Merge pull request #1 from MrMasochism/master

Updating to 1.4.7
Fix Creative Tabs With Other Mods
Merge pull request #640 from alexbegt/master

Fixing Creative Tabs