Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-02-19 13:21:27 +01:00
Code Issues Projects Releases Wiki Activity

Update upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2017-02-01 20:49:23 +00:00
parent 2268a31735
commit 91d537c7cc
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
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 db1516ba000a18da6e5d0330ec5645d9aea74898 Subproject commit 950d504bd87fe8401190dd7d8e192a266763f916

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

@ -1,4 +1,4 @@
From b23fa70f4ee594b297212cc6c674756724f06d29 Mon Sep 17 00:00:00 2001 From 10aa49668e02fea51e8db4edff6346f37fe6a217 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
@ -492,7 +492,7 @@ index 940d257..18861da 100644
<dependencies> <dependencies>
<dependency> <dependency>
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 7f9564c..569c424 100644 index facd3bd..16601fc 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 7f9564c..569c424 100644
+ +
<properties> <properties>
<build.number>unknown</build.number> <build.number>unknown</build.number>
<netty.version>4.1.6.Final</netty.version> <netty.version>4.1.7.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 63d0498..3421be0 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 2bb124e..99d4628 100644 index 850ab86..d8372c4 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 fbadb18..349d5cc 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
-- --
2.7.4 2.10.0