Skip to content
Jenkins
log in
Dashboard
RSS
Bukkit-RSS
#37
Back to Project
Status
Changes
Console Output
View Build Information
Polling Log
Git Build Data
Previous Build
Next Build
Changes
Summary
Fix merge conflicts. (
details
)
Commit 3e3f2ccfbdaac0640bf91f1eb77bd175bba43ab9 by
md_5 (md_5)
Fix merge conflicts.
CraftBukkit-Patches/0147-Remove-uneeded-validation.patch
CraftBukkit-Patches/0150-Skip-invalid-enchants-in-CraftMetaItem.patch
CraftBukkit-Patches/0152-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
CraftBukkit-Patches/0127-Better-item-validation.patch
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
Bukkit-Patches/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
CraftBukkit-Patches/0144-Filter-attribute-modifiers-which-cause-the-attribute.patch