Merge changes from Technic's base repo