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

@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack API additions for quantity/flags/lore
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index a240311e..c5befd8c 100644
index 4385ca79..7eb00104 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -0,0 +0,0 @@ package org.bukkit.inventory;