Skip to content
[Jenkins]Jenkins
log in
Success

Changes

Summary

  1. Fix conflicts (details)
Commit a926b96d5d1831781984abc4c0ecae319116e2c0 by md_5
Fix conflicts
The file was removedBukkit-Patches/0031-BungeeCord-Chat-API.patch
The file was modifiedCraftBukkit-Patches/0136-Prevent-a-crash-involving-attributes.patch
The file was modifiedCraftBukkit-Patches/0046-Implement-respawn-API.patch
The file was removedBukkit-Patches/0029-Undeprecate-Player-updateInventory-V.patch
The file was modifiedCraftBukkit-Patches/0056-BungeeCord-Support.patch
The file was removedBukkit-Patches/0030-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
The file was removedBukkit-Patches/0024-Expand-team-API-to-allow-arbitrary-strings.patch
The file was modifiedCraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch
The file was addedBukkit-Patches/0021-Silenceable-Lightning-API.patch
The file was removedBukkit-Patches/0025-Add-Score.isScoreSet-Z-API.patch
The file was modifiedCraftBukkit-Patches/0037-Player-Collision-API.patch
The file was addedBukkit-Patches/0028-Undeprecate-Player-updateInventory-V.patch
The file was removedBukkit-Patches/0019-Add-Spigot-Links.patch
The file was addedBukkit-Patches/0026-Ease-ClassLoader-Deadlocks-Where-Possible.patch
The file was removedBukkit-Patches/0020-Implement-Locale-Getter-for-Players.patch
The file was removedBukkit-Patches/0022-Silenceable-Lightning-API.patch
The file was removedBukkit-Patches/0023-Remove-deprecation-on-some-player-lookup-methods.patch
The file was addedBukkit-Patches/0029-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
The file was removedBukkit-Patches/0021-Add-support-for-fetching-hidden-players.patch
The file was modifiedCraftBukkit-Patches/0158-BungeeCord-Chat-API.patch
The file was removedBukkit-Patches/0026-Add-PlayerSpawnLocationEvent.patch
The file was addedBukkit-Patches/0030-BungeeCord-Chat-API.patch
The file was addedBukkit-Patches/0023-Expand-team-API-to-allow-arbitrary-strings.patch
The file was addedBukkit-Patches/0027-Fix-slow-tab-complete-for-some-commands.patch
The file was modifiedCraftBukkit-Patches/0086-Cap-Channel-Registrations.patch
The file was addedBukkit-Patches/0020-Add-support-for-fetching-hidden-players.patch
The file was addedBukkit-Patches/0025-Add-PlayerSpawnLocationEvent.patch
The file was modifiedCraftBukkit-Patches/0084-Add-support-for-fetching-hidden-players.patch
The file was removedBukkit-Patches/0027-Ease-ClassLoader-Deadlocks-Where-Possible.patch
The file was modifiedCraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
The file was addedBukkit-Patches/0019-Implement-Locale-Getter-for-Players.patch
The file was addedBukkit-Patches/0024-Add-Score.isScoreSet-Z-API.patch
The file was removedBukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch
The file was modifiedCraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch
The file was modifiedCraftBukkit-Patches/0079-Implement-Locale-Getter-for-Players.patch
The file was modifiedCraftBukkit-Patches/0061-Particle-API.patch
The file was addedBukkit-Patches/0022-Remove-deprecation-on-some-player-lookup-methods.patch