[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:
28237f03 SPIGOT-4330: Improve isSimilar for legacy stacks

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

@@ -1,4 +1,4 @@
-From 9756eecfa718f223ef7c239d82f8f06ff599f5bd Mon Sep 17 00:00:00 2001
+From 2d6c06d66fa0bb54e1e769dc71adbb750c64225d 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 ec2b8b8e..3012aec2 100644
+index ec2b8b8ed..3012aec22 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 ec2b8b8e..3012aec2 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 2e44d4e2..fa9a06fc 100644
+index c744799f6..5e8de1152 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -504,7 +504,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -506,7 +506,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
              }
          }
  
@@ -45,7 +45,7 @@ index 2e44d4e2..fa9a06fc 100644
      }
  
      /**
-@@ -562,4 +567,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -564,4 +569,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
  
          return true;
      }

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

@@ -1,4 +1,4 @@
-From a7fd9a66c2babbdf94e302b868bbfd98e4fc6761 Mon Sep 17 00:00:00 2001
+From 51c81236c3fdc09dcf56197c10e8b63ec2f3dd2f 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 3012aec2..63dd1b32 100644
+index 3012aec22..63dd1b32d 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 3012aec2..63dd1b32 100644
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index fa9a06fc..78029ca6 100644
+index 5e8de1152..c3cb1247f 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -580,5 +580,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -582,5 +582,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 91f63506cf54c56acf226e072a806b25bede75c9 Mon Sep 17 00:00:00 2001
+From e45b4d932c1cf570cf43366467210ead1d75ef6c 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 78029ca6..972b945d 100644
+index c3cb1247f..26ab1278b 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -591,5 +591,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -593,5 +593,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
      public String getI18NDisplayName() {
          return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
      }

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

@@ -1,11 +1,11 @@
-From 7f8a8f71328288fcd226a13f93e8f97b7f5f5a59 Mon Sep 17 00:00:00 2001
+From c8ba7f7135c253c45cff6953dfb2c718a48b3f31 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 972b945d3..526ff1666 100644
+index 26ab1278b..fb47fc291 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 972b945d3..526ff1666 100644
  /**
   * Represents a stack of items
   */
-@@ -599,5 +603,133 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -601,5 +605,133 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
          // Requires access to NMS
          return ensureServerConversions().getMaxItemUseDuration();
      }

work/Bukkit

@@ -1 +1 @@
-Subproject commit 3d50da5752316cd9a6de6869d707ef5c247d82c3
+Subproject commit 28237f03e476ca980c59a5146954649d489fe5bc