Mod updates and switch for Forge
Update merge