diff --git a/gradle.properties b/gradle.properties
index cd7588e4..7987a03c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,5 +4,5 @@ version=1.20.1-R0.1-SNAPSHOT
 mcVersion=1.20.1
 packageVersion=1_20_R1
 org.gradle.jvmargs=-Xmx2G
-paperRef=e2b197132d00833a82cbbb57930842a6b896d626
+paperRef=517f8fbbac2467fb24fa87d6bd56ce5c1b9bc972
 preVersion=false
diff --git a/patches/server/0048-Stackable-ShulkerBoxes.patch b/patches/server/0048-Stackable-ShulkerBoxes.patch
index 92d9831c..8a5c3855 100644
--- a/patches/server/0048-Stackable-ShulkerBoxes.patch
+++ b/patches/server/0048-Stackable-ShulkerBoxes.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Stackable ShulkerBoxes
 This patch is Powered by fabric-carpet(https://github.com/gnembon/fabric-carpet) and plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index b3d809c48b041af03471942213070cc3e0b19f2f..0e40f8fc0357ae936c8b37942d1df9cb21075a98 100644
+index d39f31e7cf315c7cdc1daab28164380e44dd8341..8289293abeec8bed84c2072bc2c501c51ef5b719 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -14,10 +14,12 @@ import net.minecraft.world.entity.Entity;
@@ -44,7 +44,7 @@ index b3d809c48b041af03471942213070cc3e0b19f2f..0e40f8fc0357ae936c8b37942d1df9cb
      }
  
      public ItemEntity(Level world, double x, double y, double z, ItemStack stack, double velocityX, double velocityY, double velocityZ) {
-@@ -287,10 +297,49 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -289,10 +299,49 @@ public class ItemEntity extends Entity implements TraceableEntity {
      private boolean isMergable() {
          ItemStack itemstack = this.getItem();
  
diff --git a/patches/server/0084-SIMD-support.patch b/patches/server/0083-SIMD-support.patch
similarity index 100%
rename from patches/server/0084-SIMD-support.patch
rename to patches/server/0083-SIMD-support.patch
diff --git a/patches/server/0083-Use-fast-item-merge-raytracing.patch b/patches/server/0083-Use-fast-item-merge-raytracing.patch
deleted file mode 100644
index 935b55db..00000000
--- a/patches/server/0083-Use-fast-item-merge-raytracing.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: violetc <58360096+s-yh-china@users.noreply.github.com>
-Date: Mon, 17 Jul 2023 22:27:12 +0800
-Subject: [PATCH] Use fast item merge raytracing
-
-This patch is Powered by Gale(https://github.com/GaleMC/Gale)
-
-diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index ef6c0e51f2f971f30fce36b5502daa5b5bbf1b26..b2574d8ad26a0b3ef991a557d5865d38dd7a77fc 100644
---- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -285,9 +285,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
- 
-                 if (entityitem.isMergable()) {
-                     // Paper start - Fix items merging through walls
--                    if (this.level().clipDirect(this.position(), entityitem.position(),
--                        net.minecraft.world.phys.shapes.CollisionContext.of(this)) == net.minecraft.world.phys.HitResult.Type.BLOCK) {
--                        continue;
-+                    if (this.level().paperConfig().fixes.fixItemsMergingThroughWalls) { // Leaves - just fix config
-+                        if (this.level().clipDirect(this.position(), entityitem.position(),
-+                            net.minecraft.world.phys.shapes.CollisionContext.of(this)) == net.minecraft.world.phys.HitResult.Type.BLOCK) {
-+                            continue;
-+                        }
-                     }
-                     // Paper end - Fix items merging through walls
-                     this.tryToMerge(entityitem);
diff --git a/patches/server/0085-Dont-respond-ping-before-start-fully.patch b/patches/server/0084-Dont-respond-ping-before-start-fully.patch
similarity index 100%
rename from patches/server/0085-Dont-respond-ping-before-start-fully.patch
rename to patches/server/0084-Dont-respond-ping-before-start-fully.patch
diff --git a/patches/server/0086-Faster-chunk-serialization.patch b/patches/server/0085-Faster-chunk-serialization.patch
similarity index 100%
rename from patches/server/0086-Faster-chunk-serialization.patch
rename to patches/server/0085-Faster-chunk-serialization.patch
diff --git a/patches/server/0087-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0086-Optimize-world-generation-chunk-and-block-access.patch
similarity index 100%
rename from patches/server/0087-Optimize-world-generation-chunk-and-block-access.patch
rename to patches/server/0086-Optimize-world-generation-chunk-and-block-access.patch
diff --git a/patches/server/0088-Cache-world-generator-sea-level.patch b/patches/server/0087-Cache-world-generator-sea-level.patch
similarity index 100%
rename from patches/server/0088-Cache-world-generator-sea-level.patch
rename to patches/server/0087-Cache-world-generator-sea-level.patch
diff --git a/patches/server/0089-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0088-Skip-secondary-POI-sensor-if-absent.patch
similarity index 100%
rename from patches/server/0089-Skip-secondary-POI-sensor-if-absent.patch
rename to patches/server/0088-Skip-secondary-POI-sensor-if-absent.patch
diff --git a/patches/server/0090-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0089-Cache-CubeVoxelShape-shape-array.patch
similarity index 100%
rename from patches/server/0090-Cache-CubeVoxelShape-shape-array.patch
rename to patches/server/0089-Cache-CubeVoxelShape-shape-array.patch
diff --git a/patches/server/0091-Store-mob-counts-in-an-array.patch b/patches/server/0090-Store-mob-counts-in-an-array.patch
similarity index 100%
rename from patches/server/0091-Store-mob-counts-in-an-array.patch
rename to patches/server/0090-Store-mob-counts-in-an-array.patch
diff --git a/patches/server/0092-Cache-BlockStatePairKey-hash.patch b/patches/server/0091-Cache-BlockStatePairKey-hash.patch
similarity index 100%
rename from patches/server/0092-Cache-BlockStatePairKey-hash.patch
rename to patches/server/0091-Cache-BlockStatePairKey-hash.patch
diff --git a/patches/server/0093-Optimize-noise-generation.patch b/patches/server/0092-Optimize-noise-generation.patch
similarity index 100%
rename from patches/server/0093-Optimize-noise-generation.patch
rename to patches/server/0092-Optimize-noise-generation.patch
diff --git a/patches/server/0094-Disable-packet-limit.patch b/patches/server/0093-Disable-packet-limit.patch
similarity index 100%
rename from patches/server/0094-Disable-packet-limit.patch
rename to patches/server/0093-Disable-packet-limit.patch
diff --git a/patches/server/0095-Reduce-array-allocations.patch b/patches/server/0094-Reduce-array-allocations.patch
similarity index 99%
rename from patches/server/0095-Reduce-array-allocations.patch
rename to patches/server/0094-Reduce-array-allocations.patch
index 4d9e67d4..4b743b7c 100644
--- a/patches/server/0095-Reduce-array-allocations.patch
+++ b/patches/server/0094-Reduce-array-allocations.patch
@@ -416,7 +416,7 @@ index 97ff19efa0b3943ccb7a6e02cba6ed2fea61adac..b8995b0af34a1d790f48aa8e1090d204
      private EquipmentSlot(EquipmentSlot.Type type, int entityId, int armorStandId, String name) {
          this.type = type;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f560f0b91818d8c41c6842a241699fe5f3163818..8feb08d1debe98234e084be05f7bff5496cdc6e1 100644
+index d56f683a5d043f3be624a94d889acc1df0e95554..7e3265028cce8cafd7da9d1aaa41856f5f2d455d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3105,7 +3105,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0096-Optimize-sun-burn-tick.patch b/patches/server/0095-Optimize-sun-burn-tick.patch
similarity index 100%
rename from patches/server/0096-Optimize-sun-burn-tick.patch
rename to patches/server/0095-Optimize-sun-burn-tick.patch
diff --git a/patches/server/0097-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0096-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
similarity index 100%
rename from patches/server/0097-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
rename to patches/server/0096-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
diff --git a/patches/server/0098-Use-optimized-collection.patch b/patches/server/0097-Use-optimized-collection.patch
similarity index 100%
rename from patches/server/0098-Use-optimized-collection.patch
rename to patches/server/0097-Use-optimized-collection.patch
diff --git a/patches/server/0099-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0098-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
similarity index 100%
rename from patches/server/0099-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
rename to patches/server/0098-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
diff --git a/patches/server/0100-Optimized-CubePointRange.patch b/patches/server/0099-Optimized-CubePointRange.patch
similarity index 100%
rename from patches/server/0100-Optimized-CubePointRange.patch
rename to patches/server/0099-Optimized-CubePointRange.patch
diff --git a/patches/server/0101-Check-frozen-ticks-before-landing-block.patch b/patches/server/0100-Check-frozen-ticks-before-landing-block.patch
similarity index 93%
rename from patches/server/0101-Check-frozen-ticks-before-landing-block.patch
rename to patches/server/0100-Check-frozen-ticks-before-landing-block.patch
index 75cfbe93..29967ec0 100644
--- a/patches/server/0101-Check-frozen-ticks-before-landing-block.patch
+++ b/patches/server/0100-Check-frozen-ticks-before-landing-block.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Check frozen ticks before landing block
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8feb08d1debe98234e084be05f7bff5496cdc6e1..106e515a56937504dac7343defa7c9d1b39ac10a 100644
+index 7e3265028cce8cafd7da9d1aaa41856f5f2d455d..6d34badf1078126451f92ad3ce04494b1e30169c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -583,11 +583,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0102-Cache-ominous-banner-item.patch b/patches/server/0101-Cache-ominous-banner-item.patch
similarity index 100%
rename from patches/server/0102-Cache-ominous-banner-item.patch
rename to patches/server/0101-Cache-ominous-banner-item.patch
diff --git a/patches/server/0103-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0102-Skip-entity-move-if-movement-is-zero.patch
similarity index 100%
rename from patches/server/0103-Skip-entity-move-if-movement-is-zero.patch
rename to patches/server/0102-Skip-entity-move-if-movement-is-zero.patch
diff --git a/patches/server/0104-Skip-cloning-advancement-criteria.patch b/patches/server/0103-Skip-cloning-advancement-criteria.patch
similarity index 100%
rename from patches/server/0104-Skip-cloning-advancement-criteria.patch
rename to patches/server/0103-Skip-cloning-advancement-criteria.patch
diff --git a/patches/server/0105-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0104-Skip-unnecessary-mob-spawning-computations.patch
similarity index 100%
rename from patches/server/0105-Skip-unnecessary-mob-spawning-computations.patch
rename to patches/server/0104-Skip-unnecessary-mob-spawning-computations.patch
diff --git a/patches/server/0106-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0105-Skip-negligible-planar-movement-multiplication.patch
similarity index 100%
rename from patches/server/0106-Skip-negligible-planar-movement-multiplication.patch
rename to patches/server/0105-Skip-negligible-planar-movement-multiplication.patch
diff --git a/patches/server/0107-Fix-villagers-dont-release-memory.patch b/patches/server/0106-Fix-villagers-dont-release-memory.patch
similarity index 100%
rename from patches/server/0107-Fix-villagers-dont-release-memory.patch
rename to patches/server/0106-Fix-villagers-dont-release-memory.patch
diff --git a/patches/server/0108-Avoid-anvil-too-expensive.patch b/patches/server/0107-Avoid-anvil-too-expensive.patch
similarity index 100%
rename from patches/server/0108-Avoid-anvil-too-expensive.patch
rename to patches/server/0107-Avoid-anvil-too-expensive.patch
diff --git a/patches/server/0109-Bow-infinity-fix.patch b/patches/server/0108-Bow-infinity-fix.patch
similarity index 100%
rename from patches/server/0109-Bow-infinity-fix.patch
rename to patches/server/0108-Bow-infinity-fix.patch
diff --git a/patches/server/0110-Zero-tick-plants.patch b/patches/server/0109-Zero-tick-plants.patch
similarity index 100%
rename from patches/server/0110-Zero-tick-plants.patch
rename to patches/server/0109-Zero-tick-plants.patch
diff --git a/patches/server/0111-Leaves-update-command.patch b/patches/server/0110-Leaves-update-command.patch
similarity index 100%
rename from patches/server/0111-Leaves-update-command.patch
rename to patches/server/0110-Leaves-update-command.patch
diff --git a/patches/server/0112-Force-peaceful-mode-switch.patch b/patches/server/0111-Force-peaceful-mode-switch.patch
similarity index 100%
rename from patches/server/0112-Force-peaceful-mode-switch.patch
rename to patches/server/0111-Force-peaceful-mode-switch.patch
diff --git a/patches/server/0113-Add-Leaves-Auto-Update.patch b/patches/server/0112-Add-Leaves-Auto-Update.patch
similarity index 100%
rename from patches/server/0113-Add-Leaves-Auto-Update.patch
rename to patches/server/0112-Add-Leaves-Auto-Update.patch
diff --git a/patches/server/0114-Replay-Mod-API.patch b/patches/server/0113-Replay-Mod-API.patch
similarity index 100%
rename from patches/server/0114-Replay-Mod-API.patch
rename to patches/server/0113-Replay-Mod-API.patch
diff --git a/patches/server/0115-Leaves-tick-command.patch b/patches/server/0114-Leaves-tick-command.patch
similarity index 100%
rename from patches/server/0115-Leaves-tick-command.patch
rename to patches/server/0114-Leaves-tick-command.patch
diff --git a/patches/server/0116-Fix-vehicle-teleport-by-end-gateway.patch b/patches/server/0115-Fix-vehicle-teleport-by-end-gateway.patch
similarity index 100%
rename from patches/server/0116-Fix-vehicle-teleport-by-end-gateway.patch
rename to patches/server/0115-Fix-vehicle-teleport-by-end-gateway.patch
diff --git a/patches/server/0117-Leaves-I18n.patch b/patches/server/0116-Leaves-I18n.patch
similarity index 100%
rename from patches/server/0117-Leaves-I18n.patch
rename to patches/server/0116-Leaves-I18n.patch
diff --git a/patches/server/0118-Fix-minecraft-hopper-not-work-without-player.patch b/patches/server/0117-Fix-minecraft-hopper-not-work-without-player.patch
similarity index 100%
rename from patches/server/0118-Fix-minecraft-hopper-not-work-without-player.patch
rename to patches/server/0117-Fix-minecraft-hopper-not-work-without-player.patch
diff --git a/patches/server/0119-Delete-Timings.patch b/patches/server/0118-Delete-Timings.patch
similarity index 99%
rename from patches/server/0119-Delete-Timings.patch
rename to patches/server/0118-Delete-Timings.patch
index d886999e..d97d0d99 100644
--- a/patches/server/0119-Delete-Timings.patch
+++ b/patches/server/0118-Delete-Timings.patch
@@ -1767,7 +1767,7 @@ index 9afc81ccb237c3655d64cdbe8a0db9a4d7791043..2d2e69c5bf7439009d7108a8e651ee30
          return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 106e515a56937504dac7343defa7c9d1b39ac10a..48a53959f8bdca3a9355e24096aab61608f61da9 100644
+index 6d34badf1078126451f92ad3ce04494b1e30169c..7329b19fd023de20ed56e2b8d11cf9116522ac3f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
diff --git a/patches/server/0120-Wool-Hopper-Counter.patch b/patches/server/0119-Wool-Hopper-Counter.patch
similarity index 100%
rename from patches/server/0120-Wool-Hopper-Counter.patch
rename to patches/server/0119-Wool-Hopper-Counter.patch
diff --git a/patches/server/0121-Loot-world-random.patch b/patches/server/0120-Loot-world-random.patch
similarity index 100%
rename from patches/server/0121-Loot-world-random.patch
rename to patches/server/0120-Loot-world-random.patch
diff --git a/patches/server/0122-Leaves-Reload-Command.patch b/patches/server/0121-Leaves-Reload-Command.patch
similarity index 100%
rename from patches/server/0122-Leaves-Reload-Command.patch
rename to patches/server/0121-Leaves-Reload-Command.patch
diff --git a/patches/server/0123-Spider-jockeys-drop-gapples.patch b/patches/server/0122-Spider-jockeys-drop-gapples.patch
similarity index 100%
rename from patches/server/0123-Spider-jockeys-drop-gapples.patch
rename to patches/server/0122-Spider-jockeys-drop-gapples.patch