Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-01 06:33:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream. Closes #171

Browse Source
This commit is contained in:
Jamie Mansfield 2017-09-03 19:55:05 +01:00
parent 178e989894
commit 2e32a81429
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit bd5a7e5b26b698c57e6f99933452bfc0659269f9 Subproject commit 7068013be85ce8b3029048b74007993e7f103b51

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

@ -1,4 +1,4 @@
From ac3c09c9f54bf1dd42d45dcd63be12259f392dd1 Mon Sep 17 00:00:00 2001 From 2af626ec06c4cac9323f5701e63f8002f664c195 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
@ -66,7 +66,7 @@ index 96a46738..2a3c5eae 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 9c02b389..f1b3a071 100644 index 9b5c98f7..7bc2dff7 100644
--- a/bootstrap/pom.xml --- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml +++ b/bootstrap/pom.xml
@@ -4,19 +4,19 @@ @@ -4,19 +4,19 @@
@ -493,7 +493,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 6821d750..3eb013db 100644 index 714d421d..ecc35560 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -4,23 +4,24 @@ @@ -4,23 +4,24 @@
@ -588,7 +588,7 @@ index 6821d750..3eb013db 100644
+ +
<properties> <properties>
<build.number>unknown</build.number> <build.number>unknown</build.number>
<netty.version>4.1.13.Final</netty.version> <netty.version>4.1.15.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 -->
@ -720,7 +720,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 1eae8733..98656fed 100644 index 211f4ded..7aedbc45 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 @@
@ -832,5 +832,5 @@ index 9ecb2612..4b3613fa 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
-- --
2.13.0 2.14.1