Changes

Summary

  1. Fix merge conflicts. (details)
Commit 3e3f2ccfbdaac0640bf91f1eb77bd175bba43ab9 by md_5 (md_5)
Fix merge conflicts.
The file was modifiedCraftBukkit-Patches/0152-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
The file was modifiedCraftBukkit-Patches/0150-Skip-invalid-enchants-in-CraftMetaItem.patch
The file was modifiedCraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
The file was modifiedCraftBukkit-Patches/0127-Better-item-validation.patch
The file was modifiedBukkit-Patches/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
The file was modifiedCraftBukkit-Patches/0147-Remove-uneeded-validation.patch
The file was modifiedCraftBukkit-Patches/0144-Filter-attribute-modifiers-which-cause-the-attribute.patch