Correct 1.5 material data. Fixes BUKKIT-4004, BUKKIT-3785
Merge branch 'master' of git://github.com/Bukkit/Bukkit into potioneffectchange