Lots of cpe changes
Merge branch 'master' of https://github.com/MrBluePotato/AtomicCraft