Update Upstream
This commit is contained in:
parent
52cd8744e0
commit
f9f71eb14e
321 changed files with 809 additions and 856 deletions
|
@ -6,7 +6,7 @@ Subject: [PATCH] Add ItemStack Recipe API helper methods
|
|||
Allows using ExactChoice Recipes with easier methodss
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
|
||||
index 038ed0a6..2181f09b 100644
|
||||
index d742c405..222a12ba 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
|
||||
@@ -0,0 +0,0 @@ public class ShapedRecipe implements Recipe, Keyed {
|
||||
|
@ -24,7 +24,7 @@ index 038ed0a6..2181f09b 100644
|
|||
* Get a copy of the ingredients map.
|
||||
*
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
|
||||
index 823645c5..062924ea 100644
|
||||
index 84062dd7..ddcf84e6 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
|
||||
@@ -0,0 +0,0 @@ public class ShapelessRecipe implements Recipe, Keyed {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue