Updated Upstream (BungeeCord)

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

BungeeCord Changes:
633ff1cf #3107: Fix action bar messages in 1.17
6cda6b6c Update SnakeYAML and Netty
This commit is contained in:
Shane Freeder 2021-06-09 10:02:18 +01:00
parent 91217e02c2
commit c74fe8a9b2
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 6 additions and 6 deletions

@ -1 +1 @@
Subproject commit 90573625f13b91aebd077136dade67637573a0e7
Subproject commit 633ff1cfc810c23f2aa368e4a588df3beb9d79c1

View File

@ -1,15 +1,15 @@
From ff1079e29631c994b5d65be0c1e3baf0b783bcfb Mon Sep 17 00:00:00 2001
From d948241c419815bafdb3e50408d0a1131da61b3e Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 13:15:09 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging
diff --git a/api/pom.xml b/api/pom.xml
index 385a5cc2..7f6da3e8 100644
index 9868a6ab..87c17046 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -76,5 +76,11 @@
<version>1.28</version>
<version>1.29</version>
<scope>compile</scope>
</dependency>
+ <!-- Waterfall - Add SLF4J -->
@ -39,7 +39,7 @@ index 9660234d..3d1e9a3a 100644
* Called when the plugin has just been loaded. Most of the proxy will not
* be initialized, so only use it for registering
diff --git a/log4j/pom.xml b/log4j/pom.xml
index 84039f14..51187fd1 100644
index d5ad0f87..7ec6e530 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -38,6 +38,12 @@
@ -56,5 +56,5 @@ index 84039f14..51187fd1 100644
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
--
2.31.1
2.32.0