diff --git a/BungeeCord-Patches/0003-Add-Waterfall-configuration-files.patch b/BungeeCord-Patches/0003-Add-Waterfall-configuration-files.patch
index 6911362..120e26a 100644
--- a/BungeeCord-Patches/0003-Add-Waterfall-configuration-files.patch
+++ b/BungeeCord-Patches/0003-Add-Waterfall-configuration-files.patch
@@ -1,4 +1,4 @@
-From b8a481fec8d1606361e8aa557ae22d32dd0a486a Mon Sep 17 00:00:00 2001
+From 748f34eb706e5a59fc92b169d35b3e7f82f5eb24 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Tue, 25 Oct 2016 11:58:37 -0400
 Subject: [PATCH] Add Waterfall configuration files
@@ -20,7 +20,7 @@ index edd82c1..b30541b 100644
  }
 diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
 new file mode 100644
-index 0000000..12c5859
+index 0000000..f9e277d
 --- /dev/null
 +++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
 @@ -0,0 +1,18 @@
@@ -42,7 +42,6 @@ index 0000000..12c5859
 +        config.load(false); // Load, but no permissions
 +    }
 +}
-\ No newline at end of file
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 index 5b01030..7bb0862 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -120,5 +119,5 @@ index 82ff91a..4ec9782 100644
          if ( permissions.isEmpty() )
          {
 -- 
-2.7.4 (Apple Git-66)
+2.10.0
 
diff --git a/BungeeCord-Patches/0004-Configurable-Waterfall-Metrics.patch b/BungeeCord-Patches/0004-Configurable-Waterfall-Metrics.patch
index 7122c93..81b8da3 100644
--- a/BungeeCord-Patches/0004-Configurable-Waterfall-Metrics.patch
+++ b/BungeeCord-Patches/0004-Configurable-Waterfall-Metrics.patch
@@ -1,4 +1,4 @@
-From 176eede573861401925dba13a9e76f3fb87a1e85 Mon Sep 17 00:00:00 2001
+From a16ac4f8fcae27f03ffc287a2063bbf6713ea053 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 19 May 2016 10:55:20 -0700
 Subject: [PATCH] Configurable Waterfall Metrics
@@ -17,38 +17,43 @@ index b30541b..293ec4e 100644
 +     */
 +    boolean isMetrics();
  }
-diff --git a/proxy/src/main/java/net/md_5/bungee/Metrics.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/Metrics.java
-similarity index 96%
-rename from proxy/src/main/java/net/md_5/bungee/Metrics.java
-rename to proxy/src/main/java/io/github/waterfallmc/waterfall/Metrics.java
-index 9523987..ae5a2a9 100644
---- a/proxy/src/main/java/net/md_5/bungee/Metrics.java
-+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/Metrics.java
-@@ -1,4 +1,4 @@
--package net.md_5.bungee;
-+package io.github.waterfallmc.waterfall;
+diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+index 7bb0862..290fad4 100644
+--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
++++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+@@ -11,7 +11,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
+ import com.google.gson.Gson;
+ import com.google.gson.GsonBuilder;
+ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+-import io.github.waterfallmc.waterfall.conf.WaterfallConfiguration;
++import net.md_5.bungee.conf.WaterfallConfiguration;
+ import io.netty.bootstrap.ServerBootstrap;
+ import io.netty.channel.Channel;
+ import io.netty.channel.ChannelException;
+@@ -289,7 +289,9 @@ public class BungeeCord extends ProxyServer
+                 }
+             }
+         }, 0, TimeUnit.MINUTES.toMillis( 5 ) );
+-        metricsThread.scheduleAtFixedRate( new Metrics(), 0, TimeUnit.MINUTES.toMillis( Metrics.PING_INTERVAL ) );
++        if (config.isMetrics()) {
++            metricsThread.scheduleAtFixedRate( new Metrics(), 0, TimeUnit.MINUTES.toMillis( Metrics.PING_INTERVAL ) );
++        }
+     }
  
- import java.io.BufferedReader;
- import java.io.IOException;
-@@ -9,6 +9,8 @@ import java.net.URL;
+     public void startListeners()
+diff --git a/proxy/src/main/java/net/md_5/bungee/Metrics.java b/proxy/src/main/java/net/md_5/bungee/Metrics.java
+index 9523987..e482e98 100644
+--- a/proxy/src/main/java/net/md_5/bungee/Metrics.java
++++ b/proxy/src/main/java/net/md_5/bungee/Metrics.java
+@@ -9,6 +9,7 @@ import java.net.URL;
  import java.net.URLConnection;
  import java.net.URLEncoder;
  import java.util.TimerTask;
 +
-+import net.md_5.bungee.BungeeCord;
  import net.md_5.bungee.api.ProxyServer;
  
  public class Metrics extends TimerTask
-@@ -29,7 +31,7 @@ public class Metrics extends TimerTask
-     /**
-      * Interval of time to ping (in minutes)
-      */
--    final static int PING_INTERVAL = 10;
-+    public final static int PING_INTERVAL = 10;
-     boolean firstPost = true;
- 
-     @Override
-@@ -71,7 +73,7 @@ public class Metrics extends TimerTask
+@@ -71,7 +72,7 @@ public class Metrics extends TimerTask
          }
  
          // Create the url
@@ -57,10 +62,19 @@ index 9523987..ae5a2a9 100644
  
          // Connect to the website
          URLConnection connection;
-diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-index 12c5859..692b83e 100644
+diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
+similarity index 56%
+rename from proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+rename to proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
+index f9e277d..38f6330 100644
 --- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
++++ b/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
+@@ -1,4 +1,4 @@
+-package io.github.waterfallmc.waterfall.conf;
++package net.md_5.bungee.conf;
+ 
+ import lombok.*;
+ 
 @@ -9,10 +9,23 @@ import net.md_5.bungee.conf.YamlConfig;
  
  public class WaterfallConfiguration extends Configuration {
@@ -85,30 +99,6 @@ index 12c5859..692b83e 100644
 +        return metrics;
      }
  }
-\ No newline at end of file
-diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index 7bb0862..304a794 100644
---- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -11,6 +11,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
- import com.google.gson.Gson;
- import com.google.gson.GsonBuilder;
- import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-+import io.github.waterfallmc.waterfall.Metrics;
- import io.github.waterfallmc.waterfall.conf.WaterfallConfiguration;
- import io.netty.bootstrap.ServerBootstrap;
- import io.netty.channel.Channel;
-@@ -289,7 +290,9 @@ public class BungeeCord extends ProxyServer
-                 }
-             }
-         }, 0, TimeUnit.MINUTES.toMillis( 5 ) );
--        metricsThread.scheduleAtFixedRate( new Metrics(), 0, TimeUnit.MINUTES.toMillis( Metrics.PING_INTERVAL ) );
-+        if (config.isMetrics()) {
-+            metricsThread.scheduleAtFixedRate( new Metrics(), 0, TimeUnit.MINUTES.toMillis( Metrics.PING_INTERVAL ) );
-+        }
-     }
- 
-     public void startListeners()
 -- 
 2.10.0
 
diff --git a/BungeeCord-Patches/0006-Get-rid-of-the-security-manager.patch b/BungeeCord-Patches/0006-Get-rid-of-the-security-manager.patch
index f76b7ed..a1b6d0c 100644
--- a/BungeeCord-Patches/0006-Get-rid-of-the-security-manager.patch
+++ b/BungeeCord-Patches/0006-Get-rid-of-the-security-manager.patch
@@ -1,4 +1,4 @@
-From d0ab8a29d1bbf86ab4d40d57957b516a43f9e3b7 Mon Sep 17 00:00:00 2001
+From a7ac451c1b8866263a0ff6eda54ec547377eed07 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Mon, 25 Jan 2016 01:19:07 -0500
 Subject: [PATCH] Get rid of the security manager.
@@ -6,10 +6,10 @@ Subject: [PATCH] Get rid of the security manager.
 There's a lot of opinions running on both sides of the debate, but we overwhelmingly feel that the security manager does not help the vast majority of BungeeCord users or plugin developers create correct code.
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index 304a794..e0512f2 100644
+index 290fad4..bd81d66 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -181,8 +181,6 @@ public class BungeeCord extends ProxyServer
+@@ -180,8 +180,6 @@ public class BungeeCord extends ProxyServer
          // Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up.
          Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use Waterfall in directory with ! in path." );
  
@@ -103,5 +103,5 @@ index 53c8192..0000000
 -    }
 -}
 -- 
-2.7.4 (Apple Git-66)
+2.10.0
 
diff --git a/BungeeCord-Patches/0009-Allow-configuration-of-the-log-file-path-filename.patch b/BungeeCord-Patches/0009-Allow-configuration-of-the-log-file-path-filename.patch
index 4f9011a..22a0b16 100644
--- a/BungeeCord-Patches/0009-Allow-configuration-of-the-log-file-path-filename.patch
+++ b/BungeeCord-Patches/0009-Allow-configuration-of-the-log-file-path-filename.patch
@@ -1,14 +1,14 @@
-From d6ed22b02af33b339cf82b3005061132f26216b9 Mon Sep 17 00:00:00 2001
+From ebc0dcc10f56b2c1f3b26535702849f94b4ec3e6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 11 Sep 2015 23:50:52 -0400
 Subject: [PATCH] Allow configuration of the log file path/filename
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index e0512f2..b729ff1 100644
+index bd81d66..a3c8caf 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -211,7 +211,7 @@ public class BungeeCord extends ProxyServer
+@@ -210,7 +210,7 @@ public class BungeeCord extends ProxyServer
          consoleReader = new ConsoleReader();
          consoleReader.setExpandEvents( false );
  
@@ -18,5 +18,5 @@ index e0512f2..b729ff1 100644
          System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );
  
 -- 
-2.7.4 (Apple Git-66)
+2.10.0
 
diff --git a/BungeeCord-Patches/0014-Don-t-allow-channel-buffers-to-grow-beyond-a-reasona.patch b/BungeeCord-Patches/0014-Don-t-allow-channel-buffers-to-grow-beyond-a-reasona.patch
index 1e982cf..33f8b1e 100644
--- a/BungeeCord-Patches/0014-Don-t-allow-channel-buffers-to-grow-beyond-a-reasona.patch
+++ b/BungeeCord-Patches/0014-Don-t-allow-channel-buffers-to-grow-beyond-a-reasona.patch
@@ -1,14 +1,14 @@
-From bfd5eff414369a0b249edc9d41603493eab3eef6 Mon Sep 17 00:00:00 2001
+From 344cc3d7f77465bc3ec499fd950f5afc6024aba7 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@optic.tv>
 Date: Mon, 6 Jul 2015 18:59:29 -0500
 Subject: [PATCH] Don't allow channel buffers to grow beyond a reasonable limit
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index b729ff1..195d606 100644
+index a3c8caf..64a0dc5 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -315,6 +315,8 @@ public class BungeeCord extends ProxyServer
+@@ -314,6 +314,8 @@ public class BungeeCord extends ProxyServer
              new ServerBootstrap()
                      .channel( PipelineUtils.getServerChannel() )
                      .option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!
@@ -18,5 +18,5 @@ index b729ff1..195d606 100644
                      .childHandler( PipelineUtils.SERVER_CHILD )
                      .group( eventLoops )
 -- 
-2.7.4 (Apple Git-66)
+2.10.0
 
diff --git a/BungeeCord-Patches/0020-Add-basic-support-for-configurable-tab-complete-thro.patch b/BungeeCord-Patches/0020-Add-basic-support-for-configurable-tab-complete-thro.patch
index c50c17f..a62f659 100644
--- a/BungeeCord-Patches/0020-Add-basic-support-for-configurable-tab-complete-thro.patch
+++ b/BungeeCord-Patches/0020-Add-basic-support-for-configurable-tab-complete-thro.patch
@@ -1,4 +1,4 @@
-From c4ca03543b96e22be0dd9b466f07811abd7f34c1 Mon Sep 17 00:00:00 2001
+From a061441178978766c9aec812946d9cfcd74b56f6 Mon Sep 17 00:00:00 2001
 From: Johannes Donath <johannesd@torchmind.com>
 Date: Sat, 4 Jul 2015 06:31:33 +0200
 Subject: [PATCH] Add basic support for configurable tab-complete throttling
@@ -22,10 +22,10 @@ index 293ec4e..66d0b8a 100644
 +     */
 +    int getTabThrottle();
  }
-diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-index 692b83e..c3ae52f 100644
---- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+diff --git a/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java b/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
+index 38f6330..6cfa96a 100644
+--- a/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
++++ b/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
 @@ -16,16 +16,36 @@ public class WaterfallConfiguration extends Configuration {
       */
      private boolean metrics = true;
@@ -63,7 +63,6 @@ index 692b83e..c3ae52f 100644
 +        return tabThrottle;
 +    }
  }
-\ No newline at end of file
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 index 92d1da0..654be21 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
diff --git a/BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch b/BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch
index e122b56..5ccd077 100644
--- a/BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch
+++ b/BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch
@@ -1,4 +1,4 @@
-From ede5d2561eadd6f28fe3ee76dc2700992a8db477 Mon Sep 17 00:00:00 2001
+From b6e83ccf0aef5cbaee7a49b90f394460447e15a6 Mon Sep 17 00:00:00 2001
 From: Janmm14 <computerjanimaus@yahoo.de>
 Date: Sat, 12 Dec 2015 23:43:30 +0100
 Subject: [PATCH] Optional server list ping logging.
@@ -24,10 +24,22 @@ index 66d0b8a..5a49050 100644
      // Throttling options
  
      /**
-diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-index c3ae52f..c53851b 100644
---- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+index ed057b8..a37f3ea 100644
+--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
++++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+@@ -382,6 +382,6 @@ public class ServerConnector extends PacketHandler
+     @Override
+     public String toString()
+     {
+-        return "[" + user.getName() + "] <-> ServerConnector [" + target.getName() + "]";
++        return "[" + user.getName() + "|" + user.getAddress() + "] <-> ServerConnector [" + target.getName() + "]";
+     }
+ }
+diff --git a/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java b/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
+index 6cfa96a..a85f985 100644
+--- a/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
++++ b/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
 @@ -16,6 +16,13 @@ public class WaterfallConfiguration extends Configuration {
       */
      private boolean metrics = true;
@@ -60,19 +72,6 @@ index c3ae52f..c53851b 100644
 +        return logServerListPing;
 +    }
  }
-\ No newline at end of file
-diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index ed057b8..a37f3ea 100644
---- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -382,6 +382,6 @@ public class ServerConnector extends PacketHandler
-     @Override
-     public String toString()
-     {
--        return "[" + user.getName() + "] <-> ServerConnector [" + target.getName() + "]";
-+        return "[" + user.getName() + "|" + user.getAddress() + "] <-> ServerConnector [" + target.getName() + "]";
-     }
- }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 index c0a5061..4768cb4 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
diff --git a/BungeeCord-Patches/0025-Use-a-worker-and-a-boss-event-loop-group.patch b/BungeeCord-Patches/0025-Use-a-worker-and-a-boss-event-loop-group.patch
index 3c0f8ac..9bccb6c 100644
--- a/BungeeCord-Patches/0025-Use-a-worker-and-a-boss-event-loop-group.patch
+++ b/BungeeCord-Patches/0025-Use-a-worker-and-a-boss-event-loop-group.patch
@@ -1,4 +1,4 @@
-From 7ae4d59792e53ed7985e899b8d3f679cf10bf5ee Mon Sep 17 00:00:00 2001
+From 225f314f6660580b82c2dcecc658b572eeec55e8 Mon Sep 17 00:00:00 2001
 From: kamcio96 <k.nadworski@icloud.com>
 Date: Mon, 14 Mar 2016 16:07:20 -0700
 Subject: [PATCH] Use a worker and a boss event loop group.
@@ -8,10 +8,10 @@ Merges the rest of https://github.com/SpigotMC/BungeeCord/pull/1706 by @kamcio96
 This is proper practice for netty.
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index 195d606..c803735 100644
+index 64a0dc5..12c7cc1 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -111,7 +111,7 @@ public class BungeeCord extends ProxyServer
+@@ -110,7 +110,7 @@ public class BungeeCord extends ProxyServer
       */
      private ResourceBundle baseBundle;
      private ResourceBundle customBundle;
@@ -20,7 +20,7 @@ index 195d606..c803735 100644
      /**
       * locations.yml save thread.
       */
-@@ -251,7 +251,8 @@ public class BungeeCord extends ProxyServer
+@@ -250,7 +250,8 @@ public class BungeeCord extends ProxyServer
              ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
          }
  
@@ -30,7 +30,7 @@ index 195d606..c803735 100644
  
          File moduleDirectory = new File( "modules" );
          moduleManager.load( this, moduleDirectory );
-@@ -319,7 +320,7 @@ public class BungeeCord extends ProxyServer
+@@ -318,7 +319,7 @@ public class BungeeCord extends ProxyServer
                      .childOption( ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 1024 * 1024 * 1 )
                      .childAttr( PipelineUtils.LISTENER, info )
                      .childHandler( PipelineUtils.SERVER_CHILD )
@@ -39,7 +39,7 @@ index 195d606..c803735 100644
                      .localAddress( info.getHost() )
                      .bind().addListener( listener );
  
-@@ -340,7 +341,7 @@ public class BungeeCord extends ProxyServer
+@@ -339,7 +340,7 @@ public class BungeeCord extends ProxyServer
                          }
                      }
                  };
@@ -48,7 +48,7 @@ index 195d606..c803735 100644
              }
          }
      }
-@@ -396,12 +397,14 @@ public class BungeeCord extends ProxyServer
+@@ -395,12 +396,14 @@ public class BungeeCord extends ProxyServer
                  }
  
                  getLogger().info( "Closing IO threads" );
diff --git a/BungeeCord-Patches/0031-Allow-the-console-to-tab-complete-commands.patch b/BungeeCord-Patches/0031-Allow-the-console-to-tab-complete-commands.patch
index 531b3e9..f05d8ee 100644
--- a/BungeeCord-Patches/0031-Allow-the-console-to-tab-complete-commands.patch
+++ b/BungeeCord-Patches/0031-Allow-the-console-to-tab-complete-commands.patch
@@ -1,14 +1,14 @@
-From 7f7105e1d3486409e139bb8b2481966f17ffe086 Mon Sep 17 00:00:00 2001
+From a76d79a2bea4d4a3296fde3fa3b484d8ddd1446d Mon Sep 17 00:00:00 2001
 From: Mystiflow <mystiflow@gmail.com>
 Date: Sun, 14 Feb 2016 15:54:40 +0000
 Subject: [PATCH] Allow the console to tab complete commands
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index c803735..f3625e5 100644
+index 12c7cc1..60a0cb4 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -210,6 +210,7 @@ public class BungeeCord extends ProxyServer
+@@ -209,6 +209,7 @@ public class BungeeCord extends ProxyServer
          AnsiConsole.systemInstall();
          consoleReader = new ConsoleReader();
          consoleReader.setExpandEvents( false );
diff --git a/BungeeCord-Patches/0032-Add-dynamic-server-addition-removal-api.patch b/BungeeCord-Patches/0032-Add-dynamic-server-addition-removal-api.patch
index 68a5a2e..35f0aae 100644
--- a/BungeeCord-Patches/0032-Add-dynamic-server-addition-removal-api.patch
+++ b/BungeeCord-Patches/0032-Add-dynamic-server-addition-removal-api.patch
@@ -1,4 +1,4 @@
-From 3a4a864eacf06308d1a6104547ba217889c17421 Mon Sep 17 00:00:00 2001
+From 8d4ebbcc8999f166b3a9e7174ffb654a56cd3a2d Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Wed, 29 Jun 2016 04:29:25 +0200
 Subject: [PATCH] Add dynamic server addition/removal api.
@@ -144,10 +144,10 @@ index 967a1b2..08aa698 100644
      {
          int index = path.indexOf( SEPARATOR );
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index f3625e5..df618d3 100644
+index 60a0cb4..f04e9c1 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -564,10 +564,18 @@ public class BungeeCord extends ProxyServer
+@@ -563,10 +563,18 @@ public class BungeeCord extends ProxyServer
          return config.getServers();
      }
  
diff --git a/BungeeCord-Patches/0034-Configurable-server-version-in-ping-response.patch b/BungeeCord-Patches/0034-Configurable-server-version-in-ping-response.patch
index 2ae5ebd..75bb1d3 100644
--- a/BungeeCord-Patches/0034-Configurable-server-version-in-ping-response.patch
+++ b/BungeeCord-Patches/0034-Configurable-server-version-in-ping-response.patch
@@ -1,4 +1,4 @@
-From 29642727f4731e93eda04843d693da9d97262f99 Mon Sep 17 00:00:00 2001
+From d10ad2d125b7af681733f793cbae4189e1caa692 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Wed, 29 Jun 2016 13:56:57 -0500
 Subject: [PATCH] Configurable server version in ping response
@@ -20,10 +20,23 @@ index f04e2bf..a443614 100644
      // Throttling options
  
      /**
-diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-index c53851b..0f48c6a 100644
---- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+index f04e9c1..7e68902 100644
+--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
++++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+@@ -612,7 +612,7 @@ public class BungeeCord extends ProxyServer
+     @Override
+     public String getGameVersion()
+     {
+-        return Joiner.on( ", " ).join( ProtocolConstants.SUPPORTED_VERSIONS );
++        return getConfig().getGameVersion(); // Waterfall
+     }
+ 
+     @Override
+diff --git a/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java b/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
+index a85f985..9088182 100644
+--- a/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
++++ b/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
 @@ -4,8 +4,11 @@ import lombok.*;
  
  import java.io.File;
@@ -57,19 +70,6 @@ index c53851b..0f48c6a 100644
 +        gameVersion = config.getString("game_version", "").isEmpty() ? Joiner.on(", ").join(ProtocolConstants.SUPPORTED_VERSIONS) : config.getString("game_version", "");
      }
  
-     @Override
-diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index df618d3..910bb02 100644
---- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -613,7 +613,7 @@ public class BungeeCord extends ProxyServer
-     @Override
-     public String getGameVersion()
-     {
--        return Joiner.on( ", " ).join( ProtocolConstants.SUPPORTED_VERSIONS );
-+        return getConfig().getGameVersion(); // Waterfall
-     }
- 
      @Override
 -- 
 2.10.0