Travis Watkins 799779e4b1 Update CraftBukkit to Minecraft 1.5.2		2013-04-27 10:42:19 -05:00
..
main	Update CraftBukkit to Minecraft 1.5.2	2013-04-27 10:42:19 -05:00
test/java/org/bukkit	Add methods to check conflicting enchantments. Adds BUKKIT-3830	2013-03-25 10:51:54 -04:00