Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-01-14 19:51:36 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Shane Freeder 2018-06-21 03:45:08 +01:00
parent 80367c1e14
commit 56e5b6b920
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit 00a145e10f5355d28a65cabcd1a45e0bf17f0cfb
Subproject commit 8ad3bf6da251ddea660bd9b6126cd01fbf456a4d

6
Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch
View File

@ -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()
{