diff --git a/Spigot-API-Patches/0152-Material-API-additions.patch b/Spigot-API-Patches/0152-Material-API-additions.patch
index eaa11edcc9..077025f677 100644
--- a/Spigot-API-Patches/0152-Material-API-additions.patch
+++ b/Spigot-API-Patches/0152-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 f66cd342c2ec3e5d4f4ae5e68dda797c793c76a7..e203c5bfc1d1bf6b500ef8a4446d3aef182b8ecb 100644
+index 27adc7afae3d32c36762b9355cb5210e187df795..2e959d195f7a5e723952e421aeaeeb463f07d3f5 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;
@@ -16,7 +16,7 @@ index f66cd342c2ec3e5d4f4ae5e68dda797c793c76a7..e203c5bfc1d1bf6b500ef8a4446d3aef
  public enum Material implements Keyed {
      //<editor-fold desc="Materials" defaultstate="collapsed">
      AIR(9648, 0),
-@@ -3565,6 +3566,22 @@ public enum Material implements Keyed {
+@@ -3562,6 +3563,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 6adb9e7578..2d8ba0fdc0 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 e203c5bfc1d1bf6b500ef8a4446d3aef182b8ecb..4ba991b79f13219182df35b4ce0c5cf57cbd208b 100644
+index 2e959d195f7a5e723952e421aeaeeb463f07d3f5..2a3becabbd10fa8ffd19f35a3f6d8a6bfcb388c3 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -3580,6 +3580,16 @@ public enum Material implements Keyed {
+@@ -3577,6 +3577,16 @@ public enum Material implements Keyed {
          }
          return false;
      }
diff --git a/work/Bukkit b/work/Bukkit
index 1b5ad2af5d..315b69c1d1 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 1b5ad2af5decf1d2cd276ae391d75a8ab1167b15
+Subproject commit 315b69c1d189f057263c5ac54c058352f706a8b9
diff --git a/work/CraftBukkit b/work/CraftBukkit
index b9b0c4e4a4..a82b212973 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit b9b0c4e4a4127599e664e4aa85b2399c8124d0df
+Subproject commit a82b21297372bff77085d76f1fda58e8b0e2e1ab
diff --git a/work/Spigot b/work/Spigot
index 138d451b0c..cd23533a5b 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 138d451b0c61bdc079b46e398ba4dfdc4bd6a233
+Subproject commit cd23533a5b0ce59fcd0dd509be994b94d7c5f55e