Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-28 13:15:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2018-04-14 12:09:17 +01:00
parent 58127189ff
commit 4f0d50aac3
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit cbfdf64a15ddade2311db0db4296de4e5813398a Subproject commit 79cd077a60be961b1bcd790737f0c6e142e7bf2d

6
BungeeCord-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 1b365ec47afe77f4b8927f09f8d116980d6a5bb4 Mon Sep 17 00:00:00 2001 From 812e7b51055a2ac4ad35c9b12a2759a84fd1dd9b Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 10:33:31 -0700 Date: Thu, 19 May 2016 10:33:31 -0700
Subject: [PATCH] POM Changes Subject: [PATCH] POM Changes
@ -494,7 +494,7 @@ index 082f0908..8b045e3b 100644
<dependencies> <dependencies>
<dependency> <dependency>
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 135f742c..c3cd07bf 100644 index b8fb238a..b0cca9fc 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -3,18 +3,25 @@ @@ -3,18 +3,25 @@
@ -589,7 +589,7 @@ index 135f742c..c3cd07bf 100644
<properties> <properties>
<build.number>unknown</build.number> <build.number>unknown</build.number>
<netty.version>4.1.21.Final</netty.version> <netty.version>4.1.23.Final</netty.version>
- <maven.compiler.source>1.7</maven.compiler.source> - <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target> - <maven.compiler.target>1.7</maven.compiler.target>
+ <!-- Require Java 8 --> + <!-- Require Java 8 -->