Changes

Started by an SCM change

Started 10 yr ago

Took 0.54 sec

Summary

Fix conflicts. (details)

Commit 6d0ae89c6eb0a15fb233fde356bf1462680bd90a by md_5 Fix conflicts.
The file was modified	CraftBukkit-Patches/0079-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
The file was modified	Bukkit-Patches/0012-Player-Collision-API.patch
The file was modified	Bukkit-Patches/0028-BungeeCord-Chat-API.patch
The file was modified	CraftBukkit-Patches/0045-Implement-respawn-API.patch
The file was modified	CraftBukkit-Patches/0077-Implement-Locale-Getter-for-Players.patch
The file was modified	CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
The file was modified	CraftBukkit-Patches/0082-Add-support-for-fetching-hidden-players.patch
The file was modified	Bukkit-Patches/0015-Add-respawn-API.patch
The file was modified	CraftBukkit-Patches/0055-BungeeCord-Support.patch
The file was modified	CraftBukkit-Patches/0084-Cap-Channel-Registrations.patch
The file was modified	Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch
The file was modified	CraftBukkit-Patches/0009-Async-Operation-Catching.patch
The file was modified	CraftBukkit-Patches/0060-Particle-API.patch
The file was modified	CraftBukkit-Patches/0068-Fix-ItemStack-Unbreakable-Code.patch
The file was modified	CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch
The file was modified	CraftBukkit-Patches/0132-Prevent-a-crash-involving-attributes.patch
The file was modified	CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch
The file was modified	CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch
The file was modified	CraftBukkit-Patches/0153-Use-FastMatches-for-ItemStack-Dirty-Check.patch
The file was modified	CraftBukkit-Patches/0039-Cap-Minimum-Player-Speed.patch
The file was modified	CraftBukkit-Patches/0065-Disable-Connected-Check-on-setScoreboard.patch
The file was modified	Bukkit-Patches/0006-Add-Particle-API.patch
The file was modified	CraftBukkit-Patches/0087-Implement-Silenceable-Lightning-API.patch
The file was modified	Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch
The file was modified	CraftBukkit-Patches/0131-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
The file was modified	Bukkit-Patches/0004-BungeeCord-Support.patch
The file was modified	CraftBukkit-Patches/0036-Player-Collision-API.patch