Skip to content
Jenkins
log in
Dashboard
RSS
Spigot-RSS
#2
Changes
Status
Changes
Console Output
View Build Information
Polling Log
Git Build Data
Previous Build
Next Build
Success
Changes
Summary
Fix conflicts (
details
)
Commit a926b96d5d1831781984abc4c0ecae319116e2c0 by
md_5
Fix conflicts
The file was modified
CraftBukkit-Patches/0056-BungeeCord-Support.patch
The file was modified
CraftBukkit-Patches/0158-BungeeCord-Chat-API.patch
The file was modified
CraftBukkit-Patches/0037-Player-Collision-API.patch
The file was modified
CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch
The file was modified
CraftBukkit-Patches/0079-Implement-Locale-Getter-for-Players.patch
The file was removed
Bukkit-Patches/0019-Add-Spigot-Links.patch
The file was modified
CraftBukkit-Patches/0046-Implement-respawn-API.patch
The file was modified
CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch
The file was modified
CraftBukkit-Patches/0084-Add-support-for-fetching-hidden-players.patch
The file was modified
CraftBukkit-Patches/0061-Particle-API.patch
The file was modified
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
The file was modified
CraftBukkit-Patches/0086-Cap-Channel-Registrations.patch
The file was modified
CraftBukkit-Patches/0136-Prevent-a-crash-involving-attributes.patch