Generate friendly names in CraftEnchantment
Search the Ore Dictionary in Material.matchMaterial

It's annoying that the OreDictionary.getOreID(String) function will grab
a new ID if the name passed in is new... needed to create the map to
make sure it won't keep making new ones.

Conflicts:
	patches/org/bukkit/Material.java.patch
Merge pull request #1603 from riking/v164-enum-names

(V164) Generate friendly Enchantment names, search oredict in Material.matchMaterial