From bea8aacdbe935c2c28e881ab82bfb52c3cb07598 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 10 Dec 2018 14:02:05 +0000
Subject: [PATCH] Merge upstream

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

diff --git a/BungeeCord b/BungeeCord
index b0737ba..afef0ec 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit b0737ba230f50e489aa4d4b60ebe162ca94685d4
+Subproject commit afef0ec1fed04f2ecea9df5134cfac7505c341a1
diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index 34e91ce..4d63117 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -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>
 Date: Thu, 19 May 2016 19:33:31 +0200
 Subject: [PATCH] POM Changes
@@ -487,7 +487,7 @@ index 15c0ada2..7073b404 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 681547f5..20078fc4 100644
+index 8587db46..5eab8750 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -582,7 +582,7 @@ index 681547f5..20078fc4 100644
  
      <properties>
          <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.target>1.7</maven.compiler.target>
 +        <!-- Require Java 8 -->
@@ -672,7 +672,7 @@ index 681547f5..20078fc4 100644
 +    </profiles>
  </project>
 diff --git a/protocol/pom.xml b/protocol/pom.xml
-index ab9868bd..333ae1e8 100644
+index 34e38ff7..a635cb70 100644
 --- a/protocol/pom.xml
 +++ b/protocol/pom.xml
 @@ -4,24 +4,24 @@
@@ -821,5 +821,5 @@ index fdd44b20..4ae682ee 100644
              <scope>compile</scope>
          </dependency>
 -- 
-2.19.1
+2.20.0