From 10043529907a4ba913ebe2712876e4b1911263b8 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 19 May 2017 21:00:13 +1000
Subject: Update to Minecraft 1.12-pre5

---
 nms-patches/ShapelessRecipes.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'nms-patches/ShapelessRecipes.patch')

diff --git a/nms-patches/ShapelessRecipes.patch b/nms-patches/ShapelessRecipes.patch
index cbe208aa..914c0af9 100644
--- a/nms-patches/ShapelessRecipes.patch
+++ b/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;
      }
  
-- 
cgit v1.2.3