you saw nothing

patches/api/Experimental-annotations-change.patch

@@ -57,12 +57,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      ITEM_BUNDLE_INSERT("item.bundle.insert"),
-+<<<<<<< HEAD
-     ITEM_BUNDLE_INSERT_FAIL("item.bundle.insert_fail"),
-+=======
 +    @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
-+>>>>>>> Experimental annotations change
+     ITEM_BUNDLE_INSERT_FAIL("item.bundle.insert_fail"),
++    @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
      ITEM_BUNDLE_REMOVE_ONE("item.bundle.remove_one"),
      ITEM_CHORUS_FRUIT_TELEPORT("item.chorus_fruit.teleport"),
      ITEM_CROP_PLANT("item.crop.plant"),

patches/api/Fix-SpawnerEntry-Equipment-API.patch

@@ -4,25 +4,6 @@ Date: Fri, 26 Apr 2024 17:00:00 -0700
 Subject: [PATCH] Fix SpawnerEntry$Equipment API
 
 
-diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/Sound.java
-+++ b/src/main/java/org/bukkit/Sound.java
-@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
-     @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
-     @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
-     ITEM_BUNDLE_INSERT("item.bundle.insert"),
--<<<<<<< HEAD
-+    @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
-     ITEM_BUNDLE_INSERT_FAIL("item.bundle.insert_fail"),
--=======
-     @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
-     @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
-->>>>>>> Experimental annotations change
-     ITEM_BUNDLE_REMOVE_ONE("item.bundle.remove_one"),
-     ITEM_CHORUS_FRUIT_TELEPORT("item.chorus_fruit.teleport"),
-     ITEM_CROP_PLANT("item.crop.plant"),
 diff --git a/src/main/java/org/bukkit/block/spawner/SpawnerEntry.java b/src/main/java/org/bukkit/block/spawner/SpawnerEntry.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/block/spawner/SpawnerEntry.java
@@ -40,11 +21,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -         * Set the loot table for the entity.
 +         * Set the loot table for the spawned entity's equipment slots.
           * <br>
-+<<<<<<< HEAD
+-         * To remove a loot table use null.
-          * To remove a loot table use null.
-+=======
 +         * To remove a loot table use {@link LootTables#EMPTY}.
-+>>>>>>> Fix SpawnerEntry$Equipment API
           *
           * @param table this {@link org.bukkit.entity.Mob} will have.
           */