Merge downstream changes from TechnicPack/TechnicSolder