From 3b5e511743de70f4e60215e9ad4b37366d98bc47 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Sun, 18 Jun 2017 16:03:06 +0100
Subject: [PATCH] Merge upstream

---
 BungeeCord                                |  2 +-
 BungeeCord-Patches/0001-POM-Changes.patch | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/BungeeCord b/BungeeCord
index eab710b..73a81ff 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit eab710b0aa41a404f0fd89a45e5753dff79a858e
+Subproject commit 73a81ff2439864187f0b40a7273e375540cc6bdc
diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index eb726d0..9d625b5 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From a825f2184cede5f507fb6d59d8027ecd81f6cbfa Mon Sep 17 00:00:00 2001
+From b7d1c8e5251a99a7758990a7e3297826c553c9fe Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 10:33:31 -0700
 Subject: [PATCH] POM Changes
@@ -141,7 +141,7 @@ index b7cb81e2..a4516ed9 100644
              return;
          }
 diff --git a/chat/pom.xml b/chat/pom.xml
-index dc097e11..2d99a884 100644
+index 970e3097..a908c13e 100644
 --- a/chat/pom.xml
 +++ b/chat/pom.xml
 @@ -4,23 +4,24 @@
@@ -178,7 +178,7 @@ index dc097e11..2d99a884 100644
  
      <dependencies>
 diff --git a/config/pom.xml b/config/pom.xml
-index ac980914..fc49babe 100644
+index 253bfdff..d3146344 100644
 --- a/config/pom.xml
 +++ b/config/pom.xml
 @@ -4,19 +4,19 @@
@@ -492,7 +492,7 @@ index 082f0908..8b045e3b 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index c817bcfa..2f4dd31b 100644
+index b35347ce..88f939df 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -4,23 +4,24 @@
@@ -587,7 +587,7 @@ index c817bcfa..2f4dd31b 100644
 +
      <properties>
          <build.number>unknown</build.number>
-         <netty.version>4.1.9.Final</netty.version>
+         <netty.version>4.1.12.Final</netty.version>
 -        <maven.compiler.source>1.7</maven.compiler.source>
 -        <maven.compiler.target>1.7</maven.compiler.target>
 +        <!-- Require Java 8 -->
@@ -724,7 +724,7 @@ index bf4b399a..9a4b6529 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index d2e864b2..057dbf61 100644
+index 48c13305..1cd7afe0 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@
@@ -836,5 +836,5 @@ index 9ecb2612..4b3613fa 100644
              <scope>compile</scope>
          </dependency>
 -- 
-2.12.0
+2.13.0