Merge pull request #1 from TechnicPack/master

Update to current mainstream