From 56e5b6b920824e534ca6acf28ad69c3a3baf8729 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 21 Jun 2018 03:45:08 +0100
Subject: [PATCH] Merge upstream

---
 Waterfall                                                   | 2 +-
 ...002-Rename-references-from-Waterfall-to-Travertine.patch | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Waterfall b/Waterfall
index 00a145e..8ad3bf6 160000
--- a/Waterfall
+++ b/Waterfall
@@ -1 +1 @@
-Subproject commit 00a145e10f5355d28a65cabcd1a45e0bf17f0cfb
+Subproject commit 8ad3bf6da251ddea660bd9b6126cd01fbf456a4d
diff --git a/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch b/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch
index 1a40378..e137d5b 100644
--- a/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch
+++ b/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch
@@ -1,4 +1,4 @@
-From a74c5c6f8c297ff8ac15b5b036d793c69b6d07fa Mon Sep 17 00:00:00 2001
+From ebeb53a88ad519bca8f5b403805b13861b9a3116 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Mon, 6 Jun 2016 13:47:46 -0600
 Subject: [PATCH] Rename references from Waterfall to Travertine
@@ -66,7 +66,7 @@ index c3cb5aaa..750217b1 100644
  
          // Waterfall start - Use TerminalConsoleAppender
 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 07e46026..c62bc9ba 100644
+index d5b3bd3d..b4a3f7be 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -188,7 +188,7 @@ public class BungeeCord extends ProxyServer
@@ -78,7 +78,7 @@ index 07e46026..c62bc9ba 100644
  
          try
          {
-@@ -492,7 +492,7 @@ public class BungeeCord extends ProxyServer
+@@ -491,7 +491,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getName()
      {