Reverted 39226fb until I get a better system worked out
Merge branch 'master' of https://github.com/Khroki/MCEdit-Unified