Fixes! The new system just about works, I just need to work on Dynamic Tank inventory merging.
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8