[Auto] Updated Upstream (Bukkit)

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:
23c1a2ba Deprecate ItemStack durability methods in favour of ItemMeta Damageable as they are being frequently used incorrectly.

Spigot-API-Patches/0060-ensureServerConversions-API.patch

@@ -1,4 +1,4 @@
-From 7a4550bdfee62eaba02e50fe3434310cb0b82f8c Mon Sep 17 00:00:00 2001
+From 9756eecfa718f223ef7c239d82f8f06ff599f5bd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:55:48 -0400
 Subject: [PATCH] ensureServerConversions API
@@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 762c43d6..045c26d9 100644
+index ec2b8b8e..3012aec2 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -134,4 +134,16 @@ public interface ItemFactory {
@@ -28,10 +28,10 @@ index 762c43d6..045c26d9 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 3c91cbe6..4940e726 100644
+index 2e44d4e2..fa9a06fc 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -495,7 +495,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -504,7 +504,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
              }
          }
  
@@ -45,7 +45,7 @@ index 3c91cbe6..4940e726 100644
      }
  
      /**
-@@ -553,4 +558,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -562,4 +567,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
  
          return true;
      }

Spigot-API-Patches/0061-Add-getI18NDisplayName-API.patch

@@ -1,4 +1,4 @@
-From 75065c61ba95680cd9e1db23b402a094d141b616 Mon Sep 17 00:00:00 2001
+From a7fd9a66c2babbdf94e302b868bbfd98e4fc6761 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:55:48 -0400
 Subject: [PATCH] Add getI18NDisplayName API
@@ -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/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 045c26d9..47bbc0f9 100644
+index 3012aec2..63dd1b32 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -145,5 +145,15 @@ public interface ItemFactory {
@@ -28,10 +28,10 @@ index 045c26d9..47bbc0f9 100644
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 4940e726..e52a39ec 100644
+index fa9a06fc..78029ca6 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -571,5 +571,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -580,5 +580,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
      public ItemStack ensureServerConversions() {
          return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
      }

Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch

@@ -1,4 +1,4 @@
-From 68e948eef9e90c001f168f58660c61ca3bbee305 Mon Sep 17 00:00:00 2001
+From 91f63506cf54c56acf226e072a806b25bede75c9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:59:50 -0400
 Subject: [PATCH] ItemStack#getMaxItemUseDuration
@@ -6,10 +6,10 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index e52a39ec..84a399e0 100644
+index 78029ca6..972b945d 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -582,5 +582,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -591,5 +591,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
      public String getI18NDisplayName() {
          return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
      }

Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch

@@ -1,11 +1,11 @@
-From 356af878d4effe5adb4fbdc3bfc21128a693a7b0 Mon Sep 17 00:00:00 2001
+From 60260cf74059c80402f6caba78347c9e7b297ec2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 22 Jun 2018 22:59:18 -0400
 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 84a399e0..4a27f4fc 100644
+index 972b945d..526ff166 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -2,7 +2,9 @@ package org.bukkit.inventory;
@@ -27,7 +27,7 @@ index 84a399e0..4a27f4fc 100644
  /**
   * Represents a stack of items
   */
-@@ -590,5 +594,133 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -599,5 +603,133 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
          // Requires access to NMS
          return ensureServerConversions().getMaxItemUseDuration();
      }

work/Bukkit

@@ -1 +1 @@
-Subproject commit 07ae1eea99b17f678fa014520229af561c3a09f6
+Subproject commit 23c1a2ba03b96b52f69a93e07706f9ccc33fd683