1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch

@@ -1,4 +1,4 @@
-From 430c19d7aa0eb0e2dbde634676b665d253669d61 Mon Sep 17 00:00:00 2001
+From 71ae7aea9324a132adf65042528ec5b02fe13c55 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:06:24 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@@ -12,7 +12,7 @@ starting point for future additions in this area.
 
 diff --git a/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
 new file mode 100644
-index 000000000..7e4acfff1
+index 00000000..7e4acfff
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
 @@ -0,0 +1,78 @@
@@ -95,5 +95,5 @@ index 000000000..7e4acfff1
 +    void setMarker(boolean marker);
 +}
 -- 
-2.21.0
+2.25.0.windows.1