Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@88a3a87 Configurable xp orb merge group count (#12503)
PaperMC/Paper@53d1d04 Disable Item Obfuscation for entity related stacks (#12297)
PaperMC/Paper@c98cd65 Add configuration interface to expose certain config values (#12273)
PaperMC/Paper@42a2a6c Supports the ability for commands to be registered internally (#12520)
PaperMC/Paper@753cff7 Improvements for Dump paper commands (#12512)
PaperMC/Paper@e2da5d2 Registry API for supported Mob Variants (#12417)
PaperMC/Paper@ab0253f Expand PlayerDeathEvent API (#12221)
PaperMC/Paper@cbcf75a Update visual fire handling with TriState support (#12303)
PaperMC/Paper@6c3964d Properly save level data async (#12530)
PaperMC/Paper@d2ad2e6 Add missing EntityLookup#getAllMapped from Moonrise
PaperMC/Paper@358e72e Remove simplify remote item matching stuff for now
PaperMC/Paper@04ffca0 Also remove CraftPlayer methods
PaperMC/Paper@a252581 Update mache

sakura-api/paper-patches/files/src/main/java/org/bukkit/Bukkit.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -127,6 +_,20 @@
+@@ -128,6 +_,20 @@
          // Paper end
      }
  

sakura-api/paper-patches/files/src/main/java/org/bukkit/entity/Entity.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -37,6 +_,22 @@
+@@ -38,6 +_,22 @@
   */
  public interface Entity extends Metadatable, CommandSender, Nameable, PersistentDataHolder, net.kyori.adventure.text.event.HoverEventSource<net.kyori.adventure.text.event.HoverEvent.ShowEntity>, net.kyori.adventure.sound.Sound.Emitter, DataComponentView { // Paper