Add methods to check for conflicting enchantments. Adds BUKKIT-3830
Allow fishing success rate to be adjustable. Adds BUKKIT-3837
Pulling all pending Bukkit-JavaDoc changes
Add Beacon BlockState for hopper events. Fixes BUKKIT-3932