mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-06-26 14:35:05 +02:00
Merge upstream
This commit is contained in:
Jamie Mansfield
parent
4f0d50aac3
commit
7385da83cf
|
|
@ -1 +1 @@
|
|||
Subproject commit 79cd077a60be961b1bcd790737f0c6e142e7bf2d
|
||||
Subproject commit fde2c3fadfc00474e6ab54870d6f18b6e70feb81
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 812e7b51055a2ac4ad35c9b12a2759a84fd1dd9b Mon Sep 17 00:00:00 2001
|
||||
From 3a437a7b1b6a3a96ba2245e091e3689041e94f3e Mon Sep 17 00:00:00 2001
|
||||
From: Tux <write@imaginarycode.com>
|
||||
Date: Thu, 19 May 2016 10:33:31 -0700
|
||||
Subject: [PATCH] POM Changes
|
||||
|
|
@ -494,7 +494,7 @@ index 082f0908..8b045e3b 100644
|
|||
<dependencies>
|
||||
<dependency>
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index b8fb238a..b0cca9fc 100644
|
||||
index 96b36d5f..7cf3b7ff 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -3,18 +3,25 @@
|
||||
|
|
@ -589,7 +589,7 @@ index b8fb238a..b0cca9fc 100644
|
|||
|
||||
<properties>
|
||||
<build.number>unknown</build.number>
|
||||
<netty.version>4.1.23.Final</netty.version>
|
||||
<netty.version>4.1.24.Final</netty.version>
|
||||
- <maven.compiler.source>1.7</maven.compiler.source>
|
||||
- <maven.compiler.target>1.7</maven.compiler.target>
|
||||
+ <!-- Require Java 8 -->
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From a66db9be317a66333b470b91eeaeac13b4d7264c Mon Sep 17 00:00:00 2001
|
||||
From 71635ee654f9c93b3540ad974b2a82b6309e8b15 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.14.3
|
||||
2.16.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 7360d776711bb8c685651162e926f9113c63a979 Mon Sep 17 00:00:00 2001
|
||||
From e8b04bb099af854160b469e372d2553f63c2c7b6 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 1c65e002..59216860 100644
|
|||
|
||||
@Override
|
||||
--
|
||||
2.16.3
|
||||
2.16.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 3a79961d7efefc19ce12e3f3e5a2f3be4d8eb1be Mon Sep 17 00:00:00 2001
|
||||
From 8a8bc18e03611469f038d8a3cb57498dc539d045 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.16.3
|
||||
2.16.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 461ed3f4fb2478874649d3dab83e94632048d373 Mon Sep 17 00:00:00 2001
|
||||
From 3b892ade0eac384ac47607c81c8f2e8ccb3d95bd 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
|
||||
|
|
@ -53,5 +53,5 @@ index 0837c672..38147e2a 100644
|
|||
+ }
|
||||
}
|
||||
--
|
||||
2.16.3
|
||||
2.16.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From cb100cb895b975df9aac238f2739022e4de43079 Mon Sep 17 00:00:00 2001
|
||||
From 42cac75a8cf299e9afb7b8eed942b9a69e1c01fa 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From c581406478bbbb2461aa5fcad41c1bf6b0bc30a0 Mon Sep 17 00:00:00 2001
|
||||
From 8ff1ce2f0f3ee89d143142058ab1019b4a3ddcd4 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 4a55c0e2..d131c02c 100644
|
|||
}
|
||||
}
|
||||
--
|
||||
2.14.1
|
||||
2.16.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 9f940798b57cbaf8f80559892380a85fc27a1395 Mon Sep 17 00:00:00 2001
|
||||
From b894a7436429ca4e1bdcc5d39c0d34bf16b82383 Mon Sep 17 00:00:00 2001
|
||||
From: Harry <me@harry5573.uk>
|
||||
Date: Wed, 24 Feb 2016 17:16:23 +0000
|
||||
Subject: [PATCH] Enable TCP_NODELAY.
|
||||
|
|
@ -18,5 +18,5 @@ index be9685b9..b0bbc1d7 100644
|
|||
ch.config().setWriteBufferWaterMark( MARK );
|
||||
|
||||
--
|
||||
2.14.1
|
||||
2.16.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From a4545c85d6b55640f54d6a1ba6f511bb1cae477b Mon Sep 17 00:00:00 2001
|
||||
From 3a4e54f376d30d7f9cd187e5da62ee80d9dfb5dc Mon Sep 17 00:00:00 2001
|
||||
From: Tux <write@imaginarycode.com>
|
||||
Date: Thu, 19 May 2016 18:05:33 -0600
|
||||
Subject: [PATCH] Micro-optimizations
|
||||
|
|
@ -79,5 +79,5 @@ index 9ea61319..565e6b0e 100644
|
|||
String subChannel = in.readUTF();
|
||||
|
||||
--
|
||||
2.16.3
|
||||
2.16.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From bb9e8a7d07d20a1c3d9fa653d6852e475dbee85e Mon Sep 17 00:00:00 2001
|
||||
From 62da2c1697d08e1e68415ac453a0391c0a58e6f8 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 847a3eca..27ee21f2 100644
|
|||
{
|
||||
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
|
||||
--
|
||||
2.16.3
|
||||
2.16.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
From dbd8dc11b91da5743cca7945485b3e76cacdeb55 Mon Sep 17 00:00:00 2001
|
||||
From 2c34f23a707a2209a1c67f64bfab950448acc9a0 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
|
||||
|
||||
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
|
||||
index 1dd0aeba..bc56d4f3 100644
|
||||
index 89c8f48f..9756c09c 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
|
||||
@@ -101,19 +101,22 @@ public class BungeeServerInfo implements ServerInfo
|
||||
|
|
@ -43,5 +43,5 @@ index 1dd0aeba..bc56d4f3 100644
|
|||
|
||||
@Override
|
||||
--
|
||||
2.14.1
|
||||
2.16.1
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user