1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-Server-Patches/0105-Add-server-name-parameter.patch

@@ -1,14 +1,14 @@
-From 8a1aad77aff1c228dc3c0b3b00ce5f0f6ffde89d Mon Sep 17 00:00:00 2001
+From 5c109a39c1e11c268d1c4e8f683a25e3b6709e3c Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Sat, 28 May 2016 16:54:03 +0200
 Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 2481c1860..4a4e56e76 100644
+index ea7d9f1d0..40e7c895c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -136,6 +136,14 @@ public class Main {
+@@ -137,6 +137,14 @@ public class Main {
                          .defaultsTo(new File("paper.yml"))
                          .describedAs("Yml file");
                  // Paper end
@@ -24,5 +24,5 @@ index 2481c1860..4a4e56e76 100644
          };
  
 -- 
-2.17.1
+2.25.0.windows.1