Added NEI support and fixed bugs
Merge branch 'dev' of https://github.com/poppypoppop/Magicians-Artifice into dev