1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch

@@ -1,4 +1,4 @@
-From 7623f58212aed74956a8d56b287b1e43c7ed3bb7 Mon Sep 17 00:00:00 2001
+From 48d7033d5636f973e7c0866bf74610ac7aa22fd4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 13 Sep 2018 21:39:26 -0400
 Subject: [PATCH] Add ItemStackRecipeChoice Draft API
@@ -9,7 +9,7 @@ Allows creating recipes that must match isSimilar to full item stack.
 
 diff --git a/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
 new file mode 100644
-index 000000000..43e6576b1
+index 00000000..43e6576b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
 @@ -0,0 +1,51 @@
@@ -65,5 +65,5 @@ index 000000000..43e6576b1
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1