Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-27 11:07:39 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (Waterfall)

Browse Source 
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
This commit is contained in:
Shane Freeder 2020-07-14 12:14:50 +01:00
parent 6d5156647f
commit 781ce27c50
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit 7737b0ff0ab2f3f23b98b5611919152f1dab7012 Subproject commit 7ddd12de7613e9badc0f7e74ccdc968a21e503c0

8
Waterfall-Proxy-Patches/0001-POM-Changes.patch
View File

@ -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> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 08:56:43 -0500 Date: Tue, 15 Nov 2016 08:56:43 -0500
Subject: [PATCH] POM Changes Subject: [PATCH] POM Changes
@ -217,7 +217,7 @@ index 5cb1bd19..a07c5a62 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/log4j/pom.xml b/log4j/pom.xml diff --git a/log4j/pom.xml b/log4j/pom.xml
index 2229d347..9d699af0 100644 index 5ec771c9..7c04ce59 100644
--- a/log4j/pom.xml --- a/log4j/pom.xml
+++ b/log4j/pom.xml +++ b/log4j/pom.xml
@@ -4,18 +4,18 @@ @@ -4,18 +4,18 @@
@ -226,14 +226,14 @@ index 2229d347..9d699af0 100644
<groupId>io.github.waterfallmc</groupId> <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId> - <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId> + <artifactId>travertine-parent</artifactId>
<version>1.16-R0.2-SNAPSHOT</version> <version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<groupId>io.github.waterfallmc</groupId> <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-log4j</artifactId> - <artifactId>waterfall-log4j</artifactId>
+ <artifactId>travertine-log4j</artifactId> + <artifactId>travertine-log4j</artifactId>
<version>1.16-R0.2-SNAPSHOT</version> <version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
- <name>Waterfall-Log</name> - <name>Waterfall-Log</name>