[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:
1cb03826 SPIGOT-5900: Re-order Material enum entries to match Minecraft's order
fdd705db #507: Add hasDiscoveredRecipe() and getDiscoveredRecipes()

CraftBukkit Changes:
551e770f5 SPIGOT-5900: Add test for the order of Material enum entries
8297676c2 #682: Add hasDiscoveredRecipe() and getDiscoveredRecipes()

Spigot-API-Patches/0153-Material-API-additions.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Material API additions
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index c7316bd2ef89e63ced9f8d37f0936f1551c1157d..769c65e7928be5e0a15e592c874fc68cc6d30148 100644
+index cedb719856573a9284443626d8823201125c895d..3a8438fb674006a5cbfd977a1cd016117691f0ee 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -85,6 +85,7 @@ import org.jetbrains.annotations.Nullable;
@@ -15,7 +15,7 @@ index c7316bd2ef89e63ced9f8d37f0936f1551c1157d..769c65e7928be5e0a15e592c874fc68c
 +@SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper
  public enum Material implements Keyed {
      //<editor-fold desc="Materials" defaultstate="collapsed">
-     ACACIA_BOAT(27326, 1),
+     AIR(9648, 0),
 @@ -3563,6 +3564,22 @@ public enum Material implements Keyed {
          }
      }