Re-add EnumColor to API!
Merge branch 'master' of https://github.com/aidancbrady/Mekanism

commit de4742e65c1199aa16fb9738c8db8f3aa4898ff4.
Revert "Added energy tablet to OreDict for recipes"

This reverts commit de4742e65c1199aa16fb9738c8db8f3aa4898ff4.