From 781ce27c50a794463ca2cc9cb1046c9e8121de35 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 14 Jul 2020 12:14:50 +0100
Subject: [PATCH] Updated Upstream (Waterfall)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Waterfall Changes:
7ddd12d Fix compile and move version changes out of the wrong patch
---
 Waterfall                                      | 2 +-
 Waterfall-Proxy-Patches/0001-POM-Changes.patch | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Waterfall b/Waterfall
index 7737b0f..7ddd12d 160000
--- a/Waterfall
+++ b/Waterfall
@@ -1 +1 @@
-Subproject commit 7737b0ff0ab2f3f23b98b5611919152f1dab7012
+Subproject commit 7ddd12de7613e9badc0f7e74ccdc968a21e503c0
diff --git a/Waterfall-Proxy-Patches/0001-POM-Changes.patch b/Waterfall-Proxy-Patches/0001-POM-Changes.patch
index 9cbd7f3..4e191e9 100644
--- a/Waterfall-Proxy-Patches/0001-POM-Changes.patch
+++ b/Waterfall-Proxy-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From e943774222d5e69130f3ef6f1493937d23c4875b Mon Sep 17 00:00:00 2001
+From e9d5abc29200cdc9a9415cf4938e814a9afa0c4f Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Tue, 15 Nov 2016 08:56:43 -0500
 Subject: [PATCH] POM Changes
@@ -217,7 +217,7 @@ index 5cb1bd19..a07c5a62 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/log4j/pom.xml b/log4j/pom.xml
-index 2229d347..9d699af0 100644
+index 5ec771c9..7c04ce59 100644
 --- a/log4j/pom.xml
 +++ b/log4j/pom.xml
 @@ -4,18 +4,18 @@
@@ -226,14 +226,14 @@ index 2229d347..9d699af0 100644
          <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
 +        <artifactId>travertine-parent</artifactId>
-         <version>1.16-R0.2-SNAPSHOT</version>
+         <version>1.16-R0.3-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
      <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-log4j</artifactId>
 +    <artifactId>travertine-log4j</artifactId>
-     <version>1.16-R0.2-SNAPSHOT</version>
+     <version>1.16-R0.3-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Waterfall-Log</name>