Incorporate changes from Technicraft/BigReactors