NEI magics
Merge pull request #293 from way2muchnoise/1.7-update

NEI magics
Merge pull request #295 from hilburn/1.7-update

Thermal Foundation Recipes
Merge remote-tracking branch 'upstream/1.7-update' into 1.7-update