Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-01-05 23:48:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2017-06-18 16:03:06 +01:00
parent 0a0f6974f3
commit 3b5e511743
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit eab710b0aa41a404f0fd89a45e5753dff79a858e Subproject commit 73a81ff2439864187f0b40a7273e375540cc6bdc

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

@ -1,4 +1,4 @@
From a825f2184cede5f507fb6d59d8027ecd81f6cbfa Mon Sep 17 00:00:00 2001 From b7d1c8e5251a99a7758990a7e3297826c553c9fe 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
@ -141,7 +141,7 @@ index b7cb81e2..a4516ed9 100644
return; return;
} }
diff --git a/chat/pom.xml b/chat/pom.xml diff --git a/chat/pom.xml b/chat/pom.xml
index dc097e11..2d99a884 100644 index 970e3097..a908c13e 100644
--- a/chat/pom.xml --- a/chat/pom.xml
+++ b/chat/pom.xml +++ b/chat/pom.xml
@@ -4,23 +4,24 @@ @@ -4,23 +4,24 @@
@ -178,7 +178,7 @@ index dc097e11..2d99a884 100644
<dependencies> <dependencies>
diff --git a/config/pom.xml b/config/pom.xml diff --git a/config/pom.xml b/config/pom.xml
index ac980914..fc49babe 100644 index 253bfdff..d3146344 100644
--- a/config/pom.xml --- a/config/pom.xml
+++ b/config/pom.xml +++ b/config/pom.xml
@@ -4,19 +4,19 @@ @@ -4,19 +4,19 @@
@ -492,7 +492,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 c817bcfa..2f4dd31b 100644 index b35347ce..88f939df 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -4,23 +4,24 @@ @@ -4,23 +4,24 @@
@ -587,7 +587,7 @@ index c817bcfa..2f4dd31b 100644
+ +
<properties> <properties>
<build.number>unknown</build.number> <build.number>unknown</build.number>
<netty.version>4.1.9.Final</netty.version> <netty.version>4.1.12.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 -->
@ -724,7 +724,7 @@ index bf4b399a..9a4b6529 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml diff --git a/proxy/pom.xml b/proxy/pom.xml
index d2e864b2..057dbf61 100644 index 48c13305..1cd7afe0 100644
--- a/proxy/pom.xml --- a/proxy/pom.xml
+++ b/proxy/pom.xml +++ b/proxy/pom.xml
@@ -4,18 +4,18 @@ @@ -4,18 +4,18 @@
@ -836,5 +836,5 @@ index 9ecb2612..4b3613fa 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
-- --
2.12.0 2.13.0