Copy license files into jar

Solves issue #201 with including the BungeeCord LICENSE file
in binary distribution, as the license requires.

BungeeCord-Patches/0002-Copy-license-files-into-jar.patch

@@ -0,0 +1,34 @@
+From 7722688cbcf4e88c94f858e0e98975d6188637f6 Mon Sep 17 00:00:00 2001
+From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
+Date: Wed, 18 Jul 2018 20:23:03 +0300
+Subject: [PATCH] Copy license files into jar
+
+
+diff --git a/proxy/pom.xml b/proxy/pom.xml
+index 00eb9c5c..841f014e 100644
+--- a/proxy/pom.xml
++++ b/proxy/pom.xml
+@@ -98,6 +98,20 @@
+                 <directory>src/main/resources</directory>
+                 <filtering>true</filtering>
+             </resource>
++            <!-- Waterfall start - copy license files into jar -->
++            <resource>
++                <directory>../</directory>
++                <includes>
++                    <include>LICENSE</include>
++                </includes>
++            </resource>
++            <resource>
++                <directory>../../</directory>
++                <includes>
++                    <include>LICENSE.txt</include>
++                </includes>
++            </resource>
++            <!-- Waterfall end -->
+         </resources>
+     </build>
+ </project>
+-- 
+2.18.0
+

BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch

@@ -1,4 +1,4 @@
-From df15b133f6533f222593d317b31350bc34dfc591 Mon Sep 17 00:00:00 2001
+From b7409af0d80b3f677a4ece5a33f51db79176d338 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 11:28:45 -0700
 Subject: [PATCH] Rename references from BungeeCord to Waterfall
@@ -114,5 +114,5 @@ index 408312fd..95590b6d 100644
              InetSocketAddress address = Util.getAddr( addr );
              ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch

@@ -1,4 +1,4 @@
-From 89660a3a2bdcfc95468d053c89a620dbd0626bed Mon Sep 17 00:00:00 2001
+From 66c8d398c18f4d5c5ecfb84d2b40ae12b2071114 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
@@ -43,7 +43,7 @@ index 00000000..f9e277dc
 +    }
 +}
 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 0d41645b..1144ec73 100644
+index 71f30980..084bc11e 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;
@@ -64,7 +64,7 @@ index 0d41645b..1144ec73 100644
       * Localization bundle.
       */
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
-index 907246a9..4a55c0e2 100644
+index 1ee82eec..6c722e8b 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 @@ -24,7 +24,7 @@ import net.md_5.bungee.util.CaseInsensitiveSet;
@@ -119,5 +119,5 @@ index 95590b6d..1019c307 100644
          if ( permissions.isEmpty() )
          {
 -- 
-2.16.1
+2.18.0
 

BungeeCord-Patches/0005-Configurable-Waterfall-Metrics.patch

@@ -1,4 +1,4 @@
-From ac53b2c6fa7cfe1db3b19cd476863505779ea486 Mon Sep 17 00:00:00 2001
+From c5b9db7ce59d9034060925262a9947b141442d35 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
@@ -82,5 +82,5 @@ index 95239878..e482e98c 100644
          // Connect to the website
          URLConnection connection;
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-CI.patch

@@ -1,4 +1,4 @@
-From bda34a59361b9de7bbbede5d9aeb30e835f87128 Mon Sep 17 00:00:00 2001
+From 0e2432374ec4026626da426fcbb25775cc210f2b Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 11:34:52 -0700
 Subject: [PATCH] Fetch modules from the Waterfall CI
@@ -40,5 +40,5 @@ index 2536435c..e1cf0010 100644
          } catch ( IOException ex )
          {
 -- 
-2.14.1
+2.18.0
 

BungeeCord-Patches/0007-Get-rid-of-the-security-manager.patch

@@ -1,4 +1,4 @@
-From ee84eda36902629e0e7340d0088f80c7c13b888b Mon Sep 17 00:00:00 2001
+From bb7ee77598b1180be1dcb7b62de86575adb33945 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,7 +6,7 @@ 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 174a0d18..6a4cc14c 100644
+index e62b5259..8a4f747c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -185,8 +185,6 @@ public class BungeeCord extends ProxyServer
@@ -103,5 +103,5 @@ index 53c81923..00000000
 -    }
 -}
 -- 
-2.16.1
+2.18.0
 

BungeeCord-Patches/0008-Presize-the-HTTP-response-buffer.patch

@@ -1,4 +1,4 @@
-From 64569da83643499139a52d19b196ef0643c5d281 Mon Sep 17 00:00:00 2001
+From b63cad3390214498b8d14ecf0ffc07999144b79a Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Wed, 13 Apr 2016 15:17:05 -0400
 Subject: [PATCH] Presize the HTTP response buffer
@@ -19,5 +19,5 @@ index 96d0a71d..bac6b1b0 100644
      @Override
      public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
 -- 
-2.14.1
+2.18.0
 

BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch

@@ -1,4 +1,4 @@
-From 40e9c66ff098c379778076921dc36f050e6b256a Mon Sep 17 00:00:00 2001
+From 2231ab609209a89a4bf6de54dd056c7a03023144 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Tue, 3 May 2016 20:31:52 -0700
 Subject: [PATCH] Don't access a ByteBuf's underlying array
@@ -86,5 +86,5 @@ index 551ae1e1..be9685b9 100644
      {
          @Override
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0010-Fix-unicode-characters-in-configuration-files.patch

@@ -1,4 +1,4 @@
-From 71635ee654f9c93b3540ad974b2a82b6309e8b15 Mon Sep 17 00:00:00 2001
+From e4b0f0e607b748017b49277706edb780eeb3e3aa Mon Sep 17 00:00:00 2001
 From: kamcio96 <k.nadworski@icloud.com>
 Date: Sat, 21 May 2016 17:17:36 -0600
 Subject: [PATCH] Fix unicode characters in configuration files
@@ -53,5 +53,5 @@ index db8aa4be..9258d7dd 100644
              return load( reader, defaults );
          }
 -- 
-2.16.1
+2.18.0
 

BungeeCord-Patches/0011-Optimize-uuid-conversions.patch

@@ -1,4 +1,4 @@
-From b43d08b7902582353ae35d4b281749e2e3471a76 Mon Sep 17 00:00:00 2001
+From 8c2f45e6976fe1f2d39feba80d53c9d549d37d89 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 14 Mar 2016 15:40:44 -0700
 Subject: [PATCH] Optimize uuid conversions
@@ -271,5 +271,5 @@ index e5d361e3..d1e9d556 100644
  
      @Override
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0012-Add-support-for-FML-with-IP-Forwarding-enabled.patch

@@ -1,4 +1,4 @@
-From 478b783a5131e16a5e565cff118c15be6cc8f8d7 Mon Sep 17 00:00:00 2001
+From dff2e0db54091955c1e33713b225976aa61c301b Mon Sep 17 00:00:00 2001
 From: Daniel Naylor <git@drnaylor.co.uk>
 Date: Tue, 25 Oct 2016 12:23:07 -0400
 Subject: [PATCH] Add support for FML with IP Forwarding enabled
@@ -100,5 +100,5 @@ index 6dca2048..f5253b89 100644
       * The FML 1.8 handshake token.
       */
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0013-Better-unit-tests-for-Chat-API.patch

@@ -1,11 +1,11 @@
-From 3b892ade0eac384ac47607c81c8f2e8ccb3d95bd Mon Sep 17 00:00:00 2001
+From 931687f8e28ae05e4d466b400a89a5267b99f54a Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 17:36:31 -0600
 Subject: [PATCH] Better unit tests for Chat API
 
 
 diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
-index 6eda2a72..22398005 100644
+index 27b5bbea..b60843b5 100644
 --- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
 +++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
 @@ -202,6 +202,26 @@ public class ComponentsTest
@@ -36,7 +36,7 @@ index 6eda2a72..22398005 100644
      public void testLoopSimple()
      {
 diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
-index 0837c672..38147e2a 100644
+index 2391c22f..8397db2d 100644
 --- a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
 +++ b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
 @@ -13,4 +13,12 @@ public class TranslatableComponentTest
@@ -53,5 +53,5 @@ index 0837c672..38147e2a 100644
 +    }
  }
 -- 
-2.16.1
+2.18.0
 

BungeeCord-Patches/0014-Don-t-allow-channel-buffers-to-grow-beyond-a-reasona.patch

@@ -1,4 +1,4 @@
-From dfdf0c885ff79cac405144f524a257be0137ce1d Mon Sep 17 00:00:00 2001
+From 07e5461a783493e3a46d1d1ea50a59d81cfde264 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
@@ -18,5 +18,5 @@ index 8a4f747c..cfc3991f 100644
                      .childHandler( PipelineUtils.SERVER_CHILD )
                      .group( eventLoops )
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0015-Allow-removing-servers-or-changing-addresses-on-relo.patch

@@ -1,4 +1,4 @@
-From 9366d5ee793cf91365eeb4dbf38c6e8be6b6c3ac Mon Sep 17 00:00:00 2001
+From 7906a1d4ebe578341401e2d69f5195d823615a5b Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 28 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Allow removing servers or changing addresses on reload
@@ -72,5 +72,5 @@ index 6c722e8b..3a73a870 100644
              }
          }
 -- 
-2.17.0.windows.1
+2.18.0
 

BungeeCord-Patches/0016-Enable-TCP_NODELAY.patch

@@ -1,4 +1,4 @@
-From 974ef96fabc5835a6385b76a76a8cdf8891b81a2 Mon Sep 17 00:00:00 2001
+From a63302940f9d49a8c25197e2fe9dc27f2f6d025e Mon Sep 17 00:00:00 2001
 From: Harry <me@harry5573.uk>
 Date: Sun, 24 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Enable TCP_NODELAY.
@@ -18,5 +18,5 @@ index be9685b9..b0bbc1d7 100644
              ch.config().setWriteBufferWaterMark( MARK );
  
 -- 
-2.17.0.windows.1
+2.18.0
 

BungeeCord-Patches/0017-Micro-optimizations.patch

@@ -1,4 +1,4 @@
-From 3f1783a2c23871117ecd7bebbc719a791f2f6b27 Mon Sep 17 00:00:00 2001
+From f9d8e2001b806c727b0a5e7f38af82eef3c1afc3 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Tue, 19 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Micro-optimizations
@@ -79,5 +79,5 @@ index 51c78e2e..23417849 100644
              String subChannel = in.readUTF();
  
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch

@@ -1,4 +1,4 @@
-From 2c0151ec567571dbd5b34c554bf18d9b88fe796d Mon Sep 17 00:00:00 2001
+From dd2af3af4926e0c273f5554ac74970ad9df08c2b Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 19 May 2016 17:09:22 -0600
 Subject: [PATCH] Allow invalid packet ids for forge servers
@@ -122,5 +122,5 @@ index cae566f5..bad9773b 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0019-Resolve-sendData-deadlocks.patch

@@ -1,4 +1,4 @@
-From 2c34f23a707a2209a1c67f64bfab950448acc9a0 Mon Sep 17 00:00:00 2001
+From d7627ca9aaad7b3625fc6b32d5a7208f7aca7889 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Fri, 12 Feb 2016 23:55:53 -0500
 Subject: [PATCH] Resolve sendData() deadlocks
@@ -43,5 +43,5 @@ index 89c8f48f..9756c09c 100644
  
      @Override
 -- 
-2.16.1
+2.18.0
 

BungeeCord-Patches/0020-Add-basic-support-for-configurable-tab-complete-thro.patch

@@ -1,4 +1,4 @@
-From f01d605e461267209d8008ae203ac107a6e82679 Mon Sep 17 00:00:00 2001
+From c3cca595f8c86af85843ed663940153613687325 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
@@ -64,7 +64,7 @@ index 056b8040..e56d3591 100644
 +    }
  }
 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 19a52458..ccdeaed1 100644
+index 99933dc8..af1c7deb 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 @@ -33,6 +33,8 @@ public class UpstreamBridge extends PacketHandler
@@ -94,5 +94,5 @@ index 19a52458..ccdeaed1 100644
  
          if ( tabComplete.getCursor().startsWith( "/" ) )
 -- 
-2.16.1
+2.18.0
 

BungeeCord-Patches/0021-Don-t-create-a-new-KickStringWriter-for-each-new-con.patch

@@ -1,4 +1,4 @@
-From cd05bb628606c9a86ce649ea90d1ceb198d1f21d Mon Sep 17 00:00:00 2001
+From b4ce6bdcc8f8aa1bad704c38ea5f9a6ac35690c4 Mon Sep 17 00:00:00 2001
 From: Harry <me@harry5573.uk>
 Date: Tue, 26 Jan 2016 01:01:57 +0000
 Subject: [PATCH] Don't create a new KickStringWriter for each new connection.
@@ -42,5 +42,5 @@ index b0bbc1d7..0cad5c89 100644
      private static boolean epoll;
  
 -- 
-2.14.1
+2.18.0
 

BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch

@@ -1,4 +1,4 @@
-From d1f44b716a78cdd29ddc056b4f717872e86c0909 Mon Sep 17 00:00:00 2001
+From 733b1ebe4e400014e1f72c90ba40399a4bd95b45 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.
@@ -134,5 +134,5 @@ index af1c7deb..81f09a80 100644
      }
  }
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0023-Add-a-property-to-accept-invalid-ping-packets.patch

@@ -1,4 +1,4 @@
-From da9d5c3de73f4bcad92c4f5ab1968fd6db4d5da2 Mon Sep 17 00:00:00 2001
+From 64744af8486cf0ded4b02dbe5ce9e6aafda0e64a Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Sun, 7 Feb 2016 00:01:19 -0700
 Subject: [PATCH] Add a property to accept invalid ping packets
@@ -29,5 +29,5 @@ index 59053de2..933a8388 100644
          disconnect( "" );
      }
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0024-Use-a-worker-and-a-boss-event-loop-group.patch

@@ -1,4 +1,4 @@
-From cb834674c3d51f0d3c27da698f0e3c82962fa3ee Mon Sep 17 00:00:00 2001
+From cc5770bd00488d5f1834287b8067202c2faeea2d 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.
@@ -83,5 +83,5 @@ index 9756c09c..648cd273 100644
                  .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable
                  .remoteAddress( getAddress() )
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0025-Better-Decompression-Sanity.patch

@@ -1,4 +1,4 @@
-From 5ee7b32fa3c3171ded4bb8d10b47620d202c5f46 Mon Sep 17 00:00:00 2001
+From 361a59c9bc239fb4f6bc0049767e5fa6e9aee7ae Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Fri, 18 Mar 2016 10:53:24 -0700
 Subject: [PATCH] Better Decompression Sanity
@@ -58,5 +58,5 @@ index 71df1fd5..4882b8ed 100644
          if ( compressionThreshold == -1 )
          {
 -- 
-2.14.3
+2.18.0
 

BungeeCord-Patches/0026-Validate-that-chat-messages-are-non-blank.patch

@@ -1,4 +1,4 @@
-From 438e3698ce253ec55958ceb5bc5e91b94aea6f2e Mon Sep 17 00:00:00 2001
+From da86dc3492cbc2c845b35fe9eaa3a73cf99d4ea3 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Tue, 25 Oct 2016 12:34:41 -0400
 Subject: [PATCH] Validate that chat messages are non-blank
@@ -33,7 +33,7 @@ index 00000000..940ad806
 +    }
 +}
 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 742ff503..b2513e93 100644
+index 81f09a80..719ad409 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 @@ -1,6 +1,7 @@
@@ -53,5 +53,5 @@ index 742ff503..b2513e93 100644
          ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() );
          if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
 -- 
-2.16.1
+2.18.0
 

BungeeCord-Patches/0027-Reduce-the-overhead-of-lots-and-lots-of-teams-with-t.patch

@@ -1,4 +1,4 @@
-From b718071e9c176cc2f6cd7f097345b5c302be10a3 Mon Sep 17 00:00:00 2001
+From 9881b437b021152393b4bff9ada36454d6f23b1d Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Mon, 25 Apr 2016 23:46:00 -0700
 Subject: [PATCH] Reduce the overhead of lots and lots of teams with the same
@@ -267,5 +267,5 @@ index 00000000..5aa306a1
 +
 +}
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0028-Better-debug-checks.patch

@@ -1,4 +1,4 @@
-From e25b383744ba5d85ced3770a20497b0252f25cce Mon Sep 17 00:00:00 2001
+From 4f9ac24b7795f778c4f0d6c2a975e46d07b52a35 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Wed, 6 Apr 2016 23:46:00 -0700
 Subject: [PATCH] Better debug checks
@@ -18,5 +18,5 @@ index 96d3c99e..da53ff0f 100644
              return protocolData.packetMap.get( packet );
          }
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0029-Add-dynamic-server-addition-removal-api.patch

@@ -1,4 +1,4 @@
-From fa6c047a48e2917f443c8c1880b1da954f5c45b5 Mon Sep 17 00:00:00 2001
+From e6bf822451bdae03f2b34af75ab45150d8a8af0f 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.
@@ -298,5 +298,5 @@ index 3a73a870..d3f0b2d8 100644
 +    // Waterfall end
  }
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0030-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch

@@ -1,4 +1,4 @@
-From 74d52d182c77622b4c017eae70d3cc729254f095 Mon Sep 17 00:00:00 2001
+From 6e96191ab29d996b10aa4eb56b583a69d42a7a2c Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Mon, 6 Jun 2016 13:36:10 -0600
 Subject: [PATCH] Don't send KICK packets while in HANDSHAKE state
@@ -27,5 +27,5 @@ index 933a8388..65e57062 100644
              ch.delayedClose( new Kick( ComponentSerializer.toString( reason ) ) );
          } else
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0031-Improve-ServerKickEvent.patch

@@ -1,4 +1,4 @@
-From c56baacce93328c48858f69df3d23bdec36b7a15 Mon Sep 17 00:00:00 2001
+From ccb2418a2b6dd46f3bf16f021994295621108c05 Mon Sep 17 00:00:00 2001
 From: Nathan Poirier <nathan@poirier.io>
 Date: Tue, 28 Jun 2016 23:00:49 -0500
 Subject: [PATCH] Improve ServerKickEvent
@@ -146,5 +146,5 @@ index b5a4a929..921605ab 100644
          {
              con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0032-Configurable-server-version-in-ping-response.patch

@@ -1,4 +1,4 @@
-From 54013d2709efdb3738c486ad4cdfcb2cd69da490 Mon Sep 17 00:00:00 2001
+From e4f6e5fd5748412ad7d6d4a592fcdcbf2befb466 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
@@ -72,5 +72,5 @@ index d347d42d..09d53fea 100644
  
      @Override
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0033-Add-timeout-variant-to-connect-methods.patch

@@ -1,4 +1,4 @@
-From aa1ec62226004b9135a87762e7530133eaa5e9ee Mon Sep 17 00:00:00 2001
+From df274598aa8366c53dc3c58321a5f498f0369c4a Mon Sep 17 00:00:00 2001
 From: Ichbinjoe <joe@ibj.io>
 Date: Sat, 16 Jul 2016 20:44:01 -0400
 Subject: [PATCH] Add timeout variant to connect methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Add timeout variant to connect methods
 Also added more connect methods to ProxiedPlayer, in addition to the new method
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
-index a7334c87..4638617d 100644
+index 333d3972..454a7229 100644
 --- a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
 +++ b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
 @@ -110,6 +110,38 @@ public interface ProxiedPlayer extends Connection, CommandSender
@@ -114,5 +114,5 @@ index 61502ea8..8344a9b6 100644
          // Windows is bugged, multi homed users will just have to live with random connecting IPs
          if ( getPendingConnection().getListener().isSetLocalAddress() && !PlatformDependent.isWindows() )
 -- 
-2.16.3
+2.18.0
 

BungeeCord-Patches/0034-Proxy-query-event.patch

@@ -1,4 +1,4 @@
-From 99e0f78518b8579d4b8bc783f3ec1384af8e8db3 Mon Sep 17 00:00:00 2001
+From 97d915652032cf21da338136fd8d5ac91752186c Mon Sep 17 00:00:00 2001
 From: minecrafter <unknown@unknown>
 Date: Sun, 3 Jul 2016 04:03:21 -0400
 Subject: [PATCH] Proxy query event
@@ -214,5 +214,5 @@ index 79d6886a..a72cfd92 100644
              } else
              {
 -- 
-2.14.1
+2.18.0
 

BungeeCord-Patches/0035-Dump-the-raw-hex-of-a-packet-on-a-decoding-error.patch

@@ -1,11 +1,11 @@
-From 046d135d0187f3d739afe48ff92eea47df55541e Mon Sep 17 00:00:00 2001
+From cf8c0cda05305f7bd23dcd2ed2464a0f4c0f7cb3 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 4 Aug 2016 19:30:49 -0700
 Subject: [PATCH] Dump the raw hex of a packet on a decoding error
 
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
-index 447eaae7..0b780e2e 100644
+index 5b32effe..9e9ea49c 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
 @@ -1,7 +1,9 @@
@@ -53,5 +53,5 @@ index 447eaae7..0b780e2e 100644
          {
              if ( slice != null )
 -- 
-2.14.1
+2.18.0
 

BungeeCord-Patches/0036-Fix-potion-race-condition-on-Forge-1.8.9.patch

@@ -1,4 +1,4 @@
-From d8fe24fd088efb4c1d5201f39f3ab892d7c62315 Mon Sep 17 00:00:00 2001
+From 59c2ac94212b06ce965ebe967ed6c389fa1895f4 Mon Sep 17 00:00:00 2001
 From: Aaron Hill <aa1ronham@gmail.com>
 Date: Thu, 15 Sep 2016 22:38:37 +0200
 Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@@ -273,5 +273,5 @@ index 0d683856..c1272da3 100644
       * Sends the server mod list to the client, or stores it for sending later.
       *
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0037-Optionally-use-async-Netty-DNS-resolver.patch

@@ -1,4 +1,4 @@
-From 1db05e22c7bea406885eae04e9df5f1f97407c10 Mon Sep 17 00:00:00 2001
+From 58bac7c43dc53cb8ebd8c2b9f2b7e3020806abe4 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Wed, 21 Dec 2016 03:13:03 -0500
 Subject: [PATCH] Optionally use async Netty DNS resolver
@@ -22,7 +22,7 @@ index a4436141..43519ce1 100644
  
      /**
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 7aedbc45..1a5d036d 100644
+index 841f014e..2efeaa9e 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -41,6 +41,14 @@
@@ -170,5 +170,5 @@ index 0cad5c89..3af6a1db 100644
          return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
      }
 -- 
-2.14.1
+2.18.0
 

BungeeCord-Patches/0038-Security-enhancements-for-EncryptionUtil.patch

@@ -1,4 +1,4 @@
-From cfeb2afa090f3486d98dd8a83120756acb97e884 Mon Sep 17 00:00:00 2001
+From 2d24076492612c9a919fcd4cb7d66ac647597528 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Wed, 21 Dec 2016 04:07:26 -0500
 Subject: [PATCH] Security enhancements for EncryptionUtil
@@ -6,7 +6,7 @@ Subject: [PATCH] Security enhancements for EncryptionUtil
 Use a constant-time comparison in getSecret() and use SecureRandom for EncryptionRequest.
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java b/proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java
-index 871e4ad0..622a21da 100644
+index 0b4732cd..e1ff4afb 100644
 --- a/proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java
 +++ b/proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java
 @@ -27,7 +27,7 @@ import net.md_5.bungee.protocol.packet.EncryptionRequest;
@@ -28,5 +28,5 @@ index 871e4ad0..622a21da 100644
              throw new IllegalStateException( "Key pairs do not match!" );
          }
 -- 
-2.14.1
+2.18.0
 

BungeeCord-Patches/0039-Improve-outdated-build-message.patch

@@ -1,4 +1,4 @@
-From 1b4c278288883e71acbd3e6ed3b67cdfd9cacbf8 Mon Sep 17 00:00:00 2001
+From f1874ae942e3360895f48572822e1ff19dbec56f Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 Date: Sat, 10 Jun 2017 20:56:02 +0100
 Subject: [PATCH] Improve outdated build message
@@ -22,5 +22,5 @@ index 11526c9c..2efe7211 100644
                  Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
              }
 -- 
-2.14.1
+2.18.0
 

BungeeCord-Patches/0040-Fix-some-forge-plugin-message-packets-not-being-forw.patch

@@ -1,4 +1,4 @@
-From 01540488bfb93de14211d9b22f8cdfc2ac62dee5 Mon Sep 17 00:00:00 2001
+From 77091f7a98ce5132ef679faac995fb70b69cbdc0 Mon Sep 17 00:00:00 2001
 From: Daniel Naylor <git@drnaylor.co.uk>
 Date: Mon, 17 Jul 2017 20:24:17 +0100
 Subject: [PATCH] Fix some forge plugin message packets not being forwarded
@@ -55,5 +55,5 @@ index 3fe5ec5f..a0c07874 100644
              synchronized ( packetQueue )
              {
 -- 
-2.14.1
+2.18.0
 

BungeeCord-Patches/0041-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch

@@ -1,4 +1,4 @@
-From 5872d7cacee483a8c84ffc319c1ffcf7d5bfc037 Mon Sep 17 00:00:00 2001
+From 2b47e488f5f1c562a71a7eb8b8d9c02f0c943ea7 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 12:46:47 +0200
 Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@@ -252,7 +252,7 @@ index 79493df2..0183bf9c 100644
          <module>protocol</module>
          <module>proxy</module>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 03708968..9f1b066e 100644
+index 2efeaa9e..2fa860e1 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -70,7 +70,7 @@

BungeeCord-Patches/0042-Handle-plugin-prefixes-using-Log4J.patch

@@ -1,4 +1,4 @@
-From cc1216e4ae16ecc16b06b848ddea7c1a15834b8b Mon Sep 17 00:00:00 2001
+From f0803d62012e3b0f6260bba862bae16c4551b9b2 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 13:07:31 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J
@@ -18,7 +18,7 @@ index bc91208a..e85b4914 100644
  
      //
 diff --git a/log4j/src/main/resources/log4j2.xml b/log4j/src/main/resources/log4j2.xml
-index d4a81199..3664f30e 100644
+index 93ce3b14..3b3525f0 100644
 --- a/log4j/src/main/resources/log4j2.xml
 +++ b/log4j/src/main/resources/log4j2.xml
 @@ -2,10 +2,20 @@
@@ -45,5 +45,5 @@ index d4a81199..3664f30e 100644
                  <TimeBasedTriggeringPolicy />
                  <OnStartupTriggeringPolicy />
 -- 
-2.14.1
+2.18.0
 

BungeeCord-Patches/0043-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -1,4 +1,4 @@
-From b77cc41ce6d472939205d2795e04769ae01d94fc Mon Sep 17 00:00:00 2001
+From 43169af28b3e8622ac7e80c22b33f1bf66eeb778 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 13:15:09 +0200
 Subject: [PATCH] Allow plugins to use SLF4J for logging

BungeeCord-Patches/0044-Add-Log4j-configuration-that-replicates-the-old-Bung.patch

@@ -1,4 +1,4 @@
-From ca65f501ae9962731c785cba7d7b3b1357f8df4e Mon Sep 17 00:00:00 2001
+From 3cb9f95261cc5461546b0b98718717d4905a30c6 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Sun, 24 Sep 2017 12:06:49 +0200
 Subject: [PATCH] Add Log4j configuration that replicates the old BungeeCord

BungeeCord-Patches/0045-Add-console-command-completion.patch

@@ -1,4 +1,4 @@
-From 056c5b8f8853c5e0471fa0f88b5fe18c58cd9345 Mon Sep 17 00:00:00 2001
+From cda9fb2d03812217e931ffd63e516395e3a65799 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 26 Sep 2017 18:59:37 +0200
 Subject: [PATCH] Add console command completion

BungeeCord-Patches/0046-Providing-access-to-the-player-s-LoginResult-on-Logi.patch

@@ -1,4 +1,4 @@
-From 13c39323880b63ffdb0cf700560ac6e60dc2055a Mon Sep 17 00:00:00 2001
+From 4fe832da4634274b6a5fa7d8591612ec37a6355f Mon Sep 17 00:00:00 2001
 From: phenomax <phenomax@revayd.net>
 Date: Thu, 10 Aug 2017 18:41:17 +0200
 Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
@@ -65,5 +65,5 @@ index 65e57062..2347654c 100644
  
      @Override
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0047-Optionally-log-InitialHandler-connections.patch

@@ -1,4 +1,4 @@
-From 3856ab186008bdc544e574f8f332b1a9576b910a Mon Sep 17 00:00:00 2001
+From 353f994a51cd870b1344e302910f7d22c04a75e1 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Thu, 8 Feb 2018 19:10:52 +0100
 Subject: [PATCH] Optionally log InitialHandler connections
@@ -72,5 +72,5 @@ index 2347654c..c6e109c5 100644
                  ch.setProtocol( Protocol.LOGIN );
  
 -- 
-2.15.1.windows.2
+2.18.0
 

BungeeCord-Patches/0048-Forge-is-a-first-class-citizen.patch

@@ -1,4 +1,4 @@
-From 419a755bd7712ed8685a01bdee5d060f5fb0e3e7 Mon Sep 17 00:00:00 2001
+From 55a04e84b0162e8acbfeaa51334103892eae281d Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 Date: Mon, 28 May 2018 21:43:55 +0100
 Subject: [PATCH] Forge is a first class citizen
@@ -31,5 +31,5 @@ index d3f0b2d8..242535d0 100644
      @Synchronized("serversLock") // Waterfall
      public void load()
 -- 
-2.15.1.windows.2
+2.18.0