Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appear 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:
e25c6a75 PR-638: Add CreativeCategory API for Materials

CraftBukkit Changes:
86292d3e0 PR-876: Add CreativeCategory API for Materials

patches/api/Timings-v2.patch

@@ -2837,9 +2837,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      Material fromLegacy(Material material);
 @@ -0,0 +0,0 @@ public interface UnsafeValues {
-     boolean removeAdvancement(NamespacedKey key);
- 
      Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(Material material, EquipmentSlot slot);
+ 
+     CreativeCategory getCreativeCategory(Material material);
 +
 +    // Paper start
 +    /**

patches/server/Timings-v2.patch

@@ -2118,7 +2118,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public static byte toLegacyData(BlockState data) {
          return CraftLegacy.toLegacyData(data);
 @@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
-         return defaultAttributes.build();
+         return CraftCreativeCategory.fromNMS(category);
      }
  
 +    // Paper start

work/Bukkit

@@ -1 +1 @@
-Subproject commit d8a3c3b55674a931391e2905cad4d54acfd15d11
+Subproject commit e25c6a75523b5122f539a5a59dcf0275c3213a5a

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 6e755020abbd73dabf2593060b7641fda9b80e71
+Subproject commit 86292d3e084729f53ce77af17b7b20d91754b7a5