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:
Shane Freeder 2018-12-10 14:02:05 +00:00
parent e34183360f
commit bea8aacdbe
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit b0737ba230f50e489aa4d4b60ebe162ca94685d4 Subproject commit afef0ec1fed04f2ecea9df5134cfac7505c341a1

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

@ -1,4 +1,4 @@
From 4198481d2e844c617eee4b691d96ce88f5e7f8d1 Mon Sep 17 00:00:00 2001 From 44f61c24b033e3bc7fd167e5163f7b0eff51ee81 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 19:33:31 +0200 Date: Thu, 19 May 2016 19:33:31 +0200
Subject: [PATCH] POM Changes Subject: [PATCH] POM Changes
@ -487,7 +487,7 @@ index 15c0ada2..7073b404 100644
<dependencies> <dependencies>
<dependency> <dependency>
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 681547f5..20078fc4 100644 index 8587db46..5eab8750 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -3,18 +3,25 @@ @@ -3,18 +3,25 @@
@ -582,7 +582,7 @@ index 681547f5..20078fc4 100644
<properties> <properties>
<build.number>unknown</build.number> <build.number>unknown</build.number>
<netty.version>4.1.31.Final</netty.version> <netty.version>4.1.32.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 -->
@ -672,7 +672,7 @@ index 681547f5..20078fc4 100644
+ </profiles> + </profiles>
</project> </project>
diff --git a/protocol/pom.xml b/protocol/pom.xml diff --git a/protocol/pom.xml b/protocol/pom.xml
index ab9868bd..333ae1e8 100644 index 34e38ff7..a635cb70 100644
--- a/protocol/pom.xml --- a/protocol/pom.xml
+++ b/protocol/pom.xml +++ b/protocol/pom.xml
@@ -4,24 +4,24 @@ @@ -4,24 +4,24 @@
@ -821,5 +821,5 @@ index fdd44b20..4ae682ee 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
-- --
2.19.1 2.20.0