Add Thorns to DamageCause - Related to BUKKIT-3505
Add ability to change player item in hand. Adds BUKKIT-3318
Add methods to check for conflicting enchantments. Adds BUKKIT-3830
Allow fishing success rate to be adjustable. Adds BUKKIT-3837
Merge remote-tracking branch 'upstream/master'