Update to Minecraft 1.12-pre5

By: md_5 <git@md-5.net>
2017-05-19 21:00:13 +10:00
parent 5284eb89a3
commit 530fe41851
47 changed files with 222 additions and 283 deletions
--- a/paper-server/nms-patches/ShapelessRecipes.patch
+++ b/paper-server/nms-patches/ShapelessRecipes.patch
@@ -1,7 +1,7 @@
 --- a/net/minecraft/server/ShapelessRecipes.java
 +++ b/net/minecraft/server/ShapelessRecipes.java
-@@ -5,6 +5,10 @@
- import com.google.gson.JsonObject;
+@@ -6,6 +6,10 @@
+ import com.google.gson.JsonParseException;
 import java.util.ArrayList;
 import java.util.Iterator;
 +// CraftBukkit start
@@ -11,7 +11,7 @@
 
 public class ShapelessRecipes extends IRecipe {
 
-@@ -17,6 +21,21 @@
+@@ -18,6 +22,21 @@
         this.ingredients = nonnulllist;
     }