diff --git a/Spigot-API-Patches/0153-Material-API-additions.patch b/Spigot-API-Patches/0153-Material-API-additions.patch
index 077025f677..d19f497e71 100644
--- a/Spigot-API-Patches/0153-Material-API-additions.patch
+++ b/Spigot-API-Patches/0153-Material-API-additions.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Material API additions
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 27adc7afae3d32c36762b9355cb5210e187df795..2e959d195f7a5e723952e421aeaeeb463f07d3f5 100644
+index e4d0dc26fb2f2c4435e11b3460d8c93d6a6fc47f..2b53e68e96ea346a6f2b5cadcf9f81b2c231c408 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -86,6 +86,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -87,6 +87,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * An enum of all material IDs accepted by the official server and client
   */
@@ -16,7 +16,7 @@ index 27adc7afae3d32c36762b9355cb5210e187df795..2e959d195f7a5e723952e421aeaeeb46
  public enum Material implements Keyed {
      //<editor-fold desc="Materials" defaultstate="collapsed">
      AIR(9648, 0),
-@@ -3562,6 +3563,22 @@ public enum Material implements Keyed {
+@@ -3563,6 +3564,22 @@ public enum Material implements Keyed {
          }
      }
  
diff --git a/Spigot-API-Patches/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-API-Patches/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
index be8e0ce2a3..5e0b5360cc 100644
--- a/Spigot-API-Patches/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
+++ b/Spigot-API-Patches/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add a way to get translation keys for blocks, entities and
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 2e959d195f7a5e723952e421aeaeeb463f07d3f5..2a3becabbd10fa8ffd19f35a3f6d8a6bfcb388c3 100644
+index 2b53e68e96ea346a6f2b5cadcf9f81b2c231c408..e453e5eb7245aad3ecbb19652ebb34abe030c0a9 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -3577,6 +3577,16 @@ public enum Material implements Keyed {
+@@ -3578,6 +3578,16 @@ public enum Material implements Keyed {
          }
          return false;
      }
diff --git a/Spigot-API-Patches/0276-Cache-the-result-of-Material-isBlock.patch b/Spigot-API-Patches/0276-Cache-the-result-of-Material-isBlock.patch
index 70795d6709..eaa498baea 100644
--- a/Spigot-API-Patches/0276-Cache-the-result-of-Material-isBlock.patch
+++ b/Spigot-API-Patches/0276-Cache-the-result-of-Material-isBlock.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cache the result of Material#isBlock
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 2a3becabbd10fa8ffd19f35a3f6d8a6bfcb388c3..7b77c7132723a01e8c38ddaa616b363be300b653 100644
+index e453e5eb7245aad3ecbb19652ebb34abe030c0a9..112c3f035ec7e7a7cae939264e0af4c6f4450abd 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -3521,6 +3521,7 @@ public enum Material implements Keyed {
+@@ -3522,6 +3522,7 @@ public enum Material implements Keyed {
      public final Class<?> data;
      private final boolean legacy;
      private final NamespacedKey key;
@@ -16,7 +16,7 @@ index 2a3becabbd10fa8ffd19f35a3f6d8a6bfcb388c3..7b77c7132723a01e8c38ddaa616b363b
  
      private Material(final int id) {
          this(id, 64);
-@@ -3718,6 +3719,11 @@ public enum Material implements Keyed {
+@@ -3719,6 +3720,11 @@ public enum Material implements Keyed {
       * @return true if this material is a block
       */
      public boolean isBlock() {
@@ -28,7 +28,7 @@ index 2a3becabbd10fa8ffd19f35a3f6d8a6bfcb388c3..7b77c7132723a01e8c38ddaa616b363b
          switch (this) {
              //<editor-fold defaultstate="collapsed" desc="isBlock">
              case ACACIA_BUTTON:
-@@ -4663,6 +4669,7 @@ public enum Material implements Keyed {
+@@ -4664,6 +4670,7 @@ public enum Material implements Keyed {
      static {
          for (Material material : values()) {
              BY_NAME.put(material.name(), material);
diff --git a/Spigot-API-Patches/0283-Item-Rarity-API.patch b/Spigot-API-Patches/0283-Item-Rarity-API.patch
index e74785e658..dfef8115bf 100644
--- a/Spigot-API-Patches/0283-Item-Rarity-API.patch
+++ b/Spigot-API-Patches/0283-Item-Rarity-API.patch
@@ -39,10 +39,10 @@ index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db202
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 7b77c7132723a01e8c38ddaa616b363be300b653..0a31a5321ac519568db936c94394f71b2e2fcec1 100644
+index 112c3f035ec7e7a7cae939264e0af4c6f4450abd..9b1c9e60dba9ea3ef8d8e164f13dd76daf57db8e 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -3588,6 +3588,17 @@ public enum Material implements Keyed {
+@@ -3589,6 +3589,17 @@ public enum Material implements Keyed {
      public String getTranslationKey() {
          return Bukkit.getUnsafe().getTranslationKey(this);
      }
diff --git a/work/Bukkit b/work/Bukkit
index b302317a95..9477fa26f2 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit b302317a9590f13ee937fa58941048c8b72fd9f8
+Subproject commit 9477fa26f2d29dba3250b1486cd2b353d697b011
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 6b8cd9a7cb..35124087d2 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 6b8cd9a7cb8f2ed94743d1ed4d4217c9a4138898
+Subproject commit 35124087d2993a66a899a209e01fe467bbeebaa1