13
0
geforkt von Mirrors/Paper

[Auto] Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
f7662d5c SPIGOT-4283: Allow setting recipe groups

CraftBukkit Changes:
bfb91314 SPIGOT-4283: Allow setting recipe groups
Dieser Commit ist enthalten in:
Automated 2018-08-17 06:49:39 -04:00
Ursprung 26b15531e0
Commit 5caf597397
3 geänderte Dateien mit 4 neuen und 4 gelöschten Zeilen

Datei anzeigen

@ -10,7 +10,7 @@ on the players login.
Plugin authors need to define a key to keep it consistent between server restarts.
diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
index d9af7155..d7fa6d28 100644
index 398ac245..fc06c7b6 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 {
@ -22,7 +22,7 @@ index d9af7155..d7fa6d28 100644
}
diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
index ca5c09b8..f2dd46f2 100644
index 0c340c84..7d60a0a9 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 {

@ -1 +1 @@
Subproject commit 5d659aa0e44dfb8ec758f910f0a4d0d1dcddd614
Subproject commit f7662d5c9249b90936349d3da43bb0bab089e59e

@ -1 +1 @@
Subproject commit 06112946da2e82ed8cbdd5f210f2a3373800181e
Subproject commit bfb9131494176498e2444f7ac69bdc924192ee2e