Update from LaChal/MCEdit-Unified