Merge Upstream

Less than 2 hours till liberation :D

BungeeCord

@@ -1 +1 @@
-Subproject commit 4c475492534bee92454e87482caa1e8e852b5f64
+Subproject commit 9ea82e95417ed034a57c218c68bf2ded57111aa7

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 9c38dfae5a5a08ed736c5d9336b1d699a5511244 Mon Sep 17 00:00:00 2001
+From f797540b3d020cdef9d2597a63b62820b5a95f8d Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 19:33:31 +0200
 Subject: [PATCH] POM Changes
@@ -142,10 +142,10 @@ index b7cb81e2..a4516ed9 100644
              return;
          }
 diff --git a/chat/pom.xml b/chat/pom.xml
-index 92f04c62..31b98b7d 100644
+index 99b089cb..c9328ac3 100644
 --- a/chat/pom.xml
 +++ b/chat/pom.xml
-@@ -4,23 +4,24 @@
+@@ -4,19 +4,19 @@
      <modelVersion>4.0.0</modelVersion>
  
      <parent>
@@ -169,17 +169,10 @@ index 92f04c62..31b98b7d 100644
 +    <name>Waterfall-Chat</name>
 +    <description>Minecraft JSON chat API intended for use with Waterfall</description>
  
-     <properties>
--        <maven.compiler.source>1.6</maven.compiler.source>
--        <maven.compiler.target>1.6</maven.compiler.target>
-+        <!-- Require Java 8, not Java 6 -->
-+        <maven.compiler.source>1.8</maven.compiler.source>
-+        <maven.compiler.target>1.8</maven.compiler.target>
-     </properties>
- 
      <dependencies>
+         <dependency>
 diff --git a/config/pom.xml b/config/pom.xml
-index 7241c6ba..bf7f5aeb 100644
+index 4bb5af69..febc4af0 100644
 --- a/config/pom.xml
 +++ b/config/pom.xml
 @@ -4,19 +4,19 @@
@@ -828,5 +821,5 @@ index fdd44b20..4ae682ee 100644
              <scope>compile</scope>
          </dependency>
 -- 
-2.15.1.windows.2
+2.18.0