1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-Server-Patches/Handle-plugin-prefixes-using-Log4J-configuration.patch

@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/pom.xml b/pom.xml
-index e6395c7734..026dcfdab5 100644
+index 663eacfe2..7132e2021 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -28,7 +28,7 @@ index e6395c7734..026dcfdab5 100644
          <dependency>
              <groupId>org.apache.logging.log4j</groupId>
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index fdca34346a..6d77bbc5aa 100644
+index fdca34346..6d77bbc5a 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -0,0 +0,0 @@ public class SpigotConfig
@@ -41,12 +41,12 @@ index fdca34346a..6d77bbc5aa 100644
  
      public static int playerShuffle;
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 08b6bb7f97..9f8334376f 100644
+index 5a049e1b5..4b3c0269e 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -0,0 +0,0 @@
- <Configuration status="WARN">
-     <Appenders>
+             <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
+         </Queue>
          <TerminalConsole name="TerminalConsole">
 -            <PatternLayout pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}" />
 +            <PatternLayout>