From 26e445a02187d739b34d0b27a6f549337d213954 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 12 Feb 2023 20:39:51 +0000
Subject: [PATCH] Updated Upstream (BungeeCord)

Upstream has released updates that appear 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:
1b6d8455 Update lombok and maven shade
19424aba #3430: Add new fallback field to TranslatableComponent
71ac9b34 #3425: Make ip command output clickable to copy ip
7651d4a2 #3423: Remove empty servers from glist by default
f8e0bccd Update README date
a5b6eb6a #3417: Support uppercase &h in Alert command
41471da9 #3405: Fix typo in ProxiedPlayer docs and add docs to ServerDisconnectEvent
---
 BungeeCord                                             |  2 +-
 ...4j2-for-logging-and-TerminalConsoleAppender-f.patch | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/BungeeCord b/BungeeCord
index e717676..1b6d845 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit e71767688d81ebff2b913920a04c5a958b57e4d9
+Subproject commit 1b6d845530c1332ca5ed511c69e2611c3e0d65b0
diff --git a/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch b/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
index c83604b..aac44d0 100644
--- a/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
+++ b/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
@@ -1,4 +1,4 @@
-From 8e937bd458b9571e4b0ea0f21f336194a7ac013c Mon Sep 17 00:00:00 2001
+From 155bccab3c402436976b06c0a4472b1a0c42a348 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 12:46:47 +0200
 Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@@ -6,7 +6,7 @@ Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
 
 
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index cf7ef042..688f1b99 100644
+index bcf23a93..232b90b2 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
 @@ -49,6 +49,9 @@
@@ -31,7 +31,7 @@ index cf7ef042..688f1b99 100644
 +                    <dependency>
 +                        <groupId>com.github.edwgiz</groupId>
 +                        <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
-+                        <version>2.13.2</version>
++                        <version>2.15</version>
 +                    </dependency>
 +                </dependencies>
              </plugin>
@@ -233,7 +233,7 @@ index 00000000..cfd039cd
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index 2ffe12f2..26f32b37 100644
+index 5afd8b9c..130670bb 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -56,11 +56,12 @@
@@ -1617,5 +1617,5 @@ index 21a48df6..00000000
 -
 -}
 -- 
-2.38.1
+2.39.1