Skip to content
Success

Changes

Summary

  1. Update to Minecraft 1.20.3 (details)
  2. SPIGOT-6026: Pull PotionEffectType and Enchantment from registry (details)
Commit 07e5dd5d594259f42e7fd42920bc45fb63a6c958 by md_5
Update to Minecraft 1.20.3
The file was modifiednms-patches/net/minecraft/world/level/block/BlockTurtleEgg.patch
The file was modifiednms-patches/net/minecraft/world/entity/animal/axolotl/Axolotl.patch
The file was addedsrc/main/java/org/bukkit/craftbukkit/block/data/type/CraftTrialSpawner.java
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
The file was modifiednms-patches/net/minecraft/world/item/crafting/IRecipe.patch
The file was modifiednms-patches/net/minecraft/world/level/storage/Convertable.patch
The file was modifiednms-patches/net/minecraft/server/CustomFunctionData.patch
The file was modifiednms-patches/net/minecraft/server/MinecraftServer.patch
The file was addednms-patches/net/minecraft/world/level/block/entity/CrafterBlockEntity.patch
The file was addedsrc/main/java/org/bukkit/craftbukkit/block/impl/CraftWeatheringCopperGrate.java
The file was addedsrc/main/java/org/bukkit/craftbukkit/block/impl/CraftWeatheringCopperDoor.java
The file was modifiednms-patches/net/minecraft/world/level/block/BlockCoralFanWall.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockSponge.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockRedstoneOre.patch
The file was modifiednms-patches/net/minecraft/world/entity/EntityLightning.patch
The file was modifiednms-patches/net/minecraft/world/level/block/DropExperienceBlock.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java
The file was modifiednms-patches/net/minecraft/world/level/block/BlockDragonEgg.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockGrowingTop.patch
The file was modifiednms-patches/net/minecraft/world/entity/projectile/IProjectile.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockBeehive.patch
The file was modifiednms-patches/net/minecraft/world/item/ItemBoat.patch
The file was modifiednms-patches/net/minecraft/world/level/RayTrace.patch
The file was modifiednms-patches/net/minecraft/world/entity/projectile/EntityThrownTrident.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockFire.patch
The file was modifiednms-patches/net/minecraft/server/network/LoginListener.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockCrops.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockPressurePlateAbstract.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockTrapdoor.patch
The file was modifiednms-patches/net/minecraft/world/level/portal/BlockPortalShape.patch
The file was addedsrc/main/java/org/bukkit/craftbukkit/block/impl/CraftCrafter.java
The file was modifiednms-patches/net/minecraft/world/level/block/BlockNote.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockPumpkinCarved.patch
The file was modifiednms-patches/net/minecraft/world/entity/monster/EntityEvoker.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockCommand.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
The file was modifiednms-patches/net/minecraft/world/level/block/piston/BlockPiston.patch
The file was addedsrc/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafter.java
The file was modifiednms-patches/net/minecraft/world/entity/player/EntityHuman.patch
The file was modifiednms-patches/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/Main.java
The file was modifiednms-patches/net/minecraft/world/inventory/Container.patch
The file was modifiedsrc/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java
The file was modifiednms-patches/net/minecraft/world/level/MobSpawnerAbstract.patch
The file was modifiednms-patches/net/minecraft/server/ScoreboardServer.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockFungi.patch
The file was modifiednms-patches/net/minecraft/world/level/block/ChangeOverTimeBlock.patch
The file was modifiednms-patches/net/minecraft/world/entity/EntityExperienceOrb.patch
The file was modifiednms-patches/net/minecraft/world/entity/ambient/EntityBat.patch
The file was modifiednms-patches/net/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructure.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockCake.patch
The file was modifiednms-patches/net/minecraft/world/entity/projectile/EntityWitherSkull.patch
The file was modifiednms-patches/net/minecraft/world/level/block/PointedDripstoneBlock.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockCocoa.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockBell.patch
The file was modifiednms-patches/net/minecraft/network/chat/ChatHexColor.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java
The file was modifiednms-patches/net/minecraft/world/level/block/BlockCauldron.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockNylium.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockTripwireHook.patch
The file was modifiednms-patches/net/minecraft/world/entity/IEntitySelector.patch
The file was modifiednms-patches/net/minecraft/world/entity/EntityLiving.patch
The file was modifiedsrc/main/java/com/mojang/brigadier/CommandDispatcher.java
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
The file was modifiednms-patches/net/minecraft/world/level/block/BlockWitherRose.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
The file was modifiednms-patches/net/minecraft/CrashReport.patch
The file was modifiednms-patches/net/minecraft/world/entity/decoration/EntityArmorStand.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockCoralFan.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockRedstoneWire.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java
The file was addedsrc/main/java/org/bukkit/craftbukkit/block/impl/CraftCopperBulb.java
The file was modifiednms-patches/net/minecraft/world/level/block/BlockRedstoneLamp.patch
The file was modifiednms-patches/net/minecraft/world/item/crafting/CraftingManager.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockGrassPath.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockSweetBerryBush.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
The file was removednms-patches/net/minecraft/server/commands/CommandTrigger.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
The file was modifiednms-patches/net/minecraft/world/level/block/AbstractCandleBlock.patch
The file was modifiednms-patches/net/minecraft/server/AdvancementDataPlayer.patch
The file was modifiednms-patches/net/minecraft/world/level/block/SculkSensorBlock.patch
The file was modifiednms-patches/net/minecraft/server/level/ChunkProviderServer.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
The file was modifiednms-patches/net/minecraft/world/entity/animal/EntityDolphin.patch
The file was modifiednms-patches/net/minecraft/world/entity/monster/EntityVex.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockMushroom.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockPressurePlateBinary.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BigDripleafBlock.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockDoor.patch
The file was modifiednms-patches/net/minecraft/world/level/storage/WorldNBTStorage.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockBambooSapling.patch
The file was modifiednms-patches/net/minecraft/world/level/block/grower/WorldGenTreeProvider.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
The file was modifiednms-patches/net/minecraft/server/network/ServerCommonPacketListenerImpl.patch
The file was addedsrc/main/java/org/bukkit/craftbukkit/entity/CraftWindCharge.java
The file was modifiednms-patches/net/minecraft/server/players/UserCache.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockBed.patch
The file was modifiednms-patches/net/minecraft/server/commands/CommandSpreadPlayers.patch
The file was removedsrc/main/java/org/bukkit/craftbukkit/block/impl/CraftPowderSnowCauldron.java
The file was modifiednms-patches/net/minecraft/network/chat/IChatBaseComponent.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
The file was modifiednms-patches/net/minecraft/world/level/block/BuddingAmethystBlock.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockDispenser.patch
The file was modifiednms-patches/net/minecraft/world/entity/projectile/EntityArrow.patch
The file was modifiednms-patches/net/minecraft/server/level/EntityPlayer.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockPoweredRail.patch
The file was modifiednms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalTarget.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
The file was modifiednms-patches/net/minecraft/world/entity/decoration/EntityItemFrame.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockSnow.patch
The file was modifiednms-patches/net/minecraft/world/level/storage/loot/LootDataManager.patch
The file was modifiednms-patches/net/minecraft/world/item/ItemChorusFruit.patch
The file was modifiednms-patches/net/minecraft/server/Main.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/util/Commodore.java
The file was modifiednms-patches/net/minecraft/world/entity/animal/horse/EntityHorseAbstract.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockFenceGate.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockFluids.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
The file was modifiednms-patches/net/minecraft/server/network/PlayerConnection.patch
The file was addednms-patches/net/minecraft/world/inventory/CrafterMenu.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockChorusFlower.patch
The file was modifiednms-patches/net/minecraft/world/level/block/LayeredCauldronBlock.patch
The file was modifiednms-patches/net/minecraft/world/entity/item/EntityItem.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockSoil.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockCampfire.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockLeaves.patch
The file was modifiednms-patches/net/minecraft/world/entity/animal/EntityAnimal.patch
The file was modifiednms-patches/net/minecraft/world/item/ItemStack.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockDirtSnowSpreadable.patch
The file was modifiednms-patches/net/minecraft/world/entity/projectile/EntityEnderPearl.patch
The file was modifiednms-patches/net/minecraft/world/level/block/RootedDirtBlock.patch
The file was addedsrc/main/java/org/bukkit/craftbukkit/block/data/type/CraftCrafter.java
The file was modifiednms-patches/net/minecraft/core/dispenser/DispenseBehaviorBoat.patch
The file was modifiednms-patches/net/minecraft/world/level/block/PowderSnowBlock.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
The file was modifiednms-patches/net/minecraft/world/entity/projectile/EntityFireball.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockRespawnAnchor.patch
The file was modifiednms-patches/net/minecraft/world/level/block/SculkCatalystBlock.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockObserver.patch
The file was modifiednms-patches/net/minecraft/commands/CommandDispatcher.patch
The file was modifiednms-patches/net/minecraft/world/entity/animal/EntityParrot.patch
The file was modifiednms-patches/net/minecraft/world/item/ItemMonsterEgg.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
The file was modifiednms-patches/net/minecraft/world/level/block/Block.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockBamboo.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockReed.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockNetherWart.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockDaylightDetector.patch
The file was modifiednms-patches/net/minecraft/world/entity/Entity.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockTripwire.patch
The file was modifiednms-patches/net/minecraft/util/datafix/DataConverterRegistry.patch
The file was modifiednms-patches/net/minecraft/world/item/crafting/ShapedRecipes.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockCactus.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockRedstoneTorch.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/CraftWorld.java
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
The file was modifiednms-patches/net/minecraft/server/players/NameReferencingFileConverter.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
The file was modifiednms-patches/net/minecraft/world/level/block/BlockVine.patch
The file was addedsrc/main/java/org/bukkit/craftbukkit/block/CraftTrialSpawner.java
The file was modifiedsrc/test/java/org/bukkit/craftbukkit/util/CraftChatMessageTest.java
The file was modifiednms-patches/net/minecraft/world/level/World.patch
The file was modifiednms-patches/net/minecraft/server/dedicated/DedicatedServerProperties.patch
The file was modifiednms-patches/net/minecraft/world/level/levelgen/structure/structures/EndCityPieces.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockStem.patch
The file was modifiednms-patches/net/minecraft/world/level/block/state/BlockBase.patch
The file was addedsrc/main/java/org/bukkit/craftbukkit/block/impl/CraftTrialSpawner.java
The file was modifiednms-patches/net/minecraft/world/entity/EntityTypes.patch
The file was modifiednms-patches/net/minecraft/world/item/ItemMinecart.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockWitherSkull.patch
The file was modifiednms-patches/net/minecraft/world/level/block/entity/TileEntitySkull.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockEnderPortal.patch
The file was modifiednms-patches/net/minecraft/world/inventory/Containers.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockFireAbstract.patch
The file was modifiednms-patches/net/minecraft/world/entity/monster/warden/Warden.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/CraftStatistic.java
The file was modifiednms-patches/net/minecraft/server/level/PlayerInteractManager.patch
The file was modifiednms-patches/net/minecraft/commands/CommandListenerWrapper.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockButtonAbstract.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
The file was modifiednms-patches/net/minecraft/world/level/block/entity/TileEntityJukeBox.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockCoralPlant.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockTallPlant.patch
The file was modifiednms-patches/net/minecraft/world/level/block/LightningRodBlock.patch
The file was modifiednms-patches/net/minecraft/world/entity/vehicle/EntityMinecartAbstract.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
The file was modifiednms-patches/net/minecraft/core/cauldron/CauldronInteraction.patch
The file was modifiednms-patches/net/minecraft/world/entity/vehicle/ChestBoat.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockChest.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
The file was modifiednms-patches/net/minecraft/world/level/block/BlockConcretePowder.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockPortal.patch
The file was addedsrc/main/java/org/bukkit/craftbukkit/entity/CraftBreeze.java
The file was modifiednms-patches/net/minecraft/network/protocol/PlayerConnectionUtils.patch
The file was modifiednms-patches/net/minecraft/world/level/block/entity/TileEntitySign.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
The file was modifiednms-patches/net/minecraft/world/entity/projectile/EntityTippedArrow.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockWaterLily.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java
The file was modifiednms-patches/net/minecraft/world/level/storage/WorldDataServer.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
The file was modifiednms-patches/net/minecraft/world/entity/vehicle/EntityBoat.patch
The file was modifiednms-patches/net/minecraft/server/commands/CommandSchedule.patch
The file was modifiednms-patches/net/minecraft/world/entity/animal/EntityTurtle.patch
The file was addednms-patches/net/minecraft/world/entity/vehicle/VehicleEntity.patch
The file was modifiednms-patches/net/minecraft/server/level/WorldServer.patch
The file was addedsrc/main/java/org/bukkit/craftbukkit/block/impl/CraftWaterloggedTransparent.java
The file was modifiednms-patches/net/minecraft/world/level/block/BlockDropper.patch
The file was modifiedpom.xml
The file was modifiednms-patches/net/minecraft/world/level/block/BlockLever.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
The file was modifiednms-patches/net/minecraft/world/level/entity/PersistentEntitySectionManager.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockDiodeAbstract.patch
The file was addedsrc/main/java/org/bukkit/craftbukkit/block/impl/CraftWeatheringCopperBulb.java
The file was addedsrc/main/java/org/bukkit/craftbukkit/block/impl/CraftWeatheringCopperTrapDoor.java
The file was modifiednms-patches/net/minecraft/world/item/ItemTrident.patch
The file was modifiednms-patches/net/minecraft/network/PacketDataSerializer.patch
The file was modifiedsrc/test/java/org/bukkit/craftbukkit/inventory/CompositeSerialization.java
The file was modifiednms-patches/net/minecraft/world/level/block/BlockScaffolding.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockComposter.patch
The file was modifiednms-patches/net/minecraft/world/level/GameRules.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockSapling.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockMobSpawner.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockMagma.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockMonsterEggs.patch
The file was modifiednms-patches/net/minecraft/world/entity/item/EntityTNTPrimed.patch
The file was modifiednms-patches/net/minecraft/world/entity/EntityInsentient.patch
The file was modifiednms-patches/net/minecraft/world/level/block/SculkVeinBlock.patch
The file was removednms-patches/net/minecraft/world/level/block/grower/WorldGenMegaTreeProvider.patch
The file was modifiednms-patches/net/minecraft/world/level/block/SculkBlock.patch
The file was addedsrc/main/java/org/bukkit/craftbukkit/block/CraftCrafter.java
The file was modifiednms-patches/net/minecraft/world/level/block/SculkShriekerBlock.patch
The file was modifiednms-patches/net/minecraft/world/entity/projectile/EntityEvokerFangs.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockMinecartDetector.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockTNT.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/CraftServer.java
The file was modifiednms-patches/net/minecraft/world/entity/projectile/EntitySpectralArrow.patch
The file was modifiedsrc/test/java/org/bukkit/ChatTest.java
The file was modifiednms-patches/net/minecraft/world/level/block/BlockIce.patch
The file was modifiednms-patches/net/minecraft/server/players/PlayerList.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockCoral.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockSign.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockPressurePlateWeighted.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockLectern.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockRedstoneComparator.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
The file was modifiednms-patches/net/minecraft/world/level/Explosion.patch
The file was modifiednms-patches/net/minecraft/world/inventory/ContainerBrewingStand.patch
The file was modifiednms-patches/net/minecraft/world/level/block/BlockPlant.patch
The file was modifiednms-patches/net/minecraft/world/item/crafting/RecipeItemStack.patch
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
Commit 8232a74cf8d32bce37c33ff6d0cd9b688a1ef8e9 by md_5
SPIGOT-6026: Pull PotionEffectType and Enchantment from registry
The file was removednms-patches/net/minecraft/world/effect/MobEffects.patch
The file was removednms-patches/net/minecraft/world/item/enchantment/Enchantments.patch
The file was modifiedsrc/test/java/org/bukkit/support/AbstractTestingBase.java
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/CraftServer.java
The file was removedsrc/test/java/org/bukkit/support/DummyEnchantments.java
The file was modifiedsrc/main/java/org/bukkit/craftbukkit/CraftRegistry.java