merge with 1.10 + local build mods