Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-02-17 20:31:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2018-02-07 21:03:40 +00:00
parent 4ea50d7023
commit 641c851948
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit ca8f31bdc70a2ec626274b4659b99732ec602969 Subproject commit e23195f5f2179b6372052f4dc9ea996b90163cf1

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

@ -1,4 +1,4 @@
From c94be33fc7712e1c3d990c106b7a86b67ac2d697 Mon Sep 17 00:00:00 2001 From 1b365ec47afe77f4b8927f09f8d116980d6a5bb4 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 b378490e..6b4c1606 100644 index 135f742c..c3cd07bf 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 b378490e..6b4c1606 100644
<properties> <properties>
<build.number>unknown</build.number> <build.number>unknown</build.number>
<netty.version>4.1.19.Final</netty.version> <netty.version>4.1.21.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 -->
@ -828,5 +828,5 @@ index 9ecb2612..4b3613fa 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
-- --
2.14.3 2.16.1