Update upstream

This commit is contained in:
Aikar
2018-07-23 18:57:54 -04:00
parent ceedd8c4f1
commit 77c51f1785
16 changed files with 39 additions and 39 deletions

View File

@@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
You must replace the language file embedded in the server jar.
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
index 27a264f549..1cdbdf6d07 100644
index e98e1ed72..1df2b463a 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -0,0 +0,0 @@ public final class CraftItemFactory implements ItemFactory {