diff --git a/Spigot-API-Patches/Display-warning-on-deprecated-recipe-API.patch b/Spigot-API-Patches/Display-warning-on-deprecated-recipe-API.patch
index 4358991d7..33007e652 100644
--- a/Spigot-API-Patches/Display-warning-on-deprecated-recipe-API.patch
+++ b/Spigot-API-Patches/Display-warning-on-deprecated-recipe-API.patch
@@ -10,7 +10,7 @@ on the players login.
 Plugin authors need to define a key to keep it consistent between server restarts.
 
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index 398ac245..fc06c7b6 100644
+index 90d6d50cd..80af6cf52 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 @@ -0,0 +0,0 @@ public class ShapedRecipe implements Recipe, Keyed {
@@ -22,7 +22,7 @@ index 398ac245..fc06c7b6 100644
      }
  
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 0c340c84..7d60a0a9 100644
+index ea359c540..7347e7464 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 @@ -0,0 +0,0 @@ public class ShapelessRecipe implements Recipe, Keyed {
diff --git a/paper b/paper
index 4a50c06ef..9efb026e8 100755
--- a/paper
+++ b/paper
@@ -82,7 +82,7 @@ case "$1" in
         scripts/upstreamMerge.sh "$basedir" "$2"
     )
     ;;
-    "cu" | "commitup" | "commitupstream" | "upcommit" | "upstreamcommit")
+    "cu" | "commitup" | "commitupstream" | "upc" | "upcommit" | "upstreamcommit")
     (
         cd "$basedir"
         shift
diff --git a/work/Bukkit b/work/Bukkit
index 28237f03e..eaf05a2ab 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 28237f03e476ca980c59a5146954649d489fe5bc
+Subproject commit eaf05a2ab257f19498826db6964039d9b1246afd
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 6304ccd95..4c219e2a1 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 6304ccd95fc9498960e99f96b59479dfc08b3c8d
+Subproject commit 4c219e2a1206225cff4b34669c00106b1c312991