From 1ef166d6a91ad33a75291b7ad59e72d8f0da5da6 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Wed, 13 Dec 2017 21:00:17 +0000
Subject: [PATCH] Merge upstream

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

diff --git a/BungeeCord b/BungeeCord
index eb288a8..9fd9843 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit eb288a80c37c4239ffb0ebd6fde3bb02e7fd99a0
+Subproject commit 9fd98436afcb6e504ed24c94997ee3c2aaa4bcfe
diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index e5e6b65..1b1bd1e 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 1d6cb01be6550b3cbda1165fbcb9acc140d7090b Mon Sep 17 00:00:00 2001
+From 8aed75956a6fb0f71c74073e815c6f471c312d56 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
@@ -494,7 +494,7 @@ index 082f0908..8b045e3b 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 3502b9b6..8d4abb4a 100644
+index 276631eb..0c281746 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -589,7 +589,7 @@ index 3502b9b6..8d4abb4a 100644
  
      <properties>
          <build.number>unknown</build.number>
-         <netty.version>4.1.17.Final</netty.version>
+         <netty.version>4.1.18.Final</netty.version>
 -        <maven.compiler.source>1.7</maven.compiler.source>
 -        <maven.compiler.target>1.7</maven.compiler.target>
 +        <!-- Require Java 8 -->
@@ -716,7 +716,7 @@ index bf4b399a..9a4b6529 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 211f4ded..7aedbc45 100644
+index 09af6a92..31a5aeb1 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@
@@ -828,5 +828,5 @@ index 9ecb2612..4b3613fa 100644
              <scope>compile</scope>
          </dependency>
 -- 
-2.15.0
+2.14.3