you saw nothing
This commit is contained in:
@@ -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"),
|
||||
|
||||
Reference in New Issue
Block a user