Summary
- More conflict resolution. (details)
| The file was modified | CraftBukkit-Patches/0152-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch |
| The file was modified | CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch |
| The file was modified | CraftBukkit-Patches/0152-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch |
| The file was modified | CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch |