From d0f2899ac8114fc9519a3da68d73866f88ddb2ff Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Fri, 6 Nov 2026 13:30:18 +0000 Subject: [PATCH] Bring basePower and old worlds to Minecraft 1.13.2 --- .github/workflows/ci.yml | 35 +- .github/workflows/codeql-analysis.yml | 22 +- .github/workflows/release-on-tag.yml | 4 +- CHANGELOG.txt | 8 + README.md | 19 +- build.gradle | 81 +- docs/1.13/BASE-IDENTITY-MIGRATION.md | 45 ++ docs/1.13/MIGRATION.md | 8 +- gradle.properties | 19 +- settings.gradle | 2 + .../poweradvantage/api/ConduitBlock.java | 2 +- .../cyano/poweradvantage/api/ConduitType.java | 2 +- .../api/FluidCategoryRegistry.java | 2 +- .../cyano/poweradvantage/api/GUIBlock.java | 4 +- .../poweradvantage/api/PoweredEntity.java | 2 +- .../api/fluid/FluidConduitBlock.java | 2 +- .../api/fluid/FluidNetworkApi.java | 4 +- .../api/fluid/FluidPoweredEntity.java | 4 +- .../poweradvantage/api/fluid/FluidStack.java | 2 +- .../api/migration/LegacyConfigMigration.java | 8 +- .../api/migration/LegacyMigrationApi.java | 36 +- .../migration/LegacyOreSpawnConfigBridge.java | 11 + .../modsupport/LightWeightPowerRegistry.java | 4 +- .../api/modsupport/package-info.java | 4 +- .../modsupport/rf/TileEntityRFConverter.java | 2 +- .../rf/TileEntityRFElectricityConverter.java | 4 +- .../rf/TileEntityRFQuantumConverter.java | 4 +- .../rf/TileEntityRFSteamConverter.java | 4 +- .../techreborn/TileEntityTRConverter.java | 2 +- .../TileEntityTRElectricityConverter.java | 4 +- .../api/simple/BlockSimpleFluidConduit.java | 2 +- .../api/simple/BlockSimpleFluidMachine.java | 4 +- .../api/simple/BlockSimplePowerConduit.java | 2 +- .../api/simple/BlockSimplePowerMachine.java | 4 +- .../api/simple/SimpleMachineGUI.java | 8 +- .../simple/TileEntitySimpleFluidMachine.java | 4 +- .../simple/TileEntitySimplePowerMachine.java | 2 +- .../PowerAdvantage.java | 40 +- .../RecipeMode.java | 2 +- .../blocks/BlockFrame.java | 2 +- .../blocks/BlockPowerSwitch.java | 4 +- .../blocks}/package-info.java | 4 +- .../client/ClientOilRenderer.java | 8 +- .../compat/BaseMetalsCompat.java | 4 +- .../conduitnetwork/ConduitNetworkManager.java | 6 +- .../conduitnetwork/ConduitRegistry.java | 6 +- .../conduitnetwork/package-info.java | 2 +- .../config/PowerAdvantageConfig.java | 6 +- .../graphics/package-info.java | 2 +- .../gui/FilteredFluidTankGUI.java | 4 +- .../gui/FluidTankGUI.java | 4 +- .../gui/FunctionalCreativeTab.java | 2 +- .../gui/StillGUI.java | 6 +- .../items => basepower/gui}/package-info.java | 4 +- .../init/Blocks.java | 46 +- .../init/Entities.java | 36 +- .../init/Fluids.java | 4 +- .../init/Fuels.java | 4 +- .../init/GUI.java | 10 +- .../init/ItemGroups.java | 27 +- .../init/Items.java | 6 +- .../init/Materials.java | 2 +- .../init/ModSupport.java | 6 +- .../init/Recipes.java | 6 +- .../init/TreasureChests.java | 18 +- .../init/Villages.java | 4 +- .../init/WorldGen.java | 4 +- .../init/package-info.java | 2 +- .../items/RotationTool.java | 2 +- .../items}/package-info.java | 4 +- .../machines/conveyors/BlockConveyor.java | 2 +- .../conveyors/BlockConveyorFilter.java | 4 +- .../conveyors/TileEntityBlockFilter.java | 4 +- .../conveyors/TileEntityConveyor.java | 8 +- .../conveyors/TileEntityConveyorFilter.java | 8 +- .../conveyors/TileEntityFoodFilter.java | 4 +- .../conveyors/TileEntityFuelFilter.java | 4 +- .../conveyors/TileEntityInventoryFilter.java | 4 +- .../conveyors/TileEntityOreFilter.java | 4 +- .../conveyors/TileEntityOverflowFilter.java | 6 +- .../conveyors/TileEntityPlantFilter.java | 4 +- .../conveyors/TileEntitySmeltableFilter.java | 4 +- .../machines/conveyors/package-info.java | 4 +- .../creative/InfiniteEnergyBlock.java | 2 +- .../creative/InfiniteEnergyTileEntity.java | 8 +- .../fluidmachines/FluidDischargeBlock.java | 2 +- .../FluidDischargeTileEntity.java | 8 +- .../fluidmachines/FluidDrainBlock.java | 2 +- .../fluidmachines/FluidDrainTileEntity.java | 8 +- .../fluidmachines/FluidPipeBlock.java | 6 +- .../fluidmachines/MetalTankBlock.java | 2 +- .../fluidmachines/MetalTankTileEntity.java | 8 +- .../machines/fluidmachines/StillBlock.java | 2 +- .../fluidmachines/StillTileEntity.java | 14 +- .../fluidmachines/StorageTankBlock.java | 6 +- .../fluidmachines/StorageTankTileEntity.java | 6 +- .../modsupport/TerminalFluidPipeBlock.java | 8 +- .../TerminalFluidPipeTileEntity.java | 10 +- .../machines/fluidmachines/package-info.java | 4 +- .../math/BlockPos4D.java | 2 +- .../math/Integer2D.java | 2 +- .../math/package-info.java | 2 +- .../migration/AdvantageLegacyMigrations.java | 36 +- .../migration/LegacyWorldDataHook.java | 82 ++- .../package-info.java | 2 +- .../recipe/MaterialTags.java | 10 +- .../recipe/PartsLoot.java | 10 +- .../recipe/RecipeConditions.java | 6 +- .../recipe/RecipeDiscovery.java | 4 +- .../registry/FuelRegistry.java | 4 +- .../registry/ITileEntityGUI.java | 2 +- .../registry/MachineGUIRegistry.java | 4 +- .../registry/package-info.java | 2 +- .../still/recipe/DistillationRecipe.java | 2 +- .../recipe/DistillationRecipeRegistry.java | 6 +- .../still/recipe/ExplicitFluidReference.java | 2 +- .../registry/still/recipe/FluidReference.java | 2 +- .../recipe/RegistryNameFluidReference.java | 4 +- .../util/FluidContainerHelper.java | 2 +- .../util/FluidHandlerHelper.java | 2 +- .../util/FluidIdHelper.java | 2 +- .../util/HashCodeHelper.java | 2 +- .../util/InventoryWrapper.java | 2 +- .../util/PowerHelper.java | 4 +- .../util/ReversibleHashMap.java | 2 +- .../util/ReversibleMap.java | 2 +- .../util/package-info.java | 2 +- src/main/resources/META-INF/coremods.json | 8 +- src/main/resources/META-INF/mods.toml | 18 +- .../blockstates/converter_rf_electricity.json | 19 + .../blockstates/converter_rf_quantum.json | 19 + .../blockstates/converter_rf_steam.json | 19 + .../blockstates/converter_tr_electricity.json | 19 + .../basepower/blockstates/crude_oil.json | 5 + .../blockstates/fluid_discharge.json | 19 + .../basepower/blockstates/fluid_drain.json | 19 + .../blockstates/fluid_metal_tank.json | 8 +- .../blockstates/fluid_pipe.json | 128 ++-- .../blockstates/fluid_pipe_terminal.json | 128 ++-- .../blockstates/fluid_storage_tank.json | 19 + .../basepower/blockstates/fluid_switch.json | 10 + .../blockstates/infinite_electricity.json | 19 + .../blockstates/infinite_quantum.json | 19 + .../basepower/blockstates/infinite_steam.json | 19 + .../basepower/blockstates/item_conveyor.json | 27 + .../blockstates/item_filter_block.json | 19 + .../blockstates/item_filter_food.json | 19 + .../blockstates/item_filter_fuel.json | 19 + .../blockstates/item_filter_inventory.json | 19 + .../blockstates/item_filter_ore.json | 19 + .../blockstates/item_filter_overflow.json | 19 + .../blockstates/item_filter_plant.json | 19 + .../blockstates/item_filter_smelt.json | 19 + .../basepower/blockstates/refined_oil.json | 5 + .../basepower/blockstates/steel_frame.json | 7 + .../blockstates/still.json | 16 +- .../assets/basepower/lang/de_de.json | 77 ++ .../assets/basepower/lang/en_au.json | 77 ++ .../assets/basepower/lang/en_ca.json | 77 ++ .../assets/basepower/lang/en_en.json | 77 ++ .../assets/basepower/lang/en_gb.json | 77 ++ .../assets/basepower/lang/en_pt.json | 77 ++ .../assets/basepower/lang/en_us.json | 75 ++ .../assets/basepower/lang/es_es.json | 75 ++ .../assets/basepower/lang/es_mx.json | 75 ++ .../assets/basepower/lang/it_it.json | 75 ++ .../assets/basepower/lang/ja_jp.json | 75 ++ .../assets/basepower/lang/ko_kr.json | 75 ++ .../assets/basepower/lang/pt_br.json | 75 ++ .../assets/basepower/lang/zh_cn.json | 75 ++ .../block/converter_rf_electricity.json | 8 +- .../models/block/converter_rf_quantum.json | 6 +- .../models/block/converter_rf_steam.json | 8 +- .../block/converter_tr_electricity.json | 6 + .../models/block/conveyor_base.json | 0 .../models/block/crude_oil.json | 2 +- .../models/block/fluid_discharge.json | 8 + .../basepower/models/block/fluid_drain.json | 8 + .../models/block/fluid_metal_tank.json | 8 +- .../basepower/models/block/fluid_pipe_0.json | 7 + .../models/block/fluid_pipe_densuw.json | 7 + .../models/block/fluid_pipe_desuw.json | 7 + .../models/block/fluid_pipe_dnu.json | 7 + .../models/block/fluid_pipe_ensw.json | 7 + .../basepower/models/block/fluid_pipe_n.json | 7 + .../basepower/models/block/fluid_pipe_ns.json | 7 + .../models/block/fluid_pipe_nsuw.json | 7 + .../models/block/fluid_pipe_nsw.json | 7 + .../models/block/fluid_pipe_nuw.json | 7 + .../basepower/models/block/fluid_pipe_nw.json | 7 + .../models/block/fluid_storage_tank.json | 6 +- .../models/block/fluid_switch_off.json | 7 + .../models/block/fluid_switch_on.json | 7 + .../models/block/infinite_electricity.json | 2 +- .../models/block/infinite_quantum.json | 2 +- .../models/block/infinite_steam.json | 2 +- .../basepower/models/block/item_conveyor.json | 10 + .../models/block/item_filter_block.json | 10 + .../models/block/item_filter_food.json | 10 + .../models/block/item_filter_fuel.json | 10 + .../models/block/item_filter_inventory.json | 10 + .../models/block/item_filter_ore.json | 10 + .../models/block/item_filter_overflow.json | 10 + .../models/block/item_filter_plant.json | 10 + .../models/block/item_filter_smelt.json | 10 + .../models/block/pipe1_0.json | 0 .../models/block/pipe1_densuw.json | 0 .../models/block/pipe1_desuw.json | 0 .../models/block/pipe1_dnu.json | 0 .../models/block/pipe1_ensw.json | 0 .../models/block/pipe1_n.json | 0 .../models/block/pipe1_ns.json | 0 .../models/block/pipe1_nsuw.json | 0 .../models/block/pipe1_nsw.json | 0 .../models/block/pipe1_nuw.json | 0 .../models/block/pipe1_nw.json | 0 .../models/block/pipe2_0.json | 0 .../models/block/pipe2_densuw.json | 0 .../models/block/pipe2_desuw.json | 0 .../models/block/pipe2_dnu.json | 0 .../models/block/pipe2_ensw.json | 0 .../models/block/pipe2_n.json | 0 .../models/block/pipe2_ns.json | 0 .../models/block/pipe2_nsuw.json | 0 .../models/block/pipe2_nsw.json | 0 .../models/block/pipe2_nuw.json | 0 .../models/block/pipe2_nw.json | 0 .../models/block/pipe3_0.json | 0 .../models/block/pipe3_densuw.json | 0 .../models/block/pipe3_desuw.json | 0 .../models/block/pipe3_dnu.json | 0 .../models/block/pipe3_ensw.json | 0 .../models/block/pipe3_n.json | 0 .../models/block/pipe3_ns.json | 0 .../models/block/pipe3_nsuw.json | 0 .../models/block/pipe3_nsw.json | 0 .../models/block/pipe3_nuw.json | 0 .../models/block/pipe3_nw.json | 0 .../models/block/pipe4_0.json | 0 .../models/block/pipe4_densuw.json | 0 .../models/block/pipe4_desuw.json | 0 .../models/block/pipe4_dnu.json | 0 .../models/block/pipe4_ensw.json | 0 .../models/block/pipe4_n.json | 0 .../models/block/pipe4_ns.json | 0 .../models/block/pipe4_nsuw.json | 0 .../models/block/pipe4_nsw.json | 0 .../models/block/pipe4_nuw.json | 0 .../models/block/pipe4_nw.json | 0 .../models/block/refined_oil.json | 2 +- .../models/block/steel_frame.json | 4 +- .../models/block/still_off.json | 4 +- .../models/block/still_on.json | 4 +- .../models/item/bioplastic_ingot.json | 6 + .../models/item/bucket_crude_oil.json | 6 + .../models/item/bucket_refined_oil.json | 6 + .../models/item/converter_rf_electricity.json | 3 + .../models/item/converter_rf_quantum.json | 3 + .../models/item/converter_rf_steam.json | 3 + .../models/item/converter_tr_electricity.json | 3 + .../basepower/models/item/crude_oil.json | 3 + .../models/item/crude_oil_bucket.json | 2 +- .../models/item/fluid_discharge.json | 3 + .../basepower/models/item/fluid_drain.json | 3 + .../models/item/fluid_metal_tank.json | 3 + .../basepower/models/item/fluid_pipe.json | 4 + .../models/item/fluid_pipe_terminal.json | 4 + .../models/item/fluid_storage_tank.json | 4 + .../basepower/models/item/fluid_switch.json | 3 + .../models/item/infinite_electricity.json | 3 + .../models/item/infinite_quantum.json | 3 + .../basepower/models/item/infinite_steam.json | 3 + .../basepower/models/item/item_conveyor.json | 3 + .../models/item/item_filter_block.json | 3 + .../models/item/item_filter_food.json | 3 + .../models/item/item_filter_fuel.json | 3 + .../models/item/item_filter_inventory.json | 3 + .../models/item/item_filter_ore.json | 3 + .../models/item/item_filter_overflow.json | 3 + .../models/item/item_filter_plant.json | 3 + .../models/item/item_filter_smelt.json | 3 + .../basepower/models/item/refined_oil.json | 3 + .../models/item/refined_oil_bucket.json | 2 +- .../models/item/rotator_tool.json | 2 +- .../models/item/sprocket.json | 2 +- .../models/item/starch.json | 2 +- .../basepower/models/item/steel_frame.json | 3 + .../assets/basepower/models/item/still.json | 3 + .../textures/blocks/crude_oil_flow.png | Bin .../textures/blocks/crude_oil_flow.png.mcmeta | 0 .../textures/blocks/crude_oil_still.png | Bin .../blocks/crude_oil_still.png.mcmeta | 0 .../textures/blocks/filter_bottom.png | Bin .../textures/blocks/filter_side_block.png | Bin .../textures/blocks/filter_side_food.png | Bin .../textures/blocks/filter_side_fuel.png | Bin .../textures/blocks/filter_side_inventory.png | Bin .../textures/blocks/filter_side_ore.png | Bin .../textures/blocks/filter_side_overflow.png | Bin .../textures/blocks/filter_side_plantable.png | Bin .../textures/blocks/filter_side_smeltable.png | Bin .../textures/blocks/fluid_discharge_face.png | Bin .../textures/blocks/fluid_discharge_side.png | Bin .../textures/blocks/fluid_drain_face.png | Bin .../textures/blocks/fluid_drain_side.png | Bin .../textures/blocks/fluid_metal_tank_side.png | Bin .../textures/blocks/fluid_metal_tank_top.png | Bin .../textures/blocks/fluid_pipe.png | Bin .../textures/blocks/fluid_switch_off.png | Bin .../textures/blocks/fluid_switch_on.png | Bin .../textures/blocks/item_conveyor_end.png | Bin .../textures/blocks/item_conveyor_side.png | Bin .../textures/blocks/item_conveyor_top.png | Bin .../textures/blocks/metal_panel.png | Bin .../textures/blocks/powercable.png | Bin .../textures/blocks/refined_oil_flow.png | Bin .../blocks/refined_oil_flow.png.mcmeta | 0 .../textures/blocks/refined_oil_still.png | Bin .../blocks/refined_oil_still.png.mcmeta | 0 .../textures/blocks/steel_frame.png | Bin .../textures/blocks/techreborn_converter.png | Bin .../gui/container/fluid_discharge_gui.png | Bin .../gui/container/fluid_drain_gui.png | Bin .../gui/container/fluid_metal_tank_gui.png | Bin .../gui/container/fluid_storage_tank_gui.png | Bin .../textures/gui/container/item_conveyor.png | Bin .../gui/container/item_conveyor_block.png | Bin .../gui/container/item_conveyor_food.png | Bin .../gui/container/item_conveyor_fuel.png | Bin .../gui/container/item_conveyor_inventory.png | Bin .../gui/container/item_conveyor_ore.png | Bin .../gui/container/item_conveyor_overflow.png | Bin .../gui/container/item_conveyor_plant.png | Bin .../gui/container/item_conveyor_smelt.png | Bin .../gui/container/machineGUI_template.png | Bin .../gui/container/player_inventory.png | Bin .../textures/gui/container/still_gui.png | Bin .../textures/items/bioplastic_ingot.png | Bin .../textures/items/bucket_crude_oil.png | Bin .../textures/items/bucket_refined_oil.png | Bin .../textures/items/rotator_tool.png | Bin .../textures/items/sprocket.png | Bin .../textures/items/starch.png | Bin .../textures/materials/brass.png | Bin .../textures/materials/copper.png | Bin .../textures/materials/invar.png | Bin .../textures/materials/iron.png | Bin .../textures/materials/metal_panel.png | Bin .../textures/materials/plastic.png | Bin .../textures/materials/steel.png | Bin .../textures/materials/steel_dark.png | Bin .../textures/materials/stone.png | Bin .../textures/materials/stone_brick.png | Bin .../textures/materials/wood.png | Bin .../blockstates/converter_rf_electricity.json | 19 - .../blockstates/converter_rf_quantum.json | 19 - .../blockstates/converter_rf_steam.json | 19 - .../blockstates/converter_tr_electricity.json | 19 - .../poweradvantage/blockstates/crude_oil.json | 5 - .../blockstates/fluid_discharge.json | 19 - .../blockstates/fluid_drain.json | 19 - .../blockstates/fluid_storage_tank.json | 19 - .../blockstates/fluid_switch.json | 10 - .../blockstates/infinite_electricity.json | 19 - .../blockstates/infinite_quantum.json | 19 - .../blockstates/infinite_steam.json | 19 - .../blockstates/item_conveyor.json | 27 - .../blockstates/item_filter_block.json | 19 - .../blockstates/item_filter_food.json | 19 - .../blockstates/item_filter_fuel.json | 19 - .../blockstates/item_filter_inventory.json | 19 - .../blockstates/item_filter_ore.json | 19 - .../blockstates/item_filter_overflow.json | 19 - .../blockstates/item_filter_plant.json | 19 - .../blockstates/item_filter_smelt.json | 19 - .../blockstates/refined_oil.json | 5 - .../blockstates/steel_frame.json | 7 - .../assets/poweradvantage/lang/de_de.json | 77 -- .../assets/poweradvantage/lang/en_au.json | 77 -- .../assets/poweradvantage/lang/en_ca.json | 77 -- .../assets/poweradvantage/lang/en_en.json | 77 -- .../assets/poweradvantage/lang/en_gb.json | 77 -- .../assets/poweradvantage/lang/en_pt.json | 77 -- .../assets/poweradvantage/lang/en_us.json | 75 -- .../assets/poweradvantage/lang/es_es.json | 75 -- .../assets/poweradvantage/lang/es_mx.json | 75 -- .../assets/poweradvantage/lang/it_it.json | 75 -- .../assets/poweradvantage/lang/ja_jp.json | 75 -- .../assets/poweradvantage/lang/ko_kr.json | 75 -- .../assets/poweradvantage/lang/pt_br.json | 75 -- .../assets/poweradvantage/lang/zh_cn.json | 75 -- .../block/converter_tr_electricity.json | 6 - .../models/block/fluid_discharge.json | 8 - .../models/block/fluid_drain.json | 8 - .../models/block/fluid_pipe_0.json | 7 - .../models/block/fluid_pipe_densuw.json | 7 - .../models/block/fluid_pipe_desuw.json | 7 - .../models/block/fluid_pipe_dnu.json | 7 - .../models/block/fluid_pipe_ensw.json | 7 - .../models/block/fluid_pipe_n.json | 7 - .../models/block/fluid_pipe_ns.json | 7 - .../models/block/fluid_pipe_nsuw.json | 7 - .../models/block/fluid_pipe_nsw.json | 7 - .../models/block/fluid_pipe_nuw.json | 7 - .../models/block/fluid_pipe_nw.json | 7 - .../models/block/fluid_switch_off.json | 7 - .../models/block/fluid_switch_on.json | 7 - .../models/block/item_conveyor.json | 10 - .../models/block/item_filter_block.json | 10 - .../models/block/item_filter_food.json | 10 - .../models/block/item_filter_fuel.json | 10 - .../models/block/item_filter_inventory.json | 10 - .../models/block/item_filter_ore.json | 10 - .../models/block/item_filter_overflow.json | 10 - .../models/block/item_filter_plant.json | 10 - .../models/block/item_filter_smelt.json | 10 - .../models/item/bioplastic_ingot.json | 6 - .../models/item/bucket_crude_oil.json | 6 - .../models/item/bucket_refined_oil.json | 6 - .../models/item/converter_rf_electricity.json | 3 - .../models/item/converter_rf_quantum.json | 3 - .../models/item/converter_rf_steam.json | 3 - .../models/item/converter_tr_electricity.json | 3 - .../poweradvantage/models/item/crude_oil.json | 3 - .../models/item/fluid_discharge.json | 3 - .../models/item/fluid_drain.json | 3 - .../models/item/fluid_metal_tank.json | 3 - .../models/item/fluid_pipe.json | 4 - .../models/item/fluid_pipe_terminal.json | 4 - .../models/item/fluid_storage_tank.json | 4 - .../models/item/fluid_switch.json | 3 - .../models/item/infinite_electricity.json | 3 - .../models/item/infinite_quantum.json | 3 - .../models/item/infinite_steam.json | 3 - .../models/item/item_conveyor.json | 3 - .../models/item/item_filter_block.json | 3 - .../models/item/item_filter_food.json | 3 - .../models/item/item_filter_fuel.json | 3 - .../models/item/item_filter_inventory.json | 3 - .../models/item/item_filter_ore.json | 3 - .../models/item/item_filter_overflow.json | 3 - .../models/item/item_filter_plant.json | 3 - .../models/item/item_filter_smelt.json | 3 - .../models/item/refined_oil.json | 3 - .../models/item/steel_frame.json | 3 - .../poweradvantage/models/item/still.json | 3 - ...igration.js => basepower_113_migration.js} | 8 +- ...ial_tags.js => basepower_material_tags.js} | 4 +- ..._renderer.js => basepower_oil_renderer.js} | 4 +- ..._parts_loot.js => basepower_parts_loot.js} | 4 +- .../recipes/bioplastic_from_starch.json | 6 +- .../recipes/converter_rf_electricity.json | 4 +- .../recipes/converter_rf_quantum.json | 4 +- .../recipes/converter_rf_steam.json | 4 +- .../converter_tr_electricity_iron.json | 4 +- ...converter_tr_electricity_refined_iron.json | 4 +- .../advancements/recipes/fluid_discharge.json | 4 +- .../advancements/recipes/fluid_drain.json | 4 +- .../recipes/fluid_metal_tank_iron_normal.json | 4 +- .../recipes/fluid_metal_tank_steel.json | 4 +- .../fluid_pipe_copper_apocalyptic.json | 4 +- .../recipes/fluid_pipe_copper_normal.json | 4 +- .../recipes/fluid_pipe_iron_apocalyptic.json | 4 +- .../recipes/fluid_pipe_iron_normal.json | 4 +- .../recipes/fluid_pipe_iron_tech.json | 4 +- .../recipes/fluid_pipe_lead_apocalyptic.json | 4 +- .../recipes/fluid_storage_tank.json | 4 +- .../advancements/recipes/fluid_switch.json | 4 +- .../advancements/recipes/item_conveyor.json | 4 +- .../recipes/item_filter_block.json | 6 +- .../recipes/item_filter_food.json | 6 +- .../recipes/item_filter_fuel.json | 6 +- .../recipes/item_filter_inventory.json | 6 +- .../advancements/recipes/item_filter_ore.json | 6 +- .../recipes/item_filter_overflow.json | 6 +- .../recipes/item_filter_plant.json | 6 +- .../recipes/item_filter_smelt.json | 6 +- .../advancements/recipes/rotator_tool.json | 4 +- .../sprocket_bronze_nugget_tech_no_rod.json | 4 +- .../recipes/sprocket_rod_normal.json | 4 +- .../recipes/sprocket_rod_tech.json | 4 +- .../recipes/sprocket_stickwood_normal.json | 4 +- .../recipes/starch_from_potato.json | 4 +- .../advancements/recipes/steel_frame.json | 4 +- .../advancements/recipes/still.json | 4 +- .../loot_tables/chests/advantage_parts.json | 14 +- .../orespawn/provider.json | 6 +- .../recipes/bioplastic_from_starch.json | 11 + .../recipes/converter_rf_electricity.json | 8 +- .../recipes/converter_rf_quantum.json | 6 +- .../recipes/converter_rf_steam.json | 8 +- .../converter_tr_electricity_iron.json | 10 +- ...converter_tr_electricity_refined_iron.json | 8 +- .../recipes/crushing_fluid_discharge.json | 6 +- .../recipes/crushing_fluid_drain.json | 6 +- .../recipes/crushing_fluid_storage_tank.json | 6 +- .../recipes/crushing_item_conveyor.json | 6 +- .../recipes/crushing_item_filter_block.json | 24 + .../recipes/crushing_item_filter_food.json | 6 +- .../recipes/crushing_item_filter_fuel.json | 6 +- .../crushing_item_filter_inventory.json | 24 + .../recipes/crushing_item_filter_ore.json | 6 +- .../crushing_item_filter_overflow.json | 24 + .../recipes/crushing_item_filter_plant.json | 24 + .../recipes/crushing_item_filter_smelt.json | 24 + .../recipes/crushing_potato_starch.json | 2 +- .../recipes/fluid_discharge.json | 12 +- .../recipes/fluid_drain.json | 12 +- .../recipes/fluid_metal_tank_iron_normal.json | 10 +- .../recipes/fluid_metal_tank_steel.json | 8 +- .../fluid_pipe_copper_apocalyptic.json | 8 +- .../recipes/fluid_pipe_copper_normal.json | 8 +- .../recipes/fluid_pipe_iron_apocalyptic.json | 8 +- .../recipes/fluid_pipe_iron_normal.json | 8 +- .../recipes/fluid_pipe_iron_tech.json | 8 +- .../recipes/fluid_pipe_lead_apocalyptic.json | 8 +- .../recipes/fluid_storage_tank.json | 8 +- .../recipes/fluid_switch.json | 8 +- .../recipes/item_conveyor.json | 8 +- .../recipes/item_filter_block.json | 6 +- .../recipes/item_filter_food.json | 6 +- .../recipes/item_filter_fuel.json | 6 +- .../recipes/item_filter_inventory.json | 6 +- .../recipes/item_filter_ore.json | 8 +- .../recipes/item_filter_overflow.json | 6 +- .../recipes/item_filter_plant.json | 6 +- .../recipes/item_filter_smelt.json | 6 +- .../recipes/rotator_tool.json | 8 +- .../sprocket_bronze_nugget_tech_no_rod.json | 12 +- .../recipes/sprocket_rod_normal.json | 10 +- .../recipes/sprocket_rod_tech.json | 10 +- .../recipes/sprocket_stickwood_normal.json | 10 +- .../recipes/starch_from_potato.json | 4 +- .../recipes/steel_frame.json | 6 +- .../recipes/still.json | 6 +- .../data/forge/tags/items/frames/steel.json | 2 +- .../data/forge/tags/items/gears.json | 2 +- .../data/forge/tags/items/gears/steel.json | 2 +- .../data/forge/tags/items/ingots/plastic.json | 2 +- .../data/forge/tags/items/pipes.json | 2 +- .../data/forge/tags/items/plastic.json | 2 +- .../data/forge/tags/items/sprockets.json | 2 +- .../forge/tags/items/sprockets/steel.json | 2 +- .../recipes/bioplastic_from_starch.json | 11 - .../recipes/crushing_item_filter_block.json | 24 - .../crushing_item_filter_inventory.json | 24 - .../crushing_item_filter_overflow.json | 24 - .../recipes/crushing_item_filter_plant.json | 24 - .../recipes/crushing_item_filter_smelt.json | 24 - src/main/resources/mcmod.info | 4 +- .../LegacyOreSpawnConfigBridgeTest.java | 14 +- .../blocks/BlockFrameOpacityTest.java | 4 +- .../ConduitNetworkManagerTest.java | 4 +- .../PowerTransferAccountingTest.java | 2 +- .../conveyors/ConveyorTransferTest.java | 6 +- .../fluidmachines/WorldFluidPickupTest.java | 4 +- .../AdvantageLegacyMigrationsTest.java | 22 +- .../migration/LegacyEnchantmentsTest.java | 13 +- .../migration/LegacyEntitiesTest.java | 4 +- .../LegacyVanillaInventoriesTest.java | 71 ++ .../registry/MachineGuiTitleTest.java | 4 +- .../resources/BuildWorkflowContractTest.java | 5 +- .../resources/ClientResourceContractTest.java | 12 +- .../resources/MaterialTagTransformerTest.java | 8 +- .../resources/OilRendererTransformerTest.java | 8 +- .../resources/PartsLootTransformerTest.java | 8 +- .../resources/RecipeUnlockContractTest.java | 4 +- .../resources/StarchRecipeTest.java | 8 +- .../support/PowerNativeTestBootstrap.java | 2 +- test-rig/build.gradle | 4 +- test-rig/client-resources/README.md | 2 +- .../client/ClientResourceProbe.java | 87 ++- .../client/MachineGuiLayoutProbe.java | 14 +- .../advantageworks/client/OilRenderProbe.java | 12 +- .../client/RecipeBookGroupingProbe.java | 6 +- .../client/TankVisualProbe.java | 10 +- .../resources/META-INF/mods.toml | 4 +- .../resources/gui-label-expectations.json | 78 +- test-rig/client-resources/run.ps1 | 34 +- .../client-resources/test-gui-contract.ps1 | 7 +- test-rig/client-resources/test-launcher.ps1 | 34 +- .../client-resources/test-probe-contract.ps1 | 4 +- test-rig/migration/broad_result_audit.py | 6 +- test-rig/migration/endurance.py | 5 +- test-rig/migration/extended_lifecycle.py | 4 +- test-rig/migration/lifecycle.py | 17 +- test-rig/migration/native113.py | 3 +- test-rig/migration/native113_broad.py | 8 +- test-rig/migration/native113_endurance.py | 7 +- .../migration/native113_machine_operations.py | 17 +- .../migration/native113_machine_upgrade.py | 146 ++++ test-rig/migration/native113_oil.py | 4 +- test-rig/migration/native113_rebrand.py | 238 ++++++ test-rig/migration/native113_rebrand_order.py | 133 ++++ test-rig/migration/native113_recipes.py | 6 +- .../migration/native113_redstone_reload.py | 6 +- test-rig/migration/native113_replay.py | 3 + test-rig/migration/oil_transfer.py | 12 +- test-rig/migration/progression.py | 40 +- test-rig/migration/recipe_unlocks.py | 30 +- test-rig/migration/semantic_machine_audit.py | 11 +- test-rig/migration/test_broad_result_audit.py | 10 +- test-rig/migration/test_native113_harvest.py | 3 + .../migration/test_native113_rebrand_order.py | 28 + .../test_native113_redstone_reload.py | 6 +- test-rig/migration/test_oil_transfer.py | 6 +- test-rig/migration/test_progression.py | 20 +- test-rig/migration/test_recipe_unlocks.py | 2 +- .../TransformerOrderBridge.java | 13 +- test-rig/migration/transformer_order.py | 9 +- test-rig/profiles/dev-core-apocalyptic.json | 29 +- .../profiles/dev-core-tech-progression.json | 29 +- test-rig/profiles/dev-core.json | 28 +- test-rig/profiles/packaged-current.json | 38 +- test-rig/profiles/packaged-decoupled.json | 38 +- test-rig/profiles/packaged-mineralogy.json | 38 +- .../profiles/packaged-optional-power.json | 38 +- test-rig/profiles/worldgen-advantage.json | 64 +- test-rig/profiles/worldgen-legacy-import.json | 86 +-- test-rig/profiles/worldgen-mineralogy.json | 54 +- .../BatteryOperationalCases.java | 6 +- .../mc/advantageworks/BayDrillAssertions.java | 8 +- .../ElectricOperationalCases.java | 16 +- .../mc/advantageworks/LifecycleProbe.java | 8 +- .../mc/advantageworks/MachineContext.java | 6 +- .../mc/advantageworks/NativeHarvestProbe.java | 18 +- .../advantageworks/PowerOperationalCases.java | 48 +- .../mc/advantageworks/ProcessProgression.java | 52 +- .../mc/advantageworks/ProgressionProbe.java | 10 +- .../mc/advantageworks/RecipeBookProbe.java | 6 +- .../mc/advantageworks/RecipeUnlockProbe.java | 2 +- .../advantageworks/RedstoneReloadProbe.java | 2 +- .../SourcePickupOperationalCases.java | 10 +- .../SteamOperationalActors.java | 16 +- .../advantageworks/SteamOperationalCases.java | 60 +- .../SteamOperationalSupplementalCases.java | 22 +- .../SteamReloadControlCases.java | 6 +- .../mc/advantageworks/WorksController.java | 12 +- .../src/main/resources/META-INF/mods.toml | 2 +- .../works/works-1.13.2.json | 694 +++++++++--------- .../mc/advantageworks/runner/WorksRunner.java | 2 +- .../advantageworks/AssertionChecksTest.java | 2 +- .../advantageworks/ConnectedSessionTest.java | 2 +- .../mc/advantageworks/LifecycleProbeTest.java | 6 +- .../advantageworks/ProfileManifestTest.java | 2 +- .../SteamOperationalSourceContractTest.java | 2 +- .../advantageworks/WorksDefinitionTest.java | 100 +-- 647 files changed, 4742 insertions(+), 3829 deletions(-) create mode 100644 docs/1.13/BASE-IDENTITY-MIGRATION.md rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/PowerAdvantage.java (84%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/RecipeMode.java (96%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/blocks/BlockFrame.java (96%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/blocks/BlockPowerSwitch.java (97%) rename src/main/java/zone/moddev/mc/{poweradvantage/gui => basepower/blocks}/package-info.java (77%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/client/ClientOilRenderer.java (91%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/compat/BaseMetalsCompat.java (93%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/conduitnetwork/ConduitNetworkManager.java (97%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/conduitnetwork/ConduitRegistry.java (98%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/conduitnetwork/package-info.java (87%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/config/PowerAdvantageConfig.java (96%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/graphics/package-info.java (70%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/gui/FilteredFluidTankGUI.java (95%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/gui/FluidTankGUI.java (97%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/gui/FunctionalCreativeTab.java (98%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/gui/StillGUI.java (90%) rename src/main/java/zone/moddev/mc/{poweradvantage/items => basepower/gui}/package-info.java (76%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/init/Blocks.java (78%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/init/Entities.java (77%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/init/Fluids.java (98%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/init/Fuels.java (89%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/init/GUI.java (93%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/init/ItemGroups.java (58%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/init/Items.java (93%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/init/Materials.java (77%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/init/ModSupport.java (95%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/init/Recipes.java (91%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/init/TreasureChests.java (86%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/init/Villages.java (94%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/init/WorldGen.java (85%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/init/package-info.java (77%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/items/RotationTool.java (97%) rename src/main/java/zone/moddev/mc/{poweradvantage/blocks => basepower/items}/package-info.java (76%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/conveyors/BlockConveyor.java (97%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/conveyors/BlockConveyorFilter.java (96%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/conveyors/TileEntityBlockFilter.java (76%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/conveyors/TileEntityConveyor.java (98%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/conveyors/TileEntityConveyorFilter.java (95%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/conveyors/TileEntityFoodFilter.java (76%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/conveyors/TileEntityFuelFilter.java (77%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/conveyors/TileEntityInventoryFilter.java (83%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/conveyors/TileEntityOreFilter.java (82%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/conveyors/TileEntityOverflowFilter.java (87%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/conveyors/TileEntityPlantFilter.java (86%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/conveyors/TileEntitySmeltableFilter.java (86%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/conveyors/package-info.java (75%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/creative/InfiniteEnergyBlock.java (96%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/creative/InfiniteEnergyTileEntity.java (89%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/fluidmachines/FluidDischargeBlock.java (97%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/fluidmachines/FluidDischargeTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/fluidmachines/FluidDrainBlock.java (96%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/fluidmachines/FluidDrainTileEntity.java (96%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/fluidmachines/FluidPipeBlock.java (90%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/fluidmachines/MetalTankBlock.java (96%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/fluidmachines/MetalTankTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/fluidmachines/StillBlock.java (98%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/fluidmachines/StillTileEntity.java (97%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/fluidmachines/StorageTankBlock.java (95%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/fluidmachines/StorageTankTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/fluidmachines/modsupport/TerminalFluidPipeBlock.java (90%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/fluidmachines/modsupport/TerminalFluidPipeTileEntity.java (94%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/machines/fluidmachines/package-info.java (74%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/math/BlockPos4D.java (99%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/math/Integer2D.java (95%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/math/package-info.java (55%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/migration/AdvantageLegacyMigrations.java (69%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/migration/LegacyWorldDataHook.java (86%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/package-info.java (81%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/recipe/MaterialTags.java (88%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/recipe/PartsLoot.java (91%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/recipe/RecipeConditions.java (91%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/recipe/RecipeDiscovery.java (93%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/registry/FuelRegistry.java (98%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/registry/ITileEntityGUI.java (96%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/registry/MachineGUIRegistry.java (98%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/registry/package-info.java (67%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/registry/still/recipe/DistillationRecipe.java (98%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/registry/still/recipe/DistillationRecipeRegistry.java (97%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/registry/still/recipe/ExplicitFluidReference.java (96%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/registry/still/recipe/FluidReference.java (97%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/registry/still/recipe/RegistryNameFluidReference.java (93%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/util/FluidContainerHelper.java (98%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/util/FluidHandlerHelper.java (93%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/util/FluidIdHelper.java (94%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/util/HashCodeHelper.java (96%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/util/InventoryWrapper.java (99%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/util/PowerHelper.java (94%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/util/ReversibleHashMap.java (97%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/util/ReversibleMap.java (81%) rename src/main/java/zone/moddev/mc/{poweradvantage => basepower}/util/package-info.java (55%) create mode 100644 src/main/resources/assets/basepower/blockstates/converter_rf_electricity.json create mode 100644 src/main/resources/assets/basepower/blockstates/converter_rf_quantum.json create mode 100644 src/main/resources/assets/basepower/blockstates/converter_rf_steam.json create mode 100644 src/main/resources/assets/basepower/blockstates/converter_tr_electricity.json create mode 100644 src/main/resources/assets/basepower/blockstates/crude_oil.json create mode 100644 src/main/resources/assets/basepower/blockstates/fluid_discharge.json create mode 100644 src/main/resources/assets/basepower/blockstates/fluid_drain.json rename src/main/resources/assets/{poweradvantage => basepower}/blockstates/fluid_metal_tank.json (54%) rename src/main/resources/assets/{poweradvantage => basepower}/blockstates/fluid_pipe.json (70%) rename src/main/resources/assets/{poweradvantage => basepower}/blockstates/fluid_pipe_terminal.json (70%) create mode 100644 src/main/resources/assets/basepower/blockstates/fluid_storage_tank.json create mode 100644 src/main/resources/assets/basepower/blockstates/fluid_switch.json create mode 100644 src/main/resources/assets/basepower/blockstates/infinite_electricity.json create mode 100644 src/main/resources/assets/basepower/blockstates/infinite_quantum.json create mode 100644 src/main/resources/assets/basepower/blockstates/infinite_steam.json create mode 100644 src/main/resources/assets/basepower/blockstates/item_conveyor.json create mode 100644 src/main/resources/assets/basepower/blockstates/item_filter_block.json create mode 100644 src/main/resources/assets/basepower/blockstates/item_filter_food.json create mode 100644 src/main/resources/assets/basepower/blockstates/item_filter_fuel.json create mode 100644 src/main/resources/assets/basepower/blockstates/item_filter_inventory.json create mode 100644 src/main/resources/assets/basepower/blockstates/item_filter_ore.json create mode 100644 src/main/resources/assets/basepower/blockstates/item_filter_overflow.json create mode 100644 src/main/resources/assets/basepower/blockstates/item_filter_plant.json create mode 100644 src/main/resources/assets/basepower/blockstates/item_filter_smelt.json create mode 100644 src/main/resources/assets/basepower/blockstates/refined_oil.json create mode 100644 src/main/resources/assets/basepower/blockstates/steel_frame.json rename src/main/resources/assets/{poweradvantage => basepower}/blockstates/still.json (53%) create mode 100644 src/main/resources/assets/basepower/lang/de_de.json create mode 100644 src/main/resources/assets/basepower/lang/en_au.json create mode 100644 src/main/resources/assets/basepower/lang/en_ca.json create mode 100644 src/main/resources/assets/basepower/lang/en_en.json create mode 100644 src/main/resources/assets/basepower/lang/en_gb.json create mode 100644 src/main/resources/assets/basepower/lang/en_pt.json create mode 100644 src/main/resources/assets/basepower/lang/en_us.json create mode 100644 src/main/resources/assets/basepower/lang/es_es.json create mode 100644 src/main/resources/assets/basepower/lang/es_mx.json create mode 100644 src/main/resources/assets/basepower/lang/it_it.json create mode 100644 src/main/resources/assets/basepower/lang/ja_jp.json create mode 100644 src/main/resources/assets/basepower/lang/ko_kr.json create mode 100644 src/main/resources/assets/basepower/lang/pt_br.json create mode 100644 src/main/resources/assets/basepower/lang/zh_cn.json rename src/main/resources/assets/{poweradvantage => basepower}/models/block/converter_rf_electricity.json (94%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/converter_rf_quantum.json (96%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/converter_rf_steam.json (95%) create mode 100644 src/main/resources/assets/basepower/models/block/converter_tr_electricity.json rename src/main/resources/assets/{poweradvantage => basepower}/models/block/conveyor_base.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/crude_oil.json (52%) create mode 100644 src/main/resources/assets/basepower/models/block/fluid_discharge.json create mode 100644 src/main/resources/assets/basepower/models/block/fluid_drain.json rename src/main/resources/assets/{poweradvantage => basepower}/models/block/fluid_metal_tank.json (94%) create mode 100644 src/main/resources/assets/basepower/models/block/fluid_pipe_0.json create mode 100644 src/main/resources/assets/basepower/models/block/fluid_pipe_densuw.json create mode 100644 src/main/resources/assets/basepower/models/block/fluid_pipe_desuw.json create mode 100644 src/main/resources/assets/basepower/models/block/fluid_pipe_dnu.json create mode 100644 src/main/resources/assets/basepower/models/block/fluid_pipe_ensw.json create mode 100644 src/main/resources/assets/basepower/models/block/fluid_pipe_n.json create mode 100644 src/main/resources/assets/basepower/models/block/fluid_pipe_ns.json create mode 100644 src/main/resources/assets/basepower/models/block/fluid_pipe_nsuw.json create mode 100644 src/main/resources/assets/basepower/models/block/fluid_pipe_nsw.json create mode 100644 src/main/resources/assets/basepower/models/block/fluid_pipe_nuw.json create mode 100644 src/main/resources/assets/basepower/models/block/fluid_pipe_nw.json rename src/main/resources/assets/{poweradvantage => basepower}/models/block/fluid_storage_tank.json (97%) create mode 100644 src/main/resources/assets/basepower/models/block/fluid_switch_off.json create mode 100644 src/main/resources/assets/basepower/models/block/fluid_switch_on.json rename src/main/resources/assets/{poweradvantage => basepower}/models/block/infinite_electricity.json (52%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/infinite_quantum.json (52%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/infinite_steam.json (52%) create mode 100644 src/main/resources/assets/basepower/models/block/item_conveyor.json create mode 100644 src/main/resources/assets/basepower/models/block/item_filter_block.json create mode 100644 src/main/resources/assets/basepower/models/block/item_filter_food.json create mode 100644 src/main/resources/assets/basepower/models/block/item_filter_fuel.json create mode 100644 src/main/resources/assets/basepower/models/block/item_filter_inventory.json create mode 100644 src/main/resources/assets/basepower/models/block/item_filter_ore.json create mode 100644 src/main/resources/assets/basepower/models/block/item_filter_overflow.json create mode 100644 src/main/resources/assets/basepower/models/block/item_filter_plant.json create mode 100644 src/main/resources/assets/basepower/models/block/item_filter_smelt.json rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe1_0.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe1_densuw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe1_desuw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe1_dnu.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe1_ensw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe1_n.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe1_ns.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe1_nsuw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe1_nsw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe1_nuw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe1_nw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe2_0.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe2_densuw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe2_desuw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe2_dnu.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe2_ensw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe2_n.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe2_ns.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe2_nsuw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe2_nsw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe2_nuw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe2_nw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe3_0.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe3_densuw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe3_desuw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe3_dnu.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe3_ensw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe3_n.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe3_ns.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe3_nsuw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe3_nsw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe3_nuw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe3_nw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe4_0.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe4_densuw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe4_desuw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe4_dnu.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe4_ensw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe4_n.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe4_ns.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe4_nsuw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe4_nsw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe4_nuw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/pipe4_nw.json (100%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/refined_oil.json (51%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/steel_frame.json (94%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/still_off.json (96%) rename src/main/resources/assets/{poweradvantage => basepower}/models/block/still_on.json (96%) create mode 100644 src/main/resources/assets/basepower/models/item/bioplastic_ingot.json create mode 100644 src/main/resources/assets/basepower/models/item/bucket_crude_oil.json create mode 100644 src/main/resources/assets/basepower/models/item/bucket_refined_oil.json create mode 100644 src/main/resources/assets/basepower/models/item/converter_rf_electricity.json create mode 100644 src/main/resources/assets/basepower/models/item/converter_rf_quantum.json create mode 100644 src/main/resources/assets/basepower/models/item/converter_rf_steam.json create mode 100644 src/main/resources/assets/basepower/models/item/converter_tr_electricity.json create mode 100644 src/main/resources/assets/basepower/models/item/crude_oil.json rename src/main/resources/assets/{poweradvantage => basepower}/models/item/crude_oil_bucket.json (54%) create mode 100644 src/main/resources/assets/basepower/models/item/fluid_discharge.json create mode 100644 src/main/resources/assets/basepower/models/item/fluid_drain.json create mode 100644 src/main/resources/assets/basepower/models/item/fluid_metal_tank.json create mode 100644 src/main/resources/assets/basepower/models/item/fluid_pipe.json create mode 100644 src/main/resources/assets/basepower/models/item/fluid_pipe_terminal.json create mode 100644 src/main/resources/assets/basepower/models/item/fluid_storage_tank.json create mode 100644 src/main/resources/assets/basepower/models/item/fluid_switch.json create mode 100644 src/main/resources/assets/basepower/models/item/infinite_electricity.json create mode 100644 src/main/resources/assets/basepower/models/item/infinite_quantum.json create mode 100644 src/main/resources/assets/basepower/models/item/infinite_steam.json create mode 100644 src/main/resources/assets/basepower/models/item/item_conveyor.json create mode 100644 src/main/resources/assets/basepower/models/item/item_filter_block.json create mode 100644 src/main/resources/assets/basepower/models/item/item_filter_food.json create mode 100644 src/main/resources/assets/basepower/models/item/item_filter_fuel.json create mode 100644 src/main/resources/assets/basepower/models/item/item_filter_inventory.json create mode 100644 src/main/resources/assets/basepower/models/item/item_filter_ore.json create mode 100644 src/main/resources/assets/basepower/models/item/item_filter_overflow.json create mode 100644 src/main/resources/assets/basepower/models/item/item_filter_plant.json create mode 100644 src/main/resources/assets/basepower/models/item/item_filter_smelt.json create mode 100644 src/main/resources/assets/basepower/models/item/refined_oil.json rename src/main/resources/assets/{poweradvantage => basepower}/models/item/refined_oil_bucket.json (53%) rename src/main/resources/assets/{poweradvantage => basepower}/models/item/rotator_tool.json (50%) rename src/main/resources/assets/{poweradvantage => basepower}/models/item/sprocket.json (53%) rename src/main/resources/assets/{poweradvantage => basepower}/models/item/starch.json (54%) create mode 100644 src/main/resources/assets/basepower/models/item/steel_frame.json create mode 100644 src/main/resources/assets/basepower/models/item/still.json rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/crude_oil_flow.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/crude_oil_flow.png.mcmeta (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/crude_oil_still.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/crude_oil_still.png.mcmeta (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/filter_bottom.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/filter_side_block.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/filter_side_food.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/filter_side_fuel.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/filter_side_inventory.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/filter_side_ore.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/filter_side_overflow.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/filter_side_plantable.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/filter_side_smeltable.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/fluid_discharge_face.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/fluid_discharge_side.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/fluid_drain_face.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/fluid_drain_side.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/fluid_metal_tank_side.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/fluid_metal_tank_top.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/fluid_pipe.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/fluid_switch_off.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/fluid_switch_on.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/item_conveyor_end.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/item_conveyor_side.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/item_conveyor_top.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/metal_panel.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/powercable.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/refined_oil_flow.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/refined_oil_flow.png.mcmeta (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/refined_oil_still.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/refined_oil_still.png.mcmeta (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/steel_frame.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/blocks/techreborn_converter.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/gui/container/fluid_discharge_gui.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/gui/container/fluid_drain_gui.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/gui/container/fluid_metal_tank_gui.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/gui/container/fluid_storage_tank_gui.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/gui/container/item_conveyor.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/gui/container/item_conveyor_block.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/gui/container/item_conveyor_food.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/gui/container/item_conveyor_fuel.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/gui/container/item_conveyor_inventory.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/gui/container/item_conveyor_ore.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/gui/container/item_conveyor_overflow.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/gui/container/item_conveyor_plant.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/gui/container/item_conveyor_smelt.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/gui/container/machineGUI_template.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/gui/container/player_inventory.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/gui/container/still_gui.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/items/bioplastic_ingot.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/items/bucket_crude_oil.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/items/bucket_refined_oil.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/items/rotator_tool.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/items/sprocket.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/items/starch.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/materials/brass.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/materials/copper.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/materials/invar.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/materials/iron.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/materials/metal_panel.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/materials/plastic.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/materials/steel.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/materials/steel_dark.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/materials/stone.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/materials/stone_brick.png (100%) rename src/main/resources/assets/{poweradvantage => basepower}/textures/materials/wood.png (100%) delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/converter_rf_electricity.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/converter_rf_quantum.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/converter_rf_steam.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/converter_tr_electricity.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/crude_oil.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/fluid_discharge.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/fluid_drain.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/fluid_storage_tank.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/fluid_switch.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/infinite_electricity.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/infinite_quantum.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/infinite_steam.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/item_conveyor.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/item_filter_block.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/item_filter_food.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/item_filter_fuel.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/item_filter_inventory.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/item_filter_ore.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/item_filter_overflow.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/item_filter_plant.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/item_filter_smelt.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/refined_oil.json delete mode 100644 src/main/resources/assets/poweradvantage/blockstates/steel_frame.json delete mode 100644 src/main/resources/assets/poweradvantage/lang/de_de.json delete mode 100644 src/main/resources/assets/poweradvantage/lang/en_au.json delete mode 100644 src/main/resources/assets/poweradvantage/lang/en_ca.json delete mode 100644 src/main/resources/assets/poweradvantage/lang/en_en.json delete mode 100644 src/main/resources/assets/poweradvantage/lang/en_gb.json delete mode 100644 src/main/resources/assets/poweradvantage/lang/en_pt.json delete mode 100644 src/main/resources/assets/poweradvantage/lang/en_us.json delete mode 100644 src/main/resources/assets/poweradvantage/lang/es_es.json delete mode 100644 src/main/resources/assets/poweradvantage/lang/es_mx.json delete mode 100644 src/main/resources/assets/poweradvantage/lang/it_it.json delete mode 100644 src/main/resources/assets/poweradvantage/lang/ja_jp.json delete mode 100644 src/main/resources/assets/poweradvantage/lang/ko_kr.json delete mode 100644 src/main/resources/assets/poweradvantage/lang/pt_br.json delete mode 100644 src/main/resources/assets/poweradvantage/lang/zh_cn.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/converter_tr_electricity.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/fluid_discharge.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/fluid_drain.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/fluid_pipe_0.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/fluid_pipe_densuw.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/fluid_pipe_desuw.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/fluid_pipe_dnu.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/fluid_pipe_ensw.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/fluid_pipe_n.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/fluid_pipe_ns.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/fluid_pipe_nsuw.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/fluid_pipe_nsw.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/fluid_pipe_nuw.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/fluid_pipe_nw.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/fluid_switch_off.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/fluid_switch_on.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/item_conveyor.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/item_filter_block.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/item_filter_food.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/item_filter_fuel.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/item_filter_inventory.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/item_filter_ore.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/item_filter_overflow.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/item_filter_plant.json delete mode 100644 src/main/resources/assets/poweradvantage/models/block/item_filter_smelt.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/bioplastic_ingot.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/bucket_crude_oil.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/bucket_refined_oil.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/converter_rf_electricity.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/converter_rf_quantum.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/converter_rf_steam.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/converter_tr_electricity.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/crude_oil.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/fluid_discharge.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/fluid_drain.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/fluid_metal_tank.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/fluid_pipe.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/fluid_pipe_terminal.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/fluid_storage_tank.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/fluid_switch.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/infinite_electricity.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/infinite_quantum.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/infinite_steam.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/item_conveyor.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/item_filter_block.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/item_filter_food.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/item_filter_fuel.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/item_filter_inventory.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/item_filter_ore.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/item_filter_overflow.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/item_filter_plant.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/item_filter_smelt.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/refined_oil.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/steel_frame.json delete mode 100644 src/main/resources/assets/poweradvantage/models/item/still.json rename src/main/resources/coremods/{poweradvantage_113_migration.js => basepower_113_migration.js} (96%) rename src/main/resources/coremods/{poweradvantage_material_tags.js => basepower_material_tags.js} (89%) rename src/main/resources/coremods/{poweradvantage_oil_renderer.js => basepower_oil_renderer.js} (96%) rename src/main/resources/coremods/{poweradvantage_parts_loot.js => basepower_parts_loot.js} (94%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/bioplastic_from_starch.json (75%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/converter_rf_electricity.json (89%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/converter_rf_quantum.json (90%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/converter_rf_steam.json (90%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/converter_tr_electricity_iron.json (86%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/converter_tr_electricity_refined_iron.json (84%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/fluid_discharge.json (92%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/fluid_drain.json (93%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/fluid_metal_tank_iron_normal.json (86%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/fluid_metal_tank_steel.json (87%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/fluid_pipe_copper_apocalyptic.json (80%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/fluid_pipe_copper_normal.json (82%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/fluid_pipe_iron_apocalyptic.json (81%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/fluid_pipe_iron_normal.json (82%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/fluid_pipe_iron_tech.json (83%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/fluid_pipe_lead_apocalyptic.json (81%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/fluid_storage_tank.json (88%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/fluid_switch.json (91%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/item_conveyor.json (91%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/item_filter_block.json (86%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/item_filter_food.json (86%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/item_filter_fuel.json (86%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/item_filter_inventory.json (85%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/item_filter_ore.json (86%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/item_filter_overflow.json (82%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/item_filter_plant.json (86%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/item_filter_smelt.json (86%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/rotator_tool.json (89%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/sprocket_bronze_nugget_tech_no_rod.json (84%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/sprocket_rod_normal.json (87%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/sprocket_rod_tech.json (88%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/sprocket_stickwood_normal.json (81%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/starch_from_potato.json (88%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/steel_frame.json (85%) rename src/main/resources/data/{poweradvantage => basepower}/advancements/recipes/still.json (93%) rename src/main/resources/data/{poweradvantage => basepower}/loot_tables/chests/advantage_parts.json (77%) rename src/main/resources/data/{poweradvantage => basepower}/orespawn/provider.json (89%) create mode 100644 src/main/resources/data/basepower/recipes/bioplastic_from_starch.json rename src/main/resources/data/{poweradvantage => basepower}/recipes/converter_rf_electricity.json (66%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/converter_rf_quantum.json (70%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/converter_rf_steam.json (67%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/converter_tr_electricity_iron.json (63%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/converter_tr_electricity_refined_iron.json (65%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/crushing_fluid_discharge.json (63%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/crushing_fluid_drain.json (64%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/crushing_fluid_storage_tank.json (63%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/crushing_item_conveyor.json (70%) create mode 100644 src/main/resources/data/basepower/recipes/crushing_item_filter_block.json rename src/main/resources/data/{poweradvantage => basepower}/recipes/crushing_item_filter_food.json (69%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/crushing_item_filter_fuel.json (69%) create mode 100644 src/main/resources/data/basepower/recipes/crushing_item_filter_inventory.json rename src/main/resources/data/{poweradvantage => basepower}/recipes/crushing_item_filter_ore.json (70%) create mode 100644 src/main/resources/data/basepower/recipes/crushing_item_filter_overflow.json create mode 100644 src/main/resources/data/basepower/recipes/crushing_item_filter_plant.json create mode 100644 src/main/resources/data/basepower/recipes/crushing_item_filter_smelt.json rename src/main/resources/data/{poweradvantage => basepower}/recipes/crushing_potato_starch.json (88%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/fluid_discharge.json (65%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/fluid_drain.json (65%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/fluid_metal_tank_iron_normal.json (61%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/fluid_metal_tank_steel.json (64%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/fluid_pipe_copper_apocalyptic.json (64%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/fluid_pipe_copper_normal.json (64%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/fluid_pipe_iron_apocalyptic.json (64%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/fluid_pipe_iron_normal.json (63%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/fluid_pipe_iron_tech.json (64%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/fluid_pipe_lead_apocalyptic.json (64%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/fluid_storage_tank.json (64%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/fluid_switch.json (67%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/item_conveyor.json (69%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/item_filter_block.json (66%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/item_filter_food.json (65%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/item_filter_fuel.json (66%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/item_filter_inventory.json (63%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/item_filter_ore.json (64%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/item_filter_overflow.json (57%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/item_filter_plant.json (64%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/item_filter_smelt.json (64%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/rotator_tool.json (65%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/sprocket_bronze_nugget_tech_no_rod.json (64%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/sprocket_rod_normal.json (64%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/sprocket_rod_tech.json (65%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/sprocket_stickwood_normal.json (65%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/starch_from_potato.json (63%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/steel_frame.json (65%) rename src/main/resources/data/{poweradvantage => basepower}/recipes/still.json (73%) delete mode 100644 src/main/resources/data/poweradvantage/recipes/bioplastic_from_starch.json delete mode 100644 src/main/resources/data/poweradvantage/recipes/crushing_item_filter_block.json delete mode 100644 src/main/resources/data/poweradvantage/recipes/crushing_item_filter_inventory.json delete mode 100644 src/main/resources/data/poweradvantage/recipes/crushing_item_filter_overflow.json delete mode 100644 src/main/resources/data/poweradvantage/recipes/crushing_item_filter_plant.json delete mode 100644 src/main/resources/data/poweradvantage/recipes/crushing_item_filter_smelt.json rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/blocks/BlockFrameOpacityTest.java (87%) rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/conduitnetwork/ConduitNetworkManagerTest.java (96%) rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/conduitnetwork/PowerTransferAccountingTest.java (97%) rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/machines/conveyors/ConveyorTransferTest.java (93%) rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/machines/fluidmachines/WorldFluidPickupTest.java (95%) rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/migration/AdvantageLegacyMigrationsTest.java (62%) rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/migration/LegacyEnchantmentsTest.java (80%) rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/migration/LegacyEntitiesTest.java (97%) create mode 100644 src/test/java/zone/moddev/mc/basepower/migration/LegacyVanillaInventoriesTest.java rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/registry/MachineGuiTitleTest.java (93%) rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/resources/BuildWorkflowContractTest.java (77%) rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/resources/ClientResourceContractTest.java (92%) rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/resources/MaterialTagTransformerTest.java (88%) rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/resources/OilRendererTransformerTest.java (93%) rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/resources/PartsLootTransformerTest.java (87%) rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/resources/RecipeUnlockContractTest.java (98%) rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/resources/StarchRecipeTest.java (82%) rename src/test/java/zone/moddev/mc/{poweradvantage => basepower}/support/PowerNativeTestBootstrap.java (97%) create mode 100644 test-rig/migration/native113_machine_upgrade.py create mode 100644 test-rig/migration/native113_rebrand.py create mode 100644 test-rig/migration/native113_rebrand_order.py create mode 100644 test-rig/migration/test_native113_rebrand_order.py diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 912c9ace..6b1d1111 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ permissions: contents: read concurrency: - group: poweradvantage-1.13-${{ github.workflow }}-${{ github.ref }} + group: basepower-1.13-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: @@ -30,12 +30,25 @@ jobs: - name: Use canonical LF dependency inputs # Base Metals predates archive text normalization; its LF artifact is separately pinned. run: git config --global core.autocrlf false + - name: Read Base Metals development pin + id: basemetals-pin + shell: bash + run: | + set -euo pipefail + ref=$(sed -n 's/^basemetals_source_commit=//p' gradle.properties) + [[ "$ref" =~ ^[a-f0-9]{40}$ ]] + echo "ref=$ref" >> "$GITHUB_OUTPUT" - name: Check out pinned Base Metals uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/BaseMetals - ref: 1376a20d7d5ba22d3abc77dc34b49a2c88943697 + ref: ${{ steps.basemetals-pin.outputs.ref }} path: .ci-dependencies/BaseMetals + - name: Install Java 25 for Mavenizer + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + with: + distribution: temurin + java-version: '25.0.3+9.0.LTS' - name: Install Java 8 toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: @@ -57,9 +70,12 @@ jobs: basemetals="$GITHUB_WORKSPACE/.ci-dependencies/BaseMetals" chmod +x "$orespawn/gradlew" "$basemetals/gradlew" (cd "$orespawn" && ./gradlew jar --no-daemon --stacktrace) - (cd "$basemetals" && ./gradlew jar --no-daemon --stacktrace) + mirror="$RUNNER_TEMP/orespawn-mirror" + (cd "$basemetals" && bash gradle/stage-orespawn-release.sh "$mirror" && + ./gradlew jar "-PorespawnVerificationRepository=$mirror" --no-daemon --stacktrace) + bm_version=$(sed -n 's/^basemetals_version=//p' gradle.properties) osjar="$orespawn/build/libs-dev/OreSpawn-4.1.0.113021-deobf.jar" - bmjar="$basemetals/build/libs-dev/BaseMetals-3.0.1.113021-deobf.jar" + bmjar="$basemetals/build/libs-dev/BaseMetals-$bm_version-deobf.jar" test -f "$osjar" && test -f "$bmjar" echo "orespawn=$osjar" >> "$GITHUB_OUTPUT" echo "basemetals=$bmjar" >> "$GITHUB_OUTPUT" @@ -73,20 +89,21 @@ jobs: - name: Upload audited release candidate uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: PowerAdvantage-1.13.2-${{ github.sha }} + name: basePower-1.13.2-${{ github.sha }} if-no-files-found: error retention-days: 30 path: | - build/libs/PowerAdvantage-2.4.4.113021.jar - build/libs/PowerAdvantage-2.4.4.113021-sources.jar - build/libs/PowerAdvantage-2.4.4.113021-javadoc.jar + build/libs/basePower-2.4.5.113021.jar + build/libs/basePower-2.4.5.113021-sources.jar + build/libs/basePower-2.4.5.113021-javadoc.jar + build/libs-dev/basePower-2.4.5.113021-deobf.jar build/release/SHA256SUMS CHANGELOG.txt - name: Upload diagnostics on failure if: failure() uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: PowerAdvantage-1.13.2-diagnostics-${{ github.sha }} + name: basePower-1.13.2-diagnostics-${{ github.sha }} if-no-files-found: ignore retention-days: 14 path: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f403b0cc..97f4d269 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,12 +30,25 @@ jobs: - name: Use canonical LF dependency inputs # Base Metals predates archive text normalization; its LF artifact is separately pinned. run: git config --global core.autocrlf false + - name: Read Base Metals development pin + id: basemetals-pin + shell: bash + run: | + set -euo pipefail + ref=$(sed -n 's/^basemetals_source_commit=//p' gradle.properties) + [[ "$ref" =~ ^[a-f0-9]{40}$ ]] + echo "ref=$ref" >> "$GITHUB_OUTPUT" - name: Check out pinned Base Metals uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/BaseMetals - ref: 1376a20d7d5ba22d3abc77dc34b49a2c88943697 + ref: ${{ steps.basemetals-pin.outputs.ref }} path: .ci-dependencies/BaseMetals + - name: Install Java 25 for Mavenizer + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + with: + distribution: temurin + java-version: '25.0.3+9.0.LTS' - name: Install Java 8 toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: @@ -57,9 +70,12 @@ jobs: basemetals="$GITHUB_WORKSPACE/.ci-dependencies/BaseMetals" chmod +x "$orespawn/gradlew" "$basemetals/gradlew" (cd "$orespawn" && ./gradlew jar --no-daemon --stacktrace) - (cd "$basemetals" && ./gradlew jar --no-daemon --stacktrace) + mirror="$RUNNER_TEMP/orespawn-mirror" + (cd "$basemetals" && bash gradle/stage-orespawn-release.sh "$mirror" && + ./gradlew jar "-PorespawnVerificationRepository=$mirror" --no-daemon --stacktrace) + bm_version=$(sed -n 's/^basemetals_version=//p' gradle.properties) echo "orespawn=$orespawn/build/libs-dev/OreSpawn-4.1.0.113021-deobf.jar" >> "$GITHUB_OUTPUT" - echo "basemetals=$basemetals/build/libs-dev/BaseMetals-3.0.1.113021-deobf.jar" >> "$GITHUB_OUTPUT" + echo "basemetals=$basemetals/build/libs-dev/BaseMetals-$bm_version-deobf.jar" >> "$GITHUB_OUTPUT" - name: Initialize CodeQL uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4 with: diff --git a/.github/workflows/release-on-tag.yml b/.github/workflows/release-on-tag.yml index af9cd1ab..5cb77899 100644 --- a/.github/workflows/release-on-tag.yml +++ b/.github/workflows/release-on-tag.yml @@ -10,13 +10,13 @@ permissions: contents: read concurrency: - group: poweradvantage-release-tag-${{ github.ref_name }} + group: basepower-release-tag-${{ github.ref_name }} cancel-in-progress: false jobs: validate-release-tag: name: Validate tag for manual release confirmation - if: github.repository == 'MinecraftModDevelopmentMods/PowerAdvantage' + if: github.repository == 'MinecraftModDevelopmentMods/basePower' runs-on: ubuntu-latest timeout-minutes: 10 diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a314f267..18fed4f2 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,11 @@ +2.4.5.113021 - basePower for Minecraft 1.13.2 + +- Bring basePower to Forge 1.13.2 under the basePower name. +- Read both original Advantage and released base* worlds through the 1.13 block conversion, keeping machine inventories, fluid amounts and saved power. +- Convert filled oil buckets and keep the original configuration files when importing settings. +- Convert old vanilla item IDs in machine inventories, including sugar cane stored in growth chambers. +- Put all three mods' player-facing items on one creative tab named basePower. + Unreleased test-coverage repairs for 1.13.2 - Keep steel frames non-opaque on dedicated servers as well as clients. diff --git a/README.md b/README.md index 54ea130e..c1bd5fd7 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,14 @@ -# PowerAdvantage +# basePower for Minecraft 1.13.2 -Power Advantage provides shared power, fluid, item transport, and compatibility APIs for its Minecraft 1.13.2 expansion mods. +basePower continues DrCyano's Power Advantage with conveyors, filters, fluid plumbing and the shared systems used by baseSteam and baseElectric. -This port keeps existing registry names and includes migration from 1.10 and 1.12. -Always back up a world before upgrading, and check that its other mods also support the target version. -The [qualification notes](docs/1.13/CURRENT-QUALIFICATION.md) separate tested scenarios from remaining gaps; +- Use Forge 25.0.223, Java 8, Base Metals 3.0.2.113021 and MMD OreSpawn 4.1.0.113021. The older Base Metals 3.0.1 download can crash while converting an old world. +- Back up the world and config. Replace the old Advantage or base* jars together, then open a copy of your world first. Save it, close Minecraft completely, and reopen the copy before upgrading your main world. + +The upgrade understands original Advantage 1.10.2 and the released base* builds for 1.10.2 and 1.12.2. Check that the other mods in your world also support 1.13.2. + +All three mods share the **basePower** creative tab. Look for the sprocket. +The [base* upgrade notes](docs/1.13/BASE-IDENTITY-MIGRATION.md) separate tested scenarios from remaining gaps; they are not a guarantee that an entire modpack can be upgraded without losses. Recipe-book discovery now follows relevant ingredients. See the [all-Advantage material checklist and automated discovery tests](docs/1.13/RECIPE-DISCOVERY.md). To regenerate the checked-in unlock JSON after changing recipes, run `node tools/generate-recipe-unlocks.js`; `check` rejects missing or stale ingredient criteria. @@ -15,7 +19,7 @@ The [manufacturing progression audit](docs/1.13/MANUFACTURING-PROGRESSION.md) tr The `master-1.13.2` build uses ForgeGradle 7.0.34 and Gradle 9.6.1. Run Gradle with Java 17; Gradle resolves the Java 8 production toolchain. -Build the pinned Base Metals `3.0.1.113021` and OreSpawn `4.1.0.113021` deobf jars in their sibling checkouts, then run: +Build the pinned Base Metals `3.0.2.113021` and OreSpawn `4.1.0.113021` deobf jars in their sibling checkouts, then run: ```text gradlew.bat clean check build javadoc verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums verifyEclipseProductionClasspath @@ -31,6 +35,7 @@ Advantage's own archives normalize text to LF. All Advantage archives also exclude empty directories left behind by older source layouts. Release jars are written to `build/libs`; `deobfJar` writes the sibling-development jar to `build/libs-dev`. +For publishing, use the [MMD release workflow](https://github.com/MinecraftModDevelopmentMods/basePower/actions/workflows/deploy-release.yml). It publishes the same checked jar to CurseForge and MMD Maven. For Eclipse, import this repository as an existing Gradle project and run: @@ -53,7 +58,7 @@ The [client resource probe](test-rig/client-resources/README.md) checks native b The [stronger regression-test backport](docs/1.13/TEST-COVERAGE-BACKPORT.md) records the local repairs, tested jar hashes and remaining manual checks. -The implementation namespace is `zone.moddev.mc.poweradvantage`. The historical `cyano.poweradvantage.api` surface, including `FluidNetworkApi`, remains available to dependent mods. Registry names, fluids, tile IDs, NBT keys, OreSpawn provider IDs, and configuration meaning remain stable. +The implementation namespace is `zone.moddev.mc.basepower`. The historical `cyano.poweradvantage.api` surface, including `FluidNetworkApi`, remains available. World migration translates old Advantage registry, fluid and tile names to the corresponding base* names while retaining saved machine data. PowerAdvantage owns the shared pre-flattening migration hook used by all three Advantage mods. See [the 1.13 migration guide](docs/1.13/MIGRATION.md) before opening an irreplaceable 1.10 or 1.12 world. The [Advantage Works rig](test-rig/README.md) provides repeatable machine, restart, world-generation, and migration checks. diff --git a/build.gradle b/build.gradle index 9089ac98..7914d668 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { group = project.mod_group version = project.mod_version -base.archivesName = 'PowerAdvantage' +base.archivesName = 'basePower' def versionParts = project.mod_version.toString().tokenize('.') if (versionParts.size() != 4 || !versionParts.every { it ==~ /\d+/ }) { @@ -101,7 +101,7 @@ minecraft { workingDir.convention layout.projectDirectory.dir(configuredRunDirectory) systemProperty 'forge.logging.markers', 'REGISTRIES' systemProperty 'forge.logging.console.level', 'info' - mods { poweradvantage { source sourceSets.main } } + mods { basepower { source sourceSets.main } } environment 'target', forge25RunTargets[name] environment 'MCP_MAPPINGS', "${mapping_channel}_${mapping_version}" environment 'MCP_VERSION', mcp_version @@ -166,7 +166,7 @@ repositories { // build to a drive letter. CI and other layouts can override either path. def baseMetalsDeobfJar = file(providers.gradleProperty('baseMetalsDeobfJar') .getOrElse('../../../BaseMetals/BaseMetals 113/BaseMetals/build/libs-dev/' - + 'BaseMetals-3.0.1.113021-deobf.jar')) + + "BaseMetals-${project.basemetals_version}-deobf.jar")) def oreSpawnDeobfJar = file(providers.gradleProperty('oreSpawnDeobfJar') .getOrElse('../../../MinecraftMineralogy/OS113/OreSpawn/build/libs-dev/' + 'OreSpawn-4.1.0.113021-deobf.jar')) @@ -314,7 +314,7 @@ tasks.register('verifyReleaseConfiguration') { group = 'verification' description = 'Validates release identity, target metadata, and optional integration policy.' doLast { - if (project.mod_version != '2.4.4.113021') { + if (project.mod_version != '2.4.5.113021') { throw new GradleException("Unexpected PowerAdvantage release version: ${project.mod_version}") } if (project.minecraft_version != '1.13.2' @@ -329,10 +329,10 @@ tasks.register('verifyReleaseConfiguration') { || project.gradle_java_version != '17') { throw new GradleException('Unexpected release dispatcher target metadata') } - if (project.mod_id != 'poweradvantage' - || project.group.toString() != 'zone.moddev.mc.poweradvantage' - || base.archivesName.get() != 'PowerAdvantage' - || project.curseforge_project_id != '240982') { + if (project.mod_id != 'basepower' + || project.group.toString() != 'zone.moddev.mc.basepower' + || base.archivesName.get() != 'basePower' + || project.curseforge_project_id != '1780140') { throw new GradleException('Unexpected Forge, Maven, archive, or CurseForge identity') } if (project.cf_requirements != 'base-metals,mmd-orespawn' @@ -340,16 +340,16 @@ tasks.register('verifyReleaseConfiguration') { || project.cf_versions != '1.13.2') { throw new GradleException('Unexpected CurseForge dependency or game-version metadata') } - if (project.basemetals_version != '3.0.1.113021' + if (project.basemetals_version != '3.0.2.113021' || project.orespawn_version != '4.1.0.113021' - || project.basemetals_source_commit != '1376a20d7d5ba22d3abc77dc34b49a2c88943697' + || !(project.basemetals_source_commit ==~ /[a-f0-9]{40}/) || project.orespawn_source_commit != '6a7c2bb07b9a7771128812fcc07d185f7d9df58b') { throw new GradleException('Unexpected Base Metals or OreSpawn dependency identity') } String mainSource = file( - 'src/main/java/zone/moddev/mc/poweradvantage/PowerAdvantage.java').getText('UTF-8') - if (!mainSource.contains('MODID = "poweradvantage"') - || !mainSource.contains('VERSION = "2.4.4.113021"') + 'src/main/java/zone/moddev/mc/basepower/PowerAdvantage.java').getText('UTF-8') + if (!mainSource.contains('MODID = "basepower"') + || !mainSource.contains('VERSION = "2.4.5.113021"') || !mainSource.contains('@Mod(PowerAdvantage.MODID)')) { throw new GradleException('PowerAdvantage source identity changed') } @@ -357,7 +357,7 @@ tasks.register('verifyReleaseConfiguration') { throw new GradleException('Legacy cyano.poweradvantage.api compatibility surface is missing') } String entitySource = file( - 'src/main/java/zone/moddev/mc/poweradvantage/init/Entities.java').getText('UTF-8') + 'src/main/java/zone/moddev/mc/basepower/init/Entities.java').getText('UTF-8') [ 'tileentity.pipe_terminal', 'tileentity.fluid_drain', 'tileentity.fluid_discharge', 'tileentity.fluid_storage_tank', @@ -371,7 +371,7 @@ tasks.register('verifyReleaseConfiguration') { } } String modsToml = file('src/main/resources/META-INF/mods.toml').getText('UTF-8').replace('\r\n', '\n') - ['modId="poweradvantage"', 'modId="basemetals"', 'modId="orespawn"', + ['modId="basepower"', 'modId="basemetals"', 'modId="orespawn"', 'mandatory=true'].each { required -> if (!modsToml.contains(required)) { throw new GradleException("Source mods.toml is missing ${required}") @@ -401,9 +401,9 @@ tasks.register('verifyReleaseConfiguration') { } } Map provider = new JsonSlurper().parse(file( - 'src/main/resources/data/poweradvantage/orespawn/provider.json')) as Map + 'src/main/resources/data/basepower/orespawn/provider.json')) as Map Map desertOil = provider.fluid_deposits[ - 'poweradvantage:fluid_deposit/desert_crude_oil'].dimensions['minecraft:overworld'] as Map + 'basepower:fluid_deposit/desert_crude_oil'].dimensions['minecraft:overworld'] as Map if (desertOil.biome_dictionary != ['SANDY'] || (desertOil.excluded_biome_dictionary as Set) != (['BEACH', 'MESA'] as Set)) { throw new GradleException( @@ -508,12 +508,12 @@ tasks.register('verifyReleaseArtifacts') { new ZipFile(mainJar).withCloseable { zip -> List names = zip.entries().collect { it.name } ['META-INF/mods.toml', 'pack.mcmeta', - 'zone/moddev/mc/poweradvantage/PowerAdvantage.class', + 'zone/moddev/mc/basepower/PowerAdvantage.class', 'cyano/poweradvantage/api/PoweredEntity.class', 'cyano/poweradvantage/api/fluid/FluidNetworkApi.class', - 'assets/poweradvantage/lang/en_us.json', - 'data/poweradvantage/recipes/fluid_drain.json', - 'data/poweradvantage/advancements/recipes/sprocket_rod_normal.json'].each { required -> + 'assets/basepower/lang/en_us.json', + 'data/basepower/recipes/fluid_drain.json', + 'data/basepower/advancements/recipes/sprocket_rod_normal.json'].each { required -> if (!names.contains(required)) { throw new GradleException("Release jar is missing ${required}") } @@ -529,7 +529,7 @@ tasks.register('verifyReleaseArtifacts') { } String modsToml = zip.getInputStream(zip.getEntry('META-INF/mods.toml')) .getText(StandardCharsets.UTF_8.name()) - if (!modsToml.contains('modId="poweradvantage"') + if (!modsToml.contains('modId="basepower"') || !modsToml.contains("version=\"${project.mod_version}\"") || !modsToml.contains('modId="basemetals"') || !modsToml.contains('modId="orespawn"')) { @@ -557,7 +557,7 @@ tasks.register('verifyReleaseArtifacts') { } new ZipFile(new File(libs, expectedReleaseFiles.get()[1])).withCloseable { sourceZip -> - if (sourceZip.getEntry('zone/moddev/mc/poweradvantage/PowerAdvantage.java') == null + if (sourceZip.getEntry('zone/moddev/mc/basepower/PowerAdvantage.java') == null || sourceZip.getEntry('cyano/poweradvantage/api/PoweredEntity.java') == null) { throw new GradleException('Sources jar is missing implementation or legacy API sources') } @@ -657,7 +657,7 @@ publishing { pom { name = 'Power Advantage' description = project.mod_description - url = 'https://github.com/MinecraftModDevelopmentMods/PowerAdvantage' + url = 'https://github.com/MinecraftModDevelopmentMods/basePower' licenses { license { name = 'GNU Lesser General Public License, Version 3' @@ -665,9 +665,9 @@ publishing { } } scm { - connection = 'scm:git:https://github.com/MinecraftModDevelopmentMods/PowerAdvantage.git' - developerConnection = 'scm:git:ssh://git@github.com/MinecraftModDevelopmentMods/PowerAdvantage.git' - url = 'https://github.com/MinecraftModDevelopmentMods/PowerAdvantage' + connection = 'scm:git:https://github.com/MinecraftModDevelopmentMods/basePower.git' + developerConnection = 'scm:git:ssh://git@github.com/MinecraftModDevelopmentMods/basePower.git' + url = 'https://github.com/MinecraftModDevelopmentMods/basePower' } } } @@ -893,6 +893,10 @@ tasks.register('verifyEclipseProductionClasspath') { throw new GradleException('Eclipse Buildship does not use this wrapper and Gradle home') } String projectMetadata = file('.project').getText('UTF-8') + String eclipseProjectName = new groovy.xml.XmlSlurper().parseText(projectMetadata).name.text() + if (eclipseProjectName != 'PowerAdvantage') { + throw new GradleException("Eclipse project must keep the checkout name PowerAdvantage: ${eclipseProjectName}") + } if (!projectMetadata.contains('org.eclipse.buildship.core.gradleprojectnature') || !projectMetadata.contains('org.eclipse.buildship.core.gradleprojectbuilder')) { throw new GradleException('Eclipse project metadata is missing its Buildship nature or builder') @@ -924,6 +928,12 @@ tasks.register('verifyEclipseProductionClasspath') { "${File.pathSeparator}${project.mod_id}%%${file(mainOutput).absolutePath}" ['runClient.launch', 'runServer.launch', 'runData.launch'].each { name -> def launch = new groovy.xml.XmlSlurper().parse(file(name)) + String launchProject = launch.stringAttribute.find { + it.@key.text() == 'org.eclipse.jdt.launching.PROJECT_ATTR' + }.@value.text() + if (launchProject != eclipseProjectName) { + throw new GradleException("${name} points to ${launchProject}, not ${eclipseProjectName}") + } String modClasses = launch.mapAttribute.find { it.@key.text() == 'org.eclipse.debug.core.environmentVariables' }.mapEntry.find { it.@key.text() == 'MOD_CLASSES' }.@value.text() @@ -940,11 +950,6 @@ tasks.register('verifyEclipseProductionClasspath') { || contents.contains('src/test') || contents.contains('bin/test')) { throw new GradleException("${name} does not isolate production code") } - if (launch.stringAttribute.find { - it.@key.text() == 'org.eclipse.jdt.launching.PROJECT_ATTR' - }.@value.text() != 'PowerAdvantage') { - throw new GradleException("${name} targets the wrong Eclipse project") - } if (contents.contains('org.eclipse.buildship.core.gradleclasspathcontainer')) { throw new GradleException("${name} exposes compileOnly dependencies at runtime") } @@ -1090,9 +1095,9 @@ tasks.register('verifyRecipeTagGuards') { throw new GradleException("${recipeFile.path} contains a non-object recipe condition") } Set guards = conditions - .findAll { it instanceof Map && it.type == 'poweradvantage:tag_not_empty' } + .findAll { it instanceof Map && it.type == 'basepower:tag_not_empty' } .collect { it.tag as String } as Set - Set emptyGuards = conditions.findAll { it.type == 'poweradvantage:tag_empty' } + Set emptyGuards = conditions.findAll { it.type == 'basepower:tag_empty' } .collect { it.tag as String } as Set if (!(emptyGuards.intersect(guards)).isEmpty()) { throw new GradleException("${recipeFile.path} requires the same tag to be empty and nonempty") @@ -1133,10 +1138,10 @@ tasks.register('clientResourceProbeJar', Jar) { // Optional coordinated play-test launch. The ordinary launch stays Power-only; // these deobf jars are runtime inputs, never release contents or compile dependencies. def advantageExtensionJars = [ - steamadvantage: file(providers.gradleProperty('steamAdvantageDeobfJar').getOrElse( - '../SteamAdvantage/SteamAdvantage/build/libs-dev/SteamAdvantage-2.2.5.113021-deobf.jar')), - electricadvantage: file(providers.gradleProperty('electricAdvantageDeobfJar').getOrElse( - '../ElectricAdvantage/ElectricAdvantage/build/libs-dev/ElectricAdvantage-2.2.5.113021-deobf.jar')) + basesteam: file(providers.gradleProperty('steamAdvantageDeobfJar').getOrElse( + '../SteamAdvantage/SteamAdvantage/build/libs-dev/baseSteam-2.2.7.113021-deobf.jar')), + baseelectric: file(providers.gradleProperty('electricAdvantageDeobfJar').getOrElse( + '../ElectricAdvantage/ElectricAdvantage/build/libs-dev/baseElectric-2.2.7.113021-deobf.jar')) ] tasks.register('prepareCombinedEclipseLaunch') { diff --git a/docs/1.13/BASE-IDENTITY-MIGRATION.md b/docs/1.13/BASE-IDENTITY-MIGRATION.md new file mode 100644 index 00000000..1cdfd7aa --- /dev/null +++ b/docs/1.13/BASE-IDENTITY-MIGRATION.md @@ -0,0 +1,45 @@ +# Upgrading a World to basePower, baseSteam and baseElectric 1.13.2 + +The three 1.13.2 builds continue DrCyano's Advantage mods under the base* names. +The migration reads the saved Forge block registry before Minecraft converts +old numeric block states. It accepts the original Advantage 1.10.2 IDs and the +released base* IDs from 1.10.2 and 1.12.2. The old and new jars should not be +installed together. + +## Before opening a world + +1. Set up a separate instance with Minecraft 1.13.2, Forge 25.0.223 and Java 8. +2. Install matching basePower, baseSteam and baseElectric builds with MMD + OreSpawn 4.1.0.113021 and Base Metals 3.0.2.113021. The older Base Metals + 3.0.1 download does not contain the + [leaves conversion fix](https://github.com/MinecraftModDevelopmentMods/BaseMetals/pull/525). +3. Check the rest of the modpack separately. Keep the original world and config + offline and open a copy. Don't accept a missing-registry warning just to get + into the world. +4. Inspect a few machines before changing anything. Check their facing, + inventories, tank levels, charge, temperature, progress and filters. Confirm + their existing pipes or wiring still supply them. Run a conveyor, a steam + machine and an electric machine without replacing any blocks. +5. Save, close Minecraft completely, and reopen the same copy. Check those + machines again. Keep the logs and the world migration report if anything + looks wrong. + +## What the automated tests check + +- Each of the three source versions is loaded from a disposable archived copy. + The checks compare saved values before conversion, after conversion, and + after a separate server process opens the result. They include inventories, + fluid quantities, stored power, orientation, filled buckets and the saved + turbine's identity. Connected machines are then run without rebuilding them. +- A larger released 1.12.2 workshop compares 41 installed machines. This caught + a flattening gap that discarded sugar cane from custom machine inventories. + The regression checks preserve the item counts and slots, not just the machine + blocks or a successful server launch. +- The native machine, client, recipe, world-generation, restart and endurance + runs are separate checks on the candidate. A visual pass cannot stand in for + processing output, and automated checks cannot stand in for manual play. + +These tests do not qualify unrelated mods, custom resource packs, or every +possible layout. Earlier Advantage test results are retained in the +[historical qualification notes](CURRENT-QUALIFICATION.md), separate from +the current base* candidate. diff --git a/docs/1.13/MIGRATION.md b/docs/1.13/MIGRATION.md index a741145f..ccea9910 100644 --- a/docs/1.13/MIGRATION.md +++ b/docs/1.13/MIGRATION.md @@ -1,6 +1,6 @@ # Advantage 1.13.2 World Migration -This release contains migration support for Advantage worlds created by Minecraft 1.10.2 and 1.12.2. PowerAdvantage owns one shared pre-flattening hook; SteamAdvantage and ElectricAdvantage register their legacy state, tile, entity, item, fluid, and NBT codecs with it. See the [original-release and chained migration matrix](MIGRATION-MATRIX.md) for qualified fixtures and remaining acceptance gates. +basePower owns the shared hook that converts old Advantage and base* worlds before Minecraft flattens legacy block metadata. baseSteam and baseElectric register their own machine and entity mappings. See the [base* upgrade notes](BASE-IDENTITY-MIGRATION.md) for the current candidate and the [original-release and chained migration matrix](MIGRATION-MATRIX.md) for earlier Advantage builds. The [current-candidate qualification and remaining tests](CURRENT-QUALIFICATION.md) separates exact-artifact reruns, state preservation, measured operation and the @@ -18,14 +18,14 @@ repaired bridge while retaining the historical failed evidence. ## Before conversion 1. Back up the complete instance and world outside Minecraft. -2. Install matching 1.13.2 releases of PowerAdvantage, SteamAdvantage, ElectricAdvantage, Base Metals, and OreSpawn where the old world used them. +2. Install matching 1.13.2 builds of basePower, baseSteam and baseElectric where the old world used them, plus OreSpawn and Base Metals with the leaves data-fixer repair. 3. Remove unrelated 1.10/1.12 jars. A mod without a 1.13 port cannot be made compatible by the Advantage migration. 4. Convert a copy first and retain the original world unchanged. -5. Check the latest log and `/poweradvantage-migration-report.txt` before accepting the conversion. +5. Check the latest log and `/basepower-migration-report.txt` before accepting the conversion. The migration reads the old Forge registry snapshot before vanilla flattening. Numeric block IDs and metadata are mapped to current states, including six-way drill facings, conveyors, filters, switches, pipes, fluids, tanks, helpers, machines, and converter variants. -Nested NBT traversal covers tile entities, ordinary entities, player data, inventories, item stacks, durable-item damage, Forge universal buckets, and named fluids. Existing quantities are not intentionally changed. Loose files are copied to `*.poweradvantage-legacy-backup` before mutation. +Nested NBT traversal covers tile entities, ordinary entities, player data, inventories, item stacks, durable-item damage, Forge universal buckets, and named fluids. Existing quantities are not intentionally changed. The migration keeps backups of affected loose files before rewriting them. ## Configuration diff --git a/gradle.properties b/gradle.properties index 88a84aa1..036e9c31 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,13 +21,13 @@ java_version=8 java_toolchain_version=8.0.502+7 java_setup_version=8.0.502+7 gradle_java_version=17 -curseforge_project_id=240982 +curseforge_project_id=1780140 -mod_id=poweradvantage -mod_name=Power Advantage +mod_id=basepower +mod_name=basePower mod_license=LGPL-3.0-only -mod_version=2.4.4.113021 -mod_group=zone.moddev.mc.poweradvantage +mod_version=2.4.5.113021 +mod_group=zone.moddev.mc.basepower mod_authors=DrCyano (aka Cyanobacterium) mod_description=API and shared machines for pressure, electricity, quantum power, fluids, and item transport. @@ -35,13 +35,12 @@ cf_requirements=base-metals,mmd-orespawn cf_optionals=additional-loot-tables cf_versions=1.13.2 -basemetals_version=3.0.1.113021 -basemetals_source_commit=1376a20d7d5ba22d3abc77dc34b49a2c88943697 +basemetals_version=3.0.2.113021 +basemetals_source_commit=37717d0b9be31e8d73cfedf5d6a3c184af3ea579 basemetals_curse_project_id=240967 -basemetals_curse_file_id=9063696 -basemetals_deobf_sha256=2E4B0F619AD6B516A341DD332FABB66FE882A9DBA8E5C74F5BB52942302CFD18 +basemetals_deobf_sha256=5A9A9E6B339B294CCFCD0DF3E8A51BA4CEF623EA084D9A5486C418A3B5995AFB # Same pinned source and class bytes, with a clean LF checkout on Linux. -basemetals_deobf_lf_sha256=D1843CFAB23E7DB4B8A64ADB280D7EA51E3909B8E3490D4F5D471F0C94E1D0BF +basemetals_deobf_lf_sha256=77CA0123FFB345F103AE64CC52FB4DA157D6867A44BABEA761EE188896D2AD83 orespawn_version=4.1.0.113021 orespawn_source_commit=6a7c2bb07b9a7771128812fcc07d185f7d9df58b diff --git a/settings.gradle b/settings.gradle index 49735d03..b4b57f33 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,4 +2,6 @@ plugins { id('org.gradle.toolchains.foojay-resolver-convention') version '1.0.0' } +// Buildship requires a project directly under the workspace to match its folder name. +// The release artifact and mod ID are configured independently in the build. rootProject.name = 'PowerAdvantage' diff --git a/src/main/java/cyano/poweradvantage/api/ConduitBlock.java b/src/main/java/cyano/poweradvantage/api/ConduitBlock.java index ba27e151..dffd50a0 100644 --- a/src/main/java/cyano/poweradvantage/api/ConduitBlock.java +++ b/src/main/java/cyano/poweradvantage/api/ConduitBlock.java @@ -1,6 +1,6 @@ package cyano.poweradvantage.api; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/cyano/poweradvantage/api/ConduitType.java b/src/main/java/cyano/poweradvantage/api/ConduitType.java index f782afc5..8ed905a9 100644 --- a/src/main/java/cyano/poweradvantage/api/ConduitType.java +++ b/src/main/java/cyano/poweradvantage/api/ConduitType.java @@ -1,6 +1,6 @@ package cyano.poweradvantage.api; -import zone.moddev.mc.poweradvantage.util.HashCodeHelper; +import zone.moddev.mc.basepower.util.HashCodeHelper; import java.util.Locale; diff --git a/src/main/java/cyano/poweradvantage/api/FluidCategoryRegistry.java b/src/main/java/cyano/poweradvantage/api/FluidCategoryRegistry.java index ba5718c9..bccbef6a 100644 --- a/src/main/java/cyano/poweradvantage/api/FluidCategoryRegistry.java +++ b/src/main/java/cyano/poweradvantage/api/FluidCategoryRegistry.java @@ -26,7 +26,7 @@ public final class FluidCategoryRegistry { static { registerAlias(CRUDE_OIL, "crude_oil"); - registerAlias(CRUDE_OIL, "poweradvantage:crude_oil"); + registerAlias(CRUDE_OIL, "basepower:crude_oil"); registerAlias(CRUDE_OIL, "mineralogy_crude_oil"); registerAlias(CRUDE_OIL, "mineralogy:crude_oil"); registerAlias(CRUDE_OIL, "oil"); diff --git a/src/main/java/cyano/poweradvantage/api/GUIBlock.java b/src/main/java/cyano/poweradvantage/api/GUIBlock.java index 7ca19174..c5e6a2c6 100644 --- a/src/main/java/cyano/poweradvantage/api/GUIBlock.java +++ b/src/main/java/cyano/poweradvantage/api/GUIBlock.java @@ -15,9 +15,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.IBlockReader; -import zone.moddev.mc.poweradvantage.registry.MachineGUIRegistry; +import zone.moddev.mc.basepower.registry.MachineGUIRegistry; import cyano.poweradvantage.api.fluid.IAdvantageFluidHandler; -import zone.moddev.mc.poweradvantage.util.FluidContainerHelper; +import zone.moddev.mc.basepower.util.FluidContainerHelper; /** *

diff --git a/src/main/java/cyano/poweradvantage/api/PoweredEntity.java b/src/main/java/cyano/poweradvantage/api/PoweredEntity.java index 097b0078..2d727036 100644 --- a/src/main/java/cyano/poweradvantage/api/PoweredEntity.java +++ b/src/main/java/cyano/poweradvantage/api/PoweredEntity.java @@ -1,6 +1,6 @@ package cyano.poweradvantage.api; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/cyano/poweradvantage/api/fluid/FluidConduitBlock.java b/src/main/java/cyano/poweradvantage/api/fluid/FluidConduitBlock.java index bbec92ef..a196ce1a 100644 --- a/src/main/java/cyano/poweradvantage/api/fluid/FluidConduitBlock.java +++ b/src/main/java/cyano/poweradvantage/api/fluid/FluidConduitBlock.java @@ -3,7 +3,7 @@ import cyano.poweradvantage.api.ConduitBlock; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerConnectorContext; -import zone.moddev.mc.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.block.material.Material; /** diff --git a/src/main/java/cyano/poweradvantage/api/fluid/FluidNetworkApi.java b/src/main/java/cyano/poweradvantage/api/fluid/FluidNetworkApi.java index 68208528..8a14e710 100644 --- a/src/main/java/cyano/poweradvantage/api/fluid/FluidNetworkApi.java +++ b/src/main/java/cyano/poweradvantage/api/fluid/FluidNetworkApi.java @@ -9,8 +9,8 @@ import net.minecraft.block.Block; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; /** * Stable entry point for offering fluid from another mod to a PowerAdvantage diff --git a/src/main/java/cyano/poweradvantage/api/fluid/FluidPoweredEntity.java b/src/main/java/cyano/poweradvantage/api/fluid/FluidPoweredEntity.java index 300455d8..7c895bb0 100644 --- a/src/main/java/cyano/poweradvantage/api/fluid/FluidPoweredEntity.java +++ b/src/main/java/cyano/poweradvantage/api/fluid/FluidPoweredEntity.java @@ -3,8 +3,8 @@ import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.fluid.Fluid; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityType; diff --git a/src/main/java/cyano/poweradvantage/api/fluid/FluidStack.java b/src/main/java/cyano/poweradvantage/api/fluid/FluidStack.java index 63750f71..5dc3a4a3 100644 --- a/src/main/java/cyano/poweradvantage/api/fluid/FluidStack.java +++ b/src/main/java/cyano/poweradvantage/api/fluid/FluidStack.java @@ -6,7 +6,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.IRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.init.Fluids; /** * Forge 25's transitional fluid stack is unfinished, so Advantage keeps its diff --git a/src/main/java/cyano/poweradvantage/api/migration/LegacyConfigMigration.java b/src/main/java/cyano/poweradvantage/api/migration/LegacyConfigMigration.java index 98a307d9..649243e6 100644 --- a/src/main/java/cyano/poweradvantage/api/migration/LegacyConfigMigration.java +++ b/src/main/java/cyano/poweradvantage/api/migration/LegacyConfigMigration.java @@ -72,7 +72,13 @@ private Result(boolean migrated, int importedValues, Path legacyFile, Path targe } public static Result migrate(Path configDirectory, String modId, Mapping... mappings) throws IOException { + return migrate(configDirectory, modId, modId, mappings); + } + + public static Result migrate(Path configDirectory, String modId, String legacyModId, Mapping... mappings) + throws IOException { Path legacyFile = configDirectory.resolve(modId + ".cfg"); + if (!Files.isRegularFile(legacyFile)) legacyFile = configDirectory.resolve(legacyModId + ".cfg"); Path targetFile = configDirectory.resolve(modId + "-common.toml"); Path reportFile = configDirectory.resolve(modId + "-legacy-config-migration.txt"); if (!Files.isRegularFile(legacyFile) || Files.exists(targetFile)) { @@ -107,7 +113,7 @@ public static Result migrate(Path configDirectory, String modId, Mapping... mapp } List toml = new ArrayList<>(); - toml.add("# Generated once from " + modId + ".cfg by the Advantage 1.13 migration."); + toml.add("# Generated once from " + legacyFile.getFileName() + " by the Advantage 1.13 migration."); toml.add("# The original cfg file has deliberately been retained."); toml.add(""); for (Map.Entry> section : sections.entrySet()) { diff --git a/src/main/java/cyano/poweradvantage/api/migration/LegacyMigrationApi.java b/src/main/java/cyano/poweradvantage/api/migration/LegacyMigrationApi.java index 0e9c8f33..90f7ab88 100644 --- a/src/main/java/cyano/poweradvantage/api/migration/LegacyMigrationApi.java +++ b/src/main/java/cyano/poweradvantage/api/migration/LegacyMigrationApi.java @@ -29,6 +29,7 @@ public interface NbtMigration { } private static final Set NAMESPACES = new LinkedHashSet<>(); + private static final Map NAMESPACE_ALIASES = new LinkedHashMap<>(); private static final Map BLOCK_ALIASES = new LinkedHashMap<>(); private static final Map ITEM_ALIASES = new LinkedHashMap<>(); private static final Map BLOCK_CODECS = new LinkedHashMap<>(); @@ -45,6 +46,20 @@ public static synchronized void registerNamespace(String namespace) { NAMESPACES.add(normalize(namespace)); } + /** Only installed mods contribute aliases. Explicit path aliases still take precedence. */ + public static synchronized void registerNamespaceAlias(String legacyNamespace, String currentNamespace) { + String legacy = normalize(legacyNamespace); + String current = normalize(currentNamespace); + registerNamespace(legacy); + registerNamespace(current); + NAMESPACE_ALIASES.put(legacy, current); + } + + public static synchronized ResourceLocation registryTarget(ResourceLocation id) { + String current = NAMESPACE_ALIASES.get(id.getNamespace()); + return current == null ? id : new ResourceLocation(current, id.getPath()); + } + public static synchronized void registerBlockAlias(ResourceLocation legacyId, ResourceLocation currentId) { BLOCK_ALIASES.put(legacyId, currentId); registerNamespace(legacyId.getNamespace()); @@ -65,6 +80,22 @@ public static synchronized void registerTileEntityAlias(String legacyId, String TILE_ALIASES.put(normalizeIdentity(legacyId), normalizeIdentity(currentId)); } + public static synchronized void registerTileEntityAliases(ResourceLocation current) { + String path = current.getPath(); + registerTileVariants(current.getNamespace(), path, current.toString()); + for (Map.Entry alias : NAMESPACE_ALIASES.entrySet()) { + if (alias.getValue().equals(current.getNamespace())) { + registerTileVariants(alias.getKey(), path, current.toString()); + } + } + } + + private static void registerTileVariants(String namespace, String path, String target) { + registerTileEntityAlias(namespace + ":" + path, target); + registerTileEntityAlias(namespace + "." + path, target); + registerTileEntityAlias("minecraft:" + namespace + "." + path, target); + } + public static synchronized void registerEntityAlias(String legacyId, String currentId) { ENTITY_ALIASES.put(normalizeIdentity(legacyId), normalizeIdentity(currentId)); } @@ -92,16 +123,17 @@ public static synchronized boolean handlesNamespace(String namespace) { public static synchronized ResourceLocation blockTarget(ResourceLocation legacyId) { ResourceLocation target = BLOCK_ALIASES.get(legacyId); - return target == null ? legacyId : target; + return target == null ? registryTarget(legacyId) : target; } public static synchronized ResourceLocation itemTarget(ResourceLocation legacyId) { ResourceLocation target = ITEM_ALIASES.get(legacyId); - return target == null ? legacyId : target; + return target == null ? registryTarget(legacyId) : target; } public static synchronized IBlockState decodeBlockState(ResourceLocation legacyId, Block block, int metadata) { BlockStateCodec codec = BLOCK_CODECS.get(legacyId); + if (codec == null) codec = BLOCK_CODECS.get(blockTarget(legacyId)); return codec == null ? block.getDefaultState() : codec.decode(block, metadata & 15); } diff --git a/src/main/java/cyano/poweradvantage/api/migration/LegacyOreSpawnConfigBridge.java b/src/main/java/cyano/poweradvantage/api/migration/LegacyOreSpawnConfigBridge.java index 83e34820..4f080498 100644 --- a/src/main/java/cyano/poweradvantage/api/migration/LegacyOreSpawnConfigBridge.java +++ b/src/main/java/cyano/poweradvantage/api/migration/LegacyOreSpawnConfigBridge.java @@ -59,7 +59,15 @@ private Result(boolean migrated, int rules, Path source, Path target) { * OreSpawn 4 provider-override location. */ public static synchronized Result migrate(Path configDirectory, String modId) throws IOException { + return migrate(configDirectory, modId, modId); + } + + public static synchronized Result migrate(Path configDirectory, String modId, String legacyModId) + throws IOException { Path source = configDirectory.resolve("orespawn").resolve(modId + ".json"); + if (!Files.isRegularFile(source)) { + source = configDirectory.resolve("orespawn").resolve(legacyModId + ".json"); + } Path target = configDirectory.resolve(modId + "-orespawn.json"); if (!Files.isRegularFile(source) || Files.exists(target) || Files.exists(configDirectory.resolve("orespawn-worldgen.json"))) { @@ -84,6 +92,9 @@ public static synchronized Result migrate(Path configDirectory, String modId) th JsonObject oldOre = oreElement.getAsJsonObject(); String output = string(oldOre, "blockID", ""); if (!isRegistryName(output)) continue; + if (output.startsWith(legacyModId + ":")) { + output = modId + output.substring(legacyModId.length()); + } JsonObject ore = convertOre(oldOre, output, dimensionId); if (ore == null) continue; diff --git a/src/main/java/cyano/poweradvantage/api/modsupport/LightWeightPowerRegistry.java b/src/main/java/cyano/poweradvantage/api/modsupport/LightWeightPowerRegistry.java index 204bfbe2..903f833e 100644 --- a/src/main/java/cyano/poweradvantage/api/modsupport/LightWeightPowerRegistry.java +++ b/src/main/java/cyano/poweradvantage/api/modsupport/LightWeightPowerRegistry.java @@ -6,7 +6,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; -import zone.moddev.mc.poweradvantage.PowerAdvantage; +import zone.moddev.mc.basepower.PowerAdvantage; import java.util.HashMap; import java.util.Map; @@ -18,7 +18,7 @@ * considered "external" power systems because their power implementation is not controlled by Power * Advantage.

*

For example, you can add Power Advantage compatibility to an existing mod like this:

-	if(Loader.isModLoaded("poweradvantage")){
+	if(Loader.isModLoaded("basepower")){
 		LightWeightPowerRegistry.registerLightWeightPowerAcceptor(Blocks.myMachine, 
 				new ILightWeightPowerAcceptor(){
 
diff --git a/src/main/java/cyano/poweradvantage/api/modsupport/package-info.java b/src/main/java/cyano/poweradvantage/api/modsupport/package-info.java
index b86dd02a..802225b2 100644
--- a/src/main/java/cyano/poweradvantage/api/modsupport/package-info.java
+++ b/src/main/java/cyano/poweradvantage/api/modsupport/package-info.java
@@ -1,7 +1,7 @@
 /**
 This package contains the light-weight API for people interested in adding Power Advantage support 
 to existing mods (instead of making a Power Advantage add-on mod). Typically, you achieve this be 
-first checking whether Power Advantage exists with if(Loader.isModLoaded("poweradvantage")){ ... }. 
+first checking whether Power Advantage exists with if(Loader.isModLoaded("basepower")){ ... }.
 Then if you detect that Power Advantage is installed, you can add an ad-hoc power handler for each 
 of your machines like this:
 LightWeightPowerRegistry.registerLightWeightPowerAcceptor(Blocks.myMachine, 
@@ -28,4 +28,4 @@ public float addEnergy(TileEntity yourMachine,
 The above example is for registerring a machine that should accept steam and electricity power from 
 Power Advantage add-on mods.
 */
-package cyano.poweradvantage.api.modsupport;
\ No newline at end of file
+package cyano.poweradvantage.api.modsupport;
diff --git a/src/main/java/cyano/poweradvantage/api/modsupport/rf/TileEntityRFConverter.java b/src/main/java/cyano/poweradvantage/api/modsupport/rf/TileEntityRFConverter.java
index c1cc2858..3ad6243c 100644
--- a/src/main/java/cyano/poweradvantage/api/modsupport/rf/TileEntityRFConverter.java
+++ b/src/main/java/cyano/poweradvantage/api/modsupport/rf/TileEntityRFConverter.java
@@ -12,7 +12,7 @@
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.energy.CapabilityEnergy;
 import net.minecraftforge.energy.IEnergyStorage;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
+import zone.moddev.mc.basepower.PowerAdvantage;
 
 /** Forge Energy bridge retained behind the historical RF-labelled block IDs. */
 public class TileEntityRFConverter extends TileEntityConverter implements IEnergyStorage {
diff --git a/src/main/java/cyano/poweradvantage/api/modsupport/rf/TileEntityRFElectricityConverter.java b/src/main/java/cyano/poweradvantage/api/modsupport/rf/TileEntityRFElectricityConverter.java
index 8c57cf57..bce68e7e 100644
--- a/src/main/java/cyano/poweradvantage/api/modsupport/rf/TileEntityRFElectricityConverter.java
+++ b/src/main/java/cyano/poweradvantage/api/modsupport/rf/TileEntityRFElectricityConverter.java
@@ -1,13 +1,13 @@
 package cyano.poweradvantage.api.modsupport.rf;
 
 import cyano.poweradvantage.api.ConduitType;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.init.Entities;
 
 public class TileEntityRFElectricityConverter extends TileEntityRFConverter {
 
 	public TileEntityRFElectricityConverter() {
 		super(Entities.RF_ELECTRICITY_CONVERTER, new ConduitType("electricity"), 8000, 1000,
-				"tile.poweradvantage.converter_rf_electricity.name");
+				"tile.basepower.converter_rf_electricity.name");
 	}
 
 }
diff --git a/src/main/java/cyano/poweradvantage/api/modsupport/rf/TileEntityRFQuantumConverter.java b/src/main/java/cyano/poweradvantage/api/modsupport/rf/TileEntityRFQuantumConverter.java
index 88749517..c9856517 100644
--- a/src/main/java/cyano/poweradvantage/api/modsupport/rf/TileEntityRFQuantumConverter.java
+++ b/src/main/java/cyano/poweradvantage/api/modsupport/rf/TileEntityRFQuantumConverter.java
@@ -1,13 +1,13 @@
 package cyano.poweradvantage.api.modsupport.rf;
 
 import cyano.poweradvantage.api.ConduitType;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.init.Entities;
 
 public class TileEntityRFQuantumConverter extends TileEntityRFConverter {
 
 	public TileEntityRFQuantumConverter() {
 		super(Entities.RF_QUANTUM_CONVERTER, new ConduitType("quantum"), 1000, 1000,
-				"tile.poweradvantage.converter_rf_quantum.name");
+				"tile.basepower.converter_rf_quantum.name");
 	}
 
 }
diff --git a/src/main/java/cyano/poweradvantage/api/modsupport/rf/TileEntityRFSteamConverter.java b/src/main/java/cyano/poweradvantage/api/modsupport/rf/TileEntityRFSteamConverter.java
index ccd184c8..511d4e97 100644
--- a/src/main/java/cyano/poweradvantage/api/modsupport/rf/TileEntityRFSteamConverter.java
+++ b/src/main/java/cyano/poweradvantage/api/modsupport/rf/TileEntityRFSteamConverter.java
@@ -1,13 +1,13 @@
 package cyano.poweradvantage.api.modsupport.rf;
 
 import cyano.poweradvantage.api.ConduitType;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.init.Entities;
 
 public class TileEntityRFSteamConverter extends TileEntityRFConverter {
 
 	public TileEntityRFSteamConverter() {
 		super(Entities.RF_STEAM_CONVERTER, new ConduitType("steam"), 1000, 1000,
-				"tile.poweradvantage.converter_rf_steam.name");
+				"tile.basepower.converter_rf_steam.name");
 	}
 
 }
diff --git a/src/main/java/cyano/poweradvantage/api/modsupport/techreborn/TileEntityTRConverter.java b/src/main/java/cyano/poweradvantage/api/modsupport/techreborn/TileEntityTRConverter.java
index 0cded265..71a46ceb 100644
--- a/src/main/java/cyano/poweradvantage/api/modsupport/techreborn/TileEntityTRConverter.java
+++ b/src/main/java/cyano/poweradvantage/api/modsupport/techreborn/TileEntityTRConverter.java
@@ -3,7 +3,7 @@
 import cyano.poweradvantage.api.ConduitType;
 import cyano.poweradvantage.api.modsupport.rf.TileEntityRFConverter;
 import net.minecraft.tileentity.TileEntityType;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
+import zone.moddev.mc.basepower.PowerAdvantage;
 
 /**
  * Compatibility base for the historical Tech Reborn-labelled converter.
diff --git a/src/main/java/cyano/poweradvantage/api/modsupport/techreborn/TileEntityTRElectricityConverter.java b/src/main/java/cyano/poweradvantage/api/modsupport/techreborn/TileEntityTRElectricityConverter.java
index 725931a8..269a0842 100644
--- a/src/main/java/cyano/poweradvantage/api/modsupport/techreborn/TileEntityTRElectricityConverter.java
+++ b/src/main/java/cyano/poweradvantage/api/modsupport/techreborn/TileEntityTRElectricityConverter.java
@@ -2,7 +2,7 @@
 
 import cyano.poweradvantage.api.ConduitType;
 import net.minecraft.entity.player.EntityPlayer;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.init.Entities;
 
 /**
  * Created by Chris on 4/10/2016.
@@ -10,7 +10,7 @@
 public class TileEntityTRElectricityConverter extends TileEntityTRConverter {
 	public TileEntityTRElectricityConverter() {
 		super(Entities.TR_ELECTRICITY_CONVERTER, new ConduitType("electricity"),
-				"tile.poweradvantage.converter_tr_electricity.name");
+				"tile.basepower.converter_tr_electricity.name");
 	}
 	
 	@Override
diff --git a/src/main/java/cyano/poweradvantage/api/simple/BlockSimpleFluidConduit.java b/src/main/java/cyano/poweradvantage/api/simple/BlockSimpleFluidConduit.java
index 055926b5..ee553f77 100644
--- a/src/main/java/cyano/poweradvantage/api/simple/BlockSimpleFluidConduit.java
+++ b/src/main/java/cyano/poweradvantage/api/simple/BlockSimpleFluidConduit.java
@@ -3,7 +3,7 @@
 import cyano.poweradvantage.api.ConduitType;
 import cyano.poweradvantage.api.PowerConnectorContext;
 import cyano.poweradvantage.api.fluid.FluidConduitBlock;
-import zone.moddev.mc.poweradvantage.util.PowerHelper;
+import zone.moddev.mc.basepower.util.PowerHelper;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
diff --git a/src/main/java/cyano/poweradvantage/api/simple/BlockSimpleFluidMachine.java b/src/main/java/cyano/poweradvantage/api/simple/BlockSimpleFluidMachine.java
index c704d81b..befab2ab 100644
--- a/src/main/java/cyano/poweradvantage/api/simple/BlockSimpleFluidMachine.java
+++ b/src/main/java/cyano/poweradvantage/api/simple/BlockSimpleFluidMachine.java
@@ -1,6 +1,6 @@
 package cyano.poweradvantage.api.simple;
 
-import zone.moddev.mc.poweradvantage.init.Fluids;
+import zone.moddev.mc.basepower.init.Fluids;
 import net.minecraft.block.material.Material;
 
 /**
@@ -8,7 +8,7 @@
  * block with an inventory and user interface that gives fluids to connected 
  * fluid consumers.

  * Example usage:
-int guiID = zone.moddev.mc.poweradvantage.registry.MachineGUIRegistry.addGUI(new MySimpleMachineGUI());
+int guiID = zone.moddev.mc.basepower.registry.MachineGUIRegistry.addGUI(new MySimpleMachineGUI());
 Block myMachineBlock = new MyBlockSimpleFluidSource(guiID,PowerAdvantage.getInstance());
 myMachineBlock.setTranslationKey(MODID+"."+"my_machine");
 myMachineBlock.setRegistryName(MODID, "my_machine");
diff --git a/src/main/java/cyano/poweradvantage/api/simple/BlockSimplePowerConduit.java b/src/main/java/cyano/poweradvantage/api/simple/BlockSimplePowerConduit.java
index 8fe0d58c..d7cd6dda 100644
--- a/src/main/java/cyano/poweradvantage/api/simple/BlockSimplePowerConduit.java
+++ b/src/main/java/cyano/poweradvantage/api/simple/BlockSimplePowerConduit.java
@@ -3,7 +3,7 @@
 import cyano.poweradvantage.api.ConduitBlock;
 import cyano.poweradvantage.api.ConduitType;
 import cyano.poweradvantage.api.PowerConnectorContext;
-import zone.moddev.mc.poweradvantage.util.PowerHelper;
+import zone.moddev.mc.basepower.util.PowerHelper;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
diff --git a/src/main/java/cyano/poweradvantage/api/simple/BlockSimplePowerMachine.java b/src/main/java/cyano/poweradvantage/api/simple/BlockSimplePowerMachine.java
index 9ad474bf..e7c50ef6 100644
--- a/src/main/java/cyano/poweradvantage/api/simple/BlockSimplePowerMachine.java
+++ b/src/main/java/cyano/poweradvantage/api/simple/BlockSimplePowerMachine.java
@@ -1,7 +1,7 @@
 package cyano.poweradvantage.api.simple;
 
 import cyano.poweradvantage.api.*;
-import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry;
+import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry;
 import net.minecraft.block.BlockHorizontal;
 import net.minecraft.block.material.Material;
 import net.minecraft.state.IProperty;
@@ -31,7 +31,7 @@
  * block with an inventory and user interface that gives power to connected 
  * machines.

  * Example usage:
-int guiID = zone.moddev.mc.poweradvantage.registry.MachineGUIRegistry.addGUI(new MySimpleMachineGUI());
+int guiID = zone.moddev.mc.basepower.registry.MachineGUIRegistry.addGUI(new MySimpleMachineGUI());
 Block myMachineBlock = new MyBlockSimplePowerSource(guiID,PowerAdvantage.getInstance());
 myMachineBlock.setTranslationKey(MODID+"."+"my_machine");
 myMachineBlock.setRegistryName(MODID, "my_machine");
diff --git a/src/main/java/cyano/poweradvantage/api/simple/SimpleMachineGUI.java b/src/main/java/cyano/poweradvantage/api/simple/SimpleMachineGUI.java
index 85aef239..dd79f431 100644
--- a/src/main/java/cyano/poweradvantage/api/simple/SimpleMachineGUI.java
+++ b/src/main/java/cyano/poweradvantage/api/simple/SimpleMachineGUI.java
@@ -1,10 +1,10 @@
 package cyano.poweradvantage.api.simple;
 
 
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
-import zone.moddev.mc.poweradvantage.math.Integer2D;
-import zone.moddev.mc.poweradvantage.registry.ITileEntityGUI;
-import zone.moddev.mc.poweradvantage.registry.MachineGUIRegistry;
+import zone.moddev.mc.basepower.PowerAdvantage;
+import zone.moddev.mc.basepower.math.Integer2D;
+import zone.moddev.mc.basepower.registry.ITileEntityGUI;
+import zone.moddev.mc.basepower.registry.MachineGUIRegistry;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
diff --git a/src/main/java/cyano/poweradvantage/api/simple/TileEntitySimpleFluidMachine.java b/src/main/java/cyano/poweradvantage/api/simple/TileEntitySimpleFluidMachine.java
index 351f3fd6..94c480a8 100644
--- a/src/main/java/cyano/poweradvantage/api/simple/TileEntitySimpleFluidMachine.java
+++ b/src/main/java/cyano/poweradvantage/api/simple/TileEntitySimpleFluidMachine.java
@@ -5,8 +5,8 @@
 import cyano.poweradvantage.api.PowerRequest;
 import cyano.poweradvantage.api.fluid.FluidPoweredEntity;
 import cyano.poweradvantage.api.fluid.FluidRequest;
-import zone.moddev.mc.poweradvantage.init.Fluids;
-import zone.moddev.mc.poweradvantage.util.FluidIdHelper;
+import zone.moddev.mc.basepower.init.Fluids;
+import zone.moddev.mc.basepower.util.FluidIdHelper;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/cyano/poweradvantage/api/simple/TileEntitySimplePowerMachine.java b/src/main/java/cyano/poweradvantage/api/simple/TileEntitySimplePowerMachine.java
index 55fac0f2..05ee4881 100644
--- a/src/main/java/cyano/poweradvantage/api/simple/TileEntitySimplePowerMachine.java
+++ b/src/main/java/cyano/poweradvantage/api/simple/TileEntitySimplePowerMachine.java
@@ -4,7 +4,7 @@
 import cyano.poweradvantage.api.PowerConnectorContext;
 import cyano.poweradvantage.api.PowerRequest;
 import cyano.poweradvantage.api.PoweredEntity;
-import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry;
+import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/PowerAdvantage.java b/src/main/java/zone/moddev/mc/basepower/PowerAdvantage.java
similarity index 84%
rename from src/main/java/zone/moddev/mc/poweradvantage/PowerAdvantage.java
rename to src/main/java/zone/moddev/mc/basepower/PowerAdvantage.java
index 5bd713db..90bd81ef 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/PowerAdvantage.java
+++ b/src/main/java/zone/moddev/mc/basepower/PowerAdvantage.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage;
+package zone.moddev.mc.basepower;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,27 +22,27 @@
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLPaths;
-import zone.moddev.mc.poweradvantage.config.PowerAdvantageConfig;
-import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry;
-import zone.moddev.mc.poweradvantage.init.Blocks;
-import zone.moddev.mc.poweradvantage.init.Fluids;
-import zone.moddev.mc.poweradvantage.init.GUI;
-import zone.moddev.mc.poweradvantage.init.Fuels;
-import zone.moddev.mc.poweradvantage.init.Items;
-import zone.moddev.mc.poweradvantage.init.ModSupport;
-import zone.moddev.mc.poweradvantage.init.Recipes;
-import zone.moddev.mc.poweradvantage.registry.MachineGUIRegistry;
-import zone.moddev.mc.poweradvantage.recipe.RecipeConditions;
-import zone.moddev.mc.poweradvantage.recipe.RecipeDiscovery;
-import zone.moddev.mc.poweradvantage.migration.AdvantageLegacyMigrations;
-import zone.moddev.mc.poweradvantage.migration.LegacyWorldDataHook;
+import zone.moddev.mc.basepower.config.PowerAdvantageConfig;
+import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry;
+import zone.moddev.mc.basepower.init.Blocks;
+import zone.moddev.mc.basepower.init.Fluids;
+import zone.moddev.mc.basepower.init.GUI;
+import zone.moddev.mc.basepower.init.Fuels;
+import zone.moddev.mc.basepower.init.Items;
+import zone.moddev.mc.basepower.init.ModSupport;
+import zone.moddev.mc.basepower.init.Recipes;
+import zone.moddev.mc.basepower.registry.MachineGUIRegistry;
+import zone.moddev.mc.basepower.recipe.RecipeConditions;
+import zone.moddev.mc.basepower.recipe.RecipeDiscovery;
+import zone.moddev.mc.basepower.migration.AdvantageLegacyMigrations;
+import zone.moddev.mc.basepower.migration.LegacyWorldDataHook;
 
 /** Forge 1.13 entry point for Power Advantage. */
 @Mod(PowerAdvantage.MODID)
 public final class PowerAdvantage {
-    public static final String MODID = "poweradvantage";
+    public static final String MODID = "basepower";
     public static final String NAME = "Power Advantage";
-    public static final String VERSION = "2.4.4.113021";
+    public static final String VERSION = "2.4.5.113021";
     public static final Logger LOGGER = LogManager.getLogger(MODID);
 
     private static PowerAdvantage instance;
@@ -96,14 +96,14 @@ public PowerAdvantage() {
         DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> {
             ModLoadingContext.get().registerExtensionPoint(
                     ExtensionPoint.GUIFACTORY, () -> MachineGUIRegistry::createClientGui);
-            zone.moddev.mc.poweradvantage.client.ClientOilRenderer.register();
+            zone.moddev.mc.basepower.client.ClientOilRenderer.register();
         });
     }
 
     private static void migrateLegacyOreSpawnConfiguration() {
         try {
             LegacyOreSpawnConfigBridge.Result result =
-                    LegacyOreSpawnConfigBridge.migrate(FMLPaths.CONFIGDIR.get(), MODID);
+                    LegacyOreSpawnConfigBridge.migrate(FMLPaths.CONFIGDIR.get(), MODID, "poweradvantage");
             if (result.wasMigrated()) {
                 LOGGER.info("Imported {} legacy Power Advantage OreSpawn rule(s) from '{}' into '{}'",
                         result.getRuleCount(), result.getSource(), result.getTarget());
@@ -115,7 +115,7 @@ private static void migrateLegacyOreSpawnConfiguration() {
 
     private static void migrateLegacyConfiguration() {
         try {
-            LegacyConfigMigration.Result result = LegacyConfigMigration.migrate(FMLPaths.CONFIGDIR.get(), MODID,
+            LegacyConfigMigration.Result result = LegacyConfigMigration.migrate(FMLPaths.CONFIGDIR.get(), MODID, "poweradvantage",
                     Mapping.of("options", "recipe_mode", "options", "recipeMode", ValueType.STRING),
                     Mapping.of("options", "treasure_chest_loot_factor", "options", "treasureChestLootFactor", ValueType.DOUBLE),
                     Mapping.of("options", "plastic_equals_rubber", "options", "plasticEqualsRubber", ValueType.BOOLEAN),
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/RecipeMode.java b/src/main/java/zone/moddev/mc/basepower/RecipeMode.java
similarity index 96%
rename from src/main/java/zone/moddev/mc/poweradvantage/RecipeMode.java
rename to src/main/java/zone/moddev/mc/basepower/RecipeMode.java
index cf753ec5..03c5450f 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/RecipeMode.java
+++ b/src/main/java/zone/moddev/mc/basepower/RecipeMode.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage;
+package zone.moddev.mc.basepower;
 
 /**
  * Differnet recipe modes change the difficulty and means by which the players make the core items 
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/blocks/BlockFrame.java b/src/main/java/zone/moddev/mc/basepower/blocks/BlockFrame.java
similarity index 96%
rename from src/main/java/zone/moddev/mc/poweradvantage/blocks/BlockFrame.java
rename to src/main/java/zone/moddev/mc/basepower/blocks/BlockFrame.java
index 0cdeb7f9..ff8954f5 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/blocks/BlockFrame.java
+++ b/src/main/java/zone/moddev/mc/basepower/blocks/BlockFrame.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.blocks;
+package zone.moddev.mc.basepower.blocks;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.SoundType;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/blocks/BlockPowerSwitch.java b/src/main/java/zone/moddev/mc/basepower/blocks/BlockPowerSwitch.java
similarity index 97%
rename from src/main/java/zone/moddev/mc/poweradvantage/blocks/BlockPowerSwitch.java
rename to src/main/java/zone/moddev/mc/basepower/blocks/BlockPowerSwitch.java
index d696168f..4c0014f4 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/blocks/BlockPowerSwitch.java
+++ b/src/main/java/zone/moddev/mc/basepower/blocks/BlockPowerSwitch.java
@@ -1,9 +1,9 @@
-package zone.moddev.mc.poweradvantage.blocks;
+package zone.moddev.mc.basepower.blocks;
 
 import cyano.poweradvantage.api.ConduitType;
 import cyano.poweradvantage.api.ITypedConduit;
 import cyano.poweradvantage.api.PowerConnectorContext;
-import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry;
+import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.state.BooleanProperty;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/gui/package-info.java b/src/main/java/zone/moddev/mc/basepower/blocks/package-info.java
similarity index 77%
rename from src/main/java/zone/moddev/mc/poweradvantage/gui/package-info.java
rename to src/main/java/zone/moddev/mc/basepower/blocks/package-info.java
index a8bcce10..0b4337c6 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/gui/package-info.java
+++ b/src/main/java/zone/moddev/mc/basepower/blocks/package-info.java
@@ -3,10 +3,10 @@
 This package contains content that is added by PowerAdvantage implementing the PowerAdvantage API. 
 If you are writing an add-on mod, use the code in this package for reference, but you should not 
 depend on it's implementation details as future updates might change them. For a better way to get 
-PowerAdvantage content, look in the zone.moddev.mc.poweradvantage.init package.
+PowerAdvantage content, look in the zone.moddev.mc.basepower.init package.
 

 Because these classes are not part of the API, they are not well documented. They were only meant 
 for the eyes of the mod author(s).
 

 */
-package zone.moddev.mc.poweradvantage.gui;
\ No newline at end of file
+package zone.moddev.mc.basepower.blocks;
\ No newline at end of file
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/client/ClientOilRenderer.java b/src/main/java/zone/moddev/mc/basepower/client/ClientOilRenderer.java
similarity index 91%
rename from src/main/java/zone/moddev/mc/poweradvantage/client/ClientOilRenderer.java
rename to src/main/java/zone/moddev/mc/basepower/client/ClientOilRenderer.java
index b5831497..5832c34f 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/client/ClientOilRenderer.java
+++ b/src/main/java/zone/moddev/mc/basepower/client/ClientOilRenderer.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.client;
+package zone.moddev.mc.basepower.client;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -8,8 +8,8 @@
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.MinecraftForge;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
-import zone.moddev.mc.poweradvantage.init.Fluids.PowerFluid;
+import zone.moddev.mc.basepower.PowerAdvantage;
+import zone.moddev.mc.basepower.init.Fluids.PowerFluid;
 
 /** Forge 25's native fluid renderer otherwise uses water sprites for custom fluids. */
 @OnlyIn(Dist.CLIENT)
@@ -49,7 +49,7 @@ public static boolean useOilPath(IFluidState state, boolean vanillaValue) {
     public static TextureAtlasSprite[] overrideSprites(IFluidState state, TextureAtlasSprite[] vanillaSprites) {
         if (!isOil(state)) return vanillaSprites;
         TextureAtlasSprite[] sprites = ((PowerFluid) state.getFluid()).getKind()
-                == zone.moddev.mc.poweradvantage.init.Fluids.Kind.CRUDE ? crudeSprites : refinedSprites;
+                == zone.moddev.mc.basepower.init.Fluids.Kind.CRUDE ? crudeSprites : refinedSprites;
         return sprites == null ? vanillaSprites : sprites;
     }
 
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/compat/BaseMetalsCompat.java b/src/main/java/zone/moddev/mc/basepower/compat/BaseMetalsCompat.java
similarity index 93%
rename from src/main/java/zone/moddev/mc/poweradvantage/compat/BaseMetalsCompat.java
rename to src/main/java/zone/moddev/mc/basepower/compat/BaseMetalsCompat.java
index 2f900a7d..cdf61bf8 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/compat/BaseMetalsCompat.java
+++ b/src/main/java/zone/moddev/mc/basepower/compat/BaseMetalsCompat.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.compat;
+package zone.moddev.mc.basepower.compat;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
@@ -6,7 +6,7 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.registries.ForgeRegistries;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
+import zone.moddev.mc.basepower.PowerAdvantage;
 
 /**
  * Compatibility entry points retained for old internal callers. Crushing recipes
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/conduitnetwork/ConduitNetworkManager.java b/src/main/java/zone/moddev/mc/basepower/conduitnetwork/ConduitNetworkManager.java
similarity index 97%
rename from src/main/java/zone/moddev/mc/poweradvantage/conduitnetwork/ConduitNetworkManager.java
rename to src/main/java/zone/moddev/mc/basepower/conduitnetwork/ConduitNetworkManager.java
index a8cf03f6..e69cc5ed 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/conduitnetwork/ConduitNetworkManager.java
+++ b/src/main/java/zone/moddev/mc/basepower/conduitnetwork/ConduitNetworkManager.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.conduitnetwork;
+package zone.moddev.mc.basepower.conduitnetwork;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -9,8 +9,8 @@
 
 import cyano.poweradvantage.api.ConduitType;
 import cyano.poweradvantage.api.PowerConnectorContext;
-import zone.moddev.mc.poweradvantage.math.BlockPos4D;
-import zone.moddev.mc.poweradvantage.util.PowerHelper;
+import zone.moddev.mc.basepower.math.BlockPos4D;
+import zone.moddev.mc.basepower.util.PowerHelper;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.ChunkPos;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/conduitnetwork/ConduitRegistry.java b/src/main/java/zone/moddev/mc/basepower/conduitnetwork/ConduitRegistry.java
similarity index 98%
rename from src/main/java/zone/moddev/mc/poweradvantage/conduitnetwork/ConduitRegistry.java
rename to src/main/java/zone/moddev/mc/basepower/conduitnetwork/ConduitRegistry.java
index 7e459efd..032ae4d0 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/conduitnetwork/ConduitRegistry.java
+++ b/src/main/java/zone/moddev/mc/basepower/conduitnetwork/ConduitRegistry.java
@@ -1,6 +1,6 @@
-package zone.moddev.mc.poweradvantage.conduitnetwork;
+package zone.moddev.mc.basepower.conduitnetwork;
 
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
+import zone.moddev.mc.basepower.PowerAdvantage;
 import cyano.poweradvantage.api.ConduitType;
 import cyano.poweradvantage.api.IPowerMachine;
 import cyano.poweradvantage.api.ITypedConduit;
@@ -8,7 +8,7 @@
 import cyano.poweradvantage.api.modsupport.ExternalPowerRequest;
 import cyano.poweradvantage.api.modsupport.LightWeightPowerRegistry;
 import cyano.poweradvantage.api.modsupport.Wrappers;
-import zone.moddev.mc.poweradvantage.math.BlockPos4D;
+import zone.moddev.mc.basepower.math.BlockPos4D;
 import net.minecraft.block.Block;
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/conduitnetwork/package-info.java b/src/main/java/zone/moddev/mc/basepower/conduitnetwork/package-info.java
similarity index 87%
rename from src/main/java/zone/moddev/mc/poweradvantage/conduitnetwork/package-info.java
rename to src/main/java/zone/moddev/mc/basepower/conduitnetwork/package-info.java
index 0dae2dea..e16e94ab 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/conduitnetwork/package-info.java
+++ b/src/main/java/zone/moddev/mc/basepower/conduitnetwork/package-info.java
@@ -4,4 +4,4 @@
 the same power type and caching the resulting list of sources and sinks. Every time a conduit block 
 is placed or broken, any adjacent networks are revalidated.
 */
-package zone.moddev.mc.poweradvantage.conduitnetwork;
\ No newline at end of file
+package zone.moddev.mc.basepower.conduitnetwork;
\ No newline at end of file
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/config/PowerAdvantageConfig.java b/src/main/java/zone/moddev/mc/basepower/config/PowerAdvantageConfig.java
similarity index 96%
rename from src/main/java/zone/moddev/mc/poweradvantage/config/PowerAdvantageConfig.java
rename to src/main/java/zone/moddev/mc/basepower/config/PowerAdvantageConfig.java
index 36a0c796..384cac26 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/config/PowerAdvantageConfig.java
+++ b/src/main/java/zone/moddev/mc/basepower/config/PowerAdvantageConfig.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.config;
+package zone.moddev.mc.basepower.config;
 
 import java.util.Arrays;
 import java.util.Locale;
@@ -6,8 +6,8 @@
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.fml.config.ModConfig;
 import cyano.poweradvantage.api.FluidCategoryRegistry;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
-import zone.moddev.mc.poweradvantage.RecipeMode;
+import zone.moddev.mc.basepower.PowerAdvantage;
+import zone.moddev.mc.basepower.RecipeMode;
 
 /** Common configuration with the same gameplay defaults as the legacy cfg file. */
 public final class PowerAdvantageConfig {
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/graphics/package-info.java b/src/main/java/zone/moddev/mc/basepower/graphics/package-info.java
similarity index 70%
rename from src/main/java/zone/moddev/mc/poweradvantage/graphics/package-info.java
rename to src/main/java/zone/moddev/mc/basepower/graphics/package-info.java
index d75d8375..29bc810f 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/graphics/package-info.java
+++ b/src/main/java/zone/moddev/mc/basepower/graphics/package-info.java
@@ -2,4 +2,4 @@
 This package contains classes related to on-demand rendering, such as for 
 entities and animated blocks.
 */
-package zone.moddev.mc.poweradvantage.graphics;
\ No newline at end of file
+package zone.moddev.mc.basepower.graphics;
\ No newline at end of file
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/gui/FilteredFluidTankGUI.java b/src/main/java/zone/moddev/mc/basepower/gui/FilteredFluidTankGUI.java
similarity index 95%
rename from src/main/java/zone/moddev/mc/poweradvantage/gui/FilteredFluidTankGUI.java
rename to src/main/java/zone/moddev/mc/basepower/gui/FilteredFluidTankGUI.java
index e8cae581..5fd2c9c3 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/gui/FilteredFluidTankGUI.java
+++ b/src/main/java/zone/moddev/mc/basepower/gui/FilteredFluidTankGUI.java
@@ -1,8 +1,8 @@
-package zone.moddev.mc.poweradvantage.gui;
+package zone.moddev.mc.basepower.gui;
 
 import cyano.poweradvantage.api.fluid.FluidPoweredEntity;
 import cyano.poweradvantage.api.simple.SimpleMachineGUI;
-import zone.moddev.mc.poweradvantage.math.Integer2D;
+import zone.moddev.mc.basepower.math.Integer2D;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.ResourceLocation;
 import cyano.poweradvantage.api.fluid.FluidStack;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/gui/FluidTankGUI.java b/src/main/java/zone/moddev/mc/basepower/gui/FluidTankGUI.java
similarity index 97%
rename from src/main/java/zone/moddev/mc/poweradvantage/gui/FluidTankGUI.java
rename to src/main/java/zone/moddev/mc/basepower/gui/FluidTankGUI.java
index 5abef14b..b3dd06d5 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/gui/FluidTankGUI.java
+++ b/src/main/java/zone/moddev/mc/basepower/gui/FluidTankGUI.java
@@ -1,8 +1,8 @@
-package zone.moddev.mc.poweradvantage.gui;
+package zone.moddev.mc.basepower.gui;
 
 import cyano.poweradvantage.api.fluid.FluidPoweredEntity;
 import cyano.poweradvantage.api.simple.SimpleMachineGUI;
-import zone.moddev.mc.poweradvantage.math.Integer2D;
+import zone.moddev.mc.basepower.math.Integer2D;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.BufferBuilder;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/gui/FunctionalCreativeTab.java b/src/main/java/zone/moddev/mc/basepower/gui/FunctionalCreativeTab.java
similarity index 98%
rename from src/main/java/zone/moddev/mc/poweradvantage/gui/FunctionalCreativeTab.java
rename to src/main/java/zone/moddev/mc/basepower/gui/FunctionalCreativeTab.java
index 6d7414a7..61bde2c8 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/gui/FunctionalCreativeTab.java
+++ b/src/main/java/zone/moddev/mc/basepower/gui/FunctionalCreativeTab.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.gui;
+package zone.moddev.mc.basepower.gui;
 
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.Item;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/gui/StillGUI.java b/src/main/java/zone/moddev/mc/basepower/gui/StillGUI.java
similarity index 90%
rename from src/main/java/zone/moddev/mc/poweradvantage/gui/StillGUI.java
rename to src/main/java/zone/moddev/mc/basepower/gui/StillGUI.java
index e091e2ec..a075a759 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/gui/StillGUI.java
+++ b/src/main/java/zone/moddev/mc/basepower/gui/StillGUI.java
@@ -1,8 +1,8 @@
-package zone.moddev.mc.poweradvantage.gui;
+package zone.moddev.mc.basepower.gui;
 
 import cyano.poweradvantage.api.simple.SimpleMachineGUI;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.StillTileEntity;
-import zone.moddev.mc.poweradvantage.math.Integer2D;
+import zone.moddev.mc.basepower.machines.fluidmachines.StillTileEntity;
+import zone.moddev.mc.basepower.math.Integer2D;
 import net.minecraft.util.ResourceLocation;
 import cyano.poweradvantage.api.fluid.FluidStack;
 
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/items/package-info.java b/src/main/java/zone/moddev/mc/basepower/gui/package-info.java
similarity index 76%
rename from src/main/java/zone/moddev/mc/poweradvantage/items/package-info.java
rename to src/main/java/zone/moddev/mc/basepower/gui/package-info.java
index 84786047..e830c8e9 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/items/package-info.java
+++ b/src/main/java/zone/moddev/mc/basepower/gui/package-info.java
@@ -3,10 +3,10 @@
 This package contains content that is added by PowerAdvantage implementing the PowerAdvantage API. 
 If you are writing an add-on mod, use the code in this package for reference, but you should not 
 depend on it's implementation details as future updates might change them. For a better way to get 
-PowerAdvantage content, look in the zone.moddev.mc.poweradvantage.init package.
+PowerAdvantage content, look in the zone.moddev.mc.basepower.init package.
 

 Because these classes are not part of the API, they are not well documented. They were only meant 
 for the eyes of the mod author(s).
 

 */
-package zone.moddev.mc.poweradvantage.items;
\ No newline at end of file
+package zone.moddev.mc.basepower.gui;
\ No newline at end of file
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/init/Blocks.java b/src/main/java/zone/moddev/mc/basepower/init/Blocks.java
similarity index 78%
rename from src/main/java/zone/moddev/mc/poweradvantage/init/Blocks.java
rename to src/main/java/zone/moddev/mc/basepower/init/Blocks.java
index f79778ef..3d233f56 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/init/Blocks.java
+++ b/src/main/java/zone/moddev/mc/basepower/init/Blocks.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.init;
+package zone.moddev.mc.basepower.init;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -17,27 +17,27 @@
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
-import zone.moddev.mc.poweradvantage.blocks.BlockFrame;
-import zone.moddev.mc.poweradvantage.blocks.BlockPowerSwitch;
-import zone.moddev.mc.poweradvantage.machines.conveyors.BlockConveyor;
-import zone.moddev.mc.poweradvantage.machines.conveyors.BlockConveyorFilter;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntityBlockFilter;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntityFoodFilter;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntityFuelFilter;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntityInventoryFilter;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntityOreFilter;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntityOverflowFilter;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntityPlantFilter;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntitySmeltableFilter;
-import zone.moddev.mc.poweradvantage.machines.creative.InfiniteEnergyBlock;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.FluidDischargeBlock;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.FluidDrainBlock;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.FluidPipeBlock;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.MetalTankBlock;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.StillBlock;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.StorageTankBlock;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.modsupport.TerminalFluidPipeBlock;
+import zone.moddev.mc.basepower.PowerAdvantage;
+import zone.moddev.mc.basepower.blocks.BlockFrame;
+import zone.moddev.mc.basepower.blocks.BlockPowerSwitch;
+import zone.moddev.mc.basepower.machines.conveyors.BlockConveyor;
+import zone.moddev.mc.basepower.machines.conveyors.BlockConveyorFilter;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntityBlockFilter;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntityFoodFilter;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntityFuelFilter;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntityInventoryFilter;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntityOreFilter;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntityOverflowFilter;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntityPlantFilter;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntitySmeltableFilter;
+import zone.moddev.mc.basepower.machines.creative.InfiniteEnergyBlock;
+import zone.moddev.mc.basepower.machines.fluidmachines.FluidDischargeBlock;
+import zone.moddev.mc.basepower.machines.fluidmachines.FluidDrainBlock;
+import zone.moddev.mc.basepower.machines.fluidmachines.FluidPipeBlock;
+import zone.moddev.mc.basepower.machines.fluidmachines.MetalTankBlock;
+import zone.moddev.mc.basepower.machines.fluidmachines.StillBlock;
+import zone.moddev.mc.basepower.machines.fluidmachines.StorageTankBlock;
+import zone.moddev.mc.basepower.machines.fluidmachines.modsupport.TerminalFluidPipeBlock;
 
 /** Stable block and block-item registry for the 1.13 port. */
 @Mod.EventBusSubscriber(modid = PowerAdvantage.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
@@ -116,7 +116,7 @@ public static synchronized void init() {
         initialized = true;
     }
 
-    private static GUIBlock filter(String id, Class type,
+    private static GUIBlock filter(String id, Class type,
             float hardness) {
         return (GUIBlock) add(new BlockConveyorFilter(Material.PISTON, hardness, type), id);
     }
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/init/Entities.java b/src/main/java/zone/moddev/mc/basepower/init/Entities.java
similarity index 77%
rename from src/main/java/zone/moddev/mc/poweradvantage/init/Entities.java
rename to src/main/java/zone/moddev/mc/basepower/init/Entities.java
index 5817e733..8f51f6ec 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/init/Entities.java
+++ b/src/main/java/zone/moddev/mc/basepower/init/Entities.java
@@ -1,27 +1,27 @@
-package zone.moddev.mc.poweradvantage.init;
+package zone.moddev.mc.basepower.init;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntityBlockFilter;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntityConveyor;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntityFoodFilter;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntityFuelFilter;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntityInventoryFilter;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntityOreFilter;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntityOverflowFilter;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntityPlantFilter;
-import zone.moddev.mc.poweradvantage.machines.conveyors.TileEntitySmeltableFilter;
-import zone.moddev.mc.poweradvantage.machines.creative.InfiniteEnergyTileEntity;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.FluidDischargeTileEntity;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.FluidDrainTileEntity;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.MetalTankTileEntity;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.StillTileEntity;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.StorageTankTileEntity;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.modsupport.TerminalFluidPipeTileEntity;
+import zone.moddev.mc.basepower.PowerAdvantage;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntityBlockFilter;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntityConveyor;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntityFoodFilter;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntityFuelFilter;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntityInventoryFilter;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntityOreFilter;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntityOverflowFilter;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntityPlantFilter;
+import zone.moddev.mc.basepower.machines.conveyors.TileEntitySmeltableFilter;
+import zone.moddev.mc.basepower.machines.creative.InfiniteEnergyTileEntity;
+import zone.moddev.mc.basepower.machines.fluidmachines.FluidDischargeTileEntity;
+import zone.moddev.mc.basepower.machines.fluidmachines.FluidDrainTileEntity;
+import zone.moddev.mc.basepower.machines.fluidmachines.MetalTankTileEntity;
+import zone.moddev.mc.basepower.machines.fluidmachines.StillTileEntity;
+import zone.moddev.mc.basepower.machines.fluidmachines.StorageTankTileEntity;
+import zone.moddev.mc.basepower.machines.fluidmachines.modsupport.TerminalFluidPipeTileEntity;
 import cyano.poweradvantage.api.modsupport.rf.TileEntityRFElectricityConverter;
 import cyano.poweradvantage.api.modsupport.rf.TileEntityRFQuantumConverter;
 import cyano.poweradvantage.api.modsupport.rf.TileEntityRFSteamConverter;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/init/Fluids.java b/src/main/java/zone/moddev/mc/basepower/init/Fluids.java
similarity index 98%
rename from src/main/java/zone/moddev/mc/poweradvantage/init/Fluids.java
rename to src/main/java/zone/moddev/mc/basepower/init/Fluids.java
index c149fe13..ddbf69cb 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/init/Fluids.java
+++ b/src/main/java/zone/moddev/mc/basepower/init/Fluids.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.init;
+package zone.moddev.mc.basepower.init;
 
 import java.util.IdentityHashMap;
 import java.util.Map;
@@ -20,7 +20,7 @@
 import net.minecraft.world.IWorldReaderBase;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
+import zone.moddev.mc.basepower.PowerAdvantage;
 
 /** Native 1.13 fluids and their PowerAdvantage conduit identities. */
 public final class Fluids {
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/init/Fuels.java b/src/main/java/zone/moddev/mc/basepower/init/Fuels.java
similarity index 89%
rename from src/main/java/zone/moddev/mc/poweradvantage/init/Fuels.java
rename to src/main/java/zone/moddev/mc/basepower/init/Fuels.java
index 3d343180..eece2bab 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/init/Fuels.java
+++ b/src/main/java/zone/moddev/mc/basepower/init/Fuels.java
@@ -1,6 +1,6 @@
-package zone.moddev.mc.poweradvantage.init;
+package zone.moddev.mc.basepower.init;
 
-import zone.moddev.mc.poweradvantage.registry.FuelRegistry;
+import zone.moddev.mc.basepower.registry.FuelRegistry;
 import net.minecraft.item.ItemStack;
 
 
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/init/GUI.java b/src/main/java/zone/moddev/mc/basepower/init/GUI.java
similarity index 93%
rename from src/main/java/zone/moddev/mc/poweradvantage/init/GUI.java
rename to src/main/java/zone/moddev/mc/basepower/init/GUI.java
index 3d845d7a..19e15230 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/init/GUI.java
+++ b/src/main/java/zone/moddev/mc/basepower/init/GUI.java
@@ -1,11 +1,11 @@
-package zone.moddev.mc.poweradvantage.init;
+package zone.moddev.mc.basepower.init;
 
 import net.minecraft.util.ResourceLocation;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
+import zone.moddev.mc.basepower.PowerAdvantage;
 import cyano.poweradvantage.api.simple.SimpleMachineGUI;
-import zone.moddev.mc.poweradvantage.gui.*;
-import zone.moddev.mc.poweradvantage.math.Integer2D;
-import zone.moddev.mc.poweradvantage.registry.MachineGUIRegistry;
+import zone.moddev.mc.basepower.gui.*;
+import zone.moddev.mc.basepower.math.Integer2D;
+import zone.moddev.mc.basepower.registry.MachineGUIRegistry;
 
 public abstract class GUI {
 
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/init/ItemGroups.java b/src/main/java/zone/moddev/mc/basepower/init/ItemGroups.java
similarity index 58%
rename from src/main/java/zone/moddev/mc/poweradvantage/init/ItemGroups.java
rename to src/main/java/zone/moddev/mc/basepower/init/ItemGroups.java
index c55a03c1..c16dbeab 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/init/ItemGroups.java
+++ b/src/main/java/zone/moddev/mc/basepower/init/ItemGroups.java
@@ -1,7 +1,7 @@
-package zone.moddev.mc.poweradvantage.init;
+package zone.moddev.mc.basepower.init;
 
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
-import zone.moddev.mc.poweradvantage.gui.FunctionalCreativeTab;
+import zone.moddev.mc.basepower.PowerAdvantage;
+import zone.moddev.mc.basepower.gui.FunctionalCreativeTab;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
@@ -10,27 +10,14 @@
 
 public class ItemGroups {
 
-	public static ItemGroup tab_powerAdvantage;
-
-	private static boolean initDone = false;
+	// Forge can construct the three mods on different threads.
+	public static final ItemGroup tab_powerAdvantage = new FunctionalCreativeTab(
+			PowerAdvantage.MODID, () -> Items.sprocket, ItemGroups::itemSort, false);
 
+	/** Kept for the expansion jars; class initialization creates the shared tab. */
 	public static void init() {
-		if (initDone) return;
-
-//		tab_powerAdvantage = FunctionalCreativeTab.create(PowerAdvantage.MODID)
-//				.setIcon(Items.sprocket)
-//				.setItemSortingAlgorithm(ItemGroups::itemSort)
-//				.setSearchable(true);
-
-		tab_powerAdvantage = new FunctionalCreativeTab(PowerAdvantage.MODID,
-				()->Items.sprocket,
-				ItemGroups::itemSort,
-				false);
-
-		initDone = true;
 	}
 
-	@SuppressWarnings("unused")
 	private static int itemSort(ItemStack A, ItemStack B) {
 		String catA = catagorize(A);
 		String catB = catagorize(B);
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/init/Items.java b/src/main/java/zone/moddev/mc/basepower/init/Items.java
similarity index 93%
rename from src/main/java/zone/moddev/mc/poweradvantage/init/Items.java
rename to src/main/java/zone/moddev/mc/basepower/init/Items.java
index 339d1e46..7e5899bd 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/init/Items.java
+++ b/src/main/java/zone/moddev/mc/basepower/init/Items.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.init;
+package zone.moddev.mc.basepower.init;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -9,8 +9,8 @@
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
-import zone.moddev.mc.poweradvantage.items.RotationTool;
+import zone.moddev.mc.basepower.PowerAdvantage;
+import zone.moddev.mc.basepower.items.RotationTool;
 
 /** Stable item registry for PowerAdvantage 1.13. */
 @Mod.EventBusSubscriber(modid = PowerAdvantage.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/init/Materials.java b/src/main/java/zone/moddev/mc/basepower/init/Materials.java
similarity index 77%
rename from src/main/java/zone/moddev/mc/poweradvantage/init/Materials.java
rename to src/main/java/zone/moddev/mc/basepower/init/Materials.java
index 4373aac3..91af7879 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/init/Materials.java
+++ b/src/main/java/zone/moddev/mc/basepower/init/Materials.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.init;
+package zone.moddev.mc.basepower.init;
 
 
 public class Materials {
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/init/ModSupport.java b/src/main/java/zone/moddev/mc/basepower/init/ModSupport.java
similarity index 95%
rename from src/main/java/zone/moddev/mc/poweradvantage/init/ModSupport.java
rename to src/main/java/zone/moddev/mc/basepower/init/ModSupport.java
index 9120d9b6..b1233e8f 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/init/ModSupport.java
+++ b/src/main/java/zone/moddev/mc/basepower/init/ModSupport.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.init;
+package zone.moddev.mc.basepower.init;
 
 import java.util.Locale;
 
@@ -11,8 +11,8 @@
 import cyano.poweradvantage.api.modsupport.techreborn.TileEntityTRElectricityConverter;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
-import zone.moddev.mc.poweradvantage.config.PowerAdvantageConfig;
+import zone.moddev.mc.basepower.PowerAdvantage;
+import zone.moddev.mc.basepower.config.PowerAdvantageConfig;
 
 /** Registers the converter blocks whose historical IDs are retained in 1.13. */
 public final class ModSupport {
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/init/Recipes.java b/src/main/java/zone/moddev/mc/basepower/init/Recipes.java
similarity index 91%
rename from src/main/java/zone/moddev/mc/poweradvantage/init/Recipes.java
rename to src/main/java/zone/moddev/mc/basepower/init/Recipes.java
index eea8f0f3..e87f2ae9 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/init/Recipes.java
+++ b/src/main/java/zone/moddev/mc/basepower/init/Recipes.java
@@ -1,11 +1,11 @@
-package zone.moddev.mc.poweradvantage.init;
+package zone.moddev.mc.basepower.init;
 
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
+import zone.moddev.mc.basepower.PowerAdvantage;
 import cyano.poweradvantage.api.FluidCategoryRegistry;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.registry.IRegistry;
-import zone.moddev.mc.poweradvantage.registry.still.recipe.DistillationRecipeRegistry;
+import zone.moddev.mc.basepower.registry.still.recipe.DistillationRecipeRegistry;
 
 
 public abstract class Recipes {
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/init/TreasureChests.java b/src/main/java/zone/moddev/mc/basepower/init/TreasureChests.java
similarity index 86%
rename from src/main/java/zone/moddev/mc/poweradvantage/init/TreasureChests.java
rename to src/main/java/zone/moddev/mc/basepower/init/TreasureChests.java
index 4ea3adfd..b41b6001 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/init/TreasureChests.java
+++ b/src/main/java/zone/moddev/mc/basepower/init/TreasureChests.java
@@ -1,7 +1,7 @@
-package zone.moddev.mc.poweradvantage.init;
+package zone.moddev.mc.basepower.init;
 
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
+import zone.moddev.mc.basepower.PowerAdvantage;
+import zone.moddev.mc.basepower.PowerAdvantage;
 import org.apache.logging.log4j.Level;
 
 import java.io.IOException;
@@ -49,7 +49,7 @@ private static void writeLootFile(Path file, String content) {
 			"                },\n" +
 			"                {\n" +
 			"                    \"type\": \"item\",\n" +
-			"                    \"name\": \"poweradvantage:sprocket\",\n" +
+			"                    \"name\": \"basepower:sprocket\",\n" +
 			"                    \"weight\": 5,\n" +
 			"                    \"functions\": [\n" +
 			"                        {\n" +
@@ -63,7 +63,7 @@ private static void writeLootFile(Path file, String content) {
 			"                },\n" +
 			"                {\n" +
 			"                    \"type\": \"item\",\n" +
-			"                    \"name\": \"poweradvantage:fluid_pipe\",\n" +
+			"                    \"name\": \"basepower:fluid_pipe\",\n" +
 			"                    \"weight\": 5,\n" +
 			"                    \"functions\": [\n" +
 			"                        {\n" +
@@ -77,22 +77,22 @@ private static void writeLootFile(Path file, String content) {
 			"                },\n" +
 			"                {\n" +
 			"                    \"type\": \"item\",\n" +
-			"                    \"name\": \"poweradvantage:fluid_storage_tank\",\n" +
+			"                    \"name\": \"basepower:fluid_storage_tank\",\n" +
 			"                    \"weight\": 3\n" +
 			"                },\n" +
 			"                {\n" +
 			"                    \"type\": \"item\",\n" +
-			"                    \"name\": \"poweradvantage:fluid_drain\",\n" +
+			"                    \"name\": \"basepower:fluid_drain\",\n" +
 			"                    \"weight\": 2\n" +
 			"                },\n" +
 			"                {\n" +
 			"                    \"type\": \"item\",\n" +
-			"                    \"name\": \"poweradvantage:fluid_discharge\",\n" +
+			"                    \"name\": \"basepower:fluid_discharge\",\n" +
 			"                    \"weight\": 2\n" +
 			"                },\n" +
 			"                {\n" +
 			"                    \"type\": \"item\",\n" +
-			"                    \"name\": \"poweradvantage:item_conveyor\",\n" +
+			"                    \"name\": \"basepower:item_conveyor\",\n" +
 			"                    \"weight\": 3,\n" +
 			"                    \"functions\": [\n" +
 			"                        {\n" +
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/init/Villages.java b/src/main/java/zone/moddev/mc/basepower/init/Villages.java
similarity index 94%
rename from src/main/java/zone/moddev/mc/poweradvantage/init/Villages.java
rename to src/main/java/zone/moddev/mc/basepower/init/Villages.java
index 25ab569f..936791b3 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/init/Villages.java
+++ b/src/main/java/zone/moddev/mc/basepower/init/Villages.java
@@ -1,8 +1,8 @@
-package zone.moddev.mc.poweradvantage.init;
+package zone.moddev.mc.basepower.init;
 
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.util.ResourceLocation;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
+import zone.moddev.mc.basepower.PowerAdvantage;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.fml.common.registry.VillagerRegistry;
 
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/init/WorldGen.java b/src/main/java/zone/moddev/mc/basepower/init/WorldGen.java
similarity index 85%
rename from src/main/java/zone/moddev/mc/poweradvantage/init/WorldGen.java
rename to src/main/java/zone/moddev/mc/basepower/init/WorldGen.java
index 77cc2cba..e25d91ce 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/init/WorldGen.java
+++ b/src/main/java/zone/moddev/mc/basepower/init/WorldGen.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.init;
+package zone.moddev.mc.basepower.init;
 
 public abstract class WorldGen {
 
@@ -20,7 +20,7 @@ public static void init() {
 			+ "			\"dimension\":\"+\",\n"
 			+ "			\"ores\":[\n"
 			+ "				{\n"
-			+ "					\"blockID\":\"poweradvantage:crude_oil\",\n"
+			+ "					\"blockID\":\"basepower:crude_oil\",\n"
 			+ "					\"size\":64,\n"
 			+ "					\"variation\":50,\n"
 			+ "					\"frequency\":0.25,\n"
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/init/package-info.java b/src/main/java/zone/moddev/mc/basepower/init/package-info.java
similarity index 77%
rename from src/main/java/zone/moddev/mc/poweradvantage/init/package-info.java
rename to src/main/java/zone/moddev/mc/basepower/init/package-info.java
index 2711107c..28a4285d 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/init/package-info.java
+++ b/src/main/java/zone/moddev/mc/basepower/init/package-info.java
@@ -2,4 +2,4 @@
 This package contains registries for all of the new content added by PowerAdvantage. Use these 
 classes to interact with the items and blocks.
 */
-package zone.moddev.mc.poweradvantage.init;
\ No newline at end of file
+package zone.moddev.mc.basepower.init;
\ No newline at end of file
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/items/RotationTool.java b/src/main/java/zone/moddev/mc/basepower/items/RotationTool.java
similarity index 97%
rename from src/main/java/zone/moddev/mc/poweradvantage/items/RotationTool.java
rename to src/main/java/zone/moddev/mc/basepower/items/RotationTool.java
index 3011304b..d8b423ad 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/items/RotationTool.java
+++ b/src/main/java/zone/moddev/mc/basepower/items/RotationTool.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.items;
+package zone.moddev.mc.basepower.items;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/blocks/package-info.java b/src/main/java/zone/moddev/mc/basepower/items/package-info.java
similarity index 76%
rename from src/main/java/zone/moddev/mc/poweradvantage/blocks/package-info.java
rename to src/main/java/zone/moddev/mc/basepower/items/package-info.java
index 5af68dab..04ef1d7b 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/blocks/package-info.java
+++ b/src/main/java/zone/moddev/mc/basepower/items/package-info.java
@@ -3,10 +3,10 @@
 This package contains content that is added by PowerAdvantage implementing the PowerAdvantage API. 
 If you are writing an add-on mod, use the code in this package for reference, but you should not 
 depend on it's implementation details as future updates might change them. For a better way to get 
-PowerAdvantage content, look in the zone.moddev.mc.poweradvantage.init package.
+PowerAdvantage content, look in the zone.moddev.mc.basepower.init package.
 

 Because these classes are not part of the API, they are not well documented. They were only meant 
 for the eyes of the mod author(s).
 

 */
-package zone.moddev.mc.poweradvantage.blocks;
\ No newline at end of file
+package zone.moddev.mc.basepower.items;
\ No newline at end of file
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/BlockConveyor.java b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/BlockConveyor.java
similarity index 97%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/BlockConveyor.java
rename to src/main/java/zone/moddev/mc/basepower/machines/conveyors/BlockConveyor.java
index a9393128..2f9b3846 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/BlockConveyor.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/BlockConveyor.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.machines.conveyors;
+package zone.moddev.mc.basepower.machines.conveyors;
 
 import cyano.poweradvantage.api.GUIBlock;
 import net.minecraft.block.Block;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/BlockConveyorFilter.java b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/BlockConveyorFilter.java
similarity index 96%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/BlockConveyorFilter.java
rename to src/main/java/zone/moddev/mc/basepower/machines/conveyors/BlockConveyorFilter.java
index 6f3c8a37..6da7525d 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/BlockConveyorFilter.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/BlockConveyorFilter.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.machines.conveyors;
+package zone.moddev.mc.basepower.machines.conveyors;
 
 import cyano.poweradvantage.api.GUIBlock;
 import net.minecraft.block.Block;
@@ -16,7 +16,7 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
+import zone.moddev.mc.basepower.PowerAdvantage;
 
 /** Horizontal conveyor filter block retaining its legacy metadata codec. */
 public class BlockConveyorFilter extends GUIBlock {
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityBlockFilter.java b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityBlockFilter.java
similarity index 76%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityBlockFilter.java
rename to src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityBlockFilter.java
index 6df07954..9e319051 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityBlockFilter.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityBlockFilter.java
@@ -1,8 +1,8 @@
-package zone.moddev.mc.poweradvantage.machines.conveyors;
+package zone.moddev.mc.basepower.machines.conveyors;
 
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.init.Entities;
 
 public class TileEntityBlockFilter extends TileEntityConveyorFilter {
 	public TileEntityBlockFilter() { super(Entities.FILTER_BLOCK, 1); }
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityConveyor.java b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityConveyor.java
similarity index 98%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityConveyor.java
rename to src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityConveyor.java
index 87bae7c2..6c82b2a9 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityConveyor.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityConveyor.java
@@ -1,6 +1,6 @@
-package zone.moddev.mc.poweradvantage.machines.conveyors;
+package zone.moddev.mc.basepower.machines.conveyors;
 
-import zone.moddev.mc.poweradvantage.util.InventoryWrapper;
+import zone.moddev.mc.basepower.util.InventoryWrapper;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
@@ -22,12 +22,12 @@
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.world.ILockableContainer;
 import net.minecraft.world.World;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
+import zone.moddev.mc.basepower.PowerAdvantage;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.init.Entities;
 
 public class TileEntityConveyor extends TileEntity implements ITickable, ISidedInventory {
 	
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityConveyorFilter.java b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityConveyorFilter.java
similarity index 95%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityConveyorFilter.java
rename to src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityConveyorFilter.java
index fe0065a2..ea13b929 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityConveyorFilter.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityConveyorFilter.java
@@ -1,6 +1,6 @@
-package zone.moddev.mc.poweradvantage.machines.conveyors;
+package zone.moddev.mc.basepower.machines.conveyors;
 
-import zone.moddev.mc.poweradvantage.util.InventoryWrapper;
+import zone.moddev.mc.basepower.util.InventoryWrapper;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.inventory.IInventory;
@@ -12,8 +12,8 @@
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.PowerAdvantage;
+import zone.moddev.mc.basepower.init.Entities;
 
 public abstract class TileEntityConveyorFilter extends TileEntityConveyor {
 
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityFoodFilter.java b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityFoodFilter.java
similarity index 76%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityFoodFilter.java
rename to src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityFoodFilter.java
index 9c084af2..139544b7 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityFoodFilter.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityFoodFilter.java
@@ -1,8 +1,8 @@
-package zone.moddev.mc.poweradvantage.machines.conveyors;
+package zone.moddev.mc.basepower.machines.conveyors;
 
 import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemStack;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.init.Entities;
 
 public class TileEntityFoodFilter extends TileEntityConveyorFilter {
 	public TileEntityFoodFilter() { super(Entities.FILTER_FOOD, 1); }
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityFuelFilter.java b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityFuelFilter.java
similarity index 77%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityFuelFilter.java
rename to src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityFuelFilter.java
index 44732b76..b0d81541 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityFuelFilter.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityFuelFilter.java
@@ -1,9 +1,9 @@
-package zone.moddev.mc.poweradvantage.machines.conveyors;
+package zone.moddev.mc.basepower.machines.conveyors;
 
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntityFurnace;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.init.Entities;
 
 public class TileEntityFuelFilter extends TileEntityConveyorFilter {
 	public TileEntityFuelFilter() { super(Entities.FILTER_FUEL, 1); }
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityInventoryFilter.java b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityInventoryFilter.java
similarity index 83%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityInventoryFilter.java
rename to src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityInventoryFilter.java
index dd622709..b72b360b 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityInventoryFilter.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityInventoryFilter.java
@@ -1,7 +1,7 @@
-package zone.moddev.mc.poweradvantage.machines.conveyors;
+package zone.moddev.mc.basepower.machines.conveyors;
 
 import net.minecraft.item.ItemStack;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.init.Entities;
 
 public class TileEntityInventoryFilter extends TileEntityConveyorFilter {
 
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityOreFilter.java b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityOreFilter.java
similarity index 82%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityOreFilter.java
rename to src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityOreFilter.java
index 4a2bd89c..4fb8f3f1 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityOreFilter.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityOreFilter.java
@@ -1,8 +1,8 @@
-package zone.moddev.mc.poweradvantage.machines.conveyors;
+package zone.moddev.mc.basepower.machines.conveyors;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.Tags;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.init.Entities;
 
 public class TileEntityOreFilter extends TileEntityConveyorFilter {
 	public TileEntityOreFilter() { super(Entities.FILTER_ORE, 1); }
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityOverflowFilter.java b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityOverflowFilter.java
similarity index 87%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityOverflowFilter.java
rename to src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityOverflowFilter.java
index ef8c74be..a7aa9c63 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityOverflowFilter.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityOverflowFilter.java
@@ -1,12 +1,12 @@
-package zone.moddev.mc.poweradvantage.machines.conveyors;
+package zone.moddev.mc.basepower.machines.conveyors;
 
-import zone.moddev.mc.poweradvantage.util.InventoryWrapper;
+import zone.moddev.mc.basepower.util.InventoryWrapper;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.init.Entities;
 
 public class TileEntityOverflowFilter extends TileEntityConveyorFilter {
 	public TileEntityOverflowFilter() { super(Entities.FILTER_OVERFLOW, 1); }
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityPlantFilter.java b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityPlantFilter.java
similarity index 86%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityPlantFilter.java
rename to src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityPlantFilter.java
index 1c9e3f60..f207f48e 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntityPlantFilter.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntityPlantFilter.java
@@ -1,11 +1,11 @@
-package zone.moddev.mc.poweradvantage.machines.conveyors;
+package zone.moddev.mc.basepower.machines.conveyors;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.IGrowable;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.IPlantable;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.init.Entities;
 
 public class TileEntityPlantFilter extends TileEntityConveyorFilter {
 	public TileEntityPlantFilter() { super(Entities.FILTER_PLANT, 1); }
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntitySmeltableFilter.java b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntitySmeltableFilter.java
similarity index 86%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntitySmeltableFilter.java
rename to src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntitySmeltableFilter.java
index 01464de4..8007c367 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/TileEntitySmeltableFilter.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/TileEntitySmeltableFilter.java
@@ -1,10 +1,10 @@
-package zone.moddev.mc.poweradvantage.machines.conveyors;
+package zone.moddev.mc.basepower.machines.conveyors;
 
 import net.minecraft.inventory.InventoryBasic;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraftforge.common.crafting.VanillaRecipeTypes;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.init.Entities;
 
 public class TileEntitySmeltableFilter extends TileEntityConveyorFilter {
 	public TileEntitySmeltableFilter() { super(Entities.FILTER_SMELT, 1); }
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/package-info.java b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/package-info.java
similarity index 75%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/package-info.java
rename to src/main/java/zone/moddev/mc/basepower/machines/conveyors/package-info.java
index 23e6fb8a..f1881ac9 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/conveyors/package-info.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/conveyors/package-info.java
@@ -3,10 +3,10 @@
 This package contains content that is added by PowerAdvantage implementing the PowerAdvantage API. 
 If you are writing an add-on mod, use the code in this package for reference, but you should not 
 depend on it's implementation details as future updates might change them. For a better way to get 
-PowerAdvantage content, look in the zone.moddev.mc.poweradvantage.init package.
+PowerAdvantage content, look in the zone.moddev.mc.basepower.init package.
 

 Because these classes are not part of the API, they are not well documented. They were only meant 
 for the eyes of the mod author(s).
 

 */
-package zone.moddev.mc.poweradvantage.machines.conveyors;
\ No newline at end of file
+package zone.moddev.mc.basepower.machines.conveyors;
\ No newline at end of file
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/creative/InfiniteEnergyBlock.java b/src/main/java/zone/moddev/mc/basepower/machines/creative/InfiniteEnergyBlock.java
similarity index 96%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/creative/InfiniteEnergyBlock.java
rename to src/main/java/zone/moddev/mc/basepower/machines/creative/InfiniteEnergyBlock.java
index feea40dc..41ee5759 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/creative/InfiniteEnergyBlock.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/creative/InfiniteEnergyBlock.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.machines.creative;
+package zone.moddev.mc.basepower.machines.creative;
 
 import cyano.poweradvantage.api.ConduitType;
 import cyano.poweradvantage.api.PoweredEntity;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/creative/InfiniteEnergyTileEntity.java b/src/main/java/zone/moddev/mc/basepower/machines/creative/InfiniteEnergyTileEntity.java
similarity index 89%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/creative/InfiniteEnergyTileEntity.java
rename to src/main/java/zone/moddev/mc/basepower/machines/creative/InfiniteEnergyTileEntity.java
index 89b48cab..31c630be 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/creative/InfiniteEnergyTileEntity.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/creative/InfiniteEnergyTileEntity.java
@@ -1,10 +1,10 @@
-package zone.moddev.mc.poweradvantage.machines.creative;
+package zone.moddev.mc.basepower.machines.creative;
 
 import cyano.poweradvantage.api.ConduitType;
 import cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.init.Entities;
 
 public class InfiniteEnergyTileEntity extends TileEntitySimplePowerMachine {
 
@@ -13,12 +13,12 @@ public class InfiniteEnergyTileEntity extends TileEntitySimplePowerMachine {
 	private final ConduitType[] type = new ConduitType[1];
 
 	public InfiniteEnergyTileEntity(ConduitType energyType) {
-		super(Entities.INFINITE_ENERGY, energyType, 1000f, "tile.poweradvantage.infinite_energy_source.name");
+		super(Entities.INFINITE_ENERGY, energyType, 1000f, "tile.basepower.infinite_energy_source.name");
 		this.type[0] = energyType;
 	}
 
 	public InfiniteEnergyTileEntity() {
-		super(Entities.INFINITE_ENERGY, new ConduitType("power"), 1000f, "tile.poweradvantage.infinite_energy_source.name");
+		super(Entities.INFINITE_ENERGY, new ConduitType("power"), 1000f, "tile.basepower.infinite_energy_source.name");
 		this.type[0] = new ConduitType("power");
 	}
 
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/FluidDischargeBlock.java b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDischargeBlock.java
similarity index 97%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/FluidDischargeBlock.java
rename to src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDischargeBlock.java
index c7b2dd7a..efd6c84b 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/FluidDischargeBlock.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDischargeBlock.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.machines.fluidmachines;
+package zone.moddev.mc.basepower.machines.fluidmachines;
 
 import cyano.poweradvantage.api.ConduitType;
 import cyano.poweradvantage.api.PoweredEntity;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/FluidDischargeTileEntity.java b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDischargeTileEntity.java
similarity index 95%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/FluidDischargeTileEntity.java
rename to src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDischargeTileEntity.java
index cf3844df..7e22e350 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/FluidDischargeTileEntity.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDischargeTileEntity.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.machines.fluidmachines;
+package zone.moddev.mc.basepower.machines.fluidmachines;
 
 import cyano.poweradvantage.api.ConduitType;
 import cyano.poweradvantage.api.fluid.FluidStack;
@@ -14,15 +14,15 @@
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import zone.moddev.mc.poweradvantage.init.Entities;
-import zone.moddev.mc.poweradvantage.util.FluidHandlerHelper;
+import zone.moddev.mc.basepower.init.Entities;
+import zone.moddev.mc.basepower.util.FluidHandlerHelper;
 
 /** Places stored fluid into the world or into a tank below. */
 public class FluidDischargeTileEntity extends TileEntitySimpleFluidMachine {
     private int oldLevel = -1;
 
     public FluidDischargeTileEntity() {
-        super(Entities.FLUID_DISCHARGE, FluidTank.BUCKET_VOLUME, "tile.poweradvantage.fluid_discharge.name");
+        super(Entities.FLUID_DISCHARGE, FluidTank.BUCKET_VOLUME, "tile.basepower.fluid_discharge.name");
     }
 
     @Override
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/FluidDrainBlock.java b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDrainBlock.java
similarity index 96%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/FluidDrainBlock.java
rename to src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDrainBlock.java
index 18b1c818..0bea8f6a 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/FluidDrainBlock.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDrainBlock.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.machines.fluidmachines;
+package zone.moddev.mc.basepower.machines.fluidmachines;
 
 import cyano.poweradvantage.api.ConduitType;
 import cyano.poweradvantage.api.PoweredEntity;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/FluidDrainTileEntity.java b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDrainTileEntity.java
similarity index 96%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/FluidDrainTileEntity.java
rename to src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDrainTileEntity.java
index 0a15e028..51a51cb7 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/FluidDrainTileEntity.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDrainTileEntity.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.machines.fluidmachines;
+package zone.moddev.mc.basepower.machines.fluidmachines;
 
 import cyano.poweradvantage.api.ConduitType;
 import cyano.poweradvantage.api.fluid.FluidStack;
@@ -16,13 +16,13 @@
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import zone.moddev.mc.poweradvantage.init.Entities;
-import zone.moddev.mc.poweradvantage.util.FluidHandlerHelper;
+import zone.moddev.mc.basepower.init.Entities;
+import zone.moddev.mc.basepower.util.FluidHandlerHelper;
 
 /** Pulls source blocks or adjacent Advantage tanks into the pipe network. */
 public class FluidDrainTileEntity extends TileEntitySimpleFluidMachine {
     public FluidDrainTileEntity() {
-        super(Entities.FLUID_DRAIN, FluidTank.BUCKET_VOLUME, "tile.poweradvantage.fluid_drain.name");
+        super(Entities.FLUID_DRAIN, FluidTank.BUCKET_VOLUME, "tile.basepower.fluid_drain.name");
     }
 
     @Override
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/FluidPipeBlock.java b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidPipeBlock.java
similarity index 90%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/FluidPipeBlock.java
rename to src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidPipeBlock.java
index 8401b595..09a27bff 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/FluidPipeBlock.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidPipeBlock.java
@@ -1,8 +1,8 @@
-package zone.moddev.mc.poweradvantage.machines.fluidmachines;
+package zone.moddev.mc.basepower.machines.fluidmachines;
 
 import cyano.poweradvantage.api.simple.BlockSimpleFluidConduit;
-import zone.moddev.mc.poweradvantage.init.Blocks;
-import zone.moddev.mc.poweradvantage.util.FluidHandlerHelper;
+import zone.moddev.mc.basepower.init.Blocks;
+import zone.moddev.mc.basepower.util.FluidHandlerHelper;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/MetalTankBlock.java b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/MetalTankBlock.java
similarity index 96%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/MetalTankBlock.java
rename to src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/MetalTankBlock.java
index 44a93d74..071bb801 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/MetalTankBlock.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/MetalTankBlock.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.machines.fluidmachines;
+package zone.moddev.mc.basepower.machines.fluidmachines;
 
 import cyano.poweradvantage.api.ConduitType;
 import cyano.poweradvantage.api.PoweredEntity;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/MetalTankTileEntity.java b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/MetalTankTileEntity.java
similarity index 95%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/MetalTankTileEntity.java
rename to src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/MetalTankTileEntity.java
index 006ea61b..f41389f7 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/MetalTankTileEntity.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/MetalTankTileEntity.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.machines.fluidmachines;
+package zone.moddev.mc.basepower.machines.fluidmachines;
 
 import cyano.poweradvantage.api.ConduitType;
 import cyano.poweradvantage.api.PowerRequest;
@@ -8,14 +8,14 @@
 import net.minecraft.fluid.Fluid;
 import cyano.poweradvantage.api.fluid.FluidStack;
 import cyano.poweradvantage.api.fluid.FluidTank;
-import zone.moddev.mc.poweradvantage.init.Entities;
-import zone.moddev.mc.poweradvantage.util.FluidContainerHelper;
+import zone.moddev.mc.basepower.init.Entities;
+import zone.moddev.mc.basepower.util.FluidContainerHelper;
 
 @SuppressWarnings("deprecation")
 public class MetalTankTileEntity  extends TileEntitySimpleFluidMachine {
 
 	public MetalTankTileEntity() {
-		super(Entities.METAL_TANK, FluidTank.BUCKET_VOLUME * 10, "tile.poweradvantage.fluid_metal_tank.name");
+		super(Entities.METAL_TANK, FluidTank.BUCKET_VOLUME * 10, "tile.basepower.fluid_metal_tank.name");
 	}
 
 
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/StillBlock.java b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/StillBlock.java
similarity index 98%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/StillBlock.java
rename to src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/StillBlock.java
index 9a8a8e87..7f33ff2f 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/StillBlock.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/StillBlock.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.machines.fluidmachines;
+package zone.moddev.mc.basepower.machines.fluidmachines;
 
 import cyano.poweradvantage.api.ConduitType;
 import cyano.poweradvantage.api.PoweredEntity;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/StillTileEntity.java b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/StillTileEntity.java
similarity index 97%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/StillTileEntity.java
rename to src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/StillTileEntity.java
index 1a0d6ea4..63d939c2 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/StillTileEntity.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/StillTileEntity.java
@@ -1,11 +1,11 @@
-package zone.moddev.mc.poweradvantage.machines.fluidmachines;
+package zone.moddev.mc.basepower.machines.fluidmachines;
 
 import cyano.poweradvantage.api.fluid.FluidRequest;
 import cyano.poweradvantage.api.simple.TileEntitySimpleFluidMachine;
-import zone.moddev.mc.poweradvantage.registry.FuelRegistry;
-import zone.moddev.mc.poweradvantage.registry.still.recipe.DistillationRecipe;
-import zone.moddev.mc.poweradvantage.registry.still.recipe.DistillationRecipeRegistry;
-import zone.moddev.mc.poweradvantage.util.FluidIdHelper;
+import zone.moddev.mc.basepower.registry.FuelRegistry;
+import zone.moddev.mc.basepower.registry.still.recipe.DistillationRecipe;
+import zone.moddev.mc.basepower.registry.still.recipe.DistillationRecipeRegistry;
+import zone.moddev.mc.basepower.util.FluidIdHelper;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -16,7 +16,7 @@
 import cyano.poweradvantage.api.fluid.FluidStack;
 import cyano.poweradvantage.api.fluid.FluidTank;
 import cyano.poweradvantage.api.fluid.FluidTankInfo;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.init.Entities;
 
 @SuppressWarnings("deprecation")
 public class StillTileEntity extends TileEntitySimpleFluidMachine {
@@ -41,7 +41,7 @@ public class StillTileEntity extends TileEntitySimpleFluidMachine {
 
 
 	public StillTileEntity() {
-		super(Entities.STILL, FluidTank.BUCKET_VOLUME, "tile.poweradvantage.still.name");
+		super(Entities.STILL, FluidTank.BUCKET_VOLUME, "tile.basepower.still.name");
 	}
 
 	@Override
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/StorageTankBlock.java b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/StorageTankBlock.java
similarity index 95%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/StorageTankBlock.java
rename to src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/StorageTankBlock.java
index 4be50893..0cf64a59 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/StorageTankBlock.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/StorageTankBlock.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.machines.fluidmachines;
+package zone.moddev.mc.basepower.machines.fluidmachines;
 
 import java.util.List;
 
@@ -24,7 +24,7 @@
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
-import zone.moddev.mc.poweradvantage.init.Fluids;
+import zone.moddev.mc.basepower.init.Fluids;
 
 /** Portable tank block. FluidID and Volume remain unchanged for old item stacks. */
 public class StorageTankBlock extends BlockSimpleFluidMachine {
@@ -80,7 +80,7 @@ public void addInformation(ItemStack stack, @Nullable IBlockReader world,
             List tooltip, ITooltipFlag flag) {
         NBTTagCompound tag = stack.getTag();
         if (tag == null || !tag.contains("FluidID", 8) || !tag.contains("Volume", 99)) {
-            tooltip.add(new TextComponentTranslation("tooltip.poweradvantage.empty"));
+            tooltip.add(new TextComponentTranslation("tooltip.basepower.empty"));
             return;
         }
         float buckets = tag.getInt("Volume") / (float) FluidTank.BUCKET_VOLUME;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/StorageTankTileEntity.java b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/StorageTankTileEntity.java
similarity index 95%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/StorageTankTileEntity.java
rename to src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/StorageTankTileEntity.java
index 467e5cbc..666ae4fa 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/StorageTankTileEntity.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/StorageTankTileEntity.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.machines.fluidmachines;
+package zone.moddev.mc.basepower.machines.fluidmachines;
 
 import cyano.poweradvantage.api.PowerRequest;
 import cyano.poweradvantage.api.fluid.FluidRequest;
@@ -8,13 +8,13 @@
 import net.minecraft.fluid.Fluid;
 import cyano.poweradvantage.api.fluid.FluidStack;
 import cyano.poweradvantage.api.fluid.FluidTank;
-import zone.moddev.mc.poweradvantage.init.Entities;
+import zone.moddev.mc.basepower.init.Entities;
 
 @SuppressWarnings("deprecation")
 public class StorageTankTileEntity  extends TileEntitySimpleFluidMachine {
 
 	public StorageTankTileEntity() {
-		super(Entities.STORAGE_TANK, FluidTank.BUCKET_VOLUME * 4, "tile.poweradvantage.fluid_storage_tank.name");
+		super(Entities.STORAGE_TANK, FluidTank.BUCKET_VOLUME * 4, "tile.basepower.fluid_storage_tank.name");
 	}
 
 	/**
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/modsupport/TerminalFluidPipeBlock.java b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/modsupport/TerminalFluidPipeBlock.java
similarity index 90%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/modsupport/TerminalFluidPipeBlock.java
rename to src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/modsupport/TerminalFluidPipeBlock.java
index ae7ef633..784d02d5 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/modsupport/TerminalFluidPipeBlock.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/modsupport/TerminalFluidPipeBlock.java
@@ -1,9 +1,9 @@
-package zone.moddev.mc.poweradvantage.machines.fluidmachines.modsupport;
+package zone.moddev.mc.basepower.machines.fluidmachines.modsupport;
 
 import cyano.poweradvantage.api.ConduitType;
-import zone.moddev.mc.poweradvantage.init.Blocks;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.FluidPipeBlock;
-import zone.moddev.mc.poweradvantage.util.FluidHandlerHelper;
+import zone.moddev.mc.basepower.init.Blocks;
+import zone.moddev.mc.basepower.machines.fluidmachines.FluidPipeBlock;
+import zone.moddev.mc.basepower.util.FluidHandlerHelper;
 import net.minecraft.block.Block;
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.state.IBlockState;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/modsupport/TerminalFluidPipeTileEntity.java b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/modsupport/TerminalFluidPipeTileEntity.java
similarity index 94%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/modsupport/TerminalFluidPipeTileEntity.java
rename to src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/modsupport/TerminalFluidPipeTileEntity.java
index 80411777..740bd028 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/modsupport/TerminalFluidPipeTileEntity.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/modsupport/TerminalFluidPipeTileEntity.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.machines.fluidmachines.modsupport;
+package zone.moddev.mc.basepower.machines.fluidmachines.modsupport;
 
 import java.util.List;
 
@@ -12,10 +12,10 @@
 import net.minecraft.fluid.Fluid;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
-import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry;
-import zone.moddev.mc.poweradvantage.init.Entities;
-import zone.moddev.mc.poweradvantage.init.Fluids;
-import zone.moddev.mc.poweradvantage.util.FluidHandlerHelper;
+import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry;
+import zone.moddev.mc.basepower.init.Entities;
+import zone.moddev.mc.basepower.init.Fluids;
+import zone.moddev.mc.basepower.util.FluidHandlerHelper;
 
 /** Bridges adjacent Advantage fluid handlers onto the conduit request network. */
 public class TerminalFluidPipeTileEntity extends PoweredEntity {
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/package-info.java b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/package-info.java
similarity index 74%
rename from src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/package-info.java
rename to src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/package-info.java
index 2df28e68..488d9fc9 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/package-info.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/package-info.java
@@ -3,10 +3,10 @@
 This package contains content that is added by PowerAdvantage implementing the PowerAdvantage API.
 If you are writing an add-on mod, use the code in this package for reference, but you should not
 depend on its implementation details as future updates might change them. For a better way to get
-PowerAdvantage content, look in the zone.moddev.mc.poweradvantage.init package.
+PowerAdvantage content, look in the zone.moddev.mc.basepower.init package.
 

 Because these classes are not part of the API, they are not well documented. They were only meant
 for the eyes of the mod author(s).
 

 */
-package zone.moddev.mc.poweradvantage.machines.fluidmachines;
+package zone.moddev.mc.basepower.machines.fluidmachines;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/math/BlockPos4D.java b/src/main/java/zone/moddev/mc/basepower/math/BlockPos4D.java
similarity index 99%
rename from src/main/java/zone/moddev/mc/poweradvantage/math/BlockPos4D.java
rename to src/main/java/zone/moddev/mc/basepower/math/BlockPos4D.java
index 9e63f0c9..128afe0c 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/math/BlockPos4D.java
+++ b/src/main/java/zone/moddev/mc/basepower/math/BlockPos4D.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.math;
+package zone.moddev.mc.basepower.math;
 
 import net.minecraft.nbt.INBTBase;
 import net.minecraft.nbt.NBTTagIntArray;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/math/Integer2D.java b/src/main/java/zone/moddev/mc/basepower/math/Integer2D.java
similarity index 95%
rename from src/main/java/zone/moddev/mc/poweradvantage/math/Integer2D.java
rename to src/main/java/zone/moddev/mc/basepower/math/Integer2D.java
index 987a8d9f..7722b0b1 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/math/Integer2D.java
+++ b/src/main/java/zone/moddev/mc/basepower/math/Integer2D.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.math;
+package zone.moddev.mc.basepower.math;
 
 /**
  * This class is used to store 2D integer coordinates
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/math/package-info.java b/src/main/java/zone/moddev/mc/basepower/math/package-info.java
similarity index 55%
rename from src/main/java/zone/moddev/mc/poweradvantage/math/package-info.java
rename to src/main/java/zone/moddev/mc/basepower/math/package-info.java
index 72c1ee2a..2ec83a06 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/math/package-info.java
+++ b/src/main/java/zone/moddev/mc/basepower/math/package-info.java
@@ -3,4 +3,4 @@
 This package contains helper classes.
 

 */
-package zone.moddev.mc.poweradvantage.math;
\ No newline at end of file
+package zone.moddev.mc.basepower.math;
\ No newline at end of file
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/migration/AdvantageLegacyMigrations.java b/src/main/java/zone/moddev/mc/basepower/migration/AdvantageLegacyMigrations.java
similarity index 69%
rename from src/main/java/zone/moddev/mc/poweradvantage/migration/AdvantageLegacyMigrations.java
rename to src/main/java/zone/moddev/mc/basepower/migration/AdvantageLegacyMigrations.java
index 9d14b677..4533b26c 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/migration/AdvantageLegacyMigrations.java
+++ b/src/main/java/zone/moddev/mc/basepower/migration/AdvantageLegacyMigrations.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.migration;
+package zone.moddev.mc.basepower.migration;
 
 import cyano.poweradvantage.api.migration.LegacyMigrationApi;
 import cyano.poweradvantage.api.simple.BlockSimplePowerMachine;
@@ -6,11 +6,11 @@
 import net.minecraft.block.BlockFlowingFluid;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.ResourceLocation;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
-import zone.moddev.mc.poweradvantage.blocks.BlockPowerSwitch;
-import zone.moddev.mc.poweradvantage.machines.conveyors.BlockConveyor;
-import zone.moddev.mc.poweradvantage.machines.conveyors.BlockConveyorFilter;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.StillBlock;
+import zone.moddev.mc.basepower.PowerAdvantage;
+import zone.moddev.mc.basepower.blocks.BlockPowerSwitch;
+import zone.moddev.mc.basepower.machines.conveyors.BlockConveyor;
+import zone.moddev.mc.basepower.machines.conveyors.BlockConveyorFilter;
+import zone.moddev.mc.basepower.machines.fluidmachines.StillBlock;
 
 /** Registers PowerAdvantage's 1.10 and 1.12 identities with the shared hook. */
 public final class AdvantageLegacyMigrations {
@@ -20,7 +20,7 @@ private AdvantageLegacyMigrations() {}
 
     public static synchronized void registerPowerAdvantage() {
         if (registered) return;
-        LegacyMigrationApi.registerNamespace(PowerAdvantage.MODID);
+        LegacyMigrationApi.registerNamespaceAlias("poweradvantage", PowerAdvantage.MODID);
 
         for (String path : new String[] {
                 "fluid_drain", "fluid_discharge", "fluid_storage_tank", "fluid_metal_tank", "still",
@@ -55,21 +55,27 @@ public static synchronized void registerPowerAdvantage() {
         registerTile("rf_quantum_converter_tileentity");
         registerTile("tr_electricity_converter_tileentity");
 
-        LegacyMigrationApi.registerFluidAlias("crude_oil", "poweradvantage:crude_oil");
-        LegacyMigrationApi.registerFluidAlias("refined_oil", "poweradvantage:refined_oil");
+        LegacyMigrationApi.registerFluidAlias("crude_oil", "basepower:crude_oil");
+        LegacyMigrationApi.registerFluidAlias("refined_oil", "basepower:refined_oil");
+        LegacyMigrationApi.registerFluidAlias("poweradvantage:crude_oil", "basepower:crude_oil");
+        LegacyMigrationApi.registerFluidAlias("poweradvantage:refined_oil", "basepower:refined_oil");
+        LegacyMigrationApi.registerFluidAlias("poweradvantage:flowing_crude_oil", "basepower:flowing_crude_oil");
+        LegacyMigrationApi.registerFluidAlias("poweradvantage:flowing_refined_oil", "basepower:flowing_refined_oil");
         LegacyMigrationApi.registerFluidAlias("mineralogy_crude_oil", "mineralogy:crude_oil");
         LegacyMigrationApi.registerLegacyFluidBucket("crude_oil", id("crude_oil_bucket"));
-        LegacyMigrationApi.registerLegacyFluidBucket("poweradvantage:crude_oil", id("crude_oil_bucket"));
+        LegacyMigrationApi.registerLegacyFluidBucket("basepower:crude_oil", id("crude_oil_bucket"));
         LegacyMigrationApi.registerLegacyFluidBucket("refined_oil", id("refined_oil_bucket"));
-        LegacyMigrationApi.registerLegacyFluidBucket("poweradvantage:refined_oil", id("refined_oil_bucket"));
+        LegacyMigrationApi.registerLegacyFluidBucket("basepower:refined_oil", id("refined_oil_bucket"));
+        for (String namespace : new String[] {"poweradvantage", PowerAdvantage.MODID}) {
+            for (String fluid : new String[] {"crude_oil", "refined_oil"}) {
+                LegacyMigrationApi.registerItemAlias(new ResourceLocation(namespace, fluid), id(fluid + "_bucket"));
+            }
+        }
         registered = true;
     }
 
     private static void registerTile(String path) {
-        String current = id(path).toString();
-        LegacyMigrationApi.registerTileEntityAlias(current, current);
-        LegacyMigrationApi.registerTileEntityAlias(PowerAdvantage.MODID + "." + path, current);
-        LegacyMigrationApi.registerTileEntityAlias("minecraft:" + PowerAdvantage.MODID + "." + path, current);
+        LegacyMigrationApi.registerTileEntityAliases(id(path));
     }
 
     private static IBlockState decodeState(Block block, int metadata) {
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/migration/LegacyWorldDataHook.java b/src/main/java/zone/moddev/mc/basepower/migration/LegacyWorldDataHook.java
similarity index 86%
rename from src/main/java/zone/moddev/mc/poweradvantage/migration/LegacyWorldDataHook.java
rename to src/main/java/zone/moddev/mc/basepower/migration/LegacyWorldDataHook.java
index a8fc5041..86ba2cc7 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/migration/LegacyWorldDataHook.java
+++ b/src/main/java/zone/moddev/mc/basepower/migration/LegacyWorldDataHook.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.migration;
+package zone.moddev.mc.basepower.migration;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -43,7 +43,7 @@
 import net.minecraftforge.fml.WorldPersistenceHooks;
 import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
 import net.minecraftforge.registries.ForgeRegistries;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
+import zone.moddev.mc.basepower.PowerAdvantage;
 
 /**
  * Shared Advantage pre-flattening migration hook for Minecraft 1.10 and 1.12
@@ -85,7 +85,14 @@ public static synchronized void prepareLegacyWorld(File levelDat) {
             NBTTagCompound root = CompressedStreamTools.readCompressed(input);
             if (!root.contains("FML", 10)) return;
             prepareLegacyData(levelDat.getParentFile(), root.getCompound("FML"));
-            migrateLoosePlayerData(levelDat, root);
+            // The backup may supply registry IDs, but must never replace newer world data.
+            if (source.equals(levelDat)) {
+                migrateLoosePlayerData(levelDat, root);
+            } else {
+                try (FileInputStream current = new FileInputStream(levelDat)) {
+                    migrateLoosePlayerData(levelDat, CompressedStreamTools.readCompressed(current));
+                }
+            }
         } catch (IOException exception) {
             PowerAdvantage.LOGGER.warn("Could not inspect '{}' for legacy Advantage registry data", source, exception);
         }
@@ -94,6 +101,7 @@ public static synchronized void prepareLegacyWorld(File levelDat) {
     /** Called by the coremod immediately after a legacy chunk NBT is read. */
     public static synchronized void prepareLegacyChunk(NBTTagCompound root) {
         if (root == null) return;
+        flattenVanillaInventories(root);
         migrateLegacyNbt(root);
         migrateLegacyEntities(root);
         if (!legacyWorldActive || !root.contains("Level", 10)) return;
@@ -108,6 +116,47 @@ public static synchronized void prepareLegacyChunk(NBTTagCompound root) {
         level.setBoolean(PRESERVE_CHUNK_MARKER, true);
     }
 
+    static void flattenVanillaInventories(NBTTagCompound root) {
+        int version = root.contains("DataVersion", 99) ? root.getInt("DataVersion") : -1;
+        if (version > LAST_PRE_FLATTENING_VERSION || !root.contains("Level", 10)) return;
+        NBTTagCompound level = root.getCompound("Level");
+        for (String key : new String[] {"TileEntities", "Entities"}) {
+            NBTTagList entries = level.getList(key, 10);
+            for (int index = 0; index < entries.size(); index++) {
+                NBTTagCompound entry = entries.getCompound(index);
+                String id = LegacyMigrationApi.entityTarget(LegacyMigrationApi.tileTarget(entry.getString("id")));
+                ResourceLocation target = safeId(id);
+                if (target != null && LegacyMigrationApi.handlesNamespace(target.getNamespace())) {
+                    flattenNestedStacks(entry, version);
+                }
+            }
+        }
+    }
+
+    private static INBTBase flattenNestedStacks(INBTBase value, int version) {
+        if (value instanceof NBTTagCompound) {
+            NBTTagCompound compound = (NBTTagCompound) value;
+            ResourceLocation id = safeId(compound.getString("id"));
+            if (id != null && "minecraft".equals(id.getNamespace()) && compound.contains("Count", 99)) {
+                // Vanilla's chunk fixer does not walk inventories of unknown tile/entity types.
+                return NBTUtil.update(DataFixesManager.getDataFixer(), TypeReferences.ITEM_STACK, compound, version);
+            }
+            for (String key : new ArrayList<>(compound.keySet())) {
+                INBTBase child = compound.getTag(key);
+                INBTBase fixed = flattenNestedStacks(child, version);
+                if (fixed != child) compound.setTag(key, fixed);
+            }
+        } else if (value instanceof NBTTagList) {
+            NBTTagList list = (NBTTagList) value;
+            for (int index = 0; index < list.size(); index++) {
+                INBTBase child = list.get(index);
+                INBTBase fixed = flattenNestedStacks(child, version);
+                if (fixed != child) list.set(index, fixed);
+            }
+        }
+        return value;
+    }
+
     private static void migrateLegacyEntities(NBTTagCompound root) {
         int version = root.contains("DataVersion", 99) ? root.getInt("DataVersion") : -1;
         if (version >= LAST_PRE_FLATTENING_VERSION || !root.contains("Level", 10)) return;
@@ -197,6 +246,9 @@ private static int installLegacyBlockStates(NBTTagCompound snapshot) {
             ResourceLocation id = safeId(normalizeLegacyRegistryName(entry.getString("K")));
             if (id == null || !LegacyMigrationApi.handlesNamespace(id.getNamespace())) continue;
             int numeric = entry.getInt("V");
+            if (numeric < 0 || numeric > 4095) {
+                throw new IllegalStateException("Invalid legacy block ID for " + id + ": " + numeric);
+            }
             ids.put(id, Integer.valueOf(numeric));
             LEGACY_BLOCK_IDS.set(numeric);
             highestState = Math.max(highestState, (numeric << 4) | 15);
@@ -208,7 +260,7 @@ private static int installLegacyBlockStates(NBTTagCompound snapshot) {
         for (Map.Entry entry : ids.entrySet()) {
             ResourceLocation target = LegacyMigrationApi.blockTarget(entry.getKey());
             Block block = ForgeRegistries.BLOCKS.getValue(target);
-            if (block == null) {
+            if (!ForgeRegistries.BLOCKS.containsKey(target) || block == null) {
                 throw new IllegalStateException("No Advantage replacement for legacy block " + entry.getKey()
                         + " (expected " + target + ")");
             }
@@ -261,10 +313,14 @@ private static boolean migrateEnchantmentList(NBTTagCompound compound, String ke
         NBTTagList list = compound.getList(key, 10);
         for (int index = 0; index < list.size(); index++) {
             NBTTagCompound enchantment = list.getCompound(index);
-            if (!enchantment.contains("id", 99)) continue;
-            String name = savedIds.get(Integer.valueOf(enchantment.getInt("id")));
-            if (name != null) {
-                enchantment.setString("id", name);
+            boolean numeric = enchantment.contains("id", 99);
+            String name = numeric ? savedIds.get(Integer.valueOf(enchantment.getInt("id")))
+                    : enchantment.getString("id");
+            ResourceLocation id = safeId(name);
+            if (id == null) continue;
+            String target = LegacyMigrationApi.registryTarget(id).toString();
+            if (numeric || !target.equals(name)) {
+                enchantment.setString("id", target);
                 changed = true;
             }
         }
@@ -321,6 +377,10 @@ private static int migrateLegacyNbt(INBTBase value) {
                 if (oldId != null && LegacyMigrationApi.handlesNamespace(oldId.getNamespace())) {
                     ResourceLocation target = LegacyMigrationApi.itemTarget(oldId);
                     if (!target.equals(oldId)) {
+                        if (!ForgeRegistries.ITEMS.containsKey(target)) {
+                            throw new IllegalStateException("No replacement for saved Advantage item " + oldId
+                                    + " (expected " + target + ")");
+                        }
                         compound.setString("id", target.toString());
                         changed++;
                     }
@@ -455,9 +515,9 @@ private static Dynamic[] expandFlatteningTable(int requiredLength) {
     }
 
     private static void writeWithBackup(File file, NBTTagCompound data) throws IOException {
-        File backup = new File(file.getParentFile(), file.getName() + ".poweradvantage-legacy-backup");
+        File backup = new File(file.getParentFile(), file.getName() + ".basepower-legacy-backup");
         if (!backup.exists()) Files.copy(file.toPath(), backup.toPath(), StandardCopyOption.COPY_ATTRIBUTES);
-        File temporary = new File(file.getParentFile(), file.getName() + ".poweradvantage.tmp");
+        File temporary = new File(file.getParentFile(), file.getName() + ".basepower.tmp");
         try (FileOutputStream output = new FileOutputStream(temporary)) {
             CompressedStreamTools.writeCompressed(data, output);
         }
@@ -470,7 +530,7 @@ private static void writeWithBackup(File file, NBTTagCompound data) throws IOExc
     }
 
     private static void writeMigrationReport(File worldDirectory, int states, int chunks) {
-        File report = new File(worldDirectory, "poweradvantage-migration-report.txt");
+        File report = new File(worldDirectory, "basepower-migration-report.txt");
         if (report.exists()) return;
         List lines = Arrays.asList(
                 "Advantage 1.13 legacy migration",
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/package-info.java b/src/main/java/zone/moddev/mc/basepower/package-info.java
similarity index 81%
rename from src/main/java/zone/moddev/mc/poweradvantage/package-info.java
rename to src/main/java/zone/moddev/mc/basepower/package-info.java
index b594f496..e4cdd203 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/package-info.java
+++ b/src/main/java/zone/moddev/mc/basepower/package-info.java
@@ -2,4 +2,4 @@
 This package contains the main mod class. If you are making an add-on mod, you probably want to use 
 classes from the cyano.poweradvantage.api.simple package
 */
-package zone.moddev.mc.poweradvantage;
\ No newline at end of file
+package zone.moddev.mc.basepower;
\ No newline at end of file
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/recipe/MaterialTags.java b/src/main/java/zone/moddev/mc/basepower/recipe/MaterialTags.java
similarity index 88%
rename from src/main/java/zone/moddev/mc/poweradvantage/recipe/MaterialTags.java
rename to src/main/java/zone/moddev/mc/basepower/recipe/MaterialTags.java
index 07d33c43..e629dd77 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/recipe/MaterialTags.java
+++ b/src/main/java/zone/moddev/mc/basepower/recipe/MaterialTags.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.recipe;
+package zone.moddev.mc.basepower.recipe;
 
 import net.minecraft.item.Item;
 import net.minecraft.tags.ItemTags;
@@ -6,9 +6,9 @@
 import net.minecraft.tags.TagCollection;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.ModList;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
-import zone.moddev.mc.poweradvantage.RecipeMode;
-import zone.moddev.mc.poweradvantage.init.Items;
+import zone.moddev.mc.basepower.PowerAdvantage;
+import zone.moddev.mc.basepower.RecipeMode;
+import zone.moddev.mc.basepower.init.Items;
 
 /** Config-dependent legacy aliases, applied before recipes and advancements read tags. */
 public final class MaterialTags {
@@ -22,7 +22,7 @@ public static void finishReload() {
             append(tags, "forge:rubber", java.util.Collections.singleton(Items.bioplastic_ingot));
             append(tags, "forge:ingots/rubber", java.util.Collections.singleton(Items.bioplastic_ingot));
         }
-        if (PowerAdvantage.recipeMode == RecipeMode.NORMAL && ModList.get().isLoaded("electricadvantage")) {
+        if (PowerAdvantage.recipeMode == RecipeMode.NORMAL && ModList.get().isLoaded("baseelectric")) {
             for (String metal : new String[] {"lead", "tin", "silver"}) {
                 append(tags, "forge:solder", tags.getOrCreate(new ResourceLocation("forge", "ingots/" + metal)).getAllElements());
             }
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/recipe/PartsLoot.java b/src/main/java/zone/moddev/mc/basepower/recipe/PartsLoot.java
similarity index 91%
rename from src/main/java/zone/moddev/mc/poweradvantage/recipe/PartsLoot.java
rename to src/main/java/zone/moddev/mc/basepower/recipe/PartsLoot.java
index 1172c1a8..58f36b79 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/recipe/PartsLoot.java
+++ b/src/main/java/zone/moddev/mc/basepower/recipe/PartsLoot.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.recipe;
+package zone.moddev.mc.basepower.recipe;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
@@ -12,7 +12,7 @@
 import net.minecraft.world.storage.loot.LootTableManager;
 import net.minecraftforge.common.ForgeHooks;
 import net.minecraftforge.fml.ModList;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
+import zone.moddev.mc.basepower.PowerAdvantage;
 
 /** Native legacy parts, confined to original vanilla chest data without ALT. */
 public final class PartsLoot {
@@ -29,13 +29,13 @@ public static LootTable loadLootTable(Gson gson, ResourceLocation name, String d
         if (path.startsWith("loot_tables/") && path.endsWith(".json"))
             path = path.substring("loot_tables/".length(), path.length() - ".json".length());
         if (defaultPack && name.getNamespace().equals("minecraft") && CHESTS.contains(path)
-                && ModList.get() != null && ModList.get().isLoaded("poweradvantage")
+                && ModList.get() != null && ModList.get().isLoaded("basepower")
                 && PowerAdvantage.chestLootFactor > 0 && !hasAdditionalLootTables()) {
             JsonObject table = new JsonParser().parse(data).getAsJsonObject();
             JsonArray pools = table.getAsJsonArray("pools");
             if (pools == null) { pools = new JsonArray(); table.add("pools", pools); }
-            for (String mod : new String[] {"poweradvantage", "steamadvantage", "electricadvantage"}) {
-                if (!ModList.get().isLoaded(mod) || (mod.equals("poweradvantage") && path.equals("chests/end_city_treasure"))) continue;
+            for (String mod : new String[] {"basepower", "basesteam", "baseelectric"}) {
+                if (!ModList.get().isLoaded(mod) || (mod.equals("basepower") && path.equals("chests/end_city_treasure"))) continue;
                 String poolName = mod + ":legacy_parts";
                 boolean exists = false;
                 for (com.google.gson.JsonElement pool : pools)
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/recipe/RecipeConditions.java b/src/main/java/zone/moddev/mc/basepower/recipe/RecipeConditions.java
similarity index 91%
rename from src/main/java/zone/moddev/mc/poweradvantage/recipe/RecipeConditions.java
rename to src/main/java/zone/moddev/mc/basepower/recipe/RecipeConditions.java
index 65109ce5..8438c4ee 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/recipe/RecipeConditions.java
+++ b/src/main/java/zone/moddev/mc/basepower/recipe/RecipeConditions.java
@@ -1,11 +1,11 @@
-package zone.moddev.mc.poweradvantage.recipe;
+package zone.moddev.mc.basepower.recipe;
 
 import net.minecraft.tags.ItemTags;
 import net.minecraft.util.JsonUtils;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.crafting.CraftingHelper;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
-import zone.moddev.mc.poweradvantage.RecipeMode;
+import zone.moddev.mc.basepower.PowerAdvantage;
+import zone.moddev.mc.basepower.RecipeMode;
 
 /** Registers the data-pack conditions used by PowerAdvantage recipe modes. */
 public final class RecipeConditions {
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/recipe/RecipeDiscovery.java b/src/main/java/zone/moddev/mc/basepower/recipe/RecipeDiscovery.java
similarity index 93%
rename from src/main/java/zone/moddev/mc/poweradvantage/recipe/RecipeDiscovery.java
rename to src/main/java/zone/moddev/mc/basepower/recipe/RecipeDiscovery.java
index 8be8b53a..0be2ab31 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/recipe/RecipeDiscovery.java
+++ b/src/main/java/zone/moddev/mc/basepower/recipe/RecipeDiscovery.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.recipe;
+package zone.moddev.mc.basepower.recipe;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -13,7 +13,7 @@
 /** Retains earned discoveries when recipe modes or material providers change. */
 public final class RecipeDiscovery {
     private static final Set NAMESPACES = new HashSet<>(Arrays.asList(
-            "poweradvantage", "steamadvantage", "electricadvantage"));
+            "basepower", "basesteam", "baseelectric"));
 
     private RecipeDiscovery() {}
 
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/registry/FuelRegistry.java b/src/main/java/zone/moddev/mc/basepower/registry/FuelRegistry.java
similarity index 98%
rename from src/main/java/zone/moddev/mc/poweradvantage/registry/FuelRegistry.java
rename to src/main/java/zone/moddev/mc/basepower/registry/FuelRegistry.java
index 2a82b95e..fa1ea541 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/registry/FuelRegistry.java
+++ b/src/main/java/zone/moddev/mc/basepower/registry/FuelRegistry.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.registry;
+package zone.moddev.mc.basepower.registry;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
@@ -13,7 +13,7 @@
 
 /**
  * The fuel registry keeps track of the cooking time for new burnables added by PowerAdvantage. The 
- * actual registration of these burnables occurs in zone.moddev.mc.poweradvantage.init.Fuels
+ * actual registration of these burnables occurs in zone.moddev.mc.basepower.init.Fuels
  * @author DrCyano
  *
  */
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/registry/ITileEntityGUI.java b/src/main/java/zone/moddev/mc/basepower/registry/ITileEntityGUI.java
similarity index 96%
rename from src/main/java/zone/moddev/mc/poweradvantage/registry/ITileEntityGUI.java
rename to src/main/java/zone/moddev/mc/basepower/registry/ITileEntityGUI.java
index 7cc88006..52a26582 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/registry/ITileEntityGUI.java
+++ b/src/main/java/zone/moddev/mc/basepower/registry/ITileEntityGUI.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.registry;
+package zone.moddev.mc.basepower.registry;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/registry/MachineGUIRegistry.java b/src/main/java/zone/moddev/mc/basepower/registry/MachineGUIRegistry.java
similarity index 98%
rename from src/main/java/zone/moddev/mc/poweradvantage/registry/MachineGUIRegistry.java
rename to src/main/java/zone/moddev/mc/basepower/registry/MachineGUIRegistry.java
index 832c3afb..a0d94dc3 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/registry/MachineGUIRegistry.java
+++ b/src/main/java/zone/moddev/mc/basepower/registry/MachineGUIRegistry.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.registry;
+package zone.moddev.mc.basepower.registry;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
@@ -137,7 +137,7 @@ public Container createContainer(InventoryPlayer inventory, EntityPlayer entityP
 
 			@Override
 			public String getGuiID() {
-				return "poweradvantage:machine";
+				return "basepower:machine";
 			}
 
 			@Override public ITextComponent getName() { return menuTitle(tile, world.getBlockState(pos).getBlock()); }
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/registry/package-info.java b/src/main/java/zone/moddev/mc/basepower/registry/package-info.java
similarity index 67%
rename from src/main/java/zone/moddev/mc/poweradvantage/registry/package-info.java
rename to src/main/java/zone/moddev/mc/basepower/registry/package-info.java
index d71055ea..d22177c1 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/registry/package-info.java
+++ b/src/main/java/zone/moddev/mc/basepower/registry/package-info.java
@@ -2,4 +2,4 @@
 This package contains registry classes for registering content related to 
 PowerAdvantage.
 */
-package zone.moddev.mc.poweradvantage.registry;
\ No newline at end of file
+package zone.moddev.mc.basepower.registry;
\ No newline at end of file
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/registry/still/recipe/DistillationRecipe.java b/src/main/java/zone/moddev/mc/basepower/registry/still/recipe/DistillationRecipe.java
similarity index 98%
rename from src/main/java/zone/moddev/mc/poweradvantage/registry/still/recipe/DistillationRecipe.java
rename to src/main/java/zone/moddev/mc/basepower/registry/still/recipe/DistillationRecipe.java
index 6ee510aa..99a1e34e 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/registry/still/recipe/DistillationRecipe.java
+++ b/src/main/java/zone/moddev/mc/basepower/registry/still/recipe/DistillationRecipe.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.registry.still.recipe;
+package zone.moddev.mc.basepower.registry.still.recipe;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/registry/still/recipe/DistillationRecipeRegistry.java b/src/main/java/zone/moddev/mc/basepower/registry/still/recipe/DistillationRecipeRegistry.java
similarity index 97%
rename from src/main/java/zone/moddev/mc/poweradvantage/registry/still/recipe/DistillationRecipeRegistry.java
rename to src/main/java/zone/moddev/mc/basepower/registry/still/recipe/DistillationRecipeRegistry.java
index 6975d664..39e53313 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/registry/still/recipe/DistillationRecipeRegistry.java
+++ b/src/main/java/zone/moddev/mc/basepower/registry/still/recipe/DistillationRecipeRegistry.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.registry.still.recipe;
+package zone.moddev.mc.basepower.registry.still.recipe;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -7,12 +7,12 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
+import zone.moddev.mc.basepower.PowerAdvantage;
 import net.minecraft.fluid.Fluid;
 import cyano.poweradvantage.api.fluid.FluidStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.registry.IRegistry;
-import zone.moddev.mc.poweradvantage.init.Fluids;
+import zone.moddev.mc.basepower.init.Fluids;
 
 /**
  * This class handles all of the recipes for machines that "smelt" fluids.
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/registry/still/recipe/ExplicitFluidReference.java b/src/main/java/zone/moddev/mc/basepower/registry/still/recipe/ExplicitFluidReference.java
similarity index 96%
rename from src/main/java/zone/moddev/mc/poweradvantage/registry/still/recipe/ExplicitFluidReference.java
rename to src/main/java/zone/moddev/mc/basepower/registry/still/recipe/ExplicitFluidReference.java
index 5fe583a4..6b7ed156 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/registry/still/recipe/ExplicitFluidReference.java
+++ b/src/main/java/zone/moddev/mc/basepower/registry/still/recipe/ExplicitFluidReference.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.registry.still.recipe;
+package zone.moddev.mc.basepower.registry.still.recipe;
 
 import net.minecraft.fluid.Fluid;
 import net.minecraft.util.ResourceLocation;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/registry/still/recipe/FluidReference.java b/src/main/java/zone/moddev/mc/basepower/registry/still/recipe/FluidReference.java
similarity index 97%
rename from src/main/java/zone/moddev/mc/poweradvantage/registry/still/recipe/FluidReference.java
rename to src/main/java/zone/moddev/mc/basepower/registry/still/recipe/FluidReference.java
index ac62fc97..870cec81 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/registry/still/recipe/FluidReference.java
+++ b/src/main/java/zone/moddev/mc/basepower/registry/still/recipe/FluidReference.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.registry.still.recipe;
+package zone.moddev.mc.basepower.registry.still.recipe;
 
 import net.minecraft.fluid.Fluid;
 import cyano.poweradvantage.api.fluid.FluidStack;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/registry/still/recipe/RegistryNameFluidReference.java b/src/main/java/zone/moddev/mc/basepower/registry/still/recipe/RegistryNameFluidReference.java
similarity index 93%
rename from src/main/java/zone/moddev/mc/poweradvantage/registry/still/recipe/RegistryNameFluidReference.java
rename to src/main/java/zone/moddev/mc/basepower/registry/still/recipe/RegistryNameFluidReference.java
index 159e6fb5..d1a46ec6 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/registry/still/recipe/RegistryNameFluidReference.java
+++ b/src/main/java/zone/moddev/mc/basepower/registry/still/recipe/RegistryNameFluidReference.java
@@ -1,9 +1,9 @@
-package zone.moddev.mc.poweradvantage.registry.still.recipe;
+package zone.moddev.mc.basepower.registry.still.recipe;
 
 import net.minecraft.fluid.Fluid;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.registry.IRegistry;
-import zone.moddev.mc.poweradvantage.init.Fluids;
+import zone.moddev.mc.basepower.init.Fluids;
 
 public class RegistryNameFluidReference extends FluidReference {
 
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/util/FluidContainerHelper.java b/src/main/java/zone/moddev/mc/basepower/util/FluidContainerHelper.java
similarity index 98%
rename from src/main/java/zone/moddev/mc/poweradvantage/util/FluidContainerHelper.java
rename to src/main/java/zone/moddev/mc/basepower/util/FluidContainerHelper.java
index 73f98307..29c26f57 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/util/FluidContainerHelper.java
+++ b/src/main/java/zone/moddev/mc/basepower/util/FluidContainerHelper.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.util;
+package zone.moddev.mc.basepower.util;
 
 import cyano.poweradvantage.api.fluid.FluidStack;
 import cyano.poweradvantage.api.fluid.FluidTank;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/util/FluidHandlerHelper.java b/src/main/java/zone/moddev/mc/basepower/util/FluidHandlerHelper.java
similarity index 93%
rename from src/main/java/zone/moddev/mc/poweradvantage/util/FluidHandlerHelper.java
rename to src/main/java/zone/moddev/mc/basepower/util/FluidHandlerHelper.java
index 9208e701..9b796171 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/util/FluidHandlerHelper.java
+++ b/src/main/java/zone/moddev/mc/basepower/util/FluidHandlerHelper.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.util;
+package zone.moddev.mc.basepower.util;
 
 import cyano.poweradvantage.api.fluid.IAdvantageFluidHandler;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/util/FluidIdHelper.java b/src/main/java/zone/moddev/mc/basepower/util/FluidIdHelper.java
similarity index 94%
rename from src/main/java/zone/moddev/mc/poweradvantage/util/FluidIdHelper.java
rename to src/main/java/zone/moddev/mc/basepower/util/FluidIdHelper.java
index 87450318..047dab3b 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/util/FluidIdHelper.java
+++ b/src/main/java/zone/moddev/mc/basepower/util/FluidIdHelper.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.util;
+package zone.moddev.mc.basepower.util;
 
 import net.minecraft.fluid.Fluid;
 import net.minecraft.util.ResourceLocation;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/util/HashCodeHelper.java b/src/main/java/zone/moddev/mc/basepower/util/HashCodeHelper.java
similarity index 96%
rename from src/main/java/zone/moddev/mc/poweradvantage/util/HashCodeHelper.java
rename to src/main/java/zone/moddev/mc/basepower/util/HashCodeHelper.java
index efed6360..c7b3a122 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/util/HashCodeHelper.java
+++ b/src/main/java/zone/moddev/mc/basepower/util/HashCodeHelper.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.util;
+package zone.moddev.mc.basepower.util;
 
 public abstract class HashCodeHelper {
 
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/util/InventoryWrapper.java b/src/main/java/zone/moddev/mc/basepower/util/InventoryWrapper.java
similarity index 99%
rename from src/main/java/zone/moddev/mc/poweradvantage/util/InventoryWrapper.java
rename to src/main/java/zone/moddev/mc/basepower/util/InventoryWrapper.java
index abe19dad..9e0340e9 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/util/InventoryWrapper.java
+++ b/src/main/java/zone/moddev/mc/basepower/util/InventoryWrapper.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.util;
+package zone.moddev.mc.basepower.util;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/util/PowerHelper.java b/src/main/java/zone/moddev/mc/basepower/util/PowerHelper.java
similarity index 94%
rename from src/main/java/zone/moddev/mc/poweradvantage/util/PowerHelper.java
rename to src/main/java/zone/moddev/mc/basepower/util/PowerHelper.java
index ca9dc8cb..47312127 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/util/PowerHelper.java
+++ b/src/main/java/zone/moddev/mc/basepower/util/PowerHelper.java
@@ -1,6 +1,6 @@
-package zone.moddev.mc.poweradvantage.util;
+package zone.moddev.mc.basepower.util;
 
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
+import zone.moddev.mc.basepower.PowerAdvantage;
 import cyano.poweradvantage.api.ITypedConduit;
 import cyano.poweradvantage.api.PowerConnectorContext;
 import net.minecraft.block.ITileEntityProvider;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/util/ReversibleHashMap.java b/src/main/java/zone/moddev/mc/basepower/util/ReversibleHashMap.java
similarity index 97%
rename from src/main/java/zone/moddev/mc/poweradvantage/util/ReversibleHashMap.java
rename to src/main/java/zone/moddev/mc/basepower/util/ReversibleHashMap.java
index f9df4fe0..0ff74bf7 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/util/ReversibleHashMap.java
+++ b/src/main/java/zone/moddev/mc/basepower/util/ReversibleHashMap.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.util;
+package zone.moddev.mc.basepower.util;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/util/ReversibleMap.java b/src/main/java/zone/moddev/mc/basepower/util/ReversibleMap.java
similarity index 81%
rename from src/main/java/zone/moddev/mc/poweradvantage/util/ReversibleMap.java
rename to src/main/java/zone/moddev/mc/basepower/util/ReversibleMap.java
index d8b39b04..fce0f4ca 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/util/ReversibleMap.java
+++ b/src/main/java/zone/moddev/mc/basepower/util/ReversibleMap.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.util;
+package zone.moddev.mc.basepower.util;
 
 public interface ReversibleMap extends java.util.Map {
 
diff --git a/src/main/java/zone/moddev/mc/poweradvantage/util/package-info.java b/src/main/java/zone/moddev/mc/basepower/util/package-info.java
similarity index 55%
rename from src/main/java/zone/moddev/mc/poweradvantage/util/package-info.java
rename to src/main/java/zone/moddev/mc/basepower/util/package-info.java
index 8346da0c..e2fb4a05 100644
--- a/src/main/java/zone/moddev/mc/poweradvantage/util/package-info.java
+++ b/src/main/java/zone/moddev/mc/basepower/util/package-info.java
@@ -3,4 +3,4 @@
 This package contains helper classes.
 

 */
-package zone.moddev.mc.poweradvantage.util;
\ No newline at end of file
+package zone.moddev.mc.basepower.util;
\ No newline at end of file
diff --git a/src/main/resources/META-INF/coremods.json b/src/main/resources/META-INF/coremods.json
index e788d50e..d5f72d8a 100644
--- a/src/main/resources/META-INF/coremods.json
+++ b/src/main/resources/META-INF/coremods.json
@@ -1,6 +1,6 @@
 {
-  "poweradvantage_113_migration": "coremods/poweradvantage_113_migration.js",
-  "poweradvantage_oil_renderer": "coremods/poweradvantage_oil_renderer.js",
-  "poweradvantage_material_tags": "coremods/poweradvantage_material_tags.js",
-  "poweradvantage_parts_loot": "coremods/poweradvantage_parts_loot.js"
+  "basepower_113_migration": "coremods/basepower_113_migration.js",
+  "basepower_oil_renderer": "coremods/basepower_oil_renderer.js",
+  "basepower_material_tags": "coremods/basepower_material_tags.js",
+  "basepower_parts_loot": "coremods/basepower_parts_loot.js"
 }
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index f2b5cabe..00700e20 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -1,38 +1,38 @@
 modLoader="javafml"
 loaderVersion="${loader_version_range}"
 license="LGPL-3.0-only"
-issueTrackerURL="https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/issues"
+issueTrackerURL="https://github.com/MinecraftModDevelopmentMods/basePower/issues"
 
 [[mods]]
-modId="poweradvantage"
+modId="basepower"
 version="${version}"
-displayName="Power Advantage"
-displayURL="https://www.curseforge.com/minecraft/mc-mods/power-advantage"
+displayName="basePower"
+displayURL="https://www.curseforge.com/minecraft/mc-mods/basepower"
 authors="DrCyano (aka Cyanobacterium), the MMD Team"
 description='''API and shared machines for pressure, electricity, quantum power, fluids, and item transport.'''
 
-[[dependencies.poweradvantage]]
+[[dependencies.basepower]]
 modId="basemetals"
 mandatory=false
-versionRange="[3.0.1.113021,4.0.0)"
+versionRange="[3.0.2.113021,4.0.0)"
 ordering="AFTER"
 side="BOTH"
 
-[[dependencies.poweradvantage]]
+[[dependencies.basepower]]
 modId="orespawn"
 mandatory=true
 versionRange="[4.1.0.113021,5.0.0)"
 ordering="AFTER"
 side="BOTH"
 
-[[dependencies.poweradvantage]]
+[[dependencies.basepower]]
 modId="forge"
 mandatory=true
 versionRange="${forge_version_range}"
 ordering="NONE"
 side="BOTH"
 
-[[dependencies.poweradvantage]]
+[[dependencies.basepower]]
 modId="minecraft"
 mandatory=true
 versionRange="${minecraft_version_range}"
diff --git a/src/main/resources/assets/basepower/blockstates/converter_rf_electricity.json b/src/main/resources/assets/basepower/blockstates/converter_rf_electricity.json
new file mode 100644
index 00000000..1ee2e9b8
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/converter_rf_electricity.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "basepower:block/converter_rf_electricity",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "basepower:block/converter_rf_electricity"
+    },
+    "facing=south": {
+      "model": "basepower:block/converter_rf_electricity",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/converter_rf_electricity",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/converter_rf_quantum.json b/src/main/resources/assets/basepower/blockstates/converter_rf_quantum.json
new file mode 100644
index 00000000..77622a74
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/converter_rf_quantum.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "basepower:block/converter_rf_quantum",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "basepower:block/converter_rf_quantum"
+    },
+    "facing=south": {
+      "model": "basepower:block/converter_rf_quantum",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/converter_rf_quantum",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/converter_rf_steam.json b/src/main/resources/assets/basepower/blockstates/converter_rf_steam.json
new file mode 100644
index 00000000..d78155d1
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/converter_rf_steam.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "basepower:block/converter_rf_steam",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "basepower:block/converter_rf_steam"
+    },
+    "facing=south": {
+      "model": "basepower:block/converter_rf_steam",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/converter_rf_steam",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/converter_tr_electricity.json b/src/main/resources/assets/basepower/blockstates/converter_tr_electricity.json
new file mode 100644
index 00000000..05a2a458
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/converter_tr_electricity.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "basepower:block/converter_tr_electricity",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "basepower:block/converter_tr_electricity"
+    },
+    "facing=south": {
+      "model": "basepower:block/converter_tr_electricity",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/converter_tr_electricity",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/crude_oil.json b/src/main/resources/assets/basepower/blockstates/crude_oil.json
new file mode 100644
index 00000000..5a992550
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/crude_oil.json
@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "basepower:block/crude_oil" }
+    }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/fluid_discharge.json b/src/main/resources/assets/basepower/blockstates/fluid_discharge.json
new file mode 100644
index 00000000..6c37194a
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/fluid_discharge.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "basepower:block/fluid_discharge",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "basepower:block/fluid_discharge"
+    },
+    "facing=south": {
+      "model": "basepower:block/fluid_discharge",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/fluid_discharge",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/fluid_drain.json b/src/main/resources/assets/basepower/blockstates/fluid_drain.json
new file mode 100644
index 00000000..ddd09e1a
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/fluid_drain.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "basepower:block/fluid_drain",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "basepower:block/fluid_drain"
+    },
+    "facing=south": {
+      "model": "basepower:block/fluid_drain",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/fluid_drain",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/fluid_metal_tank.json b/src/main/resources/assets/basepower/blockstates/fluid_metal_tank.json
similarity index 54%
rename from src/main/resources/assets/poweradvantage/blockstates/fluid_metal_tank.json
rename to src/main/resources/assets/basepower/blockstates/fluid_metal_tank.json
index 5f1ee90e..2458ad8d 100644
--- a/src/main/resources/assets/poweradvantage/blockstates/fluid_metal_tank.json
+++ b/src/main/resources/assets/basepower/blockstates/fluid_metal_tank.json
@@ -1,21 +1,21 @@
 {
   "variants": {
     "facing=east": {
-      "model": "poweradvantage:block/fluid_metal_tank",
+      "model": "basepower:block/fluid_metal_tank",
       "y": 90,
       "uvlock": true
     },
     "facing=north": {
-      "model": "poweradvantage:block/fluid_metal_tank",
+      "model": "basepower:block/fluid_metal_tank",
       "uvlock": true
     },
     "facing=south": {
-      "model": "poweradvantage:block/fluid_metal_tank",
+      "model": "basepower:block/fluid_metal_tank",
       "y": 180,
       "uvlock": true
     },
     "facing=west": {
-      "model": "poweradvantage:block/fluid_metal_tank",
+      "model": "basepower:block/fluid_metal_tank",
       "y": 270,
       "uvlock": true
     }
diff --git a/src/main/resources/assets/poweradvantage/blockstates/fluid_pipe.json b/src/main/resources/assets/basepower/blockstates/fluid_pipe.json
similarity index 70%
rename from src/main/resources/assets/poweradvantage/blockstates/fluid_pipe.json
rename to src/main/resources/assets/basepower/blockstates/fluid_pipe.json
index 74b70ea6..6299d392 100644
--- a/src/main/resources/assets/poweradvantage/blockstates/fluid_pipe.json
+++ b/src/main/resources/assets/basepower/blockstates/fluid_pipe.json
@@ -2,385 +2,385 @@
   "__comment": "blockstate parameters MUST be in alphabetical order!",
   "variants": {
     "down=false,east=false,north=false,south=false,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_ensw",
+      "model": "basepower:block/fluid_pipe_ensw",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=false,south=false,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_n",
+      "model": "basepower:block/fluid_pipe_n",
       "x": 90,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=true,north=false,south=false,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_n",
+      "model": "basepower:block/fluid_pipe_n",
       "x": 0,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=false,north=true,south=false,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_n",
+      "model": "basepower:block/fluid_pipe_n",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=false,north=false,south=true,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_n",
+      "model": "basepower:block/fluid_pipe_n",
       "x": 0,
       "y": 180,
       "uvlock": false
     },
     "down=false,east=false,north=false,south=false,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_n",
+      "model": "basepower:block/fluid_pipe_n",
       "x": 270,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=false,north=false,south=false,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_n",
+      "model": "basepower:block/fluid_pipe_n",
       "x": 0,
       "y": 270,
       "uvlock": false
     },
     "down=true,east=true,north=false,south=false,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 90,
       "y": 180,
       "uvlock": false
     },
     "down=true,east=false,north=true,south=false,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 90,
       "y": 90,
       "uvlock": false
     },
     "down=true,east=false,north=false,south=true,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 90,
       "y": 270,
       "uvlock": false
     },
     "down=true,east=false,north=false,south=false,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_ns",
+      "model": "basepower:block/fluid_pipe_ns",
       "x": 90,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=false,south=false,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 90,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=true,north=true,south=false,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 0,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=true,north=false,south=true,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 0,
       "y": 180,
       "uvlock": false
     },
     "down=false,east=true,north=false,south=false,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 270,
       "y": 180,
       "uvlock": false
     },
     "down=false,east=true,north=false,south=false,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_ns",
+      "model": "basepower:block/fluid_pipe_ns",
       "x": 0,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=false,north=true,south=true,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_ns",
+      "model": "basepower:block/fluid_pipe_ns",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=false,north=true,south=false,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 270,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=false,north=true,south=false,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=false,north=false,south=true,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 270,
       "y": 270,
       "uvlock": false
     },
     "down=false,east=false,north=false,south=true,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 0,
       "y": 270,
       "uvlock": false
     },
     "down=false,east=false,north=false,south=false,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 270,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=true,north=true,south=false,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nuw",
+      "model": "basepower:block/fluid_pipe_nuw",
       "x": 90,
       "y": 90,
       "uvlock": false
     },
     "down=true,east=true,north=false,south=true,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nuw",
+      "model": "basepower:block/fluid_pipe_nuw",
       "x": 90,
       "y": 180,
       "uvlock": false
     },
     "down=true,east=true,north=false,south=false,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_dnu",
+      "model": "basepower:block/fluid_pipe_dnu",
       "x": 0,
       "y": 90,
       "uvlock": false
     },
     "down=true,east=true,north=false,south=false,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_dnu",
+      "model": "basepower:block/fluid_pipe_dnu",
       "x": 90,
       "y": 90,
       "uvlock": false
     },
     "down=true,east=false,north=true,south=true,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_dnu",
+      "model": "basepower:block/fluid_pipe_dnu",
       "x": 90,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=true,south=false,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_dnu",
+      "model": "basepower:block/fluid_pipe_dnu",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=true,south=false,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nuw",
+      "model": "basepower:block/fluid_pipe_nuw",
       "x": 90,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=false,south=true,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_dnu",
+      "model": "basepower:block/fluid_pipe_dnu",
       "x": 0,
       "y": 180,
       "uvlock": false
     },
     "down=true,east=false,north=false,south=true,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nuw",
+      "model": "basepower:block/fluid_pipe_nuw",
       "x": 90,
       "y": 270,
       "uvlock": false
     },
     "down=true,east=false,north=false,south=false,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_dnu",
+      "model": "basepower:block/fluid_pipe_dnu",
       "x": 0,
       "y": 270,
       "uvlock": false
     },
     "down=false,east=true,north=true,south=true,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nsw",
+      "model": "basepower:block/fluid_pipe_nsw",
       "x": 0,
       "y": 180,
       "uvlock": false
     },
     "down=false,east=true,north=true,south=false,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nuw",
+      "model": "basepower:block/fluid_pipe_nuw",
       "x": 0,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=true,north=true,south=false,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsw",
+      "model": "basepower:block/fluid_pipe_nsw",
       "x": 0,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=true,north=false,south=true,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nuw",
+      "model": "basepower:block/fluid_pipe_nuw",
       "x": 0,
       "y": 180,
       "uvlock": false
     },
     "down=false,east=true,north=false,south=true,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsw",
+      "model": "basepower:block/fluid_pipe_nsw",
       "x": 0,
       "y": 270,
       "uvlock": false
     },
     "down=false,east=true,north=false,south=false,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_dnu",
+      "model": "basepower:block/fluid_pipe_dnu",
       "x": 270,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=false,north=true,south=true,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_dnu",
+      "model": "basepower:block/fluid_pipe_dnu",
       "x": 270,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=false,north=true,south=true,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsw",
+      "model": "basepower:block/fluid_pipe_nsw",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=false,north=true,south=false,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nuw",
+      "model": "basepower:block/fluid_pipe_nuw",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=false,north=false,south=true,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nuw",
+      "model": "basepower:block/fluid_pipe_nuw",
       "x": 0,
       "y": 270,
       "uvlock": false
     },
     "down=true,east=true,north=true,south=true,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 180,
       "y": 180,
       "uvlock": false
     },
     "down=true,east=true,north=true,south=false,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 90,
       "y": 90,
       "uvlock": false
     },
     "down=true,east=true,north=true,south=false,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 180,
       "y": 90,
       "uvlock": false
     },
     "down=true,east=true,north=false,south=true,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 90,
       "y": 180,
       "uvlock": false
     },
     "down=true,east=true,north=false,south=true,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 180,
       "y": 270,
       "uvlock": false
     },
     "down=true,east=true,north=false,south=false,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_ensw",
+      "model": "basepower:block/fluid_pipe_ensw",
       "x": 90,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=true,south=true,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_ensw",
+      "model": "basepower:block/fluid_pipe_ensw",
       "x": 90,
       "y": 90,
       "uvlock": false
     },
     "down=true,east=false,north=true,south=true,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 180,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=true,south=false,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 90,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=false,south=true,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 90,
       "y": 270,
       "uvlock": false
     },
     "down=false,east=true,north=true,south=true,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 0,
       "y": 180,
       "uvlock": false
     },
     "down=false,east=true,north=true,south=true,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_ensw",
+      "model": "basepower:block/fluid_pipe_ensw",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=true,north=true,south=false,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 0,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=true,north=false,south=true,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 0,
       "y": 270,
       "uvlock": false
     },
     "down=false,east=false,north=true,south=true,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=true,north=true,south=true,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_desuw",
+      "model": "basepower:block/fluid_pipe_desuw",
       "x": 0,
       "y": 270,
       "uvlock": false
     },
     "down=true,east=true,north=true,south=true,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_desuw",
+      "model": "basepower:block/fluid_pipe_desuw",
       "x": 270,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=true,north=true,south=false,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_desuw",
+      "model": "basepower:block/fluid_pipe_desuw",
       "x": 0,
       "y": 180,
       "uvlock": false
     },
     "down=true,east=true,north=false,south=true,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_desuw",
+      "model": "basepower:block/fluid_pipe_desuw",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=true,south=true,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_desuw",
+      "model": "basepower:block/fluid_pipe_desuw",
       "x": 0,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=true,north=true,south=true,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_desuw",
+      "model": "basepower:block/fluid_pipe_desuw",
       "x": 90,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=true,north=true,south=true,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_densuw",
+      "model": "basepower:block/fluid_pipe_densuw",
       "x": 0,
       "y": 0,
       "uvlock": false
diff --git a/src/main/resources/assets/poweradvantage/blockstates/fluid_pipe_terminal.json b/src/main/resources/assets/basepower/blockstates/fluid_pipe_terminal.json
similarity index 70%
rename from src/main/resources/assets/poweradvantage/blockstates/fluid_pipe_terminal.json
rename to src/main/resources/assets/basepower/blockstates/fluid_pipe_terminal.json
index e5b42d6d..470261cb 100644
--- a/src/main/resources/assets/poweradvantage/blockstates/fluid_pipe_terminal.json
+++ b/src/main/resources/assets/basepower/blockstates/fluid_pipe_terminal.json
@@ -2,385 +2,385 @@
   "__comment": "blockstate parameters MUST be in alphabetical order!",
   "variants": {
     "down=false,east=false,north=false,south=false,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_0",
+      "model": "basepower:block/fluid_pipe_0",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=false,south=false,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_n",
+      "model": "basepower:block/fluid_pipe_n",
       "x": 90,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=true,north=false,south=false,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_n",
+      "model": "basepower:block/fluid_pipe_n",
       "x": 0,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=false,north=true,south=false,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_n",
+      "model": "basepower:block/fluid_pipe_n",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=false,north=false,south=true,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_n",
+      "model": "basepower:block/fluid_pipe_n",
       "x": 0,
       "y": 180,
       "uvlock": false
     },
     "down=false,east=false,north=false,south=false,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_n",
+      "model": "basepower:block/fluid_pipe_n",
       "x": 270,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=false,north=false,south=false,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_n",
+      "model": "basepower:block/fluid_pipe_n",
       "x": 0,
       "y": 270,
       "uvlock": false
     },
     "down=true,east=true,north=false,south=false,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 90,
       "y": 180,
       "uvlock": false
     },
     "down=true,east=false,north=true,south=false,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 90,
       "y": 90,
       "uvlock": false
     },
     "down=true,east=false,north=false,south=true,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 90,
       "y": 270,
       "uvlock": false
     },
     "down=true,east=false,north=false,south=false,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_ns",
+      "model": "basepower:block/fluid_pipe_ns",
       "x": 90,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=false,south=false,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 90,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=true,north=true,south=false,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 0,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=true,north=false,south=true,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 0,
       "y": 180,
       "uvlock": false
     },
     "down=false,east=true,north=false,south=false,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 270,
       "y": 180,
       "uvlock": false
     },
     "down=false,east=true,north=false,south=false,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_ns",
+      "model": "basepower:block/fluid_pipe_ns",
       "x": 0,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=false,north=true,south=true,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_ns",
+      "model": "basepower:block/fluid_pipe_ns",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=false,north=true,south=false,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 270,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=false,north=true,south=false,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=false,north=false,south=true,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 270,
       "y": 270,
       "uvlock": false
     },
     "down=false,east=false,north=false,south=true,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 0,
       "y": 270,
       "uvlock": false
     },
     "down=false,east=false,north=false,south=false,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nw",
+      "model": "basepower:block/fluid_pipe_nw",
       "x": 270,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=true,north=true,south=false,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nuw",
+      "model": "basepower:block/fluid_pipe_nuw",
       "x": 90,
       "y": 90,
       "uvlock": false
     },
     "down=true,east=true,north=false,south=true,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nuw",
+      "model": "basepower:block/fluid_pipe_nuw",
       "x": 90,
       "y": 180,
       "uvlock": false
     },
     "down=true,east=true,north=false,south=false,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_dnu",
+      "model": "basepower:block/fluid_pipe_dnu",
       "x": 0,
       "y": 90,
       "uvlock": false
     },
     "down=true,east=true,north=false,south=false,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_dnu",
+      "model": "basepower:block/fluid_pipe_dnu",
       "x": 90,
       "y": 90,
       "uvlock": false
     },
     "down=true,east=false,north=true,south=true,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_dnu",
+      "model": "basepower:block/fluid_pipe_dnu",
       "x": 90,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=true,south=false,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_dnu",
+      "model": "basepower:block/fluid_pipe_dnu",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=true,south=false,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nuw",
+      "model": "basepower:block/fluid_pipe_nuw",
       "x": 90,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=false,south=true,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_dnu",
+      "model": "basepower:block/fluid_pipe_dnu",
       "x": 0,
       "y": 180,
       "uvlock": false
     },
     "down=true,east=false,north=false,south=true,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nuw",
+      "model": "basepower:block/fluid_pipe_nuw",
       "x": 90,
       "y": 270,
       "uvlock": false
     },
     "down=true,east=false,north=false,south=false,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_dnu",
+      "model": "basepower:block/fluid_pipe_dnu",
       "x": 0,
       "y": 270,
       "uvlock": false
     },
     "down=false,east=true,north=true,south=true,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nsw",
+      "model": "basepower:block/fluid_pipe_nsw",
       "x": 0,
       "y": 180,
       "uvlock": false
     },
     "down=false,east=true,north=true,south=false,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nuw",
+      "model": "basepower:block/fluid_pipe_nuw",
       "x": 0,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=true,north=true,south=false,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsw",
+      "model": "basepower:block/fluid_pipe_nsw",
       "x": 0,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=true,north=false,south=true,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nuw",
+      "model": "basepower:block/fluid_pipe_nuw",
       "x": 0,
       "y": 180,
       "uvlock": false
     },
     "down=false,east=true,north=false,south=true,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsw",
+      "model": "basepower:block/fluid_pipe_nsw",
       "x": 0,
       "y": 270,
       "uvlock": false
     },
     "down=false,east=true,north=false,south=false,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_dnu",
+      "model": "basepower:block/fluid_pipe_dnu",
       "x": 270,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=false,north=true,south=true,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_dnu",
+      "model": "basepower:block/fluid_pipe_dnu",
       "x": 270,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=false,north=true,south=true,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsw",
+      "model": "basepower:block/fluid_pipe_nsw",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=false,north=true,south=false,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nuw",
+      "model": "basepower:block/fluid_pipe_nuw",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=false,north=false,south=true,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nuw",
+      "model": "basepower:block/fluid_pipe_nuw",
       "x": 0,
       "y": 270,
       "uvlock": false
     },
     "down=true,east=true,north=true,south=true,up=false,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 180,
       "y": 180,
       "uvlock": false
     },
     "down=true,east=true,north=true,south=false,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 90,
       "y": 90,
       "uvlock": false
     },
     "down=true,east=true,north=true,south=false,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 180,
       "y": 90,
       "uvlock": false
     },
     "down=true,east=true,north=false,south=true,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 90,
       "y": 180,
       "uvlock": false
     },
     "down=true,east=true,north=false,south=true,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 180,
       "y": 270,
       "uvlock": false
     },
     "down=true,east=true,north=false,south=false,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_ensw",
+      "model": "basepower:block/fluid_pipe_ensw",
       "x": 90,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=true,south=true,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_ensw",
+      "model": "basepower:block/fluid_pipe_ensw",
       "x": 90,
       "y": 90,
       "uvlock": false
     },
     "down=true,east=false,north=true,south=true,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 180,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=true,south=false,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 90,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=false,south=true,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 90,
       "y": 270,
       "uvlock": false
     },
     "down=false,east=true,north=true,south=true,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 0,
       "y": 180,
       "uvlock": false
     },
     "down=false,east=true,north=true,south=true,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_ensw",
+      "model": "basepower:block/fluid_pipe_ensw",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=false,east=true,north=true,south=false,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 0,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=true,north=false,south=true,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 0,
       "y": 270,
       "uvlock": false
     },
     "down=false,east=false,north=true,south=true,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_nsuw",
+      "model": "basepower:block/fluid_pipe_nsuw",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=true,north=true,south=true,up=true,west=false": {
-      "model": "poweradvantage:block/fluid_pipe_desuw",
+      "model": "basepower:block/fluid_pipe_desuw",
       "x": 0,
       "y": 270,
       "uvlock": false
     },
     "down=true,east=true,north=true,south=true,up=false,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_desuw",
+      "model": "basepower:block/fluid_pipe_desuw",
       "x": 270,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=true,north=true,south=false,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_desuw",
+      "model": "basepower:block/fluid_pipe_desuw",
       "x": 0,
       "y": 180,
       "uvlock": false
     },
     "down=true,east=true,north=false,south=true,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_desuw",
+      "model": "basepower:block/fluid_pipe_desuw",
       "x": 0,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=false,north=true,south=true,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_desuw",
+      "model": "basepower:block/fluid_pipe_desuw",
       "x": 0,
       "y": 90,
       "uvlock": false
     },
     "down=false,east=true,north=true,south=true,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_desuw",
+      "model": "basepower:block/fluid_pipe_desuw",
       "x": 90,
       "y": 0,
       "uvlock": false
     },
     "down=true,east=true,north=true,south=true,up=true,west=true": {
-      "model": "poweradvantage:block/fluid_pipe_densuw",
+      "model": "basepower:block/fluid_pipe_densuw",
       "x": 0,
       "y": 0,
       "uvlock": false
diff --git a/src/main/resources/assets/basepower/blockstates/fluid_storage_tank.json b/src/main/resources/assets/basepower/blockstates/fluid_storage_tank.json
new file mode 100644
index 00000000..6273f11f
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/fluid_storage_tank.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "basepower:block/fluid_storage_tank",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "basepower:block/fluid_storage_tank"
+    },
+    "facing=south": {
+      "model": "basepower:block/fluid_storage_tank",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/fluid_storage_tank",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/fluid_switch.json b/src/main/resources/assets/basepower/blockstates/fluid_switch.json
new file mode 100644
index 00000000..53aed9b5
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/fluid_switch.json
@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "active=false": {
+      "model": "basepower:block/fluid_switch_off"
+    },
+    "active=true": {
+      "model": "basepower:block/fluid_switch_on"
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/infinite_electricity.json b/src/main/resources/assets/basepower/blockstates/infinite_electricity.json
new file mode 100644
index 00000000..a3dd78ee
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/infinite_electricity.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "basepower:block/infinite_electricity",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "basepower:block/infinite_electricity"
+    },
+    "facing=south": {
+      "model": "basepower:block/infinite_electricity",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/infinite_electricity",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/infinite_quantum.json b/src/main/resources/assets/basepower/blockstates/infinite_quantum.json
new file mode 100644
index 00000000..6f7a8622
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/infinite_quantum.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "basepower:block/infinite_quantum",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "basepower:block/infinite_quantum"
+    },
+    "facing=south": {
+      "model": "basepower:block/infinite_quantum",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/infinite_quantum",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/infinite_steam.json b/src/main/resources/assets/basepower/blockstates/infinite_steam.json
new file mode 100644
index 00000000..1c0c9758
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/infinite_steam.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "basepower:block/infinite_steam",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "basepower:block/infinite_steam"
+    },
+    "facing=south": {
+      "model": "basepower:block/infinite_steam",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/infinite_steam",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/item_conveyor.json b/src/main/resources/assets/basepower/blockstates/item_conveyor.json
new file mode 100644
index 00000000..81bb97be
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/item_conveyor.json
@@ -0,0 +1,27 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "basepower:block/item_conveyor",
+      "x": 90
+    },
+    "facing=up": {
+      "model": "basepower:block/item_conveyor",
+      "x": 270
+    },
+    "facing=north": {
+      "model": "basepower:block/item_conveyor"
+    },
+    "facing=south": {
+      "model": "basepower:block/item_conveyor",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/item_conveyor",
+      "y": 270
+    },
+    "facing=east": {
+      "model": "basepower:block/item_conveyor",
+      "y": 90
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/item_filter_block.json b/src/main/resources/assets/basepower/blockstates/item_filter_block.json
new file mode 100644
index 00000000..e5da2ad6
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/item_filter_block.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=north": {
+      "model": "basepower:block/item_filter_block"
+    },
+    "facing=south": {
+      "model": "basepower:block/item_filter_block",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/item_filter_block",
+      "y": 270
+    },
+    "facing=east": {
+      "model": "basepower:block/item_filter_block",
+      "y": 90
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/item_filter_food.json b/src/main/resources/assets/basepower/blockstates/item_filter_food.json
new file mode 100644
index 00000000..aa06924e
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/item_filter_food.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=north": {
+      "model": "basepower:block/item_filter_food"
+    },
+    "facing=south": {
+      "model": "basepower:block/item_filter_food",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/item_filter_food",
+      "y": 270
+    },
+    "facing=east": {
+      "model": "basepower:block/item_filter_food",
+      "y": 90
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/item_filter_fuel.json b/src/main/resources/assets/basepower/blockstates/item_filter_fuel.json
new file mode 100644
index 00000000..9d4493e6
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/item_filter_fuel.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=north": {
+      "model": "basepower:block/item_filter_fuel"
+    },
+    "facing=south": {
+      "model": "basepower:block/item_filter_fuel",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/item_filter_fuel",
+      "y": 270
+    },
+    "facing=east": {
+      "model": "basepower:block/item_filter_fuel",
+      "y": 90
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/item_filter_inventory.json b/src/main/resources/assets/basepower/blockstates/item_filter_inventory.json
new file mode 100644
index 00000000..9c5c81fe
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/item_filter_inventory.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=north": {
+      "model": "basepower:block/item_filter_inventory"
+    },
+    "facing=south": {
+      "model": "basepower:block/item_filter_inventory",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/item_filter_inventory",
+      "y": 270
+    },
+    "facing=east": {
+      "model": "basepower:block/item_filter_inventory",
+      "y": 90
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/item_filter_ore.json b/src/main/resources/assets/basepower/blockstates/item_filter_ore.json
new file mode 100644
index 00000000..5b639c64
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/item_filter_ore.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=north": {
+      "model": "basepower:block/item_filter_ore"
+    },
+    "facing=south": {
+      "model": "basepower:block/item_filter_ore",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/item_filter_ore",
+      "y": 270
+    },
+    "facing=east": {
+      "model": "basepower:block/item_filter_ore",
+      "y": 90
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/item_filter_overflow.json b/src/main/resources/assets/basepower/blockstates/item_filter_overflow.json
new file mode 100644
index 00000000..454345e7
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/item_filter_overflow.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=north": {
+      "model": "basepower:block/item_filter_overflow"
+    },
+    "facing=south": {
+      "model": "basepower:block/item_filter_overflow",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/item_filter_overflow",
+      "y": 270
+    },
+    "facing=east": {
+      "model": "basepower:block/item_filter_overflow",
+      "y": 90
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/item_filter_plant.json b/src/main/resources/assets/basepower/blockstates/item_filter_plant.json
new file mode 100644
index 00000000..2731b955
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/item_filter_plant.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=north": {
+      "model": "basepower:block/item_filter_plant"
+    },
+    "facing=south": {
+      "model": "basepower:block/item_filter_plant",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/item_filter_plant",
+      "y": 270
+    },
+    "facing=east": {
+      "model": "basepower:block/item_filter_plant",
+      "y": 90
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/item_filter_smelt.json b/src/main/resources/assets/basepower/blockstates/item_filter_smelt.json
new file mode 100644
index 00000000..bbd7b4a7
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/item_filter_smelt.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=north": {
+      "model": "basepower:block/item_filter_smelt"
+    },
+    "facing=south": {
+      "model": "basepower:block/item_filter_smelt",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "basepower:block/item_filter_smelt",
+      "y": 270
+    },
+    "facing=east": {
+      "model": "basepower:block/item_filter_smelt",
+      "y": 90
+    }
+  }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/refined_oil.json b/src/main/resources/assets/basepower/blockstates/refined_oil.json
new file mode 100644
index 00000000..d29bb008
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/refined_oil.json
@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "basepower:block/refined_oil" }
+    }
+}
diff --git a/src/main/resources/assets/basepower/blockstates/steel_frame.json b/src/main/resources/assets/basepower/blockstates/steel_frame.json
new file mode 100644
index 00000000..96d49f38
--- /dev/null
+++ b/src/main/resources/assets/basepower/blockstates/steel_frame.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "basepower:block/steel_frame"
+    }
+  }
+}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/still.json b/src/main/resources/assets/basepower/blockstates/still.json
similarity index 53%
rename from src/main/resources/assets/poweradvantage/blockstates/still.json
rename to src/main/resources/assets/basepower/blockstates/still.json
index 6fe4921b..4d20039f 100644
--- a/src/main/resources/assets/poweradvantage/blockstates/still.json
+++ b/src/main/resources/assets/basepower/blockstates/still.json
@@ -1,33 +1,33 @@
 {
   "variants": {
     "active=false,facing=east": {
-      "model": "poweradvantage:block/still_off",
+      "model": "basepower:block/still_off",
       "y": 90
     },
     "active=false,facing=north": {
-      "model": "poweradvantage:block/still_off"
+      "model": "basepower:block/still_off"
     },
     "active=false,facing=south": {
-      "model": "poweradvantage:block/still_off",
+      "model": "basepower:block/still_off",
       "y": 180
     },
     "active=false,facing=west": {
-      "model": "poweradvantage:block/still_off",
+      "model": "basepower:block/still_off",
       "y": 270
     },
     "active=true,facing=east": {
-      "model": "poweradvantage:block/still_on",
+      "model": "basepower:block/still_on",
       "y": 90
     },
     "active=true,facing=north": {
-      "model": "poweradvantage:block/still_on"
+      "model": "basepower:block/still_on"
     },
     "active=true,facing=south": {
-      "model": "poweradvantage:block/still_on",
+      "model": "basepower:block/still_on",
       "y": 180
     },
     "active=true,facing=west": {
-      "model": "poweradvantage:block/still_on",
+      "model": "basepower:block/still_on",
       "y": 270
     }
   }
diff --git a/src/main/resources/assets/basepower/lang/de_de.json b/src/main/resources/assets/basepower/lang/de_de.json
new file mode 100644
index 00000000..a22c649f
--- /dev/null
+++ b/src/main/resources/assets/basepower/lang/de_de.json
@@ -0,0 +1,77 @@
+{
+  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
+  "nei.basepower.recipehandler.shapelessfurnace.name": "Große Ofen (formlos)",
+  "nei.basepower.recipehandler.shapedfurnace.name": "Große Ofen (geformt)",
+  "tooltip.basepower.empty": "Leer",
+  "tooltip.basepower.buckets_of": "%x Eimer %y",
+  "itemGroup.basepower": "basePower",
+  "tile.basepower.fluid_drain.name": "Ablauf",
+  "tile.basepower.fluid_discharge.name": "Austragsrost",
+  "tile.basepower.fluid_storage_tank.name": "Lagertank",
+  "item.basepower.fluid_storage_tank_item.name": "Speicher",
+  "tile.basepower.fluid_pipe.name": "Rohr",
+  "tile.basepower.item_conveyor.name": "Förderer",
+  "tile.basepower.item_filter_block.name": "Block Auswahl Förder",
+  "tile.basepower.item_filter_food.name": "Lebensmittel Auswahl Förder",
+  "tile.basepower.item_filter_fuel.name": "Brennstoff Auswahl Förder",
+  "tile.basepower.item_filter_inventory.name": "Anpassbare Auswahl Förder",
+  "tile.basepower.item_filter_ore.name": "Erz Auswahl Förder",
+  "tile.basepower.item_filter_plant.name": "Pflanze Auswahl Förder",
+  "tile.basepower.item_filter_smelt.name": "Kochbare Auswahl Förder",
+  "tile.basepower.item_filter_overflow.name": "Überlauf Auswahl Förder",
+  "tile.basepower.steel_frame.name": "Stahlrahmen",
+  "item.basepower.starch.name": "Kartoffelstärke",
+  "item.basepower.bioplastic_ingot.name": "Biokunststoff-Barren",
+  "item.basepower.sprocket.name": "Kettenrad",
+  "tile.basepower.fluid_metal_tank.name": "Metall-Lagertank",
+  "item.basepower.rotator_tool.name": "Drehwerkzeug",
+  "tile.basepower.infinite_steam.name": "Unendlichen Dampfkraft",
+  "tile.basepower.infinite_electricity.name": "Unendliche Elektrische Leistung",
+  "tile.basepower.infinite_quantum.name": "Unendliche Quanten Leistung",
+  "tile.basepower.crude_oil.name": "Rohöl",
+  "fluid.basepower.crude_oil": "Rohöl",
+  "item.bucket.crude_oil": "Eimer Rohöl",
+  "tile.basepower.still.name": "Brennerei",
+  "tile.basepower.refined_oil.name": "Raffiniertes Öl",
+  "fluid.basepower.refined_oil": "Raffiniertes Öl",
+  "item.bucket.refined_oil": "Eimer für Raffiniertes Öl",
+  "tile.basepower.fluid_switch.name": "Ventil",
+  "tile.basepower.converter_rf_steam.name": "Dampf-RF Leistungstransformator",
+  "tile.basepower.converter_rf_electricity.name": "Elektrizität-RF Leistungstransformator",
+  "tile.basepower.converter_rf_quantum.name": "Quant-RF Leistungstransformator",
+  "tile.basepower.converter_tr_electricity.name": "Elektrizität-EU Leistungstransformator",
+  "block.basepower.fluid_drain": "Ablauf",
+  "block.basepower.fluid_discharge": "Austragsrost",
+  "block.basepower.fluid_storage_tank": "Lagertank",
+  "item.basepower.fluid_storage_tank_item": "Speicher",
+  "block.basepower.fluid_pipe": "Rohr",
+  "block.basepower.item_conveyor": "Förderer",
+  "block.basepower.item_filter_block": "Block Auswahl Förder",
+  "block.basepower.item_filter_food": "Lebensmittel Auswahl Förder",
+  "block.basepower.item_filter_fuel": "Brennstoff Auswahl Förder",
+  "block.basepower.item_filter_inventory": "Anpassbare Auswahl Förder",
+  "block.basepower.item_filter_ore": "Erz Auswahl Förder",
+  "block.basepower.item_filter_plant": "Pflanze Auswahl Förder",
+  "block.basepower.item_filter_smelt": "Kochbare Auswahl Förder",
+  "block.basepower.item_filter_overflow": "Überlauf Auswahl Förder",
+  "block.basepower.steel_frame": "Stahlrahmen",
+  "item.basepower.starch": "Kartoffelstärke",
+  "item.basepower.bioplastic_ingot": "Biokunststoff-Barren",
+  "item.basepower.sprocket": "Kettenrad",
+  "block.basepower.fluid_metal_tank": "Metall-Lagertank",
+  "item.basepower.rotator_tool": "Drehwerkzeug",
+  "block.basepower.infinite_steam": "Unendlichen Dampfkraft",
+  "block.basepower.infinite_electricity": "Unendliche Elektrische Leistung",
+  "block.basepower.infinite_quantum": "Unendliche Quanten Leistung",
+  "block.basepower.crude_oil": "Rohöl",
+  "block.basepower.still": "Brennerei",
+  "block.basepower.refined_oil": "Raffiniertes Öl",
+  "block.basepower.fluid_switch": "Ventil",
+  "block.basepower.converter_rf_steam": "Dampf-RF Leistungstransformator",
+  "block.basepower.converter_rf_electricity": "Elektrizität-RF Leistungstransformator",
+  "block.basepower.converter_rf_quantum": "Quant-RF Leistungstransformator",
+  "block.basepower.converter_tr_electricity": "Elektrizität-EU Leistungstransformator",
+  "item.basepower.crude_oil_bucket": "Eimer Rohöl",
+  "item.basepower.refined_oil_bucket": "Eimer für Raffiniertes Öl",
+  "block.basepower.fluid_pipe_terminal": "Rohr"
+}
diff --git a/src/main/resources/assets/basepower/lang/en_au.json b/src/main/resources/assets/basepower/lang/en_au.json
new file mode 100644
index 00000000..53b7cb50
--- /dev/null
+++ b/src/main/resources/assets/basepower/lang/en_au.json
@@ -0,0 +1,77 @@
+{
+  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
+  "nei.basepower.recipehandler.shapelessfurnace.name": "Large Furnace (Shapeless)",
+  "nei.basepower.recipehandler.shapedfurnace.name": "Large Furnace (Shaped)",
+  "tooltip.basepower.empty": "Empty",
+  "tooltip.basepower.buckets_of": "%x buckets of %y",
+  "itemGroup.basepower": "basePower",
+  "tile.basepower.fluid_drain.name": "Drain",
+  "tile.basepower.fluid_discharge.name": "Discharge Grate",
+  "tile.basepower.fluid_storage_tank.name": "Portable Fluid Tank",
+  "item.basepower.fluid_storage_tank_item.name": "Storage Tank",
+  "tile.basepower.fluid_pipe.name": "Pipe",
+  "tile.basepower.item_conveyor.name": "Conveyor",
+  "tile.basepower.item_filter_block.name": "Block Filter Conveyor",
+  "tile.basepower.item_filter_food.name": "Food Filter Conveyor",
+  "tile.basepower.item_filter_fuel.name": "Fuel Filter Conveyor",
+  "tile.basepower.item_filter_inventory.name": "Filter Conveyor",
+  "tile.basepower.item_filter_ore.name": "Ore Filter Conveyor",
+  "tile.basepower.item_filter_plant.name": "Plantable Filter Conveyor",
+  "tile.basepower.item_filter_smelt.name": "Furnace Filter Conveyor",
+  "tile.basepower.item_filter_overflow.name": "Overflow Filter Conveyor",
+  "tile.basepower.steel_frame.name": "Steel Frame",
+  "item.basepower.starch.name": "Starch",
+  "item.basepower.bioplastic_ingot.name": "Bioplastic Ingot",
+  "item.basepower.sprocket.name": "Sprocket",
+  "tile.basepower.fluid_metal_tank.name": "Metal Fluid Tank",
+  "item.basepower.rotator_tool.name": "Rotation Wrench",
+  "tile.basepower.infinite_steam.name": "Unlimited Steam Power",
+  "tile.basepower.infinite_electricity.name": "Unlimited Electrical Power",
+  "tile.basepower.infinite_quantum.name": "Unlimited Quantum Power",
+  "tile.basepower.crude_oil.name": "Crude Oil",
+  "fluid.basepower.crude_oil": "Crude Oil",
+  "item.bucket.crude_oil": "Bucket of Crude Oil",
+  "tile.basepower.still.name": "Distillation Furnace",
+  "tile.basepower.refined_oil.name": "Refined Oil",
+  "fluid.basepower.refined_oil": "Refined Oil",
+  "item.bucket.refined_oil": "Bucket of Refined Oil",
+  "tile.basepower.fluid_switch.name": "Fluid Switch Valve",
+  "tile.basepower.converter_rf_steam.name": "Steam-RF Transformer",
+  "tile.basepower.converter_rf_electricity.name": "Electricity-RF Transformer",
+  "tile.basepower.converter_rf_quantum.name": "Quantum-RF Transformer",
+  "tile.basepower.converter_tr_electricity.name": "Electricity-EU Transformer",
+  "block.basepower.fluid_drain": "Drain",
+  "block.basepower.fluid_discharge": "Discharge Grate",
+  "block.basepower.fluid_storage_tank": "Portable Fluid Tank",
+  "item.basepower.fluid_storage_tank_item": "Storage Tank",
+  "block.basepower.fluid_pipe": "Pipe",
+  "block.basepower.item_conveyor": "Conveyor",
+  "block.basepower.item_filter_block": "Block Filter Conveyor",
+  "block.basepower.item_filter_food": "Food Filter Conveyor",
+  "block.basepower.item_filter_fuel": "Fuel Filter Conveyor",
+  "block.basepower.item_filter_inventory": "Filter Conveyor",
+  "block.basepower.item_filter_ore": "Ore Filter Conveyor",
+  "block.basepower.item_filter_plant": "Plantable Filter Conveyor",
+  "block.basepower.item_filter_smelt": "Furnace Filter Conveyor",
+  "block.basepower.item_filter_overflow": "Overflow Filter Conveyor",
+  "block.basepower.steel_frame": "Steel Frame",
+  "item.basepower.starch": "Starch",
+  "item.basepower.bioplastic_ingot": "Bioplastic Ingot",
+  "item.basepower.sprocket": "Sprocket",
+  "block.basepower.fluid_metal_tank": "Metal Fluid Tank",
+  "item.basepower.rotator_tool": "Rotation Wrench",
+  "block.basepower.infinite_steam": "Unlimited Steam Power",
+  "block.basepower.infinite_electricity": "Unlimited Electrical Power",
+  "block.basepower.infinite_quantum": "Unlimited Quantum Power",
+  "block.basepower.crude_oil": "Crude Oil",
+  "block.basepower.still": "Distillation Furnace",
+  "block.basepower.refined_oil": "Refined Oil",
+  "block.basepower.fluid_switch": "Fluid Switch Valve",
+  "block.basepower.converter_rf_steam": "Steam-RF Transformer",
+  "block.basepower.converter_rf_electricity": "Electricity-RF Transformer",
+  "block.basepower.converter_rf_quantum": "Quantum-RF Transformer",
+  "block.basepower.converter_tr_electricity": "Electricity-EU Transformer",
+  "item.basepower.crude_oil_bucket": "Bucket of Crude Oil",
+  "item.basepower.refined_oil_bucket": "Bucket of Refined Oil",
+  "block.basepower.fluid_pipe_terminal": "Pipe"
+}
diff --git a/src/main/resources/assets/basepower/lang/en_ca.json b/src/main/resources/assets/basepower/lang/en_ca.json
new file mode 100644
index 00000000..53b7cb50
--- /dev/null
+++ b/src/main/resources/assets/basepower/lang/en_ca.json
@@ -0,0 +1,77 @@
+{
+  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
+  "nei.basepower.recipehandler.shapelessfurnace.name": "Large Furnace (Shapeless)",
+  "nei.basepower.recipehandler.shapedfurnace.name": "Large Furnace (Shaped)",
+  "tooltip.basepower.empty": "Empty",
+  "tooltip.basepower.buckets_of": "%x buckets of %y",
+  "itemGroup.basepower": "basePower",
+  "tile.basepower.fluid_drain.name": "Drain",
+  "tile.basepower.fluid_discharge.name": "Discharge Grate",
+  "tile.basepower.fluid_storage_tank.name": "Portable Fluid Tank",
+  "item.basepower.fluid_storage_tank_item.name": "Storage Tank",
+  "tile.basepower.fluid_pipe.name": "Pipe",
+  "tile.basepower.item_conveyor.name": "Conveyor",
+  "tile.basepower.item_filter_block.name": "Block Filter Conveyor",
+  "tile.basepower.item_filter_food.name": "Food Filter Conveyor",
+  "tile.basepower.item_filter_fuel.name": "Fuel Filter Conveyor",
+  "tile.basepower.item_filter_inventory.name": "Filter Conveyor",
+  "tile.basepower.item_filter_ore.name": "Ore Filter Conveyor",
+  "tile.basepower.item_filter_plant.name": "Plantable Filter Conveyor",
+  "tile.basepower.item_filter_smelt.name": "Furnace Filter Conveyor",
+  "tile.basepower.item_filter_overflow.name": "Overflow Filter Conveyor",
+  "tile.basepower.steel_frame.name": "Steel Frame",
+  "item.basepower.starch.name": "Starch",
+  "item.basepower.bioplastic_ingot.name": "Bioplastic Ingot",
+  "item.basepower.sprocket.name": "Sprocket",
+  "tile.basepower.fluid_metal_tank.name": "Metal Fluid Tank",
+  "item.basepower.rotator_tool.name": "Rotation Wrench",
+  "tile.basepower.infinite_steam.name": "Unlimited Steam Power",
+  "tile.basepower.infinite_electricity.name": "Unlimited Electrical Power",
+  "tile.basepower.infinite_quantum.name": "Unlimited Quantum Power",
+  "tile.basepower.crude_oil.name": "Crude Oil",
+  "fluid.basepower.crude_oil": "Crude Oil",
+  "item.bucket.crude_oil": "Bucket of Crude Oil",
+  "tile.basepower.still.name": "Distillation Furnace",
+  "tile.basepower.refined_oil.name": "Refined Oil",
+  "fluid.basepower.refined_oil": "Refined Oil",
+  "item.bucket.refined_oil": "Bucket of Refined Oil",
+  "tile.basepower.fluid_switch.name": "Fluid Switch Valve",
+  "tile.basepower.converter_rf_steam.name": "Steam-RF Transformer",
+  "tile.basepower.converter_rf_electricity.name": "Electricity-RF Transformer",
+  "tile.basepower.converter_rf_quantum.name": "Quantum-RF Transformer",
+  "tile.basepower.converter_tr_electricity.name": "Electricity-EU Transformer",
+  "block.basepower.fluid_drain": "Drain",
+  "block.basepower.fluid_discharge": "Discharge Grate",
+  "block.basepower.fluid_storage_tank": "Portable Fluid Tank",
+  "item.basepower.fluid_storage_tank_item": "Storage Tank",
+  "block.basepower.fluid_pipe": "Pipe",
+  "block.basepower.item_conveyor": "Conveyor",
+  "block.basepower.item_filter_block": "Block Filter Conveyor",
+  "block.basepower.item_filter_food": "Food Filter Conveyor",
+  "block.basepower.item_filter_fuel": "Fuel Filter Conveyor",
+  "block.basepower.item_filter_inventory": "Filter Conveyor",
+  "block.basepower.item_filter_ore": "Ore Filter Conveyor",
+  "block.basepower.item_filter_plant": "Plantable Filter Conveyor",
+  "block.basepower.item_filter_smelt": "Furnace Filter Conveyor",
+  "block.basepower.item_filter_overflow": "Overflow Filter Conveyor",
+  "block.basepower.steel_frame": "Steel Frame",
+  "item.basepower.starch": "Starch",
+  "item.basepower.bioplastic_ingot": "Bioplastic Ingot",
+  "item.basepower.sprocket": "Sprocket",
+  "block.basepower.fluid_metal_tank": "Metal Fluid Tank",
+  "item.basepower.rotator_tool": "Rotation Wrench",
+  "block.basepower.infinite_steam": "Unlimited Steam Power",
+  "block.basepower.infinite_electricity": "Unlimited Electrical Power",
+  "block.basepower.infinite_quantum": "Unlimited Quantum Power",
+  "block.basepower.crude_oil": "Crude Oil",
+  "block.basepower.still": "Distillation Furnace",
+  "block.basepower.refined_oil": "Refined Oil",
+  "block.basepower.fluid_switch": "Fluid Switch Valve",
+  "block.basepower.converter_rf_steam": "Steam-RF Transformer",
+  "block.basepower.converter_rf_electricity": "Electricity-RF Transformer",
+  "block.basepower.converter_rf_quantum": "Quantum-RF Transformer",
+  "block.basepower.converter_tr_electricity": "Electricity-EU Transformer",
+  "item.basepower.crude_oil_bucket": "Bucket of Crude Oil",
+  "item.basepower.refined_oil_bucket": "Bucket of Refined Oil",
+  "block.basepower.fluid_pipe_terminal": "Pipe"
+}
diff --git a/src/main/resources/assets/basepower/lang/en_en.json b/src/main/resources/assets/basepower/lang/en_en.json
new file mode 100644
index 00000000..53b7cb50
--- /dev/null
+++ b/src/main/resources/assets/basepower/lang/en_en.json
@@ -0,0 +1,77 @@
+{
+  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
+  "nei.basepower.recipehandler.shapelessfurnace.name": "Large Furnace (Shapeless)",
+  "nei.basepower.recipehandler.shapedfurnace.name": "Large Furnace (Shaped)",
+  "tooltip.basepower.empty": "Empty",
+  "tooltip.basepower.buckets_of": "%x buckets of %y",
+  "itemGroup.basepower": "basePower",
+  "tile.basepower.fluid_drain.name": "Drain",
+  "tile.basepower.fluid_discharge.name": "Discharge Grate",
+  "tile.basepower.fluid_storage_tank.name": "Portable Fluid Tank",
+  "item.basepower.fluid_storage_tank_item.name": "Storage Tank",
+  "tile.basepower.fluid_pipe.name": "Pipe",
+  "tile.basepower.item_conveyor.name": "Conveyor",
+  "tile.basepower.item_filter_block.name": "Block Filter Conveyor",
+  "tile.basepower.item_filter_food.name": "Food Filter Conveyor",
+  "tile.basepower.item_filter_fuel.name": "Fuel Filter Conveyor",
+  "tile.basepower.item_filter_inventory.name": "Filter Conveyor",
+  "tile.basepower.item_filter_ore.name": "Ore Filter Conveyor",
+  "tile.basepower.item_filter_plant.name": "Plantable Filter Conveyor",
+  "tile.basepower.item_filter_smelt.name": "Furnace Filter Conveyor",
+  "tile.basepower.item_filter_overflow.name": "Overflow Filter Conveyor",
+  "tile.basepower.steel_frame.name": "Steel Frame",
+  "item.basepower.starch.name": "Starch",
+  "item.basepower.bioplastic_ingot.name": "Bioplastic Ingot",
+  "item.basepower.sprocket.name": "Sprocket",
+  "tile.basepower.fluid_metal_tank.name": "Metal Fluid Tank",
+  "item.basepower.rotator_tool.name": "Rotation Wrench",
+  "tile.basepower.infinite_steam.name": "Unlimited Steam Power",
+  "tile.basepower.infinite_electricity.name": "Unlimited Electrical Power",
+  "tile.basepower.infinite_quantum.name": "Unlimited Quantum Power",
+  "tile.basepower.crude_oil.name": "Crude Oil",
+  "fluid.basepower.crude_oil": "Crude Oil",
+  "item.bucket.crude_oil": "Bucket of Crude Oil",
+  "tile.basepower.still.name": "Distillation Furnace",
+  "tile.basepower.refined_oil.name": "Refined Oil",
+  "fluid.basepower.refined_oil": "Refined Oil",
+  "item.bucket.refined_oil": "Bucket of Refined Oil",
+  "tile.basepower.fluid_switch.name": "Fluid Switch Valve",
+  "tile.basepower.converter_rf_steam.name": "Steam-RF Transformer",
+  "tile.basepower.converter_rf_electricity.name": "Electricity-RF Transformer",
+  "tile.basepower.converter_rf_quantum.name": "Quantum-RF Transformer",
+  "tile.basepower.converter_tr_electricity.name": "Electricity-EU Transformer",
+  "block.basepower.fluid_drain": "Drain",
+  "block.basepower.fluid_discharge": "Discharge Grate",
+  "block.basepower.fluid_storage_tank": "Portable Fluid Tank",
+  "item.basepower.fluid_storage_tank_item": "Storage Tank",
+  "block.basepower.fluid_pipe": "Pipe",
+  "block.basepower.item_conveyor": "Conveyor",
+  "block.basepower.item_filter_block": "Block Filter Conveyor",
+  "block.basepower.item_filter_food": "Food Filter Conveyor",
+  "block.basepower.item_filter_fuel": "Fuel Filter Conveyor",
+  "block.basepower.item_filter_inventory": "Filter Conveyor",
+  "block.basepower.item_filter_ore": "Ore Filter Conveyor",
+  "block.basepower.item_filter_plant": "Plantable Filter Conveyor",
+  "block.basepower.item_filter_smelt": "Furnace Filter Conveyor",
+  "block.basepower.item_filter_overflow": "Overflow Filter Conveyor",
+  "block.basepower.steel_frame": "Steel Frame",
+  "item.basepower.starch": "Starch",
+  "item.basepower.bioplastic_ingot": "Bioplastic Ingot",
+  "item.basepower.sprocket": "Sprocket",
+  "block.basepower.fluid_metal_tank": "Metal Fluid Tank",
+  "item.basepower.rotator_tool": "Rotation Wrench",
+  "block.basepower.infinite_steam": "Unlimited Steam Power",
+  "block.basepower.infinite_electricity": "Unlimited Electrical Power",
+  "block.basepower.infinite_quantum": "Unlimited Quantum Power",
+  "block.basepower.crude_oil": "Crude Oil",
+  "block.basepower.still": "Distillation Furnace",
+  "block.basepower.refined_oil": "Refined Oil",
+  "block.basepower.fluid_switch": "Fluid Switch Valve",
+  "block.basepower.converter_rf_steam": "Steam-RF Transformer",
+  "block.basepower.converter_rf_electricity": "Electricity-RF Transformer",
+  "block.basepower.converter_rf_quantum": "Quantum-RF Transformer",
+  "block.basepower.converter_tr_electricity": "Electricity-EU Transformer",
+  "item.basepower.crude_oil_bucket": "Bucket of Crude Oil",
+  "item.basepower.refined_oil_bucket": "Bucket of Refined Oil",
+  "block.basepower.fluid_pipe_terminal": "Pipe"
+}
diff --git a/src/main/resources/assets/basepower/lang/en_gb.json b/src/main/resources/assets/basepower/lang/en_gb.json
new file mode 100644
index 00000000..53b7cb50
--- /dev/null
+++ b/src/main/resources/assets/basepower/lang/en_gb.json
@@ -0,0 +1,77 @@
+{
+  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
+  "nei.basepower.recipehandler.shapelessfurnace.name": "Large Furnace (Shapeless)",
+  "nei.basepower.recipehandler.shapedfurnace.name": "Large Furnace (Shaped)",
+  "tooltip.basepower.empty": "Empty",
+  "tooltip.basepower.buckets_of": "%x buckets of %y",
+  "itemGroup.basepower": "basePower",
+  "tile.basepower.fluid_drain.name": "Drain",
+  "tile.basepower.fluid_discharge.name": "Discharge Grate",
+  "tile.basepower.fluid_storage_tank.name": "Portable Fluid Tank",
+  "item.basepower.fluid_storage_tank_item.name": "Storage Tank",
+  "tile.basepower.fluid_pipe.name": "Pipe",
+  "tile.basepower.item_conveyor.name": "Conveyor",
+  "tile.basepower.item_filter_block.name": "Block Filter Conveyor",
+  "tile.basepower.item_filter_food.name": "Food Filter Conveyor",
+  "tile.basepower.item_filter_fuel.name": "Fuel Filter Conveyor",
+  "tile.basepower.item_filter_inventory.name": "Filter Conveyor",
+  "tile.basepower.item_filter_ore.name": "Ore Filter Conveyor",
+  "tile.basepower.item_filter_plant.name": "Plantable Filter Conveyor",
+  "tile.basepower.item_filter_smelt.name": "Furnace Filter Conveyor",
+  "tile.basepower.item_filter_overflow.name": "Overflow Filter Conveyor",
+  "tile.basepower.steel_frame.name": "Steel Frame",
+  "item.basepower.starch.name": "Starch",
+  "item.basepower.bioplastic_ingot.name": "Bioplastic Ingot",
+  "item.basepower.sprocket.name": "Sprocket",
+  "tile.basepower.fluid_metal_tank.name": "Metal Fluid Tank",
+  "item.basepower.rotator_tool.name": "Rotation Wrench",
+  "tile.basepower.infinite_steam.name": "Unlimited Steam Power",
+  "tile.basepower.infinite_electricity.name": "Unlimited Electrical Power",
+  "tile.basepower.infinite_quantum.name": "Unlimited Quantum Power",
+  "tile.basepower.crude_oil.name": "Crude Oil",
+  "fluid.basepower.crude_oil": "Crude Oil",
+  "item.bucket.crude_oil": "Bucket of Crude Oil",
+  "tile.basepower.still.name": "Distillation Furnace",
+  "tile.basepower.refined_oil.name": "Refined Oil",
+  "fluid.basepower.refined_oil": "Refined Oil",
+  "item.bucket.refined_oil": "Bucket of Refined Oil",
+  "tile.basepower.fluid_switch.name": "Fluid Switch Valve",
+  "tile.basepower.converter_rf_steam.name": "Steam-RF Transformer",
+  "tile.basepower.converter_rf_electricity.name": "Electricity-RF Transformer",
+  "tile.basepower.converter_rf_quantum.name": "Quantum-RF Transformer",
+  "tile.basepower.converter_tr_electricity.name": "Electricity-EU Transformer",
+  "block.basepower.fluid_drain": "Drain",
+  "block.basepower.fluid_discharge": "Discharge Grate",
+  "block.basepower.fluid_storage_tank": "Portable Fluid Tank",
+  "item.basepower.fluid_storage_tank_item": "Storage Tank",
+  "block.basepower.fluid_pipe": "Pipe",
+  "block.basepower.item_conveyor": "Conveyor",
+  "block.basepower.item_filter_block": "Block Filter Conveyor",
+  "block.basepower.item_filter_food": "Food Filter Conveyor",
+  "block.basepower.item_filter_fuel": "Fuel Filter Conveyor",
+  "block.basepower.item_filter_inventory": "Filter Conveyor",
+  "block.basepower.item_filter_ore": "Ore Filter Conveyor",
+  "block.basepower.item_filter_plant": "Plantable Filter Conveyor",
+  "block.basepower.item_filter_smelt": "Furnace Filter Conveyor",
+  "block.basepower.item_filter_overflow": "Overflow Filter Conveyor",
+  "block.basepower.steel_frame": "Steel Frame",
+  "item.basepower.starch": "Starch",
+  "item.basepower.bioplastic_ingot": "Bioplastic Ingot",
+  "item.basepower.sprocket": "Sprocket",
+  "block.basepower.fluid_metal_tank": "Metal Fluid Tank",
+  "item.basepower.rotator_tool": "Rotation Wrench",
+  "block.basepower.infinite_steam": "Unlimited Steam Power",
+  "block.basepower.infinite_electricity": "Unlimited Electrical Power",
+  "block.basepower.infinite_quantum": "Unlimited Quantum Power",
+  "block.basepower.crude_oil": "Crude Oil",
+  "block.basepower.still": "Distillation Furnace",
+  "block.basepower.refined_oil": "Refined Oil",
+  "block.basepower.fluid_switch": "Fluid Switch Valve",
+  "block.basepower.converter_rf_steam": "Steam-RF Transformer",
+  "block.basepower.converter_rf_electricity": "Electricity-RF Transformer",
+  "block.basepower.converter_rf_quantum": "Quantum-RF Transformer",
+  "block.basepower.converter_tr_electricity": "Electricity-EU Transformer",
+  "item.basepower.crude_oil_bucket": "Bucket of Crude Oil",
+  "item.basepower.refined_oil_bucket": "Bucket of Refined Oil",
+  "block.basepower.fluid_pipe_terminal": "Pipe"
+}
diff --git a/src/main/resources/assets/basepower/lang/en_pt.json b/src/main/resources/assets/basepower/lang/en_pt.json
new file mode 100644
index 00000000..99288a3d
--- /dev/null
+++ b/src/main/resources/assets/basepower/lang/en_pt.json
@@ -0,0 +1,77 @@
+{
+  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
+  "nei.basepower.recipehandler.shapelessfurnace.name": "Large Furnace (Shapeless)",
+  "nei.basepower.recipehandler.shapedfurnace.name": "Large Furnace (Shaped)",
+  "tooltip.basepower.empty": "Empty",
+  "tooltip.basepower.buckets_of": "%x buckets of %y",
+  "itemGroup.basepower": "basePower",
+  "tile.basepower.fluid_drain.name": "Drain",
+  "tile.basepower.fluid_discharge.name": "Discharge Grate",
+  "tile.basepower.fluid_storage_tank.name": "Portable Fluid Tank",
+  "item.basepower.fluid_storage_tank_item.name": "Storage Tank",
+  "tile.basepower.fluid_pipe.name": "Pipe",
+  "tile.basepower.item_conveyor.name": "Conveyor",
+  "tile.basepower.item_filter_block.name": "Block Filter Conveyor",
+  "tile.basepower.item_filter_food.name": "Food Filter Conveyor",
+  "tile.basepower.item_filter_fuel.name": "Fuel Filter Conveyor",
+  "tile.basepower.item_filter_inventory.name": "Filter Conveyor",
+  "tile.basepower.item_filter_ore.name": "Ore Filter Conveyor",
+  "tile.basepower.item_filter_plant.name": "Plantable Filter Conveyor",
+  "tile.basepower.item_filter_smelt.name": "Furnace Filter Conveyor",
+  "tile.basepower.item_filter_overflow.name": "Overflow Filter Conveyor",
+  "tile.basepower.steel_frame.name": "Steel Frame",
+  "item.basepower.starch.name": "Starch",
+  "item.basepower.bioplastic_ingot.name": "Bioplastic Ingot",
+  "item.basepower.sprocket.name": "Sprocket",
+  "tile.basepower.fluid_metal_tank.name": "Metal Fluid Tank",
+  "item.basepower.rotator_tool.name": "Rotation Wrench",
+  "tile.basepower.infinite_steam.name": "Unlimited Steam Power",
+  "tile.basepower.infinite_electricity.name": "Unlimited Electrical Power",
+  "tile.basepower.infinite_quantum.name": "Unlimited Quantum Power",
+  "tile.basepower.crude_oil.name": "Black Gold",
+  "fluid.basepower.crude_oil": "Black Gold",
+  "item.bucket.crude_oil": "Bucket o' Black Gold",
+  "tile.basepower.still.name": "'Stillery",
+  "tile.basepower.refined_oil.name": "Lamp Oil",
+  "fluid.basepower.refined_oil": "Lamp Oil",
+  "item.bucket.refined_oil": "Bucket o' Lamp Oil",
+  "tile.basepower.fluid_switch.name": "Big Red Valve",
+  "tile.basepower.converter_rf_steam.name": "Steam-RF Transformer",
+  "tile.basepower.converter_rf_electricity.name": "Electricity-RF Transformer",
+  "tile.basepower.converter_rf_quantum.name": "Quantum-RF Transformer",
+  "tile.basepower.converter_tr_electricity.name": "Electricity-EU Transformer",
+  "block.basepower.fluid_drain": "Drain",
+  "block.basepower.fluid_discharge": "Discharge Grate",
+  "block.basepower.fluid_storage_tank": "Portable Fluid Tank",
+  "item.basepower.fluid_storage_tank_item": "Storage Tank",
+  "block.basepower.fluid_pipe": "Pipe",
+  "block.basepower.item_conveyor": "Conveyor",
+  "block.basepower.item_filter_block": "Block Filter Conveyor",
+  "block.basepower.item_filter_food": "Food Filter Conveyor",
+  "block.basepower.item_filter_fuel": "Fuel Filter Conveyor",
+  "block.basepower.item_filter_inventory": "Filter Conveyor",
+  "block.basepower.item_filter_ore": "Ore Filter Conveyor",
+  "block.basepower.item_filter_plant": "Plantable Filter Conveyor",
+  "block.basepower.item_filter_smelt": "Furnace Filter Conveyor",
+  "block.basepower.item_filter_overflow": "Overflow Filter Conveyor",
+  "block.basepower.steel_frame": "Steel Frame",
+  "item.basepower.starch": "Starch",
+  "item.basepower.bioplastic_ingot": "Bioplastic Ingot",
+  "item.basepower.sprocket": "Sprocket",
+  "block.basepower.fluid_metal_tank": "Metal Fluid Tank",
+  "item.basepower.rotator_tool": "Rotation Wrench",
+  "block.basepower.infinite_steam": "Unlimited Steam Power",
+  "block.basepower.infinite_electricity": "Unlimited Electrical Power",
+  "block.basepower.infinite_quantum": "Unlimited Quantum Power",
+  "block.basepower.crude_oil": "Black Gold",
+  "block.basepower.still": "'Stillery",
+  "block.basepower.refined_oil": "Lamp Oil",
+  "block.basepower.fluid_switch": "Big Red Valve",
+  "block.basepower.converter_rf_steam": "Steam-RF Transformer",
+  "block.basepower.converter_rf_electricity": "Electricity-RF Transformer",
+  "block.basepower.converter_rf_quantum": "Quantum-RF Transformer",
+  "block.basepower.converter_tr_electricity": "Electricity-EU Transformer",
+  "item.basepower.crude_oil_bucket": "Bucket o' Black Gold",
+  "item.basepower.refined_oil_bucket": "Bucket o' Lamp Oil",
+  "block.basepower.fluid_pipe_terminal": "Pipe"
+}
diff --git a/src/main/resources/assets/basepower/lang/en_us.json b/src/main/resources/assets/basepower/lang/en_us.json
new file mode 100644
index 00000000..497c2e5f
--- /dev/null
+++ b/src/main/resources/assets/basepower/lang/en_us.json
@@ -0,0 +1,75 @@
+{
+  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
+  "nei.basepower.recipehandler.shapelessfurnace.name": "Large Furnace (Shapeless)",
+  "nei.basepower.recipehandler.shapedfurnace.name": "Large Furnace (Shaped)",
+  "tooltip.basepower.empty": "Empty",
+  "tooltip.basepower.buckets_of": "%x buckets of %y",
+  "itemGroup.basepower": "basePower",
+  "tile.basepower.fluid_drain.name": "Drain",
+  "tile.basepower.fluid_discharge.name": "Discharge Grate",
+  "tile.basepower.fluid_storage_tank.name": "Portable Fluid Tank",
+  "tile.basepower.fluid_pipe.name": "Pipe",
+  "tile.basepower.item_conveyor.name": "Conveyor",
+  "tile.basepower.item_filter_block.name": "Block Filter Conveyor",
+  "tile.basepower.item_filter_food.name": "Food Filter Conveyor",
+  "tile.basepower.item_filter_fuel.name": "Fuel Filter Conveyor",
+  "tile.basepower.item_filter_inventory.name": "Filter Conveyor",
+  "tile.basepower.item_filter_ore.name": "Ore Filter Conveyor",
+  "tile.basepower.item_filter_plant.name": "Plantable Filter Conveyor",
+  "tile.basepower.item_filter_smelt.name": "Furnace Filter Conveyor",
+  "tile.basepower.item_filter_overflow.name": "Overflow Filter Conveyor",
+  "tile.basepower.steel_frame.name": "Steel Frame",
+  "item.basepower.starch.name": "Starch",
+  "item.basepower.bioplastic_ingot.name": "Bioplastic Ingot",
+  "item.basepower.sprocket.name": "Sprocket",
+  "tile.basepower.fluid_metal_tank.name": "Metal Fluid Tank",
+  "item.basepower.rotator_tool.name": "Rotation Wrench",
+  "tile.basepower.infinite_steam.name": "Unlimited Steam Power",
+  "tile.basepower.infinite_electricity.name": "Unlimited Electrical Power",
+  "tile.basepower.infinite_quantum.name": "Unlimited Quantum Power",
+  "tile.basepower.crude_oil.name": "Crude Oil",
+  "fluid.basepower.crude_oil": "Crude Oil",
+  "item.bucket.crude_oil": "Bucket of Crude Oil",
+  "tile.basepower.still.name": "Distillation Furnace",
+  "tile.basepower.refined_oil.name": "Refined Oil",
+  "fluid.basepower.refined_oil": "Refined Oil",
+  "item.bucket.refined_oil": "Bucket of Refined Oil",
+  "tile.basepower.fluid_switch.name": "Fluid Switch Valve",
+  "tile.basepower.converter_rf_steam.name": "Steam-RF Transformer",
+  "tile.basepower.converter_rf_electricity.name": "Electricity-RF Transformer",
+  "tile.basepower.converter_rf_quantum.name": "Quantum-RF Transformer",
+  "tile.basepower.converter_tr_electricity.name": "Electricity-EU Transformer",
+  "block.basepower.fluid_drain": "Drain",
+  "block.basepower.fluid_discharge": "Discharge Grate",
+  "block.basepower.fluid_storage_tank": "Portable Fluid Tank",
+  "block.basepower.fluid_pipe": "Pipe",
+  "block.basepower.item_conveyor": "Conveyor",
+  "block.basepower.item_filter_block": "Block Filter Conveyor",
+  "block.basepower.item_filter_food": "Food Filter Conveyor",
+  "block.basepower.item_filter_fuel": "Fuel Filter Conveyor",
+  "block.basepower.item_filter_inventory": "Filter Conveyor",
+  "block.basepower.item_filter_ore": "Ore Filter Conveyor",
+  "block.basepower.item_filter_plant": "Plantable Filter Conveyor",
+  "block.basepower.item_filter_smelt": "Furnace Filter Conveyor",
+  "block.basepower.item_filter_overflow": "Overflow Filter Conveyor",
+  "block.basepower.steel_frame": "Steel Frame",
+  "item.basepower.starch": "Starch",
+  "item.basepower.bioplastic_ingot": "Bioplastic Ingot",
+  "item.basepower.sprocket": "Sprocket",
+  "block.basepower.fluid_metal_tank": "Metal Fluid Tank",
+  "item.basepower.rotator_tool": "Rotation Wrench",
+  "block.basepower.infinite_steam": "Unlimited Steam Power",
+  "block.basepower.infinite_electricity": "Unlimited Electrical Power",
+  "block.basepower.infinite_quantum": "Unlimited Quantum Power",
+  "block.basepower.crude_oil": "Crude Oil",
+  "block.basepower.still": "Distillation Furnace",
+  "block.basepower.refined_oil": "Refined Oil",
+  "block.basepower.fluid_switch": "Fluid Switch Valve",
+  "block.basepower.converter_rf_steam": "Steam-RF Transformer",
+  "block.basepower.converter_rf_electricity": "Electricity-RF Transformer",
+  "block.basepower.converter_rf_quantum": "Quantum-RF Transformer",
+  "block.basepower.converter_tr_electricity": "Electricity-EU Transformer",
+  "item.basepower.crude_oil_bucket": "Bucket of Crude Oil",
+  "item.basepower.refined_oil_bucket": "Bucket of Refined Oil",
+  "block.basepower.fluid_pipe_terminal": "Pipe"
+}
diff --git a/src/main/resources/assets/basepower/lang/es_es.json b/src/main/resources/assets/basepower/lang/es_es.json
new file mode 100644
index 00000000..fa9b01db
--- /dev/null
+++ b/src/main/resources/assets/basepower/lang/es_es.json
@@ -0,0 +1,75 @@
+{
+  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
+  "nei.basepower.recipehandler.shapelessfurnace.name": "Gran Horno (no forma)",
+  "nei.basepower.recipehandler.shapedfurnace.name": "Gran Horno (en forma)",
+  "tooltip.basepower.empty": "Vacío",
+  "tooltip.basepower.buckets_of ": "%x cubos de %y",
+  "itemGroup.basepower": "basePower",
+  "tile.basepower.fluid_drain.name": "Drenaje",
+  "tile.basepower.fluid_discharge.name": "Descarga Grate",
+  "tile.basepower.fluid_storage_tank.name": "Tanque de almacenamiento",
+  "item.basepower.fluid_storage_tank_item.name": "Tanque de almacenamiento",
+  "tile.basepower.fluid_pipe.name": "Tubo",
+  "tile.basepower.item_conveyor.name": "Transportadores",
+  "tile.basepower.item_filter_block.name": "Bloquear Filtro Transportadores",
+  "tile.basepower.item_filter_food.name": "Filtro Alimentos Transportadores",
+  "tile.basepower.item_filter_fuel.name": "Filtro de combustible Transportadores",
+  "tile.basepower.item_filter_inventory.name": "Filtro Transportadores",
+  "tile.basepower.item_filter_ore.name": "Ore Transportadores Filtro",
+  "tile.basepower.item_filter_plant.name": "Plantable Transportadores Filtro",
+  "tile.basepower.item_filter_smelt.name": "Horno Filtro Transportadores",
+  "tile.basepower.item_filter_overflow.name": "Desbordamiento Filtro Transportadores",
+  "tile.basepower.steel_frame.name": "Marco de Acero",
+  "item.basepower.starch.name": "Almidón",
+  "item.basepower.bioplastic_ingot.name": "Bioplástico Lingote",
+  "item.basepower.sprocket.name": "Piñón",
+  "tile.basepower.fluid_metal_tank.name": "Tanque de Almacenamiento de Acero",
+  "item.basepower.rotator_tool.name": "Herramienta de Rotación",
+  "tile.basepower.infinite_steam.name": "La Energía de Vapor Infinito",
+  "tile.basepower.infinite_electricity.name": "Energía Eléctrica Infinito",
+  "tile.basepower.infinite_quantum.name": "Cuántica Infinito",
+  "tile.basepower.crude_oil.name": "Petróleo Crudo",
+  "fluid.basepower.crude_oil": "Petróleo Crudo",
+  "item.bucket.crude_oil.name": "Cubo de Crudo",
+  "tile.basepower.still.name": "Destilería",
+  "tile.basepower.refined_oil.name": "Refinado de Petróleo",
+  "fluid.basepower.refined_oil": "Refinado de Petróleo",
+  "item.bucket.refined_oil.name": "Cubo de Refinado de Petróleo",
+  "tile.basepower.fluid_switch.name": "Válvula",
+  "tile.basepower.converter_rf_steam.name": "Vapor-RF Transformador",
+  "tile.basepower.converter_rf_electricity.name": "Electricidad-RF Transformador",
+  "tile.basepower.converter_rf_quantum.name": "Cuántico-RF Transformador",
+  "tile.basepower.converter_tr_electricity.name": "Electricidad-EU Transformador",
+  "block.basepower.fluid_drain": "Drenaje",
+  "block.basepower.fluid_discharge": "Descarga Grate",
+  "block.basepower.fluid_storage_tank": "Tanque de almacenamiento",
+  "item.basepower.fluid_storage_tank_item": "Tanque de almacenamiento",
+  "block.basepower.fluid_pipe": "Tubo",
+  "block.basepower.item_conveyor": "Transportadores",
+  "block.basepower.item_filter_block": "Bloquear Filtro Transportadores",
+  "block.basepower.item_filter_food": "Filtro Alimentos Transportadores",
+  "block.basepower.item_filter_fuel": "Filtro de combustible Transportadores",
+  "block.basepower.item_filter_inventory": "Filtro Transportadores",
+  "block.basepower.item_filter_ore": "Ore Transportadores Filtro",
+  "block.basepower.item_filter_plant": "Plantable Transportadores Filtro",
+  "block.basepower.item_filter_smelt": "Horno Filtro Transportadores",
+  "block.basepower.item_filter_overflow": "Desbordamiento Filtro Transportadores",
+  "block.basepower.steel_frame": "Marco de Acero",
+  "item.basepower.starch": "Almidón",
+  "item.basepower.bioplastic_ingot": "Bioplástico Lingote",
+  "item.basepower.sprocket": "Piñón",
+  "block.basepower.fluid_metal_tank": "Tanque de Almacenamiento de Acero",
+  "item.basepower.rotator_tool": "Herramienta de Rotación",
+  "block.basepower.infinite_steam": "La Energía de Vapor Infinito",
+  "block.basepower.infinite_electricity": "Energía Eléctrica Infinito",
+  "block.basepower.infinite_quantum": "Cuántica Infinito",
+  "block.basepower.crude_oil": "Petróleo Crudo",
+  "block.basepower.still": "Destilería",
+  "block.basepower.refined_oil": "Refinado de Petróleo",
+  "block.basepower.fluid_switch": "Válvula",
+  "block.basepower.converter_rf_steam": "Vapor-RF Transformador",
+  "block.basepower.converter_rf_electricity": "Electricidad-RF Transformador",
+  "block.basepower.converter_rf_quantum": "Cuántico-RF Transformador",
+  "block.basepower.converter_tr_electricity": "Electricidad-EU Transformador",
+  "block.basepower.fluid_pipe_terminal": "Tubo"
+}
diff --git a/src/main/resources/assets/basepower/lang/es_mx.json b/src/main/resources/assets/basepower/lang/es_mx.json
new file mode 100644
index 00000000..490c1721
--- /dev/null
+++ b/src/main/resources/assets/basepower/lang/es_mx.json
@@ -0,0 +1,75 @@
+{
+  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
+  "nei.basepower.recipehandler.shapelessfurnace.name": "Gran Horno (no forma)",
+  "nei.basepower.recipehandler.shapedfurnace.name": "Gran Horno (en forma)",
+  "tooltip.basepower.empty": "Vacío",
+  "tooltip.basepower.buckets_of": "%x cubos de %y",
+  "itemGroup.basepower": "basePower",
+  "tile.basepower.fluid_drain.name": "Drenaje",
+  "tile.basepower.fluid_discharge.name": "Descarga Grate",
+  "tile.basepower.fluid_storage_tank.name": "Tanque de almacenamiento",
+  "item.basepower.fluid_storage_tank_item.name": "Tanque de almacenamiento",
+  "tile.basepower.fluid_pipe.name": "Tubo",
+  "tile.basepower.item_conveyor.name": "Transportadores",
+  "tile.basepower.item_filter_block.name": "Bloquear Filtro Transportadores",
+  "tile.basepower.item_filter_food.name": "Filtro Alimentos Transportadores",
+  "tile.basepower.item_filter_fuel.name": "Filtro de combustible Transportadores",
+  "tile.basepower.item_filter_inventory.name": "Filtro Transportadores",
+  "tile.basepower.item_filter_ore.name": "Ore Transportadores Filtro",
+  "tile.basepower.item_filter_plant.name": "Plantable Transportadores Filtro",
+  "tile.basepower.item_filter_smelt.name": "Horno Filtro Transportadores",
+  "tile.basepower.item_filter_overflow.name": "Desbordamiento Filtro Transportadores",
+  "tile.basepower.steel_frame.name": "Marco de Acero",
+  "item.basepower.starch.name": "Almidón",
+  "item.basepower.bioplastic_ingot.name": "Bioplástico Lingote",
+  "item.basepower.sprocket.name": "Piñón",
+  "tile.basepower.fluid_metal_tank.name": "Tanque de Almacenamiento de Acero",
+  "item.basepower.rotator_tool.name": "Herramienta de Rotación",
+  "tile.basepower.infinite_steam.name": "La Energía de Vapor Infinito",
+  "tile.basepower.infinite_electricity.name": "Energía Eléctrica Infinito",
+  "tile.basepower.infinite_quantum.name": "Cuántica Infinito",
+  "tile.basepower.crude_oil.name": "Petróleo Crudo",
+  "fluid.basepower.crude_oil": "Petróleo Crudo",
+  "item.bucket.crude_oil.name": "Cubo de Crudo",
+  "tile.basepower.still.name": "Destilería",
+  "tile.basepower.refined_oil.name": "Refinado de Petróleo",
+  "fluid.basepower.refined_oil": "Refinado de Petróleo",
+  "item.bucket.refined_oil.name": "Cubo de Refinado de Petróleo",
+  "tile.basepower.fluid_switch.name": "Válvula",
+  "tile.basepower.converter_rf_steam.name": "Vapor-RF Transformador",
+  "tile.basepower.converter_rf_electricity.name": "Electricidad-RF Transformador",
+  "tile.basepower.converter_rf_quantum.name": "Cuántico-RF Transformador",
+  "tile.basepower.converter_tr_electricity.name": "Electricidad-EU Transformador",
+  "block.basepower.fluid_drain": "Drenaje",
+  "block.basepower.fluid_discharge": "Descarga Grate",
+  "block.basepower.fluid_storage_tank": "Tanque de almacenamiento",
+  "item.basepower.fluid_storage_tank_item": "Tanque de almacenamiento",
+  "block.basepower.fluid_pipe": "Tubo",
+  "block.basepower.item_conveyor": "Transportadores",
+  "block.basepower.item_filter_block": "Bloquear Filtro Transportadores",
+  "block.basepower.item_filter_food": "Filtro Alimentos Transportadores",
+  "block.basepower.item_filter_fuel": "Filtro de combustible Transportadores",
+  "block.basepower.item_filter_inventory": "Filtro Transportadores",
+  "block.basepower.item_filter_ore": "Ore Transportadores Filtro",
+  "block.basepower.item_filter_plant": "Plantable Transportadores Filtro",
+  "block.basepower.item_filter_smelt": "Horno Filtro Transportadores",
+  "block.basepower.item_filter_overflow": "Desbordamiento Filtro Transportadores",
+  "block.basepower.steel_frame": "Marco de Acero",
+  "item.basepower.starch": "Almidón",
+  "item.basepower.bioplastic_ingot": "Bioplástico Lingote",
+  "item.basepower.sprocket": "Piñón",
+  "block.basepower.fluid_metal_tank": "Tanque de Almacenamiento de Acero",
+  "item.basepower.rotator_tool": "Herramienta de Rotación",
+  "block.basepower.infinite_steam": "La Energía de Vapor Infinito",
+  "block.basepower.infinite_electricity": "Energía Eléctrica Infinito",
+  "block.basepower.infinite_quantum": "Cuántica Infinito",
+  "block.basepower.crude_oil": "Petróleo Crudo",
+  "block.basepower.still": "Destilería",
+  "block.basepower.refined_oil": "Refinado de Petróleo",
+  "block.basepower.fluid_switch": "Válvula",
+  "block.basepower.converter_rf_steam": "Vapor-RF Transformador",
+  "block.basepower.converter_rf_electricity": "Electricidad-RF Transformador",
+  "block.basepower.converter_rf_quantum": "Cuántico-RF Transformador",
+  "block.basepower.converter_tr_electricity": "Electricidad-EU Transformador",
+  "block.basepower.fluid_pipe_terminal": "Tubo"
+}
diff --git a/src/main/resources/assets/basepower/lang/it_it.json b/src/main/resources/assets/basepower/lang/it_it.json
new file mode 100644
index 00000000..0fd40cd2
--- /dev/null
+++ b/src/main/resources/assets/basepower/lang/it_it.json
@@ -0,0 +1,75 @@
+{
+  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
+  "nei.basepower.recipehandler.shapelessfurnace.name": "Grande Fornace (informe)",
+  "nei.basepower.recipehandler.shapedfurnace.name": "Grande Fornace (forma)",
+  "tooltip.basepower.empty": "vuoto",
+  "tooltip.basepower.buckets_of": "%x secchi d'%y",
+  "itemGroup.basepower": "basePower",
+  "tile.basepower.fluid_drain.name": "Scarico",
+  "tile.basepower.fluid_discharge.name": "Griglia di scarico",
+  "tile.basepower.fluid_storage_tank.name": "Serbatoio",
+  "item.basepower.fluid_storage_tank_item.name": "Serbatoio",
+  "tile.basepower.fluid_pipe.name": "Tubo",
+  "tile.basepower.item_conveyor.name": "Trasportatore",
+  "tile.basepower.item_filter_block.name": "Filtro di blocco trasportatore",
+  "tile.basepower.item_filter_food.name": "Filtro alimentare Conveyor",
+  "tile.basepower.item_filter_fuel.name": "carburante Filtro Conveyor",
+  "tile.basepower.item_filter_inventory.name": "Filtro Conveyor",
+  "tile.basepower.item_filter_ore.name": "Ore Filtro Conveyor",
+  "tile.basepower.item_filter_plant.name": "Plantable Filtro Conveyor",
+  "tile.basepower.item_filter_smelt.name": "Forno Filtro Conveyor",
+  "tile.basepower.item_filter_overflow.name": "Straripamento Filtro Conveyor",
+  "tile.basepower.steel_frame.name": "Steel Frame",
+  "item.basepower.starch.name": "Amido",
+  "item.basepower.bioplastic_ingot.name": "Bioplastica Lingotto",
+  "item.basepower.sprocket.name": "Sprocket",
+  "tile.basepower.fluid_metal_tank.name": "Serbatoio in Metallo",
+  "item.basepower.rotator_tool.name": "Strumento di Rotazione",
+  "tile.basepower.infinite_steam.name": "Forza Vapore Infinite",
+  "tile.basepower.infinite_electricity.name": "Elettricità Infinite",
+  "tile.basepower.infinite_quantum.name": "Atomica Infinite",
+  "tile.basepower.crude_oil.name": "Olio a Crudo",
+  "fluid.basepower.crude_oil": "Olio a Crudo",
+  "item.bucket.crude_oil.name": "Secchio di Greggio",
+  "tile.basepower.still.name": "Distilleria",
+  "tile.basepower.refined_oil.name": "Olio Raffinato",
+  "fluid.basepower.refined_oil": "Olio Raffinato",
+  "item.bucket.refined_oil.name": "Secchio di Olio Raffinato",
+  "tile.basepower.fluid_switch.name": "Valvola",
+  "tile.basepower.converter_rf_steam.name": "Vapore-RF Trasformatore",
+  "tile.basepower.converter_rf_electricity.name": "Elettricità-RF Trasformatore",
+  "tile.basepower.converter_rf_quantum.name": "Quantistico-RF Trasformatore",
+  "tile.basepower.converter_tr_electricity.name": "Elettricità-EU Trasformatore",
+  "block.basepower.fluid_drain": "Scarico",
+  "block.basepower.fluid_discharge": "Griglia di scarico",
+  "block.basepower.fluid_storage_tank": "Serbatoio",
+  "item.basepower.fluid_storage_tank_item": "Serbatoio",
+  "block.basepower.fluid_pipe": "Tubo",
+  "block.basepower.item_conveyor": "Trasportatore",
+  "block.basepower.item_filter_block": "Filtro di blocco trasportatore",
+  "block.basepower.item_filter_food": "Filtro alimentare Conveyor",
+  "block.basepower.item_filter_fuel": "carburante Filtro Conveyor",
+  "block.basepower.item_filter_inventory": "Filtro Conveyor",
+  "block.basepower.item_filter_ore": "Ore Filtro Conveyor",
+  "block.basepower.item_filter_plant": "Plantable Filtro Conveyor",
+  "block.basepower.item_filter_smelt": "Forno Filtro Conveyor",
+  "block.basepower.item_filter_overflow": "Straripamento Filtro Conveyor",
+  "block.basepower.steel_frame": "Steel Frame",
+  "item.basepower.starch": "Amido",
+  "item.basepower.bioplastic_ingot": "Bioplastica Lingotto",
+  "item.basepower.sprocket": "Sprocket",
+  "block.basepower.fluid_metal_tank": "Serbatoio in Metallo",
+  "item.basepower.rotator_tool": "Strumento di Rotazione",
+  "block.basepower.infinite_steam": "Forza Vapore Infinite",
+  "block.basepower.infinite_electricity": "Elettricità Infinite",
+  "block.basepower.infinite_quantum": "Atomica Infinite",
+  "block.basepower.crude_oil": "Olio a Crudo",
+  "block.basepower.still": "Distilleria",
+  "block.basepower.refined_oil": "Olio Raffinato",
+  "block.basepower.fluid_switch": "Valvola",
+  "block.basepower.converter_rf_steam": "Vapore-RF Trasformatore",
+  "block.basepower.converter_rf_electricity": "Elettricità-RF Trasformatore",
+  "block.basepower.converter_rf_quantum": "Quantistico-RF Trasformatore",
+  "block.basepower.converter_tr_electricity": "Elettricità-EU Trasformatore",
+  "block.basepower.fluid_pipe_terminal": "Tubo"
+}
diff --git a/src/main/resources/assets/basepower/lang/ja_jp.json b/src/main/resources/assets/basepower/lang/ja_jp.json
new file mode 100644
index 00000000..60306ca5
--- /dev/null
+++ b/src/main/resources/assets/basepower/lang/ja_jp.json
@@ -0,0 +1,75 @@
+{
+  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
+  "nei.basepower.recipehandler.shapelessfurnace.name": "大型炉（型崩れ）",
+  "nei.basepower.recipehandler.shapedfurnace.name": "大型炉（形）",
+  "tooltip.basepower.empty": "空",
+  "tooltip.basepower.buckets_of": "%yの%xバケット",
+  "itemGroup.basepower": "basePower",
+  "tile.basepower.fluid_drain.name": "ドレン",
+  "tile.basepower.fluid_discharge.name": "放電グレート",
+  "tile.basepower.fluid_storage_tank.name": "貯蔵タンク",
+  "item.basepower.fluid_storage_tank_item.name": "貯蔵タンク",
+  "tile.basepower.fluid_pipe.name": "パイプ",
+  "tile.basepower.item_conveyor.name": "コンベア",
+  "tile.basepower.item_filter_block.name": "ブロックフィルタコンベア",
+  "tile.basepower.item_filter_food.name": "フードフィルターコンベア",
+  "tile.basepower.item_filter_fuel.name": "燃料フィルターコンベア",
+  "tile.basepower.item_filter_inventory.name": "フィルタコンベヤー",
+  "tile.basepower.item_filter_ore.name": "鉱石フィルターコンベア",
+  "tile.basepower.item_filter_plant.name": "プラントフィルタコンベヤー",
+  "tile.basepower.item_filter_smelt.name": "炉フィルターコンベア",
+  "tile.basepower.item_filter_overflow.name": "オーバーフローフィルタコンベヤー",
+  "tile.basepower.steel_frame.name": "鉄骨",
+  "item.basepower.starch.name": "デンプン",
+  "item.basepower.bioplastic_ingot.name": "は、バイオプラスチックインゴットを",
+  "item.basepower.sprocket.name": "スプロケット",
+  "tile.basepower.infinite_steam.name": "無限の蒸気動力",
+  "tile.basepower.infinite_electricity.name": "無限の電力",
+  "tile.basepower.infinite_quantum.name": "無限の量子パワー",
+  "tile.basepower.fluid_metal_tank.name": "金属製貯蔵タンク",
+  "item.basepower.rotator_tool.name": "回転ツール",
+  "tile.basepower.crude_oil.name": "原油",
+  "fluid.basepower.crude_oil": "原油",
+  "item.bucket.crude_oil.name": "原油のバケット",
+  "tile.basepower.still.name": "蒸留酒製造所",
+  "tile.basepower.refined_oil.name": "精製油",
+  "fluid.basepower.refined_oil": "精製油",
+  "item.bucket.refined_oil.name": "精製油のバケツ",
+  "tile.basepower.fluid_switch.name": "バルブ",
+  "tile.basepower.converter_rf_steam.name": "蒸気-RFトランス",
+  "tile.basepower.converter_rf_electricity.name": "電気-RFトランス",
+  "tile.basepower.converter_rf_quantum.name": "量子-RFトランス",
+  "tile.basepower.converter_tr_electricity.name": "電気-EUトランス",
+  "block.basepower.fluid_drain": "ドレン",
+  "block.basepower.fluid_discharge": "放電グレート",
+  "block.basepower.fluid_storage_tank": "貯蔵タンク",
+  "item.basepower.fluid_storage_tank_item": "貯蔵タンク",
+  "block.basepower.fluid_pipe": "パイプ",
+  "block.basepower.item_conveyor": "コンベア",
+  "block.basepower.item_filter_block": "ブロックフィルタコンベア",
+  "block.basepower.item_filter_food": "フードフィルターコンベア",
+  "block.basepower.item_filter_fuel": "燃料フィルターコンベア",
+  "block.basepower.item_filter_inventory": "フィルタコンベヤー",
+  "block.basepower.item_filter_ore": "鉱石フィルターコンベア",
+  "block.basepower.item_filter_plant": "プラントフィルタコンベヤー",
+  "block.basepower.item_filter_smelt": "炉フィルターコンベア",
+  "block.basepower.item_filter_overflow": "オーバーフローフィルタコンベヤー",
+  "block.basepower.steel_frame": "鉄骨",
+  "item.basepower.starch": "デンプン",
+  "item.basepower.bioplastic_ingot": "は、バイオプラスチックインゴットを",
+  "item.basepower.sprocket": "スプロケット",
+  "block.basepower.infinite_steam": "無限の蒸気動力",
+  "block.basepower.infinite_electricity": "無限の電力",
+  "block.basepower.infinite_quantum": "無限の量子パワー",
+  "block.basepower.fluid_metal_tank": "金属製貯蔵タンク",
+  "item.basepower.rotator_tool": "回転ツール",
+  "block.basepower.crude_oil": "原油",
+  "block.basepower.still": "蒸留酒製造所",
+  "block.basepower.refined_oil": "精製油",
+  "block.basepower.fluid_switch": "バルブ",
+  "block.basepower.converter_rf_steam": "蒸気-RFトランス",
+  "block.basepower.converter_rf_electricity": "電気-RFトランス",
+  "block.basepower.converter_rf_quantum": "量子-RFトランス",
+  "block.basepower.converter_tr_electricity": "電気-EUトランス",
+  "block.basepower.fluid_pipe_terminal": "パイプ"
+}
diff --git a/src/main/resources/assets/basepower/lang/ko_kr.json b/src/main/resources/assets/basepower/lang/ko_kr.json
new file mode 100644
index 00000000..a06ff90b
--- /dev/null
+++ b/src/main/resources/assets/basepower/lang/ko_kr.json
@@ -0,0 +1,75 @@
+{
+  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
+  "nei.basepower.recipehandler.shapelessfurnace.name": "대형 전기로 (못생긴)",
+  "nei.basepower.recipehandler.shapedfurnace.name": "대형 전기로 (모양)",
+  "tooltip.basepower.empty": "빈",
+  "tooltip.tooltip.basepower.buckets_of": "%는 X 버킷",
+  "itemGroup.basepower": "basePower",
+  "tile.basepower.fluid_drain.name": "드레인",
+  "tile.basepower.fluid_discharge.name": "방전 화격자",
+  "tile.basepower.fluid_storage_tank.name": "저장 탱크",
+  "item.basepower.fluid_storage_tank_item.name": "는 저장 탱크를 ",
+  "tile.basepower.fluid_pipe.name": "파이프",
+  "tile.basepower.item_conveyor.name": "컨베이어",
+  "tile.basepower.item_filter_block.name": "블록 필터 컨베이어",
+  "tile.basepower.item_filter_food.name": "식품 필터 컨베이어",
+  "tile.basepower.item_filter_fuel.name": "연료 필터 컨베이어",
+  "tile.basepower.item_filter_inventory.name": "필터 컨베이어",
+  "tile.basepower.item_filter_ore.name": "광석 필터 컨베이어",
+  "tile.basepower.item_filter_plant.name": "물만 주면 식물이 필터 컨베이어",
+  "tile.basepower.item_filter_smelt.name": "노 필터 컨베이어",
+  "tile.basepower.item_filter_overflow.name": "오버 플로우필터 컨베이어",
+  "tile.basepower.steel_frame.name": "스틸 프레임",
+  "item.basepower.starch.name": "전분",
+  "item.basepower.bioplastic_ingot.name": "는 바이오 플라스틱 잉곳을 ",
+  "item.basepower.sprocket.name": "스프로킷",
+  "tile.basepower.fluid_metal_tank.name": "금속 저장조",
+  "item.basepower.rotator_tool.name": "회전 도구",
+  "tile.basepower.infinite_steam.name": "무한 증기 력",
+  "tile.basepower.infinite_electricity.name": "무한 전력",
+  "tile.basepower.infinite_quantum.name": "무한 양자 전력",
+  "tile.basepower.crude_oil.name": "원유",
+  "fluid.basepower.crude_oil": "원유",
+  "item.bucket.crude_oil.name": "원유의 버킷",
+  "tile.basepower.still.name": "증류소",
+  "tile.basepower.refined_oil.name": "정유",
+  "fluid.basepower.refined_oil": "정유",
+  "item.bucket.refined_oil.name": "정유의 통",
+  "tile.basepower.fluid_switch.name": "판막",
+  "tile.basepower.converter_rf_steam.name": "증기-RF 전원 트랜스",
+  "tile.basepower.converter_rf_electricity.name": "전기-RF 전원 트랜스",
+  "tile.basepower.converter_rf_quantum.name": "양자-RF 전원 트랜스",
+  "tile.basepower.converter_tr_electricity.name": "전기-EU 전원 트랜스",
+  "block.basepower.fluid_drain": "드레인",
+  "block.basepower.fluid_discharge": "방전 화격자",
+  "block.basepower.fluid_storage_tank": "저장 탱크",
+  "item.basepower.fluid_storage_tank_item": "는 저장 탱크를 ",
+  "block.basepower.fluid_pipe": "파이프",
+  "block.basepower.item_conveyor": "컨베이어",
+  "block.basepower.item_filter_block": "블록 필터 컨베이어",
+  "block.basepower.item_filter_food": "식품 필터 컨베이어",
+  "block.basepower.item_filter_fuel": "연료 필터 컨베이어",
+  "block.basepower.item_filter_inventory": "필터 컨베이어",
+  "block.basepower.item_filter_ore": "광석 필터 컨베이어",
+  "block.basepower.item_filter_plant": "물만 주면 식물이 필터 컨베이어",
+  "block.basepower.item_filter_smelt": "노 필터 컨베이어",
+  "block.basepower.item_filter_overflow": "오버 플로우필터 컨베이어",
+  "block.basepower.steel_frame": "스틸 프레임",
+  "item.basepower.starch": "전분",
+  "item.basepower.bioplastic_ingot": "는 바이오 플라스틱 잉곳을 ",
+  "item.basepower.sprocket": "스프로킷",
+  "block.basepower.fluid_metal_tank": "금속 저장조",
+  "item.basepower.rotator_tool": "회전 도구",
+  "block.basepower.infinite_steam": "무한 증기 력",
+  "block.basepower.infinite_electricity": "무한 전력",
+  "block.basepower.infinite_quantum": "무한 양자 전력",
+  "block.basepower.crude_oil": "원유",
+  "block.basepower.still": "증류소",
+  "block.basepower.refined_oil": "정유",
+  "block.basepower.fluid_switch": "판막",
+  "block.basepower.converter_rf_steam": "증기-RF 전원 트랜스",
+  "block.basepower.converter_rf_electricity": "전기-RF 전원 트랜스",
+  "block.basepower.converter_rf_quantum": "양자-RF 전원 트랜스",
+  "block.basepower.converter_tr_electricity": "전기-EU 전원 트랜스",
+  "block.basepower.fluid_pipe_terminal": "파이프"
+}
diff --git a/src/main/resources/assets/basepower/lang/pt_br.json b/src/main/resources/assets/basepower/lang/pt_br.json
new file mode 100644
index 00000000..1cb084f9
--- /dev/null
+++ b/src/main/resources/assets/basepower/lang/pt_br.json
@@ -0,0 +1,75 @@
+{
+  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
+  "nei.basepower.recipehandler.shapelessfurnace.name": "Forno Grande (no forma)",
+  "nei.basepower.recipehandler.shapedfurnace.name": "Forno Grande (em forma)",
+  "tooltip.basepower.empty": "vazio",
+  "tooltip.basepower.buckets_of": "%x baldes de %y",
+  "itemGroup.basepower": "basePower",
+  "tile.basepower.fluid_drain.name": "Dreno",
+  "tile.basepower.fluid_discharge.name": "Grate Discharge",
+  "tile.basepower.fluid_storage_tank.name": "Tanque de armazenamento",
+  "item.basepower.fluid_storage_tank_item.name": "Tanque de armazenamento",
+  "tile.basepower.fluid_pipe.name": "Tubulação",
+  "tile.basepower.item_conveyor.name": "Transportador",
+  "tile.basepower.item_filter_block.name": "Bloquear filtro transportador",
+  "tile.basepower.item_filter_food.name": "Transportador Filtro de Alimentos",
+  "tile.basepower.item_filter_fuel.name": "Filtro de combustível Transportador",
+  "tile.basepower.item_filter_inventory.name": "Transportador Filtro",
+  "tile.basepower.item_filter_ore.name": "Ore Transportadora Filtro",
+  "tile.basepower.item_filter_plant.name": "Plantable Transportadora Filtro",
+  "tile.basepower.item_filter_smelt.name": "Fornalha Filtro Transportador",
+  "tile.basepower.item_filter_overflow.name": "Transbordamento Transportador Filtro",
+  "tile.basepower.steel_frame.name": "Armação de Aço",
+  "item.basepower.starch.name": "Amido",
+  "item.basepower.bioplastic_ingot.name": "Bioplastic lingote",
+  "item.basepower.sprocket.name": "Roda Dentada",
+  "tile.basepower.fluid_metal_tank.name": "Tanque de Armazenamento de Aço",
+  "item.basepower.rotator_tool.name": "Ferramenta de Rotação",
+  "tile.basepower.infinite_steam.name": "Energia a Vapor Infinito",
+  "tile.basepower.infinite_electricity.name": "Energia Elétrica Infinito",
+  "tile.basepower.infinite_quantum.name": "Energia Quantum Infinito",
+  "tile.basepower.crude_oil.name": "Óleo Cru",
+  "fluid.basepower.crude_oil": "Óleo Cru",
+  "item.bucket.crude_oil.name": "Balde de Óleo Cru",
+  "tile.basepower.still.name": "Destilaria",
+  "tile.basepower.refined_oil.name": "Óleo Refinado",
+  "fluid.basepower.refined_oil": "Óleo Refinado",
+  "item.bucket.refined_oil.name": "Balde de Óleo Refinado",
+  "tile.basepower.fluid_switch.name": "Válvula",
+  "tile.basepower.converter_rf_steam.name": "Vapor-RF Transformador",
+  "tile.basepower.converter_rf_electricity.name": "Electricidade-RF Transformador",
+  "tile.basepower.converter_rf_quantum.name": "Quantidade-RF Transformador",
+  "tile.basepower.converter_tr_electricity.name": "Electricidade-EU Transformador",
+  "block.basepower.fluid_drain": "Dreno",
+  "block.basepower.fluid_discharge": "Grate Discharge",
+  "block.basepower.fluid_storage_tank": "Tanque de armazenamento",
+  "item.basepower.fluid_storage_tank_item": "Tanque de armazenamento",
+  "block.basepower.fluid_pipe": "Tubulação",
+  "block.basepower.item_conveyor": "Transportador",
+  "block.basepower.item_filter_block": "Bloquear filtro transportador",
+  "block.basepower.item_filter_food": "Transportador Filtro de Alimentos",
+  "block.basepower.item_filter_fuel": "Filtro de combustível Transportador",
+  "block.basepower.item_filter_inventory": "Transportador Filtro",
+  "block.basepower.item_filter_ore": "Ore Transportadora Filtro",
+  "block.basepower.item_filter_plant": "Plantable Transportadora Filtro",
+  "block.basepower.item_filter_smelt": "Fornalha Filtro Transportador",
+  "block.basepower.item_filter_overflow": "Transbordamento Transportador Filtro",
+  "block.basepower.steel_frame": "Armação de Aço",
+  "item.basepower.starch": "Amido",
+  "item.basepower.bioplastic_ingot": "Bioplastic lingote",
+  "item.basepower.sprocket": "Roda Dentada",
+  "block.basepower.fluid_metal_tank": "Tanque de Armazenamento de Aço",
+  "item.basepower.rotator_tool": "Ferramenta de Rotação",
+  "block.basepower.infinite_steam": "Energia a Vapor Infinito",
+  "block.basepower.infinite_electricity": "Energia Elétrica Infinito",
+  "block.basepower.infinite_quantum": "Energia Quantum Infinito",
+  "block.basepower.crude_oil": "Óleo Cru",
+  "block.basepower.still": "Destilaria",
+  "block.basepower.refined_oil": "Óleo Refinado",
+  "block.basepower.fluid_switch": "Válvula",
+  "block.basepower.converter_rf_steam": "Vapor-RF Transformador",
+  "block.basepower.converter_rf_electricity": "Electricidade-RF Transformador",
+  "block.basepower.converter_rf_quantum": "Quantidade-RF Transformador",
+  "block.basepower.converter_tr_electricity": "Electricidade-EU Transformador",
+  "block.basepower.fluid_pipe_terminal": "Tubulação"
+}
diff --git a/src/main/resources/assets/basepower/lang/zh_cn.json b/src/main/resources/assets/basepower/lang/zh_cn.json
new file mode 100644
index 00000000..e432844a
--- /dev/null
+++ b/src/main/resources/assets/basepower/lang/zh_cn.json
@@ -0,0 +1,75 @@
+{
+  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
+  "nei.basepower.recipehandler.shapelessfurnace.name": "大熔炉(无形的)",
+  "nei.basepower.recipehandler.shapedfurnace.name": "大熔炉(有形的)",
+  "tooltip.basepower.empty": "空",
+  "tooltip.basepower.buckets_of": "%x水桶的%y",
+  "itemGroup.basepower": "basePower",
+  "tile.basepower.fluid_drain.name": "抽水机",
+  "tile.basepower.fluid_discharge.name": "排液器",
+  "tile.basepower.fluid_storage_tank.name": "便携式液体储罐",
+  "item.basepower.fluid_storage_tank_item.name": "便携式液体储罐",
+  "tile.basepower.fluid_pipe.name": "液体管",
+  "tile.basepower.item_conveyor.name": "输送机",
+  "tile.basepower.item_filter_block.name": "方块过滤输送机",
+  "tile.basepower.item_filter_food.name": "食品过滤输送机",
+  "tile.basepower.item_filter_fuel.name": "燃料过滤输送机",
+  "tile.basepower.item_filter_inventory.name": "选择过滤输送机",
+  "tile.basepower.item_filter_ore.name": "矿物过滤输送机",
+  "tile.basepower.item_filter_plant.name": "种子过滤输送机",
+  "tile.basepower.item_filter_smelt.name": "熔炉过滤输送机",
+  "tile.basepower.item_filter_overflow.name": "溢出过滤输送机",
+  "tile.basepower.steel_frame.name": "钢框架",
+  "item.basepower.starch.name": "淀粉",
+  "item.basepower.bioplastic_ingot.name": "生物塑料锭",
+  "item.basepower.sprocket.name": "链轮",
+  "tile.basepower.fluid_metal_tank.name": "金属液罐",
+  "item.basepower.rotator_tool.name": "旋转扳手",
+  "tile.basepower.infinite_steam.name": "无限蒸汽动力",
+  "tile.basepower.infinite_electricity.name": "无限电力",
+  "tile.basepower.infinite_quantum.name": "无限量子动力",
+  "tile.basepower.crude_oil.name": "原油",
+  "fluid.basepower.crude_oil": "原油",
+  "item.bucket.crude_oil.name": "原油桶",
+  "tile.basepower.still.name": "酒廠",
+  "tile.basepower.refined_oil.name": "成品油",
+  "fluid.basepower.refined_oil": "成品油",
+  "item.bucket.refined_oil.name": "成品油的桶",
+  "tile.basepower.fluid_switch.name": "閥",
+  "tile.basepower.converter_rf_steam.name": "蒸汽-RF 變壓器",
+  "tile.basepower.converter_rf_electricity.name": "電力-RF 變壓器",
+  "tile.basepower.converter_rf_quantum.name": "量子-RF 變壓器",
+  "tile.basepower.converter_tr_electricity.name": "電力-EU 變壓器",
+  "block.basepower.fluid_drain": "抽水机",
+  "block.basepower.fluid_discharge": "排液器",
+  "block.basepower.fluid_storage_tank": "便携式液体储罐",
+  "item.basepower.fluid_storage_tank_item": "便携式液体储罐",
+  "block.basepower.fluid_pipe": "液体管",
+  "block.basepower.item_conveyor": "输送机",
+  "block.basepower.item_filter_block": "方块过滤输送机",
+  "block.basepower.item_filter_food": "食品过滤输送机",
+  "block.basepower.item_filter_fuel": "燃料过滤输送机",
+  "block.basepower.item_filter_inventory": "选择过滤输送机",
+  "block.basepower.item_filter_ore": "矿物过滤输送机",
+  "block.basepower.item_filter_plant": "种子过滤输送机",
+  "block.basepower.item_filter_smelt": "熔炉过滤输送机",
+  "block.basepower.item_filter_overflow": "溢出过滤输送机",
+  "block.basepower.steel_frame": "钢框架",
+  "item.basepower.starch": "淀粉",
+  "item.basepower.bioplastic_ingot": "生物塑料锭",
+  "item.basepower.sprocket": "链轮",
+  "block.basepower.fluid_metal_tank": "金属液罐",
+  "item.basepower.rotator_tool": "旋转扳手",
+  "block.basepower.infinite_steam": "无限蒸汽动力",
+  "block.basepower.infinite_electricity": "无限电力",
+  "block.basepower.infinite_quantum": "无限量子动力",
+  "block.basepower.crude_oil": "原油",
+  "block.basepower.still": "酒廠",
+  "block.basepower.refined_oil": "成品油",
+  "block.basepower.fluid_switch": "閥",
+  "block.basepower.converter_rf_steam": "蒸汽-RF 變壓器",
+  "block.basepower.converter_rf_electricity": "電力-RF 變壓器",
+  "block.basepower.converter_rf_quantum": "量子-RF 變壓器",
+  "block.basepower.converter_tr_electricity": "電力-EU 變壓器",
+  "block.basepower.fluid_pipe_terminal": "液体管"
+}
diff --git a/src/main/resources/assets/poweradvantage/models/block/converter_rf_electricity.json b/src/main/resources/assets/basepower/models/block/converter_rf_electricity.json
similarity index 94%
rename from src/main/resources/assets/poweradvantage/models/block/converter_rf_electricity.json
rename to src/main/resources/assets/basepower/models/block/converter_rf_electricity.json
index 01a03f62..dbdf82ad 100644
--- a/src/main/resources/assets/poweradvantage/models/block/converter_rf_electricity.json
+++ b/src/main/resources/assets/basepower/models/block/converter_rf_electricity.json
@@ -1,10 +1,10 @@
 {
   "parent": "block/block",
   "textures": {
-        "face": "poweradvantage:blocks/steel_frame",
-        "core": "poweradvantage:materials/plastic",
-        "plug": "poweradvantage:blocks/filter_bottom",
-        "particle": "poweradvantage:materials/steel"
+        "face": "basepower:blocks/steel_frame",
+        "core": "basepower:materials/plastic",
+        "plug": "basepower:blocks/filter_bottom",
+        "particle": "basepower:materials/steel"
     },
     "elements": [
         {   
diff --git a/src/main/resources/assets/poweradvantage/models/block/converter_rf_quantum.json b/src/main/resources/assets/basepower/models/block/converter_rf_quantum.json
similarity index 96%
rename from src/main/resources/assets/poweradvantage/models/block/converter_rf_quantum.json
rename to src/main/resources/assets/basepower/models/block/converter_rf_quantum.json
index 5733e1cb..bd4bfd9b 100644
--- a/src/main/resources/assets/poweradvantage/models/block/converter_rf_quantum.json
+++ b/src/main/resources/assets/basepower/models/block/converter_rf_quantum.json
@@ -1,10 +1,10 @@
 {
   "parent": "block/block",
   "textures": {
-        "face": "poweradvantage:blocks/steel_frame",
+        "face": "basepower:blocks/steel_frame",
         "core": "minecraft:block/packed_ice",
-        "plug": "poweradvantage:blocks/filter_bottom",
-        "particle": "poweradvantage:materials/steel"
+        "plug": "basepower:blocks/filter_bottom",
+        "particle": "basepower:materials/steel"
     },
     "elements": [
         {   
diff --git a/src/main/resources/assets/poweradvantage/models/block/converter_rf_steam.json b/src/main/resources/assets/basepower/models/block/converter_rf_steam.json
similarity index 95%
rename from src/main/resources/assets/poweradvantage/models/block/converter_rf_steam.json
rename to src/main/resources/assets/basepower/models/block/converter_rf_steam.json
index a831250b..b1fe2c85 100644
--- a/src/main/resources/assets/poweradvantage/models/block/converter_rf_steam.json
+++ b/src/main/resources/assets/basepower/models/block/converter_rf_steam.json
@@ -1,10 +1,10 @@
 {
   "parent": "block/block",
   "textures": {
-        "face": "poweradvantage:blocks/steel_frame",
-        "core": "poweradvantage:materials/brass",
-        "plug": "poweradvantage:blocks/filter_bottom",
-        "particle": "poweradvantage:materials/steel"
+        "face": "basepower:blocks/steel_frame",
+        "core": "basepower:materials/brass",
+        "plug": "basepower:blocks/filter_bottom",
+        "particle": "basepower:materials/steel"
     },
     "elements": [
         {   
diff --git a/src/main/resources/assets/basepower/models/block/converter_tr_electricity.json b/src/main/resources/assets/basepower/models/block/converter_tr_electricity.json
new file mode 100644
index 00000000..102f1072
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/converter_tr_electricity.json
@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "basepower:blocks/techreborn_converter"
+  }
+}
diff --git a/src/main/resources/assets/poweradvantage/models/block/conveyor_base.json b/src/main/resources/assets/basepower/models/block/conveyor_base.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/conveyor_base.json
rename to src/main/resources/assets/basepower/models/block/conveyor_base.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/crude_oil.json b/src/main/resources/assets/basepower/models/block/crude_oil.json
similarity index 52%
rename from src/main/resources/assets/poweradvantage/models/block/crude_oil.json
rename to src/main/resources/assets/basepower/models/block/crude_oil.json
index 37af9662..7176ee6e 100644
--- a/src/main/resources/assets/poweradvantage/models/block/crude_oil.json
+++ b/src/main/resources/assets/basepower/models/block/crude_oil.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/block",
   "textures": {
-    "particle": "poweradvantage:blocks/crude_oil_still"
+    "particle": "basepower:blocks/crude_oil_still"
   }
 }
diff --git a/src/main/resources/assets/basepower/models/block/fluid_discharge.json b/src/main/resources/assets/basepower/models/block/fluid_discharge.json
new file mode 100644
index 00000000..2ee79703
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/fluid_discharge.json
@@ -0,0 +1,8 @@
+{
+    "parent": "block/cube_bottom_top",
+    "textures": {
+        "top": "basepower:blocks/fluid_discharge_side",
+        "bottom": "basepower:blocks/fluid_discharge_face",
+        "side": "basepower:blocks/fluid_discharge_side"
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/block/fluid_drain.json b/src/main/resources/assets/basepower/models/block/fluid_drain.json
new file mode 100644
index 00000000..b076dd00
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/fluid_drain.json
@@ -0,0 +1,8 @@
+{
+    "parent": "block/cube_bottom_top",
+    "textures": {
+        "top": "basepower:blocks/fluid_drain_face",
+        "bottom": "basepower:blocks/fluid_drain_side",
+        "side": "basepower:blocks/fluid_drain_side"
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_metal_tank.json b/src/main/resources/assets/basepower/models/block/fluid_metal_tank.json
similarity index 94%
rename from src/main/resources/assets/poweradvantage/models/block/fluid_metal_tank.json
rename to src/main/resources/assets/basepower/models/block/fluid_metal_tank.json
index 33428415..85fc4abf 100644
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_metal_tank.json
+++ b/src/main/resources/assets/basepower/models/block/fluid_metal_tank.json
@@ -1,10 +1,10 @@
 {
   "parent": "block/block",
   "textures": {
-        "top": "poweradvantage:blocks/fluid_metal_tank_top",
-        "bottom": "poweradvantage:blocks/fluid_metal_tank_top",
-        "side": "poweradvantage:blocks/fluid_metal_tank_side",
-        "particle": "poweradvantage:blocks/fluid_metal_tank_side"
+        "top": "basepower:blocks/fluid_metal_tank_top",
+        "bottom": "basepower:blocks/fluid_metal_tank_top",
+        "side": "basepower:blocks/fluid_metal_tank_side",
+        "particle": "basepower:blocks/fluid_metal_tank_side"
     },
     "elements": [
         {   
diff --git a/src/main/resources/assets/basepower/models/block/fluid_pipe_0.json b/src/main/resources/assets/basepower/models/block/fluid_pipe_0.json
new file mode 100644
index 00000000..65e3862c
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/fluid_pipe_0.json
@@ -0,0 +1,7 @@
+{
+  "parent": "basepower:block/pipe4_0",
+    "textures": {
+        "texture": "basepower:blocks/fluid_pipe",
+        "particle": "basepower:materials/iron"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/fluid_pipe_densuw.json b/src/main/resources/assets/basepower/models/block/fluid_pipe_densuw.json
new file mode 100644
index 00000000..3de01b0f
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/fluid_pipe_densuw.json
@@ -0,0 +1,7 @@
+{
+  "parent": "basepower:block/pipe4_densuw",
+    "textures": {
+        "texture": "basepower:blocks/fluid_pipe",
+        "particle": "basepower:materials/iron"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/fluid_pipe_desuw.json b/src/main/resources/assets/basepower/models/block/fluid_pipe_desuw.json
new file mode 100644
index 00000000..c61fadb9
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/fluid_pipe_desuw.json
@@ -0,0 +1,7 @@
+{
+  "parent": "basepower:block/pipe4_desuw",
+    "textures": {
+        "texture": "basepower:blocks/fluid_pipe",
+        "particle": "basepower:materials/iron"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/fluid_pipe_dnu.json b/src/main/resources/assets/basepower/models/block/fluid_pipe_dnu.json
new file mode 100644
index 00000000..cfb26b68
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/fluid_pipe_dnu.json
@@ -0,0 +1,7 @@
+{
+  "parent": "basepower:block/pipe4_dnu",
+    "textures": {
+        "texture": "basepower:blocks/fluid_pipe",
+        "particle": "basepower:materials/iron"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/fluid_pipe_ensw.json b/src/main/resources/assets/basepower/models/block/fluid_pipe_ensw.json
new file mode 100644
index 00000000..d0f8c0c8
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/fluid_pipe_ensw.json
@@ -0,0 +1,7 @@
+{
+  "parent": "basepower:block/pipe4_ensw",
+    "textures": {
+        "texture": "basepower:blocks/fluid_pipe",
+        "particle": "basepower:materials/iron"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/fluid_pipe_n.json b/src/main/resources/assets/basepower/models/block/fluid_pipe_n.json
new file mode 100644
index 00000000..2401588e
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/fluid_pipe_n.json
@@ -0,0 +1,7 @@
+{
+  "parent": "basepower:block/pipe4_n",
+    "textures": {
+        "texture": "basepower:blocks/fluid_pipe",
+        "particle": "basepower:materials/iron"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/fluid_pipe_ns.json b/src/main/resources/assets/basepower/models/block/fluid_pipe_ns.json
new file mode 100644
index 00000000..b2dc847d
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/fluid_pipe_ns.json
@@ -0,0 +1,7 @@
+{
+  "parent": "basepower:block/pipe4_ns",
+    "textures": {
+        "texture": "basepower:blocks/fluid_pipe",
+        "particle": "basepower:materials/iron"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/fluid_pipe_nsuw.json b/src/main/resources/assets/basepower/models/block/fluid_pipe_nsuw.json
new file mode 100644
index 00000000..eeaf1cc9
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/fluid_pipe_nsuw.json
@@ -0,0 +1,7 @@
+{
+  "parent": "basepower:block/pipe4_nsuw",
+    "textures": {
+        "texture": "basepower:blocks/fluid_pipe",
+        "particle": "basepower:materials/iron"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/fluid_pipe_nsw.json b/src/main/resources/assets/basepower/models/block/fluid_pipe_nsw.json
new file mode 100644
index 00000000..75c2bf60
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/fluid_pipe_nsw.json
@@ -0,0 +1,7 @@
+{
+  "parent": "basepower:block/pipe4_nsw",
+    "textures": {
+        "texture": "basepower:blocks/fluid_pipe",
+        "particle": "basepower:materials/iron"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/fluid_pipe_nuw.json b/src/main/resources/assets/basepower/models/block/fluid_pipe_nuw.json
new file mode 100644
index 00000000..4dba871f
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/fluid_pipe_nuw.json
@@ -0,0 +1,7 @@
+{
+  "parent": "basepower:block/pipe4_nuw",
+    "textures": {
+        "texture": "basepower:blocks/fluid_pipe",
+        "particle": "basepower:materials/iron"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/fluid_pipe_nw.json b/src/main/resources/assets/basepower/models/block/fluid_pipe_nw.json
new file mode 100644
index 00000000..a7aa067c
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/fluid_pipe_nw.json
@@ -0,0 +1,7 @@
+{
+  "parent": "basepower:block/pipe4_nw",
+    "textures": {
+        "texture": "basepower:blocks/fluid_pipe",
+        "particle": "basepower:materials/iron"
+    }
+}
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_storage_tank.json b/src/main/resources/assets/basepower/models/block/fluid_storage_tank.json
similarity index 97%
rename from src/main/resources/assets/poweradvantage/models/block/fluid_storage_tank.json
rename to src/main/resources/assets/basepower/models/block/fluid_storage_tank.json
index c8daff39..70f1e281 100644
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_storage_tank.json
+++ b/src/main/resources/assets/basepower/models/block/fluid_storage_tank.json
@@ -1,9 +1,9 @@
 {
   "parent": "block/block",
   "textures": {
-        "walls": "poweradvantage:materials/plastic",
-        "supports": "poweradvantage:materials/steel",
-        "particle": "poweradvantage:materials/plastic"
+        "walls": "basepower:materials/plastic",
+        "supports": "basepower:materials/steel",
+        "particle": "basepower:materials/plastic"
     },
     "elements": [
         {   
diff --git a/src/main/resources/assets/basepower/models/block/fluid_switch_off.json b/src/main/resources/assets/basepower/models/block/fluid_switch_off.json
new file mode 100644
index 00000000..53991a62
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/fluid_switch_off.json
@@ -0,0 +1,7 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "basepower:blocks/fluid_switch_off",
+        "particle": "basepower:materials/steel"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/fluid_switch_on.json b/src/main/resources/assets/basepower/models/block/fluid_switch_on.json
new file mode 100644
index 00000000..b132b591
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/fluid_switch_on.json
@@ -0,0 +1,7 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "basepower:blocks/fluid_switch_on",
+        "particle": "basepower:materials/steel"
+    }
+}
diff --git a/src/main/resources/assets/poweradvantage/models/block/infinite_electricity.json b/src/main/resources/assets/basepower/models/block/infinite_electricity.json
similarity index 52%
rename from src/main/resources/assets/poweradvantage/models/block/infinite_electricity.json
rename to src/main/resources/assets/basepower/models/block/infinite_electricity.json
index 40f79af8..83005105 100644
--- a/src/main/resources/assets/poweradvantage/models/block/infinite_electricity.json
+++ b/src/main/resources/assets/basepower/models/block/infinite_electricity.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "poweradvantage:materials/metal_panel"
+        "all": "basepower:materials/metal_panel"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/block/infinite_quantum.json b/src/main/resources/assets/basepower/models/block/infinite_quantum.json
similarity index 52%
rename from src/main/resources/assets/poweradvantage/models/block/infinite_quantum.json
rename to src/main/resources/assets/basepower/models/block/infinite_quantum.json
index 40f79af8..83005105 100644
--- a/src/main/resources/assets/poweradvantage/models/block/infinite_quantum.json
+++ b/src/main/resources/assets/basepower/models/block/infinite_quantum.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "poweradvantage:materials/metal_panel"
+        "all": "basepower:materials/metal_panel"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/block/infinite_steam.json b/src/main/resources/assets/basepower/models/block/infinite_steam.json
similarity index 52%
rename from src/main/resources/assets/poweradvantage/models/block/infinite_steam.json
rename to src/main/resources/assets/basepower/models/block/infinite_steam.json
index 40f79af8..83005105 100644
--- a/src/main/resources/assets/poweradvantage/models/block/infinite_steam.json
+++ b/src/main/resources/assets/basepower/models/block/infinite_steam.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "poweradvantage:materials/metal_panel"
+        "all": "basepower:materials/metal_panel"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/block/item_conveyor.json b/src/main/resources/assets/basepower/models/block/item_conveyor.json
new file mode 100644
index 00000000..9da9824c
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/item_conveyor.json
@@ -0,0 +1,10 @@
+{
+    "parent": "basepower:block/conveyor_base",
+    "textures": {
+        "top": "basepower:blocks/item_conveyor_top",
+        "bottom": "basepower:blocks/item_conveyor_top",
+        "side": "basepower:blocks/item_conveyor_side",
+        "end": "basepower:blocks/item_conveyor_end",
+        "rim": "basepower:materials/steel"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/item_filter_block.json b/src/main/resources/assets/basepower/models/block/item_filter_block.json
new file mode 100644
index 00000000..fadbf83d
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/item_filter_block.json
@@ -0,0 +1,10 @@
+{
+    "parent": "basepower:block/conveyor_base",
+    "textures": {
+        "top": "basepower:blocks/item_conveyor_top",
+        "bottom": "basepower:blocks/filter_bottom",
+        "side": "basepower:blocks/filter_side_block",
+        "end": "basepower:blocks/item_conveyor_end",
+        "rim": "basepower:materials/steel"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/item_filter_food.json b/src/main/resources/assets/basepower/models/block/item_filter_food.json
new file mode 100644
index 00000000..67b14ad3
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/item_filter_food.json
@@ -0,0 +1,10 @@
+{
+    "parent": "basepower:block/conveyor_base",
+    "textures": {
+        "top": "basepower:blocks/item_conveyor_top",
+        "bottom": "basepower:blocks/filter_bottom",
+        "side": "basepower:blocks/filter_side_food",
+        "end": "basepower:blocks/item_conveyor_end",
+        "rim": "basepower:materials/steel"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/item_filter_fuel.json b/src/main/resources/assets/basepower/models/block/item_filter_fuel.json
new file mode 100644
index 00000000..41c8e925
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/item_filter_fuel.json
@@ -0,0 +1,10 @@
+{
+    "parent": "basepower:block/conveyor_base",
+    "textures": {
+        "top": "basepower:blocks/item_conveyor_top",
+        "bottom": "basepower:blocks/filter_bottom",
+        "side": "basepower:blocks/filter_side_fuel",
+        "end": "basepower:blocks/item_conveyor_end",
+        "rim": "basepower:materials/steel"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/item_filter_inventory.json b/src/main/resources/assets/basepower/models/block/item_filter_inventory.json
new file mode 100644
index 00000000..cbec1c3c
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/item_filter_inventory.json
@@ -0,0 +1,10 @@
+{
+    "parent": "basepower:block/conveyor_base",
+    "textures": {
+        "top": "basepower:blocks/item_conveyor_top",
+        "bottom": "basepower:blocks/filter_bottom",
+        "side": "basepower:blocks/filter_side_inventory",
+        "end": "basepower:blocks/item_conveyor_end",
+        "rim": "basepower:materials/steel"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/item_filter_ore.json b/src/main/resources/assets/basepower/models/block/item_filter_ore.json
new file mode 100644
index 00000000..040a4fd8
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/item_filter_ore.json
@@ -0,0 +1,10 @@
+{
+    "parent": "basepower:block/conveyor_base",
+    "textures": {
+        "top": "basepower:blocks/item_conveyor_top",
+        "bottom": "basepower:blocks/filter_bottom",
+        "side": "basepower:blocks/filter_side_ore",
+        "end": "basepower:blocks/item_conveyor_end",
+        "rim": "basepower:materials/steel"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/item_filter_overflow.json b/src/main/resources/assets/basepower/models/block/item_filter_overflow.json
new file mode 100644
index 00000000..4f71669f
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/item_filter_overflow.json
@@ -0,0 +1,10 @@
+{
+    "parent": "basepower:block/conveyor_base",
+    "textures": {
+        "top": "basepower:blocks/item_conveyor_top",
+        "bottom": "basepower:blocks/filter_bottom",
+        "side": "basepower:blocks/filter_side_overflow",
+        "end": "basepower:blocks/item_conveyor_end",
+        "rim": "basepower:materials/steel"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/item_filter_plant.json b/src/main/resources/assets/basepower/models/block/item_filter_plant.json
new file mode 100644
index 00000000..1e097b16
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/item_filter_plant.json
@@ -0,0 +1,10 @@
+{
+    "parent": "basepower:block/conveyor_base",
+    "textures": {
+        "top": "basepower:blocks/item_conveyor_top",
+        "bottom": "basepower:blocks/filter_bottom",
+        "side": "basepower:blocks/filter_side_plantable",
+        "end": "basepower:blocks/item_conveyor_end",
+        "rim": "basepower:materials/steel"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/block/item_filter_smelt.json b/src/main/resources/assets/basepower/models/block/item_filter_smelt.json
new file mode 100644
index 00000000..ee436335
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/block/item_filter_smelt.json
@@ -0,0 +1,10 @@
+{
+    "parent": "basepower:block/conveyor_base",
+    "textures": {
+        "top": "basepower:blocks/item_conveyor_top",
+        "bottom": "basepower:blocks/filter_bottom",
+        "side": "basepower:blocks/filter_side_smeltable",
+        "end": "basepower:blocks/item_conveyor_end",
+        "rim": "basepower:materials/steel"
+    }
+}
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe1_0.json b/src/main/resources/assets/basepower/models/block/pipe1_0.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe1_0.json
rename to src/main/resources/assets/basepower/models/block/pipe1_0.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe1_densuw.json b/src/main/resources/assets/basepower/models/block/pipe1_densuw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe1_densuw.json
rename to src/main/resources/assets/basepower/models/block/pipe1_densuw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe1_desuw.json b/src/main/resources/assets/basepower/models/block/pipe1_desuw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe1_desuw.json
rename to src/main/resources/assets/basepower/models/block/pipe1_desuw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe1_dnu.json b/src/main/resources/assets/basepower/models/block/pipe1_dnu.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe1_dnu.json
rename to src/main/resources/assets/basepower/models/block/pipe1_dnu.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe1_ensw.json b/src/main/resources/assets/basepower/models/block/pipe1_ensw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe1_ensw.json
rename to src/main/resources/assets/basepower/models/block/pipe1_ensw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe1_n.json b/src/main/resources/assets/basepower/models/block/pipe1_n.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe1_n.json
rename to src/main/resources/assets/basepower/models/block/pipe1_n.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe1_ns.json b/src/main/resources/assets/basepower/models/block/pipe1_ns.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe1_ns.json
rename to src/main/resources/assets/basepower/models/block/pipe1_ns.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe1_nsuw.json b/src/main/resources/assets/basepower/models/block/pipe1_nsuw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe1_nsuw.json
rename to src/main/resources/assets/basepower/models/block/pipe1_nsuw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe1_nsw.json b/src/main/resources/assets/basepower/models/block/pipe1_nsw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe1_nsw.json
rename to src/main/resources/assets/basepower/models/block/pipe1_nsw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe1_nuw.json b/src/main/resources/assets/basepower/models/block/pipe1_nuw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe1_nuw.json
rename to src/main/resources/assets/basepower/models/block/pipe1_nuw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe1_nw.json b/src/main/resources/assets/basepower/models/block/pipe1_nw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe1_nw.json
rename to src/main/resources/assets/basepower/models/block/pipe1_nw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe2_0.json b/src/main/resources/assets/basepower/models/block/pipe2_0.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe2_0.json
rename to src/main/resources/assets/basepower/models/block/pipe2_0.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe2_densuw.json b/src/main/resources/assets/basepower/models/block/pipe2_densuw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe2_densuw.json
rename to src/main/resources/assets/basepower/models/block/pipe2_densuw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe2_desuw.json b/src/main/resources/assets/basepower/models/block/pipe2_desuw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe2_desuw.json
rename to src/main/resources/assets/basepower/models/block/pipe2_desuw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe2_dnu.json b/src/main/resources/assets/basepower/models/block/pipe2_dnu.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe2_dnu.json
rename to src/main/resources/assets/basepower/models/block/pipe2_dnu.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe2_ensw.json b/src/main/resources/assets/basepower/models/block/pipe2_ensw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe2_ensw.json
rename to src/main/resources/assets/basepower/models/block/pipe2_ensw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe2_n.json b/src/main/resources/assets/basepower/models/block/pipe2_n.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe2_n.json
rename to src/main/resources/assets/basepower/models/block/pipe2_n.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe2_ns.json b/src/main/resources/assets/basepower/models/block/pipe2_ns.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe2_ns.json
rename to src/main/resources/assets/basepower/models/block/pipe2_ns.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe2_nsuw.json b/src/main/resources/assets/basepower/models/block/pipe2_nsuw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe2_nsuw.json
rename to src/main/resources/assets/basepower/models/block/pipe2_nsuw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe2_nsw.json b/src/main/resources/assets/basepower/models/block/pipe2_nsw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe2_nsw.json
rename to src/main/resources/assets/basepower/models/block/pipe2_nsw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe2_nuw.json b/src/main/resources/assets/basepower/models/block/pipe2_nuw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe2_nuw.json
rename to src/main/resources/assets/basepower/models/block/pipe2_nuw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe2_nw.json b/src/main/resources/assets/basepower/models/block/pipe2_nw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe2_nw.json
rename to src/main/resources/assets/basepower/models/block/pipe2_nw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe3_0.json b/src/main/resources/assets/basepower/models/block/pipe3_0.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe3_0.json
rename to src/main/resources/assets/basepower/models/block/pipe3_0.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe3_densuw.json b/src/main/resources/assets/basepower/models/block/pipe3_densuw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe3_densuw.json
rename to src/main/resources/assets/basepower/models/block/pipe3_densuw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe3_desuw.json b/src/main/resources/assets/basepower/models/block/pipe3_desuw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe3_desuw.json
rename to src/main/resources/assets/basepower/models/block/pipe3_desuw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe3_dnu.json b/src/main/resources/assets/basepower/models/block/pipe3_dnu.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe3_dnu.json
rename to src/main/resources/assets/basepower/models/block/pipe3_dnu.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe3_ensw.json b/src/main/resources/assets/basepower/models/block/pipe3_ensw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe3_ensw.json
rename to src/main/resources/assets/basepower/models/block/pipe3_ensw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe3_n.json b/src/main/resources/assets/basepower/models/block/pipe3_n.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe3_n.json
rename to src/main/resources/assets/basepower/models/block/pipe3_n.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe3_ns.json b/src/main/resources/assets/basepower/models/block/pipe3_ns.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe3_ns.json
rename to src/main/resources/assets/basepower/models/block/pipe3_ns.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe3_nsuw.json b/src/main/resources/assets/basepower/models/block/pipe3_nsuw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe3_nsuw.json
rename to src/main/resources/assets/basepower/models/block/pipe3_nsuw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe3_nsw.json b/src/main/resources/assets/basepower/models/block/pipe3_nsw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe3_nsw.json
rename to src/main/resources/assets/basepower/models/block/pipe3_nsw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe3_nuw.json b/src/main/resources/assets/basepower/models/block/pipe3_nuw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe3_nuw.json
rename to src/main/resources/assets/basepower/models/block/pipe3_nuw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe3_nw.json b/src/main/resources/assets/basepower/models/block/pipe3_nw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe3_nw.json
rename to src/main/resources/assets/basepower/models/block/pipe3_nw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe4_0.json b/src/main/resources/assets/basepower/models/block/pipe4_0.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe4_0.json
rename to src/main/resources/assets/basepower/models/block/pipe4_0.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe4_densuw.json b/src/main/resources/assets/basepower/models/block/pipe4_densuw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe4_densuw.json
rename to src/main/resources/assets/basepower/models/block/pipe4_densuw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe4_desuw.json b/src/main/resources/assets/basepower/models/block/pipe4_desuw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe4_desuw.json
rename to src/main/resources/assets/basepower/models/block/pipe4_desuw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe4_dnu.json b/src/main/resources/assets/basepower/models/block/pipe4_dnu.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe4_dnu.json
rename to src/main/resources/assets/basepower/models/block/pipe4_dnu.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe4_ensw.json b/src/main/resources/assets/basepower/models/block/pipe4_ensw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe4_ensw.json
rename to src/main/resources/assets/basepower/models/block/pipe4_ensw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe4_n.json b/src/main/resources/assets/basepower/models/block/pipe4_n.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe4_n.json
rename to src/main/resources/assets/basepower/models/block/pipe4_n.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe4_ns.json b/src/main/resources/assets/basepower/models/block/pipe4_ns.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe4_ns.json
rename to src/main/resources/assets/basepower/models/block/pipe4_ns.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe4_nsuw.json b/src/main/resources/assets/basepower/models/block/pipe4_nsuw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe4_nsuw.json
rename to src/main/resources/assets/basepower/models/block/pipe4_nsuw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe4_nsw.json b/src/main/resources/assets/basepower/models/block/pipe4_nsw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe4_nsw.json
rename to src/main/resources/assets/basepower/models/block/pipe4_nsw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe4_nuw.json b/src/main/resources/assets/basepower/models/block/pipe4_nuw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe4_nuw.json
rename to src/main/resources/assets/basepower/models/block/pipe4_nuw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/pipe4_nw.json b/src/main/resources/assets/basepower/models/block/pipe4_nw.json
similarity index 100%
rename from src/main/resources/assets/poweradvantage/models/block/pipe4_nw.json
rename to src/main/resources/assets/basepower/models/block/pipe4_nw.json
diff --git a/src/main/resources/assets/poweradvantage/models/block/refined_oil.json b/src/main/resources/assets/basepower/models/block/refined_oil.json
similarity index 51%
rename from src/main/resources/assets/poweradvantage/models/block/refined_oil.json
rename to src/main/resources/assets/basepower/models/block/refined_oil.json
index 81449e23..28f83b65 100644
--- a/src/main/resources/assets/poweradvantage/models/block/refined_oil.json
+++ b/src/main/resources/assets/basepower/models/block/refined_oil.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/block",
   "textures": {
-    "particle": "poweradvantage:blocks/refined_oil_still"
+    "particle": "basepower:blocks/refined_oil_still"
   }
 }
diff --git a/src/main/resources/assets/poweradvantage/models/block/steel_frame.json b/src/main/resources/assets/basepower/models/block/steel_frame.json
similarity index 94%
rename from src/main/resources/assets/poweradvantage/models/block/steel_frame.json
rename to src/main/resources/assets/basepower/models/block/steel_frame.json
index 6e5ef049..a423e34b 100644
--- a/src/main/resources/assets/poweradvantage/models/block/steel_frame.json
+++ b/src/main/resources/assets/basepower/models/block/steel_frame.json
@@ -1,8 +1,8 @@
 {
   "parent": "block/block",
   "textures": {
-        "face": "poweradvantage:blocks/steel_frame",
-        "particle": "poweradvantage:materials/steel"
+        "face": "basepower:blocks/steel_frame",
+        "particle": "basepower:materials/steel"
     },
     "elements": [
         {   
diff --git a/src/main/resources/assets/poweradvantage/models/block/still_off.json b/src/main/resources/assets/basepower/models/block/still_off.json
similarity index 96%
rename from src/main/resources/assets/poweradvantage/models/block/still_off.json
rename to src/main/resources/assets/basepower/models/block/still_off.json
index 69edeb89..6b62bcb8 100644
--- a/src/main/resources/assets/poweradvantage/models/block/still_off.json
+++ b/src/main/resources/assets/basepower/models/block/still_off.json
@@ -4,8 +4,8 @@
         "top": "minecraft:block/furnace_top",
         "front": "minecraft:block/furnace_front",
         "side": "minecraft:block/furnace_side",
-        "tank": "poweradvantage:materials/steel",
-        "particle": "poweradvantage:materials/steel"
+        "tank": "basepower:materials/steel",
+        "particle": "basepower:materials/steel"
     },
     "elements": [
         {   
diff --git a/src/main/resources/assets/poweradvantage/models/block/still_on.json b/src/main/resources/assets/basepower/models/block/still_on.json
similarity index 96%
rename from src/main/resources/assets/poweradvantage/models/block/still_on.json
rename to src/main/resources/assets/basepower/models/block/still_on.json
index ac5eb132..0296244d 100644
--- a/src/main/resources/assets/poweradvantage/models/block/still_on.json
+++ b/src/main/resources/assets/basepower/models/block/still_on.json
@@ -4,8 +4,8 @@
         "top": "minecraft:block/furnace_top",
         "front": "minecraft:block/furnace_front_on",
         "side": "minecraft:block/furnace_side",
-        "tank": "poweradvantage:materials/steel",
-        "particle": "poweradvantage:materials/steel"
+        "tank": "basepower:materials/steel",
+        "particle": "basepower:materials/steel"
     },
     "elements": [
         {   
diff --git a/src/main/resources/assets/basepower/models/item/bioplastic_ingot.json b/src/main/resources/assets/basepower/models/item/bioplastic_ingot.json
new file mode 100644
index 00000000..96b8cfd8
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/bioplastic_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+    "textures": {
+        "layer0": "basepower:items/bioplastic_ingot"
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/bucket_crude_oil.json b/src/main/resources/assets/basepower/models/item/bucket_crude_oil.json
new file mode 100644
index 00000000..42995bd5
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/bucket_crude_oil.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+    "textures": {
+        "layer0": "basepower:items/bucket_crude_oil"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/item/bucket_refined_oil.json b/src/main/resources/assets/basepower/models/item/bucket_refined_oil.json
new file mode 100644
index 00000000..30287d81
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/bucket_refined_oil.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+    "textures": {
+        "layer0": "basepower:items/bucket_refined_oil"
+    }
+}
diff --git a/src/main/resources/assets/basepower/models/item/converter_rf_electricity.json b/src/main/resources/assets/basepower/models/item/converter_rf_electricity.json
new file mode 100644
index 00000000..8016dd44
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/converter_rf_electricity.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/converter_rf_electricity"
+}
diff --git a/src/main/resources/assets/basepower/models/item/converter_rf_quantum.json b/src/main/resources/assets/basepower/models/item/converter_rf_quantum.json
new file mode 100644
index 00000000..20bffbeb
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/converter_rf_quantum.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/converter_rf_quantum"
+}
diff --git a/src/main/resources/assets/basepower/models/item/converter_rf_steam.json b/src/main/resources/assets/basepower/models/item/converter_rf_steam.json
new file mode 100644
index 00000000..77e6147c
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/converter_rf_steam.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/converter_rf_steam"
+}
diff --git a/src/main/resources/assets/basepower/models/item/converter_tr_electricity.json b/src/main/resources/assets/basepower/models/item/converter_tr_electricity.json
new file mode 100644
index 00000000..8c54bb8f
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/converter_tr_electricity.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/converter_tr_electricity"
+}
diff --git a/src/main/resources/assets/basepower/models/item/crude_oil.json b/src/main/resources/assets/basepower/models/item/crude_oil.json
new file mode 100644
index 00000000..38fee3aa
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/crude_oil.json
@@ -0,0 +1,3 @@
+{
+  "parent": "basepower:item/crude_oil_bucket"
+}
diff --git a/src/main/resources/assets/poweradvantage/models/item/crude_oil_bucket.json b/src/main/resources/assets/basepower/models/item/crude_oil_bucket.json
similarity index 54%
rename from src/main/resources/assets/poweradvantage/models/item/crude_oil_bucket.json
rename to src/main/resources/assets/basepower/models/item/crude_oil_bucket.json
index 9e70d56f..e227a3d5 100644
--- a/src/main/resources/assets/poweradvantage/models/item/crude_oil_bucket.json
+++ b/src/main/resources/assets/basepower/models/item/crude_oil_bucket.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "poweradvantage:items/bucket_crude_oil"
+    "layer0": "basepower:items/bucket_crude_oil"
   }
 }
diff --git a/src/main/resources/assets/basepower/models/item/fluid_discharge.json b/src/main/resources/assets/basepower/models/item/fluid_discharge.json
new file mode 100644
index 00000000..d9af1467
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/fluid_discharge.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/fluid_discharge"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/fluid_drain.json b/src/main/resources/assets/basepower/models/item/fluid_drain.json
new file mode 100644
index 00000000..60de5a6c
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/fluid_drain.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/fluid_drain"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/fluid_metal_tank.json b/src/main/resources/assets/basepower/models/item/fluid_metal_tank.json
new file mode 100644
index 00000000..cc8c6058
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/fluid_metal_tank.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/fluid_metal_tank"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/fluid_pipe.json b/src/main/resources/assets/basepower/models/item/fluid_pipe.json
new file mode 100644
index 00000000..2cfca627
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/fluid_pipe.json
@@ -0,0 +1,4 @@
+{
+    "parent": "basepower:block/fluid_pipe_ns",
+    "ambientocclusion": false
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/fluid_pipe_terminal.json b/src/main/resources/assets/basepower/models/item/fluid_pipe_terminal.json
new file mode 100644
index 00000000..2cfca627
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/fluid_pipe_terminal.json
@@ -0,0 +1,4 @@
+{
+    "parent": "basepower:block/fluid_pipe_ns",
+    "ambientocclusion": false
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/fluid_storage_tank.json b/src/main/resources/assets/basepower/models/item/fluid_storage_tank.json
new file mode 100644
index 00000000..33831e30
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/fluid_storage_tank.json
@@ -0,0 +1,4 @@
+{
+    "parent": "basepower:block/fluid_storage_tank",
+    "ambientocclusion": false
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/fluid_switch.json b/src/main/resources/assets/basepower/models/item/fluid_switch.json
new file mode 100644
index 00000000..e62bd15b
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/fluid_switch.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/fluid_switch_on"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/infinite_electricity.json b/src/main/resources/assets/basepower/models/item/infinite_electricity.json
new file mode 100644
index 00000000..a1abf245
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/infinite_electricity.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/infinite_electricity"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/infinite_quantum.json b/src/main/resources/assets/basepower/models/item/infinite_quantum.json
new file mode 100644
index 00000000..53b56ddd
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/infinite_quantum.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/infinite_quantum"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/infinite_steam.json b/src/main/resources/assets/basepower/models/item/infinite_steam.json
new file mode 100644
index 00000000..e8f9061e
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/infinite_steam.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/infinite_steam"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/item_conveyor.json b/src/main/resources/assets/basepower/models/item/item_conveyor.json
new file mode 100644
index 00000000..f042d83c
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/item_conveyor.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/item_conveyor"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/item_filter_block.json b/src/main/resources/assets/basepower/models/item/item_filter_block.json
new file mode 100644
index 00000000..e820da77
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/item_filter_block.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/item_filter_block"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/item_filter_food.json b/src/main/resources/assets/basepower/models/item/item_filter_food.json
new file mode 100644
index 00000000..96db616c
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/item_filter_food.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/item_filter_food"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/item_filter_fuel.json b/src/main/resources/assets/basepower/models/item/item_filter_fuel.json
new file mode 100644
index 00000000..1399fb3c
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/item_filter_fuel.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/item_filter_fuel"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/item_filter_inventory.json b/src/main/resources/assets/basepower/models/item/item_filter_inventory.json
new file mode 100644
index 00000000..03a135df
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/item_filter_inventory.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/item_filter_inventory"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/item_filter_ore.json b/src/main/resources/assets/basepower/models/item/item_filter_ore.json
new file mode 100644
index 00000000..7a44c344
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/item_filter_ore.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/item_filter_ore"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/item_filter_overflow.json b/src/main/resources/assets/basepower/models/item/item_filter_overflow.json
new file mode 100644
index 00000000..caac6427
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/item_filter_overflow.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/item_filter_overflow"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/item_filter_plant.json b/src/main/resources/assets/basepower/models/item/item_filter_plant.json
new file mode 100644
index 00000000..40beb7ab
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/item_filter_plant.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/item_filter_plant"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/item_filter_smelt.json b/src/main/resources/assets/basepower/models/item/item_filter_smelt.json
new file mode 100644
index 00000000..5386d841
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/item_filter_smelt.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/item_filter_smelt"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/refined_oil.json b/src/main/resources/assets/basepower/models/item/refined_oil.json
new file mode 100644
index 00000000..a79e57e9
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/refined_oil.json
@@ -0,0 +1,3 @@
+{
+  "parent": "basepower:item/refined_oil_bucket"
+}
diff --git a/src/main/resources/assets/poweradvantage/models/item/refined_oil_bucket.json b/src/main/resources/assets/basepower/models/item/refined_oil_bucket.json
similarity index 53%
rename from src/main/resources/assets/poweradvantage/models/item/refined_oil_bucket.json
rename to src/main/resources/assets/basepower/models/item/refined_oil_bucket.json
index 48c1456a..1b69ba5d 100644
--- a/src/main/resources/assets/poweradvantage/models/item/refined_oil_bucket.json
+++ b/src/main/resources/assets/basepower/models/item/refined_oil_bucket.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "poweradvantage:items/bucket_refined_oil"
+    "layer0": "basepower:items/bucket_refined_oil"
   }
 }
diff --git a/src/main/resources/assets/poweradvantage/models/item/rotator_tool.json b/src/main/resources/assets/basepower/models/item/rotator_tool.json
similarity index 50%
rename from src/main/resources/assets/poweradvantage/models/item/rotator_tool.json
rename to src/main/resources/assets/basepower/models/item/rotator_tool.json
index 498abaf3..e096fa4c 100644
--- a/src/main/resources/assets/poweradvantage/models/item/rotator_tool.json
+++ b/src/main/resources/assets/basepower/models/item/rotator_tool.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/handheld",
     "textures": {
-        "layer0": "poweradvantage:items/rotator_tool"
+        "layer0": "basepower:items/rotator_tool"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/sprocket.json b/src/main/resources/assets/basepower/models/item/sprocket.json
similarity index 53%
rename from src/main/resources/assets/poweradvantage/models/item/sprocket.json
rename to src/main/resources/assets/basepower/models/item/sprocket.json
index f26d4642..8555e9f9 100644
--- a/src/main/resources/assets/poweradvantage/models/item/sprocket.json
+++ b/src/main/resources/assets/basepower/models/item/sprocket.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
     "textures": {
-        "layer0": "poweradvantage:items/sprocket"
+        "layer0": "basepower:items/sprocket"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/starch.json b/src/main/resources/assets/basepower/models/item/starch.json
similarity index 54%
rename from src/main/resources/assets/poweradvantage/models/item/starch.json
rename to src/main/resources/assets/basepower/models/item/starch.json
index ac3db87c..5e9dbcfe 100644
--- a/src/main/resources/assets/poweradvantage/models/item/starch.json
+++ b/src/main/resources/assets/basepower/models/item/starch.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
     "textures": {
-        "layer0": "poweradvantage:items/starch"
+        "layer0": "basepower:items/starch"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/basepower/models/item/steel_frame.json b/src/main/resources/assets/basepower/models/item/steel_frame.json
new file mode 100644
index 00000000..78e655ea
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/steel_frame.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/steel_frame"
+}
diff --git a/src/main/resources/assets/basepower/models/item/still.json b/src/main/resources/assets/basepower/models/item/still.json
new file mode 100644
index 00000000..74f0491a
--- /dev/null
+++ b/src/main/resources/assets/basepower/models/item/still.json
@@ -0,0 +1,3 @@
+{
+    "parent": "basepower:block/still_off"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/crude_oil_flow.png b/src/main/resources/assets/basepower/textures/blocks/crude_oil_flow.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/crude_oil_flow.png
rename to src/main/resources/assets/basepower/textures/blocks/crude_oil_flow.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/crude_oil_flow.png.mcmeta b/src/main/resources/assets/basepower/textures/blocks/crude_oil_flow.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/crude_oil_flow.png.mcmeta
rename to src/main/resources/assets/basepower/textures/blocks/crude_oil_flow.png.mcmeta
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/crude_oil_still.png b/src/main/resources/assets/basepower/textures/blocks/crude_oil_still.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/crude_oil_still.png
rename to src/main/resources/assets/basepower/textures/blocks/crude_oil_still.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/crude_oil_still.png.mcmeta b/src/main/resources/assets/basepower/textures/blocks/crude_oil_still.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/crude_oil_still.png.mcmeta
rename to src/main/resources/assets/basepower/textures/blocks/crude_oil_still.png.mcmeta
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/filter_bottom.png b/src/main/resources/assets/basepower/textures/blocks/filter_bottom.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/filter_bottom.png
rename to src/main/resources/assets/basepower/textures/blocks/filter_bottom.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/filter_side_block.png b/src/main/resources/assets/basepower/textures/blocks/filter_side_block.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/filter_side_block.png
rename to src/main/resources/assets/basepower/textures/blocks/filter_side_block.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/filter_side_food.png b/src/main/resources/assets/basepower/textures/blocks/filter_side_food.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/filter_side_food.png
rename to src/main/resources/assets/basepower/textures/blocks/filter_side_food.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/filter_side_fuel.png b/src/main/resources/assets/basepower/textures/blocks/filter_side_fuel.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/filter_side_fuel.png
rename to src/main/resources/assets/basepower/textures/blocks/filter_side_fuel.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/filter_side_inventory.png b/src/main/resources/assets/basepower/textures/blocks/filter_side_inventory.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/filter_side_inventory.png
rename to src/main/resources/assets/basepower/textures/blocks/filter_side_inventory.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/filter_side_ore.png b/src/main/resources/assets/basepower/textures/blocks/filter_side_ore.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/filter_side_ore.png
rename to src/main/resources/assets/basepower/textures/blocks/filter_side_ore.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/filter_side_overflow.png b/src/main/resources/assets/basepower/textures/blocks/filter_side_overflow.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/filter_side_overflow.png
rename to src/main/resources/assets/basepower/textures/blocks/filter_side_overflow.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/filter_side_plantable.png b/src/main/resources/assets/basepower/textures/blocks/filter_side_plantable.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/filter_side_plantable.png
rename to src/main/resources/assets/basepower/textures/blocks/filter_side_plantable.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/filter_side_smeltable.png b/src/main/resources/assets/basepower/textures/blocks/filter_side_smeltable.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/filter_side_smeltable.png
rename to src/main/resources/assets/basepower/textures/blocks/filter_side_smeltable.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/fluid_discharge_face.png b/src/main/resources/assets/basepower/textures/blocks/fluid_discharge_face.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/fluid_discharge_face.png
rename to src/main/resources/assets/basepower/textures/blocks/fluid_discharge_face.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/fluid_discharge_side.png b/src/main/resources/assets/basepower/textures/blocks/fluid_discharge_side.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/fluid_discharge_side.png
rename to src/main/resources/assets/basepower/textures/blocks/fluid_discharge_side.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/fluid_drain_face.png b/src/main/resources/assets/basepower/textures/blocks/fluid_drain_face.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/fluid_drain_face.png
rename to src/main/resources/assets/basepower/textures/blocks/fluid_drain_face.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/fluid_drain_side.png b/src/main/resources/assets/basepower/textures/blocks/fluid_drain_side.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/fluid_drain_side.png
rename to src/main/resources/assets/basepower/textures/blocks/fluid_drain_side.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/fluid_metal_tank_side.png b/src/main/resources/assets/basepower/textures/blocks/fluid_metal_tank_side.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/fluid_metal_tank_side.png
rename to src/main/resources/assets/basepower/textures/blocks/fluid_metal_tank_side.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/fluid_metal_tank_top.png b/src/main/resources/assets/basepower/textures/blocks/fluid_metal_tank_top.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/fluid_metal_tank_top.png
rename to src/main/resources/assets/basepower/textures/blocks/fluid_metal_tank_top.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/fluid_pipe.png b/src/main/resources/assets/basepower/textures/blocks/fluid_pipe.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/fluid_pipe.png
rename to src/main/resources/assets/basepower/textures/blocks/fluid_pipe.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/fluid_switch_off.png b/src/main/resources/assets/basepower/textures/blocks/fluid_switch_off.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/fluid_switch_off.png
rename to src/main/resources/assets/basepower/textures/blocks/fluid_switch_off.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/fluid_switch_on.png b/src/main/resources/assets/basepower/textures/blocks/fluid_switch_on.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/fluid_switch_on.png
rename to src/main/resources/assets/basepower/textures/blocks/fluid_switch_on.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/item_conveyor_end.png b/src/main/resources/assets/basepower/textures/blocks/item_conveyor_end.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/item_conveyor_end.png
rename to src/main/resources/assets/basepower/textures/blocks/item_conveyor_end.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/item_conveyor_side.png b/src/main/resources/assets/basepower/textures/blocks/item_conveyor_side.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/item_conveyor_side.png
rename to src/main/resources/assets/basepower/textures/blocks/item_conveyor_side.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/item_conveyor_top.png b/src/main/resources/assets/basepower/textures/blocks/item_conveyor_top.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/item_conveyor_top.png
rename to src/main/resources/assets/basepower/textures/blocks/item_conveyor_top.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/metal_panel.png b/src/main/resources/assets/basepower/textures/blocks/metal_panel.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/metal_panel.png
rename to src/main/resources/assets/basepower/textures/blocks/metal_panel.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/powercable.png b/src/main/resources/assets/basepower/textures/blocks/powercable.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/powercable.png
rename to src/main/resources/assets/basepower/textures/blocks/powercable.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/refined_oil_flow.png b/src/main/resources/assets/basepower/textures/blocks/refined_oil_flow.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/refined_oil_flow.png
rename to src/main/resources/assets/basepower/textures/blocks/refined_oil_flow.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/refined_oil_flow.png.mcmeta b/src/main/resources/assets/basepower/textures/blocks/refined_oil_flow.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/refined_oil_flow.png.mcmeta
rename to src/main/resources/assets/basepower/textures/blocks/refined_oil_flow.png.mcmeta
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/refined_oil_still.png b/src/main/resources/assets/basepower/textures/blocks/refined_oil_still.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/refined_oil_still.png
rename to src/main/resources/assets/basepower/textures/blocks/refined_oil_still.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/refined_oil_still.png.mcmeta b/src/main/resources/assets/basepower/textures/blocks/refined_oil_still.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/refined_oil_still.png.mcmeta
rename to src/main/resources/assets/basepower/textures/blocks/refined_oil_still.png.mcmeta
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/steel_frame.png b/src/main/resources/assets/basepower/textures/blocks/steel_frame.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/steel_frame.png
rename to src/main/resources/assets/basepower/textures/blocks/steel_frame.png
diff --git a/src/main/resources/assets/poweradvantage/textures/blocks/techreborn_converter.png b/src/main/resources/assets/basepower/textures/blocks/techreborn_converter.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/blocks/techreborn_converter.png
rename to src/main/resources/assets/basepower/textures/blocks/techreborn_converter.png
diff --git a/src/main/resources/assets/poweradvantage/textures/gui/container/fluid_discharge_gui.png b/src/main/resources/assets/basepower/textures/gui/container/fluid_discharge_gui.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/gui/container/fluid_discharge_gui.png
rename to src/main/resources/assets/basepower/textures/gui/container/fluid_discharge_gui.png
diff --git a/src/main/resources/assets/poweradvantage/textures/gui/container/fluid_drain_gui.png b/src/main/resources/assets/basepower/textures/gui/container/fluid_drain_gui.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/gui/container/fluid_drain_gui.png
rename to src/main/resources/assets/basepower/textures/gui/container/fluid_drain_gui.png
diff --git a/src/main/resources/assets/poweradvantage/textures/gui/container/fluid_metal_tank_gui.png b/src/main/resources/assets/basepower/textures/gui/container/fluid_metal_tank_gui.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/gui/container/fluid_metal_tank_gui.png
rename to src/main/resources/assets/basepower/textures/gui/container/fluid_metal_tank_gui.png
diff --git a/src/main/resources/assets/poweradvantage/textures/gui/container/fluid_storage_tank_gui.png b/src/main/resources/assets/basepower/textures/gui/container/fluid_storage_tank_gui.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/gui/container/fluid_storage_tank_gui.png
rename to src/main/resources/assets/basepower/textures/gui/container/fluid_storage_tank_gui.png
diff --git a/src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor.png b/src/main/resources/assets/basepower/textures/gui/container/item_conveyor.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor.png
rename to src/main/resources/assets/basepower/textures/gui/container/item_conveyor.png
diff --git a/src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor_block.png b/src/main/resources/assets/basepower/textures/gui/container/item_conveyor_block.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor_block.png
rename to src/main/resources/assets/basepower/textures/gui/container/item_conveyor_block.png
diff --git a/src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor_food.png b/src/main/resources/assets/basepower/textures/gui/container/item_conveyor_food.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor_food.png
rename to src/main/resources/assets/basepower/textures/gui/container/item_conveyor_food.png
diff --git a/src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor_fuel.png b/src/main/resources/assets/basepower/textures/gui/container/item_conveyor_fuel.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor_fuel.png
rename to src/main/resources/assets/basepower/textures/gui/container/item_conveyor_fuel.png
diff --git a/src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor_inventory.png b/src/main/resources/assets/basepower/textures/gui/container/item_conveyor_inventory.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor_inventory.png
rename to src/main/resources/assets/basepower/textures/gui/container/item_conveyor_inventory.png
diff --git a/src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor_ore.png b/src/main/resources/assets/basepower/textures/gui/container/item_conveyor_ore.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor_ore.png
rename to src/main/resources/assets/basepower/textures/gui/container/item_conveyor_ore.png
diff --git a/src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor_overflow.png b/src/main/resources/assets/basepower/textures/gui/container/item_conveyor_overflow.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor_overflow.png
rename to src/main/resources/assets/basepower/textures/gui/container/item_conveyor_overflow.png
diff --git a/src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor_plant.png b/src/main/resources/assets/basepower/textures/gui/container/item_conveyor_plant.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor_plant.png
rename to src/main/resources/assets/basepower/textures/gui/container/item_conveyor_plant.png
diff --git a/src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor_smelt.png b/src/main/resources/assets/basepower/textures/gui/container/item_conveyor_smelt.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/gui/container/item_conveyor_smelt.png
rename to src/main/resources/assets/basepower/textures/gui/container/item_conveyor_smelt.png
diff --git a/src/main/resources/assets/poweradvantage/textures/gui/container/machineGUI_template.png b/src/main/resources/assets/basepower/textures/gui/container/machineGUI_template.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/gui/container/machineGUI_template.png
rename to src/main/resources/assets/basepower/textures/gui/container/machineGUI_template.png
diff --git a/src/main/resources/assets/poweradvantage/textures/gui/container/player_inventory.png b/src/main/resources/assets/basepower/textures/gui/container/player_inventory.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/gui/container/player_inventory.png
rename to src/main/resources/assets/basepower/textures/gui/container/player_inventory.png
diff --git a/src/main/resources/assets/poweradvantage/textures/gui/container/still_gui.png b/src/main/resources/assets/basepower/textures/gui/container/still_gui.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/gui/container/still_gui.png
rename to src/main/resources/assets/basepower/textures/gui/container/still_gui.png
diff --git a/src/main/resources/assets/poweradvantage/textures/items/bioplastic_ingot.png b/src/main/resources/assets/basepower/textures/items/bioplastic_ingot.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/items/bioplastic_ingot.png
rename to src/main/resources/assets/basepower/textures/items/bioplastic_ingot.png
diff --git a/src/main/resources/assets/poweradvantage/textures/items/bucket_crude_oil.png b/src/main/resources/assets/basepower/textures/items/bucket_crude_oil.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/items/bucket_crude_oil.png
rename to src/main/resources/assets/basepower/textures/items/bucket_crude_oil.png
diff --git a/src/main/resources/assets/poweradvantage/textures/items/bucket_refined_oil.png b/src/main/resources/assets/basepower/textures/items/bucket_refined_oil.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/items/bucket_refined_oil.png
rename to src/main/resources/assets/basepower/textures/items/bucket_refined_oil.png
diff --git a/src/main/resources/assets/poweradvantage/textures/items/rotator_tool.png b/src/main/resources/assets/basepower/textures/items/rotator_tool.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/items/rotator_tool.png
rename to src/main/resources/assets/basepower/textures/items/rotator_tool.png
diff --git a/src/main/resources/assets/poweradvantage/textures/items/sprocket.png b/src/main/resources/assets/basepower/textures/items/sprocket.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/items/sprocket.png
rename to src/main/resources/assets/basepower/textures/items/sprocket.png
diff --git a/src/main/resources/assets/poweradvantage/textures/items/starch.png b/src/main/resources/assets/basepower/textures/items/starch.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/items/starch.png
rename to src/main/resources/assets/basepower/textures/items/starch.png
diff --git a/src/main/resources/assets/poweradvantage/textures/materials/brass.png b/src/main/resources/assets/basepower/textures/materials/brass.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/materials/brass.png
rename to src/main/resources/assets/basepower/textures/materials/brass.png
diff --git a/src/main/resources/assets/poweradvantage/textures/materials/copper.png b/src/main/resources/assets/basepower/textures/materials/copper.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/materials/copper.png
rename to src/main/resources/assets/basepower/textures/materials/copper.png
diff --git a/src/main/resources/assets/poweradvantage/textures/materials/invar.png b/src/main/resources/assets/basepower/textures/materials/invar.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/materials/invar.png
rename to src/main/resources/assets/basepower/textures/materials/invar.png
diff --git a/src/main/resources/assets/poweradvantage/textures/materials/iron.png b/src/main/resources/assets/basepower/textures/materials/iron.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/materials/iron.png
rename to src/main/resources/assets/basepower/textures/materials/iron.png
diff --git a/src/main/resources/assets/poweradvantage/textures/materials/metal_panel.png b/src/main/resources/assets/basepower/textures/materials/metal_panel.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/materials/metal_panel.png
rename to src/main/resources/assets/basepower/textures/materials/metal_panel.png
diff --git a/src/main/resources/assets/poweradvantage/textures/materials/plastic.png b/src/main/resources/assets/basepower/textures/materials/plastic.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/materials/plastic.png
rename to src/main/resources/assets/basepower/textures/materials/plastic.png
diff --git a/src/main/resources/assets/poweradvantage/textures/materials/steel.png b/src/main/resources/assets/basepower/textures/materials/steel.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/materials/steel.png
rename to src/main/resources/assets/basepower/textures/materials/steel.png
diff --git a/src/main/resources/assets/poweradvantage/textures/materials/steel_dark.png b/src/main/resources/assets/basepower/textures/materials/steel_dark.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/materials/steel_dark.png
rename to src/main/resources/assets/basepower/textures/materials/steel_dark.png
diff --git a/src/main/resources/assets/poweradvantage/textures/materials/stone.png b/src/main/resources/assets/basepower/textures/materials/stone.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/materials/stone.png
rename to src/main/resources/assets/basepower/textures/materials/stone.png
diff --git a/src/main/resources/assets/poweradvantage/textures/materials/stone_brick.png b/src/main/resources/assets/basepower/textures/materials/stone_brick.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/materials/stone_brick.png
rename to src/main/resources/assets/basepower/textures/materials/stone_brick.png
diff --git a/src/main/resources/assets/poweradvantage/textures/materials/wood.png b/src/main/resources/assets/basepower/textures/materials/wood.png
similarity index 100%
rename from src/main/resources/assets/poweradvantage/textures/materials/wood.png
rename to src/main/resources/assets/basepower/textures/materials/wood.png
diff --git a/src/main/resources/assets/poweradvantage/blockstates/converter_rf_electricity.json b/src/main/resources/assets/poweradvantage/blockstates/converter_rf_electricity.json
deleted file mode 100644
index 35df5016..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/converter_rf_electricity.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=east": {
-      "model": "poweradvantage:block/converter_rf_electricity",
-      "y": 90
-    },
-    "facing=north": {
-      "model": "poweradvantage:block/converter_rf_electricity"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/converter_rf_electricity",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/converter_rf_electricity",
-      "y": 270
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/converter_rf_quantum.json b/src/main/resources/assets/poweradvantage/blockstates/converter_rf_quantum.json
deleted file mode 100644
index 257c03cf..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/converter_rf_quantum.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=east": {
-      "model": "poweradvantage:block/converter_rf_quantum",
-      "y": 90
-    },
-    "facing=north": {
-      "model": "poweradvantage:block/converter_rf_quantum"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/converter_rf_quantum",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/converter_rf_quantum",
-      "y": 270
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/converter_rf_steam.json b/src/main/resources/assets/poweradvantage/blockstates/converter_rf_steam.json
deleted file mode 100644
index d868d075..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/converter_rf_steam.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=east": {
-      "model": "poweradvantage:block/converter_rf_steam",
-      "y": 90
-    },
-    "facing=north": {
-      "model": "poweradvantage:block/converter_rf_steam"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/converter_rf_steam",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/converter_rf_steam",
-      "y": 270
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/converter_tr_electricity.json b/src/main/resources/assets/poweradvantage/blockstates/converter_tr_electricity.json
deleted file mode 100644
index d7730168..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/converter_tr_electricity.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=east": {
-      "model": "poweradvantage:block/converter_tr_electricity",
-      "y": 90
-    },
-    "facing=north": {
-      "model": "poweradvantage:block/converter_tr_electricity"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/converter_tr_electricity",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/converter_tr_electricity",
-      "y": 270
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/crude_oil.json b/src/main/resources/assets/poweradvantage/blockstates/crude_oil.json
deleted file mode 100644
index 9ff671aa..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/crude_oil.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "": { "model": "poweradvantage:block/crude_oil" }
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/fluid_discharge.json b/src/main/resources/assets/poweradvantage/blockstates/fluid_discharge.json
deleted file mode 100644
index 1266604e..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/fluid_discharge.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=east": {
-      "model": "poweradvantage:block/fluid_discharge",
-      "y": 90
-    },
-    "facing=north": {
-      "model": "poweradvantage:block/fluid_discharge"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/fluid_discharge",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/fluid_discharge",
-      "y": 270
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/fluid_drain.json b/src/main/resources/assets/poweradvantage/blockstates/fluid_drain.json
deleted file mode 100644
index 70980092..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/fluid_drain.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=east": {
-      "model": "poweradvantage:block/fluid_drain",
-      "y": 90
-    },
-    "facing=north": {
-      "model": "poweradvantage:block/fluid_drain"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/fluid_drain",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/fluid_drain",
-      "y": 270
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/fluid_storage_tank.json b/src/main/resources/assets/poweradvantage/blockstates/fluid_storage_tank.json
deleted file mode 100644
index c835f911..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/fluid_storage_tank.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=east": {
-      "model": "poweradvantage:block/fluid_storage_tank",
-      "y": 90
-    },
-    "facing=north": {
-      "model": "poweradvantage:block/fluid_storage_tank"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/fluid_storage_tank",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/fluid_storage_tank",
-      "y": 270
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/fluid_switch.json b/src/main/resources/assets/poweradvantage/blockstates/fluid_switch.json
deleted file mode 100644
index 5817285b..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/fluid_switch.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "variants": {
-    "active=false": {
-      "model": "poweradvantage:block/fluid_switch_off"
-    },
-    "active=true": {
-      "model": "poweradvantage:block/fluid_switch_on"
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/infinite_electricity.json b/src/main/resources/assets/poweradvantage/blockstates/infinite_electricity.json
deleted file mode 100644
index e06b9490..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/infinite_electricity.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=east": {
-      "model": "poweradvantage:block/infinite_electricity",
-      "y": 90
-    },
-    "facing=north": {
-      "model": "poweradvantage:block/infinite_electricity"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/infinite_electricity",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/infinite_electricity",
-      "y": 270
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/infinite_quantum.json b/src/main/resources/assets/poweradvantage/blockstates/infinite_quantum.json
deleted file mode 100644
index 1e7ad502..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/infinite_quantum.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=east": {
-      "model": "poweradvantage:block/infinite_quantum",
-      "y": 90
-    },
-    "facing=north": {
-      "model": "poweradvantage:block/infinite_quantum"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/infinite_quantum",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/infinite_quantum",
-      "y": 270
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/infinite_steam.json b/src/main/resources/assets/poweradvantage/blockstates/infinite_steam.json
deleted file mode 100644
index 3ad324b6..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/infinite_steam.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=east": {
-      "model": "poweradvantage:block/infinite_steam",
-      "y": 90
-    },
-    "facing=north": {
-      "model": "poweradvantage:block/infinite_steam"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/infinite_steam",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/infinite_steam",
-      "y": 270
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/item_conveyor.json b/src/main/resources/assets/poweradvantage/blockstates/item_conveyor.json
deleted file mode 100644
index 93c7ac9e..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/item_conveyor.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "variants": {
-    "facing=down": {
-      "model": "poweradvantage:block/item_conveyor",
-      "x": 90
-    },
-    "facing=up": {
-      "model": "poweradvantage:block/item_conveyor",
-      "x": 270
-    },
-    "facing=north": {
-      "model": "poweradvantage:block/item_conveyor"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/item_conveyor",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/item_conveyor",
-      "y": 270
-    },
-    "facing=east": {
-      "model": "poweradvantage:block/item_conveyor",
-      "y": 90
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/item_filter_block.json b/src/main/resources/assets/poweradvantage/blockstates/item_filter_block.json
deleted file mode 100644
index 39140fb1..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/item_filter_block.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=north": {
-      "model": "poweradvantage:block/item_filter_block"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/item_filter_block",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/item_filter_block",
-      "y": 270
-    },
-    "facing=east": {
-      "model": "poweradvantage:block/item_filter_block",
-      "y": 90
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/item_filter_food.json b/src/main/resources/assets/poweradvantage/blockstates/item_filter_food.json
deleted file mode 100644
index 6cc97515..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/item_filter_food.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=north": {
-      "model": "poweradvantage:block/item_filter_food"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/item_filter_food",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/item_filter_food",
-      "y": 270
-    },
-    "facing=east": {
-      "model": "poweradvantage:block/item_filter_food",
-      "y": 90
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/item_filter_fuel.json b/src/main/resources/assets/poweradvantage/blockstates/item_filter_fuel.json
deleted file mode 100644
index 9bbcc350..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/item_filter_fuel.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=north": {
-      "model": "poweradvantage:block/item_filter_fuel"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/item_filter_fuel",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/item_filter_fuel",
-      "y": 270
-    },
-    "facing=east": {
-      "model": "poweradvantage:block/item_filter_fuel",
-      "y": 90
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/item_filter_inventory.json b/src/main/resources/assets/poweradvantage/blockstates/item_filter_inventory.json
deleted file mode 100644
index ce93778d..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/item_filter_inventory.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=north": {
-      "model": "poweradvantage:block/item_filter_inventory"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/item_filter_inventory",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/item_filter_inventory",
-      "y": 270
-    },
-    "facing=east": {
-      "model": "poweradvantage:block/item_filter_inventory",
-      "y": 90
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/item_filter_ore.json b/src/main/resources/assets/poweradvantage/blockstates/item_filter_ore.json
deleted file mode 100644
index 402f28c9..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/item_filter_ore.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=north": {
-      "model": "poweradvantage:block/item_filter_ore"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/item_filter_ore",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/item_filter_ore",
-      "y": 270
-    },
-    "facing=east": {
-      "model": "poweradvantage:block/item_filter_ore",
-      "y": 90
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/item_filter_overflow.json b/src/main/resources/assets/poweradvantage/blockstates/item_filter_overflow.json
deleted file mode 100644
index 83a02f1c..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/item_filter_overflow.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=north": {
-      "model": "poweradvantage:block/item_filter_overflow"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/item_filter_overflow",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/item_filter_overflow",
-      "y": 270
-    },
-    "facing=east": {
-      "model": "poweradvantage:block/item_filter_overflow",
-      "y": 90
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/item_filter_plant.json b/src/main/resources/assets/poweradvantage/blockstates/item_filter_plant.json
deleted file mode 100644
index 0527268e..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/item_filter_plant.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=north": {
-      "model": "poweradvantage:block/item_filter_plant"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/item_filter_plant",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/item_filter_plant",
-      "y": 270
-    },
-    "facing=east": {
-      "model": "poweradvantage:block/item_filter_plant",
-      "y": 90
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/item_filter_smelt.json b/src/main/resources/assets/poweradvantage/blockstates/item_filter_smelt.json
deleted file mode 100644
index eb7fb555..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/item_filter_smelt.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=north": {
-      "model": "poweradvantage:block/item_filter_smelt"
-    },
-    "facing=south": {
-      "model": "poweradvantage:block/item_filter_smelt",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "poweradvantage:block/item_filter_smelt",
-      "y": 270
-    },
-    "facing=east": {
-      "model": "poweradvantage:block/item_filter_smelt",
-      "y": 90
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/refined_oil.json b/src/main/resources/assets/poweradvantage/blockstates/refined_oil.json
deleted file mode 100644
index 80e8102b..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/refined_oil.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "": { "model": "poweradvantage:block/refined_oil" }
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/blockstates/steel_frame.json b/src/main/resources/assets/poweradvantage/blockstates/steel_frame.json
deleted file mode 100644
index 6adc29c6..00000000
--- a/src/main/resources/assets/poweradvantage/blockstates/steel_frame.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "poweradvantage:block/steel_frame"
-    }
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/lang/de_de.json b/src/main/resources/assets/poweradvantage/lang/de_de.json
deleted file mode 100644
index bdf24685..00000000
--- a/src/main/resources/assets/poweradvantage/lang/de_de.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
-  "nei.poweradvantage.recipehandler.shapelessfurnace.name": "Große Ofen (formlos)",
-  "nei.poweradvantage.recipehandler.shapedfurnace.name": "Große Ofen (geformt)",
-  "tooltip.poweradvantage.empty": "Leer",
-  "tooltip.poweradvantage.buckets_of": "%x Eimer %y",
-  "itemGroup.poweradvantage": "Leistungsvorteil",
-  "tile.poweradvantage.fluid_drain.name": "Ablauf",
-  "tile.poweradvantage.fluid_discharge.name": "Austragsrost",
-  "tile.poweradvantage.fluid_storage_tank.name": "Lagertank",
-  "item.poweradvantage.fluid_storage_tank_item.name": "Speicher",
-  "tile.poweradvantage.fluid_pipe.name": "Rohr",
-  "tile.poweradvantage.item_conveyor.name": "Förderer",
-  "tile.poweradvantage.item_filter_block.name": "Block Auswahl Förder",
-  "tile.poweradvantage.item_filter_food.name": "Lebensmittel Auswahl Förder",
-  "tile.poweradvantage.item_filter_fuel.name": "Brennstoff Auswahl Förder",
-  "tile.poweradvantage.item_filter_inventory.name": "Anpassbare Auswahl Förder",
-  "tile.poweradvantage.item_filter_ore.name": "Erz Auswahl Förder",
-  "tile.poweradvantage.item_filter_plant.name": "Pflanze Auswahl Förder",
-  "tile.poweradvantage.item_filter_smelt.name": "Kochbare Auswahl Förder",
-  "tile.poweradvantage.item_filter_overflow.name": "Überlauf Auswahl Förder",
-  "tile.poweradvantage.steel_frame.name": "Stahlrahmen",
-  "item.poweradvantage.starch.name": "Kartoffelstärke",
-  "item.poweradvantage.bioplastic_ingot.name": "Biokunststoff-Barren",
-  "item.poweradvantage.sprocket.name": "Kettenrad",
-  "tile.poweradvantage.fluid_metal_tank.name": "Metall-Lagertank",
-  "item.poweradvantage.rotator_tool.name": "Drehwerkzeug",
-  "tile.poweradvantage.infinite_steam.name": "Unendlichen Dampfkraft",
-  "tile.poweradvantage.infinite_electricity.name": "Unendliche Elektrische Leistung",
-  "tile.poweradvantage.infinite_quantum.name": "Unendliche Quanten Leistung",
-  "tile.poweradvantage.crude_oil.name": "Rohöl",
-  "fluid.poweradvantage.crude_oil": "Rohöl",
-  "item.bucket.crude_oil": "Eimer Rohöl",
-  "tile.poweradvantage.still.name": "Brennerei",
-  "tile.poweradvantage.refined_oil.name": "Raffiniertes Öl",
-  "fluid.poweradvantage.refined_oil": "Raffiniertes Öl",
-  "item.bucket.refined_oil": "Eimer für Raffiniertes Öl",
-  "tile.poweradvantage.fluid_switch.name": "Ventil",
-  "tile.poweradvantage.converter_rf_steam.name": "Dampf-RF Leistungstransformator",
-  "tile.poweradvantage.converter_rf_electricity.name": "Elektrizität-RF Leistungstransformator",
-  "tile.poweradvantage.converter_rf_quantum.name": "Quant-RF Leistungstransformator",
-  "tile.poweradvantage.converter_tr_electricity.name": "Elektrizität-EU Leistungstransformator",
-  "block.poweradvantage.fluid_drain": "Ablauf",
-  "block.poweradvantage.fluid_discharge": "Austragsrost",
-  "block.poweradvantage.fluid_storage_tank": "Lagertank",
-  "item.poweradvantage.fluid_storage_tank_item": "Speicher",
-  "block.poweradvantage.fluid_pipe": "Rohr",
-  "block.poweradvantage.item_conveyor": "Förderer",
-  "block.poweradvantage.item_filter_block": "Block Auswahl Förder",
-  "block.poweradvantage.item_filter_food": "Lebensmittel Auswahl Förder",
-  "block.poweradvantage.item_filter_fuel": "Brennstoff Auswahl Förder",
-  "block.poweradvantage.item_filter_inventory": "Anpassbare Auswahl Förder",
-  "block.poweradvantage.item_filter_ore": "Erz Auswahl Förder",
-  "block.poweradvantage.item_filter_plant": "Pflanze Auswahl Förder",
-  "block.poweradvantage.item_filter_smelt": "Kochbare Auswahl Förder",
-  "block.poweradvantage.item_filter_overflow": "Überlauf Auswahl Förder",
-  "block.poweradvantage.steel_frame": "Stahlrahmen",
-  "item.poweradvantage.starch": "Kartoffelstärke",
-  "item.poweradvantage.bioplastic_ingot": "Biokunststoff-Barren",
-  "item.poweradvantage.sprocket": "Kettenrad",
-  "block.poweradvantage.fluid_metal_tank": "Metall-Lagertank",
-  "item.poweradvantage.rotator_tool": "Drehwerkzeug",
-  "block.poweradvantage.infinite_steam": "Unendlichen Dampfkraft",
-  "block.poweradvantage.infinite_electricity": "Unendliche Elektrische Leistung",
-  "block.poweradvantage.infinite_quantum": "Unendliche Quanten Leistung",
-  "block.poweradvantage.crude_oil": "Rohöl",
-  "block.poweradvantage.still": "Brennerei",
-  "block.poweradvantage.refined_oil": "Raffiniertes Öl",
-  "block.poweradvantage.fluid_switch": "Ventil",
-  "block.poweradvantage.converter_rf_steam": "Dampf-RF Leistungstransformator",
-  "block.poweradvantage.converter_rf_electricity": "Elektrizität-RF Leistungstransformator",
-  "block.poweradvantage.converter_rf_quantum": "Quant-RF Leistungstransformator",
-  "block.poweradvantage.converter_tr_electricity": "Elektrizität-EU Leistungstransformator",
-  "item.poweradvantage.crude_oil_bucket": "Eimer Rohöl",
-  "item.poweradvantage.refined_oil_bucket": "Eimer für Raffiniertes Öl",
-  "block.poweradvantage.fluid_pipe_terminal": "Rohr"
-}
diff --git a/src/main/resources/assets/poweradvantage/lang/en_au.json b/src/main/resources/assets/poweradvantage/lang/en_au.json
deleted file mode 100644
index 7b1619fe..00000000
--- a/src/main/resources/assets/poweradvantage/lang/en_au.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
-  "nei.poweradvantage.recipehandler.shapelessfurnace.name": "Large Furnace (Shapeless)",
-  "nei.poweradvantage.recipehandler.shapedfurnace.name": "Large Furnace (Shaped)",
-  "tooltip.poweradvantage.empty": "Empty",
-  "tooltip.poweradvantage.buckets_of": "%x buckets of %y",
-  "itemGroup.poweradvantage": "Power Advantage",
-  "tile.poweradvantage.fluid_drain.name": "Drain",
-  "tile.poweradvantage.fluid_discharge.name": "Discharge Grate",
-  "tile.poweradvantage.fluid_storage_tank.name": "Portable Fluid Tank",
-  "item.poweradvantage.fluid_storage_tank_item.name": "Storage Tank",
-  "tile.poweradvantage.fluid_pipe.name": "Pipe",
-  "tile.poweradvantage.item_conveyor.name": "Conveyor",
-  "tile.poweradvantage.item_filter_block.name": "Block Filter Conveyor",
-  "tile.poweradvantage.item_filter_food.name": "Food Filter Conveyor",
-  "tile.poweradvantage.item_filter_fuel.name": "Fuel Filter Conveyor",
-  "tile.poweradvantage.item_filter_inventory.name": "Filter Conveyor",
-  "tile.poweradvantage.item_filter_ore.name": "Ore Filter Conveyor",
-  "tile.poweradvantage.item_filter_plant.name": "Plantable Filter Conveyor",
-  "tile.poweradvantage.item_filter_smelt.name": "Furnace Filter Conveyor",
-  "tile.poweradvantage.item_filter_overflow.name": "Overflow Filter Conveyor",
-  "tile.poweradvantage.steel_frame.name": "Steel Frame",
-  "item.poweradvantage.starch.name": "Starch",
-  "item.poweradvantage.bioplastic_ingot.name": "Bioplastic Ingot",
-  "item.poweradvantage.sprocket.name": "Sprocket",
-  "tile.poweradvantage.fluid_metal_tank.name": "Metal Fluid Tank",
-  "item.poweradvantage.rotator_tool.name": "Rotation Wrench",
-  "tile.poweradvantage.infinite_steam.name": "Unlimited Steam Power",
-  "tile.poweradvantage.infinite_electricity.name": "Unlimited Electrical Power",
-  "tile.poweradvantage.infinite_quantum.name": "Unlimited Quantum Power",
-  "tile.poweradvantage.crude_oil.name": "Crude Oil",
-  "fluid.poweradvantage.crude_oil": "Crude Oil",
-  "item.bucket.crude_oil": "Bucket of Crude Oil",
-  "tile.poweradvantage.still.name": "Distillation Furnace",
-  "tile.poweradvantage.refined_oil.name": "Refined Oil",
-  "fluid.poweradvantage.refined_oil": "Refined Oil",
-  "item.bucket.refined_oil": "Bucket of Refined Oil",
-  "tile.poweradvantage.fluid_switch.name": "Fluid Switch Valve",
-  "tile.poweradvantage.converter_rf_steam.name": "Steam-RF Transformer",
-  "tile.poweradvantage.converter_rf_electricity.name": "Electricity-RF Transformer",
-  "tile.poweradvantage.converter_rf_quantum.name": "Quantum-RF Transformer",
-  "tile.poweradvantage.converter_tr_electricity.name": "Electricity-EU Transformer",
-  "block.poweradvantage.fluid_drain": "Drain",
-  "block.poweradvantage.fluid_discharge": "Discharge Grate",
-  "block.poweradvantage.fluid_storage_tank": "Portable Fluid Tank",
-  "item.poweradvantage.fluid_storage_tank_item": "Storage Tank",
-  "block.poweradvantage.fluid_pipe": "Pipe",
-  "block.poweradvantage.item_conveyor": "Conveyor",
-  "block.poweradvantage.item_filter_block": "Block Filter Conveyor",
-  "block.poweradvantage.item_filter_food": "Food Filter Conveyor",
-  "block.poweradvantage.item_filter_fuel": "Fuel Filter Conveyor",
-  "block.poweradvantage.item_filter_inventory": "Filter Conveyor",
-  "block.poweradvantage.item_filter_ore": "Ore Filter Conveyor",
-  "block.poweradvantage.item_filter_plant": "Plantable Filter Conveyor",
-  "block.poweradvantage.item_filter_smelt": "Furnace Filter Conveyor",
-  "block.poweradvantage.item_filter_overflow": "Overflow Filter Conveyor",
-  "block.poweradvantage.steel_frame": "Steel Frame",
-  "item.poweradvantage.starch": "Starch",
-  "item.poweradvantage.bioplastic_ingot": "Bioplastic Ingot",
-  "item.poweradvantage.sprocket": "Sprocket",
-  "block.poweradvantage.fluid_metal_tank": "Metal Fluid Tank",
-  "item.poweradvantage.rotator_tool": "Rotation Wrench",
-  "block.poweradvantage.infinite_steam": "Unlimited Steam Power",
-  "block.poweradvantage.infinite_electricity": "Unlimited Electrical Power",
-  "block.poweradvantage.infinite_quantum": "Unlimited Quantum Power",
-  "block.poweradvantage.crude_oil": "Crude Oil",
-  "block.poweradvantage.still": "Distillation Furnace",
-  "block.poweradvantage.refined_oil": "Refined Oil",
-  "block.poweradvantage.fluid_switch": "Fluid Switch Valve",
-  "block.poweradvantage.converter_rf_steam": "Steam-RF Transformer",
-  "block.poweradvantage.converter_rf_electricity": "Electricity-RF Transformer",
-  "block.poweradvantage.converter_rf_quantum": "Quantum-RF Transformer",
-  "block.poweradvantage.converter_tr_electricity": "Electricity-EU Transformer",
-  "item.poweradvantage.crude_oil_bucket": "Bucket of Crude Oil",
-  "item.poweradvantage.refined_oil_bucket": "Bucket of Refined Oil",
-  "block.poweradvantage.fluid_pipe_terminal": "Pipe"
-}
diff --git a/src/main/resources/assets/poweradvantage/lang/en_ca.json b/src/main/resources/assets/poweradvantage/lang/en_ca.json
deleted file mode 100644
index 7b1619fe..00000000
--- a/src/main/resources/assets/poweradvantage/lang/en_ca.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
-  "nei.poweradvantage.recipehandler.shapelessfurnace.name": "Large Furnace (Shapeless)",
-  "nei.poweradvantage.recipehandler.shapedfurnace.name": "Large Furnace (Shaped)",
-  "tooltip.poweradvantage.empty": "Empty",
-  "tooltip.poweradvantage.buckets_of": "%x buckets of %y",
-  "itemGroup.poweradvantage": "Power Advantage",
-  "tile.poweradvantage.fluid_drain.name": "Drain",
-  "tile.poweradvantage.fluid_discharge.name": "Discharge Grate",
-  "tile.poweradvantage.fluid_storage_tank.name": "Portable Fluid Tank",
-  "item.poweradvantage.fluid_storage_tank_item.name": "Storage Tank",
-  "tile.poweradvantage.fluid_pipe.name": "Pipe",
-  "tile.poweradvantage.item_conveyor.name": "Conveyor",
-  "tile.poweradvantage.item_filter_block.name": "Block Filter Conveyor",
-  "tile.poweradvantage.item_filter_food.name": "Food Filter Conveyor",
-  "tile.poweradvantage.item_filter_fuel.name": "Fuel Filter Conveyor",
-  "tile.poweradvantage.item_filter_inventory.name": "Filter Conveyor",
-  "tile.poweradvantage.item_filter_ore.name": "Ore Filter Conveyor",
-  "tile.poweradvantage.item_filter_plant.name": "Plantable Filter Conveyor",
-  "tile.poweradvantage.item_filter_smelt.name": "Furnace Filter Conveyor",
-  "tile.poweradvantage.item_filter_overflow.name": "Overflow Filter Conveyor",
-  "tile.poweradvantage.steel_frame.name": "Steel Frame",
-  "item.poweradvantage.starch.name": "Starch",
-  "item.poweradvantage.bioplastic_ingot.name": "Bioplastic Ingot",
-  "item.poweradvantage.sprocket.name": "Sprocket",
-  "tile.poweradvantage.fluid_metal_tank.name": "Metal Fluid Tank",
-  "item.poweradvantage.rotator_tool.name": "Rotation Wrench",
-  "tile.poweradvantage.infinite_steam.name": "Unlimited Steam Power",
-  "tile.poweradvantage.infinite_electricity.name": "Unlimited Electrical Power",
-  "tile.poweradvantage.infinite_quantum.name": "Unlimited Quantum Power",
-  "tile.poweradvantage.crude_oil.name": "Crude Oil",
-  "fluid.poweradvantage.crude_oil": "Crude Oil",
-  "item.bucket.crude_oil": "Bucket of Crude Oil",
-  "tile.poweradvantage.still.name": "Distillation Furnace",
-  "tile.poweradvantage.refined_oil.name": "Refined Oil",
-  "fluid.poweradvantage.refined_oil": "Refined Oil",
-  "item.bucket.refined_oil": "Bucket of Refined Oil",
-  "tile.poweradvantage.fluid_switch.name": "Fluid Switch Valve",
-  "tile.poweradvantage.converter_rf_steam.name": "Steam-RF Transformer",
-  "tile.poweradvantage.converter_rf_electricity.name": "Electricity-RF Transformer",
-  "tile.poweradvantage.converter_rf_quantum.name": "Quantum-RF Transformer",
-  "tile.poweradvantage.converter_tr_electricity.name": "Electricity-EU Transformer",
-  "block.poweradvantage.fluid_drain": "Drain",
-  "block.poweradvantage.fluid_discharge": "Discharge Grate",
-  "block.poweradvantage.fluid_storage_tank": "Portable Fluid Tank",
-  "item.poweradvantage.fluid_storage_tank_item": "Storage Tank",
-  "block.poweradvantage.fluid_pipe": "Pipe",
-  "block.poweradvantage.item_conveyor": "Conveyor",
-  "block.poweradvantage.item_filter_block": "Block Filter Conveyor",
-  "block.poweradvantage.item_filter_food": "Food Filter Conveyor",
-  "block.poweradvantage.item_filter_fuel": "Fuel Filter Conveyor",
-  "block.poweradvantage.item_filter_inventory": "Filter Conveyor",
-  "block.poweradvantage.item_filter_ore": "Ore Filter Conveyor",
-  "block.poweradvantage.item_filter_plant": "Plantable Filter Conveyor",
-  "block.poweradvantage.item_filter_smelt": "Furnace Filter Conveyor",
-  "block.poweradvantage.item_filter_overflow": "Overflow Filter Conveyor",
-  "block.poweradvantage.steel_frame": "Steel Frame",
-  "item.poweradvantage.starch": "Starch",
-  "item.poweradvantage.bioplastic_ingot": "Bioplastic Ingot",
-  "item.poweradvantage.sprocket": "Sprocket",
-  "block.poweradvantage.fluid_metal_tank": "Metal Fluid Tank",
-  "item.poweradvantage.rotator_tool": "Rotation Wrench",
-  "block.poweradvantage.infinite_steam": "Unlimited Steam Power",
-  "block.poweradvantage.infinite_electricity": "Unlimited Electrical Power",
-  "block.poweradvantage.infinite_quantum": "Unlimited Quantum Power",
-  "block.poweradvantage.crude_oil": "Crude Oil",
-  "block.poweradvantage.still": "Distillation Furnace",
-  "block.poweradvantage.refined_oil": "Refined Oil",
-  "block.poweradvantage.fluid_switch": "Fluid Switch Valve",
-  "block.poweradvantage.converter_rf_steam": "Steam-RF Transformer",
-  "block.poweradvantage.converter_rf_electricity": "Electricity-RF Transformer",
-  "block.poweradvantage.converter_rf_quantum": "Quantum-RF Transformer",
-  "block.poweradvantage.converter_tr_electricity": "Electricity-EU Transformer",
-  "item.poweradvantage.crude_oil_bucket": "Bucket of Crude Oil",
-  "item.poweradvantage.refined_oil_bucket": "Bucket of Refined Oil",
-  "block.poweradvantage.fluid_pipe_terminal": "Pipe"
-}
diff --git a/src/main/resources/assets/poweradvantage/lang/en_en.json b/src/main/resources/assets/poweradvantage/lang/en_en.json
deleted file mode 100644
index 7b1619fe..00000000
--- a/src/main/resources/assets/poweradvantage/lang/en_en.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
-  "nei.poweradvantage.recipehandler.shapelessfurnace.name": "Large Furnace (Shapeless)",
-  "nei.poweradvantage.recipehandler.shapedfurnace.name": "Large Furnace (Shaped)",
-  "tooltip.poweradvantage.empty": "Empty",
-  "tooltip.poweradvantage.buckets_of": "%x buckets of %y",
-  "itemGroup.poweradvantage": "Power Advantage",
-  "tile.poweradvantage.fluid_drain.name": "Drain",
-  "tile.poweradvantage.fluid_discharge.name": "Discharge Grate",
-  "tile.poweradvantage.fluid_storage_tank.name": "Portable Fluid Tank",
-  "item.poweradvantage.fluid_storage_tank_item.name": "Storage Tank",
-  "tile.poweradvantage.fluid_pipe.name": "Pipe",
-  "tile.poweradvantage.item_conveyor.name": "Conveyor",
-  "tile.poweradvantage.item_filter_block.name": "Block Filter Conveyor",
-  "tile.poweradvantage.item_filter_food.name": "Food Filter Conveyor",
-  "tile.poweradvantage.item_filter_fuel.name": "Fuel Filter Conveyor",
-  "tile.poweradvantage.item_filter_inventory.name": "Filter Conveyor",
-  "tile.poweradvantage.item_filter_ore.name": "Ore Filter Conveyor",
-  "tile.poweradvantage.item_filter_plant.name": "Plantable Filter Conveyor",
-  "tile.poweradvantage.item_filter_smelt.name": "Furnace Filter Conveyor",
-  "tile.poweradvantage.item_filter_overflow.name": "Overflow Filter Conveyor",
-  "tile.poweradvantage.steel_frame.name": "Steel Frame",
-  "item.poweradvantage.starch.name": "Starch",
-  "item.poweradvantage.bioplastic_ingot.name": "Bioplastic Ingot",
-  "item.poweradvantage.sprocket.name": "Sprocket",
-  "tile.poweradvantage.fluid_metal_tank.name": "Metal Fluid Tank",
-  "item.poweradvantage.rotator_tool.name": "Rotation Wrench",
-  "tile.poweradvantage.infinite_steam.name": "Unlimited Steam Power",
-  "tile.poweradvantage.infinite_electricity.name": "Unlimited Electrical Power",
-  "tile.poweradvantage.infinite_quantum.name": "Unlimited Quantum Power",
-  "tile.poweradvantage.crude_oil.name": "Crude Oil",
-  "fluid.poweradvantage.crude_oil": "Crude Oil",
-  "item.bucket.crude_oil": "Bucket of Crude Oil",
-  "tile.poweradvantage.still.name": "Distillation Furnace",
-  "tile.poweradvantage.refined_oil.name": "Refined Oil",
-  "fluid.poweradvantage.refined_oil": "Refined Oil",
-  "item.bucket.refined_oil": "Bucket of Refined Oil",
-  "tile.poweradvantage.fluid_switch.name": "Fluid Switch Valve",
-  "tile.poweradvantage.converter_rf_steam.name": "Steam-RF Transformer",
-  "tile.poweradvantage.converter_rf_electricity.name": "Electricity-RF Transformer",
-  "tile.poweradvantage.converter_rf_quantum.name": "Quantum-RF Transformer",
-  "tile.poweradvantage.converter_tr_electricity.name": "Electricity-EU Transformer",
-  "block.poweradvantage.fluid_drain": "Drain",
-  "block.poweradvantage.fluid_discharge": "Discharge Grate",
-  "block.poweradvantage.fluid_storage_tank": "Portable Fluid Tank",
-  "item.poweradvantage.fluid_storage_tank_item": "Storage Tank",
-  "block.poweradvantage.fluid_pipe": "Pipe",
-  "block.poweradvantage.item_conveyor": "Conveyor",
-  "block.poweradvantage.item_filter_block": "Block Filter Conveyor",
-  "block.poweradvantage.item_filter_food": "Food Filter Conveyor",
-  "block.poweradvantage.item_filter_fuel": "Fuel Filter Conveyor",
-  "block.poweradvantage.item_filter_inventory": "Filter Conveyor",
-  "block.poweradvantage.item_filter_ore": "Ore Filter Conveyor",
-  "block.poweradvantage.item_filter_plant": "Plantable Filter Conveyor",
-  "block.poweradvantage.item_filter_smelt": "Furnace Filter Conveyor",
-  "block.poweradvantage.item_filter_overflow": "Overflow Filter Conveyor",
-  "block.poweradvantage.steel_frame": "Steel Frame",
-  "item.poweradvantage.starch": "Starch",
-  "item.poweradvantage.bioplastic_ingot": "Bioplastic Ingot",
-  "item.poweradvantage.sprocket": "Sprocket",
-  "block.poweradvantage.fluid_metal_tank": "Metal Fluid Tank",
-  "item.poweradvantage.rotator_tool": "Rotation Wrench",
-  "block.poweradvantage.infinite_steam": "Unlimited Steam Power",
-  "block.poweradvantage.infinite_electricity": "Unlimited Electrical Power",
-  "block.poweradvantage.infinite_quantum": "Unlimited Quantum Power",
-  "block.poweradvantage.crude_oil": "Crude Oil",
-  "block.poweradvantage.still": "Distillation Furnace",
-  "block.poweradvantage.refined_oil": "Refined Oil",
-  "block.poweradvantage.fluid_switch": "Fluid Switch Valve",
-  "block.poweradvantage.converter_rf_steam": "Steam-RF Transformer",
-  "block.poweradvantage.converter_rf_electricity": "Electricity-RF Transformer",
-  "block.poweradvantage.converter_rf_quantum": "Quantum-RF Transformer",
-  "block.poweradvantage.converter_tr_electricity": "Electricity-EU Transformer",
-  "item.poweradvantage.crude_oil_bucket": "Bucket of Crude Oil",
-  "item.poweradvantage.refined_oil_bucket": "Bucket of Refined Oil",
-  "block.poweradvantage.fluid_pipe_terminal": "Pipe"
-}
diff --git a/src/main/resources/assets/poweradvantage/lang/en_gb.json b/src/main/resources/assets/poweradvantage/lang/en_gb.json
deleted file mode 100644
index 7b1619fe..00000000
--- a/src/main/resources/assets/poweradvantage/lang/en_gb.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
-  "nei.poweradvantage.recipehandler.shapelessfurnace.name": "Large Furnace (Shapeless)",
-  "nei.poweradvantage.recipehandler.shapedfurnace.name": "Large Furnace (Shaped)",
-  "tooltip.poweradvantage.empty": "Empty",
-  "tooltip.poweradvantage.buckets_of": "%x buckets of %y",
-  "itemGroup.poweradvantage": "Power Advantage",
-  "tile.poweradvantage.fluid_drain.name": "Drain",
-  "tile.poweradvantage.fluid_discharge.name": "Discharge Grate",
-  "tile.poweradvantage.fluid_storage_tank.name": "Portable Fluid Tank",
-  "item.poweradvantage.fluid_storage_tank_item.name": "Storage Tank",
-  "tile.poweradvantage.fluid_pipe.name": "Pipe",
-  "tile.poweradvantage.item_conveyor.name": "Conveyor",
-  "tile.poweradvantage.item_filter_block.name": "Block Filter Conveyor",
-  "tile.poweradvantage.item_filter_food.name": "Food Filter Conveyor",
-  "tile.poweradvantage.item_filter_fuel.name": "Fuel Filter Conveyor",
-  "tile.poweradvantage.item_filter_inventory.name": "Filter Conveyor",
-  "tile.poweradvantage.item_filter_ore.name": "Ore Filter Conveyor",
-  "tile.poweradvantage.item_filter_plant.name": "Plantable Filter Conveyor",
-  "tile.poweradvantage.item_filter_smelt.name": "Furnace Filter Conveyor",
-  "tile.poweradvantage.item_filter_overflow.name": "Overflow Filter Conveyor",
-  "tile.poweradvantage.steel_frame.name": "Steel Frame",
-  "item.poweradvantage.starch.name": "Starch",
-  "item.poweradvantage.bioplastic_ingot.name": "Bioplastic Ingot",
-  "item.poweradvantage.sprocket.name": "Sprocket",
-  "tile.poweradvantage.fluid_metal_tank.name": "Metal Fluid Tank",
-  "item.poweradvantage.rotator_tool.name": "Rotation Wrench",
-  "tile.poweradvantage.infinite_steam.name": "Unlimited Steam Power",
-  "tile.poweradvantage.infinite_electricity.name": "Unlimited Electrical Power",
-  "tile.poweradvantage.infinite_quantum.name": "Unlimited Quantum Power",
-  "tile.poweradvantage.crude_oil.name": "Crude Oil",
-  "fluid.poweradvantage.crude_oil": "Crude Oil",
-  "item.bucket.crude_oil": "Bucket of Crude Oil",
-  "tile.poweradvantage.still.name": "Distillation Furnace",
-  "tile.poweradvantage.refined_oil.name": "Refined Oil",
-  "fluid.poweradvantage.refined_oil": "Refined Oil",
-  "item.bucket.refined_oil": "Bucket of Refined Oil",
-  "tile.poweradvantage.fluid_switch.name": "Fluid Switch Valve",
-  "tile.poweradvantage.converter_rf_steam.name": "Steam-RF Transformer",
-  "tile.poweradvantage.converter_rf_electricity.name": "Electricity-RF Transformer",
-  "tile.poweradvantage.converter_rf_quantum.name": "Quantum-RF Transformer",
-  "tile.poweradvantage.converter_tr_electricity.name": "Electricity-EU Transformer",
-  "block.poweradvantage.fluid_drain": "Drain",
-  "block.poweradvantage.fluid_discharge": "Discharge Grate",
-  "block.poweradvantage.fluid_storage_tank": "Portable Fluid Tank",
-  "item.poweradvantage.fluid_storage_tank_item": "Storage Tank",
-  "block.poweradvantage.fluid_pipe": "Pipe",
-  "block.poweradvantage.item_conveyor": "Conveyor",
-  "block.poweradvantage.item_filter_block": "Block Filter Conveyor",
-  "block.poweradvantage.item_filter_food": "Food Filter Conveyor",
-  "block.poweradvantage.item_filter_fuel": "Fuel Filter Conveyor",
-  "block.poweradvantage.item_filter_inventory": "Filter Conveyor",
-  "block.poweradvantage.item_filter_ore": "Ore Filter Conveyor",
-  "block.poweradvantage.item_filter_plant": "Plantable Filter Conveyor",
-  "block.poweradvantage.item_filter_smelt": "Furnace Filter Conveyor",
-  "block.poweradvantage.item_filter_overflow": "Overflow Filter Conveyor",
-  "block.poweradvantage.steel_frame": "Steel Frame",
-  "item.poweradvantage.starch": "Starch",
-  "item.poweradvantage.bioplastic_ingot": "Bioplastic Ingot",
-  "item.poweradvantage.sprocket": "Sprocket",
-  "block.poweradvantage.fluid_metal_tank": "Metal Fluid Tank",
-  "item.poweradvantage.rotator_tool": "Rotation Wrench",
-  "block.poweradvantage.infinite_steam": "Unlimited Steam Power",
-  "block.poweradvantage.infinite_electricity": "Unlimited Electrical Power",
-  "block.poweradvantage.infinite_quantum": "Unlimited Quantum Power",
-  "block.poweradvantage.crude_oil": "Crude Oil",
-  "block.poweradvantage.still": "Distillation Furnace",
-  "block.poweradvantage.refined_oil": "Refined Oil",
-  "block.poweradvantage.fluid_switch": "Fluid Switch Valve",
-  "block.poweradvantage.converter_rf_steam": "Steam-RF Transformer",
-  "block.poweradvantage.converter_rf_electricity": "Electricity-RF Transformer",
-  "block.poweradvantage.converter_rf_quantum": "Quantum-RF Transformer",
-  "block.poweradvantage.converter_tr_electricity": "Electricity-EU Transformer",
-  "item.poweradvantage.crude_oil_bucket": "Bucket of Crude Oil",
-  "item.poweradvantage.refined_oil_bucket": "Bucket of Refined Oil",
-  "block.poweradvantage.fluid_pipe_terminal": "Pipe"
-}
diff --git a/src/main/resources/assets/poweradvantage/lang/en_pt.json b/src/main/resources/assets/poweradvantage/lang/en_pt.json
deleted file mode 100644
index 0c78c2f9..00000000
--- a/src/main/resources/assets/poweradvantage/lang/en_pt.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
-  "nei.poweradvantage.recipehandler.shapelessfurnace.name": "Large Furnace (Shapeless)",
-  "nei.poweradvantage.recipehandler.shapedfurnace.name": "Large Furnace (Shaped)",
-  "tooltip.poweradvantage.empty": "Empty",
-  "tooltip.poweradvantage.buckets_of": "%x buckets of %y",
-  "itemGroup.poweradvantage": "Power Advantage",
-  "tile.poweradvantage.fluid_drain.name": "Drain",
-  "tile.poweradvantage.fluid_discharge.name": "Discharge Grate",
-  "tile.poweradvantage.fluid_storage_tank.name": "Portable Fluid Tank",
-  "item.poweradvantage.fluid_storage_tank_item.name": "Storage Tank",
-  "tile.poweradvantage.fluid_pipe.name": "Pipe",
-  "tile.poweradvantage.item_conveyor.name": "Conveyor",
-  "tile.poweradvantage.item_filter_block.name": "Block Filter Conveyor",
-  "tile.poweradvantage.item_filter_food.name": "Food Filter Conveyor",
-  "tile.poweradvantage.item_filter_fuel.name": "Fuel Filter Conveyor",
-  "tile.poweradvantage.item_filter_inventory.name": "Filter Conveyor",
-  "tile.poweradvantage.item_filter_ore.name": "Ore Filter Conveyor",
-  "tile.poweradvantage.item_filter_plant.name": "Plantable Filter Conveyor",
-  "tile.poweradvantage.item_filter_smelt.name": "Furnace Filter Conveyor",
-  "tile.poweradvantage.item_filter_overflow.name": "Overflow Filter Conveyor",
-  "tile.poweradvantage.steel_frame.name": "Steel Frame",
-  "item.poweradvantage.starch.name": "Starch",
-  "item.poweradvantage.bioplastic_ingot.name": "Bioplastic Ingot",
-  "item.poweradvantage.sprocket.name": "Sprocket",
-  "tile.poweradvantage.fluid_metal_tank.name": "Metal Fluid Tank",
-  "item.poweradvantage.rotator_tool.name": "Rotation Wrench",
-  "tile.poweradvantage.infinite_steam.name": "Unlimited Steam Power",
-  "tile.poweradvantage.infinite_electricity.name": "Unlimited Electrical Power",
-  "tile.poweradvantage.infinite_quantum.name": "Unlimited Quantum Power",
-  "tile.poweradvantage.crude_oil.name": "Black Gold",
-  "fluid.poweradvantage.crude_oil": "Black Gold",
-  "item.bucket.crude_oil": "Bucket o' Black Gold",
-  "tile.poweradvantage.still.name": "'Stillery",
-  "tile.poweradvantage.refined_oil.name": "Lamp Oil",
-  "fluid.poweradvantage.refined_oil": "Lamp Oil",
-  "item.bucket.refined_oil": "Bucket o' Lamp Oil",
-  "tile.poweradvantage.fluid_switch.name": "Big Red Valve",
-  "tile.poweradvantage.converter_rf_steam.name": "Steam-RF Transformer",
-  "tile.poweradvantage.converter_rf_electricity.name": "Electricity-RF Transformer",
-  "tile.poweradvantage.converter_rf_quantum.name": "Quantum-RF Transformer",
-  "tile.poweradvantage.converter_tr_electricity.name": "Electricity-EU Transformer",
-  "block.poweradvantage.fluid_drain": "Drain",
-  "block.poweradvantage.fluid_discharge": "Discharge Grate",
-  "block.poweradvantage.fluid_storage_tank": "Portable Fluid Tank",
-  "item.poweradvantage.fluid_storage_tank_item": "Storage Tank",
-  "block.poweradvantage.fluid_pipe": "Pipe",
-  "block.poweradvantage.item_conveyor": "Conveyor",
-  "block.poweradvantage.item_filter_block": "Block Filter Conveyor",
-  "block.poweradvantage.item_filter_food": "Food Filter Conveyor",
-  "block.poweradvantage.item_filter_fuel": "Fuel Filter Conveyor",
-  "block.poweradvantage.item_filter_inventory": "Filter Conveyor",
-  "block.poweradvantage.item_filter_ore": "Ore Filter Conveyor",
-  "block.poweradvantage.item_filter_plant": "Plantable Filter Conveyor",
-  "block.poweradvantage.item_filter_smelt": "Furnace Filter Conveyor",
-  "block.poweradvantage.item_filter_overflow": "Overflow Filter Conveyor",
-  "block.poweradvantage.steel_frame": "Steel Frame",
-  "item.poweradvantage.starch": "Starch",
-  "item.poweradvantage.bioplastic_ingot": "Bioplastic Ingot",
-  "item.poweradvantage.sprocket": "Sprocket",
-  "block.poweradvantage.fluid_metal_tank": "Metal Fluid Tank",
-  "item.poweradvantage.rotator_tool": "Rotation Wrench",
-  "block.poweradvantage.infinite_steam": "Unlimited Steam Power",
-  "block.poweradvantage.infinite_electricity": "Unlimited Electrical Power",
-  "block.poweradvantage.infinite_quantum": "Unlimited Quantum Power",
-  "block.poweradvantage.crude_oil": "Black Gold",
-  "block.poweradvantage.still": "'Stillery",
-  "block.poweradvantage.refined_oil": "Lamp Oil",
-  "block.poweradvantage.fluid_switch": "Big Red Valve",
-  "block.poweradvantage.converter_rf_steam": "Steam-RF Transformer",
-  "block.poweradvantage.converter_rf_electricity": "Electricity-RF Transformer",
-  "block.poweradvantage.converter_rf_quantum": "Quantum-RF Transformer",
-  "block.poweradvantage.converter_tr_electricity": "Electricity-EU Transformer",
-  "item.poweradvantage.crude_oil_bucket": "Bucket o' Black Gold",
-  "item.poweradvantage.refined_oil_bucket": "Bucket o' Lamp Oil",
-  "block.poweradvantage.fluid_pipe_terminal": "Pipe"
-}
diff --git a/src/main/resources/assets/poweradvantage/lang/en_us.json b/src/main/resources/assets/poweradvantage/lang/en_us.json
deleted file mode 100644
index 76a243b9..00000000
--- a/src/main/resources/assets/poweradvantage/lang/en_us.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
-  "nei.poweradvantage.recipehandler.shapelessfurnace.name": "Large Furnace (Shapeless)",
-  "nei.poweradvantage.recipehandler.shapedfurnace.name": "Large Furnace (Shaped)",
-  "tooltip.poweradvantage.empty": "Empty",
-  "tooltip.poweradvantage.buckets_of": "%x buckets of %y",
-  "itemGroup.poweradvantage": "Power Advantage",
-  "tile.poweradvantage.fluid_drain.name": "Drain",
-  "tile.poweradvantage.fluid_discharge.name": "Discharge Grate",
-  "tile.poweradvantage.fluid_storage_tank.name": "Portable Fluid Tank",
-  "tile.poweradvantage.fluid_pipe.name": "Pipe",
-  "tile.poweradvantage.item_conveyor.name": "Conveyor",
-  "tile.poweradvantage.item_filter_block.name": "Block Filter Conveyor",
-  "tile.poweradvantage.item_filter_food.name": "Food Filter Conveyor",
-  "tile.poweradvantage.item_filter_fuel.name": "Fuel Filter Conveyor",
-  "tile.poweradvantage.item_filter_inventory.name": "Filter Conveyor",
-  "tile.poweradvantage.item_filter_ore.name": "Ore Filter Conveyor",
-  "tile.poweradvantage.item_filter_plant.name": "Plantable Filter Conveyor",
-  "tile.poweradvantage.item_filter_smelt.name": "Furnace Filter Conveyor",
-  "tile.poweradvantage.item_filter_overflow.name": "Overflow Filter Conveyor",
-  "tile.poweradvantage.steel_frame.name": "Steel Frame",
-  "item.poweradvantage.starch.name": "Starch",
-  "item.poweradvantage.bioplastic_ingot.name": "Bioplastic Ingot",
-  "item.poweradvantage.sprocket.name": "Sprocket",
-  "tile.poweradvantage.fluid_metal_tank.name": "Metal Fluid Tank",
-  "item.poweradvantage.rotator_tool.name": "Rotation Wrench",
-  "tile.poweradvantage.infinite_steam.name": "Unlimited Steam Power",
-  "tile.poweradvantage.infinite_electricity.name": "Unlimited Electrical Power",
-  "tile.poweradvantage.infinite_quantum.name": "Unlimited Quantum Power",
-  "tile.poweradvantage.crude_oil.name": "Crude Oil",
-  "fluid.poweradvantage.crude_oil": "Crude Oil",
-  "item.bucket.crude_oil": "Bucket of Crude Oil",
-  "tile.poweradvantage.still.name": "Distillation Furnace",
-  "tile.poweradvantage.refined_oil.name": "Refined Oil",
-  "fluid.poweradvantage.refined_oil": "Refined Oil",
-  "item.bucket.refined_oil": "Bucket of Refined Oil",
-  "tile.poweradvantage.fluid_switch.name": "Fluid Switch Valve",
-  "tile.poweradvantage.converter_rf_steam.name": "Steam-RF Transformer",
-  "tile.poweradvantage.converter_rf_electricity.name": "Electricity-RF Transformer",
-  "tile.poweradvantage.converter_rf_quantum.name": "Quantum-RF Transformer",
-  "tile.poweradvantage.converter_tr_electricity.name": "Electricity-EU Transformer",
-  "block.poweradvantage.fluid_drain": "Drain",
-  "block.poweradvantage.fluid_discharge": "Discharge Grate",
-  "block.poweradvantage.fluid_storage_tank": "Portable Fluid Tank",
-  "block.poweradvantage.fluid_pipe": "Pipe",
-  "block.poweradvantage.item_conveyor": "Conveyor",
-  "block.poweradvantage.item_filter_block": "Block Filter Conveyor",
-  "block.poweradvantage.item_filter_food": "Food Filter Conveyor",
-  "block.poweradvantage.item_filter_fuel": "Fuel Filter Conveyor",
-  "block.poweradvantage.item_filter_inventory": "Filter Conveyor",
-  "block.poweradvantage.item_filter_ore": "Ore Filter Conveyor",
-  "block.poweradvantage.item_filter_plant": "Plantable Filter Conveyor",
-  "block.poweradvantage.item_filter_smelt": "Furnace Filter Conveyor",
-  "block.poweradvantage.item_filter_overflow": "Overflow Filter Conveyor",
-  "block.poweradvantage.steel_frame": "Steel Frame",
-  "item.poweradvantage.starch": "Starch",
-  "item.poweradvantage.bioplastic_ingot": "Bioplastic Ingot",
-  "item.poweradvantage.sprocket": "Sprocket",
-  "block.poweradvantage.fluid_metal_tank": "Metal Fluid Tank",
-  "item.poweradvantage.rotator_tool": "Rotation Wrench",
-  "block.poweradvantage.infinite_steam": "Unlimited Steam Power",
-  "block.poweradvantage.infinite_electricity": "Unlimited Electrical Power",
-  "block.poweradvantage.infinite_quantum": "Unlimited Quantum Power",
-  "block.poweradvantage.crude_oil": "Crude Oil",
-  "block.poweradvantage.still": "Distillation Furnace",
-  "block.poweradvantage.refined_oil": "Refined Oil",
-  "block.poweradvantage.fluid_switch": "Fluid Switch Valve",
-  "block.poweradvantage.converter_rf_steam": "Steam-RF Transformer",
-  "block.poweradvantage.converter_rf_electricity": "Electricity-RF Transformer",
-  "block.poweradvantage.converter_rf_quantum": "Quantum-RF Transformer",
-  "block.poweradvantage.converter_tr_electricity": "Electricity-EU Transformer",
-  "item.poweradvantage.crude_oil_bucket": "Bucket of Crude Oil",
-  "item.poweradvantage.refined_oil_bucket": "Bucket of Refined Oil",
-  "block.poweradvantage.fluid_pipe_terminal": "Pipe"
-}
diff --git a/src/main/resources/assets/poweradvantage/lang/es_es.json b/src/main/resources/assets/poweradvantage/lang/es_es.json
deleted file mode 100644
index 68471f7c..00000000
--- a/src/main/resources/assets/poweradvantage/lang/es_es.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
-  "nei.poweradvantage.recipehandler.shapelessfurnace.name": "Gran Horno (no forma)",
-  "nei.poweradvantage.recipehandler.shapedfurnace.name": "Gran Horno (en forma)",
-  "tooltip.poweradvantage.empty": "Vacío",
-  "tooltip.poweradvantage.buckets_of ": "%x cubos de %y",
-  "itemGroup.poweradvantage": "Ventaja de Energía",
-  "tile.poweradvantage.fluid_drain.name": "Drenaje",
-  "tile.poweradvantage.fluid_discharge.name": "Descarga Grate",
-  "tile.poweradvantage.fluid_storage_tank.name": "Tanque de almacenamiento",
-  "item.poweradvantage.fluid_storage_tank_item.name": "Tanque de almacenamiento",
-  "tile.poweradvantage.fluid_pipe.name": "Tubo",
-  "tile.poweradvantage.item_conveyor.name": "Transportadores",
-  "tile.poweradvantage.item_filter_block.name": "Bloquear Filtro Transportadores",
-  "tile.poweradvantage.item_filter_food.name": "Filtro Alimentos Transportadores",
-  "tile.poweradvantage.item_filter_fuel.name": "Filtro de combustible Transportadores",
-  "tile.poweradvantage.item_filter_inventory.name": "Filtro Transportadores",
-  "tile.poweradvantage.item_filter_ore.name": "Ore Transportadores Filtro",
-  "tile.poweradvantage.item_filter_plant.name": "Plantable Transportadores Filtro",
-  "tile.poweradvantage.item_filter_smelt.name": "Horno Filtro Transportadores",
-  "tile.poweradvantage.item_filter_overflow.name": "Desbordamiento Filtro Transportadores",
-  "tile.poweradvantage.steel_frame.name": "Marco de Acero",
-  "item.poweradvantage.starch.name": "Almidón",
-  "item.poweradvantage.bioplastic_ingot.name": "Bioplástico Lingote",
-  "item.poweradvantage.sprocket.name": "Piñón",
-  "tile.poweradvantage.fluid_metal_tank.name": "Tanque de Almacenamiento de Acero",
-  "item.poweradvantage.rotator_tool.name": "Herramienta de Rotación",
-  "tile.poweradvantage.infinite_steam.name": "La Energía de Vapor Infinito",
-  "tile.poweradvantage.infinite_electricity.name": "Energía Eléctrica Infinito",
-  "tile.poweradvantage.infinite_quantum.name": "Cuántica Infinito",
-  "tile.poweradvantage.crude_oil.name": "Petróleo Crudo",
-  "fluid.poweradvantage.crude_oil": "Petróleo Crudo",
-  "item.bucket.crude_oil.name": "Cubo de Crudo",
-  "tile.poweradvantage.still.name": "Destilería",
-  "tile.poweradvantage.refined_oil.name": "Refinado de Petróleo",
-  "fluid.poweradvantage.refined_oil": "Refinado de Petróleo",
-  "item.bucket.refined_oil.name": "Cubo de Refinado de Petróleo",
-  "tile.poweradvantage.fluid_switch.name": "Válvula",
-  "tile.poweradvantage.converter_rf_steam.name": "Vapor-RF Transformador",
-  "tile.poweradvantage.converter_rf_electricity.name": "Electricidad-RF Transformador",
-  "tile.poweradvantage.converter_rf_quantum.name": "Cuántico-RF Transformador",
-  "tile.poweradvantage.converter_tr_electricity.name": "Electricidad-EU Transformador",
-  "block.poweradvantage.fluid_drain": "Drenaje",
-  "block.poweradvantage.fluid_discharge": "Descarga Grate",
-  "block.poweradvantage.fluid_storage_tank": "Tanque de almacenamiento",
-  "item.poweradvantage.fluid_storage_tank_item": "Tanque de almacenamiento",
-  "block.poweradvantage.fluid_pipe": "Tubo",
-  "block.poweradvantage.item_conveyor": "Transportadores",
-  "block.poweradvantage.item_filter_block": "Bloquear Filtro Transportadores",
-  "block.poweradvantage.item_filter_food": "Filtro Alimentos Transportadores",
-  "block.poweradvantage.item_filter_fuel": "Filtro de combustible Transportadores",
-  "block.poweradvantage.item_filter_inventory": "Filtro Transportadores",
-  "block.poweradvantage.item_filter_ore": "Ore Transportadores Filtro",
-  "block.poweradvantage.item_filter_plant": "Plantable Transportadores Filtro",
-  "block.poweradvantage.item_filter_smelt": "Horno Filtro Transportadores",
-  "block.poweradvantage.item_filter_overflow": "Desbordamiento Filtro Transportadores",
-  "block.poweradvantage.steel_frame": "Marco de Acero",
-  "item.poweradvantage.starch": "Almidón",
-  "item.poweradvantage.bioplastic_ingot": "Bioplástico Lingote",
-  "item.poweradvantage.sprocket": "Piñón",
-  "block.poweradvantage.fluid_metal_tank": "Tanque de Almacenamiento de Acero",
-  "item.poweradvantage.rotator_tool": "Herramienta de Rotación",
-  "block.poweradvantage.infinite_steam": "La Energía de Vapor Infinito",
-  "block.poweradvantage.infinite_electricity": "Energía Eléctrica Infinito",
-  "block.poweradvantage.infinite_quantum": "Cuántica Infinito",
-  "block.poweradvantage.crude_oil": "Petróleo Crudo",
-  "block.poweradvantage.still": "Destilería",
-  "block.poweradvantage.refined_oil": "Refinado de Petróleo",
-  "block.poweradvantage.fluid_switch": "Válvula",
-  "block.poweradvantage.converter_rf_steam": "Vapor-RF Transformador",
-  "block.poweradvantage.converter_rf_electricity": "Electricidad-RF Transformador",
-  "block.poweradvantage.converter_rf_quantum": "Cuántico-RF Transformador",
-  "block.poweradvantage.converter_tr_electricity": "Electricidad-EU Transformador",
-  "block.poweradvantage.fluid_pipe_terminal": "Tubo"
-}
diff --git a/src/main/resources/assets/poweradvantage/lang/es_mx.json b/src/main/resources/assets/poweradvantage/lang/es_mx.json
deleted file mode 100644
index c0c5cb2e..00000000
--- a/src/main/resources/assets/poweradvantage/lang/es_mx.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
-  "nei.poweradvantage.recipehandler.shapelessfurnace.name": "Gran Horno (no forma)",
-  "nei.poweradvantage.recipehandler.shapedfurnace.name": "Gran Horno (en forma)",
-  "tooltip.poweradvantage.empty": "Vacío",
-  "tooltip.poweradvantage.buckets_of": "%x cubos de %y",
-  "itemGroup.poweradvantage": "Ventaja de Energía",
-  "tile.poweradvantage.fluid_drain.name": "Drenaje",
-  "tile.poweradvantage.fluid_discharge.name": "Descarga Grate",
-  "tile.poweradvantage.fluid_storage_tank.name": "Tanque de almacenamiento",
-  "item.poweradvantage.fluid_storage_tank_item.name": "Tanque de almacenamiento",
-  "tile.poweradvantage.fluid_pipe.name": "Tubo",
-  "tile.poweradvantage.item_conveyor.name": "Transportadores",
-  "tile.poweradvantage.item_filter_block.name": "Bloquear Filtro Transportadores",
-  "tile.poweradvantage.item_filter_food.name": "Filtro Alimentos Transportadores",
-  "tile.poweradvantage.item_filter_fuel.name": "Filtro de combustible Transportadores",
-  "tile.poweradvantage.item_filter_inventory.name": "Filtro Transportadores",
-  "tile.poweradvantage.item_filter_ore.name": "Ore Transportadores Filtro",
-  "tile.poweradvantage.item_filter_plant.name": "Plantable Transportadores Filtro",
-  "tile.poweradvantage.item_filter_smelt.name": "Horno Filtro Transportadores",
-  "tile.poweradvantage.item_filter_overflow.name": "Desbordamiento Filtro Transportadores",
-  "tile.poweradvantage.steel_frame.name": "Marco de Acero",
-  "item.poweradvantage.starch.name": "Almidón",
-  "item.poweradvantage.bioplastic_ingot.name": "Bioplástico Lingote",
-  "item.poweradvantage.sprocket.name": "Piñón",
-  "tile.poweradvantage.fluid_metal_tank.name": "Tanque de Almacenamiento de Acero",
-  "item.poweradvantage.rotator_tool.name": "Herramienta de Rotación",
-  "tile.poweradvantage.infinite_steam.name": "La Energía de Vapor Infinito",
-  "tile.poweradvantage.infinite_electricity.name": "Energía Eléctrica Infinito",
-  "tile.poweradvantage.infinite_quantum.name": "Cuántica Infinito",
-  "tile.poweradvantage.crude_oil.name": "Petróleo Crudo",
-  "fluid.poweradvantage.crude_oil": "Petróleo Crudo",
-  "item.bucket.crude_oil.name": "Cubo de Crudo",
-  "tile.poweradvantage.still.name": "Destilería",
-  "tile.poweradvantage.refined_oil.name": "Refinado de Petróleo",
-  "fluid.poweradvantage.refined_oil": "Refinado de Petróleo",
-  "item.bucket.refined_oil.name": "Cubo de Refinado de Petróleo",
-  "tile.poweradvantage.fluid_switch.name": "Válvula",
-  "tile.poweradvantage.converter_rf_steam.name": "Vapor-RF Transformador",
-  "tile.poweradvantage.converter_rf_electricity.name": "Electricidad-RF Transformador",
-  "tile.poweradvantage.converter_rf_quantum.name": "Cuántico-RF Transformador",
-  "tile.poweradvantage.converter_tr_electricity.name": "Electricidad-EU Transformador",
-  "block.poweradvantage.fluid_drain": "Drenaje",
-  "block.poweradvantage.fluid_discharge": "Descarga Grate",
-  "block.poweradvantage.fluid_storage_tank": "Tanque de almacenamiento",
-  "item.poweradvantage.fluid_storage_tank_item": "Tanque de almacenamiento",
-  "block.poweradvantage.fluid_pipe": "Tubo",
-  "block.poweradvantage.item_conveyor": "Transportadores",
-  "block.poweradvantage.item_filter_block": "Bloquear Filtro Transportadores",
-  "block.poweradvantage.item_filter_food": "Filtro Alimentos Transportadores",
-  "block.poweradvantage.item_filter_fuel": "Filtro de combustible Transportadores",
-  "block.poweradvantage.item_filter_inventory": "Filtro Transportadores",
-  "block.poweradvantage.item_filter_ore": "Ore Transportadores Filtro",
-  "block.poweradvantage.item_filter_plant": "Plantable Transportadores Filtro",
-  "block.poweradvantage.item_filter_smelt": "Horno Filtro Transportadores",
-  "block.poweradvantage.item_filter_overflow": "Desbordamiento Filtro Transportadores",
-  "block.poweradvantage.steel_frame": "Marco de Acero",
-  "item.poweradvantage.starch": "Almidón",
-  "item.poweradvantage.bioplastic_ingot": "Bioplástico Lingote",
-  "item.poweradvantage.sprocket": "Piñón",
-  "block.poweradvantage.fluid_metal_tank": "Tanque de Almacenamiento de Acero",
-  "item.poweradvantage.rotator_tool": "Herramienta de Rotación",
-  "block.poweradvantage.infinite_steam": "La Energía de Vapor Infinito",
-  "block.poweradvantage.infinite_electricity": "Energía Eléctrica Infinito",
-  "block.poweradvantage.infinite_quantum": "Cuántica Infinito",
-  "block.poweradvantage.crude_oil": "Petróleo Crudo",
-  "block.poweradvantage.still": "Destilería",
-  "block.poweradvantage.refined_oil": "Refinado de Petróleo",
-  "block.poweradvantage.fluid_switch": "Válvula",
-  "block.poweradvantage.converter_rf_steam": "Vapor-RF Transformador",
-  "block.poweradvantage.converter_rf_electricity": "Electricidad-RF Transformador",
-  "block.poweradvantage.converter_rf_quantum": "Cuántico-RF Transformador",
-  "block.poweradvantage.converter_tr_electricity": "Electricidad-EU Transformador",
-  "block.poweradvantage.fluid_pipe_terminal": "Tubo"
-}
diff --git a/src/main/resources/assets/poweradvantage/lang/it_it.json b/src/main/resources/assets/poweradvantage/lang/it_it.json
deleted file mode 100644
index b69cfcc1..00000000
--- a/src/main/resources/assets/poweradvantage/lang/it_it.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
-  "nei.poweradvantage.recipehandler.shapelessfurnace.name": "Grande Fornace (informe)",
-  "nei.poweradvantage.recipehandler.shapedfurnace.name": "Grande Fornace (forma)",
-  "tooltip.poweradvantage.empty": "vuoto",
-  "tooltip.poweradvantage.buckets_of": "%x secchi d'%y",
-  "itemGroup.poweradvantage": "Potenza Advantage",
-  "tile.poweradvantage.fluid_drain.name": "Scarico",
-  "tile.poweradvantage.fluid_discharge.name": "Griglia di scarico",
-  "tile.poweradvantage.fluid_storage_tank.name": "Serbatoio",
-  "item.poweradvantage.fluid_storage_tank_item.name": "Serbatoio",
-  "tile.poweradvantage.fluid_pipe.name": "Tubo",
-  "tile.poweradvantage.item_conveyor.name": "Trasportatore",
-  "tile.poweradvantage.item_filter_block.name": "Filtro di blocco trasportatore",
-  "tile.poweradvantage.item_filter_food.name": "Filtro alimentare Conveyor",
-  "tile.poweradvantage.item_filter_fuel.name": "carburante Filtro Conveyor",
-  "tile.poweradvantage.item_filter_inventory.name": "Filtro Conveyor",
-  "tile.poweradvantage.item_filter_ore.name": "Ore Filtro Conveyor",
-  "tile.poweradvantage.item_filter_plant.name": "Plantable Filtro Conveyor",
-  "tile.poweradvantage.item_filter_smelt.name": "Forno Filtro Conveyor",
-  "tile.poweradvantage.item_filter_overflow.name": "Straripamento Filtro Conveyor",
-  "tile.poweradvantage.steel_frame.name": "Steel Frame",
-  "item.poweradvantage.starch.name": "Amido",
-  "item.poweradvantage.bioplastic_ingot.name": "Bioplastica Lingotto",
-  "item.poweradvantage.sprocket.name": "Sprocket",
-  "tile.poweradvantage.fluid_metal_tank.name": "Serbatoio in Metallo",
-  "item.poweradvantage.rotator_tool.name": "Strumento di Rotazione",
-  "tile.poweradvantage.infinite_steam.name": "Forza Vapore Infinite",
-  "tile.poweradvantage.infinite_electricity.name": "Elettricità Infinite",
-  "tile.poweradvantage.infinite_quantum.name": "Atomica Infinite",
-  "tile.poweradvantage.crude_oil.name": "Olio a Crudo",
-  "fluid.poweradvantage.crude_oil": "Olio a Crudo",
-  "item.bucket.crude_oil.name": "Secchio di Greggio",
-  "tile.poweradvantage.still.name": "Distilleria",
-  "tile.poweradvantage.refined_oil.name": "Olio Raffinato",
-  "fluid.poweradvantage.refined_oil": "Olio Raffinato",
-  "item.bucket.refined_oil.name": "Secchio di Olio Raffinato",
-  "tile.poweradvantage.fluid_switch.name": "Valvola",
-  "tile.poweradvantage.converter_rf_steam.name": "Vapore-RF Trasformatore",
-  "tile.poweradvantage.converter_rf_electricity.name": "Elettricità-RF Trasformatore",
-  "tile.poweradvantage.converter_rf_quantum.name": "Quantistico-RF Trasformatore",
-  "tile.poweradvantage.converter_tr_electricity.name": "Elettricità-EU Trasformatore",
-  "block.poweradvantage.fluid_drain": "Scarico",
-  "block.poweradvantage.fluid_discharge": "Griglia di scarico",
-  "block.poweradvantage.fluid_storage_tank": "Serbatoio",
-  "item.poweradvantage.fluid_storage_tank_item": "Serbatoio",
-  "block.poweradvantage.fluid_pipe": "Tubo",
-  "block.poweradvantage.item_conveyor": "Trasportatore",
-  "block.poweradvantage.item_filter_block": "Filtro di blocco trasportatore",
-  "block.poweradvantage.item_filter_food": "Filtro alimentare Conveyor",
-  "block.poweradvantage.item_filter_fuel": "carburante Filtro Conveyor",
-  "block.poweradvantage.item_filter_inventory": "Filtro Conveyor",
-  "block.poweradvantage.item_filter_ore": "Ore Filtro Conveyor",
-  "block.poweradvantage.item_filter_plant": "Plantable Filtro Conveyor",
-  "block.poweradvantage.item_filter_smelt": "Forno Filtro Conveyor",
-  "block.poweradvantage.item_filter_overflow": "Straripamento Filtro Conveyor",
-  "block.poweradvantage.steel_frame": "Steel Frame",
-  "item.poweradvantage.starch": "Amido",
-  "item.poweradvantage.bioplastic_ingot": "Bioplastica Lingotto",
-  "item.poweradvantage.sprocket": "Sprocket",
-  "block.poweradvantage.fluid_metal_tank": "Serbatoio in Metallo",
-  "item.poweradvantage.rotator_tool": "Strumento di Rotazione",
-  "block.poweradvantage.infinite_steam": "Forza Vapore Infinite",
-  "block.poweradvantage.infinite_electricity": "Elettricità Infinite",
-  "block.poweradvantage.infinite_quantum": "Atomica Infinite",
-  "block.poweradvantage.crude_oil": "Olio a Crudo",
-  "block.poweradvantage.still": "Distilleria",
-  "block.poweradvantage.refined_oil": "Olio Raffinato",
-  "block.poweradvantage.fluid_switch": "Valvola",
-  "block.poweradvantage.converter_rf_steam": "Vapore-RF Trasformatore",
-  "block.poweradvantage.converter_rf_electricity": "Elettricità-RF Trasformatore",
-  "block.poweradvantage.converter_rf_quantum": "Quantistico-RF Trasformatore",
-  "block.poweradvantage.converter_tr_electricity": "Elettricità-EU Trasformatore",
-  "block.poweradvantage.fluid_pipe_terminal": "Tubo"
-}
diff --git a/src/main/resources/assets/poweradvantage/lang/ja_jp.json b/src/main/resources/assets/poweradvantage/lang/ja_jp.json
deleted file mode 100644
index b65f8ea5..00000000
--- a/src/main/resources/assets/poweradvantage/lang/ja_jp.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
-  "nei.poweradvantage.recipehandler.shapelessfurnace.name": "大型炉（型崩れ）",
-  "nei.poweradvantage.recipehandler.shapedfurnace.name": "大型炉（形）",
-  "tooltip.poweradvantage.empty": "空",
-  "tooltip.poweradvantage.buckets_of": "%yの%xバケット",
-  "itemGroup.poweradvantage": "パワー·アドバンテージ",
-  "tile.poweradvantage.fluid_drain.name": "ドレン",
-  "tile.poweradvantage.fluid_discharge.name": "放電グレート",
-  "tile.poweradvantage.fluid_storage_tank.name": "貯蔵タンク",
-  "item.poweradvantage.fluid_storage_tank_item.name": "貯蔵タンク",
-  "tile.poweradvantage.fluid_pipe.name": "パイプ",
-  "tile.poweradvantage.item_conveyor.name": "コンベア",
-  "tile.poweradvantage.item_filter_block.name": "ブロックフィルタコンベア",
-  "tile.poweradvantage.item_filter_food.name": "フードフィルターコンベア",
-  "tile.poweradvantage.item_filter_fuel.name": "燃料フィルターコンベア",
-  "tile.poweradvantage.item_filter_inventory.name": "フィルタコンベヤー",
-  "tile.poweradvantage.item_filter_ore.name": "鉱石フィルターコンベア",
-  "tile.poweradvantage.item_filter_plant.name": "プラントフィルタコンベヤー",
-  "tile.poweradvantage.item_filter_smelt.name": "炉フィルターコンベア",
-  "tile.poweradvantage.item_filter_overflow.name": "オーバーフローフィルタコンベヤー",
-  "tile.poweradvantage.steel_frame.name": "鉄骨",
-  "item.poweradvantage.starch.name": "デンプン",
-  "item.poweradvantage.bioplastic_ingot.name": "は、バイオプラスチックインゴットを",
-  "item.poweradvantage.sprocket.name": "スプロケット",
-  "tile.poweradvantage.infinite_steam.name": "無限の蒸気動力",
-  "tile.poweradvantage.infinite_electricity.name": "無限の電力",
-  "tile.poweradvantage.infinite_quantum.name": "無限の量子パワー",
-  "tile.poweradvantage.fluid_metal_tank.name": "金属製貯蔵タンク",
-  "item.poweradvantage.rotator_tool.name": "回転ツール",
-  "tile.poweradvantage.crude_oil.name": "原油",
-  "fluid.poweradvantage.crude_oil": "原油",
-  "item.bucket.crude_oil.name": "原油のバケット",
-  "tile.poweradvantage.still.name": "蒸留酒製造所",
-  "tile.poweradvantage.refined_oil.name": "精製油",
-  "fluid.poweradvantage.refined_oil": "精製油",
-  "item.bucket.refined_oil.name": "精製油のバケツ",
-  "tile.poweradvantage.fluid_switch.name": "バルブ",
-  "tile.poweradvantage.converter_rf_steam.name": "蒸気-RFトランス",
-  "tile.poweradvantage.converter_rf_electricity.name": "電気-RFトランス",
-  "tile.poweradvantage.converter_rf_quantum.name": "量子-RFトランス",
-  "tile.poweradvantage.converter_tr_electricity.name": "電気-EUトランス",
-  "block.poweradvantage.fluid_drain": "ドレン",
-  "block.poweradvantage.fluid_discharge": "放電グレート",
-  "block.poweradvantage.fluid_storage_tank": "貯蔵タンク",
-  "item.poweradvantage.fluid_storage_tank_item": "貯蔵タンク",
-  "block.poweradvantage.fluid_pipe": "パイプ",
-  "block.poweradvantage.item_conveyor": "コンベア",
-  "block.poweradvantage.item_filter_block": "ブロックフィルタコンベア",
-  "block.poweradvantage.item_filter_food": "フードフィルターコンベア",
-  "block.poweradvantage.item_filter_fuel": "燃料フィルターコンベア",
-  "block.poweradvantage.item_filter_inventory": "フィルタコンベヤー",
-  "block.poweradvantage.item_filter_ore": "鉱石フィルターコンベア",
-  "block.poweradvantage.item_filter_plant": "プラントフィルタコンベヤー",
-  "block.poweradvantage.item_filter_smelt": "炉フィルターコンベア",
-  "block.poweradvantage.item_filter_overflow": "オーバーフローフィルタコンベヤー",
-  "block.poweradvantage.steel_frame": "鉄骨",
-  "item.poweradvantage.starch": "デンプン",
-  "item.poweradvantage.bioplastic_ingot": "は、バイオプラスチックインゴットを",
-  "item.poweradvantage.sprocket": "スプロケット",
-  "block.poweradvantage.infinite_steam": "無限の蒸気動力",
-  "block.poweradvantage.infinite_electricity": "無限の電力",
-  "block.poweradvantage.infinite_quantum": "無限の量子パワー",
-  "block.poweradvantage.fluid_metal_tank": "金属製貯蔵タンク",
-  "item.poweradvantage.rotator_tool": "回転ツール",
-  "block.poweradvantage.crude_oil": "原油",
-  "block.poweradvantage.still": "蒸留酒製造所",
-  "block.poweradvantage.refined_oil": "精製油",
-  "block.poweradvantage.fluid_switch": "バルブ",
-  "block.poweradvantage.converter_rf_steam": "蒸気-RFトランス",
-  "block.poweradvantage.converter_rf_electricity": "電気-RFトランス",
-  "block.poweradvantage.converter_rf_quantum": "量子-RFトランス",
-  "block.poweradvantage.converter_tr_electricity": "電気-EUトランス",
-  "block.poweradvantage.fluid_pipe_terminal": "パイプ"
-}
diff --git a/src/main/resources/assets/poweradvantage/lang/ko_kr.json b/src/main/resources/assets/poweradvantage/lang/ko_kr.json
deleted file mode 100644
index 4680143e..00000000
--- a/src/main/resources/assets/poweradvantage/lang/ko_kr.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
-  "nei.poweradvantage.recipehandler.shapelessfurnace.name": "대형 전기로 (못생긴)",
-  "nei.poweradvantage.recipehandler.shapedfurnace.name": "대형 전기로 (모양)",
-  "tooltip.poweradvantage.empty": "빈",
-  "tooltip.tooltip.poweradvantage.buckets_of": "%는 X 버킷",
-  "itemGroup.poweradvantage": "전원의 장점을 ",
-  "tile.poweradvantage.fluid_drain.name": "드레인",
-  "tile.poweradvantage.fluid_discharge.name": "방전 화격자",
-  "tile.poweradvantage.fluid_storage_tank.name": "저장 탱크",
-  "item.poweradvantage.fluid_storage_tank_item.name": "는 저장 탱크를 ",
-  "tile.poweradvantage.fluid_pipe.name": "파이프",
-  "tile.poweradvantage.item_conveyor.name": "컨베이어",
-  "tile.poweradvantage.item_filter_block.name": "블록 필터 컨베이어",
-  "tile.poweradvantage.item_filter_food.name": "식품 필터 컨베이어",
-  "tile.poweradvantage.item_filter_fuel.name": "연료 필터 컨베이어",
-  "tile.poweradvantage.item_filter_inventory.name": "필터 컨베이어",
-  "tile.poweradvantage.item_filter_ore.name": "광석 필터 컨베이어",
-  "tile.poweradvantage.item_filter_plant.name": "물만 주면 식물이 필터 컨베이어",
-  "tile.poweradvantage.item_filter_smelt.name": "노 필터 컨베이어",
-  "tile.poweradvantage.item_filter_overflow.name": "오버 플로우필터 컨베이어",
-  "tile.poweradvantage.steel_frame.name": "스틸 프레임",
-  "item.poweradvantage.starch.name": "전분",
-  "item.poweradvantage.bioplastic_ingot.name": "는 바이오 플라스틱 잉곳을 ",
-  "item.poweradvantage.sprocket.name": "스프로킷",
-  "tile.poweradvantage.fluid_metal_tank.name": "금속 저장조",
-  "item.poweradvantage.rotator_tool.name": "회전 도구",
-  "tile.poweradvantage.infinite_steam.name": "무한 증기 력",
-  "tile.poweradvantage.infinite_electricity.name": "무한 전력",
-  "tile.poweradvantage.infinite_quantum.name": "무한 양자 전력",
-  "tile.poweradvantage.crude_oil.name": "원유",
-  "fluid.poweradvantage.crude_oil": "원유",
-  "item.bucket.crude_oil.name": "원유의 버킷",
-  "tile.poweradvantage.still.name": "증류소",
-  "tile.poweradvantage.refined_oil.name": "정유",
-  "fluid.poweradvantage.refined_oil": "정유",
-  "item.bucket.refined_oil.name": "정유의 통",
-  "tile.poweradvantage.fluid_switch.name": "판막",
-  "tile.poweradvantage.converter_rf_steam.name": "증기-RF 전원 트랜스",
-  "tile.poweradvantage.converter_rf_electricity.name": "전기-RF 전원 트랜스",
-  "tile.poweradvantage.converter_rf_quantum.name": "양자-RF 전원 트랜스",
-  "tile.poweradvantage.converter_tr_electricity.name": "전기-EU 전원 트랜스",
-  "block.poweradvantage.fluid_drain": "드레인",
-  "block.poweradvantage.fluid_discharge": "방전 화격자",
-  "block.poweradvantage.fluid_storage_tank": "저장 탱크",
-  "item.poweradvantage.fluid_storage_tank_item": "는 저장 탱크를 ",
-  "block.poweradvantage.fluid_pipe": "파이프",
-  "block.poweradvantage.item_conveyor": "컨베이어",
-  "block.poweradvantage.item_filter_block": "블록 필터 컨베이어",
-  "block.poweradvantage.item_filter_food": "식품 필터 컨베이어",
-  "block.poweradvantage.item_filter_fuel": "연료 필터 컨베이어",
-  "block.poweradvantage.item_filter_inventory": "필터 컨베이어",
-  "block.poweradvantage.item_filter_ore": "광석 필터 컨베이어",
-  "block.poweradvantage.item_filter_plant": "물만 주면 식물이 필터 컨베이어",
-  "block.poweradvantage.item_filter_smelt": "노 필터 컨베이어",
-  "block.poweradvantage.item_filter_overflow": "오버 플로우필터 컨베이어",
-  "block.poweradvantage.steel_frame": "스틸 프레임",
-  "item.poweradvantage.starch": "전분",
-  "item.poweradvantage.bioplastic_ingot": "는 바이오 플라스틱 잉곳을 ",
-  "item.poweradvantage.sprocket": "스프로킷",
-  "block.poweradvantage.fluid_metal_tank": "금속 저장조",
-  "item.poweradvantage.rotator_tool": "회전 도구",
-  "block.poweradvantage.infinite_steam": "무한 증기 력",
-  "block.poweradvantage.infinite_electricity": "무한 전력",
-  "block.poweradvantage.infinite_quantum": "무한 양자 전력",
-  "block.poweradvantage.crude_oil": "원유",
-  "block.poweradvantage.still": "증류소",
-  "block.poweradvantage.refined_oil": "정유",
-  "block.poweradvantage.fluid_switch": "판막",
-  "block.poweradvantage.converter_rf_steam": "증기-RF 전원 트랜스",
-  "block.poweradvantage.converter_rf_electricity": "전기-RF 전원 트랜스",
-  "block.poweradvantage.converter_rf_quantum": "양자-RF 전원 트랜스",
-  "block.poweradvantage.converter_tr_electricity": "전기-EU 전원 트랜스",
-  "block.poweradvantage.fluid_pipe_terminal": "파이프"
-}
diff --git a/src/main/resources/assets/poweradvantage/lang/pt_br.json b/src/main/resources/assets/poweradvantage/lang/pt_br.json
deleted file mode 100644
index f837618a..00000000
--- a/src/main/resources/assets/poweradvantage/lang/pt_br.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
-  "nei.poweradvantage.recipehandler.shapelessfurnace.name": "Forno Grande (no forma)",
-  "nei.poweradvantage.recipehandler.shapedfurnace.name": "Forno Grande (em forma)",
-  "tooltip.poweradvantage.empty": "vazio",
-  "tooltip.poweradvantage.buckets_of": "%x baldes de %y",
-  "itemGroup.poweradvantage": "Vantagem de Poder",
-  "tile.poweradvantage.fluid_drain.name": "Dreno",
-  "tile.poweradvantage.fluid_discharge.name": "Grate Discharge",
-  "tile.poweradvantage.fluid_storage_tank.name": "Tanque de armazenamento",
-  "item.poweradvantage.fluid_storage_tank_item.name": "Tanque de armazenamento",
-  "tile.poweradvantage.fluid_pipe.name": "Tubulação",
-  "tile.poweradvantage.item_conveyor.name": "Transportador",
-  "tile.poweradvantage.item_filter_block.name": "Bloquear filtro transportador",
-  "tile.poweradvantage.item_filter_food.name": "Transportador Filtro de Alimentos",
-  "tile.poweradvantage.item_filter_fuel.name": "Filtro de combustível Transportador",
-  "tile.poweradvantage.item_filter_inventory.name": "Transportador Filtro",
-  "tile.poweradvantage.item_filter_ore.name": "Ore Transportadora Filtro",
-  "tile.poweradvantage.item_filter_plant.name": "Plantable Transportadora Filtro",
-  "tile.poweradvantage.item_filter_smelt.name": "Fornalha Filtro Transportador",
-  "tile.poweradvantage.item_filter_overflow.name": "Transbordamento Transportador Filtro",
-  "tile.poweradvantage.steel_frame.name": "Armação de Aço",
-  "item.poweradvantage.starch.name": "Amido",
-  "item.poweradvantage.bioplastic_ingot.name": "Bioplastic lingote",
-  "item.poweradvantage.sprocket.name": "Roda Dentada",
-  "tile.poweradvantage.fluid_metal_tank.name": "Tanque de Armazenamento de Aço",
-  "item.poweradvantage.rotator_tool.name": "Ferramenta de Rotação",
-  "tile.poweradvantage.infinite_steam.name": "Energia a Vapor Infinito",
-  "tile.poweradvantage.infinite_electricity.name": "Energia Elétrica Infinito",
-  "tile.poweradvantage.infinite_quantum.name": "Energia Quantum Infinito",
-  "tile.poweradvantage.crude_oil.name": "Óleo Cru",
-  "fluid.poweradvantage.crude_oil": "Óleo Cru",
-  "item.bucket.crude_oil.name": "Balde de Óleo Cru",
-  "tile.poweradvantage.still.name": "Destilaria",
-  "tile.poweradvantage.refined_oil.name": "Óleo Refinado",
-  "fluid.poweradvantage.refined_oil": "Óleo Refinado",
-  "item.bucket.refined_oil.name": "Balde de Óleo Refinado",
-  "tile.poweradvantage.fluid_switch.name": "Válvula",
-  "tile.poweradvantage.converter_rf_steam.name": "Vapor-RF Transformador",
-  "tile.poweradvantage.converter_rf_electricity.name": "Electricidade-RF Transformador",
-  "tile.poweradvantage.converter_rf_quantum.name": "Quantidade-RF Transformador",
-  "tile.poweradvantage.converter_tr_electricity.name": "Electricidade-EU Transformador",
-  "block.poweradvantage.fluid_drain": "Dreno",
-  "block.poweradvantage.fluid_discharge": "Grate Discharge",
-  "block.poweradvantage.fluid_storage_tank": "Tanque de armazenamento",
-  "item.poweradvantage.fluid_storage_tank_item": "Tanque de armazenamento",
-  "block.poweradvantage.fluid_pipe": "Tubulação",
-  "block.poweradvantage.item_conveyor": "Transportador",
-  "block.poweradvantage.item_filter_block": "Bloquear filtro transportador",
-  "block.poweradvantage.item_filter_food": "Transportador Filtro de Alimentos",
-  "block.poweradvantage.item_filter_fuel": "Filtro de combustível Transportador",
-  "block.poweradvantage.item_filter_inventory": "Transportador Filtro",
-  "block.poweradvantage.item_filter_ore": "Ore Transportadora Filtro",
-  "block.poweradvantage.item_filter_plant": "Plantable Transportadora Filtro",
-  "block.poweradvantage.item_filter_smelt": "Fornalha Filtro Transportador",
-  "block.poweradvantage.item_filter_overflow": "Transbordamento Transportador Filtro",
-  "block.poweradvantage.steel_frame": "Armação de Aço",
-  "item.poweradvantage.starch": "Amido",
-  "item.poweradvantage.bioplastic_ingot": "Bioplastic lingote",
-  "item.poweradvantage.sprocket": "Roda Dentada",
-  "block.poweradvantage.fluid_metal_tank": "Tanque de Armazenamento de Aço",
-  "item.poweradvantage.rotator_tool": "Ferramenta de Rotação",
-  "block.poweradvantage.infinite_steam": "Energia a Vapor Infinito",
-  "block.poweradvantage.infinite_electricity": "Energia Elétrica Infinito",
-  "block.poweradvantage.infinite_quantum": "Energia Quantum Infinito",
-  "block.poweradvantage.crude_oil": "Óleo Cru",
-  "block.poweradvantage.still": "Destilaria",
-  "block.poweradvantage.refined_oil": "Óleo Refinado",
-  "block.poweradvantage.fluid_switch": "Válvula",
-  "block.poweradvantage.converter_rf_steam": "Vapor-RF Transformador",
-  "block.poweradvantage.converter_rf_electricity": "Electricidade-RF Transformador",
-  "block.poweradvantage.converter_rf_quantum": "Quantidade-RF Transformador",
-  "block.poweradvantage.converter_tr_electricity": "Electricidade-EU Transformador",
-  "block.poweradvantage.fluid_pipe_terminal": "Tubulação"
-}
diff --git a/src/main/resources/assets/poweradvantage/lang/zh_cn.json b/src/main/resources/assets/poweradvantage/lang/zh_cn.json
deleted file mode 100644
index b8c066bb..00000000
--- a/src/main/resources/assets/poweradvantage/lang/zh_cn.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)",
-  "nei.poweradvantage.recipehandler.shapelessfurnace.name": "大熔炉(无形的)",
-  "nei.poweradvantage.recipehandler.shapedfurnace.name": "大熔炉(有形的)",
-  "tooltip.poweradvantage.empty": "空",
-  "tooltip.poweradvantage.buckets_of": "%x水桶的%y",
-  "itemGroup.poweradvantage": "能量优势",
-  "tile.poweradvantage.fluid_drain.name": "抽水机",
-  "tile.poweradvantage.fluid_discharge.name": "排液器",
-  "tile.poweradvantage.fluid_storage_tank.name": "便携式液体储罐",
-  "item.poweradvantage.fluid_storage_tank_item.name": "便携式液体储罐",
-  "tile.poweradvantage.fluid_pipe.name": "液体管",
-  "tile.poweradvantage.item_conveyor.name": "输送机",
-  "tile.poweradvantage.item_filter_block.name": "方块过滤输送机",
-  "tile.poweradvantage.item_filter_food.name": "食品过滤输送机",
-  "tile.poweradvantage.item_filter_fuel.name": "燃料过滤输送机",
-  "tile.poweradvantage.item_filter_inventory.name": "选择过滤输送机",
-  "tile.poweradvantage.item_filter_ore.name": "矿物过滤输送机",
-  "tile.poweradvantage.item_filter_plant.name": "种子过滤输送机",
-  "tile.poweradvantage.item_filter_smelt.name": "熔炉过滤输送机",
-  "tile.poweradvantage.item_filter_overflow.name": "溢出过滤输送机",
-  "tile.poweradvantage.steel_frame.name": "钢框架",
-  "item.poweradvantage.starch.name": "淀粉",
-  "item.poweradvantage.bioplastic_ingot.name": "生物塑料锭",
-  "item.poweradvantage.sprocket.name": "链轮",
-  "tile.poweradvantage.fluid_metal_tank.name": "金属液罐",
-  "item.poweradvantage.rotator_tool.name": "旋转扳手",
-  "tile.poweradvantage.infinite_steam.name": "无限蒸汽动力",
-  "tile.poweradvantage.infinite_electricity.name": "无限电力",
-  "tile.poweradvantage.infinite_quantum.name": "无限量子动力",
-  "tile.poweradvantage.crude_oil.name": "原油",
-  "fluid.poweradvantage.crude_oil": "原油",
-  "item.bucket.crude_oil.name": "原油桶",
-  "tile.poweradvantage.still.name": "酒廠",
-  "tile.poweradvantage.refined_oil.name": "成品油",
-  "fluid.poweradvantage.refined_oil": "成品油",
-  "item.bucket.refined_oil.name": "成品油的桶",
-  "tile.poweradvantage.fluid_switch.name": "閥",
-  "tile.poweradvantage.converter_rf_steam.name": "蒸汽-RF 變壓器",
-  "tile.poweradvantage.converter_rf_electricity.name": "電力-RF 變壓器",
-  "tile.poweradvantage.converter_rf_quantum.name": "量子-RF 變壓器",
-  "tile.poweradvantage.converter_tr_electricity.name": "電力-EU 變壓器",
-  "block.poweradvantage.fluid_drain": "抽水机",
-  "block.poweradvantage.fluid_discharge": "排液器",
-  "block.poweradvantage.fluid_storage_tank": "便携式液体储罐",
-  "item.poweradvantage.fluid_storage_tank_item": "便携式液体储罐",
-  "block.poweradvantage.fluid_pipe": "液体管",
-  "block.poweradvantage.item_conveyor": "输送机",
-  "block.poweradvantage.item_filter_block": "方块过滤输送机",
-  "block.poweradvantage.item_filter_food": "食品过滤输送机",
-  "block.poweradvantage.item_filter_fuel": "燃料过滤输送机",
-  "block.poweradvantage.item_filter_inventory": "选择过滤输送机",
-  "block.poweradvantage.item_filter_ore": "矿物过滤输送机",
-  "block.poweradvantage.item_filter_plant": "种子过滤输送机",
-  "block.poweradvantage.item_filter_smelt": "熔炉过滤输送机",
-  "block.poweradvantage.item_filter_overflow": "溢出过滤输送机",
-  "block.poweradvantage.steel_frame": "钢框架",
-  "item.poweradvantage.starch": "淀粉",
-  "item.poweradvantage.bioplastic_ingot": "生物塑料锭",
-  "item.poweradvantage.sprocket": "链轮",
-  "block.poweradvantage.fluid_metal_tank": "金属液罐",
-  "item.poweradvantage.rotator_tool": "旋转扳手",
-  "block.poweradvantage.infinite_steam": "无限蒸汽动力",
-  "block.poweradvantage.infinite_electricity": "无限电力",
-  "block.poweradvantage.infinite_quantum": "无限量子动力",
-  "block.poweradvantage.crude_oil": "原油",
-  "block.poweradvantage.still": "酒廠",
-  "block.poweradvantage.refined_oil": "成品油",
-  "block.poweradvantage.fluid_switch": "閥",
-  "block.poweradvantage.converter_rf_steam": "蒸汽-RF 變壓器",
-  "block.poweradvantage.converter_rf_electricity": "電力-RF 變壓器",
-  "block.poweradvantage.converter_rf_quantum": "量子-RF 變壓器",
-  "block.poweradvantage.converter_tr_electricity": "電力-EU 變壓器",
-  "block.poweradvantage.fluid_pipe_terminal": "液体管"
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/converter_tr_electricity.json b/src/main/resources/assets/poweradvantage/models/block/converter_tr_electricity.json
deleted file mode 100644
index 7dff7e5a..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/converter_tr_electricity.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "poweradvantage:blocks/techreborn_converter"
-  }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_discharge.json b/src/main/resources/assets/poweradvantage/models/block/fluid_discharge.json
deleted file mode 100644
index df0fc23e..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_discharge.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "parent": "block/cube_bottom_top",
-    "textures": {
-        "top": "poweradvantage:blocks/fluid_discharge_side",
-        "bottom": "poweradvantage:blocks/fluid_discharge_face",
-        "side": "poweradvantage:blocks/fluid_discharge_side"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_drain.json b/src/main/resources/assets/poweradvantage/models/block/fluid_drain.json
deleted file mode 100644
index 93445c16..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_drain.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "parent": "block/cube_bottom_top",
-    "textures": {
-        "top": "poweradvantage:blocks/fluid_drain_face",
-        "bottom": "poweradvantage:blocks/fluid_drain_side",
-        "side": "poweradvantage:blocks/fluid_drain_side"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_0.json b/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_0.json
deleted file mode 100644
index 25307680..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "poweradvantage:block/pipe4_0",
-    "textures": {
-        "texture": "poweradvantage:blocks/fluid_pipe",
-        "particle": "poweradvantage:materials/iron"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_densuw.json b/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_densuw.json
deleted file mode 100644
index b27c5e3b..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_densuw.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "poweradvantage:block/pipe4_densuw",
-    "textures": {
-        "texture": "poweradvantage:blocks/fluid_pipe",
-        "particle": "poweradvantage:materials/iron"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_desuw.json b/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_desuw.json
deleted file mode 100644
index b28fbf1a..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_desuw.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "poweradvantage:block/pipe4_desuw",
-    "textures": {
-        "texture": "poweradvantage:blocks/fluid_pipe",
-        "particle": "poweradvantage:materials/iron"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_dnu.json b/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_dnu.json
deleted file mode 100644
index 58ad993c..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_dnu.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "poweradvantage:block/pipe4_dnu",
-    "textures": {
-        "texture": "poweradvantage:blocks/fluid_pipe",
-        "particle": "poweradvantage:materials/iron"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_ensw.json b/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_ensw.json
deleted file mode 100644
index f909d919..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_ensw.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "poweradvantage:block/pipe4_ensw",
-    "textures": {
-        "texture": "poweradvantage:blocks/fluid_pipe",
-        "particle": "poweradvantage:materials/iron"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_n.json b/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_n.json
deleted file mode 100644
index 549fa775..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_n.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "poweradvantage:block/pipe4_n",
-    "textures": {
-        "texture": "poweradvantage:blocks/fluid_pipe",
-        "particle": "poweradvantage:materials/iron"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_ns.json b/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_ns.json
deleted file mode 100644
index 46b2b21e..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_ns.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "poweradvantage:block/pipe4_ns",
-    "textures": {
-        "texture": "poweradvantage:blocks/fluid_pipe",
-        "particle": "poweradvantage:materials/iron"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_nsuw.json b/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_nsuw.json
deleted file mode 100644
index a2efd485..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_nsuw.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "poweradvantage:block/pipe4_nsuw",
-    "textures": {
-        "texture": "poweradvantage:blocks/fluid_pipe",
-        "particle": "poweradvantage:materials/iron"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_nsw.json b/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_nsw.json
deleted file mode 100644
index a4d12d0a..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_nsw.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "poweradvantage:block/pipe4_nsw",
-    "textures": {
-        "texture": "poweradvantage:blocks/fluid_pipe",
-        "particle": "poweradvantage:materials/iron"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_nuw.json b/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_nuw.json
deleted file mode 100644
index 2c6730c8..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_nuw.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "poweradvantage:block/pipe4_nuw",
-    "textures": {
-        "texture": "poweradvantage:blocks/fluid_pipe",
-        "particle": "poweradvantage:materials/iron"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_nw.json b/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_nw.json
deleted file mode 100644
index 03097f73..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_pipe_nw.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "parent": "poweradvantage:block/pipe4_nw",
-    "textures": {
-        "texture": "poweradvantage:blocks/fluid_pipe",
-        "particle": "poweradvantage:materials/iron"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_switch_off.json b/src/main/resources/assets/poweradvantage/models/block/fluid_switch_off.json
deleted file mode 100644
index 99376fe2..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_switch_off.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "poweradvantage:blocks/fluid_switch_off",
-        "particle": "poweradvantage:materials/steel"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/fluid_switch_on.json b/src/main/resources/assets/poweradvantage/models/block/fluid_switch_on.json
deleted file mode 100644
index a09edb76..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/fluid_switch_on.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "poweradvantage:blocks/fluid_switch_on",
-        "particle": "poweradvantage:materials/steel"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/item_conveyor.json b/src/main/resources/assets/poweradvantage/models/block/item_conveyor.json
deleted file mode 100644
index f176d901..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/item_conveyor.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "poweradvantage:block/conveyor_base",
-    "textures": {
-        "top": "poweradvantage:blocks/item_conveyor_top",
-        "bottom": "poweradvantage:blocks/item_conveyor_top",
-        "side": "poweradvantage:blocks/item_conveyor_side",
-        "end": "poweradvantage:blocks/item_conveyor_end",
-        "rim": "poweradvantage:materials/steel"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/item_filter_block.json b/src/main/resources/assets/poweradvantage/models/block/item_filter_block.json
deleted file mode 100644
index 0d2c3a62..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/item_filter_block.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "poweradvantage:block/conveyor_base",
-    "textures": {
-        "top": "poweradvantage:blocks/item_conveyor_top",
-        "bottom": "poweradvantage:blocks/filter_bottom",
-        "side": "poweradvantage:blocks/filter_side_block",
-        "end": "poweradvantage:blocks/item_conveyor_end",
-        "rim": "poweradvantage:materials/steel"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/item_filter_food.json b/src/main/resources/assets/poweradvantage/models/block/item_filter_food.json
deleted file mode 100644
index 2c1f6589..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/item_filter_food.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "poweradvantage:block/conveyor_base",
-    "textures": {
-        "top": "poweradvantage:blocks/item_conveyor_top",
-        "bottom": "poweradvantage:blocks/filter_bottom",
-        "side": "poweradvantage:blocks/filter_side_food",
-        "end": "poweradvantage:blocks/item_conveyor_end",
-        "rim": "poweradvantage:materials/steel"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/item_filter_fuel.json b/src/main/resources/assets/poweradvantage/models/block/item_filter_fuel.json
deleted file mode 100644
index d12bdefb..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/item_filter_fuel.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "poweradvantage:block/conveyor_base",
-    "textures": {
-        "top": "poweradvantage:blocks/item_conveyor_top",
-        "bottom": "poweradvantage:blocks/filter_bottom",
-        "side": "poweradvantage:blocks/filter_side_fuel",
-        "end": "poweradvantage:blocks/item_conveyor_end",
-        "rim": "poweradvantage:materials/steel"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/item_filter_inventory.json b/src/main/resources/assets/poweradvantage/models/block/item_filter_inventory.json
deleted file mode 100644
index 45200ce2..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/item_filter_inventory.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "poweradvantage:block/conveyor_base",
-    "textures": {
-        "top": "poweradvantage:blocks/item_conveyor_top",
-        "bottom": "poweradvantage:blocks/filter_bottom",
-        "side": "poweradvantage:blocks/filter_side_inventory",
-        "end": "poweradvantage:blocks/item_conveyor_end",
-        "rim": "poweradvantage:materials/steel"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/item_filter_ore.json b/src/main/resources/assets/poweradvantage/models/block/item_filter_ore.json
deleted file mode 100644
index 26dbe01c..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/item_filter_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "poweradvantage:block/conveyor_base",
-    "textures": {
-        "top": "poweradvantage:blocks/item_conveyor_top",
-        "bottom": "poweradvantage:blocks/filter_bottom",
-        "side": "poweradvantage:blocks/filter_side_ore",
-        "end": "poweradvantage:blocks/item_conveyor_end",
-        "rim": "poweradvantage:materials/steel"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/item_filter_overflow.json b/src/main/resources/assets/poweradvantage/models/block/item_filter_overflow.json
deleted file mode 100644
index 8abd3a4b..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/item_filter_overflow.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "poweradvantage:block/conveyor_base",
-    "textures": {
-        "top": "poweradvantage:blocks/item_conveyor_top",
-        "bottom": "poweradvantage:blocks/filter_bottom",
-        "side": "poweradvantage:blocks/filter_side_overflow",
-        "end": "poweradvantage:blocks/item_conveyor_end",
-        "rim": "poweradvantage:materials/steel"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/item_filter_plant.json b/src/main/resources/assets/poweradvantage/models/block/item_filter_plant.json
deleted file mode 100644
index 4d16d31e..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/item_filter_plant.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "poweradvantage:block/conveyor_base",
-    "textures": {
-        "top": "poweradvantage:blocks/item_conveyor_top",
-        "bottom": "poweradvantage:blocks/filter_bottom",
-        "side": "poweradvantage:blocks/filter_side_plantable",
-        "end": "poweradvantage:blocks/item_conveyor_end",
-        "rim": "poweradvantage:materials/steel"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/block/item_filter_smelt.json b/src/main/resources/assets/poweradvantage/models/block/item_filter_smelt.json
deleted file mode 100644
index 49deac1d..00000000
--- a/src/main/resources/assets/poweradvantage/models/block/item_filter_smelt.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "poweradvantage:block/conveyor_base",
-    "textures": {
-        "top": "poweradvantage:blocks/item_conveyor_top",
-        "bottom": "poweradvantage:blocks/filter_bottom",
-        "side": "poweradvantage:blocks/filter_side_smeltable",
-        "end": "poweradvantage:blocks/item_conveyor_end",
-        "rim": "poweradvantage:materials/steel"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/item/bioplastic_ingot.json b/src/main/resources/assets/poweradvantage/models/item/bioplastic_ingot.json
deleted file mode 100644
index 8c08c41c..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/bioplastic_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-    "textures": {
-        "layer0": "poweradvantage:items/bioplastic_ingot"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/bucket_crude_oil.json b/src/main/resources/assets/poweradvantage/models/item/bucket_crude_oil.json
deleted file mode 100644
index 2d783539..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/bucket_crude_oil.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-    "textures": {
-        "layer0": "poweradvantage:items/bucket_crude_oil"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/item/bucket_refined_oil.json b/src/main/resources/assets/poweradvantage/models/item/bucket_refined_oil.json
deleted file mode 100644
index eb646820..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/bucket_refined_oil.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-    "textures": {
-        "layer0": "poweradvantage:items/bucket_refined_oil"
-    }
-}
diff --git a/src/main/resources/assets/poweradvantage/models/item/converter_rf_electricity.json b/src/main/resources/assets/poweradvantage/models/item/converter_rf_electricity.json
deleted file mode 100644
index b9b04298..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/converter_rf_electricity.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/converter_rf_electricity"
-}
diff --git a/src/main/resources/assets/poweradvantage/models/item/converter_rf_quantum.json b/src/main/resources/assets/poweradvantage/models/item/converter_rf_quantum.json
deleted file mode 100644
index ca2c0b82..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/converter_rf_quantum.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/converter_rf_quantum"
-}
diff --git a/src/main/resources/assets/poweradvantage/models/item/converter_rf_steam.json b/src/main/resources/assets/poweradvantage/models/item/converter_rf_steam.json
deleted file mode 100644
index 1ca73e42..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/converter_rf_steam.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/converter_rf_steam"
-}
diff --git a/src/main/resources/assets/poweradvantage/models/item/converter_tr_electricity.json b/src/main/resources/assets/poweradvantage/models/item/converter_tr_electricity.json
deleted file mode 100644
index 9a7a15f8..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/converter_tr_electricity.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/converter_tr_electricity"
-}
diff --git a/src/main/resources/assets/poweradvantage/models/item/crude_oil.json b/src/main/resources/assets/poweradvantage/models/item/crude_oil.json
deleted file mode 100644
index 79fdb9e9..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/crude_oil.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "parent": "poweradvantage:item/crude_oil_bucket"
-}
diff --git a/src/main/resources/assets/poweradvantage/models/item/fluid_discharge.json b/src/main/resources/assets/poweradvantage/models/item/fluid_discharge.json
deleted file mode 100644
index e0bcaeee..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/fluid_discharge.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/fluid_discharge"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/fluid_drain.json b/src/main/resources/assets/poweradvantage/models/item/fluid_drain.json
deleted file mode 100644
index fc987457..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/fluid_drain.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/fluid_drain"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/fluid_metal_tank.json b/src/main/resources/assets/poweradvantage/models/item/fluid_metal_tank.json
deleted file mode 100644
index 97ecaa98..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/fluid_metal_tank.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/fluid_metal_tank"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/fluid_pipe.json b/src/main/resources/assets/poweradvantage/models/item/fluid_pipe.json
deleted file mode 100644
index 097b7358..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/fluid_pipe.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "parent": "poweradvantage:block/fluid_pipe_ns",
-    "ambientocclusion": false
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/fluid_pipe_terminal.json b/src/main/resources/assets/poweradvantage/models/item/fluid_pipe_terminal.json
deleted file mode 100644
index 097b7358..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/fluid_pipe_terminal.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "parent": "poweradvantage:block/fluid_pipe_ns",
-    "ambientocclusion": false
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/fluid_storage_tank.json b/src/main/resources/assets/poweradvantage/models/item/fluid_storage_tank.json
deleted file mode 100644
index a337b200..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/fluid_storage_tank.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "parent": "poweradvantage:block/fluid_storage_tank",
-    "ambientocclusion": false
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/fluid_switch.json b/src/main/resources/assets/poweradvantage/models/item/fluid_switch.json
deleted file mode 100644
index f00c5426..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/fluid_switch.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/fluid_switch_on"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/infinite_electricity.json b/src/main/resources/assets/poweradvantage/models/item/infinite_electricity.json
deleted file mode 100644
index 5b216c85..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/infinite_electricity.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/infinite_electricity"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/infinite_quantum.json b/src/main/resources/assets/poweradvantage/models/item/infinite_quantum.json
deleted file mode 100644
index 03aab32c..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/infinite_quantum.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/infinite_quantum"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/infinite_steam.json b/src/main/resources/assets/poweradvantage/models/item/infinite_steam.json
deleted file mode 100644
index 231eb2ca..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/infinite_steam.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/infinite_steam"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/item_conveyor.json b/src/main/resources/assets/poweradvantage/models/item/item_conveyor.json
deleted file mode 100644
index 4fa32a5d..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/item_conveyor.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/item_conveyor"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/item_filter_block.json b/src/main/resources/assets/poweradvantage/models/item/item_filter_block.json
deleted file mode 100644
index 0e5aca23..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/item_filter_block.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/item_filter_block"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/item_filter_food.json b/src/main/resources/assets/poweradvantage/models/item/item_filter_food.json
deleted file mode 100644
index f238e136..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/item_filter_food.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/item_filter_food"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/item_filter_fuel.json b/src/main/resources/assets/poweradvantage/models/item/item_filter_fuel.json
deleted file mode 100644
index 4fb288b6..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/item_filter_fuel.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/item_filter_fuel"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/item_filter_inventory.json b/src/main/resources/assets/poweradvantage/models/item/item_filter_inventory.json
deleted file mode 100644
index 1e3a7703..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/item_filter_inventory.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/item_filter_inventory"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/item_filter_ore.json b/src/main/resources/assets/poweradvantage/models/item/item_filter_ore.json
deleted file mode 100644
index ba5c859c..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/item_filter_ore.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/item_filter_ore"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/item_filter_overflow.json b/src/main/resources/assets/poweradvantage/models/item/item_filter_overflow.json
deleted file mode 100644
index 92ae073c..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/item_filter_overflow.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/item_filter_overflow"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/item_filter_plant.json b/src/main/resources/assets/poweradvantage/models/item/item_filter_plant.json
deleted file mode 100644
index 74d98116..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/item_filter_plant.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/item_filter_plant"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/item_filter_smelt.json b/src/main/resources/assets/poweradvantage/models/item/item_filter_smelt.json
deleted file mode 100644
index d4f0bc20..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/item_filter_smelt.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/item_filter_smelt"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/poweradvantage/models/item/refined_oil.json b/src/main/resources/assets/poweradvantage/models/item/refined_oil.json
deleted file mode 100644
index 0a841a81..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/refined_oil.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "parent": "poweradvantage:item/refined_oil_bucket"
-}
diff --git a/src/main/resources/assets/poweradvantage/models/item/steel_frame.json b/src/main/resources/assets/poweradvantage/models/item/steel_frame.json
deleted file mode 100644
index e87a33bb..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/steel_frame.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/steel_frame"
-}
diff --git a/src/main/resources/assets/poweradvantage/models/item/still.json b/src/main/resources/assets/poweradvantage/models/item/still.json
deleted file mode 100644
index e70ea2ae..00000000
--- a/src/main/resources/assets/poweradvantage/models/item/still.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "poweradvantage:block/still_off"
-}
\ No newline at end of file
diff --git a/src/main/resources/coremods/poweradvantage_113_migration.js b/src/main/resources/coremods/basepower_113_migration.js
similarity index 96%
rename from src/main/resources/coremods/poweradvantage_113_migration.js
rename to src/main/resources/coremods/basepower_113_migration.js
index 0d430ad1..6b70981d 100644
--- a/src/main/resources/coremods/poweradvantage_113_migration.js
+++ b/src/main/resources/coremods/basepower_113_migration.js
@@ -6,11 +6,11 @@ var LabelNode = Java.type('org.objectweb.asm.tree.LabelNode');
 var MethodInsnNode = Java.type('org.objectweb.asm.tree.MethodInsnNode');
 var VarInsnNode = Java.type('org.objectweb.asm.tree.VarInsnNode');
 
-var hook = 'zone/moddev/mc/poweradvantage/migration/LegacyWorldDataHook';
+var hook = 'zone/moddev/mc/basepower/migration/LegacyWorldDataHook';
 
 function initializeCoreMod() {
     return {
-        'poweradvantage_legacy_world_info': {
+        'basepower_legacy_world_info': {
             'target': { 'type': 'CLASS', 'name': 'net.minecraft.world.storage.SaveFormatOld' },
             'transformer': function(classNode) {
                 var patched = false;
@@ -29,7 +29,7 @@ function initializeCoreMod() {
                 return classNode;
             }
         },
-        'poweradvantage_legacy_chunk_status': {
+        'basepower_legacy_chunk_status': {
             'target': { 'type': 'CLASS', 'name': 'net.minecraft.world.chunk.storage.AnvilChunkLoader' },
             'transformer': function(classNode) {
                 var descriptor = '(Lnet/minecraft/world/dimension/DimensionType;' +
@@ -67,7 +67,7 @@ function initializeCoreMod() {
                 return classNode;
             }
         },
-        'poweradvantage_legacy_worldgen_guard': {
+        'basepower_legacy_worldgen_guard': {
             'target': { 'type': 'CLASS', 'name': 'net.minecraft.world.gen.WorldGenRegion' },
             'transformer': function(classNode) {
                 var descriptor = '(Lnet/minecraft/util/math/BlockPos;' +
diff --git a/src/main/resources/coremods/poweradvantage_material_tags.js b/src/main/resources/coremods/basepower_material_tags.js
similarity index 89%
rename from src/main/resources/coremods/poweradvantage_material_tags.js
rename to src/main/resources/coremods/basepower_material_tags.js
index 6923c547..48d81d6d 100644
--- a/src/main/resources/coremods/poweradvantage_material_tags.js
+++ b/src/main/resources/coremods/basepower_material_tags.js
@@ -3,7 +3,7 @@ var MethodInsnNode = Java.type('org.objectweb.asm.tree.MethodInsnNode');
 
 function initializeCoreMod() {
     return {
-        'poweradvantage_material_tags': {
+        'basepower_material_tags': {
             'target': { 'type': 'CLASS', 'name': 'net.minecraft.tags.NetworkTagManager' },
             'transformer': function(classNode) {
                 var patched = 0;
@@ -16,7 +16,7 @@ function initializeCoreMod() {
                         // Forge 25 has no tags-loaded event. This runs after tag resolution,
                         // but before the following recipe and advancement reload listeners.
                         method.instructions.insertBefore(instruction, new MethodInsnNode(Opcodes.INVOKESTATIC,
-                                'zone/moddev/mc/poweradvantage/recipe/MaterialTags', 'finishReload', '()V', false));
+                                'zone/moddev/mc/basepower/recipe/MaterialTags', 'finishReload', '()V', false));
                         patched++;
                     }
                 }
diff --git a/src/main/resources/coremods/poweradvantage_oil_renderer.js b/src/main/resources/coremods/basepower_oil_renderer.js
similarity index 96%
rename from src/main/resources/coremods/poweradvantage_oil_renderer.js
rename to src/main/resources/coremods/basepower_oil_renderer.js
index 8b7ad02e..53d294dd 100644
--- a/src/main/resources/coremods/poweradvantage_oil_renderer.js
+++ b/src/main/resources/coremods/basepower_oil_renderer.js
@@ -5,7 +5,7 @@ var VarInsnNode = Java.type('org.objectweb.asm.tree.VarInsnNode');
 
 function initializeCoreMod() {
     return {
-        'poweradvantage_oil_renderer': {
+        'basepower_oil_renderer': {
             'target': { 'type': 'CLASS', 'name': 'net.minecraft.client.renderer.BlockFluidRenderer' },
             'transformer': function(classNode) {
                 var descriptor = '(Lnet/minecraft/world/IWorldReader;Lnet/minecraft/util/math/BlockPos;' +
@@ -39,7 +39,7 @@ function initializeCoreMod() {
                         hook.add(new VarInsnNode(Opcodes.ALOAD, 4));
                         hook.add(new VarInsnNode(reference ? Opcodes.ALOAD : Opcodes.ILOAD, instruction.var));
                         hook.add(new MethodInsnNode(Opcodes.INVOKESTATIC,
-                                'zone/moddev/mc/poweradvantage/client/ClientOilRenderer',
+                                'zone/moddev/mc/basepower/client/ClientOilRenderer',
                                 hookName, hookDescriptor, false));
                         hook.add(new VarInsnNode(reference ? Opcodes.ASTORE : Opcodes.ISTORE, instruction.var));
                         method.instructions.insert(instruction, hook);
diff --git a/src/main/resources/coremods/poweradvantage_parts_loot.js b/src/main/resources/coremods/basepower_parts_loot.js
similarity index 94%
rename from src/main/resources/coremods/poweradvantage_parts_loot.js
rename to src/main/resources/coremods/basepower_parts_loot.js
index 3698954f..8b0bede5 100644
--- a/src/main/resources/coremods/poweradvantage_parts_loot.js
+++ b/src/main/resources/coremods/basepower_parts_loot.js
@@ -2,7 +2,7 @@ var MethodInsnNode = Java.type('org.objectweb.asm.tree.MethodInsnNode');
 
 function initializeCoreMod() {
     return {
-        'poweradvantage_parts_loot': {
+        'basepower_parts_loot': {
             'target': { 'type': 'CLASS', 'name': 'net.minecraft.world.storage.loot.LootTableManager' },
             'transformer': function(classNode) {
                 var patched = 0;
@@ -12,7 +12,7 @@ function initializeCoreMod() {
                             instruction = instruction.getNext()) {
                         if (instruction instanceof MethodInsnNode && instruction.owner === 'net/minecraftforge/common/ForgeHooks'
                                 && instruction.name === 'loadLootTable') {
-                            instruction.owner = 'zone/moddev/mc/poweradvantage/recipe/PartsLoot';
+                            instruction.owner = 'zone/moddev/mc/basepower/recipe/PartsLoot';
                             patched++;
                         }
                     }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/bioplastic_from_starch.json b/src/main/resources/data/basepower/advancements/recipes/bioplastic_from_starch.json
similarity index 75%
rename from src/main/resources/data/poweradvantage/advancements/recipes/bioplastic_from_starch.json
rename to src/main/resources/data/basepower/advancements/recipes/bioplastic_from_starch.json
index b12696d4..6fa840c2 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/bioplastic_from_starch.json
+++ b/src/main/resources/data/basepower/advancements/recipes/bioplastic_from_starch.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "item": "poweradvantage:starch"
+            "item": "basepower:starch"
           }
         ]
       }
@@ -14,7 +14,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:bioplastic_from_starch"
+        "recipe": "basepower:bioplastic_from_starch"
       }
     }
   },
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:bioplastic_from_starch"
+      "basepower:bioplastic_from_starch"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/converter_rf_electricity.json b/src/main/resources/data/basepower/advancements/recipes/converter_rf_electricity.json
similarity index 89%
rename from src/main/resources/data/poweradvantage/advancements/recipes/converter_rf_electricity.json
rename to src/main/resources/data/basepower/advancements/recipes/converter_rf_electricity.json
index fdb15ac4..db787e7f 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/converter_rf_electricity.json
+++ b/src/main/resources/data/basepower/advancements/recipes/converter_rf_electricity.json
@@ -34,7 +34,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:converter_rf_electricity"
+        "recipe": "basepower:converter_rf_electricity"
       }
     }
   },
@@ -48,7 +48,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:converter_rf_electricity"
+      "basepower:converter_rf_electricity"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/converter_rf_quantum.json b/src/main/resources/data/basepower/advancements/recipes/converter_rf_quantum.json
similarity index 90%
rename from src/main/resources/data/poweradvantage/advancements/recipes/converter_rf_quantum.json
rename to src/main/resources/data/basepower/advancements/recipes/converter_rf_quantum.json
index 3e740797..2b09837b 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/converter_rf_quantum.json
+++ b/src/main/resources/data/basepower/advancements/recipes/converter_rf_quantum.json
@@ -34,7 +34,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:converter_rf_quantum"
+        "recipe": "basepower:converter_rf_quantum"
       }
     }
   },
@@ -48,7 +48,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:converter_rf_quantum"
+      "basepower:converter_rf_quantum"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/converter_rf_steam.json b/src/main/resources/data/basepower/advancements/recipes/converter_rf_steam.json
similarity index 90%
rename from src/main/resources/data/poweradvantage/advancements/recipes/converter_rf_steam.json
rename to src/main/resources/data/basepower/advancements/recipes/converter_rf_steam.json
index 990200c0..f8ba0af5 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/converter_rf_steam.json
+++ b/src/main/resources/data/basepower/advancements/recipes/converter_rf_steam.json
@@ -34,7 +34,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:converter_rf_steam"
+        "recipe": "basepower:converter_rf_steam"
       }
     }
   },
@@ -48,7 +48,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:converter_rf_steam"
+      "basepower:converter_rf_steam"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/converter_tr_electricity_iron.json b/src/main/resources/data/basepower/advancements/recipes/converter_tr_electricity_iron.json
similarity index 86%
rename from src/main/resources/data/poweradvantage/advancements/recipes/converter_tr_electricity_iron.json
rename to src/main/resources/data/basepower/advancements/recipes/converter_tr_electricity_iron.json
index bd7f8c97..cc616be6 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/converter_tr_electricity_iron.json
+++ b/src/main/resources/data/basepower/advancements/recipes/converter_tr_electricity_iron.json
@@ -24,7 +24,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:converter_tr_electricity_iron"
+        "recipe": "basepower:converter_tr_electricity_iron"
       }
     }
   },
@@ -37,7 +37,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:converter_tr_electricity_iron"
+      "basepower:converter_tr_electricity_iron"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/converter_tr_electricity_refined_iron.json b/src/main/resources/data/basepower/advancements/recipes/converter_tr_electricity_refined_iron.json
similarity index 84%
rename from src/main/resources/data/poweradvantage/advancements/recipes/converter_tr_electricity_refined_iron.json
rename to src/main/resources/data/basepower/advancements/recipes/converter_tr_electricity_refined_iron.json
index e8ad9a09..9ae4e5f7 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/converter_tr_electricity_refined_iron.json
+++ b/src/main/resources/data/basepower/advancements/recipes/converter_tr_electricity_refined_iron.json
@@ -24,7 +24,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:converter_tr_electricity_refined_iron"
+        "recipe": "basepower:converter_tr_electricity_refined_iron"
       }
     }
   },
@@ -37,7 +37,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:converter_tr_electricity_refined_iron"
+      "basepower:converter_tr_electricity_refined_iron"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_discharge.json b/src/main/resources/data/basepower/advancements/recipes/fluid_discharge.json
similarity index 92%
rename from src/main/resources/data/poweradvantage/advancements/recipes/fluid_discharge.json
rename to src/main/resources/data/basepower/advancements/recipes/fluid_discharge.json
index 92d9a799..6eee6ff0 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_discharge.json
+++ b/src/main/resources/data/basepower/advancements/recipes/fluid_discharge.json
@@ -44,7 +44,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:fluid_discharge"
+        "recipe": "basepower:fluid_discharge"
       }
     }
   },
@@ -59,7 +59,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:fluid_discharge"
+      "basepower:fluid_discharge"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_drain.json b/src/main/resources/data/basepower/advancements/recipes/fluid_drain.json
similarity index 93%
rename from src/main/resources/data/poweradvantage/advancements/recipes/fluid_drain.json
rename to src/main/resources/data/basepower/advancements/recipes/fluid_drain.json
index e3105a37..c79372f5 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_drain.json
+++ b/src/main/resources/data/basepower/advancements/recipes/fluid_drain.json
@@ -44,7 +44,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:fluid_drain"
+        "recipe": "basepower:fluid_drain"
       }
     }
   },
@@ -59,7 +59,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:fluid_drain"
+      "basepower:fluid_drain"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_metal_tank_iron_normal.json b/src/main/resources/data/basepower/advancements/recipes/fluid_metal_tank_iron_normal.json
similarity index 86%
rename from src/main/resources/data/poweradvantage/advancements/recipes/fluid_metal_tank_iron_normal.json
rename to src/main/resources/data/basepower/advancements/recipes/fluid_metal_tank_iron_normal.json
index c7d0feb8..c25d54ec 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_metal_tank_iron_normal.json
+++ b/src/main/resources/data/basepower/advancements/recipes/fluid_metal_tank_iron_normal.json
@@ -24,7 +24,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:fluid_metal_tank_iron_normal"
+        "recipe": "basepower:fluid_metal_tank_iron_normal"
       }
     }
   },
@@ -37,7 +37,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:fluid_metal_tank_iron_normal"
+      "basepower:fluid_metal_tank_iron_normal"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_metal_tank_steel.json b/src/main/resources/data/basepower/advancements/recipes/fluid_metal_tank_steel.json
similarity index 87%
rename from src/main/resources/data/poweradvantage/advancements/recipes/fluid_metal_tank_steel.json
rename to src/main/resources/data/basepower/advancements/recipes/fluid_metal_tank_steel.json
index 6d74fa18..98f2b0e3 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_metal_tank_steel.json
+++ b/src/main/resources/data/basepower/advancements/recipes/fluid_metal_tank_steel.json
@@ -24,7 +24,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:fluid_metal_tank_steel"
+        "recipe": "basepower:fluid_metal_tank_steel"
       }
     }
   },
@@ -37,7 +37,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:fluid_metal_tank_steel"
+      "basepower:fluid_metal_tank_steel"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_copper_apocalyptic.json b/src/main/resources/data/basepower/advancements/recipes/fluid_pipe_copper_apocalyptic.json
similarity index 80%
rename from src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_copper_apocalyptic.json
rename to src/main/resources/data/basepower/advancements/recipes/fluid_pipe_copper_apocalyptic.json
index 27009313..9ae581b8 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_copper_apocalyptic.json
+++ b/src/main/resources/data/basepower/advancements/recipes/fluid_pipe_copper_apocalyptic.json
@@ -14,7 +14,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:fluid_pipe_copper_apocalyptic"
+        "recipe": "basepower:fluid_pipe_copper_apocalyptic"
       }
     }
   },
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:fluid_pipe_copper_apocalyptic"
+      "basepower:fluid_pipe_copper_apocalyptic"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_copper_normal.json b/src/main/resources/data/basepower/advancements/recipes/fluid_pipe_copper_normal.json
similarity index 82%
rename from src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_copper_normal.json
rename to src/main/resources/data/basepower/advancements/recipes/fluid_pipe_copper_normal.json
index 729c73ec..508016f9 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_copper_normal.json
+++ b/src/main/resources/data/basepower/advancements/recipes/fluid_pipe_copper_normal.json
@@ -14,7 +14,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:fluid_pipe_copper_normal"
+        "recipe": "basepower:fluid_pipe_copper_normal"
       }
     }
   },
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:fluid_pipe_copper_normal"
+      "basepower:fluid_pipe_copper_normal"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_iron_apocalyptic.json b/src/main/resources/data/basepower/advancements/recipes/fluid_pipe_iron_apocalyptic.json
similarity index 81%
rename from src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_iron_apocalyptic.json
rename to src/main/resources/data/basepower/advancements/recipes/fluid_pipe_iron_apocalyptic.json
index 23f83225..902e5684 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_iron_apocalyptic.json
+++ b/src/main/resources/data/basepower/advancements/recipes/fluid_pipe_iron_apocalyptic.json
@@ -14,7 +14,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:fluid_pipe_iron_apocalyptic"
+        "recipe": "basepower:fluid_pipe_iron_apocalyptic"
       }
     }
   },
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:fluid_pipe_iron_apocalyptic"
+      "basepower:fluid_pipe_iron_apocalyptic"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_iron_normal.json b/src/main/resources/data/basepower/advancements/recipes/fluid_pipe_iron_normal.json
similarity index 82%
rename from src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_iron_normal.json
rename to src/main/resources/data/basepower/advancements/recipes/fluid_pipe_iron_normal.json
index 3e073674..69dfe6cb 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_iron_normal.json
+++ b/src/main/resources/data/basepower/advancements/recipes/fluid_pipe_iron_normal.json
@@ -14,7 +14,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:fluid_pipe_iron_normal"
+        "recipe": "basepower:fluid_pipe_iron_normal"
       }
     }
   },
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:fluid_pipe_iron_normal"
+      "basepower:fluid_pipe_iron_normal"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_iron_tech.json b/src/main/resources/data/basepower/advancements/recipes/fluid_pipe_iron_tech.json
similarity index 83%
rename from src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_iron_tech.json
rename to src/main/resources/data/basepower/advancements/recipes/fluid_pipe_iron_tech.json
index 0b9c5b1f..d9a093dc 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_iron_tech.json
+++ b/src/main/resources/data/basepower/advancements/recipes/fluid_pipe_iron_tech.json
@@ -14,7 +14,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:fluid_pipe_iron_tech"
+        "recipe": "basepower:fluid_pipe_iron_tech"
       }
     }
   },
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:fluid_pipe_iron_tech"
+      "basepower:fluid_pipe_iron_tech"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_lead_apocalyptic.json b/src/main/resources/data/basepower/advancements/recipes/fluid_pipe_lead_apocalyptic.json
similarity index 81%
rename from src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_lead_apocalyptic.json
rename to src/main/resources/data/basepower/advancements/recipes/fluid_pipe_lead_apocalyptic.json
index 32c9450b..9ebf5a61 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_pipe_lead_apocalyptic.json
+++ b/src/main/resources/data/basepower/advancements/recipes/fluid_pipe_lead_apocalyptic.json
@@ -14,7 +14,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:fluid_pipe_lead_apocalyptic"
+        "recipe": "basepower:fluid_pipe_lead_apocalyptic"
       }
     }
   },
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:fluid_pipe_lead_apocalyptic"
+      "basepower:fluid_pipe_lead_apocalyptic"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_storage_tank.json b/src/main/resources/data/basepower/advancements/recipes/fluid_storage_tank.json
similarity index 88%
rename from src/main/resources/data/poweradvantage/advancements/recipes/fluid_storage_tank.json
rename to src/main/resources/data/basepower/advancements/recipes/fluid_storage_tank.json
index 4ed10ce5..93c5e276 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_storage_tank.json
+++ b/src/main/resources/data/basepower/advancements/recipes/fluid_storage_tank.json
@@ -24,7 +24,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:fluid_storage_tank"
+        "recipe": "basepower:fluid_storage_tank"
       }
     }
   },
@@ -37,7 +37,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:fluid_storage_tank"
+      "basepower:fluid_storage_tank"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_switch.json b/src/main/resources/data/basepower/advancements/recipes/fluid_switch.json
similarity index 91%
rename from src/main/resources/data/poweradvantage/advancements/recipes/fluid_switch.json
rename to src/main/resources/data/basepower/advancements/recipes/fluid_switch.json
index 08e18f07..2ce73e8e 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/fluid_switch.json
+++ b/src/main/resources/data/basepower/advancements/recipes/fluid_switch.json
@@ -34,7 +34,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:fluid_switch"
+        "recipe": "basepower:fluid_switch"
       }
     }
   },
@@ -48,7 +48,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:fluid_switch"
+      "basepower:fluid_switch"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/item_conveyor.json b/src/main/resources/data/basepower/advancements/recipes/item_conveyor.json
similarity index 91%
rename from src/main/resources/data/poweradvantage/advancements/recipes/item_conveyor.json
rename to src/main/resources/data/basepower/advancements/recipes/item_conveyor.json
index 604ef11f..428a5279 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/item_conveyor.json
+++ b/src/main/resources/data/basepower/advancements/recipes/item_conveyor.json
@@ -34,7 +34,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:item_conveyor"
+        "recipe": "basepower:item_conveyor"
       }
     }
   },
@@ -48,7 +48,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:item_conveyor"
+      "basepower:item_conveyor"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/item_filter_block.json b/src/main/resources/data/basepower/advancements/recipes/item_filter_block.json
similarity index 86%
rename from src/main/resources/data/poweradvantage/advancements/recipes/item_filter_block.json
rename to src/main/resources/data/basepower/advancements/recipes/item_filter_block.json
index 75e1064f..1bdf6986 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/item_filter_block.json
+++ b/src/main/resources/data/basepower/advancements/recipes/item_filter_block.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "item": "poweradvantage:item_conveyor"
+            "item": "basepower:item_conveyor"
           }
         ]
       }
@@ -34,7 +34,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:item_filter_block"
+        "recipe": "basepower:item_filter_block"
       }
     }
   },
@@ -48,7 +48,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:item_filter_block"
+      "basepower:item_filter_block"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/item_filter_food.json b/src/main/resources/data/basepower/advancements/recipes/item_filter_food.json
similarity index 86%
rename from src/main/resources/data/poweradvantage/advancements/recipes/item_filter_food.json
rename to src/main/resources/data/basepower/advancements/recipes/item_filter_food.json
index a781e2d6..5e87e69b 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/item_filter_food.json
+++ b/src/main/resources/data/basepower/advancements/recipes/item_filter_food.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "item": "poweradvantage:item_conveyor"
+            "item": "basepower:item_conveyor"
           }
         ]
       }
@@ -34,7 +34,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:item_filter_food"
+        "recipe": "basepower:item_filter_food"
       }
     }
   },
@@ -48,7 +48,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:item_filter_food"
+      "basepower:item_filter_food"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/item_filter_fuel.json b/src/main/resources/data/basepower/advancements/recipes/item_filter_fuel.json
similarity index 86%
rename from src/main/resources/data/poweradvantage/advancements/recipes/item_filter_fuel.json
rename to src/main/resources/data/basepower/advancements/recipes/item_filter_fuel.json
index 4bef4dd2..9d98e9fc 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/item_filter_fuel.json
+++ b/src/main/resources/data/basepower/advancements/recipes/item_filter_fuel.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "item": "poweradvantage:item_conveyor"
+            "item": "basepower:item_conveyor"
           }
         ]
       }
@@ -34,7 +34,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:item_filter_fuel"
+        "recipe": "basepower:item_filter_fuel"
       }
     }
   },
@@ -48,7 +48,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:item_filter_fuel"
+      "basepower:item_filter_fuel"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/item_filter_inventory.json b/src/main/resources/data/basepower/advancements/recipes/item_filter_inventory.json
similarity index 85%
rename from src/main/resources/data/poweradvantage/advancements/recipes/item_filter_inventory.json
rename to src/main/resources/data/basepower/advancements/recipes/item_filter_inventory.json
index cbf44f37..df7d8c71 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/item_filter_inventory.json
+++ b/src/main/resources/data/basepower/advancements/recipes/item_filter_inventory.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "item": "poweradvantage:item_conveyor"
+            "item": "basepower:item_conveyor"
           }
         ]
       }
@@ -34,7 +34,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:item_filter_inventory"
+        "recipe": "basepower:item_filter_inventory"
       }
     }
   },
@@ -48,7 +48,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:item_filter_inventory"
+      "basepower:item_filter_inventory"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/item_filter_ore.json b/src/main/resources/data/basepower/advancements/recipes/item_filter_ore.json
similarity index 86%
rename from src/main/resources/data/poweradvantage/advancements/recipes/item_filter_ore.json
rename to src/main/resources/data/basepower/advancements/recipes/item_filter_ore.json
index 8b572bdf..5acf1338 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/item_filter_ore.json
+++ b/src/main/resources/data/basepower/advancements/recipes/item_filter_ore.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "item": "poweradvantage:item_conveyor"
+            "item": "basepower:item_conveyor"
           }
         ]
       }
@@ -34,7 +34,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:item_filter_ore"
+        "recipe": "basepower:item_filter_ore"
       }
     }
   },
@@ -48,7 +48,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:item_filter_ore"
+      "basepower:item_filter_ore"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/item_filter_overflow.json b/src/main/resources/data/basepower/advancements/recipes/item_filter_overflow.json
similarity index 82%
rename from src/main/resources/data/poweradvantage/advancements/recipes/item_filter_overflow.json
rename to src/main/resources/data/basepower/advancements/recipes/item_filter_overflow.json
index 46807bcb..2e594139 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/item_filter_overflow.json
+++ b/src/main/resources/data/basepower/advancements/recipes/item_filter_overflow.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "item": "poweradvantage:item_conveyor"
+            "item": "basepower:item_conveyor"
           }
         ]
       }
@@ -24,7 +24,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:item_filter_overflow"
+        "recipe": "basepower:item_filter_overflow"
       }
     }
   },
@@ -37,7 +37,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:item_filter_overflow"
+      "basepower:item_filter_overflow"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/item_filter_plant.json b/src/main/resources/data/basepower/advancements/recipes/item_filter_plant.json
similarity index 86%
rename from src/main/resources/data/poweradvantage/advancements/recipes/item_filter_plant.json
rename to src/main/resources/data/basepower/advancements/recipes/item_filter_plant.json
index 8fcd57bc..6e8b15c7 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/item_filter_plant.json
+++ b/src/main/resources/data/basepower/advancements/recipes/item_filter_plant.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "item": "poweradvantage:item_conveyor"
+            "item": "basepower:item_conveyor"
           }
         ]
       }
@@ -34,7 +34,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:item_filter_plant"
+        "recipe": "basepower:item_filter_plant"
       }
     }
   },
@@ -48,7 +48,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:item_filter_plant"
+      "basepower:item_filter_plant"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/item_filter_smelt.json b/src/main/resources/data/basepower/advancements/recipes/item_filter_smelt.json
similarity index 86%
rename from src/main/resources/data/poweradvantage/advancements/recipes/item_filter_smelt.json
rename to src/main/resources/data/basepower/advancements/recipes/item_filter_smelt.json
index b0f57b85..27de05e2 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/item_filter_smelt.json
+++ b/src/main/resources/data/basepower/advancements/recipes/item_filter_smelt.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "item": "poweradvantage:item_conveyor"
+            "item": "basepower:item_conveyor"
           }
         ]
       }
@@ -34,7 +34,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:item_filter_smelt"
+        "recipe": "basepower:item_filter_smelt"
       }
     }
   },
@@ -48,7 +48,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:item_filter_smelt"
+      "basepower:item_filter_smelt"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/rotator_tool.json b/src/main/resources/data/basepower/advancements/recipes/rotator_tool.json
similarity index 89%
rename from src/main/resources/data/poweradvantage/advancements/recipes/rotator_tool.json
rename to src/main/resources/data/basepower/advancements/recipes/rotator_tool.json
index b8367265..eed458d8 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/rotator_tool.json
+++ b/src/main/resources/data/basepower/advancements/recipes/rotator_tool.json
@@ -24,7 +24,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:rotator_tool"
+        "recipe": "basepower:rotator_tool"
       }
     }
   },
@@ -37,7 +37,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:rotator_tool"
+      "basepower:rotator_tool"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/sprocket_bronze_nugget_tech_no_rod.json b/src/main/resources/data/basepower/advancements/recipes/sprocket_bronze_nugget_tech_no_rod.json
similarity index 84%
rename from src/main/resources/data/poweradvantage/advancements/recipes/sprocket_bronze_nugget_tech_no_rod.json
rename to src/main/resources/data/basepower/advancements/recipes/sprocket_bronze_nugget_tech_no_rod.json
index 088df53f..2591d5ee 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/sprocket_bronze_nugget_tech_no_rod.json
+++ b/src/main/resources/data/basepower/advancements/recipes/sprocket_bronze_nugget_tech_no_rod.json
@@ -24,7 +24,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:sprocket_bronze_nugget_tech_no_rod"
+        "recipe": "basepower:sprocket_bronze_nugget_tech_no_rod"
       }
     }
   },
@@ -37,7 +37,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:sprocket_bronze_nugget_tech_no_rod"
+      "basepower:sprocket_bronze_nugget_tech_no_rod"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/sprocket_rod_normal.json b/src/main/resources/data/basepower/advancements/recipes/sprocket_rod_normal.json
similarity index 87%
rename from src/main/resources/data/poweradvantage/advancements/recipes/sprocket_rod_normal.json
rename to src/main/resources/data/basepower/advancements/recipes/sprocket_rod_normal.json
index a322a855..ea3a3bcc 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/sprocket_rod_normal.json
+++ b/src/main/resources/data/basepower/advancements/recipes/sprocket_rod_normal.json
@@ -24,7 +24,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:sprocket_rod_normal"
+        "recipe": "basepower:sprocket_rod_normal"
       }
     }
   },
@@ -37,7 +37,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:sprocket_rod_normal"
+      "basepower:sprocket_rod_normal"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/sprocket_rod_tech.json b/src/main/resources/data/basepower/advancements/recipes/sprocket_rod_tech.json
similarity index 88%
rename from src/main/resources/data/poweradvantage/advancements/recipes/sprocket_rod_tech.json
rename to src/main/resources/data/basepower/advancements/recipes/sprocket_rod_tech.json
index 5f79ed5b..4a6a2719 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/sprocket_rod_tech.json
+++ b/src/main/resources/data/basepower/advancements/recipes/sprocket_rod_tech.json
@@ -24,7 +24,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:sprocket_rod_tech"
+        "recipe": "basepower:sprocket_rod_tech"
       }
     }
   },
@@ -37,7 +37,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:sprocket_rod_tech"
+      "basepower:sprocket_rod_tech"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/sprocket_stickwood_normal.json b/src/main/resources/data/basepower/advancements/recipes/sprocket_stickwood_normal.json
similarity index 81%
rename from src/main/resources/data/poweradvantage/advancements/recipes/sprocket_stickwood_normal.json
rename to src/main/resources/data/basepower/advancements/recipes/sprocket_stickwood_normal.json
index 2ed87710..203b43ad 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/sprocket_stickwood_normal.json
+++ b/src/main/resources/data/basepower/advancements/recipes/sprocket_stickwood_normal.json
@@ -14,7 +14,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:sprocket_stickwood_normal"
+        "recipe": "basepower:sprocket_stickwood_normal"
       }
     }
   },
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:sprocket_stickwood_normal"
+      "basepower:sprocket_stickwood_normal"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/starch_from_potato.json b/src/main/resources/data/basepower/advancements/recipes/starch_from_potato.json
similarity index 88%
rename from src/main/resources/data/poweradvantage/advancements/recipes/starch_from_potato.json
rename to src/main/resources/data/basepower/advancements/recipes/starch_from_potato.json
index 1b43de31..3640acbd 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/starch_from_potato.json
+++ b/src/main/resources/data/basepower/advancements/recipes/starch_from_potato.json
@@ -24,7 +24,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:starch_from_potato"
+        "recipe": "basepower:starch_from_potato"
       }
     }
   },
@@ -37,7 +37,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:starch_from_potato"
+      "basepower:starch_from_potato"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/steel_frame.json b/src/main/resources/data/basepower/advancements/recipes/steel_frame.json
similarity index 85%
rename from src/main/resources/data/poweradvantage/advancements/recipes/steel_frame.json
rename to src/main/resources/data/basepower/advancements/recipes/steel_frame.json
index 48cafc5e..f0268ab3 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/steel_frame.json
+++ b/src/main/resources/data/basepower/advancements/recipes/steel_frame.json
@@ -14,7 +14,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:steel_frame"
+        "recipe": "basepower:steel_frame"
       }
     }
   },
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:steel_frame"
+      "basepower:steel_frame"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/advancements/recipes/still.json b/src/main/resources/data/basepower/advancements/recipes/still.json
similarity index 93%
rename from src/main/resources/data/poweradvantage/advancements/recipes/still.json
rename to src/main/resources/data/basepower/advancements/recipes/still.json
index c3199575..a0dc1b84 100644
--- a/src/main/resources/data/poweradvantage/advancements/recipes/still.json
+++ b/src/main/resources/data/basepower/advancements/recipes/still.json
@@ -34,7 +34,7 @@
     "has_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "poweradvantage:still"
+        "recipe": "basepower:still"
       }
     }
   },
@@ -48,7 +48,7 @@
   ],
   "rewards": {
     "recipes": [
-      "poweradvantage:still"
+      "basepower:still"
     ]
   }
 }
diff --git a/src/main/resources/data/poweradvantage/loot_tables/chests/advantage_parts.json b/src/main/resources/data/basepower/loot_tables/chests/advantage_parts.json
similarity index 77%
rename from src/main/resources/data/poweradvantage/loot_tables/chests/advantage_parts.json
rename to src/main/resources/data/basepower/loot_tables/chests/advantage_parts.json
index c4998bb3..c0958a9c 100644
--- a/src/main/resources/data/poweradvantage/loot_tables/chests/advantage_parts.json
+++ b/src/main/resources/data/basepower/loot_tables/chests/advantage_parts.json
@@ -10,7 +10,7 @@
         },
         {
           "type": "item",
-          "name": "poweradvantage:sprocket",
+          "name": "basepower:sprocket",
           "weight": 5,
           "functions": [
             {
@@ -24,7 +24,7 @@
         },
         {
           "type": "item",
-          "name": "poweradvantage:fluid_pipe",
+          "name": "basepower:fluid_pipe",
           "weight": 5,
           "functions": [
             {
@@ -38,22 +38,22 @@
         },
         {
           "type": "item",
-          "name": "poweradvantage:fluid_storage_tank",
+          "name": "basepower:fluid_storage_tank",
           "weight": 3
         },
         {
           "type": "item",
-          "name": "poweradvantage:fluid_drain",
+          "name": "basepower:fluid_drain",
           "weight": 2
         },
         {
           "type": "item",
-          "name": "poweradvantage:fluid_discharge",
+          "name": "basepower:fluid_discharge",
           "weight": 2
         },
         {
           "type": "item",
-          "name": "poweradvantage:item_conveyor",
+          "name": "basepower:item_conveyor",
           "weight": 3,
           "functions": [
             {
@@ -66,7 +66,7 @@
           ]
         }
       ],
-      "name": "poweradvantage_legacy_parts_0"
+      "name": "basepower_legacy_parts_0"
     }
   ]
 }
diff --git a/src/main/resources/data/poweradvantage/orespawn/provider.json b/src/main/resources/data/basepower/orespawn/provider.json
similarity index 89%
rename from src/main/resources/data/poweradvantage/orespawn/provider.json
rename to src/main/resources/data/basepower/orespawn/provider.json
index 926e1005..6dd46c28 100644
--- a/src/main/resources/data/poweradvantage/orespawn/provider.json
+++ b/src/main/resources/data/basepower/orespawn/provider.json
@@ -1,14 +1,14 @@
 {
   "schema_version": 4,
-  "provider_modid": "poweradvantage",
+  "provider_modid": "basepower",
   "provider_revision": 1,
   "profile_defaults": {
     "place_fluid_deposits": true
   },
   "fluid_deposits": {
-    "poweradvantage:fluid_deposit/desert_crude_oil": {
+    "basepower:fluid_deposit/desert_crude_oil": {
       "enabled": true,
-      "block": "poweradvantage:crude_oil",
+      "block": "basepower:crude_oil",
       "dimensions": {
         "minecraft:overworld": {
           "enabled": true,
diff --git a/src/main/resources/data/basepower/recipes/bioplastic_from_starch.json b/src/main/resources/data/basepower/recipes/bioplastic_from_starch.json
new file mode 100644
index 00000000..d0d38d7b
--- /dev/null
+++ b/src/main/resources/data/basepower/recipes/bioplastic_from_starch.json
@@ -0,0 +1,11 @@
+{
+  "type": "minecraft:smelting",
+  "ingredient": {
+    "item": "basepower:starch"
+  },
+  "result": "basepower:bioplastic_ingot",
+  "experience": 0.1,
+  "cookingtime": 200,
+  "conditions": [],
+  "group": "basepower:bioplastic_ingot"
+}
diff --git a/src/main/resources/data/poweradvantage/recipes/converter_rf_electricity.json b/src/main/resources/data/basepower/recipes/converter_rf_electricity.json
similarity index 66%
rename from src/main/resources/data/poweradvantage/recipes/converter_rf_electricity.json
rename to src/main/resources/data/basepower/recipes/converter_rf_electricity.json
index 14ce2a66..2684a731 100644
--- a/src/main/resources/data/poweradvantage/recipes/converter_rf_electricity.json
+++ b/src/main/resources/data/basepower/recipes/converter_rf_electricity.json
@@ -15,17 +15,17 @@
     }
   },
   "result": {
-    "item": "poweradvantage:converter_rf_electricity"
+    "item": "basepower:converter_rf_electricity"
   },
   "conditions": [
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:power_supply_units"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:frames/steel"
     }
   ],
-  "group": "poweradvantage:converter_rf_electricity"
+  "group": "basepower:converter_rf_electricity"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/converter_rf_quantum.json b/src/main/resources/data/basepower/recipes/converter_rf_quantum.json
similarity index 70%
rename from src/main/resources/data/poweradvantage/recipes/converter_rf_quantum.json
rename to src/main/resources/data/basepower/recipes/converter_rf_quantum.json
index 847a7766..42803316 100644
--- a/src/main/resources/data/poweradvantage/recipes/converter_rf_quantum.json
+++ b/src/main/resources/data/basepower/recipes/converter_rf_quantum.json
@@ -15,13 +15,13 @@
     }
   },
   "result": {
-    "item": "poweradvantage:converter_rf_quantum"
+    "item": "basepower:converter_rf_quantum"
   },
   "conditions": [
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:frames/steel"
     }
   ],
-  "group": "poweradvantage:converter_rf_quantum"
+  "group": "basepower:converter_rf_quantum"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/converter_rf_steam.json b/src/main/resources/data/basepower/recipes/converter_rf_steam.json
similarity index 67%
rename from src/main/resources/data/poweradvantage/recipes/converter_rf_steam.json
rename to src/main/resources/data/basepower/recipes/converter_rf_steam.json
index 8063d676..af33bdfc 100644
--- a/src/main/resources/data/poweradvantage/recipes/converter_rf_steam.json
+++ b/src/main/resources/data/basepower/recipes/converter_rf_steam.json
@@ -15,17 +15,17 @@
     }
   },
   "result": {
-    "item": "poweradvantage:converter_rf_steam"
+    "item": "basepower:converter_rf_steam"
   },
   "conditions": [
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:governors"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:frames/steel"
     }
   ],
-  "group": "poweradvantage:converter_rf_steam"
+  "group": "basepower:converter_rf_steam"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/converter_tr_electricity_iron.json b/src/main/resources/data/basepower/recipes/converter_tr_electricity_iron.json
similarity index 63%
rename from src/main/resources/data/poweradvantage/recipes/converter_tr_electricity_iron.json
rename to src/main/resources/data/basepower/recipes/converter_tr_electricity_iron.json
index 7e651368..1e4061fc 100644
--- a/src/main/resources/data/poweradvantage/recipes/converter_tr_electricity_iron.json
+++ b/src/main/resources/data/basepower/recipes/converter_tr_electricity_iron.json
@@ -14,21 +14,21 @@
     }
   },
   "result": {
-    "item": "poweradvantage:converter_tr_electricity"
+    "item": "basepower:converter_tr_electricity"
   },
   "conditions": [
     {
-      "type": "poweradvantage:tag_empty",
+      "type": "basepower:tag_empty",
       "tag": "forge:ingots/refined_iron"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/iron"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:power_supply_units"
     }
   ],
-  "group": "poweradvantage:converter_tr_electricity"
+  "group": "basepower:converter_tr_electricity"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/converter_tr_electricity_refined_iron.json b/src/main/resources/data/basepower/recipes/converter_tr_electricity_refined_iron.json
similarity index 65%
rename from src/main/resources/data/poweradvantage/recipes/converter_tr_electricity_refined_iron.json
rename to src/main/resources/data/basepower/recipes/converter_tr_electricity_refined_iron.json
index b54899e9..478f6afa 100644
--- a/src/main/resources/data/poweradvantage/recipes/converter_tr_electricity_refined_iron.json
+++ b/src/main/resources/data/basepower/recipes/converter_tr_electricity_refined_iron.json
@@ -14,17 +14,17 @@
     }
   },
   "result": {
-    "item": "poweradvantage:converter_tr_electricity"
+    "item": "basepower:converter_tr_electricity"
   },
   "conditions": [
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/refined_iron"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:power_supply_units"
     }
   ],
-  "group": "poweradvantage:converter_tr_electricity"
+  "group": "basepower:converter_tr_electricity"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/crushing_fluid_discharge.json b/src/main/resources/data/basepower/recipes/crushing_fluid_discharge.json
similarity index 63%
rename from src/main/resources/data/poweradvantage/recipes/crushing_fluid_discharge.json
rename to src/main/resources/data/basepower/recipes/crushing_fluid_discharge.json
index be1433fc..287cfbfd 100644
--- a/src/main/resources/data/poweradvantage/recipes/crushing_fluid_discharge.json
+++ b/src/main/resources/data/basepower/recipes/crushing_fluid_discharge.json
@@ -1,10 +1,10 @@
 {
   "type": "basemetals:crushing",
   "ingredient": {
-    "item": "poweradvantage:fluid_discharge"
+    "item": "basepower:fluid_discharge"
   },
   "result": {
-    "item": "poweradvantage:fluid_pipe",
+    "item": "basepower:fluid_pipe",
     "count": 2
   },
   "conditions": [
@@ -13,7 +13,7 @@
       "modid": "basemetals"
     },
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "APOCALYPTIC"
     }
   ]
diff --git a/src/main/resources/data/poweradvantage/recipes/crushing_fluid_drain.json b/src/main/resources/data/basepower/recipes/crushing_fluid_drain.json
similarity index 64%
rename from src/main/resources/data/poweradvantage/recipes/crushing_fluid_drain.json
rename to src/main/resources/data/basepower/recipes/crushing_fluid_drain.json
index 9f29a41c..69d8e470 100644
--- a/src/main/resources/data/poweradvantage/recipes/crushing_fluid_drain.json
+++ b/src/main/resources/data/basepower/recipes/crushing_fluid_drain.json
@@ -1,10 +1,10 @@
 {
   "type": "basemetals:crushing",
   "ingredient": {
-    "item": "poweradvantage:fluid_drain"
+    "item": "basepower:fluid_drain"
   },
   "result": {
-    "item": "poweradvantage:fluid_pipe",
+    "item": "basepower:fluid_pipe",
     "count": 2
   },
   "conditions": [
@@ -13,7 +13,7 @@
       "modid": "basemetals"
     },
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "APOCALYPTIC"
     }
   ]
diff --git a/src/main/resources/data/poweradvantage/recipes/crushing_fluid_storage_tank.json b/src/main/resources/data/basepower/recipes/crushing_fluid_storage_tank.json
similarity index 63%
rename from src/main/resources/data/poweradvantage/recipes/crushing_fluid_storage_tank.json
rename to src/main/resources/data/basepower/recipes/crushing_fluid_storage_tank.json
index ef926eb3..a6d41a9e 100644
--- a/src/main/resources/data/poweradvantage/recipes/crushing_fluid_storage_tank.json
+++ b/src/main/resources/data/basepower/recipes/crushing_fluid_storage_tank.json
@@ -1,10 +1,10 @@
 {
   "type": "basemetals:crushing",
   "ingredient": {
-    "item": "poweradvantage:fluid_storage_tank"
+    "item": "basepower:fluid_storage_tank"
   },
   "result": {
-    "item": "poweradvantage:fluid_pipe",
+    "item": "basepower:fluid_pipe",
     "count": 1
   },
   "conditions": [
@@ -13,7 +13,7 @@
       "modid": "basemetals"
     },
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "APOCALYPTIC"
     }
   ]
diff --git a/src/main/resources/data/poweradvantage/recipes/crushing_item_conveyor.json b/src/main/resources/data/basepower/recipes/crushing_item_conveyor.json
similarity index 70%
rename from src/main/resources/data/poweradvantage/recipes/crushing_item_conveyor.json
rename to src/main/resources/data/basepower/recipes/crushing_item_conveyor.json
index 938aa2cd..f20d15eb 100644
--- a/src/main/resources/data/poweradvantage/recipes/crushing_item_conveyor.json
+++ b/src/main/resources/data/basepower/recipes/crushing_item_conveyor.json
@@ -1,7 +1,7 @@
 {
   "type": "basemetals:crushing",
   "ingredient": {
-    "item": "poweradvantage:item_conveyor"
+    "item": "basepower:item_conveyor"
   },
   "result": {
     "item": "basemetals:steel_plate",
@@ -13,11 +13,11 @@
       "modid": "basemetals"
     },
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "APOCALYPTIC"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:plates/steel"
     }
   ]
diff --git a/src/main/resources/data/basepower/recipes/crushing_item_filter_block.json b/src/main/resources/data/basepower/recipes/crushing_item_filter_block.json
new file mode 100644
index 00000000..d3429ad9
--- /dev/null
+++ b/src/main/resources/data/basepower/recipes/crushing_item_filter_block.json
@@ -0,0 +1,24 @@
+{
+  "type": "basemetals:crushing",
+  "ingredient": {
+    "item": "basepower:item_filter_block"
+  },
+  "result": {
+    "item": "basemetals:steel_plate",
+    "count": 1
+  },
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "basemetals"
+    },
+    {
+      "type": "basepower:recipe_mode",
+      "mode": "APOCALYPTIC"
+    },
+    {
+      "type": "basepower:tag_not_empty",
+      "tag": "forge:plates/steel"
+    }
+  ]
+}
diff --git a/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_food.json b/src/main/resources/data/basepower/recipes/crushing_item_filter_food.json
similarity index 69%
rename from src/main/resources/data/poweradvantage/recipes/crushing_item_filter_food.json
rename to src/main/resources/data/basepower/recipes/crushing_item_filter_food.json
index 21c06c04..05ccc8e4 100644
--- a/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_food.json
+++ b/src/main/resources/data/basepower/recipes/crushing_item_filter_food.json
@@ -1,7 +1,7 @@
 {
   "type": "basemetals:crushing",
   "ingredient": {
-    "item": "poweradvantage:item_filter_food"
+    "item": "basepower:item_filter_food"
   },
   "result": {
     "item": "basemetals:steel_plate",
@@ -13,11 +13,11 @@
       "modid": "basemetals"
     },
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "APOCALYPTIC"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:plates/steel"
     }
   ]
diff --git a/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_fuel.json b/src/main/resources/data/basepower/recipes/crushing_item_filter_fuel.json
similarity index 69%
rename from src/main/resources/data/poweradvantage/recipes/crushing_item_filter_fuel.json
rename to src/main/resources/data/basepower/recipes/crushing_item_filter_fuel.json
index 15f45a8f..44f31b31 100644
--- a/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_fuel.json
+++ b/src/main/resources/data/basepower/recipes/crushing_item_filter_fuel.json
@@ -1,7 +1,7 @@
 {
   "type": "basemetals:crushing",
   "ingredient": {
-    "item": "poweradvantage:item_filter_fuel"
+    "item": "basepower:item_filter_fuel"
   },
   "result": {
     "item": "basemetals:steel_plate",
@@ -13,11 +13,11 @@
       "modid": "basemetals"
     },
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "APOCALYPTIC"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:plates/steel"
     }
   ]
diff --git a/src/main/resources/data/basepower/recipes/crushing_item_filter_inventory.json b/src/main/resources/data/basepower/recipes/crushing_item_filter_inventory.json
new file mode 100644
index 00000000..807e993d
--- /dev/null
+++ b/src/main/resources/data/basepower/recipes/crushing_item_filter_inventory.json
@@ -0,0 +1,24 @@
+{
+  "type": "basemetals:crushing",
+  "ingredient": {
+    "item": "basepower:item_filter_inventory"
+  },
+  "result": {
+    "item": "basemetals:steel_plate",
+    "count": 1
+  },
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "basemetals"
+    },
+    {
+      "type": "basepower:recipe_mode",
+      "mode": "APOCALYPTIC"
+    },
+    {
+      "type": "basepower:tag_not_empty",
+      "tag": "forge:plates/steel"
+    }
+  ]
+}
diff --git a/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_ore.json b/src/main/resources/data/basepower/recipes/crushing_item_filter_ore.json
similarity index 70%
rename from src/main/resources/data/poweradvantage/recipes/crushing_item_filter_ore.json
rename to src/main/resources/data/basepower/recipes/crushing_item_filter_ore.json
index c452fc85..e6163d6b 100644
--- a/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_ore.json
+++ b/src/main/resources/data/basepower/recipes/crushing_item_filter_ore.json
@@ -1,7 +1,7 @@
 {
   "type": "basemetals:crushing",
   "ingredient": {
-    "item": "poweradvantage:item_filter_ore"
+    "item": "basepower:item_filter_ore"
   },
   "result": {
     "item": "basemetals:steel_plate",
@@ -13,11 +13,11 @@
       "modid": "basemetals"
     },
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "APOCALYPTIC"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:plates/steel"
     }
   ]
diff --git a/src/main/resources/data/basepower/recipes/crushing_item_filter_overflow.json b/src/main/resources/data/basepower/recipes/crushing_item_filter_overflow.json
new file mode 100644
index 00000000..bebb9dbf
--- /dev/null
+++ b/src/main/resources/data/basepower/recipes/crushing_item_filter_overflow.json
@@ -0,0 +1,24 @@
+{
+  "type": "basemetals:crushing",
+  "ingredient": {
+    "item": "basepower:item_filter_overflow"
+  },
+  "result": {
+    "item": "basemetals:steel_plate",
+    "count": 1
+  },
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "basemetals"
+    },
+    {
+      "type": "basepower:recipe_mode",
+      "mode": "APOCALYPTIC"
+    },
+    {
+      "type": "basepower:tag_not_empty",
+      "tag": "forge:plates/steel"
+    }
+  ]
+}
diff --git a/src/main/resources/data/basepower/recipes/crushing_item_filter_plant.json b/src/main/resources/data/basepower/recipes/crushing_item_filter_plant.json
new file mode 100644
index 00000000..3477628d
--- /dev/null
+++ b/src/main/resources/data/basepower/recipes/crushing_item_filter_plant.json
@@ -0,0 +1,24 @@
+{
+  "type": "basemetals:crushing",
+  "ingredient": {
+    "item": "basepower:item_filter_plant"
+  },
+  "result": {
+    "item": "basemetals:steel_plate",
+    "count": 1
+  },
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "basemetals"
+    },
+    {
+      "type": "basepower:recipe_mode",
+      "mode": "APOCALYPTIC"
+    },
+    {
+      "type": "basepower:tag_not_empty",
+      "tag": "forge:plates/steel"
+    }
+  ]
+}
diff --git a/src/main/resources/data/basepower/recipes/crushing_item_filter_smelt.json b/src/main/resources/data/basepower/recipes/crushing_item_filter_smelt.json
new file mode 100644
index 00000000..4b460e80
--- /dev/null
+++ b/src/main/resources/data/basepower/recipes/crushing_item_filter_smelt.json
@@ -0,0 +1,24 @@
+{
+  "type": "basemetals:crushing",
+  "ingredient": {
+    "item": "basepower:item_filter_smelt"
+  },
+  "result": {
+    "item": "basemetals:steel_plate",
+    "count": 1
+  },
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "basemetals"
+    },
+    {
+      "type": "basepower:recipe_mode",
+      "mode": "APOCALYPTIC"
+    },
+    {
+      "type": "basepower:tag_not_empty",
+      "tag": "forge:plates/steel"
+    }
+  ]
+}
diff --git a/src/main/resources/data/poweradvantage/recipes/crushing_potato_starch.json b/src/main/resources/data/basepower/recipes/crushing_potato_starch.json
similarity index 88%
rename from src/main/resources/data/poweradvantage/recipes/crushing_potato_starch.json
rename to src/main/resources/data/basepower/recipes/crushing_potato_starch.json
index 9282b29e..6e8df4fa 100644
--- a/src/main/resources/data/poweradvantage/recipes/crushing_potato_starch.json
+++ b/src/main/resources/data/basepower/recipes/crushing_potato_starch.json
@@ -9,7 +9,7 @@
     }
   ],
   "result": {
-    "item": "poweradvantage:starch",
+    "item": "basepower:starch",
     "count": 1
   },
   "conditions": [
diff --git a/src/main/resources/data/poweradvantage/recipes/fluid_discharge.json b/src/main/resources/data/basepower/recipes/fluid_discharge.json
similarity index 65%
rename from src/main/resources/data/poweradvantage/recipes/fluid_discharge.json
rename to src/main/resources/data/basepower/recipes/fluid_discharge.json
index ecf2d303..6a49f66d 100644
--- a/src/main/resources/data/poweradvantage/recipes/fluid_discharge.json
+++ b/src/main/resources/data/basepower/recipes/fluid_discharge.json
@@ -20,24 +20,24 @@
     }
   },
   "result": {
-    "item": "poweradvantage:fluid_discharge"
+    "item": "basepower:fluid_discharge"
   },
-  "group": "poweradvantage:fluid_discharge",
+  "group": "basepower:fluid_discharge",
   "conditions": [
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:bars"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:frames/steel"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:pipes"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:plates/steel"
     }
   ]
diff --git a/src/main/resources/data/poweradvantage/recipes/fluid_drain.json b/src/main/resources/data/basepower/recipes/fluid_drain.json
similarity index 65%
rename from src/main/resources/data/poweradvantage/recipes/fluid_drain.json
rename to src/main/resources/data/basepower/recipes/fluid_drain.json
index 94a9e5b5..fd33b2c8 100644
--- a/src/main/resources/data/poweradvantage/recipes/fluid_drain.json
+++ b/src/main/resources/data/basepower/recipes/fluid_drain.json
@@ -20,24 +20,24 @@
     }
   },
   "result": {
-    "item": "poweradvantage:fluid_drain"
+    "item": "basepower:fluid_drain"
   },
-  "group": "poweradvantage:fluid_drain",
+  "group": "basepower:fluid_drain",
   "conditions": [
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:bars"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:frames/steel"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:pipes"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:plates/steel"
     }
   ]
diff --git a/src/main/resources/data/poweradvantage/recipes/fluid_metal_tank_iron_normal.json b/src/main/resources/data/basepower/recipes/fluid_metal_tank_iron_normal.json
similarity index 61%
rename from src/main/resources/data/poweradvantage/recipes/fluid_metal_tank_iron_normal.json
rename to src/main/resources/data/basepower/recipes/fluid_metal_tank_iron_normal.json
index f97e9c64..9c0fdc33 100644
--- a/src/main/resources/data/poweradvantage/recipes/fluid_metal_tank_iron_normal.json
+++ b/src/main/resources/data/basepower/recipes/fluid_metal_tank_iron_normal.json
@@ -14,21 +14,21 @@
     }
   },
   "result": {
-    "item": "poweradvantage:fluid_metal_tank"
+    "item": "basepower:fluid_metal_tank"
   },
   "conditions": [
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "NORMAL"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/iron"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:pipes"
     }
   ],
-  "group": "poweradvantage:fluid_metal_tank"
+  "group": "basepower:fluid_metal_tank"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/fluid_metal_tank_steel.json b/src/main/resources/data/basepower/recipes/fluid_metal_tank_steel.json
similarity index 64%
rename from src/main/resources/data/poweradvantage/recipes/fluid_metal_tank_steel.json
rename to src/main/resources/data/basepower/recipes/fluid_metal_tank_steel.json
index 2045c3b2..37733d05 100644
--- a/src/main/resources/data/poweradvantage/recipes/fluid_metal_tank_steel.json
+++ b/src/main/resources/data/basepower/recipes/fluid_metal_tank_steel.json
@@ -14,16 +14,16 @@
     }
   },
   "result": {
-    "item": "poweradvantage:fluid_metal_tank"
+    "item": "basepower:fluid_metal_tank"
   },
-  "group": "poweradvantage:fluid_metal_tank",
+  "group": "basepower:fluid_metal_tank",
   "conditions": [
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/steel"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:pipes"
     }
   ]
diff --git a/src/main/resources/data/poweradvantage/recipes/fluid_pipe_copper_apocalyptic.json b/src/main/resources/data/basepower/recipes/fluid_pipe_copper_apocalyptic.json
similarity index 64%
rename from src/main/resources/data/poweradvantage/recipes/fluid_pipe_copper_apocalyptic.json
rename to src/main/resources/data/basepower/recipes/fluid_pipe_copper_apocalyptic.json
index fb955d41..50fbd0c6 100644
--- a/src/main/resources/data/poweradvantage/recipes/fluid_pipe_copper_apocalyptic.json
+++ b/src/main/resources/data/basepower/recipes/fluid_pipe_copper_apocalyptic.json
@@ -11,18 +11,18 @@
     }
   },
   "result": {
-    "item": "poweradvantage:fluid_pipe",
+    "item": "basepower:fluid_pipe",
     "count": 3
   },
   "conditions": [
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "APOCALYPTIC"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/copper"
     }
   ],
-  "group": "poweradvantage:fluid_pipe"
+  "group": "basepower:fluid_pipe"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/fluid_pipe_copper_normal.json b/src/main/resources/data/basepower/recipes/fluid_pipe_copper_normal.json
similarity index 64%
rename from src/main/resources/data/poweradvantage/recipes/fluid_pipe_copper_normal.json
rename to src/main/resources/data/basepower/recipes/fluid_pipe_copper_normal.json
index 28b0f330..e94d98eb 100644
--- a/src/main/resources/data/poweradvantage/recipes/fluid_pipe_copper_normal.json
+++ b/src/main/resources/data/basepower/recipes/fluid_pipe_copper_normal.json
@@ -11,18 +11,18 @@
     }
   },
   "result": {
-    "item": "poweradvantage:fluid_pipe",
+    "item": "basepower:fluid_pipe",
     "count": 6
   },
   "conditions": [
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "NORMAL"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/copper"
     }
   ],
-  "group": "poweradvantage:fluid_pipe"
+  "group": "basepower:fluid_pipe"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/fluid_pipe_iron_apocalyptic.json b/src/main/resources/data/basepower/recipes/fluid_pipe_iron_apocalyptic.json
similarity index 64%
rename from src/main/resources/data/poweradvantage/recipes/fluid_pipe_iron_apocalyptic.json
rename to src/main/resources/data/basepower/recipes/fluid_pipe_iron_apocalyptic.json
index 304275bb..36d5c6b9 100644
--- a/src/main/resources/data/poweradvantage/recipes/fluid_pipe_iron_apocalyptic.json
+++ b/src/main/resources/data/basepower/recipes/fluid_pipe_iron_apocalyptic.json
@@ -11,18 +11,18 @@
     }
   },
   "result": {
-    "item": "poweradvantage:fluid_pipe",
+    "item": "basepower:fluid_pipe",
     "count": 3
   },
   "conditions": [
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "APOCALYPTIC"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/iron"
     }
   ],
-  "group": "poweradvantage:fluid_pipe"
+  "group": "basepower:fluid_pipe"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/fluid_pipe_iron_normal.json b/src/main/resources/data/basepower/recipes/fluid_pipe_iron_normal.json
similarity index 63%
rename from src/main/resources/data/poweradvantage/recipes/fluid_pipe_iron_normal.json
rename to src/main/resources/data/basepower/recipes/fluid_pipe_iron_normal.json
index 138d1a20..86a88671 100644
--- a/src/main/resources/data/poweradvantage/recipes/fluid_pipe_iron_normal.json
+++ b/src/main/resources/data/basepower/recipes/fluid_pipe_iron_normal.json
@@ -11,18 +11,18 @@
     }
   },
   "result": {
-    "item": "poweradvantage:fluid_pipe",
+    "item": "basepower:fluid_pipe",
     "count": 6
   },
   "conditions": [
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "NORMAL"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/iron"
     }
   ],
-  "group": "poweradvantage:fluid_pipe"
+  "group": "basepower:fluid_pipe"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/fluid_pipe_iron_tech.json b/src/main/resources/data/basepower/recipes/fluid_pipe_iron_tech.json
similarity index 64%
rename from src/main/resources/data/poweradvantage/recipes/fluid_pipe_iron_tech.json
rename to src/main/resources/data/basepower/recipes/fluid_pipe_iron_tech.json
index ecfae1ea..8d6d6ce8 100644
--- a/src/main/resources/data/poweradvantage/recipes/fluid_pipe_iron_tech.json
+++ b/src/main/resources/data/basepower/recipes/fluid_pipe_iron_tech.json
@@ -11,18 +11,18 @@
     }
   },
   "result": {
-    "item": "poweradvantage:fluid_pipe",
+    "item": "basepower:fluid_pipe",
     "count": 6
   },
   "conditions": [
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "TECH_PROGRESSION"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/iron"
     }
   ],
-  "group": "poweradvantage:fluid_pipe"
+  "group": "basepower:fluid_pipe"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/fluid_pipe_lead_apocalyptic.json b/src/main/resources/data/basepower/recipes/fluid_pipe_lead_apocalyptic.json
similarity index 64%
rename from src/main/resources/data/poweradvantage/recipes/fluid_pipe_lead_apocalyptic.json
rename to src/main/resources/data/basepower/recipes/fluid_pipe_lead_apocalyptic.json
index d5d4c736..b6a655a8 100644
--- a/src/main/resources/data/poweradvantage/recipes/fluid_pipe_lead_apocalyptic.json
+++ b/src/main/resources/data/basepower/recipes/fluid_pipe_lead_apocalyptic.json
@@ -11,18 +11,18 @@
     }
   },
   "result": {
-    "item": "poweradvantage:fluid_pipe",
+    "item": "basepower:fluid_pipe",
     "count": 3
   },
   "conditions": [
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "APOCALYPTIC"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/lead"
     }
   ],
-  "group": "poweradvantage:fluid_pipe"
+  "group": "basepower:fluid_pipe"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/fluid_storage_tank.json b/src/main/resources/data/basepower/recipes/fluid_storage_tank.json
similarity index 64%
rename from src/main/resources/data/poweradvantage/recipes/fluid_storage_tank.json
rename to src/main/resources/data/basepower/recipes/fluid_storage_tank.json
index 65034d0e..fd205290 100644
--- a/src/main/resources/data/poweradvantage/recipes/fluid_storage_tank.json
+++ b/src/main/resources/data/basepower/recipes/fluid_storage_tank.json
@@ -14,16 +14,16 @@
     }
   },
   "result": {
-    "item": "poweradvantage:fluid_storage_tank"
+    "item": "basepower:fluid_storage_tank"
   },
-  "group": "poweradvantage:fluid_storage_tank",
+  "group": "basepower:fluid_storage_tank",
   "conditions": [
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/plastic"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:pipes"
     }
   ]
diff --git a/src/main/resources/data/poweradvantage/recipes/fluid_switch.json b/src/main/resources/data/basepower/recipes/fluid_switch.json
similarity index 67%
rename from src/main/resources/data/poweradvantage/recipes/fluid_switch.json
rename to src/main/resources/data/basepower/recipes/fluid_switch.json
index c5614c49..2e3b9dc0 100644
--- a/src/main/resources/data/poweradvantage/recipes/fluid_switch.json
+++ b/src/main/resources/data/basepower/recipes/fluid_switch.json
@@ -16,16 +16,16 @@
     }
   },
   "result": {
-    "item": "poweradvantage:fluid_switch"
+    "item": "basepower:fluid_switch"
   },
-  "group": "poweradvantage:fluid_switch",
+  "group": "basepower:fluid_switch",
   "conditions": [
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:frames/steel"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:pipes"
     }
   ]
diff --git a/src/main/resources/data/poweradvantage/recipes/item_conveyor.json b/src/main/resources/data/basepower/recipes/item_conveyor.json
similarity index 69%
rename from src/main/resources/data/poweradvantage/recipes/item_conveyor.json
rename to src/main/resources/data/basepower/recipes/item_conveyor.json
index ecbcede0..ea0c68d7 100644
--- a/src/main/resources/data/poweradvantage/recipes/item_conveyor.json
+++ b/src/main/resources/data/basepower/recipes/item_conveyor.json
@@ -17,17 +17,17 @@
     }
   },
   "result": {
-    "item": "poweradvantage:item_conveyor",
+    "item": "basepower:item_conveyor",
     "count": 5
   },
-  "group": "poweradvantage:item_conveyor",
+  "group": "basepower:item_conveyor",
   "conditions": [
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:plates/steel"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:sprockets"
     }
   ]
diff --git a/src/main/resources/data/poweradvantage/recipes/item_filter_block.json b/src/main/resources/data/basepower/recipes/item_filter_block.json
similarity index 66%
rename from src/main/resources/data/poweradvantage/recipes/item_filter_block.json
rename to src/main/resources/data/basepower/recipes/item_filter_block.json
index 1e341238..3d80c30a 100644
--- a/src/main/resources/data/poweradvantage/recipes/item_filter_block.json
+++ b/src/main/resources/data/basepower/recipes/item_filter_block.json
@@ -7,7 +7,7 @@
   ],
   "key": {
     "x": {
-      "item": "poweradvantage:item_conveyor"
+      "item": "basepower:item_conveyor"
     },
     "y": {
       "item": "minecraft:stone",
@@ -18,7 +18,7 @@
     }
   },
   "result": {
-    "item": "poweradvantage:item_filter_block"
+    "item": "basepower:item_filter_block"
   },
-  "group": "poweradvantage:item_filter_block"
+  "group": "basepower:item_filter_block"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/item_filter_food.json b/src/main/resources/data/basepower/recipes/item_filter_food.json
similarity index 65%
rename from src/main/resources/data/poweradvantage/recipes/item_filter_food.json
rename to src/main/resources/data/basepower/recipes/item_filter_food.json
index 624079b6..794a1a07 100644
--- a/src/main/resources/data/poweradvantage/recipes/item_filter_food.json
+++ b/src/main/resources/data/basepower/recipes/item_filter_food.json
@@ -7,7 +7,7 @@
   ],
   "key": {
     "x": {
-      "item": "poweradvantage:item_conveyor"
+      "item": "basepower:item_conveyor"
     },
     "y": {
       "item": "minecraft:bread"
@@ -17,7 +17,7 @@
     }
   },
   "result": {
-    "item": "poweradvantage:item_filter_food"
+    "item": "basepower:item_filter_food"
   },
-  "group": "poweradvantage:item_filter_food"
+  "group": "basepower:item_filter_food"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/item_filter_fuel.json b/src/main/resources/data/basepower/recipes/item_filter_fuel.json
similarity index 66%
rename from src/main/resources/data/poweradvantage/recipes/item_filter_fuel.json
rename to src/main/resources/data/basepower/recipes/item_filter_fuel.json
index d6a5c935..423d8a50 100644
--- a/src/main/resources/data/poweradvantage/recipes/item_filter_fuel.json
+++ b/src/main/resources/data/basepower/recipes/item_filter_fuel.json
@@ -7,7 +7,7 @@
   ],
   "key": {
     "x": {
-      "item": "poweradvantage:item_conveyor"
+      "item": "basepower:item_conveyor"
     },
     "y": {
       "item": "minecraft:coal",
@@ -18,7 +18,7 @@
     }
   },
   "result": {
-    "item": "poweradvantage:item_filter_fuel"
+    "item": "basepower:item_filter_fuel"
   },
-  "group": "poweradvantage:item_filter_fuel"
+  "group": "basepower:item_filter_fuel"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/item_filter_inventory.json b/src/main/resources/data/basepower/recipes/item_filter_inventory.json
similarity index 63%
rename from src/main/resources/data/poweradvantage/recipes/item_filter_inventory.json
rename to src/main/resources/data/basepower/recipes/item_filter_inventory.json
index 597acd77..915d055a 100644
--- a/src/main/resources/data/poweradvantage/recipes/item_filter_inventory.json
+++ b/src/main/resources/data/basepower/recipes/item_filter_inventory.json
@@ -7,7 +7,7 @@
   ],
   "key": {
     "x": {
-      "item": "poweradvantage:item_conveyor"
+      "item": "basepower:item_conveyor"
     },
     "y": {
       "item": "minecraft:chest"
@@ -17,7 +17,7 @@
     }
   },
   "result": {
-    "item": "poweradvantage:item_filter_inventory"
+    "item": "basepower:item_filter_inventory"
   },
-  "group": "poweradvantage:item_filter_inventory"
+  "group": "basepower:item_filter_inventory"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/item_filter_ore.json b/src/main/resources/data/basepower/recipes/item_filter_ore.json
similarity index 64%
rename from src/main/resources/data/poweradvantage/recipes/item_filter_ore.json
rename to src/main/resources/data/basepower/recipes/item_filter_ore.json
index acc6ad2b..2cc51d2a 100644
--- a/src/main/resources/data/poweradvantage/recipes/item_filter_ore.json
+++ b/src/main/resources/data/basepower/recipes/item_filter_ore.json
@@ -7,7 +7,7 @@
   ],
   "key": {
     "x": {
-      "item": "poweradvantage:item_conveyor"
+      "item": "basepower:item_conveyor"
     },
     "y": {
       "tag": "forge:ingots/gold"
@@ -17,12 +17,12 @@
     }
   },
   "result": {
-    "item": "poweradvantage:item_filter_ore"
+    "item": "basepower:item_filter_ore"
   },
-  "group": "poweradvantage:item_filter_ore",
+  "group": "basepower:item_filter_ore",
   "conditions": [
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/gold"
     }
   ]
diff --git a/src/main/resources/data/poweradvantage/recipes/item_filter_overflow.json b/src/main/resources/data/basepower/recipes/item_filter_overflow.json
similarity index 57%
rename from src/main/resources/data/poweradvantage/recipes/item_filter_overflow.json
rename to src/main/resources/data/basepower/recipes/item_filter_overflow.json
index ce858ccc..8b6bf07f 100644
--- a/src/main/resources/data/poweradvantage/recipes/item_filter_overflow.json
+++ b/src/main/resources/data/basepower/recipes/item_filter_overflow.json
@@ -6,14 +6,14 @@
   ],
   "key": {
     "x": {
-      "item": "poweradvantage:item_conveyor"
+      "item": "basepower:item_conveyor"
     },
     "z": {
       "item": "minecraft:oak_pressure_plate"
     }
   },
   "result": {
-    "item": "poweradvantage:item_filter_overflow"
+    "item": "basepower:item_filter_overflow"
   },
-  "group": "poweradvantage:item_filter_overflow"
+  "group": "basepower:item_filter_overflow"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/item_filter_plant.json b/src/main/resources/data/basepower/recipes/item_filter_plant.json
similarity index 64%
rename from src/main/resources/data/poweradvantage/recipes/item_filter_plant.json
rename to src/main/resources/data/basepower/recipes/item_filter_plant.json
index 5d4f1c23..1d0761b5 100644
--- a/src/main/resources/data/poweradvantage/recipes/item_filter_plant.json
+++ b/src/main/resources/data/basepower/recipes/item_filter_plant.json
@@ -7,7 +7,7 @@
   ],
   "key": {
     "x": {
-      "item": "poweradvantage:item_conveyor"
+      "item": "basepower:item_conveyor"
     },
     "y": {
       "tag": "minecraft:saplings"
@@ -17,7 +17,7 @@
     }
   },
   "result": {
-    "item": "poweradvantage:item_filter_plant"
+    "item": "basepower:item_filter_plant"
   },
-  "group": "poweradvantage:item_filter_plant"
+  "group": "basepower:item_filter_plant"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/item_filter_smelt.json b/src/main/resources/data/basepower/recipes/item_filter_smelt.json
similarity index 64%
rename from src/main/resources/data/poweradvantage/recipes/item_filter_smelt.json
rename to src/main/resources/data/basepower/recipes/item_filter_smelt.json
index 04e84649..71df57a1 100644
--- a/src/main/resources/data/poweradvantage/recipes/item_filter_smelt.json
+++ b/src/main/resources/data/basepower/recipes/item_filter_smelt.json
@@ -7,7 +7,7 @@
   ],
   "key": {
     "x": {
-      "item": "poweradvantage:item_conveyor"
+      "item": "basepower:item_conveyor"
     },
     "y": {
       "item": "minecraft:furnace"
@@ -17,7 +17,7 @@
     }
   },
   "result": {
-    "item": "poweradvantage:item_filter_smelt"
+    "item": "basepower:item_filter_smelt"
   },
-  "group": "poweradvantage:item_filter_smelt"
+  "group": "basepower:item_filter_smelt"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/rotator_tool.json b/src/main/resources/data/basepower/recipes/rotator_tool.json
similarity index 65%
rename from src/main/resources/data/poweradvantage/recipes/rotator_tool.json
rename to src/main/resources/data/basepower/recipes/rotator_tool.json
index d90ea08a..70b03cd7 100644
--- a/src/main/resources/data/poweradvantage/recipes/rotator_tool.json
+++ b/src/main/resources/data/basepower/recipes/rotator_tool.json
@@ -14,16 +14,16 @@
     }
   },
   "result": {
-    "item": "poweradvantage:rotator_tool"
+    "item": "basepower:rotator_tool"
   },
-  "group": "poweradvantage:rotator_tool",
+  "group": "basepower:rotator_tool",
   "conditions": [
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/iron"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:sprockets"
     }
   ]
diff --git a/src/main/resources/data/poweradvantage/recipes/sprocket_bronze_nugget_tech_no_rod.json b/src/main/resources/data/basepower/recipes/sprocket_bronze_nugget_tech_no_rod.json
similarity index 64%
rename from src/main/resources/data/poweradvantage/recipes/sprocket_bronze_nugget_tech_no_rod.json
rename to src/main/resources/data/basepower/recipes/sprocket_bronze_nugget_tech_no_rod.json
index b699bc2c..8fc3c678 100644
--- a/src/main/resources/data/poweradvantage/recipes/sprocket_bronze_nugget_tech_no_rod.json
+++ b/src/main/resources/data/basepower/recipes/sprocket_bronze_nugget_tech_no_rod.json
@@ -14,26 +14,26 @@
     }
   },
   "result": {
-    "item": "poweradvantage:sprocket",
+    "item": "basepower:sprocket",
     "count": 4
   },
   "conditions": [
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "TECH_PROGRESSION"
     },
     {
-      "type": "poweradvantage:tag_empty",
+      "type": "basepower:tag_empty",
       "tag": "forge:rods"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/steel"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:nuggets/bronze"
     }
   ],
-  "group": "poweradvantage:sprocket"
+  "group": "basepower:sprocket"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/sprocket_rod_normal.json b/src/main/resources/data/basepower/recipes/sprocket_rod_normal.json
similarity index 64%
rename from src/main/resources/data/poweradvantage/recipes/sprocket_rod_normal.json
rename to src/main/resources/data/basepower/recipes/sprocket_rod_normal.json
index 5ce0069a..cb030cbe 100644
--- a/src/main/resources/data/poweradvantage/recipes/sprocket_rod_normal.json
+++ b/src/main/resources/data/basepower/recipes/sprocket_rod_normal.json
@@ -14,22 +14,22 @@
     }
   },
   "result": {
-    "item": "poweradvantage:sprocket",
+    "item": "basepower:sprocket",
     "count": 4
   },
   "conditions": [
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "NORMAL"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/steel"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:rods"
     }
   ],
-  "group": "poweradvantage:sprocket"
+  "group": "basepower:sprocket"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/sprocket_rod_tech.json b/src/main/resources/data/basepower/recipes/sprocket_rod_tech.json
similarity index 65%
rename from src/main/resources/data/poweradvantage/recipes/sprocket_rod_tech.json
rename to src/main/resources/data/basepower/recipes/sprocket_rod_tech.json
index 4a080402..2f361a78 100644
--- a/src/main/resources/data/poweradvantage/recipes/sprocket_rod_tech.json
+++ b/src/main/resources/data/basepower/recipes/sprocket_rod_tech.json
@@ -14,22 +14,22 @@
     }
   },
   "result": {
-    "item": "poweradvantage:sprocket",
+    "item": "basepower:sprocket",
     "count": 4
   },
   "conditions": [
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "TECH_PROGRESSION"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/steel"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:rods"
     }
   ],
-  "group": "poweradvantage:sprocket"
+  "group": "basepower:sprocket"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/sprocket_stickwood_normal.json b/src/main/resources/data/basepower/recipes/sprocket_stickwood_normal.json
similarity index 65%
rename from src/main/resources/data/poweradvantage/recipes/sprocket_stickwood_normal.json
rename to src/main/resources/data/basepower/recipes/sprocket_stickwood_normal.json
index 90d6d9fc..d0a47360 100644
--- a/src/main/resources/data/poweradvantage/recipes/sprocket_stickwood_normal.json
+++ b/src/main/resources/data/basepower/recipes/sprocket_stickwood_normal.json
@@ -14,22 +14,22 @@
     }
   },
   "result": {
-    "item": "poweradvantage:sprocket",
+    "item": "basepower:sprocket",
     "count": 4
   },
   "conditions": [
     {
-      "type": "poweradvantage:recipe_mode",
+      "type": "basepower:recipe_mode",
       "mode": "NORMAL"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:ingots/steel"
     },
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:rods/wooden"
     }
   ],
-  "group": "poweradvantage:sprocket"
+  "group": "basepower:sprocket"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/starch_from_potato.json b/src/main/resources/data/basepower/recipes/starch_from_potato.json
similarity index 63%
rename from src/main/resources/data/poweradvantage/recipes/starch_from_potato.json
rename to src/main/resources/data/basepower/recipes/starch_from_potato.json
index 1333f013..cabc1111 100644
--- a/src/main/resources/data/poweradvantage/recipes/starch_from_potato.json
+++ b/src/main/resources/data/basepower/recipes/starch_from_potato.json
@@ -6,6 +6,6 @@
       { "item": "minecraft:poisonous_potato" }
     ]
   ],
-  "result": { "item": "poweradvantage:starch", "count": 1 },
-  "group": "poweradvantage:starch"
+  "result": { "item": "basepower:starch", "count": 1 },
+  "group": "basepower:starch"
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/steel_frame.json b/src/main/resources/data/basepower/recipes/steel_frame.json
similarity index 65%
rename from src/main/resources/data/poweradvantage/recipes/steel_frame.json
rename to src/main/resources/data/basepower/recipes/steel_frame.json
index b1452d5a..a9c6b2ea 100644
--- a/src/main/resources/data/poweradvantage/recipes/steel_frame.json
+++ b/src/main/resources/data/basepower/recipes/steel_frame.json
@@ -11,12 +11,12 @@
     }
   },
   "result": {
-    "item": "poweradvantage:steel_frame"
+    "item": "basepower:steel_frame"
   },
-  "group": "poweradvantage:steel_frame",
+  "group": "basepower:steel_frame",
   "conditions": [
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:bars/steel"
     }
   ]
diff --git a/src/main/resources/data/poweradvantage/recipes/still.json b/src/main/resources/data/basepower/recipes/still.json
similarity index 73%
rename from src/main/resources/data/poweradvantage/recipes/still.json
rename to src/main/resources/data/basepower/recipes/still.json
index ddb37426..46e0a417 100644
--- a/src/main/resources/data/poweradvantage/recipes/still.json
+++ b/src/main/resources/data/basepower/recipes/still.json
@@ -16,12 +16,12 @@
     }
   },
   "result": {
-    "item": "poweradvantage:still"
+    "item": "basepower:still"
   },
-  "group": "poweradvantage:still",
+  "group": "basepower:still",
   "conditions": [
     {
-      "type": "poweradvantage:tag_not_empty",
+      "type": "basepower:tag_not_empty",
       "tag": "forge:pipes"
     }
   ]
diff --git a/src/main/resources/data/forge/tags/items/frames/steel.json b/src/main/resources/data/forge/tags/items/frames/steel.json
index c0f5e8e6..2ec93a5c 100644
--- a/src/main/resources/data/forge/tags/items/frames/steel.json
+++ b/src/main/resources/data/forge/tags/items/frames/steel.json
@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "poweradvantage:steel_frame"
+    "basepower:steel_frame"
   ]
 }
diff --git a/src/main/resources/data/forge/tags/items/gears.json b/src/main/resources/data/forge/tags/items/gears.json
index b3b11578..28b81e98 100644
--- a/src/main/resources/data/forge/tags/items/gears.json
+++ b/src/main/resources/data/forge/tags/items/gears.json
@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "poweradvantage:sprocket"
+    "basepower:sprocket"
   ]
 }
diff --git a/src/main/resources/data/forge/tags/items/gears/steel.json b/src/main/resources/data/forge/tags/items/gears/steel.json
index b3b11578..28b81e98 100644
--- a/src/main/resources/data/forge/tags/items/gears/steel.json
+++ b/src/main/resources/data/forge/tags/items/gears/steel.json
@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "poweradvantage:sprocket"
+    "basepower:sprocket"
   ]
 }
diff --git a/src/main/resources/data/forge/tags/items/ingots/plastic.json b/src/main/resources/data/forge/tags/items/ingots/plastic.json
index 6f60c386..d922cf4f 100644
--- a/src/main/resources/data/forge/tags/items/ingots/plastic.json
+++ b/src/main/resources/data/forge/tags/items/ingots/plastic.json
@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "poweradvantage:bioplastic_ingot"
+    "basepower:bioplastic_ingot"
   ]
 }
diff --git a/src/main/resources/data/forge/tags/items/pipes.json b/src/main/resources/data/forge/tags/items/pipes.json
index c62f9bb8..8c70e3c2 100644
--- a/src/main/resources/data/forge/tags/items/pipes.json
+++ b/src/main/resources/data/forge/tags/items/pipes.json
@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "poweradvantage:fluid_pipe"
+    "basepower:fluid_pipe"
   ]
 }
diff --git a/src/main/resources/data/forge/tags/items/plastic.json b/src/main/resources/data/forge/tags/items/plastic.json
index 6f60c386..d922cf4f 100644
--- a/src/main/resources/data/forge/tags/items/plastic.json
+++ b/src/main/resources/data/forge/tags/items/plastic.json
@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "poweradvantage:bioplastic_ingot"
+    "basepower:bioplastic_ingot"
   ]
 }
diff --git a/src/main/resources/data/forge/tags/items/sprockets.json b/src/main/resources/data/forge/tags/items/sprockets.json
index b3b11578..28b81e98 100644
--- a/src/main/resources/data/forge/tags/items/sprockets.json
+++ b/src/main/resources/data/forge/tags/items/sprockets.json
@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "poweradvantage:sprocket"
+    "basepower:sprocket"
   ]
 }
diff --git a/src/main/resources/data/forge/tags/items/sprockets/steel.json b/src/main/resources/data/forge/tags/items/sprockets/steel.json
index b3b11578..28b81e98 100644
--- a/src/main/resources/data/forge/tags/items/sprockets/steel.json
+++ b/src/main/resources/data/forge/tags/items/sprockets/steel.json
@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "poweradvantage:sprocket"
+    "basepower:sprocket"
   ]
 }
diff --git a/src/main/resources/data/poweradvantage/recipes/bioplastic_from_starch.json b/src/main/resources/data/poweradvantage/recipes/bioplastic_from_starch.json
deleted file mode 100644
index 2eea1c7b..00000000
--- a/src/main/resources/data/poweradvantage/recipes/bioplastic_from_starch.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "type": "minecraft:smelting",
-  "ingredient": {
-    "item": "poweradvantage:starch"
-  },
-  "result": "poweradvantage:bioplastic_ingot",
-  "experience": 0.1,
-  "cookingtime": 200,
-  "conditions": [],
-  "group": "poweradvantage:bioplastic_ingot"
-}
diff --git a/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_block.json b/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_block.json
deleted file mode 100644
index dfbcd2d6..00000000
--- a/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_block.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "type": "basemetals:crushing",
-  "ingredient": {
-    "item": "poweradvantage:item_filter_block"
-  },
-  "result": {
-    "item": "basemetals:steel_plate",
-    "count": 1
-  },
-  "conditions": [
-    {
-      "type": "forge:mod_loaded",
-      "modid": "basemetals"
-    },
-    {
-      "type": "poweradvantage:recipe_mode",
-      "mode": "APOCALYPTIC"
-    },
-    {
-      "type": "poweradvantage:tag_not_empty",
-      "tag": "forge:plates/steel"
-    }
-  ]
-}
diff --git a/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_inventory.json b/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_inventory.json
deleted file mode 100644
index c3121aaf..00000000
--- a/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_inventory.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "type": "basemetals:crushing",
-  "ingredient": {
-    "item": "poweradvantage:item_filter_inventory"
-  },
-  "result": {
-    "item": "basemetals:steel_plate",
-    "count": 1
-  },
-  "conditions": [
-    {
-      "type": "forge:mod_loaded",
-      "modid": "basemetals"
-    },
-    {
-      "type": "poweradvantage:recipe_mode",
-      "mode": "APOCALYPTIC"
-    },
-    {
-      "type": "poweradvantage:tag_not_empty",
-      "tag": "forge:plates/steel"
-    }
-  ]
-}
diff --git a/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_overflow.json b/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_overflow.json
deleted file mode 100644
index 87033def..00000000
--- a/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_overflow.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "type": "basemetals:crushing",
-  "ingredient": {
-    "item": "poweradvantage:item_filter_overflow"
-  },
-  "result": {
-    "item": "basemetals:steel_plate",
-    "count": 1
-  },
-  "conditions": [
-    {
-      "type": "forge:mod_loaded",
-      "modid": "basemetals"
-    },
-    {
-      "type": "poweradvantage:recipe_mode",
-      "mode": "APOCALYPTIC"
-    },
-    {
-      "type": "poweradvantage:tag_not_empty",
-      "tag": "forge:plates/steel"
-    }
-  ]
-}
diff --git a/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_plant.json b/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_plant.json
deleted file mode 100644
index 07236306..00000000
--- a/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_plant.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "type": "basemetals:crushing",
-  "ingredient": {
-    "item": "poweradvantage:item_filter_plant"
-  },
-  "result": {
-    "item": "basemetals:steel_plate",
-    "count": 1
-  },
-  "conditions": [
-    {
-      "type": "forge:mod_loaded",
-      "modid": "basemetals"
-    },
-    {
-      "type": "poweradvantage:recipe_mode",
-      "mode": "APOCALYPTIC"
-    },
-    {
-      "type": "poweradvantage:tag_not_empty",
-      "tag": "forge:plates/steel"
-    }
-  ]
-}
diff --git a/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_smelt.json b/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_smelt.json
deleted file mode 100644
index bdf912e2..00000000
--- a/src/main/resources/data/poweradvantage/recipes/crushing_item_filter_smelt.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "type": "basemetals:crushing",
-  "ingredient": {
-    "item": "poweradvantage:item_filter_smelt"
-  },
-  "result": {
-    "item": "basemetals:steel_plate",
-    "count": 1
-  },
-  "conditions": [
-    {
-      "type": "forge:mod_loaded",
-      "modid": "basemetals"
-    },
-    {
-      "type": "poweradvantage:recipe_mode",
-      "mode": "APOCALYPTIC"
-    },
-    {
-      "type": "poweradvantage:tag_not_empty",
-      "tag": "forge:plates/steel"
-    }
-  ]
-}
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index a78e7516..0ad6806f 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,11 +1,11 @@
 [
 {
-  "modid": "poweradvantage",
+  "modid": "basepower",
   "name": "Power Advantage",
   "description": "API for power DrCyano's power systems mods.",
   "version": "${version}",
   "mcversion": "${mcversion}",
-  "url": "https://github.com/MinecraftModDevelopmentMods/PowerAdvantage",
+  "url": "https://github.com/MinecraftModDevelopmentMods/basePower",
   "updateUrl": "",
   "authorList": ["DrCyano (aka Cyanobacterium)"],
   "credits": "The Forge and FML guys, for making the Forge modding API (you guys are awesome), engineers everywhere, and the mod author DrCyano (aka Cyanobacterium)",
diff --git a/src/test/java/cyano/poweradvantage/api/migration/LegacyOreSpawnConfigBridgeTest.java b/src/test/java/cyano/poweradvantage/api/migration/LegacyOreSpawnConfigBridgeTest.java
index f38f35b8..df2618fa 100644
--- a/src/test/java/cyano/poweradvantage/api/migration/LegacyOreSpawnConfigBridgeTest.java
+++ b/src/test/java/cyano/poweradvantage/api/migration/LegacyOreSpawnConfigBridgeTest.java
@@ -28,24 +28,24 @@ public void convertsOs1RulesWithoutChangingTheirSource() throws Exception {
         byte[] original = Files.readAllBytes(source);
 
         LegacyOreSpawnConfigBridge.Result result =
-                LegacyOreSpawnConfigBridge.migrate(config, "poweradvantage");
+                LegacyOreSpawnConfigBridge.migrate(config, "basepower", "poweradvantage");
 
         assertTrue(result.wasMigrated());
         assertEquals(1, result.getRuleCount());
-        assertTrue(Files.exists(config.resolve("poweradvantage-orespawn.json")));
+        assertTrue(Files.exists(config.resolve("basepower-orespawn.json")));
         assertEquals(new String(original, StandardCharsets.UTF_8),
                 new String(Files.readAllBytes(source), StandardCharsets.UTF_8));
         try (Reader reader = Files.newBufferedReader(result.getTarget(), StandardCharsets.UTF_8)) {
             JsonObject provider = new JsonParser().parse(reader).getAsJsonObject();
             JsonObject ores = provider.getAsJsonObject("ores");
-            assertTrue(ores.has("poweradvantage:legacy/poweradvantage_crude_oil_0"));
+            assertTrue(ores.has("basepower:legacy/basepower_crude_oil_0"));
             assertFalse(provider.getAsJsonObject("fluid_deposits")
-                    .has("poweradvantage:fluid_deposit/desert_crude_oil"));
+                    .has("basepower:fluid_deposit/desert_crude_oil"));
         }
         String report = new String(Files.readAllBytes(
                 config.resolve("orespawn-os3-migration-report.json")), StandardCharsets.UTF_8);
         assertTrue(report.contains("os1_config_source"));
-        assertTrue(report.contains("poweradvantage:legacy/poweradvantage_crude_oil_0"));
+        assertTrue(report.contains("basepower:legacy/basepower_crude_oil_0"));
     }
 
     @Test
@@ -57,9 +57,9 @@ public void existingModernProfileRemainsAuthoritative() throws Exception {
         Files.write(config.resolve("orespawn-worldgen.json"), "{}".getBytes(StandardCharsets.UTF_8));
 
         LegacyOreSpawnConfigBridge.Result result =
-                LegacyOreSpawnConfigBridge.migrate(config, "poweradvantage");
+                LegacyOreSpawnConfigBridge.migrate(config, "basepower", "poweradvantage");
 
         assertFalse(result.wasMigrated());
-        assertFalse(Files.exists(config.resolve("poweradvantage-orespawn.json")));
+        assertFalse(Files.exists(config.resolve("basepower-orespawn.json")));
     }
 }
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/blocks/BlockFrameOpacityTest.java b/src/test/java/zone/moddev/mc/basepower/blocks/BlockFrameOpacityTest.java
similarity index 87%
rename from src/test/java/zone/moddev/mc/poweradvantage/blocks/BlockFrameOpacityTest.java
rename to src/test/java/zone/moddev/mc/basepower/blocks/BlockFrameOpacityTest.java
index 7edab28c..82d16ec1 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/blocks/BlockFrameOpacityTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/blocks/BlockFrameOpacityTest.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.blocks;
+package zone.moddev.mc.basepower.blocks;
 
 import net.minecraft.block.material.Material;
 import org.junit.BeforeClass;
@@ -6,7 +6,7 @@
 import static org.junit.Assert.*;
 
 public class BlockFrameOpacityTest {
-    @BeforeClass public static void bootstrap() { zone.moddev.mc.poweradvantage.support.PowerNativeTestBootstrap.register(); }
+    @BeforeClass public static void bootstrap() { zone.moddev.mc.basepower.support.PowerNativeTestBootstrap.register(); }
 
     @Test public void frameRemainsNonSolidOnTheDedicatedServer() {
         BlockFrame frame = new BlockFrame(Material.PISTON, .75F, 10) {
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/conduitnetwork/ConduitNetworkManagerTest.java b/src/test/java/zone/moddev/mc/basepower/conduitnetwork/ConduitNetworkManagerTest.java
similarity index 96%
rename from src/test/java/zone/moddev/mc/poweradvantage/conduitnetwork/ConduitNetworkManagerTest.java
rename to src/test/java/zone/moddev/mc/basepower/conduitnetwork/ConduitNetworkManagerTest.java
index 6fa96761..7194ed94 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/conduitnetwork/ConduitNetworkManagerTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/conduitnetwork/ConduitNetworkManagerTest.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.conduitnetwork;
+package zone.moddev.mc.basepower.conduitnetwork;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -7,7 +7,7 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import org.junit.Test;
-import zone.moddev.mc.poweradvantage.math.BlockPos4D;
+import zone.moddev.mc.basepower.math.BlockPos4D;
 
 public class ConduitNetworkManagerTest {
     private final ConduitNetworkManager manager = new ConduitNetworkManager(new ConduitType("test"));
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/conduitnetwork/PowerTransferAccountingTest.java b/src/test/java/zone/moddev/mc/basepower/conduitnetwork/PowerTransferAccountingTest.java
similarity index 97%
rename from src/test/java/zone/moddev/mc/poweradvantage/conduitnetwork/PowerTransferAccountingTest.java
rename to src/test/java/zone/moddev/mc/basepower/conduitnetwork/PowerTransferAccountingTest.java
index 070739c1..709e5940 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/conduitnetwork/PowerTransferAccountingTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/conduitnetwork/PowerTransferAccountingTest.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.conduitnetwork;
+package zone.moddev.mc.basepower.conduitnetwork;
 
 import cyano.poweradvantage.api.*;
 import java.util.Arrays;
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/machines/conveyors/ConveyorTransferTest.java b/src/test/java/zone/moddev/mc/basepower/machines/conveyors/ConveyorTransferTest.java
similarity index 93%
rename from src/test/java/zone/moddev/mc/poweradvantage/machines/conveyors/ConveyorTransferTest.java
rename to src/test/java/zone/moddev/mc/basepower/machines/conveyors/ConveyorTransferTest.java
index 3aad59d8..05f2e746 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/machines/conveyors/ConveyorTransferTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/machines/conveyors/ConveyorTransferTest.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.machines.conveyors;
+package zone.moddev.mc.basepower.machines.conveyors;
 
 import net.minecraft.inventory.InventoryBasic;
 import net.minecraft.item.ItemStack;
@@ -6,11 +6,11 @@
 import net.minecraft.util.EnumFacing;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import zone.moddev.mc.poweradvantage.util.InventoryWrapper;
+import zone.moddev.mc.basepower.util.InventoryWrapper;
 import static org.junit.Assert.*;
 
 public class ConveyorTransferTest {
-    @BeforeClass public static void bootstrap() { zone.moddev.mc.poweradvantage.support.PowerNativeTestBootstrap.register(); }
+    @BeforeClass public static void bootstrap() { zone.moddev.mc.basepower.support.PowerNativeTestBootstrap.register(); }
 
     @Test public void laterEmptySlotRemainsAnAvailableDestination() {
         InventoryBasic destination = new InventoryBasic(new net.minecraft.util.text.TextComponentString("test"), 2);
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/WorldFluidPickupTest.java b/src/test/java/zone/moddev/mc/basepower/machines/fluidmachines/WorldFluidPickupTest.java
similarity index 95%
rename from src/test/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/WorldFluidPickupTest.java
rename to src/test/java/zone/moddev/mc/basepower/machines/fluidmachines/WorldFluidPickupTest.java
index 53a80653..76792ba5 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/machines/fluidmachines/WorldFluidPickupTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/machines/fluidmachines/WorldFluidPickupTest.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.machines.fluidmachines;
+package zone.moddev.mc.basepower.machines.fluidmachines;
 
 import java.lang.reflect.Proxy;
 import java.util.concurrent.atomic.AtomicReference;
@@ -14,7 +14,7 @@
 import static org.junit.Assert.*;
 
 public class WorldFluidPickupTest {
-    @BeforeClass public static void bootstrap() { zone.moddev.mc.poweradvantage.support.PowerNativeTestBootstrap.register(); }
+    @BeforeClass public static void bootstrap() { zone.moddev.mc.basepower.support.PowerNativeTestBootstrap.register(); }
 
     @Test public void waterloggedHostSurvivesTheNativePickup() {
         AtomicReference state = new AtomicReference<>(Blocks.OAK_SLAB.getDefaultState()
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/migration/AdvantageLegacyMigrationsTest.java b/src/test/java/zone/moddev/mc/basepower/migration/AdvantageLegacyMigrationsTest.java
similarity index 62%
rename from src/test/java/zone/moddev/mc/poweradvantage/migration/AdvantageLegacyMigrationsTest.java
rename to src/test/java/zone/moddev/mc/basepower/migration/AdvantageLegacyMigrationsTest.java
index 81b77250..6d11a026 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/migration/AdvantageLegacyMigrationsTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/migration/AdvantageLegacyMigrationsTest.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.migration;
+package zone.moddev.mc.basepower.migration;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -22,21 +22,21 @@ public class AdvantageLegacyMigrationsTest {
                 "converter_rf_steam", "converter_rf_electricity", "converter_rf_quantum",
                 "converter_tr_electricity")) {
             assertNotNull(path, LegacyMigrationApi.blockStateCodecs().get(
-                    new ResourceLocation("poweradvantage", path)));
+                    new ResourceLocation("basepower", path)));
         }
     }
 
     @Test public void retainsLegacyTileFluidAndBucketIdentities() {
         AdvantageLegacyMigrations.registerPowerAdvantage();
-        assertTrue(LegacyMigrationApi.handlesNamespace("poweradvantage"));
-        assertEquals("poweradvantage:tileentity.fluid_storage_tank",
-                LegacyMigrationApi.tileTarget("poweradvantage.tileentity.fluid_storage_tank"));
-        assertEquals("poweradvantage:tileentity.fluid_storage_tank",
-                LegacyMigrationApi.tileTarget("minecraft:poweradvantage.tileentity.fluid_storage_tank"));
-        assertEquals("poweradvantage:crude_oil", LegacyMigrationApi.fluidTarget("crude_oil"));
-        assertEquals(new ResourceLocation("poweradvantage", "crude_oil_bucket"),
+        assertTrue(LegacyMigrationApi.handlesNamespace("basepower"));
+        assertEquals("basepower:tileentity.fluid_storage_tank",
+                LegacyMigrationApi.tileTarget("basepower.tileentity.fluid_storage_tank"));
+        assertEquals("basepower:tileentity.fluid_storage_tank",
+                LegacyMigrationApi.tileTarget("minecraft:basepower.tileentity.fluid_storage_tank"));
+        assertEquals("basepower:crude_oil", LegacyMigrationApi.fluidTarget("crude_oil"));
+        assertEquals(new ResourceLocation("basepower", "crude_oil_bucket"),
                 LegacyMigrationApi.bucketTarget("crude_oil"));
-        assertEquals(new ResourceLocation("poweradvantage", "refined_oil_bucket"),
-                LegacyMigrationApi.bucketTarget("poweradvantage:refined_oil"));
+        assertEquals(new ResourceLocation("basepower", "refined_oil_bucket"),
+                LegacyMigrationApi.bucketTarget("basepower:refined_oil"));
     }
 }
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/migration/LegacyEnchantmentsTest.java b/src/test/java/zone/moddev/mc/basepower/migration/LegacyEnchantmentsTest.java
similarity index 80%
rename from src/test/java/zone/moddev/mc/poweradvantage/migration/LegacyEnchantmentsTest.java
rename to src/test/java/zone/moddev/mc/basepower/migration/LegacyEnchantmentsTest.java
index abc9d523..6d031b45 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/migration/LegacyEnchantmentsTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/migration/LegacyEnchantmentsTest.java
@@ -1,7 +1,8 @@
-package zone.moddev.mc.poweradvantage.migration;
+package zone.moddev.mc.basepower.migration;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import cyano.poweradvantage.api.migration.LegacyMigrationApi;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import org.junit.Test;
@@ -10,6 +11,7 @@
 public class LegacyEnchantmentsTest {
     @Test public void resolvesOriginalMusketIdsBeforeVanillaCanAssignBindingCurse() {
         Map saved = new LinkedHashMap<>();
+        LegacyMigrationApi.registerNamespaceAlias("steamadvantage", "basesteam");
         saved.put(10, "steamadvantage:high_explosive");
         saved.put(11, "steamadvantage:powderless");
         saved.put(12, "steamadvantage:rapid_reload");
@@ -26,7 +28,8 @@ public class LegacyEnchantmentsTest {
         assertTrue(LegacyWorldDataHook.migrateLegacyEnchantments(tag, saved));
         assertFalse(tag.contains("ench", 9));
         for (int i = 0; i < 4; i++) {
-            assertEquals(saved.get(10 + i), tag.getList("Enchantments", 10).getCompound(i).getString("id"));
+            assertEquals(saved.get(10 + i).replace("steamadvantage:", "basesteam:"),
+                    tag.getList("Enchantments", 10).getCompound(i).getString("id"));
             assertEquals(3, tag.getList("Enchantments", 10).getCompound(i).getShort("lvl"));
         }
         assertFalse(LegacyWorldDataHook.migrateLegacyEnchantments(tag, saved));
@@ -34,7 +37,7 @@ public class LegacyEnchantmentsTest {
 
     @Test public void honorsWorldSpecificIdsAndPreservesStoredEnchantments() {
         Map saved = new LinkedHashMap<>();
-        saved.put(173, "steamadvantage:rapid_reload");
+        saved.put(173, "basesteam:rapid_reload");
         NBTTagCompound book = new NBTTagCompound();
         NBTTagList list = new NBTTagList();
         NBTTagCompound entry = new NBTTagCompound();
@@ -43,14 +46,14 @@ public class LegacyEnchantmentsTest {
         list.add(entry);
         book.setTag("StoredEnchantments", list);
         assertTrue(LegacyWorldDataHook.migrateLegacyEnchantments(book, saved));
-        assertEquals("steamadvantage:rapid_reload", book.getList("StoredEnchantments", 10).getCompound(0).getString("id"));
+        assertEquals("basesteam:rapid_reload", book.getList("StoredEnchantments", 10).getCompound(0).getString("id"));
         assertEquals(2, book.getList("StoredEnchantments", 10).getCompound(0).getShort("lvl"));
     }
 
     @Test(expected = IllegalStateException.class)
     public void refusesIncompleteOldListInsteadOfSilentlyDroppingAnEnchantment() {
         Map saved = new LinkedHashMap<>();
-        saved.put(10, "steamadvantage:high_explosive");
+        saved.put(10, "basesteam:high_explosive");
         NBTTagCompound tag = new NBTTagCompound();
         NBTTagList list = new NBTTagList();
         NBTTagCompound entry = new NBTTagCompound();
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/migration/LegacyEntitiesTest.java b/src/test/java/zone/moddev/mc/basepower/migration/LegacyEntitiesTest.java
similarity index 97%
rename from src/test/java/zone/moddev/mc/poweradvantage/migration/LegacyEntitiesTest.java
rename to src/test/java/zone/moddev/mc/basepower/migration/LegacyEntitiesTest.java
index 5d1262d7..2f931991 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/migration/LegacyEntitiesTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/migration/LegacyEntitiesTest.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.migration;
+package zone.moddev.mc.basepower.migration;
 
 import com.mojang.datafixers.DataFixTypes;
 import net.minecraft.nbt.NBTTagCompound;
@@ -103,7 +103,7 @@ private static void assertWolf(boolean customEntity) {
         entities.add(wolf);
         if (customEntity) {
             NBTTagCompound turbine = new NBTTagCompound();
-            turbine.setString("id", "electricadvantage.electricadvantage.Hydroturbine");
+            turbine.setString("id", "baseelectric.baseelectric.Hydroturbine");
             turbine.setIntArray("parentPos", new int[] {164, 81, 8});
             entities.add(turbine);
         }
diff --git a/src/test/java/zone/moddev/mc/basepower/migration/LegacyVanillaInventoriesTest.java b/src/test/java/zone/moddev/mc/basepower/migration/LegacyVanillaInventoriesTest.java
new file mode 100644
index 00000000..adadd457
--- /dev/null
+++ b/src/test/java/zone/moddev/mc/basepower/migration/LegacyVanillaInventoriesTest.java
@@ -0,0 +1,71 @@
+package zone.moddev.mc.basepower.migration;
+
+import cyano.poweradvantage.api.migration.LegacyMigrationApi;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.ResourceLocation;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class LegacyVanillaInventoriesTest {
+    @BeforeClass public static void register() {
+        LegacyMigrationApi.registerNamespaceAlias("electricadvantage", "baseelectric");
+        LegacyMigrationApi.registerTileEntityAliases(new ResourceLocation("baseelectric", "growth_chamber"));
+    }
+
+    @Test public void flattensVanillaItemsInModInventoriesWithSlotsAndTagsIntact() {
+        NBTTagCompound machine = container("minecraft:electricadvantage.growth_chamber");
+        NBTTagCompound chest = container("minecraft:chest");
+        LegacyWorldDataHook.flattenVanillaInventories(chunk(1343, machine, chest));
+
+        NBTTagList contents = machine.getList("Items", 10);
+        NBTTagCompound cane = contents.getCompound(0);
+        assertEquals("minecraft:sugar_cane", cane.getString("id"));
+        assertEquals(7, cane.getByte("Count"));
+        assertEquals(3, cane.getByte("Slot"));
+        assertEquals("keep me", cane.getCompound("tag").getString("Note"));
+        assertEquals("minecraft:red_wool", contents.getCompound(1).getString("id"));
+        assertEquals("minecraft:reeds", chest.getList("Items", 10).getCompound(0).getString("id"));
+    }
+
+    @Test public void leavesAlreadyFlattenedChunksForTheNormalReader() {
+        NBTTagCompound machine = container("baseelectric:growth_chamber");
+        LegacyWorldDataHook.flattenVanillaInventories(chunk(1631, machine));
+        assertEquals("minecraft:reeds", machine.getList("Items", 10).getCompound(0).getString("id"));
+    }
+
+    private static NBTTagCompound chunk(int version, NBTTagCompound... tiles) {
+        NBTTagCompound root = new NBTTagCompound();
+        NBTTagCompound level = new NBTTagCompound();
+        NBTTagList entries = new NBTTagList();
+        for (NBTTagCompound tile : tiles) entries.add(tile);
+        level.setTag("TileEntities", entries);
+        root.setTag("Level", level);
+        root.setInt("DataVersion", version);
+        return root;
+    }
+
+    private static NBTTagCompound container(String id) {
+        NBTTagCompound tile = new NBTTagCompound();
+        NBTTagList items = new NBTTagList();
+        items.add(stack("minecraft:reeds", 0));
+        items.add(stack("minecraft:wool", 14));
+        tile.setString("id", id);
+        tile.setTag("Items", items);
+        return tile;
+    }
+
+    private static NBTTagCompound stack(String id, int metadata) {
+        NBTTagCompound value = new NBTTagCompound();
+        NBTTagCompound tag = new NBTTagCompound();
+        value.setString("id", id);
+        value.setByte("Slot", (byte) 3);
+        value.setByte("Count", (byte) 7);
+        value.setShort("Damage", (short) metadata);
+        tag.setString("Note", "keep me");
+        value.setTag("tag", tag);
+        return value;
+    }
+}
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/registry/MachineGuiTitleTest.java b/src/test/java/zone/moddev/mc/basepower/registry/MachineGuiTitleTest.java
similarity index 93%
rename from src/test/java/zone/moddev/mc/poweradvantage/registry/MachineGuiTitleTest.java
rename to src/test/java/zone/moddev/mc/basepower/registry/MachineGuiTitleTest.java
index 414a8a4c..7fb0eba4 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/registry/MachineGuiTitleTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/registry/MachineGuiTitleTest.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.registry;
+package zone.moddev.mc.basepower.registry;
 
 import java.lang.reflect.Method;
 import net.minecraft.block.Block;
@@ -15,7 +15,7 @@
 
 public class MachineGuiTitleTest {
     @BeforeClass public static void bootstrap() {
-        zone.moddev.mc.poweradvantage.support.PowerNativeTestBootstrap.register();
+        zone.moddev.mc.basepower.support.PowerNativeTestBootstrap.register();
     }
 
     @Test public void defaultTitleUsesTheBlockTranslationInsteadOfAnInternalInventoryName() throws Exception {
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/resources/BuildWorkflowContractTest.java b/src/test/java/zone/moddev/mc/basepower/resources/BuildWorkflowContractTest.java
similarity index 77%
rename from src/test/java/zone/moddev/mc/poweradvantage/resources/BuildWorkflowContractTest.java
rename to src/test/java/zone/moddev/mc/basepower/resources/BuildWorkflowContractTest.java
index e6a6c529..ef148058 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/resources/BuildWorkflowContractTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/resources/BuildWorkflowContractTest.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.resources;
+package zone.moddev.mc.basepower.resources;
 
 import org.junit.Test;
 
@@ -16,7 +16,8 @@ public class BuildWorkflowContractTest {
             int policy = workflow.indexOf("run: git config --global core.autocrlf false");
             int checkout = workflow.indexOf("- name: Check out pinned Base Metals");
             assertTrue(name, policy >= 0 && checkout > policy);
-            assertTrue(name, workflow.contains("ref: 1376a20d7d5ba22d3abc77dc34b49a2c88943697"));
+            assertTrue(name, workflow.contains("ref: ${{ steps.basemetals-pin.outputs.ref }}"));
+            assertTrue(name, workflow.contains("s/^basemetals_source_commit=//p"));
         }
     }
 }
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/resources/ClientResourceContractTest.java b/src/test/java/zone/moddev/mc/basepower/resources/ClientResourceContractTest.java
similarity index 92%
rename from src/test/java/zone/moddev/mc/poweradvantage/resources/ClientResourceContractTest.java
rename to src/test/java/zone/moddev/mc/basepower/resources/ClientResourceContractTest.java
index 64247224..7a836406 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/resources/ClientResourceContractTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/resources/ClientResourceContractTest.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.resources;
+package zone.moddev.mc.basepower.resources;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -20,7 +20,7 @@
 
 public class ClientResourceContractTest {
     private static final Path ROOT = Paths.get("src/main/resources");
-    private static final Path ASSETS = ROOT.resolve("assets/poweradvantage");
+    private static final Path ASSETS = ROOT.resolve("assets/basepower");
 
     @Test public void blockstatesResolveLiteralModelPaths() throws IOException {
         for (Path file : jsonFiles(ASSETS.resolve("blockstates"))) {
@@ -62,7 +62,7 @@ public class ClientResourceContractTest {
             JsonObject locale = read(file);
             for (Map.Entry entry : locale.entrySet()) {
                 String key = entry.getKey();
-                if ((key.startsWith("tile.poweradvantage.") || key.startsWith("item.poweradvantage."))
+                if ((key.startsWith("tile.basepower.") || key.startsWith("item.basepower."))
                         && key.endsWith(".name")) {
                     String modern = key.substring(0, key.length() - ".name".length());
                     if (modern.startsWith("tile.")) modern = "block." + modern.substring("tile.".length());
@@ -76,10 +76,10 @@ public class ClientResourceContractTest {
         JsonObject locale = read(ASSETS.resolve("lang/en_us.json"));
         for (Path file : jsonFiles(ASSETS.resolve("blockstates"))) {
             String id = file.getFileName().toString().replace(".json", "");
-            assertTrue("Missing block name: " + id, locale.has("block.poweradvantage." + id));
+            assertTrue("Missing block name: " + id, locale.has("block.basepower." + id));
         }
         for (String id : new String[] {"crude_oil", "refined_oil"}) {
-            assertEquals(locale.get("item.bucket." + id), locale.get("item.poweradvantage." + id + "_bucket"));
+            assertEquals(locale.get("item.bucket." + id), locale.get("item.basepower." + id + "_bucket"));
         }
     }
 
@@ -101,7 +101,7 @@ private static void verifyReference(String reference, String directory, String s
         String path = parts.length == 2 ? parts[1] : parts[0];
         if (directory.equals("models") && namespace.equals("minecraft") && path.startsWith("builtin/")) return;
         String resource = "assets/" + namespace + "/" + directory + "/" + path + suffix;
-        boolean found = namespace.equals("poweradvantage") ? Files.isRegularFile(ROOT.resolve(resource))
+        boolean found = namespace.equals("basepower") ? Files.isRegularFile(ROOT.resolve(resource))
                 : ClientResourceContractTest.class.getClassLoader().getResource(resource) != null;
         assertTrue(file + " references missing resource " + resource, found);
     }
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/resources/MaterialTagTransformerTest.java b/src/test/java/zone/moddev/mc/basepower/resources/MaterialTagTransformerTest.java
similarity index 88%
rename from src/test/java/zone/moddev/mc/poweradvantage/resources/MaterialTagTransformerTest.java
rename to src/test/java/zone/moddev/mc/basepower/resources/MaterialTagTransformerTest.java
index e816f940..b17d9649 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/resources/MaterialTagTransformerTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/resources/MaterialTagTransformerTest.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.resources;
+package zone.moddev.mc.basepower.resources;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -39,16 +39,16 @@ private static void check(boolean productionName) throws Exception {
         assertNotNull(reload);
         if (productionName) reload.name = "func_195410_a";
         ScriptEngine engine = new ScriptEngineManager().getEngineByName("nashorn");
-        try (Reader script = Files.newBufferedReader(Paths.get("src/main/resources/coremods/poweradvantage_material_tags.js"),
+        try (Reader script = Files.newBufferedReader(Paths.get("src/main/resources/coremods/basepower_material_tags.js"),
                 StandardCharsets.UTF_8)) { engine.eval(script); }
         engine.put("manager", node);
-        engine.eval("initializeCoreMod().poweradvantage_material_tags.transformer(manager)");
+        engine.eval("initializeCoreMod().basepower_material_tags.transformer(manager)");
         int installed = 0, hooks = 0;
         for (AbstractInsnNode instruction : reload.instructions.toArray()) {
             if (!(instruction instanceof MethodInsnNode)) continue;
             MethodInsnNode call = (MethodInsnNode) instruction;
             if (call.owner.startsWith("net/minecraft/tags/") && call.desc.endsWith("TagCollection;)V")) installed++;
-            if (call.owner.equals("zone/moddev/mc/poweradvantage/recipe/MaterialTags")) {
+            if (call.owner.equals("zone/moddev/mc/basepower/recipe/MaterialTags")) {
                 assertEquals(3, installed);
                 assertEquals("finishReload", call.name);
                 assertEquals(Opcodes.RETURN, call.getNext().getOpcode());
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/resources/OilRendererTransformerTest.java b/src/test/java/zone/moddev/mc/basepower/resources/OilRendererTransformerTest.java
similarity index 93%
rename from src/test/java/zone/moddev/mc/poweradvantage/resources/OilRendererTransformerTest.java
rename to src/test/java/zone/moddev/mc/basepower/resources/OilRendererTransformerTest.java
index 9734df96..5a84f71b 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/resources/OilRendererTransformerTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/resources/OilRendererTransformerTest.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.resources;
+package zone.moddev.mc.basepower.resources;
 
 import org.junit.Test;
 import org.objectweb.asm.ClassReader;
@@ -24,7 +24,7 @@
 public class OilRendererTransformerTest {
     private static final String RENDER = "(Lnet/minecraft/world/IWorldReader;Lnet/minecraft/util/math/BlockPos;"
             + "Lnet/minecraft/client/renderer/BufferBuilder;Lnet/minecraft/fluid/IFluidState;)Z";
-    private static final String OWNER = "zone/moddev/mc/poweradvantage/client/ClientOilRenderer";
+    private static final String OWNER = "zone/moddev/mc/basepower/client/ClientOilRenderer";
     private static final String PEER = "test/SiblingFluidRenderer";
 
     @Test public void patchesMappedRenderer() throws Exception {
@@ -74,12 +74,12 @@ private static MethodNode render(ClassNode node) {
     private static void transform(ClassNode node) throws Exception {
         ScriptEngine engine = new ScriptEngineManager().getEngineByName("nashorn");
         assertNotNull("Run transformer tests with the Java 8 toolchain", engine);
-        try (Reader script = Files.newBufferedReader(Paths.get("src/main/resources/coremods/poweradvantage_oil_renderer.js"),
+        try (Reader script = Files.newBufferedReader(Paths.get("src/main/resources/coremods/basepower_oil_renderer.js"),
                 StandardCharsets.UTF_8)) {
             engine.eval(script);
         }
         engine.put("renderer", node);
-        assertSame(node, engine.eval("initializeCoreMod().poweradvantage_oil_renderer.transformer(renderer)"));
+        assertSame(node, engine.eval("initializeCoreMod().basepower_oil_renderer.transformer(renderer)"));
     }
 
     private static void assertHooks(ClassNode node, String owner) {
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/resources/PartsLootTransformerTest.java b/src/test/java/zone/moddev/mc/basepower/resources/PartsLootTransformerTest.java
similarity index 87%
rename from src/test/java/zone/moddev/mc/poweradvantage/resources/PartsLootTransformerTest.java
rename to src/test/java/zone/moddev/mc/basepower/resources/PartsLootTransformerTest.java
index 30fbade1..0cc7f040 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/resources/PartsLootTransformerTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/resources/PartsLootTransformerTest.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.resources;
+package zone.moddev.mc.basepower.resources;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -24,15 +24,15 @@ public class PartsLootTransformerTest {
             new ClassReader(input).accept(node, 0);
         }
         ScriptEngine engine = new ScriptEngineManager().getEngineByName("nashorn");
-        try (Reader script = Files.newBufferedReader(Paths.get("src/main/resources/coremods/poweradvantage_parts_loot.js"),
+        try (Reader script = Files.newBufferedReader(Paths.get("src/main/resources/coremods/basepower_parts_loot.js"),
                 StandardCharsets.UTF_8)) { engine.eval(script); }
         engine.put("manager", node);
-        engine.eval("initializeCoreMod().poweradvantage_parts_loot.transformer(manager)");
+        engine.eval("initializeCoreMod().basepower_parts_loot.transformer(manager)");
         int calls = 0;
         for (MethodNode method : node.methods) for (AbstractInsnNode instruction : method.instructions.toArray()) {
             if (!(instruction instanceof MethodInsnNode)) continue;
             MethodInsnNode call = (MethodInsnNode) instruction;
-            if (call.owner.equals("zone/moddev/mc/poweradvantage/recipe/PartsLoot")) {
+            if (call.owner.equals("zone/moddev/mc/basepower/recipe/PartsLoot")) {
                 calls++;
                 assertEquals(Opcodes.INVOKESTATIC, call.getOpcode());
                 assertEquals("loadLootTable", call.name);
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/resources/RecipeUnlockContractTest.java b/src/test/java/zone/moddev/mc/basepower/resources/RecipeUnlockContractTest.java
similarity index 98%
rename from src/test/java/zone/moddev/mc/poweradvantage/resources/RecipeUnlockContractTest.java
rename to src/test/java/zone/moddev/mc/basepower/resources/RecipeUnlockContractTest.java
index 6c026f38..1285c52d 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/resources/RecipeUnlockContractTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/resources/RecipeUnlockContractTest.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.resources;
+package zone.moddev.mc.basepower.resources;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -21,7 +21,7 @@
 import static org.junit.Assert.*;
 
 public class RecipeUnlockContractTest {
-    private static final String MOD = "poweradvantage";
+    private static final String MOD = "basepower";
     private static final Path DATA = Paths.get("src/main/resources/data", MOD);
     private static final Set IGNORED = new LinkedHashSet<>(java.util.Arrays.asList(
             "item:minecraft:stick", "item:minecraft:string", "item:minecraft:feather", "tag:forge:rods/wooden"));
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/resources/StarchRecipeTest.java b/src/test/java/zone/moddev/mc/basepower/resources/StarchRecipeTest.java
similarity index 82%
rename from src/test/java/zone/moddev/mc/poweradvantage/resources/StarchRecipeTest.java
rename to src/test/java/zone/moddev/mc/basepower/resources/StarchRecipeTest.java
index dab10709..4a6e7691 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/resources/StarchRecipeTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/resources/StarchRecipeTest.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.resources;
+package zone.moddev.mc.basepower.resources;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
@@ -19,7 +19,7 @@ public class StarchRecipeTest {
         JsonArray inputs = recipe.getAsJsonArray("ingredients");
         assertEquals(1, inputs.size());
         assertEquals(potatoes(), items(inputs.get(0).getAsJsonArray()));
-        assertEquals("poweradvantage:starch", recipe.getAsJsonObject("result").get("item").getAsString());
+        assertEquals("basepower:starch", recipe.getAsJsonObject("result").get("item").getAsString());
         assertEquals(1, recipe.getAsJsonObject("result").get("count").getAsInt());
     }
 
@@ -27,13 +27,13 @@ public class StarchRecipeTest {
         JsonObject recipe = read("crushing_potato_starch");
         assertEquals("basemetals:crushing", recipe.get("type").getAsString());
         assertEquals(potatoes(), items(recipe.getAsJsonArray("ingredient")));
-        assertEquals("poweradvantage:starch", recipe.getAsJsonObject("result").get("item").getAsString());
+        assertEquals("basepower:starch", recipe.getAsJsonObject("result").get("item").getAsString());
         assertEquals(1, recipe.getAsJsonObject("result").get("count").getAsInt());
     }
 
     private static JsonObject read(String name) throws Exception {
         return new JsonParser().parse(new String(Files.readAllBytes(Paths.get(
-                "src/main/resources/data/poweradvantage/recipes/" + name + ".json")), StandardCharsets.UTF_8)).getAsJsonObject();
+                "src/main/resources/data/basepower/recipes/" + name + ".json")), StandardCharsets.UTF_8)).getAsJsonObject();
     }
     private static Set potatoes() {
         return new HashSet<>(java.util.Arrays.asList("minecraft:potato", "minecraft:poisonous_potato"));
diff --git a/src/test/java/zone/moddev/mc/poweradvantage/support/PowerNativeTestBootstrap.java b/src/test/java/zone/moddev/mc/basepower/support/PowerNativeTestBootstrap.java
similarity index 97%
rename from src/test/java/zone/moddev/mc/poweradvantage/support/PowerNativeTestBootstrap.java
rename to src/test/java/zone/moddev/mc/basepower/support/PowerNativeTestBootstrap.java
index 5de2e93c..aca7128f 100644
--- a/src/test/java/zone/moddev/mc/poweradvantage/support/PowerNativeTestBootstrap.java
+++ b/src/test/java/zone/moddev/mc/basepower/support/PowerNativeTestBootstrap.java
@@ -1,4 +1,4 @@
-package zone.moddev.mc.poweradvantage.support;
+package zone.moddev.mc.basepower.support;
 
 import java.io.InputStream;
 import java.lang.reflect.Field;
diff --git a/test-rig/build.gradle b/test-rig/build.gradle
index acb44acf..02b0a323 100644
--- a/test-rig/build.gradle
+++ b/test-rig/build.gradle
@@ -62,7 +62,7 @@ dependencies {
     testImplementation sourceSets.runner.output
     testImplementation 'junit:junit:4.13.2'
     compileOnly files(project.findProperty('powerAdvantageDeobfJar')
-            ?: '../build/libs-dev/PowerAdvantage-2.4.4.113021-deobf.jar')
+            ?: '../build/libs-dev/basePower-2.4.5.113021-deobf.jar')
 }
 
 tasks.named('processResources', ProcessResources) {
@@ -161,7 +161,7 @@ tasks.register('verifyHarnessIsolation') {
     group = 'verification'
     description = 'Confirms the PowerAdvantage release contains no test-harness content.'
     doLast {
-        File powerJar = file('../build/libs/PowerAdvantage-2.4.4.113021.jar')
+        File powerJar = file('../build/libs/basePower-2.4.5.113021.jar')
         if (!powerJar.isFile()) {
             throw new GradleException("Build PowerAdvantage first: ${powerJar}")
         }
diff --git a/test-rig/client-resources/README.md b/test-rig/client-resources/README.md
index abe445d8..3c951b89 100644
--- a/test-rig/client-resources/README.md
+++ b/test-rig/client-resources/README.md
@@ -79,7 +79,7 @@ The default `-OutputSource Gradle` merges Gradle's classes and processed resourc
 
 For coordinated startup, first run `gradlew.bat prepareCombinedEclipseLaunch`, then add `-LaunchProfile runClientAllAdvantage.launch -RequireExtensions` to the probe command. The report's `advantage_mods` must list all three mods. With this flag, resource and item-name assertions cover Power, Steam and Electric, and model/blockstate errors from any of their namespaces fail the run. Without it, the original Power-only scope is unchanged. Pin every rebuilt expansion jar in the development and packaged rig profiles before regenerating the combined launch.
 
-Assertions cover every registered item and valid block state in the selected Advantage namespaces, nonempty item/machine geometry, missing-model and missing-texture sprites, English item names, the shared creative tab and its icon, and agreement between Power's modern block and legacy GUI translation keys. Native fluid block models are intentionally particle-only. This test does not certify machine operation, animated entity rendering, or third-party resource packs.
+Assertions cover every registered item and valid block state in the selected Advantage namespaces, nonempty item/machine geometry, missing-model and missing-texture sprites, English item names, and agreement between Power's modern block and legacy GUI translation keys. The creative check requires exactly one basePower tab with its sprocket icon and every player-facing item exactly once. It checks other item tabs for misplaced entries, excluding vanilla search and the special hotbar/inventory screens. The report lists the tab labels and the actual item IDs. Generated machine parts, variants and raw fluid blocks that were already hidden stay off the tab. Native fluid block models are intentionally particle-only. This test does not certify machine operation, animated entity rendering, or third-party resource packs.
 
 The six `ClientResourceContractTest` checks first failed against the pre-repair resources. They cover literal model paths, removed legacy blockstate selectors, model parents/textures (including vanilla assets), oil item models, locale aliases, and English block/bucket coverage.
 
diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/ClientResourceProbe.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/ClientResourceProbe.java
index 78414bfa..4f2094ff 100644
--- a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/ClientResourceProbe.java
+++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/ClientResourceProbe.java
@@ -1,5 +1,6 @@
 package zone.moddev.mc.advantageworks.client;
 
+import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
@@ -8,6 +9,7 @@
 import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.NonNullList;
@@ -18,15 +20,18 @@
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.registries.ForgeRegistries;
 import org.apache.logging.log4j.LogManager;
-import zone.moddev.mc.poweradvantage.init.ItemGroups;
+import zone.moddev.mc.basepower.init.ItemGroups;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Random;
+import java.util.Set;
 
 /** Runs after native resource baking, without opening or generating a world. */
 @Mod(ClientResourceProbe.MODID)
@@ -49,9 +54,9 @@ public final class ClientResourceProbe {
                     && "25.0.223".equals(result.get("forge").getAsString()), "Wrong native client target");
             require(minecraft.world == null && minecraft.player == null && !minecraft.isIntegratedServerRunning(),
                     "Resource probe must not open a world or connect to a server");
-            com.google.gson.JsonArray mods = new com.google.gson.JsonArray();
+            JsonArray mods = new JsonArray();
             JsonObject versions = new JsonObject();
-            for (String id : new String[]{"poweradvantage", "steamadvantage", "electricadvantage"}) {
+            for (String id : new String[]{"basepower", "basesteam", "baseelectric"}) {
                 boolean loaded = net.minecraftforge.fml.ModList.get().isLoaded(id);
                 if (loaded) {
                     mods.add(id);
@@ -62,11 +67,11 @@ public final class ClientResourceProbe {
             }
             result.add("advantage_mods", mods);
             result.add("mod_versions", versions);
-            require(versions.has("poweradvantage") && zone.moddev.mc.poweradvantage.PowerAdvantage.VERSION
-                    .equals(versions.get("poweradvantage").getAsString()), "Power metadata does not match the compiled version");
-            require("2.4.4.113021".equals(versions.get("poweradvantage").getAsString()), "Wrong native Power candidate");
-            for (String id : new String[]{"steamadvantage", "electricadvantage"}) {
-                if (versions.has(id)) require("2.2.5.113021".equals(versions.get(id).getAsString()), "Wrong native expansion candidate: " + id);
+            require(versions.has("basepower") && zone.moddev.mc.basepower.PowerAdvantage.VERSION
+                    .equals(versions.get("basepower").getAsString()), "Power metadata does not match the compiled version");
+            require("2.4.5.113021".equals(versions.get("basepower").getAsString()), "Wrong native Power candidate");
+            for (String id : new String[]{"basesteam", "baseelectric"}) {
+                if (versions.has(id)) require("2.2.7.113021".equals(versions.get(id).getAsString()), "Wrong native expansion candidate: " + id);
             }
             require(minecraft.getModelManager().getMissingModel() != null, "Timed out before model baking");
             int items = 0;
@@ -91,12 +96,9 @@ public final class ClientResourceProbe {
                     states++;
                 }
             }
-            NonNullList contents = NonNullList.create();
-            ItemGroups.tab_powerAdvantage.fill(contents);
             require(items > 0 && states > 0, "Power Advantage content is not registered");
-            require(!contents.isEmpty(), "Power Advantage creative tab is empty");
-            require(!ItemGroups.tab_powerAdvantage.getIcon().isEmpty(), "Power Advantage creative tab has no icon");
-            require(I18n.format("block.poweradvantage.still").equals(I18n.format("tile.poweradvantage.still.name")),
+            int creativeEntries = verifyCreativeTab(result);
+            require(I18n.format("block.basepower.still").equals(I18n.format("tile.basepower.still.name")),
                     "Legacy GUI translation differs from modern block name");
             TankVisualProbe.verify(minecraft, result);
             MachineGuiLayoutProbe.verify(minecraft, result);
@@ -105,9 +107,9 @@ public final class ClientResourceProbe {
             result.addProperty("status", "PASS");
             result.addProperty("items", items);
             result.addProperty("block_states", states);
-            result.addProperty("creative_entries", contents.size());
+            result.addProperty("creative_entries", creativeEntries);
             result.addProperty("screen", minecraft.currentScreen == null ? "none" : minecraft.currentScreen.getClass().getName());
-            LogManager.getLogger(MODID).info("ADVANTAGE_CLIENT_RESOURCES PASS items={} block_states={} creative_entries={}", items, states, contents.size());
+            LogManager.getLogger(MODID).info("ADVANTAGE_CLIENT_RESOURCES PASS items={} block_states={} creative_entries={}", items, states, creativeEntries);
         } catch (RuntimeException | LinkageError | AssertionError failure) {
             result.addProperty("status", "FAIL");
             result.addProperty("error", failure.toString());
@@ -119,9 +121,60 @@ public final class ClientResourceProbe {
         }
     }
 
+    private static int verifyCreativeTab(JsonObject result) {
+        ItemGroup shared = ItemGroups.tab_powerAdvantage;
+        // Fluids use buckets; the other entries are generated machine parts or variants.
+        Set hidden = new HashSet<>(Arrays.asList(
+                "basepower:crude_oil", "basepower:refined_oil", "basepower:fluid_pipe_terminal",
+                "basesteam:drillbit", "basesteam:pump_pipe_steam",
+                "baseelectric:laser_turret_evil", "baseelectric:pump_pipe_electric"));
+        Set expected = new HashSet<>();
+        for (Item item : ForgeRegistries.ITEMS) {
+            ResourceLocation id = item.getRegistryName();
+            if (id != null && included(id.getNamespace()) && !hidden.contains(id.toString())) {
+                expected.add(id.toString());
+            }
+        }
+
+        int matchingTabs = 0;
+        JsonArray tabs = new JsonArray();
+        JsonArray visible = new JsonArray();
+        List failures = new ArrayList<>();
+        for (ItemGroup tab : ItemGroup.GROUPS) {
+            if (tab == null) continue;
+            String label = tab.getTabLabel();
+            tabs.add(label);
+            if ("basepower".equals(label) || "poweradvantage".equals(label)
+                    || "basesteam".equals(label) || "steamadvantage".equals(label)
+                    || "baseelectric".equals(label) || "electricadvantage".equals(label)) matchingTabs++;
+            if (tab == ItemGroup.SEARCH || tab == ItemGroup.HOTBAR || tab == ItemGroup.INVENTORY) continue;
+            NonNullList contents = NonNullList.create();
+            tab.fill(contents);
+            for (ItemStack stack : contents) {
+                ResourceLocation id = stack.getItem().getRegistryName();
+                if (id == null || !included(id.getNamespace())) continue;
+                String name = id.toString();
+                if (tab != shared) failures.add(name + " is on " + label);
+                else if (!expected.remove(name)) failures.add("Unexpected or duplicate stack: " + name);
+                else visible.add(name);
+            }
+        }
+        result.add("creative_tab_labels", tabs);
+        result.add("creative_visible_items", visible);
+        result.addProperty("creative_tab_title", I18n.format(shared.getTranslationKey()));
+        if (matchingTabs != 1) failures.add("Expected one base* creative tab, found " + matchingTabs);
+        if (!"basePower".equals(I18n.format(shared.getTranslationKey()))) failures.add("Wrong creative tab title");
+        if (!new ResourceLocation("basepower", "sprocket").equals(shared.getIcon().getItem().getRegistryName())) {
+            failures.add("Wrong creative tab icon");
+        }
+        if (!expected.isEmpty()) failures.add("Missing creative items: " + expected);
+        require(failures.isEmpty(), failures.toString());
+        return visible.size();
+    }
+
     private static boolean included(String namespace) {
-        return "poweradvantage".equals(namespace) || (Boolean.getBoolean("advantageworks.requireExtensions")
-                && ("steamadvantage".equals(namespace) || "electricadvantage".equals(namespace)));
+        return "basepower".equals(namespace) || (Boolean.getBoolean("advantageworks.requireExtensions")
+                && ("basesteam".equals(namespace) || "baseelectric".equals(namespace)));
     }
 
     private static void verifyModel(IBakedModel model, IBakedModel missing, IBlockState state, String id, boolean requireQuads) {
diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/MachineGuiLayoutProbe.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/MachineGuiLayoutProbe.java
index be139952..6df75ff5 100644
--- a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/MachineGuiLayoutProbe.java
+++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/MachineGuiLayoutProbe.java
@@ -36,7 +36,7 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraftforge.registries.ForgeRegistries;
-import zone.moddev.mc.poweradvantage.registry.MachineGUIRegistry;
+import zone.moddev.mc.basepower.registry.MachineGUIRegistry;
 
 /** Renders every registered machine screen, not just its detached decorations. */
 final class MachineGuiLayoutProbe {
@@ -162,11 +162,11 @@ static void verify(Minecraft minecraft, JsonObject result) {
                     require(screen.hovered() == menu.inventorySlots.get(menu.inventorySlots.size() - 9), "Inventory hitbox is misaligned");
                     ImageIO.write(tooltip, "png", new File("machine-gui-layouts/" + id.replace(':', '-') + "-tooltip.png"));
                     inventory.setInventorySlotContents(0, net.minecraft.item.ItemStack.EMPTY);
-                    if (block == zone.moddev.mc.poweradvantage.init.Blocks.metal_storage_tank) {
+                    if (block == zone.moddev.mc.basepower.init.Blocks.metal_storage_tank) {
                         negativeControls += verifyMissingLabelControls(minecraft, screen);
                         verifyLongName(minecraft, (SimpleMachineGUI) definition, menu, inventory);
                     }
-                    if (block == zone.moddev.mc.poweradvantage.init.Blocks.metal_storage_tank) {
+                    if (block == zone.moddev.mc.basepower.init.Blocks.metal_storage_tank) {
                         verifyHelperLimits(screen);
                     }
                     row.addProperty("renders", renders);
@@ -388,10 +388,10 @@ private static void require(boolean value, String message) {
     }
 
     private static void verifyHelperLimits(RecordingScreen screen) throws Exception {
-        for (String name : new String[]{"zone.moddev.mc.electricadvantage.gui.GUIHelper",
-                "zone.moddev.mc.steamadvantage.gui.GUIHelper"}) {
-            if (!net.minecraftforge.fml.ModList.get().isLoaded(name.contains("electricadvantage") ? "electricadvantage" : "steamadvantage")) continue;
-            String[] methods = name.contains("electricadvantage") ? new String[]{"drawProgressBar"}
+        for (String name : new String[]{"zone.moddev.mc.baseelectric.gui.GUIHelper",
+                "zone.moddev.mc.basesteam.gui.GUIHelper"}) {
+            if (!net.minecraftforge.fml.ModList.get().isLoaded(name.contains("baseelectric") ? "baseelectric" : "basesteam")) continue;
+            String[] methods = name.contains("baseelectric") ? new String[]{"drawProgressBar"}
                     : new String[]{"drawDownArrowProgress", "drawFlameProgress"};
             for (String method : methods) {
                 Method draw = Class.forName(name).getMethod(method, int.class, int.class, float.class, SimpleMachineGUI.GUIContainer.class);
diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/OilRenderProbe.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/OilRenderProbe.java
index b980ba59..d0614dd4 100644
--- a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/OilRenderProbe.java
+++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/OilRenderProbe.java
@@ -15,8 +15,8 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorldReader;
-import zone.moddev.mc.poweradvantage.init.Fluids;
-import zone.moddev.mc.poweradvantage.init.Items;
+import zone.moddev.mc.basepower.init.Fluids;
+import zone.moddev.mc.basepower.init.Items;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Proxy;
@@ -42,10 +42,10 @@ static void verify(Minecraft minecraft, JsonObject result) {
         JsonArray cases = new JsonArray();
         result.add("fluid_rendering", cases);
         boolean valid = true;
-        valid &= check(minecraft, Fluids.crude_oil.getDefaultState(), "poweradvantage:blocks/crude_oil_still", false, cases);
-        valid &= check(minecraft, Fluids.flowing_crude_oil.getFlowingFluidState(5, false), "poweradvantage:blocks/crude_oil_flow", true, cases);
-        valid &= check(minecraft, Fluids.refined_oil.getDefaultState(), "poweradvantage:blocks/refined_oil_still", false, cases);
-        valid &= check(minecraft, Fluids.flowing_refined_oil.getFlowingFluidState(5, false), "poweradvantage:blocks/refined_oil_flow", true, cases);
+        valid &= check(minecraft, Fluids.crude_oil.getDefaultState(), "basepower:blocks/crude_oil_still", false, cases);
+        valid &= check(minecraft, Fluids.flowing_crude_oil.getFlowingFluidState(5, false), "basepower:blocks/crude_oil_flow", true, cases);
+        valid &= check(minecraft, Fluids.refined_oil.getDefaultState(), "basepower:blocks/refined_oil_still", false, cases);
+        valid &= check(minecraft, Fluids.flowing_refined_oil.getFlowingFluidState(5, false), "basepower:blocks/refined_oil_flow", true, cases);
         valid &= check(minecraft, net.minecraft.init.Fluids.WATER.getDefaultState(), "minecraft:block/water_still", false, cases);
         valid &= check(minecraft, net.minecraft.init.Fluids.LAVA.getDefaultState(), "minecraft:block/lava_still", false, cases);
         if (!valid) throw new IllegalStateException("Native fluid renderer used the wrong sprite or tint: " + cases);
diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/RecipeBookGroupingProbe.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/RecipeBookGroupingProbe.java
index 47512b32..77e09158 100644
--- a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/RecipeBookGroupingProbe.java
+++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/RecipeBookGroupingProbe.java
@@ -108,12 +108,12 @@ static void verify(Minecraft minecraft, JsonObject report) {
 
     private static void render(Minecraft minecraft, RecipeBookClient book) throws Exception {
         List shown = new ArrayList<>();
-        Set selected = new HashSet<>(java.util.Arrays.asList("electricadvantage:blank_circuit_board",
-                "electricadvantage:integrated_circuit", "electricadvantage:control_circuit", "electricadvantage:psu", "poweradvantage:item_conveyor"));
+        Set selected = new HashSet<>(java.util.Arrays.asList("baseelectric:blank_circuit_board",
+                "baseelectric:integrated_circuit", "baseelectric:control_circuit", "baseelectric:psu", "basepower:item_conveyor"));
         for (RecipeList cell : book.getRecipes()) {
             IRecipe recipe = cell.getRecipes().get(0);
             String id = recipe.getRecipeOutput().getItem().getRegistryName().toString();
-            if (selected.contains(id) || id.startsWith("poweradvantage:item_filter_")) shown.add(cell);
+            if (selected.contains(id) || id.startsWith("basepower:item_filter_")) shown.add(cell);
         }
         shown.sort(java.util.Comparator.comparing(cell -> cell.getRecipes().get(0).getRecipeOutput().getItem().getRegistryName().toString()));
         require(shown.size() == 13, "The thirteen reported circuit/conveyor cells must be separate");
diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/TankVisualProbe.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/TankVisualProbe.java
index a01821a5..266beb4a 100644
--- a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/TankVisualProbe.java
+++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/TankVisualProbe.java
@@ -17,10 +17,10 @@
 import net.minecraft.world.IBlockReader;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
-import zone.moddev.mc.poweradvantage.gui.FilteredFluidTankGUI;
-import zone.moddev.mc.poweradvantage.gui.FluidTankGUI;
-import zone.moddev.mc.poweradvantage.init.Blocks;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.MetalTankTileEntity;
+import zone.moddev.mc.basepower.gui.FilteredFluidTankGUI;
+import zone.moddev.mc.basepower.gui.FluidTankGUI;
+import zone.moddev.mc.basepower.init.Blocks;
+import zone.moddev.mc.basepower.machines.fluidmachines.MetalTankTileEntity;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
@@ -69,7 +69,7 @@ private static boolean floorVisible(final IBlockState tank) {
     }
 
     private static int renderWater(Minecraft minecraft, MetalTankTileEntity tile) {
-        FilteredFluidTankGUI definition = new FilteredFluidTankGUI(new ResourceLocation("poweradvantage", "textures/gui/container/fluid_metal_tank_gui.png"));
+        FilteredFluidTankGUI definition = new FilteredFluidTankGUI(new ResourceLocation("basepower", "textures/gui/container/fluid_metal_tank_gui.png"));
         SimpleMachineGUI.GUIContainer screen = definition.new GUIContainer(new InventoryPlayer(null), tile);
         screen.mc = minecraft;
         tile.getTank().setFluid(new FluidStack(net.minecraft.init.Fluids.WATER, 10000));
diff --git a/test-rig/client-resources/resources/META-INF/mods.toml b/test-rig/client-resources/resources/META-INF/mods.toml
index 87823e5f..6febde2a 100644
--- a/test-rig/client-resources/resources/META-INF/mods.toml
+++ b/test-rig/client-resources/resources/META-INF/mods.toml
@@ -9,8 +9,8 @@ displayName="Advantage Client Resource Probe"
 description='''Build-only model, texture and translation checks. Never distribute with the mod.'''
 
 [[dependencies.advantageclientresources]]
-modId="poweradvantage"
+modId="basepower"
 mandatory=true
-versionRange="[2.4.4.113021,)"
+versionRange="[2.4.5.113021,)"
 ordering="AFTER"
 side="CLIENT"
diff --git a/test-rig/client-resources/resources/gui-label-expectations.json b/test-rig/client-resources/resources/gui-label-expectations.json
index 2f82b82b..bdbb23d8 100644
--- a/test-rig/client-resources/resources/gui-label-expectations.json
+++ b/test-rig/client-resources/resources/gui-label-expectations.json
@@ -3,44 +3,44 @@
   "inventory": "Inventory",
   "layout": { "height": 240, "machineTop": 12, "machineHeight": 128, "inventoryTop": 150, "titleY": 1, "inventoryLabelY": 140, "inventoryRows": [158, 176, 194, 216] },
   "machines": {
-    "poweradvantage:fluid_drain": "Drain",
-    "poweradvantage:fluid_discharge": "Discharge Grate",
-    "poweradvantage:fluid_storage_tank": "Portable Fluid Tank",
-    "poweradvantage:fluid_metal_tank": "Metal Fluid Tank",
-    "poweradvantage:still": "Distillation Furnace",
-    "poweradvantage:item_conveyor": "Conveyor",
-    "poweradvantage:item_filter_block": "Block Filter Conveyor",
-    "poweradvantage:item_filter_food": "Food Filter Conveyor",
-    "poweradvantage:item_filter_fuel": "Fuel Filter Conveyor",
-    "poweradvantage:item_filter_inventory": "Filter Conveyor",
-    "poweradvantage:item_filter_ore": "Ore Filter Conveyor",
-    "poweradvantage:item_filter_plant": "Plantable Filter Conveyor",
-    "poweradvantage:item_filter_smelt": "Furnace Filter Conveyor",
-    "poweradvantage:item_filter_overflow": "Overflow Filter Conveyor",
-    "steamadvantage:steam_boiler_coal": "Coal-Fired Steam Boiler",
-    "steamadvantage:steam_boiler_electric": "Electric Steam Boiler",
-    "steamadvantage:steam_boiler_geothermal": "Geothermal Steam Boiler",
-    "steamadvantage:steam_boiler_oil": "Oil-Burning Steam Boiler",
-    "steamadvantage:steam_tank": "Steam Boiler Tank",
-    "steamadvantage:steam_furnace": "Steam-Powered Furnace",
-    "steamadvantage:steam_crusher": "Steam-Powered Rock Crusher",
-    "steamadvantage:steam_drill": "Steam-Powered Drill",
-    "steamadvantage:steam_still": "Steam-Powered Still",
-    "steamadvantage:steam_pump": "Steam-Powered Pump",
-    "electricadvantage:electric_battery_array": "Battery Array",
-    "electricadvantage:electric_crusher": "Electric Rock Crusher",
-    "electricadvantage:electric_drill": "Electric Mining Drill",
-    "electricadvantage:electric_fabricator": "Automated Assembler",
-    "electricadvantage:electric_furnace": "Electric Arc Furnace",
-    "electricadvantage:electric_oven": "Electric Oven",
-    "electricadvantage:electric_pump": "Electric Pump",
-    "electricadvantage:electric_still": "Electric Distiller",
-    "electricadvantage:growth_chamber": "Growth Chamber",
-    "electricadvantage:growth_chamber_controller": "Growth Chamber Control Unit",
-    "electricadvantage:hydroelectric_generator": "Hydroelectric Generator",
-    "electricadvantage:laser_turret": "Laser Turret",
-    "electricadvantage:photovoltaic_generator": "Photovoltaic Generator",
-    "electricadvantage:plastic_refinery": "Petro-Plastic Refinery",
-    "electricadvantage:steam_powered_generator": "Steam-Powered Electric Generator"
+    "basepower:fluid_drain": "Drain",
+    "basepower:fluid_discharge": "Discharge Grate",
+    "basepower:fluid_storage_tank": "Portable Fluid Tank",
+    "basepower:fluid_metal_tank": "Metal Fluid Tank",
+    "basepower:still": "Distillation Furnace",
+    "basepower:item_conveyor": "Conveyor",
+    "basepower:item_filter_block": "Block Filter Conveyor",
+    "basepower:item_filter_food": "Food Filter Conveyor",
+    "basepower:item_filter_fuel": "Fuel Filter Conveyor",
+    "basepower:item_filter_inventory": "Filter Conveyor",
+    "basepower:item_filter_ore": "Ore Filter Conveyor",
+    "basepower:item_filter_plant": "Plantable Filter Conveyor",
+    "basepower:item_filter_smelt": "Furnace Filter Conveyor",
+    "basepower:item_filter_overflow": "Overflow Filter Conveyor",
+    "basesteam:steam_boiler_coal": "Coal-Fired Steam Boiler",
+    "basesteam:steam_boiler_electric": "Electric Steam Boiler",
+    "basesteam:steam_boiler_geothermal": "Geothermal Steam Boiler",
+    "basesteam:steam_boiler_oil": "Oil-Burning Steam Boiler",
+    "basesteam:steam_tank": "Steam Boiler Tank",
+    "basesteam:steam_furnace": "Steam-Powered Furnace",
+    "basesteam:steam_crusher": "Steam-Powered Rock Crusher",
+    "basesteam:steam_drill": "Steam-Powered Drill",
+    "basesteam:steam_still": "Steam-Powered Still",
+    "basesteam:steam_pump": "Steam-Powered Pump",
+    "baseelectric:electric_battery_array": "Battery Array",
+    "baseelectric:electric_crusher": "Electric Rock Crusher",
+    "baseelectric:electric_drill": "Electric Mining Drill",
+    "baseelectric:electric_fabricator": "Automated Assembler",
+    "baseelectric:electric_furnace": "Electric Arc Furnace",
+    "baseelectric:electric_oven": "Electric Oven",
+    "baseelectric:electric_pump": "Electric Pump",
+    "baseelectric:electric_still": "Electric Distiller",
+    "baseelectric:growth_chamber": "Growth Chamber",
+    "baseelectric:growth_chamber_controller": "Growth Chamber Control Unit",
+    "baseelectric:hydroelectric_generator": "Hydroelectric Generator",
+    "baseelectric:laser_turret": "Laser Turret",
+    "baseelectric:photovoltaic_generator": "Photovoltaic Generator",
+    "baseelectric:plastic_refinery": "Petro-Plastic Refinery",
+    "baseelectric:steam_powered_generator": "Steam-Powered Electric Generator"
   }
 }
diff --git a/test-rig/client-resources/run.ps1 b/test-rig/client-resources/run.ps1
index 44d740af..0b01cb4b 100644
--- a/test-rig/client-resources/run.ps1
+++ b/test-rig/client-resources/run.ps1
@@ -31,7 +31,7 @@ function Assert-NativeMetadata([string]$Metadata, [string]$Id) {
     if ($header -notmatch ('(?m)^modId\s*=\s*"' + [regex]::Escape($Id) + '"[ \t]*(?:#[^\r\n]*)?\r?$') -or
         $header -notmatch '(?m)^version\s*=\s*"[^"\r\n]*\.113\d+"[ \t]*(?:#[^\r\n]*)?\r?$' -or
         $Metadata -notmatch '(?m)^loaderVersion\s*=\s*"\[25,') { throw "Not a native Forge 25 candidate: $Id" }
-    $expected = @{ poweradvantage = '2.4.4.113021'; steamadvantage = '2.2.5.113021'; electricadvantage = '2.2.5.113021' }
+    $expected = @{ basepower = '2.4.5.113021'; basesteam = '2.2.7.113021'; baseelectric = '2.2.7.113021' }
     if ($expected.ContainsKey($Id) -and $header -notmatch ('(?m)^version\s*=\s*"' + [regex]::Escape($expected[$Id]) + '"[ \t]*(?:#[^\r\n]*)?\r?$')) {
         throw "Unexpected native candidate version for $Id; expected $($expected[$Id])"
     }
@@ -70,7 +70,7 @@ $inputReport.launch = Get-Record (Join-Path $project $LaunchProfile)
 $inputReport.probe = Get-Record $probe
 $probeMetadata = Read-JarMetadata $probe
 if ($probeMetadata -notmatch 'loaderVersion="\[25,\)"' -or
-    $probeMetadata -notmatch 'versionRange="\[2\.4\.4\.113021,\)"') { throw 'Rebuild the native 1.13 probe; do not substitute a legacy probe.' }
+    $probeMetadata -notmatch 'versionRange="\[2\.4\.5\.113021,\)"') { throw 'Rebuild the native 1.13 probe; do not substitute a legacy probe.' }
 Copy-Item -LiteralPath (Join-Path $project $LaunchProfile) -Destination (Join-Path $runtime 'launch.xml')
 $environment = @{}
 foreach ($map in $launch.launchConfiguration.mapAttribute) {
@@ -79,7 +79,7 @@ foreach ($map in $launch.launchConfiguration.mapAttribute) {
     }
 }
 Assert-NativeLaunch $environment $attributes
-$modOutput = Join-Path $runtime 'poweradvantage'
+$modOutput = Join-Path $runtime 'basepower'
 New-Item -ItemType Directory -Path $modOutput,(Join-Path $runtime 'mods') -Force | Out-Null
 if ($OutputSource -eq 'Eclipse') {
     Copy-Item -Path (Join-Path $project 'bin/main/*') -Destination $modOutput -Recurse
@@ -96,14 +96,14 @@ if (-not (Test-Path -LiteralPath $metadataPath) -or (Get-Content -LiteralPath $m
         Set-Content -LiteralPath (Join-Path $runtime 'client-resources.json') -Encoding utf8
     throw $failure
 }
-Assert-NativeMetadata (Get-Content -LiteralPath $metadataPath -Raw) 'poweradvantage'
+Assert-NativeMetadata (Get-Content -LiteralPath $metadataPath -Raw) 'basepower'
 $outputFiles = @(Get-ChildItem -LiteralPath $modOutput -Recurse -File | Sort-Object FullName | ForEach-Object { Get-Record $_.FullName })
 if (@($outputFiles | Where-Object { $_.path -like '*.class' }).Count -eq 0) { throw 'Selected output has no compiled production classes.' }
 $outputFiles | ConvertTo-Json -Depth 6 | Set-Content -LiteralPath (Join-Path $runtime 'production-files.json') -Encoding utf8
 $inputReport.production_files = Get-Record (Join-Path $runtime 'production-files.json')
-if (-not $PowerCandidate) { $PowerCandidate = Join-Path $project 'build/libs-dev/PowerAdvantage-2.4.4.113021-deobf.jar' }
+if (-not $PowerCandidate) { $PowerCandidate = Join-Path $project 'build/libs-dev/basePower-2.4.5.113021-deobf.jar' }
 $PowerCandidate = (Resolve-Path -LiteralPath $PowerCandidate).Path
-Assert-NativeMetadata (Read-JarMetadata $PowerCandidate) 'poweradvantage'
+Assert-NativeMetadata (Read-JarMetadata $PowerCandidate) 'basepower'
 $inputReport.power_candidate = Get-Record $PowerCandidate
 $inputReport.candidate_note = 'Jar provenance only; runtime uses the separately hashed selected production classes/resources.'
 Copy-Item -LiteralPath $probe -Destination (Join-Path $runtime 'mods/advantageclientresources.jar')
@@ -143,7 +143,7 @@ foreach ($archive in $archives) {
     $record = Get-Record $archive
     $metadata = if ([IO.Path]::GetExtension($archive) -eq '.jar') { Read-JarMetadata $archive }
     $modHeader = if ($metadata) { [regex]::Match($metadata, '(?ms)^\[\[mods\]\]\s*(.*?)(?=^\[|\z)').Groups[1].Value }
-    if ($modHeader -match '(?m)^modId\s*=\s*"(?:steamadvantage|electricadvantage|basemetals|orespawn)"') {
+    if ($modHeader -match '(?m)^modId\s*=\s*"(?:basesteam|baseelectric|basemetals|orespawn)"') {
         # Never read mutable sibling build outputs while the client is running.
         $snapshotDirectory = Join-Path $runtime 'runtime-archives'
         New-Item -ItemType Directory -Path $snapshotDirectory -Force | Out-Null
@@ -154,10 +154,10 @@ foreach ($archive in $archives) {
         $snapshotRecord.origin_path = $record.path
         $record = $snapshotRecord
     }
-    foreach ($id in 'poweradvantage','steamadvantage','electricadvantage','basemetals','orespawn') {
+    foreach ($id in 'basepower','basesteam','baseelectric','basemetals','orespawn') {
         if ($modHeader -match ('(?m)^modId\s*=\s*"' + $id + '"[ \t]*(?:#[^\r\n]*)?\r?$')) {
             Assert-NativeMetadata $metadata $id
-            if ($id -eq 'poweradvantage' -or $runtimeCandidates.ContainsKey($id)) { throw "Duplicate runtime candidate: $id" }
+            if ($id -eq 'basepower' -or $runtimeCandidates.ContainsKey($id)) { throw "Duplicate runtime candidate: $id" }
             $runtimeCandidates[$id] = $record
         }
     }
@@ -168,12 +168,12 @@ $archives = $launchArchives
 $inputReport.archives = $archiveRecords
 $inputReport.runtime_candidates = $runtimeCandidates
 if (-not ($archives -match 'forge-1\.13\.2-25\.0\.223\.jar$')) { throw 'Missing actual native mapped Forge runtime.' }
-if ($RequireExtensions -and (-not $runtimeCandidates.ContainsKey('steamadvantage') -or -not $runtimeCandidates.ContainsKey('electricadvantage'))) { throw 'Combined launch must explicitly contain both native expansion candidates.' }
+if ($RequireExtensions -and (-not $runtimeCandidates.ContainsKey('basesteam') -or -not $runtimeCandidates.ContainsKey('baseelectric'))) { throw 'Combined launch must explicitly contain both native expansion candidates.' }
 $arguments = @([regex]::Matches($attributes['org.eclipse.jdt.launching.PROGRAM_ARGUMENTS'], '"[^"]*"|\S+') | ForEach-Object { $_.Value.Trim('"') })
 $vmArguments = @([regex]::Matches($attributes['org.eclipse.jdt.launching.VM_ARGUMENTS'], '"[^"]*"|\S+') | ForEach-Object { $_.Value.Trim('"') })
 if ($RequireExtensions) { $vmArguments += '-Dadvantageworks.requireExtensions=true' }
 if ($MachineGuiLayouts) { $vmArguments += '-Dadvantageworks.machineGuiLayouts=true' }
-$environment.MOD_CLASSES = "poweradvantage%%$modOutput;poweradvantage%%$modOutput"
+$environment.MOD_CLASSES = "basepower%%$modOutput;basepower%%$modOutput"
 $inputReport.environment = $environment
 $inputReport.program_arguments = $arguments
 $inputReport.vm_arguments = $vmArguments
@@ -214,12 +214,20 @@ if ($MachineGuiLayouts -and ($result.machine_gui_text_spec -ne 2 -or $result.mac
         $result.machine_gui_negative_controls_rejected -ne ($expectedGuiTextChecks + 4))) {
     throw 'Required-caption GUI contract v2 did not pass; an older no-label probe is not acceptable.'
 }
-if ($RecipeBookFixtures -and $result.recipe_book_grouping_status -ne 'PASS') { throw 'Native recipe fixtures were supplied but recipe-book grouping did not pass.' }
+if ($RecipeBookFixtures) {
+    $grouping = @($result.recipe_book_grouping)
+    $expectedPackets = 'recipes-apocalyptic-sweep.bin', 'recipes-normal-sweep.bin', 'recipes-tech-sweep.bin'
+    if ($grouping.Count -ne $expectedPackets.Count -or
+        (($grouping.packet | Sort-Object) -join ',') -cne ($expectedPackets -join ',') -or
+        @($grouping | Where-Object { $_.status -cne 'PASS' -or $_.cells -le 0 -or $_.recipes -lt $_.cells }).Count -ne 0) {
+        throw 'Native recipe fixtures require passing grouping results for all three recipe modes.'
+    }
+}
 foreach ($record in $archiveRecords) {
     if ((Get-FileHash -LiteralPath $record.path).Hash -ne $record.sha256) { throw "Dependency changed during the run: $($record.path)" }
 }
 $log = Get-Content -LiteralPath (Join-Path $runtime 'logs/latest.log') -Raw
-$namespaces = if ($RequireExtensions) { '(?:poweradvantage|steamadvantage|electricadvantage)' } else { 'poweradvantage' }
+$namespaces = if ($RequireExtensions) { '(?:basepower|basesteam|baseelectric)' } else { 'basepower' }
 if ($log -match "Unable to load model:.*${namespaces}:|Exception loading blockstate definition:.*${namespaces}:|\[FML\.TEXTURE_ERRORS/\]") {
     throw "Client logged a model or texture error; inspect $runtime/logs/latest.log"
 }
diff --git a/test-rig/client-resources/test-gui-contract.ps1 b/test-rig/client-resources/test-gui-contract.ps1
index 097df16e..c4675281 100644
--- a/test-rig/client-resources/test-gui-contract.ps1
+++ b/test-rig/client-resources/test-gui-contract.ps1
@@ -169,13 +169,16 @@ function Canonical-Source([string]$Source) {
     $Source = [regex]::Replace($Source, '/\*[\s\S]*?\*/|//[^\r\n]*', '')
     [regex]::Replace($Source, '\s+', '')
 }
+function Convert-ReleaseIds([string]$Source) {
+    $Source -creplace '(? {items}")
+        if "energy" in saved:
+            energy = struct.unpack(">f", struct.pack(">i", int(data["Energy"][0])))[0]
+            if energy != saved["energy"]:
+                raise AssertionError(f"{name}: energy changed: {saved['energy']} -> {energy}")
+        if "fluid" in saved:
+            tank = data["Tank"]
+            expected = [fluid_id(saved["fluid"][0]), saved["fluid"][1]]
+            if [tank["FluidName"], tank["Amount"]] != expected:
+                raise AssertionError(f"{name}: tank changed: {expected} -> {tank}")
+
+
+def operate(runtime, target, pins, frozen, positions, expected, java, port):
+    launcher = prepare(runtime, target, [], port)
+    verify_code(runtime, pins["serverCode"])
+    write_json(runtime / INVENTORY, pins["serverCode"])
+    shutil.copytree(frozen / WORLD, runtime / WORLD)
+    shutil.copytree(frozen / "config", runtime / "config")
+    shutil.copy2(frozen / "server.properties", runtime / "server.properties")
+    shutil.copy2(frozen / "migration-fixture.json", runtime / "migration-fixture.json")
+    (runtime / "migration-operate.allow").touch()
+    jobs = (("sourceChest", "destination", "dirt", "dirt", 8),
+            ("steamCrusher", "steamCrusher", "stone", "cobblestone", 1),
+            ("electricFurnace", "electricFurnace", "iron_ore", "iron_ingot", 1))
+    server = Server(runtime, java, launcher, "resumed")
+    try:
+        for source, _, resource, _, count in jobs:
+            x, y, z = positions[source]
+            server.send(f"replaceitem block {x} {y} {z} container.0 minecraft:{resource} {count}")
+            server.wait("Replaced a slot at", 30)
+        time.sleep(30)
+        server.snapshot("resumed")
+        server.send("save-all flush")
+        server.wait("Saved the game", 30)
+    finally:
+        server.close()
+    require_native_boot(runtime / "console-resumed.log")
+    verify_staged(runtime, target)
+    rows = {row["name"]: row for row in read_json(runtime / "migration-resumed.json")}
+    outputs = {}
+    for source, sink, resource, product, count in jobs:
+        old = sum(e["count"] for e in expected["witnesses"][sink].get("items", ())
+                  if e["item"] == "minecraft:" + product)
+        live = sum(int(e["Count"]) for e in parse_nbt(rows[sink]).get("Items", ())
+                   if e["id"] == "minecraft:" + product)
+        remaining = sum(int(e["Count"]) for e in parse_nbt(rows[source]).get("Items", ())
+                        if e["id"] == "minecraft:" + resource)
+        if live != old + count or remaining:
+            raise AssertionError(f"{sink}: expected {old + count} {product} and no remaining input, got {live}/{remaining}")
+        outputs[sink] = dict(before=old, after=live, item="minecraft:" + product)
+    return dict(status="PASS", outputs=outputs, snapshotSha256=digest(runtime / "migration-resumed.json"))
+
+
+def run(args):
+    sys.path.insert(0, str(args.previous_rig.resolve()))
+    from native112_rebrand import observe, observe_turbine
+
+    source = args.fixture / ("target" if args.released112 else "source")
+    receipt = args.fixture / "rebrand-upgrade-results.json"
+    history = read_json(receipt)
+    if history["status"] != "PASS":
+        raise AssertionError("A passing retained source qualification is required")
+    expected = history["phases"]["restarted" if args.released112 else "source"]
+    positions = {key: tuple(value) for key, value in history["positions"].items()}
+    target = pinned_profile(args.target_manifest, "target113")
+    pins = read_json(args.target_manifest)["target113"]
+    output = output_path(args.output)
+    for protected in (source, args.fixture, args.source_manifest, args.target_manifest, target[0], *target[2]):
+        require_disjoint(output, protected)
+    with socket.socket() as listener:
+        listener.bind(("127.0.0.1", args.port))
+    source_world = fingerprint(source / WORLD)
+    source_config = fingerprint(source / "config")
+    if not args.released112 and source_world != read_json(args.fixture / "source-world-hashes.json"):
+        raise AssertionError("Retained 1.10 world differs from its earlier qualification")
+    source_pins = read_json(args.source_manifest)
+    source_jars = {p.name: digest(p) for p in (source / "mods").glob("*.jar")}
+    if args.released112:
+        for entry in source_pins["releases"]:
+            jar = entry["name"] + "-" + entry["version"] + ".jar"
+            if source_jars.get(jar) != entry["artifact"]["sha256"]:
+                raise AssertionError(f"Source does not use the released 1.12 jar: {jar}")
+    else:
+        expected_jars = {Path(row["path"]).name: row["sha256"] for row in source_pins["jars"]}
+        if source_jars != expected_jars or digest(args.source_manifest) != history["sourceManifestSha256"]:
+            raise AssertionError("Retained 1.10 source mods do not match the original pins")
+    observed = json.loads(json.dumps(observe(source / WORLD, positions, require_modern=args.released112)))
+    for key, value in observed.items():
+        if value != expected[key]:
+            raise AssertionError(f"Retained source state changed: {key}")
+    verify_code(target[0], pins["serverCode"])
+    launcher = prepare(output, target, [], args.port)
+    verify_code(output, pins["serverCode"])
+    write_json(output / INVENTORY, pins["serverCode"])
+    shutil.copytree(source / WORLD, output / WORLD)
+    shutil.copytree(source / "config", output / "config")
+    properties = output / "server.properties"
+    lines = [line for line in properties.read_text().splitlines() if not line.startswith("generator-settings=")]
+    properties.write_text("\n".join(lines) + "\n", encoding="ascii")
+    write_json(output / "migration-fixture.json", [
+        dict(name=name, x=pos[0], y=pos[1], z=pos[2]) for name, pos in positions.items()])
+    result_path = output / "native113-rebrand-results.json"
+    result = dict(status="RUNNING", source=str(source.resolve()), sourceJars=source_jars,
+                  sourceWorld=source_world, sourceManifestSha256=digest(args.source_manifest),
+                  previousReceiptSha256=digest(receipt), targetManifestSha256=digest(args.target_manifest),
+                  phases={})
+    write_json(result_path, result)
+    try:
+        for phase in ("converted", "restarted"):
+            server = Server(output, args.java8, launcher, phase)
+            try:
+                server.snapshot(phase)
+                server.send("save-all flush")
+                server.wait("Saved the game", 30)
+            finally:
+                server.close()
+            require_native_boot(output / f"console-{phase}.log")
+            verify_staged(output, target)
+            snapshot = output / f"migration-{phase}.json"
+            verify_snapshot(expected, read_json(snapshot))
+            turbine = observe_turbine(output / WORLD, positions["hydroGenerator"])
+            if turbine != dict(expected["turbine"], id="baseelectric:hydroturbine"):
+                raise AssertionError(f"Saved turbine was changed or replaced: {turbine}")
+            result["phases"][phase] = dict(status="PASS", witnesses=len(positions),
+                                           snapshotSha256=digest(snapshot), turbine=turbine)
+            write_json(result_path, result)
+        repeated = compare(output / "migration-converted.json", output / "migration-restarted.json")
+        if repeated["status"] != "PASS":
+            raise AssertionError(f"Converted save changed during cold restart: {repeated}")
+        write_json(output / "state-comparison.json", dict(
+            conversion=result["phases"]["converted"], restart=result["phases"]["restarted"],
+            idempotence=repeated))
+        if args.operate:
+            result["phases"]["resumed"] = operate(output / "operation", target, pins, output,
+                                                   positions, expected, args.java8, args.port)
+        result["status"] = "PASS"
+    except Exception as error:
+        result.update(status="FAIL", failure=str(error), traceback=traceback.format_exc())
+    finally:
+        result["sourceUnchanged"] = (source_world == fingerprint(source / WORLD)
+                                     and source_config == fingerprint(source / "config"))
+        if not result["sourceUnchanged"]:
+            result["status"] = "FAIL"
+        write_json(result_path, result)
+    print(result["status"], result_path, flush=True)
+    return int(result["status"] != "PASS")
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description=__doc__)
+    for name in ("previous-rig", "fixture", "source-manifest", "target-manifest", "java8", "output"):
+        parser.add_argument("--" + name, type=Path, required=True)
+    parser.add_argument("--port", type=int, required=True)
+    parser.add_argument("--released112", action="store_true")
+    parser.add_argument("--operate", action="store_true", help="Run imported machines on a second disposable copy")
+    raise SystemExit(run(parser.parse_args()))
diff --git a/test-rig/migration/native113_rebrand_order.py b/test-rig/migration/native113_rebrand_order.py
new file mode 100644
index 00000000..0f214593
--- /dev/null
+++ b/test-rig/migration/native113_rebrand_order.py
@@ -0,0 +1,133 @@
+"""Check original-release block states and actors under both actual transformer orders."""
+
+import argparse
+from pathlib import Path
+import shutil
+
+import transformer_order as order
+from matrix import WORLD, differences, digest, fingerprint, parse_nbt, write_json
+from native113 import output_path, pinned_profile, require_disjoint
+from native113_code import verify_code
+from native113_lifecycle import prepare, read_json, require_native_boot, verify_staged
+from native113_rebrand import canonical
+
+
+def migrated_names(value, key=None):
+    if isinstance(value, dict):
+        result = {field: migrated_names(child, field) for field, child in value.items()}
+        if "Count" in result and result.get("id") in ("basepower:crude_oil", "basepower:refined_oil"):
+            # Historical 1.13 exposed the filled bucket under the fluid's path.
+            result["id"] += "_bucket"
+        return result
+    if isinstance(value, list):
+        return [migrated_names(child) for child in value]
+    if isinstance(value, str) and key in ("id", "name", "FluidName", "FluidID"):
+        return canonical(value)
+    return value
+
+
+def compare_exact(expected, actual):
+    if expected == actual:
+        return {"status": "PASS"}
+    return {"status": "FAIL", "differences": differences(expected, actual),
+            "reverseDifferences": differences(actual, expected)}
+
+
+def check_turbine_id(runtime, phase, state):
+    rows = read_json(runtime / f"actors-{phase}.json")["entities"]
+    turbine = [row for row in rows if row["witness"] == "hydroturbine"]
+    if len(turbine) != 1 or parse_nbt(turbine[0])["id"] != "baseelectric:hydroturbine":
+        raise AssertionError("Wrong native turbine ID or duplicate turbine")
+    # The historical actor reader normalizes this entity to the old name.
+    state["entities"]["hydroturbine"]["id"] = "baseelectric:hydroturbine"
+
+
+def backup_proof(source, runtime):
+    uuid = read_json(source / "actor-fixture.json")["playerUuid"]
+    proof = {}
+    for relative in (Path("level.dat"), Path("playerdata") / f"{uuid}.dat"):
+        original = digest(source / WORLD / relative)
+        prefix = runtime / WORLD / relative
+        backups = {item.name: digest(item) for item in prefix.parent.glob(prefix.name + ".*-legacy-backup")}
+        if original not in backups.values():
+            raise AssertionError(f"No unmodified backup retained for {relative}")
+        proof[str(relative)] = {"original": original, "backups": backups}
+    return proof
+
+
+def run(args):
+    output = output_path(args.output)
+    require_disjoint(output, args.archive)
+    require_disjoint(output, args.target_manifest)
+    source = args.archive / "original110-mixed-input"
+    reference = args.archive / "original110-natural"
+    if read_json(args.archive / "summary.json")["semantic_status"] != "PASS":
+        raise AssertionError("Archived comparison was not qualified")
+    protected = {path: fingerprint(path) for path in (source, reference)}
+    if fingerprint(source / WORLD) != read_json(source / "fixture-hashes.json"):
+        raise AssertionError("Original mixed fixture no longer matches the archived hash")
+    target = pinned_profile(args.target_manifest, "target113")
+    inventory = read_json(args.target_manifest)["target113"]["serverCode"]
+    verify_code(target[0], inventory)
+    output.mkdir(parents=True)
+    patched = order.build_bridge(output, target, args.java8)
+    expected_code = {"files": dict(inventory["files"])}
+    expected_code["files"][order.COREMODS.as_posix()] = {"sha256": digest(patched), "size": patched.stat().st_size}
+    expected_blocks = migrated_names(order.block_semantics(reference, "converted"))
+    if len(expected_blocks) != 358:
+        raise AssertionError("Archive has the wrong block witness count")
+    report = {"status": "RUNNING", "targetManifestSha256": digest(args.target_manifest),
+              "archive": str(args.archive.resolve()), "originalWorldHashes": fingerprint(source / WORLD),
+              "witnesses": len(expected_blocks), "orders": {}}
+    report_path = output / "native113-rebrand-order-results.json"
+    try:
+        for mode in ("bm-first", "pa-first"):
+            runtime = output / mode
+            launcher = prepare(runtime, target, [], args.port, source)
+            shutil.copy2(source / "actor-fixture.json", runtime / "actor-fixture.json")
+            shutil.copy2(patched, runtime / order.COREMODS)
+            (runtime / "transformer-order.mode").write_text(mode, encoding="ascii")
+            verify_code(runtime, expected_code)
+            report["orders"][mode] = phases = {}
+            backups = None
+            for phase in ("converted", "restarted"):
+                first = phase == "converted"
+                state, adapter, observations = order.checkpoint(runtime, args.java8, launcher, phase, first)
+                require_native_boot(runtime / f"console-{phase}.log")
+                verify_staged(runtime, target)
+                verify_code(runtime, expected_code)
+                state_expected = migrated_names(read_json(reference / f"semantic-{phase}.json"))
+                adapter_phase = "converted-adapter" if first else "restarted-adapter"
+                adapter_expected = migrated_names(read_json(reference / f"semantic-{adapter_phase}.json"))
+                check_turbine_id(runtime, phase, state)
+                check_turbine_id(runtime, adapter_phase if first else phase, adapter)
+                current_backups = backup_proof(source, runtime)
+                if backups is not None and current_backups != backups:
+                    raise AssertionError("Original migration backups changed during restart")
+                backups = current_backups
+                gates = [compare_exact(expected_blocks, order.block_semantics(runtime, phase)),
+                         compare_exact(state_expected, state), compare_exact(adapter_expected, adapter)]
+                phases[phase] = dict(blocks=gates[0], actors=gates[1], adapter=gates[2],
+                                     order=observations["order"], backups=backups)
+                write_json(report_path, report)
+                print(mode, phase, [gate["status"] for gate in gates], flush=True)
+        report["status"] = "PASS" if all(
+            item[name]["status"] == "PASS" for phases in report["orders"].values()
+            for item in phases.values() for name in ("blocks", "actors", "adapter", "order")) else "FAIL"
+    except Exception as failure:
+        report.update(status="FAIL", failure=str(failure))
+        raise
+    finally:
+        report["sourceUnchanged"] = all(fingerprint(path) == hashes for path, hashes in protected.items())
+        if not report["sourceUnchanged"]:
+            report["status"] = "FAIL"
+        write_json(report_path, report)
+    return int(report["status"] != "PASS")
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description=__doc__)
+    for flag in ("archive", "target-manifest", "java8", "output"):
+        parser.add_argument("--" + flag, type=Path, required=True)
+    parser.add_argument("--port", type=int, required=True)
+    raise SystemExit(run(parser.parse_args()))
diff --git a/test-rig/migration/native113_recipes.py b/test-rig/migration/native113_recipes.py
index 1ea3fbaf..7ea64868 100644
--- a/test-rig/migration/native113_recipes.py
+++ b/test-rig/migration/native113_recipes.py
@@ -23,7 +23,7 @@
 from recipe_unlocks import MATERIALS
 
 
-MOD_COUNTS = {"poweradvantage": 35, "steamadvantage": 24, "electricadvantage": 50}
+MOD_COUNTS = {"basepower": 35, "basesteam": 24, "baseelectric": 50}
 RECIPE_TYPES = {"minecraft:crafting_shaped", "minecraft:crafting_shapeless", "minecraft:smelting"}
 UNLOCK_BOOTS = (
     ("NORMAL", "normal", ("sweep", "persist")),
@@ -78,7 +78,7 @@ def recipe_fixture(jars):
 
 def native_target(manifest):
     entry = read_json(manifest)["target113"]
-    required = {"advantageworkstest", "poweradvantage", "steamadvantage", "electricadvantage", "basemetals", "orespawn"}
+    required = {"advantageworkstest", "basepower", "basesteam", "baseelectric", "basemetals", "orespawn"}
     if {jar["id"] for jar in entry["jars"]} != required:
         raise ValueError("This campaign requires exactly the native harness and five packaged mods")
     target = pinned_profile(manifest, "target113")
@@ -112,7 +112,7 @@ def stage_native(runtime, target, port, campaign):
 
 
 def configure(runtime, mode, rubber=True):
-    config = runtime / "config/poweradvantage-common.toml"
+    config = runtime / "config/basepower-common.toml"
     config.parent.mkdir(exist_ok=True)
     config.write_text(f'[options]\nrecipeMode = "{mode}"\nplasticEqualsRubber = {str(rubber).lower()}\n', encoding="utf-8")
 
diff --git a/test-rig/migration/native113_redstone_reload.py b/test-rig/migration/native113_redstone_reload.py
index d14e8299..d2aa600a 100644
--- a/test-rig/migration/native113_redstone_reload.py
+++ b/test-rig/migration/native113_redstone_reload.py
@@ -77,9 +77,9 @@ def rows_by_id(rows, holds):
         signal = holds and case["held"]
         require(row.get("signal") is signal, key + ": actual neighbor signal differs")
         require(row.get("holdBlock") == ("minecraft:redstone_block" if signal else "minecraft:air"), key + ": wrong hold block")
-        require(row.get("block") == "electricadvantage:electric_drill", key + ": stationary drill changed")
+        require(row.get("block") == "baseelectric:electric_drill", key + ": stationary drill changed")
         require(type(row.get("active")) is bool, key + ": missing actual ACTIVE")
-        state = "Block{electricadvantage:electric_drill}[active=" + str(row["active"]).lower() + ",facing=north]"
+        state = "Block{baseelectric:electric_drill}[active=" + str(row["active"]).lower() + ",facing=north]"
         require(row.get("state") == state, key + ": raw block state disagrees with ACTIVE/facing")
         require(isinstance(row.get("energy"), (int, float)) and math.isfinite(row["energy"])
                 and 0 <= row["energy"] <= 500, key + ": invalid finite reserve")
@@ -241,7 +241,7 @@ def pin(args):
         raise FileExistsError(destination)
     replacements = {"advantageworkstest": args.harness.resolve()}
     if args.electric_jar:
-        replacements["electricadvantage"] = args.electric_jar.resolve()
+        replacements["baseelectric"] = args.electric_jar.resolve()
     target = copy.deepcopy(document["target113"])
     require(set(replacements).issubset({jar["id"] for jar in target["jars"]}), "Missing replaced mod ID in base")
     sources = [(jar, replacements.get(jar["id"], (base.parent / jar["path"]).resolve())) for jar in target["jars"]]
diff --git a/test-rig/migration/native113_replay.py b/test-rig/migration/native113_replay.py
index aebbfc06..ae768d36 100644
--- a/test-rig/migration/native113_replay.py
+++ b/test-rig/migration/native113_replay.py
@@ -80,6 +80,9 @@ def probe(runner, operation, label):
     status, error = "FAIL", None
     try:
         with ExitStack() as context:
+            context.enter_context(patch.object(lifecycle, "NAMESPACES", {
+                "poweradvantage": "basepower", "steamadvantage": "basesteam", "electricadvantage": "baseelectric",
+            }))
             for item in (lifecycle, extended_lifecycle, pipe_only_lifecycle):
                 context.enter_context(patch.object(item, "profiles", lambda _: {"target113": target}))
                 context.enter_context(patch.object(item, "stage", stage))
diff --git a/test-rig/migration/oil_transfer.py b/test-rig/migration/oil_transfer.py
index 017e832b..cd54867d 100644
--- a/test-rig/migration/oil_transfer.py
+++ b/test-rig/migration/oil_transfer.py
@@ -24,8 +24,8 @@ def fixtures():
         output = [x + 12, y - 3, z]
         result.append({"id": f"OIL-{oil}-{tank}", "min": [x, 72, 2048], "max": [x + 31, 88, 2079],
                        "source": source, "drain": drain, "pipes": pipes, "output": output,
-                       "fluid": "poweradvantage:" + oil, "bucket": "poweradvantage:" + oil + "_bucket",
-                       "tank": "poweradvantage:" + tank, "witnesses": [source, drain, *pipes, output]})
+                       "fluid": "basepower:" + oil, "bucket": "basepower:" + oil + "_bucket",
+                       "tank": "basepower:" + tank, "witnesses": [source, drain, *pipes, output]})
     return result
 
 
@@ -37,10 +37,10 @@ def inspect(snapshot, definition, expected):
         drain = at(snapshot, f["id"], f["drain"])
         output = at(snapshot, f["id"], f["output"])
         require(source["block"] == "minecraft:air", f"Source not collected: {f['id']}")
-        require(drain["block"] == "poweradvantage:fluid_drain", f"Drain missing: {f['id']}")
+        require(drain["block"] == "basepower:fluid_drain", f"Drain missing: {f['id']}")
         require(output["block"] == f["tank"], f"Container changed: {f['id']}")
         for pos in f["pipes"]:
-            require(at(snapshot, f["id"], pos)["block"] == "poweradvantage:fluid_pipe", f"Pipe missing: {f['id']}")
+            require(at(snapshot, f["id"], pos)["block"] == "basepower:fluid_pipe", f"Pipe missing: {f['id']}")
         held = parse(drain).get("Tank", {}).get("Amount", 0)
         tank = parse(output).get("Tank", {})
         require(held == 0, f"Oil stuck in drain ({held} mB): {f['id']}")
@@ -87,8 +87,8 @@ def run(args):
         runner.probe("load", "oil-loaded")
         for f in definition:
             runner.command("fill " + " ".join(map(str, f["min"] + f["max"])) + " minecraft:air replace")
-            for pos in f["pipes"]: runner.block(pos, "poweradvantage:fluid_pipe")
-            runner.block(f["drain"], "poweradvantage:fluid_drain")
+            for pos in f["pipes"]: runner.block(pos, "basepower:fluid_pipe")
+            runner.block(f["drain"], "basepower:fluid_drain")
             runner.block(f["output"], f["tank"])
             x, y, z = f["source"]
             for dx, dz in ((-1, 0), (1, 0), (0, -1), (0, 1)):
diff --git a/test-rig/migration/progression.py b/test-rig/migration/progression.py
index 8197d1d4..34fd8bba 100644
--- a/test-rig/migration/progression.py
+++ b/test-rig/migration/progression.py
@@ -17,22 +17,22 @@
     "minecraft:gunpowder", "minecraft:flint", "minecraft:leather", "minecraft:string",
     "minecraft:feather", "minecraft:blaze_rod", "minecraft:ender_pearl", "minecraft:quartz",
     "basemetals:copper_ore", "basemetals:tin_ore", "basemetals:zinc_ore", "basemetals:lead_ore",
-    "basemetals:nickel_ore", "basemetals:silver_ore", "electricadvantage:li_ore",
-    "electricadvantage:sulfur_ore",
+    "basemetals:nickel_ore", "basemetals:silver_ore", "baseelectric:li_ore",
+    "baseelectric:sulfur_ore",
 ]
 
 EXCLUSIONS = {
-    "poweradvantage:infinite_steam": "Creative-only source, intentionally no survival recipe",
-    "poweradvantage:infinite_electricity": "Creative-only source, intentionally no survival recipe",
-    "poweradvantage:infinite_quantum": "Creative-only source, intentionally no survival recipe",
-    "poweradvantage:crude_oil": "World fluid block, placed and collected through its bucket",
-    "poweradvantage:refined_oil": "World fluid block, produced by distillation and placed through its bucket",
-    "poweradvantage:fluid_pipe_terminal": "Hidden state of an ordinary pipe adjacent to a fluid capability",
-    "steamadvantage:drillbit": "Hidden helper placed by a working steam drill; craft steam_drill_bit instead",
-    "steamadvantage:platform": "Elevator-generated helper with no block drops",
-    "steamadvantage:pump_pipe_steam": "Hidden helper created by a steam pump",
-    "electricadvantage:pump_pipe_electric": "Hidden helper created by an electric pump",
-    "electricadvantage:laser_turret_evil": "Hidden converted state of the craftable laser turret",
+    "basepower:infinite_steam": "Creative-only source, intentionally no survival recipe",
+    "basepower:infinite_electricity": "Creative-only source, intentionally no survival recipe",
+    "basepower:infinite_quantum": "Creative-only source, intentionally no survival recipe",
+    "basepower:crude_oil": "World fluid block, placed and collected through its bucket",
+    "basepower:refined_oil": "World fluid block, produced by distillation and placed through its bucket",
+    "basepower:fluid_pipe_terminal": "Hidden state of an ordinary pipe adjacent to a fluid capability",
+    "basesteam:drillbit": "Hidden helper placed by a working steam drill; craft steam_drill_bit instead",
+    "basesteam:platform": "Elevator-generated helper with no block drops",
+    "basesteam:pump_pipe_steam": "Hidden helper created by a steam pump",
+    "baseelectric:pump_pipe_electric": "Hidden helper created by an electric pump",
+    "baseelectric:laser_turret_evil": "Hidden converted state of the craftable laser turret",
 }
 
 
@@ -43,13 +43,13 @@ def fixture():
 
 def validate_tags(result, mode, rubber):
     tags = result["tags"]
-    assert "electricadvantage:electric_conduit" in tags["wires"]
+    assert "baseelectric:electric_conduit" in tags["wires"]
     assert {"basemetals:coal_powder", "basemetals:charcoal_powder"} <= set(tags["dusts/carbon"])
-    assert ("poweradvantage:bioplastic_ingot" in tags["rubber"]) == rubber
-    assert {"poweradvantage:bioplastic_ingot", "electricadvantage:petrolplastic_ingot"} <= set(tags["plastic"])
-    assert "electricadvantage:control_circuit" in tags["circuit_boards"]
-    assert "electricadvantage:blank_circuit_board" not in tags["circuit_boards"]
-    assert "electricadvantage:solder" in tags["solder"]
+    assert ("basepower:bioplastic_ingot" in tags["rubber"]) == rubber
+    assert {"basepower:bioplastic_ingot", "baseelectric:petrolplastic_ingot"} <= set(tags["plastic"])
+    assert "baseelectric:control_circuit" in tags["circuit_boards"]
+    assert "baseelectric:blank_circuit_board" not in tags["circuit_boards"]
+    assert "baseelectric:solder" in tags["solder"]
     for metal in ("lead", "tin", "silver"):
         assert (f"basemetals:{metal}_ingot" in tags["solder"]) == (mode == "NORMAL")
 
@@ -96,7 +96,7 @@ def run(args):
         for rubber in (True, False)]
     try:
         for mode, rubber in cases:
-            config = output / "config/poweradvantage-common.toml"
+            config = output / "config/basepower-common.toml"
             config.parent.mkdir(exist_ok=True)
             config.write_text(f'[options]\nrecipeMode = "{mode}"\nplasticEqualsRubber = {str(rubber).lower()}\n')
             for phase in ("initial", "restart"):
diff --git a/test-rig/migration/recipe_unlocks.py b/test-rig/migration/recipe_unlocks.py
index 936866fa..2b6a0a99 100644
--- a/test-rig/migration/recipe_unlocks.py
+++ b/test-rig/migration/recipe_unlocks.py
@@ -11,14 +11,14 @@
 MATERIALS = [
     "minecraft:iron_ingot", "basemetals:steel_ingot", "basemetals:copper_ingot",
     "basemetals:lead_ingot", "basemetals:brass_ingot", "basemetals:steel_bars",
-    "poweradvantage:steel_frame", "poweradvantage:fluid_pipe", "poweradvantage:item_conveyor",
-    "steamadvantage:steam_pipe", "poweradvantage:bioplastic_ingot", "basemetals:copper_rod",
-    "electricadvantage:silicon_ingot", "electricadvantage:integrated_circuit",
+    "basepower:steel_frame", "basepower:fluid_pipe", "basepower:item_conveyor",
+    "basesteam:steam_pipe", "basepower:bioplastic_ingot", "basemetals:copper_rod",
+    "baseelectric:silicon_ingot", "baseelectric:integrated_circuit",
     "basemetals:tin_powder", "minecraft:sand", "minecraft:gunpowder",
-    "basemetals:steel_plate", "electricadvantage:psu",
-    "poweradvantage:starch", "electricadvantage:li_ingot", "electricadvantage:li_nugget",
-    "electricadvantage:li_powder", "electricadvantage:li_ore",
-    "electricadvantage:silicon_mix", "electricadvantage:solder_mix",
+    "basemetals:steel_plate", "baseelectric:psu",
+    "basepower:starch", "baseelectric:li_ingot", "baseelectric:li_nugget",
+    "baseelectric:li_powder", "baseelectric:li_ore",
+    "baseelectric:silicon_mix", "baseelectric:solder_mix",
     "minecraft:potato",
 ]
 
@@ -26,13 +26,13 @@
 def fixture(extensions="both"):
     recipes = []
     for mod, root in (
-        ("poweradvantage", POWER),
-        ("steamadvantage", POWER.parent / "SteamAdvantage/SteamAdvantage"),
-        ("electricadvantage", POWER.parent / "ElectricAdvantage/ElectricAdvantage"),
+        ("basepower", POWER),
+        ("basesteam", POWER.parent / "SteamAdvantage/SteamAdvantage"),
+        ("baseelectric", POWER.parent / "ElectricAdvantage/ElectricAdvantage"),
     ):
-        if mod == "steamadvantage" and extensions not in ("both", "steam"):
+        if mod == "basesteam" and extensions not in ("both", "steam"):
             continue
-        if mod == "electricadvantage" and extensions not in ("both", "electric"):
+        if mod == "baseelectric" and extensions not in ("both", "electric"):
             continue
         data = root / "src/main/resources/data" / mod
         for file in sorted((data / "recipes").glob("*.json")):
@@ -60,9 +60,9 @@ def run(args):
     manifest = json.loads((RIG / "profiles" / (profile + ".json")).read_text())
     jars = []
     for mod in manifest["mods"]:
-        if mod["id"] == "steamadvantage" and args.extensions not in ("both", "steam"):
+        if mod["id"] == "basesteam" and args.extensions not in ("both", "steam"):
             continue
-        if mod["id"] == "electricadvantage" and args.extensions not in ("both", "electric"):
+        if mod["id"] == "baseelectric" and args.extensions not in ("both", "electric"):
             continue
         jar = (RIG / mod["path"]).resolve()
         if digest(jar) != mod["sha256"]:
@@ -79,7 +79,7 @@ def run(args):
               "inputs": json.loads((output / "input-jars.json").read_text())}
 
     def boot(mode, label, operations):
-        config = output / "config/poweradvantage-common.toml"
+        config = output / "config/basepower-common.toml"
         config.parent.mkdir(exist_ok=True)
         config.write_text(f'[options]\nrecipeMode = "{mode}"\n')
         server = Server(output, args.java8, launcher, label)
diff --git a/test-rig/migration/semantic_machine_audit.py b/test-rig/migration/semantic_machine_audit.py
index 535628ce..5a5e2b90 100644
--- a/test-rig/migration/semantic_machine_audit.py
+++ b/test-rig/migration/semantic_machine_audit.py
@@ -189,9 +189,14 @@ def audit_connected(root, ticks=512):
                 status="FAIL" if counts["FAIL"] else "INCOMPLETE" if counts["INCOMPLETE"] else "PASS")
 
 
-def endurance_batch(documents, definitions):
+def endurance_batch(documents, definitions, namespaces=None):
     """Check measured endpoint facts, not the ledger's asserted output counts."""
     failures, frames = [], {}
+    namespaces = namespaces or {}
+
+    def target_id(value):
+        namespace, separator, path = value.partition(":")
+        return namespaces.get(namespace, namespace) + separator + path
     try:
         for station, document in documents.items():
             if document.get("station") != station or not document.get("snapshot"):
@@ -222,7 +227,7 @@ def contents(station, relative):
             return counts
 
         for station, pos, neighbours, block, product, fuel in BATCH_MACHINES:
-            if at(station, pos)[0]["block"] != block: raise ValueError("Wrong processing machine")
+            if at(station, pos)[0]["block"] != target_id(block): raise ValueError("Wrong processing machine")
             counts = sum((contents(station, p) for p in (pos, *neighbours)), Counter())
             if fuel: counts.pop("minecraft:coal", None)
             if counts != {"minecraft:" + product: 4}: raise ValueError("Incorrect exact processing yield: " + block)
@@ -252,7 +257,7 @@ def contents(station, relative):
             amount = tank.get("Amount")
             if not isinstance(amount, int) or amount < 0 or "FluidName" not in tank: raise ValueError("Malformed oil amount/identity")
             if amount: fluids[tank["FluidName"]] += amount
-        if fluids != {"poweradvantage:refined_oil": 1000}: raise ValueError("Incorrect oil quantity/identity")
+        if fluids != {target_id("poweradvantage:refined_oil"): 1000}: raise ValueError("Incorrect oil quantity/identity")
     except (KeyError, ValueError, TypeError) as error:
         failures.append(str(error))
     return dict(status="FAIL" if failures else "PASS", failures=failures)
diff --git a/test-rig/migration/test_broad_result_audit.py b/test-rig/migration/test_broad_result_audit.py
index 2353916f..949d1d96 100644
--- a/test-rig/migration/test_broad_result_audit.py
+++ b/test-rig/migration/test_broad_result_audit.py
@@ -37,7 +37,7 @@ def setUp(self):
         self.stations = json.loads(definition)["stations"]
         self.definitions = {s["id"]: s for s in self.stations}
         jars = []
-        for name in ("poweradvantage", "steamadvantage", "electricadvantage", "advantageworkstest", "basemetals", "orespawn"):
+        for name in ("basepower", "basesteam", "baseelectric", "advantageworkstest", "basemetals", "orespawn"):
             path = self.root / (name + ".jar")
             if name == "advantageworkstest":
                 with zipfile.ZipFile(path, "w") as archive:
@@ -134,7 +134,7 @@ def drills(self, spec, moved):
         result = []
         for a in spec["assertions"]:
             block = a.get("block")
-            if block not in ("steamadvantage:steam_drill", "electricadvantage:electric_drill"):
+            if block not in ("basesteam:steam_drill", "baseelectric:electric_drill"):
                 continue
             direction = a.get("meta", audit.DIRECTIONS.index(a.get("expectedText", "down")))
             origin = [x + y for x, y in zip(spec["origin"], a["pos"])]
@@ -146,7 +146,7 @@ def drills(self, spec, moved):
                    + 'tag:{AdvBayStock:' + json.dumps(key) + '}}]}')
             result.append(dict(pos=pos, block=block, state="facing=" + audit.DIRECTIONS[direction], nbt=tag))
             if not moved:
-                result.append(dict(pos=rear, block="steamadvantage:steam_track" if spec["id"] == "S-05" else "electricadvantage:electric_track", state="track"))
+                result.append(dict(pos=rear, block="basesteam:steam_track" if spec["id"] == "S-05" else "baseelectric:electric_track", state="track"))
         return result
 
     def assert_rejected(self, contains=None, requested=audit.PROFILES):
@@ -240,7 +240,7 @@ def test_failed_assertion_cannot_hide_behind_manual(self):
         self.assert_rejected("wrong raw result")
 
     def test_loaded_mod_version_mismatch_rejected(self):
-        self.mutate_raw(lambda rows: rows["W-01"]["mods"].update(poweradvantage="wrong"))
+        self.mutate_raw(lambda rows: rows["W-01"]["mods"].update(basepower="wrong"))
         self.assert_rejected("loaded mod set")
 
     def test_error_and_shutdown_error_cannot_be_masked(self):
@@ -277,7 +277,7 @@ def test_native_drill_summary_is_not_the_measurement(self):
         self.assert_rejected("differs from native snapshots")
 
     def test_mod_bytes_and_staging_receipt_both_required(self):
-        (self.profile() / "mods/poweradvantage.jar").write_bytes(b"changed")
+        (self.profile() / "mods/basepower.jar").write_bytes(b"changed")
         self.assert_rejected("mod bytes differ")
 
     def test_extra_mod_rejected(self):
diff --git a/test-rig/migration/test_native113_harvest.py b/test-rig/migration/test_native113_harvest.py
index 6b2bb537..231231b5 100644
--- a/test-rig/migration/test_native113_harvest.py
+++ b/test-rig/migration/test_native113_harvest.py
@@ -47,6 +47,9 @@ def test_java_witness_inputs_masks_trial_counts_and_thresholds_are_unchanged(sel
         source = (Path(__file__).resolve().parents[1] /
                   "src/main/java/zone/moddev/mc/advantageworks/NativeHarvestProbe.java").read_text()
         region = source.split("        String sulfur =", 1)[1].split("        JsonObject solar =", 1)[0]
+        self.assertIn("baseelectric:sulfur_ore", region)
+        self.assertIn("basepower:steel_frame", region)
+        region = region.replace("baseelectric:", "electricadvantage:").replace("basepower:", "poweradvantage:")
         self.assertEqual("3FF0AC4C13CA1B737679F67128CE2F41C5A0873E89258D456628BA8A309BAA9A",
                          hashlib.sha256(region.encode()).hexdigest().upper())
         self.assertIn("Actual drop quantity changed: ", source)
diff --git a/test-rig/migration/test_native113_rebrand_order.py b/test-rig/migration/test_native113_rebrand_order.py
new file mode 100644
index 00000000..44f2943b
--- /dev/null
+++ b/test-rig/migration/test_native113_rebrand_order.py
@@ -0,0 +1,28 @@
+import unittest
+
+from native113_rebrand_order import compare_exact, migrated_names
+
+
+class RebrandOrderOracleTest(unittest.TestCase):
+    def test_old_oil_item_and_fluid_are_distinct(self):
+        saved = {
+            "Items": [{"id": "poweradvantage:crude_oil", "Count": 1, "Slot": 3,
+                       "tag": {"Witness": "poweradvantage:crude_oil"}}],
+            "Tank": {"FluidName": "poweradvantage:crude_oil", "Amount": 3250},
+        }
+        expected = migrated_names(saved)
+        self.assertEqual("basepower:crude_oil_bucket", expected["Items"][0]["id"])
+        self.assertEqual("basepower:crude_oil", expected["Tank"]["FluidName"])
+        self.assertEqual(3250, expected["Tank"]["Amount"])
+        self.assertEqual(3, expected["Items"][0]["Slot"])
+        self.assertEqual(saved["Items"][0]["tag"], expected["Items"][0]["tag"])
+
+    def test_missing_or_replaced_state_fails(self):
+        expected = {"id": "baseelectric:hydroturbine", "UUIDMost": 3}
+        for actual in ({"id": "electricadvantage:hydroturbine", "UUIDMost": 3},
+                       {"id": "baseelectric:hydroturbine", "UUIDMost": 4},
+                       {"id": "baseelectric:hydroturbine"},
+                       dict(expected, extra=True)):
+            with self.subTest(actual=actual):
+                self.assertEqual("FAIL", compare_exact(expected, actual)["status"])
+        self.assertEqual("PASS", compare_exact(expected, dict(expected))["status"])
diff --git a/test-rig/migration/test_native113_redstone_reload.py b/test-rig/migration/test_native113_redstone_reload.py
index ab33dd3a..01ab342a 100644
--- a/test-rig/migration/test_native113_redstone_reload.py
+++ b/test-rig/migration/test_native113_redstone_reload.py
@@ -14,13 +14,13 @@ def row(case, progress, held=False, energy=None, targeted=True):
     bits = struct.unpack(">i", struct.pack(">f", energy))[0]
     states = ','.join('{Name:"minecraft:obsidian"}' for _ in range(9))
     items = '{Slot:0b,id:"minecraft:dirt",Count:7b,tag:{AdvWorksWitness:"' + case["id"] + '"}},{Slot:1b,id:"minecraft:apple",Count:13b}'
-    nbt = ('{id:"electricadvantage:electric_drill",x:%d,y:%d,z:%d,Energy:[I;%d],progress:%ds,'
+    nbt = ('{id:"baseelectric:electric_drill",x:%d,y:%d,z:%d,Energy:[I;%d],progress:%ds,'
            'Items:[%s],targetX:%d,targetY:%d,targetZ:%d,TargetStates:[%s]}') % (
                x, y, z, bits, progress, items, x, y, z - 1, states)
     if not targeted:
         nbt = nbt[:nbt.index(',targetX:')] + '}'
-    return dict(case, block="electricadvantage:electric_drill", active=True,
-                state="Block{electricadvantage:electric_drill}[active=true,facing=north]",
+    return dict(case, block="baseelectric:electric_drill", active=True,
+                state="Block{baseelectric:electric_drill}[active=true,facing=north]",
                 signal=held, holdBlock="minecraft:redstone_block" if held else "minecraft:air",
                 energy=energy, progress=progress, nbt=nbt,
                 targets=[dict(pos=[x + dx, y + dy, z - 1], state="Block{minecraft:obsidian}")
diff --git a/test-rig/migration/test_oil_transfer.py b/test-rig/migration/test_oil_transfer.py
index 350b41b1..69fc993f 100644
--- a/test-rig/migration/test_oil_transfer.py
+++ b/test-rig/migration/test_oil_transfer.py
@@ -11,8 +11,8 @@ def sample(self):
         snapshot = {"cases": {}}
         for f in definition:
             rows = [{"pos": f["source"], "block": "minecraft:air"}]
-            rows.append({"pos": f["drain"], "block": "poweradvantage:fluid_drain", "tileIdentity": 1, "nbt": "{Tank:{Empty:1b}}"})
-            rows.extend({"pos": p, "block": "poweradvantage:fluid_pipe"} for p in f["pipes"])
+            rows.append({"pos": f["drain"], "block": "basepower:fluid_drain", "tileIdentity": 1, "nbt": "{Tank:{Empty:1b}}"})
+            rows.extend({"pos": p, "block": "basepower:fluid_pipe"} for p in f["pipes"])
             rows.append({"pos": f["output"], "block": f["tank"], "tileIdentity": 2,
                          "nbt": '{Tank:{Amount:1000,FluidName:"' + f["fluid"] + '"}}'})
             snapshot["cases"][f["id"]] = rows
@@ -31,7 +31,7 @@ def test_loss_duplication_and_stuck_fluid_fail(self):
         definition, original = self.sample()
         for amount in (0, 999, 1001, 2000):
             snapshot = copy.deepcopy(original)
-            snapshot["cases"][definition[0]["id"]][-1]["nbt"] = '{Tank:{Amount:' + str(amount) + ',FluidName:"poweradvantage:crude_oil"}}'
+            snapshot["cases"][definition[0]["id"]][-1]["nbt"] = '{Tank:{Amount:' + str(amount) + ',FluidName:"basepower:crude_oil"}}'
             with self.assertRaises(AssertionError): inspect(snapshot, definition, 1000)
         original["cases"][definition[0]["id"]][1]["nbt"] = '{Tank:{Amount:1}}'
         with self.assertRaises(AssertionError): inspect(original, definition, 1000)
diff --git a/test-rig/migration/test_progression.py b/test-rig/migration/test_progression.py
index 2c71d105..7cf7dd58 100644
--- a/test-rig/migration/test_progression.py
+++ b/test-rig/migration/test_progression.py
@@ -6,13 +6,13 @@ class ManufacturingOracleTest(unittest.TestCase):
     def test_natural_basis_cannot_supply_finished_advantage_parts(self):
         self.assertEqual(len(NATURAL_RESOURCES), len(set(NATURAL_RESOURCES)))
         advantage = [item for item in NATURAL_RESOURCES if item.split(":")[0]
-                     in ("poweradvantage", "steamadvantage", "electricadvantage")]
-        self.assertEqual(["electricadvantage:li_ore", "electricadvantage:sulfur_ore"], advantage)
+                     in ("basepower", "basesteam", "baseelectric")]
+        self.assertEqual(["baseelectric:li_ore", "baseelectric:sulfur_ore"], advantage)
         self.assertTrue(all(item.endswith("_ore") for item in NATURAL_RESOURCES if item.startswith("basemetals:")))
 
     def test_exclusions_do_not_hide_craftable_materials_or_machines(self):
-        for item in ("electricadvantage:psu", "poweradvantage:starch", "electricadvantage:li_nugget",
-                     "poweradvantage:converter_rf_quantum", "steamadvantage:steam_drill"):
+        for item in ("baseelectric:psu", "basepower:starch", "baseelectric:li_nugget",
+                     "basepower:converter_rf_quantum", "basesteam:steam_drill"):
             self.assertNotIn(item, EXCLUSIONS)
         self.assertEqual([16384, 78, 16384], fixture()["machineBounds"]["min"])
 
@@ -20,13 +20,13 @@ def test_tag_oracle_rejects_the_original_empty_tags_and_wrong_board(self):
         tags = {key: [] for key in ("wires", "dusts/carbon", "rubber", "plastic", "circuit_boards", "solder")}
         with self.assertRaises(AssertionError):
             validate_tags({"tags": tags}, "NORMAL", True)
-        tags.update({"wires": ["electricadvantage:electric_conduit"],
+        tags.update({"wires": ["baseelectric:electric_conduit"],
                      "dusts/carbon": ["basemetals:coal_powder", "basemetals:charcoal_powder"],
-                     "rubber": ["poweradvantage:bioplastic_ingot"],
-                     "plastic": ["poweradvantage:bioplastic_ingot", "electricadvantage:petrolplastic_ingot"],
-                     "circuit_boards": ["electricadvantage:control_circuit"],
-                     "solder": ["electricadvantage:solder"] + [f"basemetals:{m}_ingot" for m in ("lead", "tin", "silver")]})
+                     "rubber": ["basepower:bioplastic_ingot"],
+                     "plastic": ["basepower:bioplastic_ingot", "baseelectric:petrolplastic_ingot"],
+                     "circuit_boards": ["baseelectric:control_circuit"],
+                     "solder": ["baseelectric:solder"] + [f"basemetals:{m}_ingot" for m in ("lead", "tin", "silver")]})
         validate_tags({"tags": tags}, "NORMAL", True)
-        tags["circuit_boards"].append("electricadvantage:blank_circuit_board")
+        tags["circuit_boards"].append("baseelectric:blank_circuit_board")
         with self.assertRaises(AssertionError):
             validate_tags({"tags": tags}, "NORMAL", True)
diff --git a/test-rig/migration/test_recipe_unlocks.py b/test-rig/migration/test_recipe_unlocks.py
index f10bc2ea..1908fd2f 100644
--- a/test-rig/migration/test_recipe_unlocks.py
+++ b/test-rig/migration/test_recipe_unlocks.py
@@ -8,7 +8,7 @@ class RecipeUnlockRunnerTest(unittest.TestCase):
     def test_fixture_covers_crafting_and_smelting_but_not_crushing(self):
         recipes = fixture()["recipes"]
         self.assertEqual(Counter(recipe["id"].split(":")[0] for recipe in recipes),
-                         {"poweradvantage": 35, "steamadvantage": 24, "electricadvantage": 50})
+                         {"basepower": 35, "basesteam": 24, "baseelectric": 50})
         self.assertEqual(109, len({recipe["id"] for recipe in recipes}))
         self.assertTrue(all(":crushing_" not in recipe["id"] for recipe in recipes))
 
diff --git a/test-rig/migration/transformer-order-probe/TransformerOrderBridge.java b/test-rig/migration/transformer-order-probe/TransformerOrderBridge.java
index c44147e6..2ca129d7 100644
--- a/test-rig/migration/transformer-order-probe/TransformerOrderBridge.java
+++ b/test-rig/migration/transformer-order-probe/TransformerOrderBridge.java
@@ -56,7 +56,7 @@ public static List> configure(List> input) throw
         List natural = names(input);
         for (String suffix : SUFFIXES) {
             int bm = find(output, "basemetals_legacy_" + suffix);
-            int pa = find(output, "poweradvantage_legacy_" + suffix);
+            int pa = find(output, "poweradvantage_legacy_" + suffix, "basepower_legacy_" + suffix);
             if (!mode.equals("natural") && ((bm < pa) != mode.equals("bm-first"))) {
                 ITransformer saved = output.get(bm);
                 output.set(bm, output.get(pa));
@@ -80,14 +80,14 @@ public static List> configure(List> input) throw
         return output;
     }
 
-    private static int find(List> values, String expected) {
+    private static int find(List> values, String... expected) {
         int found = -1;
         for (int i = 0; i < values.size(); i++) {
-            if (!name(values.get(i)).equals(expected)) continue;
-            if (found != -1) throw new IllegalStateException("Duplicate transformer: " + expected);
+            if (!Arrays.asList(expected).contains(name(values.get(i)))) continue;
+            if (found != -1) throw new IllegalStateException("Duplicate transformer: " + Arrays.toString(expected));
             found = i;
         }
-        if (found == -1) throw new IllegalStateException("Missing transformer: " + expected);
+        if (found == -1) throw new IllegalStateException("Missing transformer: " + Arrays.toString(expected));
         return found;
     }
 
@@ -100,7 +100,8 @@ private static List names(List> values) {
     private static boolean selected(String name) {
         for (String suffix : SUFFIXES) {
             if (name.equals("basemetals_legacy_" + suffix)
-                    || name.equals("poweradvantage_legacy_" + suffix)) return true;
+                    || name.equals("poweradvantage_legacy_" + suffix)
+                    || name.equals("basepower_legacy_" + suffix)) return true;
         }
         return false;
     }
diff --git a/test-rig/migration/transformer_order.py b/test-rig/migration/transformer_order.py
index cc905186..5f53d6ef 100644
--- a/test-rig/migration/transformer_order.py
+++ b/test-rig/migration/transformer_order.py
@@ -208,7 +208,7 @@ def prepare_fixture(source, destination):
 def hook_mod(hook):
     if "/basemetals/" in hook["owner"]:
         return "bm"
-    if "/poweradvantage/" in hook["owner"]:
+    if "/poweradvantage/" in hook["owner"] or "/basepower/" in hook["owner"]:
         return "pa"
     raise AssertionError("Unexpected hook owner")
 
@@ -233,7 +233,12 @@ def order_evidence(runtime, mode, label=None):
     proof = {}
     for suffix, (class_name, methods) in SUFFIXES.items():
         applications = groups[class_name]
-        bm, pa = "basemetals_legacy_" + suffix, "poweradvantage_legacy_" + suffix
+        bm = "basemetals_legacy_" + suffix
+        candidates = [name for name in ("poweradvantage_legacy_" + suffix, "basepower_legacy_" + suffix)
+                      if name in registration["forced"]]
+        if len(candidates) != 1:
+            raise AssertionError(f"Expected exactly one Power migration transformer for {class_name}")
+        pa = candidates[0]
         expected = [n for n in registration["forced"] if n in (bm, pa)]
         requested = [bm, pa] if mode == "bm-first" else [pa, bm] if mode == "pa-first" else expected
         if expected != requested or [e["transformer"] for e in applications] != expected:
diff --git a/test-rig/profiles/dev-core-apocalyptic.json b/test-rig/profiles/dev-core-apocalyptic.json
index 39d2ce4f..9427f8a2 100644
--- a/test-rig/profiles/dev-core-apocalyptic.json
+++ b/test-rig/profiles/dev-core-apocalyptic.json
@@ -7,31 +7,30 @@
   "shutdownTimeoutSeconds": 60,
   "stationRunSeconds": 5,
   "recipeMode": "APOCALYPTIC",
-  "sourceCommit": "working-tree-from-40811a0",
-  "sourceVersion": "2.4.4.113021",
-  "lifecycleStations": [],
+  "sourceCommit": "working-tree-from-d4ebfea",
+  "sourceVersion": "2.4.5.113021",
   "mods": [
     {
       "id": "advantageworkstest",
       "version": "1.1.0.113021",
       "file": "AdvantageWorksTestHarness-1.1.0.113021-deobf.jar",
-      "path": "build/libs-dev/AdvantageWorksTestHarness-1.1.0.113021-deobf.jar",
+      "path": "build/gradle/libs-dev/AdvantageWorksTestHarness-1.1.0.113021-deobf.jar",
       "workspaceProduced": true,
-      "sha256": "5816997BCBE8C2061FB4815F59AAD038F8FD914BB413A050BD9FB2A588597952"
+      "sha256": "57A8A9020B864FD3E623F80951AE4614773FD3F80F72B163E43675EB187B99A3"
     },
     {
-      "id": "steamadvantage",
-      "version": "2.2.5.113021",
-      "file": "SteamAdvantage-2.2.5.113021-deobf.jar",
-      "path": "../../SteamAdvantage/SteamAdvantage/build/libs-dev/SteamAdvantage-2.2.5.113021-deobf.jar",
-      "sha256": "CD0FF2C4F79484211DF3BBF1CA63F48C43620FEB764390FAC614AD3DDE0AF5C3"
+      "id": "basesteam",
+      "version": "2.2.7.113021",
+      "file": "baseSteam-2.2.7.113021-deobf.jar",
+      "path": "../../SteamAdvantage/SteamAdvantage/build/libs-dev/baseSteam-2.2.7.113021-deobf.jar",
+      "sha256": "F56F3FC2DF9EEE77ACC50DF228FAD0A7ABCF02A57F864AB8B84348F8D033DF84"
     },
     {
-      "id": "electricadvantage",
-      "version": "2.2.5.113021",
-      "file": "ElectricAdvantage-2.2.5.113021-deobf.jar",
-      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs-dev/ElectricAdvantage-2.2.5.113021-deobf.jar",
-      "sha256": "5991D71D6C4FFD41968463C2E9D1D8941FAB2B65E0F9CF6E9412E7B0879373E5"
+      "id": "baseelectric",
+      "version": "2.2.7.113021",
+      "file": "baseElectric-2.2.7.113021-deobf.jar",
+      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs-dev/baseElectric-2.2.7.113021-deobf.jar",
+      "sha256": "620074389CE2CE432BBD27256CBBEF3D3195C66461002D10B36C65B7ECF39B18"
     }
   ]
 }
diff --git a/test-rig/profiles/dev-core-tech-progression.json b/test-rig/profiles/dev-core-tech-progression.json
index 2374298d..ecff5da9 100644
--- a/test-rig/profiles/dev-core-tech-progression.json
+++ b/test-rig/profiles/dev-core-tech-progression.json
@@ -7,31 +7,30 @@
   "shutdownTimeoutSeconds": 60,
   "stationRunSeconds": 5,
   "recipeMode": "TECH_PROGRESSION",
-  "sourceCommit": "working-tree-from-40811a0",
-  "sourceVersion": "2.4.4.113021",
-  "lifecycleStations": [],
+  "sourceCommit": "working-tree-from-d4ebfea",
+  "sourceVersion": "2.4.5.113021",
   "mods": [
     {
       "id": "advantageworkstest",
       "version": "1.1.0.113021",
       "file": "AdvantageWorksTestHarness-1.1.0.113021-deobf.jar",
-      "path": "build/libs-dev/AdvantageWorksTestHarness-1.1.0.113021-deobf.jar",
+      "path": "build/gradle/libs-dev/AdvantageWorksTestHarness-1.1.0.113021-deobf.jar",
       "workspaceProduced": true,
-      "sha256": "5816997BCBE8C2061FB4815F59AAD038F8FD914BB413A050BD9FB2A588597952"
+      "sha256": "57A8A9020B864FD3E623F80951AE4614773FD3F80F72B163E43675EB187B99A3"
     },
     {
-      "id": "steamadvantage",
-      "version": "2.2.5.113021",
-      "file": "SteamAdvantage-2.2.5.113021-deobf.jar",
-      "path": "../../SteamAdvantage/SteamAdvantage/build/libs-dev/SteamAdvantage-2.2.5.113021-deobf.jar",
-      "sha256": "CD0FF2C4F79484211DF3BBF1CA63F48C43620FEB764390FAC614AD3DDE0AF5C3"
+      "id": "basesteam",
+      "version": "2.2.7.113021",
+      "file": "baseSteam-2.2.7.113021-deobf.jar",
+      "path": "../../SteamAdvantage/SteamAdvantage/build/libs-dev/baseSteam-2.2.7.113021-deobf.jar",
+      "sha256": "F56F3FC2DF9EEE77ACC50DF228FAD0A7ABCF02A57F864AB8B84348F8D033DF84"
     },
     {
-      "id": "electricadvantage",
-      "version": "2.2.5.113021",
-      "file": "ElectricAdvantage-2.2.5.113021-deobf.jar",
-      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs-dev/ElectricAdvantage-2.2.5.113021-deobf.jar",
-      "sha256": "5991D71D6C4FFD41968463C2E9D1D8941FAB2B65E0F9CF6E9412E7B0879373E5"
+      "id": "baseelectric",
+      "version": "2.2.7.113021",
+      "file": "baseElectric-2.2.7.113021-deobf.jar",
+      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs-dev/baseElectric-2.2.7.113021-deobf.jar",
+      "sha256": "620074389CE2CE432BBD27256CBBEF3D3195C66461002D10B36C65B7ECF39B18"
     }
   ]
 }
diff --git a/test-rig/profiles/dev-core.json b/test-rig/profiles/dev-core.json
index 9cec5cbd..16e1201a 100644
--- a/test-rig/profiles/dev-core.json
+++ b/test-rig/profiles/dev-core.json
@@ -7,30 +7,30 @@
   "shutdownTimeoutSeconds": 60,
   "stationRunSeconds": 5,
   "recipeMode": "NORMAL",
-  "sourceCommit": "working-tree-from-40811a0",
-  "sourceVersion": "2.4.4.113021",
+  "sourceCommit": "working-tree-from-d4ebfea",
+  "sourceVersion": "2.4.5.113021",
   "mods": [
     {
       "id": "advantageworkstest",
       "version": "1.1.0.113021",
       "file": "AdvantageWorksTestHarness-1.1.0.113021-deobf.jar",
-      "path": "build/libs-dev/AdvantageWorksTestHarness-1.1.0.113021-deobf.jar",
+      "path": "build/gradle/libs-dev/AdvantageWorksTestHarness-1.1.0.113021-deobf.jar",
       "workspaceProduced": true,
-      "sha256": "5816997BCBE8C2061FB4815F59AAD038F8FD914BB413A050BD9FB2A588597952"
+      "sha256": "57A8A9020B864FD3E623F80951AE4614773FD3F80F72B163E43675EB187B99A3"
     },
     {
-      "id": "steamadvantage",
-      "version": "2.2.5.113021",
-      "file": "SteamAdvantage-2.2.5.113021-deobf.jar",
-      "path": "../../SteamAdvantage/SteamAdvantage/build/libs-dev/SteamAdvantage-2.2.5.113021-deobf.jar",
-      "sha256": "CD0FF2C4F79484211DF3BBF1CA63F48C43620FEB764390FAC614AD3DDE0AF5C3"
+      "id": "basesteam",
+      "version": "2.2.7.113021",
+      "file": "baseSteam-2.2.7.113021-deobf.jar",
+      "path": "../../SteamAdvantage/SteamAdvantage/build/libs-dev/baseSteam-2.2.7.113021-deobf.jar",
+      "sha256": "F56F3FC2DF9EEE77ACC50DF228FAD0A7ABCF02A57F864AB8B84348F8D033DF84"
     },
     {
-      "id": "electricadvantage",
-      "version": "2.2.5.113021",
-      "file": "ElectricAdvantage-2.2.5.113021-deobf.jar",
-      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs-dev/ElectricAdvantage-2.2.5.113021-deobf.jar",
-      "sha256": "5991D71D6C4FFD41968463C2E9D1D8941FAB2B65E0F9CF6E9412E7B0879373E5"
+      "id": "baseelectric",
+      "version": "2.2.7.113021",
+      "file": "baseElectric-2.2.7.113021-deobf.jar",
+      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs-dev/baseElectric-2.2.7.113021-deobf.jar",
+      "sha256": "620074389CE2CE432BBD27256CBBEF3D3195C66461002D10B36C65B7ECF39B18"
     }
   ]
 }
diff --git a/test-rig/profiles/packaged-current.json b/test-rig/profiles/packaged-current.json
index 77b3684a..b16d7cb8 100644
--- a/test-rig/profiles/packaged-current.json
+++ b/test-rig/profiles/packaged-current.json
@@ -7,8 +7,8 @@
   "shutdownTimeoutSeconds": 60,
   "stationRunSeconds": 5,
   "recipeMode": "NORMAL",
-  "sourceCommit": "working-tree-from-40811a0",
-  "sourceVersion": "2.4.4.113021",
+  "sourceCommit": "working-tree-from-d4ebfea",
+  "sourceVersion": "2.4.5.113021",
   "forge": {
     "version": "1.13.2-25.0.223",
     "installerPath": ".cache/forge-1.13.2-25.0.223-installer.jar",
@@ -20,30 +20,30 @@
       "id": "advantageworkstest",
       "version": "1.1.0.113021",
       "file": "AdvantageWorksTestHarness-1.1.0.113021.jar",
-      "path": "build/libs/AdvantageWorksTestHarness-1.1.0.113021.jar",
-      "sha256": "2A260DF4B66454B57ECB6B021BCF26B3A812CA5FC0A8B9C4C9E904879AA67A1C",
+      "path": "build/gradle/libs/AdvantageWorksTestHarness-1.1.0.113021.jar",
+      "sha256": "D3612632090D7CAB2DF87AB7F51C603A6E4ABDFE20F838A224547AC5E63ECDBE",
       "workspaceProduced": true
     },
     {
-      "id": "poweradvantage",
-      "version": "2.4.4.113021",
-      "file": "PowerAdvantage-2.4.4.113021.jar",
-      "path": "../build/libs/PowerAdvantage-2.4.4.113021.jar",
-      "sha256": "E5B62769812AE02393A305CF33D2E168BFB2B6D370AB04D43409B94F5740D193"
+      "id": "basepower",
+      "version": "2.4.5.113021",
+      "file": "basePower-2.4.5.113021.jar",
+      "path": "../build/libs/basePower-2.4.5.113021.jar",
+      "sha256": "99A99E103AE23C5C4DD831FFDF3E4C5AFDB89307224B08529B7AD94807A34DDF"
     },
     {
-      "id": "steamadvantage",
-      "version": "2.2.5.113021",
-      "file": "SteamAdvantage-2.2.5.113021.jar",
-      "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.5.113021.jar",
-      "sha256": "A87F141913D511DB025FEE6D6FBA4000098598D8692B4BA53E7E80C67B14ACCA"
+      "id": "basesteam",
+      "version": "2.2.7.113021",
+      "file": "baseSteam-2.2.7.113021.jar",
+      "path": "../../SteamAdvantage/SteamAdvantage/build/libs/baseSteam-2.2.7.113021.jar",
+      "sha256": "435787C910F6B297E20FB0777CD4DB9154AEEBC19E816D563AE7802773DEAD97"
     },
     {
-      "id": "electricadvantage",
-      "version": "2.2.5.113021",
-      "file": "ElectricAdvantage-2.2.5.113021.jar",
-      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.5.113021.jar",
-      "sha256": "C785155C05133D1A408613D2C9738A32C9818E31C2599ECBD9F2FE76965DB5BA"
+      "id": "baseelectric",
+      "version": "2.2.7.113021",
+      "file": "baseElectric-2.2.7.113021.jar",
+      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/baseElectric-2.2.7.113021.jar",
+      "sha256": "C8DADD930C76C054D8B999712A9010E54836BBAEA7AA060B087127166932846E"
     },
     {
       "id": "basemetals",
diff --git a/test-rig/profiles/packaged-decoupled.json b/test-rig/profiles/packaged-decoupled.json
index 145f8050..5975f6b0 100644
--- a/test-rig/profiles/packaged-decoupled.json
+++ b/test-rig/profiles/packaged-decoupled.json
@@ -7,8 +7,8 @@
   "shutdownTimeoutSeconds": 60,
   "stationRunSeconds": 5,
   "recipeMode": "NORMAL",
-  "sourceCommit": "working-tree-from-40811a0",
-  "sourceVersion": "2.4.4.113021",
+  "sourceCommit": "working-tree-from-d4ebfea",
+  "sourceVersion": "2.4.5.113021",
   "forge": {
     "version": "1.13.2-25.0.223",
     "installerPath": ".cache/forge-1.13.2-25.0.223-installer.jar",
@@ -20,30 +20,30 @@
       "id": "advantageworkstest",
       "version": "1.1.0.113021",
       "file": "AdvantageWorksTestHarness-1.1.0.113021.jar",
-      "path": "build/libs/AdvantageWorksTestHarness-1.1.0.113021.jar",
+      "path": "build/gradle/libs/AdvantageWorksTestHarness-1.1.0.113021.jar",
       "workspaceProduced": true,
-      "sha256": "2A260DF4B66454B57ECB6B021BCF26B3A812CA5FC0A8B9C4C9E904879AA67A1C"
+      "sha256": "D3612632090D7CAB2DF87AB7F51C603A6E4ABDFE20F838A224547AC5E63ECDBE"
     },
     {
-      "id": "poweradvantage",
-      "version": "2.4.4.113021",
-      "file": "PowerAdvantage-2.4.4.113021.jar",
-      "path": "../build/libs/PowerAdvantage-2.4.4.113021.jar",
-      "sha256": "E5B62769812AE02393A305CF33D2E168BFB2B6D370AB04D43409B94F5740D193"
+      "id": "basepower",
+      "version": "2.4.5.113021",
+      "file": "basePower-2.4.5.113021.jar",
+      "path": "../build/libs/basePower-2.4.5.113021.jar",
+      "sha256": "99A99E103AE23C5C4DD831FFDF3E4C5AFDB89307224B08529B7AD94807A34DDF"
     },
     {
-      "id": "steamadvantage",
-      "version": "2.2.5.113021",
-      "file": "SteamAdvantage-2.2.5.113021.jar",
-      "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.5.113021.jar",
-      "sha256": "A87F141913D511DB025FEE6D6FBA4000098598D8692B4BA53E7E80C67B14ACCA"
+      "id": "basesteam",
+      "version": "2.2.7.113021",
+      "file": "baseSteam-2.2.7.113021.jar",
+      "path": "../../SteamAdvantage/SteamAdvantage/build/libs/baseSteam-2.2.7.113021.jar",
+      "sha256": "435787C910F6B297E20FB0777CD4DB9154AEEBC19E816D563AE7802773DEAD97"
     },
     {
-      "id": "electricadvantage",
-      "version": "2.2.5.113021",
-      "file": "ElectricAdvantage-2.2.5.113021.jar",
-      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.5.113021.jar",
-      "sha256": "C785155C05133D1A408613D2C9738A32C9818E31C2599ECBD9F2FE76965DB5BA"
+      "id": "baseelectric",
+      "version": "2.2.7.113021",
+      "file": "baseElectric-2.2.7.113021.jar",
+      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/baseElectric-2.2.7.113021.jar",
+      "sha256": "C8DADD930C76C054D8B999712A9010E54836BBAEA7AA060B087127166932846E"
     },
     {
       "id": "orespawn",
diff --git a/test-rig/profiles/packaged-mineralogy.json b/test-rig/profiles/packaged-mineralogy.json
index a46186ea..e75110a2 100644
--- a/test-rig/profiles/packaged-mineralogy.json
+++ b/test-rig/profiles/packaged-mineralogy.json
@@ -7,8 +7,8 @@
   "shutdownTimeoutSeconds": 60,
   "stationRunSeconds": 5,
   "recipeMode": "NORMAL",
-  "sourceCommit": "working-tree-from-40811a0",
-  "sourceVersion": "2.4.4.113021",
+  "sourceCommit": "working-tree-from-d4ebfea",
+  "sourceVersion": "2.4.5.113021",
   "forge": {
     "version": "1.13.2-25.0.223",
     "installerPath": ".cache/forge-1.13.2-25.0.223-installer.jar",
@@ -20,30 +20,30 @@
       "id": "advantageworkstest",
       "version": "1.1.0.113021",
       "file": "AdvantageWorksTestHarness-1.1.0.113021.jar",
-      "path": "build/libs/AdvantageWorksTestHarness-1.1.0.113021.jar",
+      "path": "build/gradle/libs/AdvantageWorksTestHarness-1.1.0.113021.jar",
       "workspaceProduced": true,
-      "sha256": "2A260DF4B66454B57ECB6B021BCF26B3A812CA5FC0A8B9C4C9E904879AA67A1C"
+      "sha256": "D3612632090D7CAB2DF87AB7F51C603A6E4ABDFE20F838A224547AC5E63ECDBE"
     },
     {
-      "id": "poweradvantage",
-      "version": "2.4.4.113021",
-      "file": "PowerAdvantage-2.4.4.113021.jar",
-      "path": "../build/libs/PowerAdvantage-2.4.4.113021.jar",
-      "sha256": "E5B62769812AE02393A305CF33D2E168BFB2B6D370AB04D43409B94F5740D193"
+      "id": "basepower",
+      "version": "2.4.5.113021",
+      "file": "basePower-2.4.5.113021.jar",
+      "path": "../build/libs/basePower-2.4.5.113021.jar",
+      "sha256": "99A99E103AE23C5C4DD831FFDF3E4C5AFDB89307224B08529B7AD94807A34DDF"
     },
     {
-      "id": "steamadvantage",
-      "version": "2.2.5.113021",
-      "file": "SteamAdvantage-2.2.5.113021.jar",
-      "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.5.113021.jar",
-      "sha256": "A87F141913D511DB025FEE6D6FBA4000098598D8692B4BA53E7E80C67B14ACCA"
+      "id": "basesteam",
+      "version": "2.2.7.113021",
+      "file": "baseSteam-2.2.7.113021.jar",
+      "path": "../../SteamAdvantage/SteamAdvantage/build/libs/baseSteam-2.2.7.113021.jar",
+      "sha256": "435787C910F6B297E20FB0777CD4DB9154AEEBC19E816D563AE7802773DEAD97"
     },
     {
-      "id": "electricadvantage",
-      "version": "2.2.5.113021",
-      "file": "ElectricAdvantage-2.2.5.113021.jar",
-      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.5.113021.jar",
-      "sha256": "C785155C05133D1A408613D2C9738A32C9818E31C2599ECBD9F2FE76965DB5BA"
+      "id": "baseelectric",
+      "version": "2.2.7.113021",
+      "file": "baseElectric-2.2.7.113021.jar",
+      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/baseElectric-2.2.7.113021.jar",
+      "sha256": "C8DADD930C76C054D8B999712A9010E54836BBAEA7AA060B087127166932846E"
     },
     {
       "id": "orespawn",
diff --git a/test-rig/profiles/packaged-optional-power.json b/test-rig/profiles/packaged-optional-power.json
index 9000cbb5..34660751 100644
--- a/test-rig/profiles/packaged-optional-power.json
+++ b/test-rig/profiles/packaged-optional-power.json
@@ -7,8 +7,8 @@
   "shutdownTimeoutSeconds": 60,
   "stationRunSeconds": 5,
   "recipeMode": "NORMAL",
-  "sourceCommit": "working-tree-from-40811a0",
-  "sourceVersion": "2.4.4.113021",
+  "sourceCommit": "working-tree-from-d4ebfea",
+  "sourceVersion": "2.4.5.113021",
   "forge": {
     "version": "1.13.2-25.0.223",
     "installerPath": ".cache/forge-1.13.2-25.0.223-installer.jar",
@@ -20,30 +20,30 @@
       "id": "advantageworkstest",
       "version": "1.1.0.113021",
       "file": "AdvantageWorksTestHarness-1.1.0.113021.jar",
-      "path": "build/libs/AdvantageWorksTestHarness-1.1.0.113021.jar",
+      "path": "build/gradle/libs/AdvantageWorksTestHarness-1.1.0.113021.jar",
       "workspaceProduced": true,
-      "sha256": "2A260DF4B66454B57ECB6B021BCF26B3A812CA5FC0A8B9C4C9E904879AA67A1C"
+      "sha256": "D3612632090D7CAB2DF87AB7F51C603A6E4ABDFE20F838A224547AC5E63ECDBE"
     },
     {
-      "id": "poweradvantage",
-      "version": "2.4.4.113021",
-      "file": "PowerAdvantage-2.4.4.113021.jar",
-      "path": "../build/libs/PowerAdvantage-2.4.4.113021.jar",
-      "sha256": "E5B62769812AE02393A305CF33D2E168BFB2B6D370AB04D43409B94F5740D193"
+      "id": "basepower",
+      "version": "2.4.5.113021",
+      "file": "basePower-2.4.5.113021.jar",
+      "path": "../build/libs/basePower-2.4.5.113021.jar",
+      "sha256": "99A99E103AE23C5C4DD831FFDF3E4C5AFDB89307224B08529B7AD94807A34DDF"
     },
     {
-      "id": "steamadvantage",
-      "version": "2.2.5.113021",
-      "file": "SteamAdvantage-2.2.5.113021.jar",
-      "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.5.113021.jar",
-      "sha256": "A87F141913D511DB025FEE6D6FBA4000098598D8692B4BA53E7E80C67B14ACCA"
+      "id": "basesteam",
+      "version": "2.2.7.113021",
+      "file": "baseSteam-2.2.7.113021.jar",
+      "path": "../../SteamAdvantage/SteamAdvantage/build/libs/baseSteam-2.2.7.113021.jar",
+      "sha256": "435787C910F6B297E20FB0777CD4DB9154AEEBC19E816D563AE7802773DEAD97"
     },
     {
-      "id": "electricadvantage",
-      "version": "2.2.5.113021",
-      "file": "ElectricAdvantage-2.2.5.113021.jar",
-      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.5.113021.jar",
-      "sha256": "C785155C05133D1A408613D2C9738A32C9818E31C2599ECBD9F2FE76965DB5BA"
+      "id": "baseelectric",
+      "version": "2.2.7.113021",
+      "file": "baseElectric-2.2.7.113021.jar",
+      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/baseElectric-2.2.7.113021.jar",
+      "sha256": "C8DADD930C76C054D8B999712A9010E54836BBAEA7AA060B087127166932846E"
     },
     {
       "id": "orespawn",
diff --git a/test-rig/profiles/worldgen-advantage.json b/test-rig/profiles/worldgen-advantage.json
index 5d1c3347..1d83e737 100644
--- a/test-rig/profiles/worldgen-advantage.json
+++ b/test-rig/profiles/worldgen-advantage.json
@@ -5,8 +5,8 @@
   "startupTimeoutSeconds": 180,
   "stationRunSeconds": 5,
   "recipeMode": "NORMAL",
-  "sourceCommit": "working-tree-from-40811a0",
-  "sourceVersion": "2.4.4.113021",
+  "sourceCommit": "working-tree-from-d4ebfea",
+  "sourceVersion": "2.4.5.113021",
   "forge": {
     "version": "1.13.2-25.0.223",
     "installerPath": ".cache/forge-1.13.2-25.0.223-installer.jar",
@@ -18,30 +18,30 @@
       "id": "advantageworkstest",
       "version": "1.1.0.113021",
       "file": "AdvantageWorksTestHarness-1.1.0.113021.jar",
-      "path": "build/libs/AdvantageWorksTestHarness-1.1.0.113021.jar",
+      "path": "build/gradle/libs/AdvantageWorksTestHarness-1.1.0.113021.jar",
       "workspaceProduced": true,
-      "sha256": "2A260DF4B66454B57ECB6B021BCF26B3A812CA5FC0A8B9C4C9E904879AA67A1C"
+      "sha256": "D3612632090D7CAB2DF87AB7F51C603A6E4ABDFE20F838A224547AC5E63ECDBE"
     },
     {
-      "id": "poweradvantage",
-      "version": "2.4.4.113021",
-      "file": "PowerAdvantage-2.4.4.113021.jar",
-      "path": "../build/libs/PowerAdvantage-2.4.4.113021.jar",
-      "sha256": "E5B62769812AE02393A305CF33D2E168BFB2B6D370AB04D43409B94F5740D193"
+      "id": "basepower",
+      "version": "2.4.5.113021",
+      "file": "basePower-2.4.5.113021.jar",
+      "path": "../build/libs/basePower-2.4.5.113021.jar",
+      "sha256": "99A99E103AE23C5C4DD831FFDF3E4C5AFDB89307224B08529B7AD94807A34DDF"
     },
     {
-      "id": "steamadvantage",
-      "version": "2.2.5.113021",
-      "file": "SteamAdvantage-2.2.5.113021.jar",
-      "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.5.113021.jar",
-      "sha256": "A87F141913D511DB025FEE6D6FBA4000098598D8692B4BA53E7E80C67B14ACCA"
+      "id": "basesteam",
+      "version": "2.2.7.113021",
+      "file": "baseSteam-2.2.7.113021.jar",
+      "path": "../../SteamAdvantage/SteamAdvantage/build/libs/baseSteam-2.2.7.113021.jar",
+      "sha256": "435787C910F6B297E20FB0777CD4DB9154AEEBC19E816D563AE7802773DEAD97"
     },
     {
-      "id": "electricadvantage",
-      "version": "2.2.5.113021",
-      "file": "ElectricAdvantage-2.2.5.113021.jar",
-      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.5.113021.jar",
-      "sha256": "C785155C05133D1A408613D2C9738A32C9818E31C2599ECBD9F2FE76965DB5BA"
+      "id": "baseelectric",
+      "version": "2.2.7.113021",
+      "file": "baseElectric-2.2.7.113021.jar",
+      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/baseElectric-2.2.7.113021.jar",
+      "sha256": "C8DADD930C76C054D8B999712A9010E54836BBAEA7AA060B087127166932846E"
     },
     {
       "id": "orespawn",
@@ -65,7 +65,7 @@
     {
       "id": "desert-oil-visible",
       "section": "fluid_deposits",
-      "entry": "poweradvantage:fluid_deposit/desert_crude_oil",
+      "entry": "basepower:fluid_deposit/desert_crude_oil",
       "present": true,
       "field": "enabled",
       "expectedBoolean": true
@@ -73,15 +73,15 @@
     {
       "id": "desert-oil-owner",
       "section": "fluid_deposits",
-      "entry": "poweradvantage:fluid_deposit/desert_crude_oil",
+      "entry": "basepower:fluid_deposit/desert_crude_oil",
       "present": true,
       "field": "source_provider",
-      "expectedString": "poweradvantage"
+      "expectedString": "basepower"
     },
     {
       "id": "electric-sulfur-default",
       "section": "ores",
-      "entry": "electricadvantage:ore/sulfur",
+      "entry": "baseelectric:ore/sulfur",
       "present": true,
       "field": "enabled",
       "expectedBoolean": true
@@ -89,7 +89,7 @@
     {
       "id": "electric-lithium-default",
       "section": "ores",
-      "entry": "electricadvantage:ore/lithium",
+      "entry": "baseelectric:ore/lithium",
       "present": true,
       "field": "enabled",
       "expectedBoolean": true
@@ -98,13 +98,13 @@
   "profileMutations": [
     {
       "section": "fluid_deposits",
-      "entry": "poweradvantage:fluid_deposit/desert_crude_oil",
+      "entry": "basepower:fluid_deposit/desert_crude_oil",
       "field": "enabled",
       "booleanValue": false
     },
     {
       "section": "ores",
-      "entry": "electricadvantage:ore/sulfur",
+      "entry": "baseelectric:ore/sulfur",
       "field": "enabled",
       "booleanValue": false
     }
@@ -113,7 +113,7 @@
     {
       "id": "desert-oil-user-disable-persists",
       "section": "fluid_deposits",
-      "entry": "poweradvantage:fluid_deposit/desert_crude_oil",
+      "entry": "basepower:fluid_deposit/desert_crude_oil",
       "present": true,
       "field": "enabled",
       "expectedBoolean": false
@@ -121,7 +121,7 @@
     {
       "id": "electric-sulfur-user-disable-persists",
       "section": "ores",
-      "entry": "electricadvantage:ore/sulfur",
+      "entry": "baseelectric:ore/sulfur",
       "present": true,
       "field": "enabled",
       "expectedBoolean": false
@@ -129,7 +129,7 @@
     {
       "id": "electric-lithium-remains-enabled",
       "section": "ores",
-      "entry": "electricadvantage:ore/lithium",
+      "entry": "baseelectric:ore/lithium",
       "present": true,
       "field": "enabled",
       "expectedBoolean": true
@@ -137,9 +137,9 @@
   ],
   "worldgenExpectations": {
     "minimumCounts": {
-      "poweradvantage:crude_oil": 1,
-      "electricadvantage:li_ore": 1,
-      "electricadvantage:sulfur_ore": 1
+      "basepower:crude_oil": 1,
+      "baseelectric:li_ore": 1,
+      "baseelectric:sulfur_ore": 1
     },
     "maximumCounts": {
       "mineralogy:crude_oil": 0,
diff --git a/test-rig/profiles/worldgen-legacy-import.json b/test-rig/profiles/worldgen-legacy-import.json
index a11328bb..9d0d4925 100644
--- a/test-rig/profiles/worldgen-legacy-import.json
+++ b/test-rig/profiles/worldgen-legacy-import.json
@@ -5,8 +5,8 @@
   "startupTimeoutSeconds": 180,
   "stationRunSeconds": 5,
   "recipeMode": "NORMAL",
-  "sourceCommit": "working-tree-from-40811a0",
-  "sourceVersion": "2.4.4.113021",
+  "sourceCommit": "working-tree-from-d4ebfea",
+  "sourceVersion": "2.4.5.113021",
   "forge": {
     "version": "1.13.2-25.0.223",
     "installerPath": ".cache/forge-1.13.2-25.0.223-installer.jar",
@@ -18,30 +18,30 @@
       "id": "advantageworkstest",
       "version": "1.1.0.113021",
       "file": "AdvantageWorksTestHarness-1.1.0.113021.jar",
-      "path": "build/libs/AdvantageWorksTestHarness-1.1.0.113021.jar",
+      "path": "build/gradle/libs/AdvantageWorksTestHarness-1.1.0.113021.jar",
       "workspaceProduced": true,
-      "sha256": "2A260DF4B66454B57ECB6B021BCF26B3A812CA5FC0A8B9C4C9E904879AA67A1C"
+      "sha256": "D3612632090D7CAB2DF87AB7F51C603A6E4ABDFE20F838A224547AC5E63ECDBE"
     },
     {
-      "id": "poweradvantage",
-      "version": "2.4.4.113021",
-      "file": "PowerAdvantage-2.4.4.113021.jar",
-      "path": "../build/libs/PowerAdvantage-2.4.4.113021.jar",
-      "sha256": "E5B62769812AE02393A305CF33D2E168BFB2B6D370AB04D43409B94F5740D193"
+      "id": "basepower",
+      "version": "2.4.5.113021",
+      "file": "basePower-2.4.5.113021.jar",
+      "path": "../build/libs/basePower-2.4.5.113021.jar",
+      "sha256": "99A99E103AE23C5C4DD831FFDF3E4C5AFDB89307224B08529B7AD94807A34DDF"
     },
     {
-      "id": "steamadvantage",
-      "version": "2.2.5.113021",
-      "file": "SteamAdvantage-2.2.5.113021.jar",
-      "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.5.113021.jar",
-      "sha256": "A87F141913D511DB025FEE6D6FBA4000098598D8692B4BA53E7E80C67B14ACCA"
+      "id": "basesteam",
+      "version": "2.2.7.113021",
+      "file": "baseSteam-2.2.7.113021.jar",
+      "path": "../../SteamAdvantage/SteamAdvantage/build/libs/baseSteam-2.2.7.113021.jar",
+      "sha256": "435787C910F6B297E20FB0777CD4DB9154AEEBC19E816D563AE7802773DEAD97"
     },
     {
-      "id": "electricadvantage",
-      "version": "2.2.5.113021",
-      "file": "ElectricAdvantage-2.2.5.113021.jar",
-      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.5.113021.jar",
-      "sha256": "C785155C05133D1A408613D2C9738A32C9818E31C2599ECBD9F2FE76965DB5BA"
+      "id": "baseelectric",
+      "version": "2.2.7.113021",
+      "file": "baseElectric-2.2.7.113021.jar",
+      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/baseElectric-2.2.7.113021.jar",
+      "sha256": "C8DADD930C76C054D8B999712A9010E54836BBAEA7AA060B087127166932846E"
     },
     {
       "id": "orespawn",
@@ -60,7 +60,7 @@
   "buildWorks": false,
   "worldgenSampleRadius": 8,
   "stableWorldgenCountExclusions": [
-    "poweradvantage:crude_oil"
+    "basepower:crude_oil"
   ],
   "shutdownTimeoutSeconds": 300,
   "lifecycleStations": [],
@@ -78,7 +78,7 @@
     {
       "id": "legacy-oil-retained",
       "section": "ores",
-      "entry": "poweradvantage:legacy/poweradvantage_crude_oil_0",
+      "entry": "basepower:legacy/basepower_crude_oil_0",
       "present": true,
       "field": "enabled",
       "expectedBoolean": true
@@ -86,7 +86,7 @@
     {
       "id": "legacy-lithium-retained",
       "section": "ores",
-      "entry": "electricadvantage:legacy/electricadvantage_li_ore_0",
+      "entry": "baseelectric:legacy/baseelectric_li_ore_0",
       "present": true,
       "field": "enabled",
       "expectedBoolean": true
@@ -94,7 +94,7 @@
     {
       "id": "legacy-sulfur-retained",
       "section": "ores",
-      "entry": "electricadvantage:legacy/electricadvantage_sulfur_ore_1",
+      "entry": "baseelectric:legacy/baseelectric_sulfur_ore_1",
       "present": true,
       "field": "enabled",
       "expectedBoolean": true
@@ -102,19 +102,19 @@
     {
       "id": "modern-oil-not-duplicated",
       "section": "fluid_deposits",
-      "entry": "poweradvantage:fluid_deposit/desert_crude_oil",
+      "entry": "basepower:fluid_deposit/desert_crude_oil",
       "present": false
     },
     {
       "id": "modern-lithium-not-duplicated",
       "section": "ores",
-      "entry": "electricadvantage:ore/lithium",
+      "entry": "baseelectric:ore/lithium",
       "present": false
     },
     {
       "id": "modern-sulfur-not-duplicated",
       "section": "ores",
-      "entry": "electricadvantage:ore/sulfur",
+      "entry": "baseelectric:ore/sulfur",
       "present": false
     }
   ],
@@ -122,7 +122,7 @@
     {
       "id": "legacy-oil-retained",
       "section": "ores",
-      "entry": "poweradvantage:legacy/poweradvantage_crude_oil_0",
+      "entry": "basepower:legacy/basepower_crude_oil_0",
       "present": true,
       "field": "enabled",
       "expectedBoolean": true
@@ -130,7 +130,7 @@
     {
       "id": "legacy-lithium-retained",
       "section": "ores",
-      "entry": "electricadvantage:legacy/electricadvantage_li_ore_0",
+      "entry": "baseelectric:legacy/baseelectric_li_ore_0",
       "present": true,
       "field": "enabled",
       "expectedBoolean": true
@@ -138,7 +138,7 @@
     {
       "id": "legacy-sulfur-retained",
       "section": "ores",
-      "entry": "electricadvantage:legacy/electricadvantage_sulfur_ore_1",
+      "entry": "baseelectric:legacy/baseelectric_sulfur_ore_1",
       "present": true,
       "field": "enabled",
       "expectedBoolean": true
@@ -146,19 +146,19 @@
     {
       "id": "modern-oil-not-duplicated",
       "section": "fluid_deposits",
-      "entry": "poweradvantage:fluid_deposit/desert_crude_oil",
+      "entry": "basepower:fluid_deposit/desert_crude_oil",
       "present": false
     },
     {
       "id": "modern-lithium-not-duplicated",
       "section": "ores",
-      "entry": "electricadvantage:ore/lithium",
+      "entry": "baseelectric:ore/lithium",
       "present": false
     },
     {
       "id": "modern-sulfur-not-duplicated",
       "section": "ores",
-      "entry": "electricadvantage:ore/sulfur",
+      "entry": "baseelectric:ore/sulfur",
       "present": false
     }
   ],
@@ -171,14 +171,14 @@
     },
     {
       "id": "power-provider",
-      "path": "config/poweradvantage-orespawn.json",
-      "contains": "poweradvantage:legacy/poweradvantage_crude_oil_0",
+      "path": "config/basepower-orespawn.json",
+      "contains": "basepower:legacy/basepower_crude_oil_0",
       "minimumOccurrences": 1
     },
     {
       "id": "electric-provider",
-      "path": "config/electricadvantage-orespawn.json",
-      "contains": "electricadvantage:legacy/electricadvantage_li_ore_0",
+      "path": "config/baseelectric-orespawn.json",
+      "contains": "baseelectric:legacy/baseelectric_li_ore_0",
       "minimumOccurrences": 1
     }
   ],
@@ -191,22 +191,22 @@
     },
     {
       "id": "power-provider",
-      "path": "config/poweradvantage-orespawn.json",
-      "contains": "poweradvantage:legacy/poweradvantage_crude_oil_0",
+      "path": "config/basepower-orespawn.json",
+      "contains": "basepower:legacy/basepower_crude_oil_0",
       "minimumOccurrences": 1
     },
     {
       "id": "electric-provider",
-      "path": "config/electricadvantage-orespawn.json",
-      "contains": "electricadvantage:legacy/electricadvantage_li_ore_0",
+      "path": "config/baseelectric-orespawn.json",
+      "contains": "baseelectric:legacy/baseelectric_li_ore_0",
       "minimumOccurrences": 1
     }
   ],
   "worldgenExpectations": {
     "minimumCounts": {
-      "poweradvantage:crude_oil": 1,
-      "electricadvantage:li_ore": 1,
-      "electricadvantage:sulfur_ore": 1
+      "basepower:crude_oil": 1,
+      "baseelectric:li_ore": 1,
+      "baseelectric:sulfur_ore": 1
     },
     "maximumCounts": {
       "mineralogy:crude_oil": 0,
diff --git a/test-rig/profiles/worldgen-mineralogy.json b/test-rig/profiles/worldgen-mineralogy.json
index 45fcf3cd..d4756458 100644
--- a/test-rig/profiles/worldgen-mineralogy.json
+++ b/test-rig/profiles/worldgen-mineralogy.json
@@ -5,8 +5,8 @@
   "startupTimeoutSeconds": 180,
   "stationRunSeconds": 5,
   "recipeMode": "NORMAL",
-  "sourceCommit": "working-tree-from-40811a0",
-  "sourceVersion": "2.4.4.113021",
+  "sourceCommit": "working-tree-from-d4ebfea",
+  "sourceVersion": "2.4.5.113021",
   "forge": {
     "version": "1.13.2-25.0.223",
     "installerPath": ".cache/forge-1.13.2-25.0.223-installer.jar",
@@ -18,30 +18,30 @@
       "id": "advantageworkstest",
       "version": "1.1.0.113021",
       "file": "AdvantageWorksTestHarness-1.1.0.113021.jar",
-      "path": "build/libs/AdvantageWorksTestHarness-1.1.0.113021.jar",
+      "path": "build/gradle/libs/AdvantageWorksTestHarness-1.1.0.113021.jar",
       "workspaceProduced": true,
-      "sha256": "2A260DF4B66454B57ECB6B021BCF26B3A812CA5FC0A8B9C4C9E904879AA67A1C"
+      "sha256": "D3612632090D7CAB2DF87AB7F51C603A6E4ABDFE20F838A224547AC5E63ECDBE"
     },
     {
-      "id": "poweradvantage",
-      "version": "2.4.4.113021",
-      "file": "PowerAdvantage-2.4.4.113021.jar",
-      "path": "../build/libs/PowerAdvantage-2.4.4.113021.jar",
-      "sha256": "E5B62769812AE02393A305CF33D2E168BFB2B6D370AB04D43409B94F5740D193"
+      "id": "basepower",
+      "version": "2.4.5.113021",
+      "file": "basePower-2.4.5.113021.jar",
+      "path": "../build/libs/basePower-2.4.5.113021.jar",
+      "sha256": "99A99E103AE23C5C4DD831FFDF3E4C5AFDB89307224B08529B7AD94807A34DDF"
     },
     {
-      "id": "steamadvantage",
-      "version": "2.2.5.113021",
-      "file": "SteamAdvantage-2.2.5.113021.jar",
-      "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.5.113021.jar",
-      "sha256": "A87F141913D511DB025FEE6D6FBA4000098598D8692B4BA53E7E80C67B14ACCA"
+      "id": "basesteam",
+      "version": "2.2.7.113021",
+      "file": "baseSteam-2.2.7.113021.jar",
+      "path": "../../SteamAdvantage/SteamAdvantage/build/libs/baseSteam-2.2.7.113021.jar",
+      "sha256": "435787C910F6B297E20FB0777CD4DB9154AEEBC19E816D563AE7802773DEAD97"
     },
     {
-      "id": "electricadvantage",
-      "version": "2.2.5.113021",
-      "file": "ElectricAdvantage-2.2.5.113021.jar",
-      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.5.113021.jar",
-      "sha256": "C785155C05133D1A408613D2C9738A32C9818E31C2599ECBD9F2FE76965DB5BA"
+      "id": "baseelectric",
+      "version": "2.2.7.113021",
+      "file": "baseElectric-2.2.7.113021.jar",
+      "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/baseElectric-2.2.7.113021.jar",
+      "sha256": "C8DADD930C76C054D8B999712A9010E54836BBAEA7AA060B087127166932846E"
     },
     {
       "id": "orespawn",
@@ -73,7 +73,7 @@
     {
       "id": "desert-oil-enabled",
       "section": "fluid_deposits",
-      "entry": "poweradvantage:fluid_deposit/desert_crude_oil",
+      "entry": "basepower:fluid_deposit/desert_crude_oil",
       "present": true,
       "field": "enabled",
       "expectedBoolean": true
@@ -97,7 +97,7 @@
     {
       "id": "electric-sulfur-disabled",
       "section": "ores",
-      "entry": "electricadvantage:ore/sulfur",
+      "entry": "baseelectric:ore/sulfur",
       "present": true,
       "field": "enabled",
       "expectedBoolean": false
@@ -105,7 +105,7 @@
     {
       "id": "electric-lithium-fallback-enabled",
       "section": "ores",
-      "entry": "electricadvantage:ore/lithium",
+      "entry": "baseelectric:ore/lithium",
       "present": true,
       "field": "enabled",
       "expectedBoolean": true
@@ -114,7 +114,7 @@
   "profileMutations": [
     {
       "section": "ores",
-      "entry": "electricadvantage:ore/sulfur",
+      "entry": "baseelectric:ore/sulfur",
       "field": "enabled",
       "booleanValue": true
     }
@@ -123,7 +123,7 @@
     {
       "id": "electric-sulfur-user-enable-persists",
       "section": "ores",
-      "entry": "electricadvantage:ore/sulfur",
+      "entry": "baseelectric:ore/sulfur",
       "present": true,
       "field": "enabled",
       "expectedBoolean": true
@@ -147,13 +147,13 @@
   ],
   "worldgenExpectations": {
     "minimumCounts": {
-      "poweradvantage:crude_oil": 1,
+      "basepower:crude_oil": 1,
       "mineralogy:crude_oil": 1,
       "mineralogy:sulfur_ore": 1,
-      "electricadvantage:li_ore": 1
+      "baseelectric:li_ore": 1
     },
     "maximumCounts": {
-      "electricadvantage:sulfur_ore": 0
+      "baseelectric:sulfur_ore": 0
     },
     "zeroBiomeViolations": true
   }
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/BatteryOperationalCases.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/BatteryOperationalCases.java
index 357dc98f..40abf799 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/BatteryOperationalCases.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/BatteryOperationalCases.java
@@ -15,10 +15,10 @@ static void register(List cases) {
             cases.add(new MachineScenario("electric/battery-chemistry-" + chemistry,
                     "Each battery chemistry supplies a real LED from finite item NBT, retaining its rated capacity and exact energy debit", 160,
                     c -> {
-                        c.block(7, 4, 8, "electricadvantage:electric_battery_array");
-                        c.put(7, 4, 8, 0, "electricadvantage:" + chemistry + "_battery", 1);
+                        c.block(7, 4, 8, "baseelectric:electric_battery_array");
+                        c.put(7, 4, 8, 0, "baseelectric:" + chemistry + "_battery", 1);
                         c.inventory(7, 4, 8).getStackInSlot(0).getOrCreateTag().setFloat("energy", 10);
-                        c.block(8, 4, 8, "electricadvantage:led_bar");
+                        c.block(8, 4, 8, "baseelectric:led_bar");
                     }, c -> {
                         PoweredEntity array = (PoweredEntity)c.tile(7, 4, 8);
                         c.require(array.getEnergyCapacity(new ConduitType("electricity")) == capacity, "rated battery capacity retained");
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/BayDrillAssertions.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/BayDrillAssertions.java
index 0b82ebee..e8cce169 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/BayDrillAssertions.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/BayDrillAssertions.java
@@ -11,8 +11,8 @@ final class BayDrillAssertions {
     private BayDrillAssertions() { }
 
     static boolean applies(WorksDefinition.Station station, WorksDefinition.Assertion assertion) {
-        return ("S-05".equals(station.id) && "steamadvantage:steam_drill".equals(assertion.block))
-                || ("E-06".equals(station.id) && "electricadvantage:electric_drill".equals(assertion.block));
+        return ("S-05".equals(station.id) && "basesteam:steam_drill".equals(assertion.block))
+                || ("E-06".equals(station.id) && "baseelectric:electric_drill".equals(assertion.block));
     }
 
     static int[] rearTrack(WorksDefinition.Station station, WorksDefinition.Assertion assertion) {
@@ -22,8 +22,8 @@ static int[] rearTrack(WorksDefinition.Station station, WorksDefinition.Assertio
         if (direction < 0 || direction >= REAR.length) throw new IllegalArgumentException("Invalid drill facing");
         int[] rear = assertion.pos.clone();
         for (int i = 0; i < 3; i++) rear[i] += REAR[direction][i];
-        String track = assertion.block.startsWith("steamadvantage:")
-                ? "steamadvantage:steam_track" : "electricadvantage:electric_track";
+        String track = assertion.block.startsWith("basesteam:")
+                ? "basesteam:steam_track" : "baseelectric:electric_track";
         if (station.placements.stream().noneMatch(p -> track.equals(p.block) && Arrays.equals(p.pos, rear))) {
             throw new IllegalArgumentException("Drill bay has no declared rear track");
         }
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/ElectricOperationalCases.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/ElectricOperationalCases.java
index 840cfbbd..eb70a779 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/ElectricOperationalCases.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/ElectricOperationalCases.java
@@ -24,7 +24,7 @@
 
 /** Independent operating contracts. Only setup seeds inputs; all work uses world ticks. */
 public final class ElectricOperationalCases {
-    private static final String EA = "electricadvantage:";
+    private static final String EA = "baseelectric:";
     private static final String ELECTRICITY = "electricity";
     private static final String GREENHOUSE = "greenhouse";
     private static final int Y = 2;
@@ -165,7 +165,7 @@ private static void refinery(List cases) {
                         int x = CELLS[i];
                         c.block(x, Y, Z, EA + "plastic_refinery");
                         if (i != 1) c.electricSupply(x - 1, Y, Z, 4000);
-                        if (i != 2) reserve(c, x, Y, Z, "getTank", "poweradvantage:refined_oil", i == 4 ? 99 : 200);
+                        if (i != 2) reserve(c, x, Y, Z, "getTank", "basepower:refined_oil", i == 4 ? 99 : 200);
                     }
                     rejectFluid(c, CELLS[2], "minecraft:water", 200);
                     c.put(CELLS[3], Y, Z, 0, EA + "petrolplastic_ingot", 64);
@@ -189,15 +189,15 @@ private static void still(List cases) {
                         int x = CELLS[i];
                         c.block(x, Y, Z, EA + "electric_still");
                         if (i != 1) c.electricSupply(x - 1, Y, Z, 1000);
-                        if (i != 2) reserve(c, x, Y, Z, "getInputTank", "poweradvantage:crude_oil", i == 4 ? 1 : 40);
+                        if (i != 2) reserve(c, x, Y, Z, "getInputTank", "basepower:crude_oil", i == 4 ? 1 : 40);
                     }
                     rejectFluid(c, CELLS[2], "minecraft:water", 40);
-                    reserve(c, CELLS[3], Y, Z, "getOutputTank", "poweradvantage:refined_oil", 1000);
+                    reserve(c, CELLS[3], Y, Z, "getOutputTank", "basepower:refined_oil", 1000);
                     equal(c, "setup.fullOutput", tankAmount(c, CELLS[3], 1), 1000);
                 }, c -> {
                     equal(c, "positive.input", tankAmount(c, CELLS[0], 0), 0);
                     equal(c, "positive.output", tankAmount(c, CELLS[0], 1), 20);
-                    fluidIs(c, CELLS[0], 1, "poweradvantage:refined_oil");
+                    fluidIs(c, CELLS[0], 1, "basepower:refined_oil");
                     close(c, "positive.energyDebit", 1000 - pairEnergy(c, CELLS[0]), 320, 0.01f);
                     for (int i = 1; i < CELLS.length; i++) {
                         equal(c, "negative" + i + ".input", tankAmount(c, CELLS[i], 0), i == 2 ? 0 : i == 4 ? 1 : 40);
@@ -210,7 +210,7 @@ private static void still(List cases) {
                 + "mutation. The 48 finite mB then operate on natural ticks, making 24 mB refined oil for 384 electricity.", 80, c -> {
                     c.block(8, Y, Z, EA + "electric_still");
                     c.electricSupply(7, Y, Z, 1000);
-                    net.minecraft.fluid.Fluid oil = net.minecraft.util.registry.IRegistry.field_212619_h.func_212608_b(new ResourceLocation("poweradvantage:crude_oil"));
+                    net.minecraft.fluid.Fluid oil = net.minecraft.util.registry.IRegistry.field_212619_h.func_212608_b(new ResourceLocation("basepower:crude_oil"));
                     c.require(oil != null, "Crude oil exists for faced automation");
                     int stored = 0;
                     for (EnumFacing face : EnumFacing.values()) {
@@ -224,12 +224,12 @@ private static void still(List cases) {
                 }, c -> {
                     equal(c, "faced.input", tankAmount(c, 8, 0), 0);
                     equal(c, "faced.output", tankAmount(c, 8, 1), 24);
-                    fluidIs(c, 8, 1, "poweradvantage:refined_oil");
+                    fluidIs(c, 8, 1, "basepower:refined_oil");
                     close(c, "faced.energyDebit", 1000 - pairEnergy(c, 8), 384, 0.01f);
                     for (EnumFacing face : EnumFacing.values()) {
                         FluidStack simulated = fluids(c, 8, face).drain(24, false);
                         equal(c, "face." + face + ".drainable", simulated == null ? 0 : simulated.amount, 24);
-                        c.require(new ResourceLocation("poweradvantage:refined_oil").equals(
+                        c.require(new ResourceLocation("basepower:refined_oil").equals(
                                 net.minecraft.util.registry.IRegistry.field_212619_h.getKey(simulated.getFluid())),
                                 "Face offers the real refined product " + face);
                         equal(c, "face." + face + ".drainSimulationUnchanged", tankAmount(c, 8, 1), 24);
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/LifecycleProbe.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/LifecycleProbe.java
index 8aa01670..eed2b4c9 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/LifecycleProbe.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/LifecycleProbe.java
@@ -29,7 +29,7 @@
 import net.minecraftforge.event.world.ChunkEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
-import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry;
+import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry;
 
 /** Observes real tile movement and chunk lifecycles only in marked disposable worlds. */
 final class LifecycleProbe {
@@ -71,7 +71,7 @@ static void validate(Fixture fixture) {
             throw new IllegalArgumentException("Missing witnesses");
         for (int[] pos : fixture.witnesses) requireInside(fixture, pos);
         if (fixture.bucket != null) {
-            if (!fixture.bucket.matches("poweradvantage:(crude|refined)_oil_bucket"))
+            if (!fixture.bucket.matches("basepower:(crude|refined)_oil_bucket"))
                 throw new IllegalArgumentException("Unsupported oil bucket");
             requireInside(fixture, fixture.source);
             if (fixture.source[1] >= fixture.max[1])
@@ -97,8 +97,8 @@ static void validate(Fixture fixture) {
             for (int axis = 0; axis < 3; axis++) distance += Math.abs(fixture.from[axis] - fixture.to[axis]);
             if ((fixture.route == null && distance != 1) || fixture.initialEnergy <= 0 || !Float.isFinite(fixture.initialEnergy))
                 throw new IllegalArgumentException("Invalid movement fixture");
-            if (!"steamadvantage:steam_drill".equals(fixture.block)
-                    && !"electricadvantage:electric_drill".equals(fixture.block))
+            if (!"basesteam:steam_drill".equals(fixture.block)
+                    && !"baseelectric:electric_drill".equals(fixture.block))
                 throw new IllegalArgumentException("Not an Advantage drill");
             if (fixture.route != null) {
                 if (fixture.route.size() < 2 || fixture.route.size() > 8 || fixture.controls == null
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/MachineContext.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/MachineContext.java
index e7966872..45c2a549 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/MachineContext.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/MachineContext.java
@@ -179,14 +179,14 @@ float energy(int x, int y, int z, String type) {
     }
 
     void steamSupply(int x, int y, int z, float reserve) {
-        block(x, y, z, "steamadvantage:steam_tank");
+        block(x, y, z, "basesteam:steam_tank");
         power(x, y, z, "steam", reserve);
     }
 
     void electricSupply(int x, int y, int z, float reserve) {
         if (!Float.isFinite(reserve) || reserve < 0 || reserve > 8000) throw new IllegalArgumentException("Invalid battery reserve");
-        block(x, y, z, "electricadvantage:electric_battery_array");
-        put(x, y, z, 0, "electricadvantage:lithium_battery", 1);
+        block(x, y, z, "baseelectric:electric_battery_array");
+        put(x, y, z, 0, "baseelectric:lithium_battery", 1);
         inventory(x, y, z).getStackInSlot(0).getOrCreateTag().setFloat("energy", reserve);
         inventory(x, y, z).markDirty();
     }
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/NativeHarvestProbe.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/NativeHarvestProbe.java
index a15c02da..7c7ed90f 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/NativeHarvestProbe.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/NativeHarvestProbe.java
@@ -110,12 +110,12 @@ private static void witness(WorldServer world, EntityPlayerMP player, JsonArray
                 require(world.setBlockState(POS, requested, 2), "Cannot place harvest witness");
                 IBlockState state = world.getBlockState(POS);
                 require(state.equals(requested), "Native connection state changed before mining");
-                boolean expectedSolid = blockId.endsWith("_ore") || blockId.equals("electricadvantage:electric_conduit");
+                boolean expectedSolid = blockId.endsWith("_ore") || blockId.equals("baseelectric:electric_conduit");
                 require(state.isSolid() == expectedSolid, "Legacy solid/non-solid property changed");
                 row.addProperty("actualSolid", state.isSolid());
                 boolean fullCollision = !VoxelShapes.compare(state.getCollisionShape(world, POS),
                         VoxelShapes.fullCube(), IBooleanFunction.NOT_SAME);
-                require(fullCollision != blockId.equals("electricadvantage:electric_conduit"),
+                require(fullCollision != blockId.equals("baseelectric:electric_conduit"),
                         "Legacy wire/frame/scaffold collision geometry changed");
                 row.addProperty("fullCollision", fullCollision);
                 if (level >= 0) require(state.getHarvestTool() == ToolType.PICKAXE
@@ -174,11 +174,11 @@ private static void run(WorldServer world, String label) throws Exception {
         };
         player.setPosition(POS.getX() + 0.5, POS.getY() + 1, POS.getZ() + 0.5);
         JsonArray rows = new JsonArray();
-        String sulfur = "electricadvantage:sulfur_ore", lithium = "electricadvantage:li_ore";
+        String sulfur = "baseelectric:sulfur_ore", lithium = "baseelectric:li_ore";
         witness(world, player, rows, "sulfur/hand-fails", sulfur, 0, null, false, false, "", 0, 0, 1);
         witness(world, player, rows, "sulfur/axe-fails", sulfur, 0, Items.IRON_AXE, false, false, "", 0, 0, 1);
-        witness(world, player, rows, "sulfur/wood", sulfur, 0, Items.WOODEN_PICKAXE, false, true, "electricadvantage:sulfur_powder", 1, 4, 8);
-        witness(world, player, rows, "sulfur/stone", sulfur, 0, Items.STONE_PICKAXE, false, true, "electricadvantage:sulfur_powder", 1, 4, 8);
+        witness(world, player, rows, "sulfur/wood", sulfur, 0, Items.WOODEN_PICKAXE, false, true, "baseelectric:sulfur_powder", 1, 4, 8);
+        witness(world, player, rows, "sulfur/stone", sulfur, 0, Items.STONE_PICKAXE, false, true, "baseelectric:sulfur_powder", 1, 4, 8);
         witness(world, player, rows, "sulfur/silk", sulfur, 0, Items.WOODEN_PICKAXE, true, true, sulfur, 1, 1, 1);
         witness(world, player, rows, "lithium/hand-fails", lithium, 1, null, false, false, "", 0, 0, 1);
         witness(world, player, rows, "lithium/wood-fails", lithium, 1, Items.WOODEN_PICKAXE, false, false, "", 0, 0, 1);
@@ -187,11 +187,11 @@ private static void run(WorldServer world, String label) throws Exception {
         witness(world, player, rows, "lithium/stone", lithium, 1, Items.STONE_PICKAXE, false, true, lithium, 1, 1, 1);
         witness(world, player, rows, "lithium/diamond", lithium, 1, Items.DIAMOND_PICKAXE, false, true, lithium, 1, 1, 1);
         witness(world, player, rows, "lithium/silk", lithium, 1, Items.STONE_PICKAXE, true, true, lithium, 1, 1, 1);
-        witness(world, player, rows, "frame/hand", "poweradvantage:steel_frame", -1, null, false, true, "poweradvantage:steel_frame", 1, 1, 1);
-        witness(world, player, rows, "frame/silk", "poweradvantage:steel_frame", -1, Items.DIAMOND_PICKAXE, true, true, "poweradvantage:steel_frame", 1, 1, 1);
+        witness(world, player, rows, "frame/hand", "basepower:steel_frame", -1, null, false, true, "basepower:steel_frame", 1, 1, 1);
+        witness(world, player, rows, "frame/silk", "basepower:steel_frame", -1, Items.DIAMOND_PICKAXE, true, true, "basepower:steel_frame", 1, 1, 1);
         for (int mask = 0; mask < 64; mask++) {
             for (String family : new String[] {"wire", "scaffold"}) {
-                String identity = "electricadvantage:" + (family.equals("wire") ? "electric_conduit" : "electric_track");
+                String identity = "baseelectric:" + (family.equals("wire") ? "electric_conduit" : "electric_track");
                 String prefix = family + "/" + mask;
                 witness(world, player, rows, prefix + "/hand", identity, -1, null, false, true, identity, 1, 1, 1, mask);
                 witness(world, player, rows, prefix + "/silk", identity, -1, Items.DIAMOND_PICKAXE, true, true, identity, 1, 1, 1, mask);
@@ -200,7 +200,7 @@ private static void run(WorldServer world, String label) throws Exception {
         JsonObject solar = new JsonObject();
         solar.addProperty("id", "solar/native-solidity");
         try {
-            Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation("electricadvantage:photovoltaic_generator"));
+            Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation("baseelectric:photovoltaic_generator"));
             require(block != null && block != net.minecraft.init.Blocks.AIR, "Missing native photovoltaic block");
             world.setBlockState(POS, block.getDefaultState(), 2);
             require(world.getBlockState(POS).isSolid(), "Legacy photovoltaic solid=true was lost");
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/PowerOperationalCases.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/PowerOperationalCases.java
index 42666ae3..d49587e5 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/PowerOperationalCases.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/PowerOperationalCases.java
@@ -15,7 +15,7 @@ static void register(List cases) {
                 "power/conveyor/locked-" + (sourceLocked ? "source" : "destination"),
                 "Automation must not bypass a vanilla chest lock, at either end of the belt", 160,
                 c -> {
-                    conveyor(c, "poweradvantage:item_conveyor"); c.put(4, 2, 5, 0, "minecraft:dirt", 16);
+                    conveyor(c, "basepower:item_conveyor"); c.put(4, 2, 5, 0, "minecraft:dirt", 16);
                     net.minecraft.nbt.NBTTagCompound lock = new net.minecraft.nbt.NBTTagCompound(); lock.setString("Lock", "Works key");
                     c.seed(sourceLocked ? 4 : 6, 2, 5, lock);
                 }, c -> {
@@ -28,7 +28,7 @@ static void register(List cases) {
                     "A finite 16 dirt reaches the chest in the declared direction, without loss or extra items", 200,
                     c -> {
                         BlockPos offset = BlockPos.ORIGIN.offset(direction);
-                        c.block(8, 6, 8, "poweradvantage:item_conveyor"); c.facing(8, 6, 8, direction.getName());
+                        c.block(8, 6, 8, "basepower:item_conveyor"); c.facing(8, 6, 8, direction.getName());
                         c.block(8 - offset.getX(), 6 - offset.getY(), 8 - offset.getZ(), "minecraft:chest");
                         c.block(8 + offset.getX(), 6 + offset.getY(), 8 + offset.getZ(), "minecraft:chest");
                         c.put(8 - offset.getX(), 6 - offset.getY(), 8 - offset.getZ(), 0, "minecraft:dirt", 16);
@@ -40,14 +40,14 @@ static void register(List cases) {
                     }));
         }
         cases.add(new MachineScenario("power/conveyor/blocked", "Full output retains every dirt item in source or belt", 200,
-                c -> { conveyor(c, "poweradvantage:item_conveyor"); c.put(4, 2, 5, 0, "minecraft:dirt", 16); full(c, 6, 2, 5); },
+                c -> { conveyor(c, "basepower:item_conveyor"); c.put(4, 2, 5, 0, "minecraft:dirt", 16); full(c, 6, 2, 5); },
                 c -> {
                     c.require(c.count(4, 2, 5, "minecraft:dirt") + c.count(5, 2, 5, "minecraft:dirt") == 16, "blocked conveyor retains all inputs");
                     c.require(c.count(6, 2, 5, "minecraft:cobblestone") == 1728, "full output contents unchanged");
                 }));
         cases.add(new MachineScenario("power/conveyor/item-entity", "Dropped dirt is collected and delivered without a duplicate entity", 200,
                 c -> {
-                    c.block(5, 2, 5, "poweradvantage:item_conveyor"); c.facing(5, 2, 5, "east");
+                    c.block(5, 2, 5, "basepower:item_conveyor"); c.facing(5, 2, 5, "east");
                     c.block(6, 2, 5, "minecraft:chest"); c.block(4, 1, 5, "minecraft:stone");
                     c.block(3, 2, 5, "minecraft:stone"); c.block(4, 2, 4, "minecraft:stone"); c.block(4, 2, 6, "minecraft:stone");
                     BlockPos p = c.at(4, 2, 5);
@@ -60,7 +60,7 @@ static void register(List cases) {
                 }));
         cases.add(new MachineScenario("power/conveyor/nbt-preserved", "Distinct custom item data must not merge into or overwrite another stack", 200,
                 c -> {
-                    conveyor(c, "poweradvantage:item_conveyor");
+                    conveyor(c, "basepower:item_conveyor");
                     c.put(4, 2, 5, 0, "minecraft:dirt", 3); c.put(4, 2, 5, 1, "minecraft:dirt", 3);
                     c.inventory(4, 2, 5).getStackInSlot(0).getOrCreateTag().setString("Witness", "A");
                     c.inventory(4, 2, 5).getStackInSlot(1).getOrCreateTag().setString("Witness", "B");
@@ -87,14 +87,14 @@ static void register(List cases) {
         };
         for (String[] filter : filters) cases.add(new MachineScenario("power/filter/" + filter[0],
                 "Eight matching items go down; eight nonmatching items go forward; bounded inputs exhaust", 300,
-                c -> { filter(c, "poweradvantage:item_filter_" + filter[0]); c.put(4, 2, 5, 0, filter[1], 8); c.put(4, 2, 5, 1, filter[2], 8); },
+                c -> { filter(c, "basepower:item_filter_" + filter[0]); c.put(4, 2, 5, 0, filter[1], 8); c.put(4, 2, 5, 1, filter[2], 8); },
                 c -> filterOutcome(c, filter[1], filter[2], true)));
         for (int ghosts = 0; ghosts <= 3; ghosts++) {
             final int slots = ghosts;
             cases.add(new MachineScenario("power/filter/inventory-" + slots,
                     "Zero references pass all; one or several references sort matching dirt, retaining reference slots", 300,
                     c -> {
-                        filter(c, "poweradvantage:item_filter_inventory");
+                        filter(c, "basepower:item_filter_inventory");
                         c.put(4, 2, 5, 0, "minecraft:dirt", 8); c.put(4, 2, 5, 1, "minecraft:apple", 8);
                         if (slots > 0) c.put(5, 2, 5, 1, "minecraft:dirt", 1);
                         if (slots > 1) { c.put(5, 2, 5, 2, "minecraft:cobblestone", 1); c.put(5, 2, 5, 3, "minecraft:coal", 1); }
@@ -108,7 +108,7 @@ static void register(List cases) {
             cases.add(new MachineScenario("power/filter/overflow-" + flags,
                     "Use lower output first, overflow forward when lower is full, retain input when both are full", 300,
                     c -> {
-                        filter(c, "poweradvantage:item_filter_overflow"); c.put(4, 2, 5, 0, "minecraft:dirt", 16);
+                        filter(c, "basepower:item_filter_overflow"); c.put(4, 2, 5, 0, "minecraft:dirt", 16);
                         if (lowerFull) full(c, 5, 1, 5); if (forwardFull) full(c, 6, 2, 5);
                     }, c -> {
                         int lower = c.count(5, 1, 5, "minecraft:dirt"), forward = c.count(6, 2, 5, "minecraft:dirt");
@@ -117,10 +117,10 @@ static void register(List cases) {
                         c.require(c.count(4, 2, 5, "minecraft:dirt") + c.count(5, 2, 5, "minecraft:dirt") + lower + forward == 16, "overflow conservation even with both outputs blocked");
                     }));
         }
-        for (String fluid : new String[]{"minecraft:water", "poweradvantage:crude_oil", "poweradvantage:refined_oil"}) {
+        for (String fluid : new String[]{"minecraft:water", "basepower:crude_oil", "basepower:refined_oil"}) {
             cases.add(new MachineScenario("power/drain/" + fluid.replace(':', '_'),
                     "Exactly one native fluid source travels through drain and pipe to storage with registry identity intact", 80,
-                    c -> { drain(c, fluid, "poweradvantage:fluid_storage_tank", false); },
+                    c -> { drain(c, fluid, "basepower:fluid_storage_tank", false); },
                     c -> {
                         c.require(c.world.isAirBlock(c.at(5, 2, 5)), "native source collected");
                         c.require(c.fluidAmount(7, 1, 5) == 1000 && c.fluidAmount(5, 1, 5) == 0, "exact source volume delivered");
@@ -129,24 +129,24 @@ static void register(List cases) {
         }
         cases.add(new MachineScenario("power/drain/non-source", "Flowing water without a source cannot create a bucket", 80,
                 c -> {
-                    drain(c, "minecraft:water", "poweradvantage:fluid_storage_tank", false);
+                    drain(c, "minecraft:water", "basepower:fluid_storage_tank", false);
                     c.world.setBlockState(c.at(5, 2, 5), net.minecraft.init.Blocks.WATER.getDefaultState()
                             .with(net.minecraft.block.BlockFlowingFluid.LEVEL, 7), 3);
                 }, c -> c.require(c.fluidAmount(5, 1, 5) + c.fluidAmount(7, 1, 5) == 0, "no source means no collected millibuckets")));
         for (boolean matching : new boolean[]{true, false}) cases.add(new MachineScenario("power/tank/filter-" + matching,
                 "A bucket reference admits matching water or rejects it without losing the source volume", 80,
-                c -> { drain(c, "minecraft:water", "poweradvantage:fluid_metal_tank", false); c.put(7, 1, 5, 0, matching ? "minecraft:water_bucket" : "minecraft:lava_bucket", 1); },
+                c -> { drain(c, "minecraft:water", "basepower:fluid_metal_tank", false); c.put(7, 1, 5, 0, matching ? "minecraft:water_bucket" : "minecraft:lava_bucket", 1); },
                 c -> {
                     c.require(c.fluidAmount(7, 1, 5) == (matching ? 1000 : 0), "bucket filter controls actual network acceptance");
                     c.require(c.fluidAmount(7, 1, 5) + c.fluidAmount(5, 1, 5) == 1000, "rejected water is retained rather than deleted");
                 }));
         cases.add(new MachineScenario("power/tank/full", "Full metal storage never overfills or deletes the extra source bucket", 80,
-                c -> { drain(c, "minecraft:water", "poweradvantage:fluid_metal_tank", false); c.tank(7, 1, 5, "minecraft:water", 10000); },
+                c -> { drain(c, "minecraft:water", "basepower:fluid_metal_tank", false); c.tank(7, 1, 5, "minecraft:water", 10000); },
                 c -> c.require(c.fluidAmount(7, 1, 5) == 10000 && c.fluidAmount(5, 1, 5) == 1000, "full output applies backpressure and conserves 11000 mB")));
         for (boolean signal : new boolean[]{true, false}) cases.add(new MachineScenario("power/fluid-switch/" + signal,
                 "Redstone isolates the fluid path; removing it permits transfer without replacing machinery", 100,
                 c -> {
-                    drain(c, "minecraft:water", "poweradvantage:fluid_storage_tank", true);
+                    drain(c, "minecraft:water", "basepower:fluid_storage_tank", true);
                     if (signal) c.block(6, 2, 5, "minecraft:redstone_block");
                 }, c -> {
                     c.require(c.fluidAmount(7, 1, 5) == (signal ? 0 : 1000), "redstone controls fluid delivery");
@@ -155,7 +155,7 @@ static void register(List cases) {
         for (boolean blocked : new boolean[]{true, false}) cases.add(new MachineScenario("power/discharge/" + blocked,
                 "A discharge places one bucket into air, but must never replace solid bedrock", 80,
                 c -> {
-                    c.block(5, 2, 5, "poweradvantage:fluid_discharge");
+                    c.block(5, 2, 5, "basepower:fluid_discharge");
                     for (EnumFacing direction : EnumFacing.values()) if (direction != EnumFacing.UP) {
                         BlockPos p = BlockPos.ORIGIN.offset(direction);
                         c.block(5 + p.getX(), 1 + p.getY(), 5 + p.getZ(), "minecraft:bedrock");
@@ -176,18 +176,18 @@ private static void stills(List cases) {
             cases.add(new MachineScenario("power/still/" + mode,
                     "Finite crude oil produces refined oil at 2:1; fuel, valid input, capacity and redstone govern useful work", 620,
                     c -> {
-                        c.block(8, 4, 8, "poweradvantage:still");
-                        zone.moddev.mc.poweradvantage.machines.fluidmachines.StillTileEntity still =
-                                (zone.moddev.mc.poweradvantage.machines.fluidmachines.StillTileEntity)c.tile(8, 4, 8);
+                        c.block(8, 4, 8, "basepower:still");
+                        zone.moddev.mc.basepower.machines.fluidmachines.StillTileEntity still =
+                                (zone.moddev.mc.basepower.machines.fluidmachines.StillTileEntity)c.tile(8, 4, 8);
                         still.getInputTank().setFluid(new cyano.poweradvantage.api.fluid.FluidStack(
                                 mode.equals("invalid") ? net.minecraft.init.Fluids.WATER
-                                        : net.minecraft.util.registry.IRegistry.field_212619_h.func_212608_b(new net.minecraft.util.ResourceLocation("poweradvantage:crude_oil")), 1000));
+                                        : net.minecraft.util.registry.IRegistry.field_212619_h.func_212608_b(new net.minecraft.util.ResourceLocation("basepower:crude_oil")), 1000));
                         if (!mode.equals("no-fuel")) c.put(8, 4, 8, 0, "minecraft:coal", 1);
-                        if (output > 0) c.tank(8, 4, 8, "poweradvantage:refined_oil", output);
+                        if (output > 0) c.tank(8, 4, 8, "basepower:refined_oil", output);
                         if (mode.equals("redstone")) c.block(9, 4, 8, "minecraft:redstone_block");
                     }, c -> {
-                        zone.moddev.mc.poweradvantage.machines.fluidmachines.StillTileEntity still =
-                                (zone.moddev.mc.poweradvantage.machines.fluidmachines.StillTileEntity)c.tile(8, 4, 8);
+                        zone.moddev.mc.basepower.machines.fluidmachines.StillTileEntity still =
+                                (zone.moddev.mc.basepower.machines.fluidmachines.StillTileEntity)c.tile(8, 4, 8);
                         c.require(still.getInputTank().getFluidAmount() == 1000 - product * 2, "exact raw input debit");
                         c.require(c.fluidAmount(8, 4, 8) == output + product, "exact bounded distillation product");
                         if (product == 0 && !mode.equals("no-fuel"))
@@ -209,12 +209,12 @@ private static void filterOutcome(MachineContext c, String matching, String othe
         c.require(c.count(4, 2, 5, matching) + c.count(4, 2, 5, other) == 0 && c.inventory(5, 2, 5).getStackInSlot(0).isEmpty(), "finite source and filter buffer exhausted");
     }
     private static void drain(MachineContext c, String fluid, String tank, boolean switched) {
-        c.block(5, 1, 5, "poweradvantage:fluid_drain");
+        c.block(5, 1, 5, "basepower:fluid_drain");
         for (EnumFacing d : new EnumFacing[]{EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.WEST, EnumFacing.EAST}) {
             BlockPos p = BlockPos.ORIGIN.offset(d); c.block(5 + p.getX(), 2, 5 + p.getZ(), "minecraft:bedrock");
         }
         c.block(5, 2, 5, fluid);
-        c.block(6, 1, 5, switched ? "poweradvantage:fluid_switch" : "poweradvantage:fluid_pipe");
+        c.block(6, 1, 5, switched ? "basepower:fluid_switch" : "basepower:fluid_pipe");
         c.block(7, 1, 5, tank);
     }
 }
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/ProcessProgression.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/ProcessProgression.java
index 9dd8a70c..ec2d0885 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/ProcessProgression.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/ProcessProgression.java
@@ -27,9 +27,9 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.registries.ForgeRegistries;
-import zone.moddev.mc.poweradvantage.init.Fluids;
-import zone.moddev.mc.poweradvantage.machines.fluidmachines.StillTileEntity;
-import zone.moddev.mc.poweradvantage.util.FluidContainerHelper;
+import zone.moddev.mc.basepower.init.Fluids;
+import zone.moddev.mc.basepower.machines.fluidmachines.StillTileEntity;
+import zone.moddev.mc.basepower.util.FluidContainerHelper;
 import static zone.moddev.mc.advantageworks.ProgressionProbe.*;
 
 /** Non-table processing edges are verified with live bounded machines here. */
@@ -93,31 +93,31 @@ static boolean canCrush(Map known, ItemStack input) {
                 if (id.startsWith("basemetals:") && id.endsWith("_crackhammer")
                         && stack(id).getItem().canHarvestBlock(((ItemBlock) input.getItem()).getBlock().getDefaultState())) return true;
             }
-            return (has(known, "steamadvantage:steam_crusher", "steamadvantage:steam_boiler_coal", "minecraft:water_bucket"))
-                    || has(known, "electricadvantage:electric_crusher", "electricadvantage:hydroelectric_generator", "minecraft:water_bucket");
+            return (has(known, "basesteam:steam_crusher", "basesteam:steam_boiler_coal", "minecraft:water_bucket"))
+                    || has(known, "baseelectric:electric_crusher", "baseelectric:hydroelectric_generator", "minecraft:water_bucket");
         }
         return true;
     }
 
     static boolean advance(WorldServer world, EntityPlayerMP player, Map known, JsonObject fixture) {
         boolean changed = false;
-        for (String machine : new String[] {"steamadvantage:steam_crusher", "electricadvantage:electric_crusher"}) {
+        for (String machine : new String[] {"basesteam:steam_crusher", "baseelectric:electric_crusher"}) {
             if (known.containsKey(machine) && crusherWitnesses.add(machine)) {
                 for (String potato : new String[] {"minecraft:potato", "minecraft:poisonous_potato"})
                     crushPotato(world, fixture, machine, potato);
             }
         }
-        if (known.containsKey("electricadvantage:sulfur_ore") && !known.containsKey("electricadvantage:sulfur_powder")) {
+        if (known.containsKey("baseelectric:sulfur_ore") && !known.containsKey("baseelectric:sulfur_powder")) {
             BlockPos pos = new BlockPos(16392, 80, 16384);
-            fresh(world, fixture, pos, "electricadvantage:sulfur_ore");
+            fresh(world, fixture, pos, "baseelectric:sulfur_ore");
             NonNullList drops = NonNullList.create();
             world.getBlockState(pos).getBlock().getDrops(world.getBlockState(pos), drops, world, pos, 0);
-            require(drops.size() == 1 && id(drops.get(0)).equals("electricadvantage:sulfur_powder")
+            require(drops.size() == 1 && id(drops.get(0)).equals("baseelectric:sulfur_powder")
                     && drops.get(0).getCount() >= 1 && drops.get(0).getCount() <= 4, "Sulfur ore drops changed");
-            changed |= acquire(known, player, drops.get(0), "mine_generated_sulfur_ore", Collections.singletonList("electricadvantage:sulfur_ore"));
+            changed |= acquire(known, player, drops.get(0), "mine_generated_sulfur_ore", Collections.singletonList("baseelectric:sulfur_ore"));
         }
         if (known.containsKey("minecraft:bucket")) {
-            for (String fluid : new String[] {"minecraft:water", "poweradvantage:crude_oil"}) {
+            for (String fluid : new String[] {"minecraft:water", "basepower:crude_oil"}) {
                 String bucket = fluid.equals("minecraft:water") ? "minecraft:water_bucket" : fluid + "_bucket";
                 if (known.containsKey(bucket)) continue;
                 BlockPos pos = new BlockPos(16390, 80, 16384);
@@ -132,9 +132,9 @@ static boolean advance(WorldServer world, EntityPlayerMP player, Map machine.getEnergy(power), "Powered crusher did not consume energy");
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/ProgressionProbe.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/ProgressionProbe.java
index c723ce4a..a4c12b65 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/ProgressionProbe.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/ProgressionProbe.java
@@ -47,8 +47,8 @@
 import net.minecraftforge.common.crafting.VanillaRecipeTypes;
 import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 import net.minecraftforge.registries.ForgeRegistries;
-import zone.moddev.mc.poweradvantage.PowerAdvantage;
-import zone.moddev.mc.poweradvantage.RecipeMode;
+import zone.moddev.mc.basepower.PowerAdvantage;
+import zone.moddev.mc.basepower.RecipeMode;
 
 /** Manufacture from declared natural resources; no pre-supplied Advantage parts. */
 final class ProgressionProbe {
@@ -191,7 +191,7 @@ private void audit(MinecraftServer server, WorldServer world, String label) thro
             if (exclusions.has(id)) {
                 row.addProperty("status", "INTENTIONAL_EXCLUSION");
                 row.addProperty("reason", exclusions.get(id).getAsString());
-            } else if (PowerAdvantage.recipeMode == RecipeMode.APOCALYPTIC && id.equals("electricadvantage:photovoltaic_generator")) {
+            } else if (PowerAdvantage.recipeMode == RecipeMode.APOCALYPTIC && id.equals("baseelectric:photovoltaic_generator")) {
                 row.addProperty("status", "INTENTIONAL_MODE_RESTRICTION");
                 row.addProperty("reason", "Legacy Apocalyptic mode forbids new photovoltaic generators; use hydro or steam generation");
             } else if (known.containsKey(id)) {
@@ -252,8 +252,8 @@ static ItemStack stack(String id) {
 
     private static boolean advantage(ItemStack stack) { return !stack.isEmpty() && owned(stack.getItem().getRegistryName()); }
     private static boolean owned(ResourceLocation id) {
-        return id != null && (id.getNamespace().equals("poweradvantage") || id.getNamespace().equals("steamadvantage")
-                || id.getNamespace().equals("electricadvantage"));
+        return id != null && (id.getNamespace().equals("basepower") || id.getNamespace().equals("basesteam")
+                || id.getNamespace().equals("baseelectric"));
     }
     static String id(ItemStack stack) { return stack.getItem().getRegistryName().toString(); }
     static void require(boolean value, String reason) { if (!value) throw new IllegalStateException(reason); }
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/RecipeBookProbe.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/RecipeBookProbe.java
index d01bd9da..3204fb2c 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/RecipeBookProbe.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/RecipeBookProbe.java
@@ -26,7 +26,7 @@ static void verify(MinecraftServer server, WorldServer world, String label, Json
         List recipes = new ArrayList<>();
         for (IRecipe recipe : server.getRecipeManager().getRecipes()) {
             String namespace = recipe.getId().getNamespace();
-            if (!(namespace.equals("poweradvantage") || namespace.equals("steamadvantage") || namespace.equals("electricadvantage"))) continue;
+            if (!(namespace.equals("basepower") || namespace.equals("basesteam") || namespace.equals("baseelectric"))) continue;
             if (recipe.getType() != VanillaRecipeTypes.CRAFTING && recipe.getType() != VanillaRecipeTypes.SMELTING) continue;
             String output = id(recipe.getRecipeOutput());
             require(output.equals(recipe.getGroup()), "Mixed-output recipe group: " + recipe.getId() + " -> " + recipe.getGroup());
@@ -47,7 +47,7 @@ static void verify(MinecraftServer server, WorldServer world, String label, Json
             buffer.readBytes(bytes);
             Files.write(Paths.get("recipes-" + label + ".bin"), bytes);
         } finally { buffer.release(); }
-        IRecipe starch = server.getRecipeManager().getRecipe(new ResourceLocation("poweradvantage:starch_from_potato"));
+        IRecipe starch = server.getRecipeManager().getRecipe(new ResourceLocation("basepower:starch_from_potato"));
         require(starch != null && starch.getType() == VanillaRecipeTypes.CRAFTING, "Missing native potato crafting recipe");
         int cases = 0;
         for (int width : new int[] {2, 3}) for (String potato : new String[] {"minecraft:potato", "minecraft:poisonous_potato"}) {
@@ -60,7 +60,7 @@ static void verify(MinecraftServer server, WorldServer world, String label, Json
                 IRecipe selected = world.getRecipeManager().getRecipe(grid, world, VanillaRecipeTypes.CRAFTING);
                 require(selected != null && selected.getId().equals(starch.getId()), "Conflicting native potato crafting recipe");
                 ItemStack result = starch.getCraftingResult(grid);
-                require(id(result).equals("poweradvantage:starch") && result.getCount() == 1, "Starch output changed");
+                require(id(result).equals("basepower:starch") && result.getCount() == 1, "Starch output changed");
                 require(grid.getStackInSlot(slot).getCount() == count, "Result preview mutated input");
                 ItemStack consumed = grid.decrStackSize(slot, 1);
                 require(consumed.getCount() == 1 && grid.getStackInSlot(slot).getCount() == count - 1,
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/RecipeUnlockProbe.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/RecipeUnlockProbe.java
index cab7eda3..4d409dc3 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/RecipeUnlockProbe.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/RecipeUnlockProbe.java
@@ -88,7 +88,7 @@ private void run(MinecraftServer server, WorldServer world, String operation, St
         RecipeBookProbe.verify(server, world, label, result);
         for (JsonElement element : cases) {
             String id = element.getAsJsonObject().get("id").getAsString();
-            require(id.matches("(power|steam|electric)advantage:[a-z0-9_]+"), "Unsafe recipe ID");
+            require(id.matches("base(power|steam|electric):[a-z0-9_]+"), "Unsafe recipe ID");
             require(advancement(server, id) != null, "Missing loaded advancement: " + id);
         }
         if (operation.equals("sweep")) {
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/RedstoneReloadProbe.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/RedstoneReloadProbe.java
index 7be0bafc..7b250969 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/RedstoneReloadProbe.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/RedstoneReloadProbe.java
@@ -213,7 +213,7 @@ private void construct(Witness witness) {
         force(witness);
         for (int dx = -1; dx <= 1; dx++) for (int dy = -1; dy <= 1; dy++) for (int dz = -1; dz <= 1; dz++)
             world.setBlockState(witness.pos.add(dx, dy, dz), Blocks.AIR.getDefaultState(), 2);
-        Block block = net.minecraftforge.registries.ForgeRegistries.BLOCKS.getValue(new ResourceLocation("electricadvantage:electric_drill"));
+        Block block = net.minecraftforge.registries.ForgeRegistries.BLOCKS.getValue(new ResourceLocation("baseelectric:electric_drill"));
         if (block == null || block == Blocks.AIR) throw new IllegalStateException("Electric drill registry absent");
         world.setBlockState(witness.pos, block.getDefaultState().with(BlockStateProperties.FACING, EnumFacing.NORTH), 2);
         for (int dx = -1; dx <= 1; dx++) for (int dy = -1; dy <= 1; dy++)
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/SourcePickupOperationalCases.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/SourcePickupOperationalCases.java
index f7d4dc36..ff84aa34 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/SourcePickupOperationalCases.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/SourcePickupOperationalCases.java
@@ -11,15 +11,15 @@ static void register(List cases) {
                     "Native pickup removes exactly one bucket of water, preserving the waterlogged slab and retaining the collected fluid after restart", 400,
                     c -> {
                         if (machine.equals("power-drain")) {
-                            c.block(8, 2, 8, "poweradvantage:fluid_drain");
-                            c.block(9, 2, 8, "poweradvantage:fluid_pipe");
-                            c.block(10, 2, 8, "poweradvantage:fluid_metal_tank");
+                            c.block(8, 2, 8, "basepower:fluid_drain");
+                            c.block(9, 2, 8, "basepower:fluid_pipe");
+                            c.block(10, 2, 8, "basepower:fluid_metal_tank");
                             for (int[] p : new int[][]{{7,3,8},{9,3,8},{8,3,7},{8,3,9},{8,4,8}})
                                 c.block(p[0],p[1],p[2],"minecraft:bedrock");
                             slab(c, 8, 3, 8);
                         } else {
-                            c.block(8, 4, 8, machine.equals("steam-pump") ? "steamadvantage:steam_pump" : "electricadvantage:electric_pump");
-                            c.block(9, 4, 8, "poweradvantage:fluid_metal_tank");
+                            c.block(8, 4, 8, machine.equals("steam-pump") ? "basesteam:steam_pump" : "baseelectric:electric_pump");
+                            c.block(9, 4, 8, "basepower:fluid_metal_tank");
                             if (machine.equals("steam-pump")) c.steamSupply(7, 4, 8, 600);
                             else c.electricSupply(7, 4, 8, 8000);
                             for (int[] p : new int[][]{{8,0,8},{8,0,7},{8,0,9},{7,0,8},{9,0,7},{9,0,9},{10,0,8},{9,1,8}})
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/SteamOperationalActors.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/SteamOperationalActors.java
index 9bfab7a2..410f017d 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/SteamOperationalActors.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/SteamOperationalActors.java
@@ -42,7 +42,7 @@ private static void elevator(List cases) {
                     "A real passenger moves to the physical stop, one move costs exactly 32 steam, "
                     + "a steady signal never repeats the move, and insufficient steam leaves passenger/shaft unchanged.",
                     80, c -> {
-                        c.block(8, 0, 8, "steamadvantage:steam_elevator");
+                        c.block(8, 0, 8, "basesteam:steam_elevator");
                         c.block(8, 9, 8, "minecraft:stone");
                         boolean down = mode.equals("down");
                         if (down) {
@@ -78,7 +78,7 @@ private static void elevator(List cases) {
                             IBlockState state = c.world.getBlockState(c.at(8, y, 8));
                             c.record("shaft/" + y, state.toString());
                             if (movedUp && y <= 6) {
-                                c.require("steamadvantage:platform".equals(String.valueOf(state.getBlock().getRegistryName())),
+                                c.require("basesteam:platform".equals(String.valueOf(state.getBlock().getRegistryName())),
                                         "Raised shaft contains physical platform segment " + y);
                                 IntegerProperty height = (IntegerProperty) state.getBlock().getStateContainer().getProperty("height");
                                 c.require(height != null && state.get(height) == (y == 6 ? 4 : 0),
@@ -94,7 +94,7 @@ private static void elevator(List cases) {
     }
 
     private static void platform(MachineContext c, int y, int height) {
-        c.block(8, y, 8, "steamadvantage:platform");
+        c.block(8, y, 8, "basesteam:platform");
         IBlockState state = c.world.getBlockState(c.at(8, y, 8));
         IntegerProperty property = (IntegerProperty) state.getBlock().getStateContainer().getProperty("height");
         if (property == null) throw new IllegalStateException("Missing native platform height");
@@ -128,15 +128,15 @@ private static void musket(List cases) {
                         };
                         shot.player.interactionManager.setGameType(GameType.SURVIVAL);
                         shot.player.setPositionAndRotation(muzzle.getX() + 0.5, muzzle.getY(), muzzle.getZ() + 0.5, 0, 0);
-                        Item weapon = ForgeRegistries.ITEMS.getValue(new ResourceLocation("steamadvantage:musket"));
+                        Item weapon = ForgeRegistries.ITEMS.getValue(new ResourceLocation("basesteam:musket"));
                         c.require(weapon != null && weapon != net.minecraft.init.Items.AIR, "Native musket is registered");
                         shot.weapon = new ItemStack(weapon);
                         shot.player.setHeldItem(EnumHand.MAIN_HAND, shot.weapon);
-                        if (!mode.equals("no-ammo")) enchant(c, shot.weapon, "steamadvantage:rapid_reload");
-                        if (mode.equals("powderless")) enchant(c, shot.weapon, "steamadvantage:powderless");
+                        if (!mode.equals("no-ammo")) enchant(c, shot.weapon, "basesteam:rapid_reload");
+                        if (mode.equals("powderless")) enchant(c, shot.weapon, "basesteam:powderless");
                         if (mode.equals("infinity")) enchant(c, shot.weapon, "minecraft:infinity");
                         if (mode.equals("last-cartridge") || mode.equals("infinity")) {
-                            Item cartridge = ForgeRegistries.ITEMS.getValue(new ResourceLocation("steamadvantage:blackpowder_cartridge"));
+                            Item cartridge = ForgeRegistries.ITEMS.getValue(new ResourceLocation("basesteam:blackpowder_cartridge"));
                             c.require(cartridge != null && cartridge != net.minecraft.init.Items.AIR, "Cartridge is registered");
                             shot.player.inventory.setInventorySlotContents(1, new ItemStack(cartridge));
                         }
@@ -191,7 +191,7 @@ private static void musket(List cases) {
 
     private static float shotDamage() {
         try {
-            float damage = Class.forName("zone.moddev.mc.steamadvantage.SteamAdvantage", false,
+            float damage = Class.forName("zone.moddev.mc.basesteam.SteamAdvantage", false,
                     SteamOperationalActors.class.getClassLoader()).getDeclaredField("MUSKET_DAMAGE").getFloat(null);
             if (!Float.isFinite(damage) || damage <= 0 || damage >= 1000) throw new IllegalStateException("Unsupported configured musket damage");
             return damage;
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/SteamOperationalCases.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/SteamOperationalCases.java
index a682a498..4c55aa9c 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/SteamOperationalCases.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/SteamOperationalCases.java
@@ -34,7 +34,7 @@ private static void add(List cases, String id, String contract,
     }
 
     private static void machine(MachineContext c, String id) {
-        c.block(X, Y, Z, "steamadvantage:" + id);
+        c.block(X, Y, Z, "basesteam:" + id);
     }
 
     private static void supply(MachineContext c, float amount) {
@@ -125,23 +125,23 @@ private static void boilers(List cases) {
 
         add(cases, "oil-production", "A finite 100 mB crude-oil charge converts 64 water to 80 steam at the historical 25-percent bonus.", 160,
                 c -> { machine(c, "steam_boiler_oil"); fill(c, "minecraft:water", 64);
-                    fill(c, "poweradvantage:crude_oil", 100); },
+                    fill(c, "basepower:crude_oil", 100); },
                 c -> { fluid(c, "getWaterTank", "minecraft:water", 0);
-                    fluid(c, "getFuelTank", "poweradvantage:crude_oil", 0);
+                    fluid(c, "getFuelTank", "basepower:crude_oil", 0);
                     c.require(steam(c) == 80, "64 debited water produces exactly 80 steam at the oil boiler's 1.25 ratio"); });
         add(cases, "oil-water-not-fuel", "Water is not liquid fuel and cannot burn itself.", 120,
                 c -> { machine(c, "steam_boiler_oil"); fill(c, "minecraft:water", 64); },
                 c -> { fluid(c, "getWaterTank", "minecraft:water", 64);
-                    fluid(c, "getFuelTank", "poweradvantage:crude_oil", 0);
+                    fluid(c, "getFuelTank", "basepower:crude_oil", 0);
                     c.require(steam(c) == 0, "Nonflammable water does not produce steam without fuel"); });
         add(cases, "oil-dry", "Liquid fuel is preserved when no water is available.", 120,
-                c -> { machine(c, "steam_boiler_oil"); fill(c, "poweradvantage:crude_oil", 100); },
-                c -> { fluid(c, "getFuelTank", "poweradvantage:crude_oil", 100);
+                c -> { machine(c, "steam_boiler_oil"); fill(c, "basepower:crude_oil", 100); },
+                c -> { fluid(c, "getFuelTank", "basepower:crude_oil", 100);
                     c.require(steam(c) == 0, "Dry oil boiler does not ignite"); });
         add(cases, "oil-small-charge", "A 1 mB fuel aliquot can boil a finite three-water charge without inventing water.", 100,
                 c -> { machine(c, "steam_boiler_oil"); fill(c, "minecraft:water", 3);
-                    fill(c, "poweradvantage:crude_oil", 1); },
-                c -> { fluid(c, "getFuelTank", "poweradvantage:crude_oil", 0);
+                    fill(c, "basepower:crude_oil", 1); },
+                c -> { fluid(c, "getFuelTank", "basepower:crude_oil", 0);
                     fluid(c, "getWaterTank", "minecraft:water", 0);
                     float value = steam(c); c.require(value >= 0 && value <= 3.75F,
                             "Three water cannot create more than 3.75 steam at the historical oil bonus (including idle loss)");
@@ -261,31 +261,31 @@ private static void crusherAndStorage(List cases) {
 
     private static void still(List cases) {
         add(cases, "still-production", "Steam distills finite crude oil at the historical 2:1 ratio.", 180,
-                c -> { machine(c, "steam_still"); supply(c, 500); fill(c, "poweradvantage:crude_oil", 200); },
-                c -> { fluid(c, "getInputTank", "poweradvantage:crude_oil", 0);
-                    fluid(c, "getOutputTank", "poweradvantage:refined_oil", 100);
+                c -> { machine(c, "steam_still"); supply(c, 500); fill(c, "basepower:crude_oil", 200); },
+                c -> { fluid(c, "getInputTank", "basepower:crude_oil", 0);
+                    fluid(c, "getOutputTank", "basepower:refined_oil", 100);
                     c.require(remainingSteam(c) <= 500 - 50 * 1.5F, "50 two-application distillations debit 75 steam"); });
         add(cases, "still-no-power", "Valid crude oil remains untouched without steam.", 160,
-                c -> { machine(c, "steam_still"); fill(c, "poweradvantage:crude_oil", 200); },
-                c -> { fluid(c, "getInputTank", "poweradvantage:crude_oil", 200);
-                    fluid(c, "getOutputTank", "poweradvantage:refined_oil", 0); });
+                c -> { machine(c, "steam_still"); fill(c, "basepower:crude_oil", 200); },
+                c -> { fluid(c, "getInputTank", "basepower:crude_oil", 200);
+                    fluid(c, "getOutputTank", "basepower:refined_oil", 0); });
         add(cases, "still-full-output", "A full output cannot destroy crude oil or spend productive steam.", 160,
-                c -> { machine(c, "steam_still"); supply(c, 500); fill(c, "poweradvantage:crude_oil", 200);
-                    reserve(c, "TankOut", "poweradvantage:refined_oil", 1000); },
-                c -> { fluid(c, "getInputTank", "poweradvantage:crude_oil", 200);
-                    fluid(c, "getOutputTank", "poweradvantage:refined_oil", 1000);
+                c -> { machine(c, "steam_still"); supply(c, 500); fill(c, "basepower:crude_oil", 200);
+                    reserve(c, "TankOut", "basepower:refined_oil", 1000); },
+                c -> { fluid(c, "getInputTank", "basepower:crude_oil", 200);
+                    fluid(c, "getOutputTank", "basepower:refined_oil", 1000);
                     c.require(remainingSteam(c) >= 500 - 2 * 160 * 0.0625F, "Full still spends no productive steam"); });
         add(cases, "still-one-output-space", "The final single output space accepts one recipe, never discarding a second recipe.", 160,
-                c -> { machine(c, "steam_still"); supply(c, 500); fill(c, "poweradvantage:crude_oil", 200);
-                    reserve(c, "TankOut", "poweradvantage:refined_oil", 999); },
-                c -> { fluid(c, "getInputTank", "poweradvantage:crude_oil", 198);
-                    fluid(c, "getOutputTank", "poweradvantage:refined_oil", 1000);
+                c -> { machine(c, "steam_still"); supply(c, 500); fill(c, "basepower:crude_oil", 200);
+                    reserve(c, "TankOut", "basepower:refined_oil", 999); },
+                c -> { fluid(c, "getInputTank", "basepower:crude_oil", 198);
+                    fluid(c, "getOutputTank", "basepower:refined_oil", 1000);
                     c.require(remainingSteam(c) <= 498.5F, "The single accepted operation debits steam"); });
         add(cases, "still-incomplete-input", "An incomplete 2-mB recipe cannot turn one mB into product.", 160,
                 c -> { machine(c, "steam_still"); supply(c, 500);
-                    reserve(c, "TankIn", "poweradvantage:crude_oil", 1); },
-                c -> { fluid(c, "getInputTank", "poweradvantage:crude_oil", 1);
-                    fluid(c, "getOutputTank", "poweradvantage:refined_oil", 0); });
+                    reserve(c, "TankIn", "basepower:crude_oil", 1); },
+                c -> { fluid(c, "getInputTank", "basepower:crude_oil", 1);
+                    fluid(c, "getOutputTank", "basepower:refined_oil", 0); });
         add(cases, "still-invalid-fluid", "A real capability rejects water as still feedstock.", 120,
                 c -> { machine(c, "steam_still"); supply(c, 500);
                     NativeFluidPort handler = new NativeFluidPort(c.tile(X, Y, Z), EnumFacing.UP);
@@ -293,7 +293,7 @@ private static void still(List cases) {
                     c.record("capability/rejected-water", accepted);
                     c.require(accepted == 0, "Water is rejected by the still input capability"); },
                 c -> { fluid(c, "getInputTank", "minecraft:water", 0);
-                    fluid(c, "getOutputTank", "poweradvantage:refined_oil", 0); });
+                    fluid(c, "getOutputTank", "basepower:refined_oil", 0); });
     }
 
     private static void basin(MachineContext c) {
@@ -323,18 +323,18 @@ private static boolean blockIs(MachineContext c, int x, int y, int z, String id)
     private static void pump(List cases) {
         add(cases, "pump-3x3-intake-lift", "The pump builds its lift, removes finite real sources and delivers matching fluid at elevation.", 320,
                 c -> { machine(c, "steam_pump"); basin(c); supply(c, 600);
-                    c.block(X + 1, Y, Z, "poweradvantage:fluid_storage_tank"); },
+                    c.block(X + 1, Y, Z, "basepower:fluid_storage_tank"); },
                 c -> { int removed = 9 - sources(c); int stored = c.fluidAmount(X + 1, Y, Z);
                     int internal = amount(c, "getTank");
                     c.require(removed > 0 && stored >= 1000, "Real intake removal delivers at least a bucket four blocks above the intake");
                     c.require(stored + internal == removed * 1000, "Every removed source is conserved between receiver and pump");
-                    for (int y = 1; y <= 3; y++) c.require(blockIs(c, X, y, Z, "steamadvantage:pump_pipe_steam"),
+                    for (int y = 1; y <= 3; y++) c.require(blockIs(c, X, y, Z, "basesteam:pump_pipe_steam"),
                             "Natural pump ticks build lift segment " + y);
                     c.require(remainingSteam(c) <= 600 - 3 * 5 - removed * (32 + 4),
                             "Finite steam debits pipe placement and four-block lifting for every removed bucket"); });
         add(cases, "pump-no-power", "A real 3x3 intake remains untouched without steam, including lift construction.", 180,
                 c -> { machine(c, "steam_pump"); basin(c);
-                    c.block(X + 1, Y, Z, "poweradvantage:fluid_storage_tank"); },
+                    c.block(X + 1, Y, Z, "basepower:fluid_storage_tank"); },
                 c -> { c.require(sources(c) == 9 && amount(c, "getTank") == 0 && c.fluidAmount(X + 1, Y, Z) == 0,
                         "No power means no source removal or fluid output");
                     c.require(blockIs(c, X, Y - 1, Z, "minecraft:air"), "No steam means no lift construction"); });
@@ -344,7 +344,7 @@ private static void pump(List cases) {
                     c.require(blockIs(c, X, Y - 1, Z, "minecraft:air"), "Insufficient steam cannot place the first pipe"); });
         add(cases, "pump-full-output", "A full connected receiver cannot delete pump fluid or debit a new source.", 160,
                 c -> { machine(c, "steam_pump"); basin(c); supply(c, 600); fill(c, "minecraft:lava", 1000);
-                    c.block(X + 1, Y, Z, "poweradvantage:fluid_storage_tank");
+                    c.block(X + 1, Y, Z, "basepower:fluid_storage_tank");
                     c.tank(X + 1, Y, Z, "minecraft:lava", 4000); },
                 c -> { fluid(c, "getTank", "minecraft:lava", 1000);
                     c.require(c.fluidAmount(X + 1, Y, Z) == 4000 && sources(c) == 9,
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/SteamOperationalSupplementalCases.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/SteamOperationalSupplementalCases.java
index a5af2a35..230886fa 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/SteamOperationalSupplementalCases.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/SteamOperationalSupplementalCases.java
@@ -43,11 +43,11 @@ private static void priority(List cases) {
                     "A finite source fills a normal consumer before backup storage. Disabling backup discharge "
                     + "prevents later relay masking the original allocation; a full-consumer control proves backup connectivity.",
                     80, c -> {
-                        c.block(8, 4, 8, "steamadvantage:steam_boiler_coal");
-                        c.block(9, 4, 8, "steamadvantage:steam_furnace");
-                        c.block(7, 4, 8, "steamadvantage:steam_pipe");
-                        c.block(6, 4, 8, "steamadvantage:steam_pipe");
-                        c.block(5, 4, 8, "steamadvantage:steam_tank");
+                        c.block(8, 4, 8, "basesteam:steam_boiler_coal");
+                        c.block(9, 4, 8, "basesteam:steam_furnace");
+                        c.block(7, 4, 8, "basesteam:steam_pipe");
+                        c.block(6, 4, 8, "basesteam:steam_pipe");
+                        c.block(5, 4, 8, "basesteam:steam_tank");
                         c.block(4, 4, 8, "minecraft:redstone_block");
                         c.power(8, 4, 8, "steam", 40);
                         if (consumerFull) c.power(9, 4, 8, "steam", 200);
@@ -94,7 +94,7 @@ private static void recoil(List cases, int level) {
                 + "only when enchanted. This measures impulse/packet delivery, not a manually ticked fake player's travel.",
                 40, c -> {
                     prepareShot(c, shot, "recoil-" + level, false);
-                    if (level > 0) enchant(c, shot.weapon, "steamadvantage:recoil", level);
+                    if (level > 0) enchant(c, shot.weapon, "basesteam:recoil", level);
                     fire(c, shot);
                 }, c -> {
                     verifyShot(c, shot, false, false);
@@ -116,7 +116,7 @@ private static void explosive(List cases, int level) {
                 + "Finite targets and the level-one blast remain inside the bay; no TNT or flammable terrain is seeded.",
                 40, c -> {
                     prepareShot(c, shot, "explosive-" + level, true);
-                    if (level > 0) enchant(c, shot.weapon, "steamadvantage:high_explosive", level);
+                    if (level > 0) enchant(c, shot.weapon, "basesteam:high_explosive", level);
                     fire(c, shot);
                     shot.immediateCollateralFire = savedFireTicks(shot.collateral);
                     shot.immediateCollateralHealth = shot.collateral.getHealth();
@@ -169,12 +169,12 @@ private static void prepareShot(MachineContext c, Shot shot, String id, boolean
         shot.player.interactionManager.setGameType(GameType.SURVIVAL);
         shot.player.setPositionAndRotation(muzzle.getX() + 0.5, muzzle.getY(), muzzle.getZ() + 0.5, 0, 0);
         shot.player.motionX = shot.player.motionY = shot.player.motionZ = 0;
-        shot.weapon = new ItemStack(item(c, "steamadvantage:musket"));
+        shot.weapon = new ItemStack(item(c, "basesteam:musket"));
         shot.player.setHeldItem(EnumHand.MAIN_HAND, shot.weapon);
-        shot.player.inventory.setInventorySlotContents(1, new ItemStack(item(c, "steamadvantage:blackpowder_cartridge"), 2));
-        enchant(c, shot.weapon, "steamadvantage:rapid_reload", 1);
+        shot.player.inventory.setInventorySlotContents(1, new ItemStack(item(c, "basesteam:blackpowder_cartridge"), 2));
+        enchant(c, shot.weapon, "basesteam:rapid_reload", 1);
         try {
-            shot.configuredDamage = Class.forName("zone.moddev.mc.steamadvantage.SteamAdvantage", false,
+            shot.configuredDamage = Class.forName("zone.moddev.mc.basesteam.SteamAdvantage", false,
                     SteamOperationalSupplementalCases.class.getClassLoader()).getDeclaredField("MUSKET_DAMAGE").getFloat(null);
         } catch (ReflectiveOperationException error) {
             throw new IllegalStateException("Musket configuration contract is unavailable", error);
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/SteamReloadControlCases.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/SteamReloadControlCases.java
index 9138de53..4db38b67 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/SteamReloadControlCases.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/SteamReloadControlCases.java
@@ -16,7 +16,7 @@ static void register(List cases) {
                     int[] stock = {0, 1, 32, 64};
                     for (int i = 0; i < stock.length; i++) {
                         int x = 3 + i * 6;
-                        c.block(x, Y, Z, "steamadvantage:steam_crusher");
+                        c.block(x, Y, Z, "basesteam:steam_crusher");
                         c.put(x, Y, Z, 0, "minecraft:stone", stock[i]);
                     }
                 }, holding(new int[]{3, 9, 15, 21}, c -> {
@@ -41,7 +41,7 @@ private static void crusher(List cases, String name, boolean si
         cases.add(new MachineScenario("steam/lifecycle/crusher-first-loaded-" + name,
                 "One native tick observes live redstone before touching saved crusher progress; no reload grace or replacement.", 1,
                 c -> {
-                    c.block(X, Y, Z, "steamadvantage:steam_crusher");
+                    c.block(X, Y, Z, "basesteam:steam_crusher");
                     if (signalled) c.block(X - 1, Y, Z, "minecraft:redstone_block");
                     c.put(X, Y, Z, 0, "minecraft:stone", 1);
                     NBTTagCompound tag = new NBTTagCompound(); tag.setShort("progress", (short)106); c.seed(X, Y, Z, tag);
@@ -66,7 +66,7 @@ private static void furnace(List cases, boolean signalled) {
         cases.add(new MachineScenario("steam/lifecycle/furnace-first-loaded-" + (signalled ? "signalled" : "unpowered"),
                 "A burning, partly completed furnace uses the real control signal for its first steam heat bonus and work increment.", 1,
                 c -> {
-                    c.block(X, Y, Z, "steamadvantage:steam_furnace");
+                    c.block(X, Y, Z, "basesteam:steam_furnace");
                     if (signalled) c.block(X - 1, Y, Z, "minecraft:redstone_block");
                     c.put(X, Y, Z, 1, "minecraft:sand", 1);
                     NBTTagCompound tag = new NBTTagCompound();
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/WorksController.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/WorksController.java
index a7b20f60..859d9068 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/WorksController.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/WorksController.java
@@ -206,10 +206,10 @@ synchronized String sampleWorldgen(MinecraftServer server, int radius) throws Co
         }
         WorldServer world = overworld(server);
         Map expectedBiomes = new LinkedHashMap<>();
-        expectedBiomes.put("poweradvantage:crude_oil", "DESERT");
+        expectedBiomes.put("basepower:crude_oil", "DESERT");
         expectedBiomes.put("mineralogy:crude_oil", "OCEAN");
-        expectedBiomes.put("electricadvantage:li_ore", null);
-        expectedBiomes.put("electricadvantage:sulfur_ore", null);
+        expectedBiomes.put("baseelectric:li_ore", null);
+        expectedBiomes.put("baseelectric:sulfur_ore", null);
         expectedBiomes.put("mineralogy:sulfur_ore", null);
 
         Set chunks = new LinkedHashSet<>();
@@ -953,8 +953,8 @@ private static CommandException commandError(String message) {
     }
 
     private static IBlockState legacyState(String name, Block block, int metadata) {
-        if (name != null && (name.startsWith("poweradvantage:")
-                || name.startsWith("steamadvantage:") || name.startsWith("electricadvantage:"))) {
+        if (name != null && (name.startsWith("basepower:")
+                || name.startsWith("basesteam:") || name.startsWith("baseelectric:"))) {
             return LegacyMigrationApi.decodeBlockState(new ResourceLocation(name), block, metadata);
         }
         if (block instanceof BlockFlowingFluid) {
@@ -972,7 +972,7 @@ private static ItemStack itemStack(Item item, int count, int damage) {
     private static Fluid fluid(String name) {
         if (name == null || name.trim().isEmpty()) return null;
         ResourceLocation id = name.indexOf(':') >= 0 ? new ResourceLocation(name)
-                : new ResourceLocation("poweradvantage", name);
+                : new ResourceLocation("basepower", name);
         Fluid value = IRegistry.field_212619_h.func_212608_b(id);
         if (value == null) {
             String migratedName = LegacyMigrationApi.fluidTarget(name);
diff --git a/test-rig/src/main/resources/META-INF/mods.toml b/test-rig/src/main/resources/META-INF/mods.toml
index 5ea8f12b..39c8e2d5 100644
--- a/test-rig/src/main/resources/META-INF/mods.toml
+++ b/test-rig/src/main/resources/META-INF/mods.toml
@@ -10,7 +10,7 @@ authors="Minecraft Mod Development"
 description='''Server-side commissioning harness for the Advantage family. Not for distribution.'''
 
 [[dependencies.advantageworkstest]]
-modId="poweradvantage"
+modId="basepower"
 mandatory=true
 versionRange="[2.4.4.113021,)"
 ordering="AFTER"
diff --git a/test-rig/src/main/resources/assets/advantageworkstest/works/works-1.13.2.json b/test-rig/src/main/resources/assets/advantageworkstest/works/works-1.13.2.json
index 6a3aaa3a..6230977c 100644
--- a/test-rig/src/main/resources/assets/advantageworkstest/works/works-1.13.2.json
+++ b/test-rig/src/main/resources/assets/advantageworkstest/works/works-1.13.2.json
@@ -42,7 +42,7 @@
       ],
       "exclusive": false,
       "requiredMods": [
-        "poweradvantage"
+        "basepower"
       ],
       "placements": [
         {
@@ -51,7 +51,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_drain",
+          "block": "basepower:fluid_drain",
           "meta": 0
         },
         {
@@ -60,7 +60,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_pipe",
+          "block": "basepower:fluid_pipe",
           "meta": 0
         },
         {
@@ -69,7 +69,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_storage_tank",
+          "block": "basepower:fluid_storage_tank",
           "meta": 0
         },
         {
@@ -78,7 +78,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_pipe",
+          "block": "basepower:fluid_pipe",
           "meta": 0
         },
         {
@@ -87,7 +87,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_switch",
+          "block": "basepower:fluid_switch",
           "meta": 0
         },
         {
@@ -96,7 +96,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_pipe",
+          "block": "basepower:fluid_pipe",
           "meta": 0
         },
         {
@@ -105,7 +105,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_metal_tank",
+          "block": "basepower:fluid_metal_tank",
           "meta": 0
         },
         {
@@ -114,7 +114,7 @@
             1,
             8
           ],
-          "block": "poweradvantage:fluid_discharge",
+          "block": "basepower:fluid_discharge",
           "meta": 0
         },
         {
@@ -123,7 +123,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_storage_tank",
+          "block": "basepower:fluid_storage_tank",
           "meta": 0
         },
         {
@@ -132,7 +132,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_metal_tank",
+          "block": "basepower:fluid_metal_tank",
           "meta": 0
         },
         {
@@ -141,7 +141,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_pipe_terminal",
+          "block": "basepower:fluid_pipe_terminal",
           "meta": 0
         },
         {
@@ -150,7 +150,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:steel_frame",
+          "block": "basepower:steel_frame",
           "meta": 0
         },
         {
@@ -159,7 +159,7 @@
             2,
             7
           ],
-          "block": "poweradvantage:infinite_steam",
+          "block": "basepower:infinite_steam",
           "meta": 0
         },
         {
@@ -168,7 +168,7 @@
             2,
             7
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         },
         {
@@ -177,30 +177,30 @@
             2,
             7
           ],
-          "block": "poweradvantage:infinite_quantum",
+          "block": "basepower:infinite_quantum",
           "meta": 0
         },
         {
           "pos": [20, 1, 14],
-          "block": "poweradvantage:converter_rf_steam",
+          "block": "basepower:converter_rf_steam",
           "meta": 0,
           "optional": true
         },
         {
           "pos": [21, 1, 14],
-          "block": "poweradvantage:converter_rf_electricity",
+          "block": "basepower:converter_rf_electricity",
           "meta": 0,
           "optional": true
         },
         {
           "pos": [22, 1, 14],
-          "block": "poweradvantage:converter_rf_quantum",
+          "block": "basepower:converter_rf_quantum",
           "meta": 0,
           "optional": true
         },
         {
           "pos": [23, 1, 14],
-          "block": "poweradvantage:converter_tr_electricity",
+          "block": "basepower:converter_tr_electricity",
           "meta": 0,
           "optional": true
         },
@@ -210,7 +210,7 @@
             1,
             10
           ],
-          "block": "poweradvantage:crude_oil",
+          "block": "basepower:crude_oil",
           "meta": 0
         },
         {
@@ -219,7 +219,7 @@
             1,
             10
           ],
-          "block": "poweradvantage:refined_oil",
+          "block": "basepower:refined_oil",
           "meta": 0
         },
         {
@@ -241,7 +241,7 @@
             24
           ],
           "slot": 0,
-          "item": "poweradvantage:starch",
+          "item": "basepower:starch",
           "count": 16
         },
         {
@@ -252,7 +252,7 @@
             24
           ],
           "slot": 1,
-          "item": "poweradvantage:bioplastic_ingot",
+          "item": "basepower:bioplastic_ingot",
           "count": 16
         },
         {
@@ -263,7 +263,7 @@
             24
           ],
           "slot": 2,
-          "item": "poweradvantage:sprocket",
+          "item": "basepower:sprocket",
           "count": 16
         },
         {
@@ -274,7 +274,7 @@
             24
           ],
           "slot": 3,
-          "item": "poweradvantage:rotator_tool",
+          "item": "basepower:rotator_tool",
           "count": 1
         },
         {
@@ -315,7 +315,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_drain"
+          "block": "basepower:fluid_drain"
         },
         {
           "id": "portable-tank-tile",
@@ -347,7 +347,7 @@
           "id": "power-items",
           "type": "registryItem",
           "pos": null,
-          "item": "poweradvantage:rotator_tool"
+          "item": "basepower:rotator_tool"
         },
         {
           "id": "orespawn-integration",
@@ -360,28 +360,28 @@
           "id": "rf-steam-converter",
           "type": "registryBlock",
           "pos": null,
-          "block": "poweradvantage:converter_rf_steam",
+          "block": "basepower:converter_rf_steam",
           "optional": true
         },
         {
           "id": "rf-electric-converter",
           "type": "registryBlock",
           "pos": null,
-          "block": "poweradvantage:converter_rf_electricity",
+          "block": "basepower:converter_rf_electricity",
           "optional": true
         },
         {
           "id": "rf-quantum-converter",
           "type": "registryBlock",
           "pos": null,
-          "block": "poweradvantage:converter_rf_quantum",
+          "block": "basepower:converter_rf_quantum",
           "optional": true
         },
         {
           "id": "tech-reborn-converter",
           "type": "registryBlock",
           "pos": null,
-          "block": "poweradvantage:converter_tr_electricity",
+          "block": "basepower:converter_tr_electricity",
           "optional": true
         }
       ],
@@ -415,7 +415,7 @@
       ],
       "exclusive": true,
       "requiredMods": [
-        "poweradvantage"
+        "basepower"
       ],
       "placements": [
         {
@@ -424,7 +424,7 @@
             1,
             8
           ],
-          "block": "poweradvantage:fluid_drain",
+          "block": "basepower:fluid_drain",
           "meta": 0
         },
         {
@@ -433,7 +433,7 @@
             1,
             8
           ],
-          "block": "poweradvantage:fluid_pipe",
+          "block": "basepower:fluid_pipe",
           "meta": 0
         },
         {
@@ -442,7 +442,7 @@
             1,
             8
           ],
-          "block": "poweradvantage:fluid_metal_tank",
+          "block": "basepower:fluid_metal_tank",
           "meta": 0
         },
         {
@@ -451,7 +451,7 @@
             1,
             8
           ],
-          "block": "poweradvantage:fluid_metal_tank",
+          "block": "basepower:fluid_metal_tank",
           "meta": 0
         },
         {
@@ -460,7 +460,7 @@
             1,
             8
           ],
-          "block": "poweradvantage:fluid_pipe",
+          "block": "basepower:fluid_pipe",
           "meta": 0
         },
         {
@@ -469,7 +469,7 @@
             1,
             8
           ],
-          "block": "poweradvantage:fluid_discharge",
+          "block": "basepower:fluid_discharge",
           "meta": 0
         },
         {
@@ -628,7 +628,7 @@
       ],
       "exclusive": false,
       "requiredMods": [
-        "poweradvantage"
+        "basepower"
       ],
       "placements": [
         {
@@ -637,7 +637,7 @@
             1,
             8
           ],
-          "block": "poweradvantage:fluid_storage_tank",
+          "block": "basepower:fluid_storage_tank",
           "meta": 0
         },
         {
@@ -646,7 +646,7 @@
             1,
             8
           ],
-          "block": "poweradvantage:fluid_pipe",
+          "block": "basepower:fluid_pipe",
           "meta": 0
         },
         {
@@ -655,7 +655,7 @@
             1,
             8
           ],
-          "block": "poweradvantage:still",
+          "block": "basepower:still",
           "meta": 0
         },
         {
@@ -664,7 +664,7 @@
             1,
             8
           ],
-          "block": "poweradvantage:fluid_pipe",
+          "block": "basepower:fluid_pipe",
           "meta": 0
         },
         {
@@ -673,7 +673,7 @@
             1,
             8
           ],
-          "block": "poweradvantage:fluid_metal_tank",
+          "block": "basepower:fluid_metal_tank",
           "meta": 0
         },
         {
@@ -687,31 +687,31 @@
         },
         {
           "pos": [4, 1, 14],
-          "block": "poweradvantage:fluid_storage_tank",
+          "block": "basepower:fluid_storage_tank",
           "meta": 0,
           "requiredMods": ["mineralogy"]
         },
         {
           "pos": [5, 1, 14],
-          "block": "poweradvantage:fluid_pipe",
+          "block": "basepower:fluid_pipe",
           "meta": 0,
           "requiredMods": ["mineralogy"]
         },
         {
           "pos": [6, 1, 14],
-          "block": "poweradvantage:still",
+          "block": "basepower:still",
           "meta": 0,
           "requiredMods": ["mineralogy"]
         },
         {
           "pos": [7, 1, 14],
-          "block": "poweradvantage:fluid_pipe",
+          "block": "basepower:fluid_pipe",
           "meta": 0,
           "requiredMods": ["mineralogy"]
         },
         {
           "pos": [8, 1, 14],
-          "block": "poweradvantage:fluid_metal_tank",
+          "block": "basepower:fluid_metal_tank",
           "meta": 0,
           "requiredMods": ["mineralogy"]
         }
@@ -733,19 +733,19 @@
         {
           "type": "setFluid",
           "pos": [6, 1, 8],
-          "fluid": "poweradvantage:crude_oil",
+          "fluid": "basepower:crude_oil",
           "value": 0
         },
         {
           "type": "setFluid",
           "pos": [8, 1, 8],
-          "fluid": "poweradvantage:refined_oil",
+          "fluid": "basepower:refined_oil",
           "value": 0
         },
         {
           "type": "setFluid",
           "pos": [4, 1, 8],
-          "fluid": "poweradvantage:crude_oil",
+          "fluid": "basepower:crude_oil",
           "value": 2000
         },
         {
@@ -769,7 +769,7 @@
         {
           "type": "setFluid",
           "pos": [8, 1, 14],
-          "fluid": "poweradvantage:refined_oil",
+          "fluid": "basepower:refined_oil",
           "value": 0,
           "requiredMods": ["mineralogy"]
         },
@@ -851,7 +851,7 @@
           "type": "fluidAmount",
           "positions": [[4, 1, 8], [6, 1, 8], [8, 1, 8]],
           "nbtPath": "Tank",
-          "fluid": "poweradvantage:refined_oil",
+          "fluid": "basepower:refined_oil",
           "value": 1000
         },
         {
@@ -875,7 +875,7 @@
           "type": "fluidAmount",
           "positions": [[4, 1, 14], [6, 1, 14], [8, 1, 14]],
           "nbtPath": "Tank",
-          "fluid": "poweradvantage:refined_oil",
+          "fluid": "basepower:refined_oil",
           "value": 1000,
           "requiredMods": ["mineralogy"]
         }
@@ -909,7 +909,7 @@
       ],
       "exclusive": false,
       "requiredMods": [
-        "poweradvantage"
+        "basepower"
       ],
       "placements": [
         {
@@ -927,7 +927,7 @@
             1,
             6
           ],
-          "block": "poweradvantage:item_conveyor",
+          "block": "basepower:item_conveyor",
           "meta": 5
         },
         {
@@ -936,7 +936,7 @@
             1,
             6
           ],
-          "block": "poweradvantage:item_conveyor",
+          "block": "basepower:item_conveyor",
           "meta": 5
         },
         {
@@ -963,7 +963,7 @@
             1,
             9
           ],
-          "block": "poweradvantage:item_filter_inventory",
+          "block": "basepower:item_filter_inventory",
           "meta": 5
         },
         {
@@ -999,7 +999,7 @@
             1,
             12
           ],
-          "block": "poweradvantage:item_filter_block",
+          "block": "basepower:item_filter_block",
           "meta": 5
         },
         {
@@ -1008,7 +1008,7 @@
             1,
             12
           ],
-          "block": "poweradvantage:item_filter_food",
+          "block": "basepower:item_filter_food",
           "meta": 5
         },
         {
@@ -1017,7 +1017,7 @@
             1,
             12
           ],
-          "block": "poweradvantage:item_filter_fuel",
+          "block": "basepower:item_filter_fuel",
           "meta": 5
         },
         {
@@ -1026,7 +1026,7 @@
             1,
             12
           ],
-          "block": "poweradvantage:item_filter_ore",
+          "block": "basepower:item_filter_ore",
           "meta": 5
         },
         {
@@ -1035,7 +1035,7 @@
             1,
             12
           ],
-          "block": "poweradvantage:item_filter_plant",
+          "block": "basepower:item_filter_plant",
           "meta": 5
         },
         {
@@ -1044,7 +1044,7 @@
             1,
             12
           ],
-          "block": "poweradvantage:item_filter_smelt",
+          "block": "basepower:item_filter_smelt",
           "meta": 5
         },
         {
@@ -1071,7 +1071,7 @@
             1,
             9
           ],
-          "block": "poweradvantage:item_filter_overflow",
+          "block": "basepower:item_filter_overflow",
           "meta": 5
         },
         {
@@ -1107,7 +1107,7 @@
             1,
             6
           ],
-          "block": "poweradvantage:item_conveyor",
+          "block": "basepower:item_conveyor",
           "meta": 1
         },
         {
@@ -1116,7 +1116,7 @@
             2,
             6
           ],
-          "block": "poweradvantage:item_conveyor",
+          "block": "basepower:item_conveyor",
           "meta": 5
         },
         {
@@ -1134,7 +1134,7 @@
             1,
             12
           ],
-          "block": "poweradvantage:item_conveyor",
+          "block": "basepower:item_conveyor",
           "meta": 5
         },
         {
@@ -1143,7 +1143,7 @@
             1,
             12
           ],
-          "block": "poweradvantage:item_conveyor",
+          "block": "basepower:item_conveyor",
           "meta": 5
         },
         {
@@ -1162,7 +1162,7 @@
         },
         {
           "pos": [3, 1, 15],
-          "block": "poweradvantage:item_filter_inventory",
+          "block": "basepower:item_filter_inventory",
           "meta": 5
         },
         {
@@ -1182,7 +1182,7 @@
         },
         {
           "pos": [3, 1, 18],
-          "block": "poweradvantage:item_filter_inventory",
+          "block": "basepower:item_filter_inventory",
           "meta": 5
         },
         {
@@ -1232,7 +1232,7 @@
         },
         {
           "pos": [13, 1, 15],
-          "block": "poweradvantage:item_filter_overflow",
+          "block": "basepower:item_filter_overflow",
           "meta": 5
         },
         {
@@ -1252,7 +1252,7 @@
         },
         {
           "pos": [13, 1, 18],
-          "block": "poweradvantage:item_filter_overflow",
+          "block": "basepower:item_filter_overflow",
           "meta": 5
         },
         {
@@ -1272,7 +1272,7 @@
         },
         {
           "pos": [13, 1, 21],
-          "block": "poweradvantage:item_filter_overflow",
+          "block": "basepower:item_filter_overflow",
           "meta": 5
         },
         {
@@ -1630,7 +1630,7 @@
             1,
             6
           ],
-          "block": "poweradvantage:item_conveyor",
+          "block": "basepower:item_conveyor",
           "meta": 5
         },
         {
@@ -1720,8 +1720,8 @@
       ],
       "exclusive": false,
       "requiredMods": [
-        "poweradvantage",
-        "steamadvantage"
+        "basepower",
+        "basesteam"
       ],
       "placements": [
         {
@@ -1730,7 +1730,7 @@
             1,
             7
           ],
-          "block": "steamadvantage:steam_boiler_coal",
+          "block": "basesteam:steam_boiler_coal",
           "meta": 0
         },
         {
@@ -1739,7 +1739,7 @@
             1,
             7
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -1748,7 +1748,7 @@
             1,
             7
           ],
-          "block": "steamadvantage:steam_tank",
+          "block": "basesteam:steam_tank",
           "meta": 0
         },
         {
@@ -1757,7 +1757,7 @@
             1,
             12
           ],
-          "block": "steamadvantage:steam_boiler_electric",
+          "block": "basesteam:steam_boiler_electric",
           "meta": 0
         },
         {
@@ -1766,7 +1766,7 @@
             1,
             12
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -1775,7 +1775,7 @@
             1,
             12
           ],
-          "block": "steamadvantage:steam_tank",
+          "block": "basesteam:steam_tank",
           "meta": 0
         },
         {
@@ -1784,7 +1784,7 @@
             1,
             7
           ],
-          "block": "steamadvantage:steam_boiler_geothermal",
+          "block": "basesteam:steam_boiler_geothermal",
           "meta": 0
         },
         {
@@ -1793,7 +1793,7 @@
             1,
             7
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -1802,7 +1802,7 @@
             1,
             7
           ],
-          "block": "steamadvantage:steam_tank",
+          "block": "basesteam:steam_tank",
           "meta": 0
         },
         {
@@ -1811,7 +1811,7 @@
             1,
             12
           ],
-          "block": "steamadvantage:steam_boiler_oil",
+          "block": "basesteam:steam_boiler_oil",
           "meta": 0
         },
         {
@@ -1820,7 +1820,7 @@
             1,
             12
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -1829,7 +1829,7 @@
             1,
             12
           ],
-          "block": "steamadvantage:steam_tank",
+          "block": "basesteam:steam_tank",
           "meta": 0
         },
         {
@@ -1862,7 +1862,7 @@
             20
           ],
           "slot": 0,
-          "item": "steamadvantage:steam_governor",
+          "item": "basesteam:steam_governor",
           "count": 4
         },
         {
@@ -1886,7 +1886,7 @@
             1,
             6
           ],
-          "block": "poweradvantage:fluid_storage_tank",
+          "block": "basepower:fluid_storage_tank",
           "meta": 0
         },
         {
@@ -1906,7 +1906,7 @@
             1,
             13
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         },
         {
@@ -1926,7 +1926,7 @@
             1,
             13
           ],
-          "block": "poweradvantage:fluid_storage_tank",
+          "block": "basepower:fluid_storage_tank",
           "meta": 0
         },
         {
@@ -2053,8 +2053,8 @@
       ],
       "exclusive": false,
       "requiredMods": [
-        "poweradvantage",
-        "steamadvantage"
+        "basepower",
+        "basesteam"
       ],
       "placements": [
         {
@@ -2063,7 +2063,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -2072,7 +2072,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_tank",
+          "block": "basesteam:steam_tank",
           "meta": 0
         },
         {
@@ -2081,7 +2081,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -2090,7 +2090,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_furnace",
+          "block": "basesteam:steam_furnace",
           "meta": 0
         },
         {
@@ -2099,7 +2099,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_drill",
+          "block": "basesteam:steam_drill",
           "meta": 1
         },
         {
@@ -2108,7 +2108,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_crusher",
+          "block": "basesteam:steam_crusher",
           "meta": 0
         },
         {
@@ -2117,7 +2117,7 @@
             1,
             7
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -2126,7 +2126,7 @@
             1,
             6
           ],
-          "block": "steamadvantage:steam_switch",
+          "block": "basesteam:steam_switch",
           "meta": 0
         },
         {
@@ -2135,7 +2135,7 @@
             1,
             9
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -2144,7 +2144,7 @@
             1,
             10
           ],
-          "block": "steamadvantage:steam_drill",
+          "block": "basesteam:steam_drill",
           "meta": 3
         },
         {
@@ -2163,7 +2163,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -2172,7 +2172,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -2181,7 +2181,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -2190,7 +2190,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -2199,7 +2199,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_tank",
+          "block": "basesteam:steam_tank",
           "meta": 0
         }
       ],
@@ -2212,7 +2212,7 @@
             1,
             8
           ],
-          "block": "poweradvantage:infinite_steam",
+          "block": "basepower:infinite_steam",
           "meta": 0
         },
         {
@@ -2222,7 +2222,7 @@
             1,
             8
           ],
-          "block": "poweradvantage:infinite_steam",
+          "block": "basepower:infinite_steam",
           "meta": 0
         }
       ],
@@ -2253,7 +2253,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_pipe"
+          "block": "basesteam:steam_pipe"
         },
         {
           "id": "steam-switch",
@@ -2263,7 +2263,7 @@
             1,
             6
           ],
-          "block": "steamadvantage:steam_switch"
+          "block": "basesteam:steam_switch"
         },
         {
           "id": "middle-drill",
@@ -2305,8 +2305,8 @@
       ],
       "exclusive": false,
       "requiredMods": [
-        "poweradvantage",
-        "steamadvantage"
+        "basepower",
+        "basesteam"
       ],
       "placements": [
         {
@@ -2315,7 +2315,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_boiler_coal",
+          "block": "basesteam:steam_boiler_coal",
           "meta": 0
         },
         {
@@ -2324,7 +2324,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -2333,7 +2333,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_tank",
+          "block": "basesteam:steam_tank",
           "meta": 0
         },
         {
@@ -2342,7 +2342,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -2351,7 +2351,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_furnace",
+          "block": "basesteam:steam_furnace",
           "meta": 0
         },
         {
@@ -2360,7 +2360,7 @@
             1,
             8
           ],
-          "block": "steamadvantage:steam_crusher",
+          "block": "basesteam:steam_crusher",
           "meta": 0
         },
         {
@@ -2369,7 +2369,7 @@
             1,
             10
           ],
-          "block": "steamadvantage:steam_switch",
+          "block": "basesteam:steam_switch",
           "meta": 0
         }
       ],
@@ -2394,7 +2394,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_storage_tank",
+          "block": "basepower:fluid_storage_tank",
           "meta": 0
         },
         {
@@ -2475,8 +2475,8 @@
       ],
       "exclusive": false,
       "requiredMods": [
-        "poweradvantage",
-        "steamadvantage"
+        "basepower",
+        "basesteam"
       ],
       "placements": [
         {
@@ -2494,7 +2494,7 @@
             1,
             7
           ],
-          "block": "steamadvantage:steam_furnace",
+          "block": "basesteam:steam_furnace",
           "meta": 0
         },
         {
@@ -2512,7 +2512,7 @@
             1,
             6
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -2530,7 +2530,7 @@
             1,
             13
           ],
-          "block": "steamadvantage:steam_crusher",
+          "block": "basesteam:steam_crusher",
           "meta": 0
         },
         {
@@ -2548,7 +2548,7 @@
             1,
             12
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -2557,7 +2557,7 @@
             1,
             13
           ],
-          "block": "steamadvantage:steam_still",
+          "block": "basesteam:steam_still",
           "meta": 0
         },
         {
@@ -2566,7 +2566,7 @@
             1,
             13
           ],
-          "block": "steamadvantage:steam_crusher",
+          "block": "basesteam:steam_crusher",
           "meta": 0
         }
       ],
@@ -2591,7 +2591,7 @@
             1,
             5
           ],
-          "block": "poweradvantage:infinite_steam",
+          "block": "basepower:infinite_steam",
           "meta": 0
         },
         {
@@ -2601,7 +2601,7 @@
             1,
             11
           ],
-          "block": "poweradvantage:infinite_steam",
+          "block": "basepower:infinite_steam",
           "meta": 0
         },
         {
@@ -2611,7 +2611,7 @@
             1,
             12
           ],
-          "block": "poweradvantage:infinite_steam",
+          "block": "basepower:infinite_steam",
           "meta": 0
         },
         {
@@ -2739,8 +2739,8 @@
       "exclusive": true,
       "enclosed": true,
       "requiredMods": [
-        "poweradvantage",
-        "steamadvantage"
+        "basepower",
+        "basesteam"
       ],
       "placements": [
         {
@@ -2749,7 +2749,7 @@
             2,
             6
           ],
-          "block": "steamadvantage:steam_drill",
+          "block": "basesteam:steam_drill",
           "meta": 0
         },
         {
@@ -2758,7 +2758,7 @@
             2,
             6
           ],
-          "block": "steamadvantage:steam_drill",
+          "block": "basesteam:steam_drill",
           "meta": 1
         },
         {
@@ -2767,7 +2767,7 @@
             2,
             6
           ],
-          "block": "steamadvantage:steam_drill",
+          "block": "basesteam:steam_drill",
           "meta": 2
         },
         {
@@ -2776,7 +2776,7 @@
             2,
             6
           ],
-          "block": "steamadvantage:steam_drill",
+          "block": "basesteam:steam_drill",
           "meta": 3
         },
         {
@@ -2785,7 +2785,7 @@
             2,
             6
           ],
-          "block": "steamadvantage:steam_drill",
+          "block": "basesteam:steam_drill",
           "meta": 4
         },
         {
@@ -2794,7 +2794,7 @@
             2,
             6
           ],
-          "block": "steamadvantage:steam_drill",
+          "block": "basesteam:steam_drill",
           "meta": 5
         },
         {
@@ -2803,7 +2803,7 @@
             3,
             6
           ],
-          "block": "steamadvantage:steam_track",
+          "block": "basesteam:steam_track",
           "meta": 0
         },
         {
@@ -2812,7 +2812,7 @@
             1,
             6
           ],
-          "block": "steamadvantage:steam_track",
+          "block": "basesteam:steam_track",
           "meta": 0
         },
         {
@@ -2821,7 +2821,7 @@
             2,
             7
           ],
-          "block": "steamadvantage:steam_track",
+          "block": "basesteam:steam_track",
           "meta": 0
         },
         {
@@ -2830,7 +2830,7 @@
             2,
             5
           ],
-          "block": "steamadvantage:steam_track",
+          "block": "basesteam:steam_track",
           "meta": 0
         },
         {
@@ -2839,7 +2839,7 @@
             2,
             6
           ],
-          "block": "steamadvantage:steam_track",
+          "block": "basesteam:steam_track",
           "meta": 0
         },
         {
@@ -2848,7 +2848,7 @@
             2,
             6
           ],
-          "block": "steamadvantage:steam_track",
+          "block": "basesteam:steam_track",
           "meta": 0
         },
         {
@@ -2857,7 +2857,7 @@
             1,
             6
           ],
-          "block": "steamadvantage:drillbit",
+          "block": "basesteam:drillbit",
           "meta": 0
         },
         {
@@ -2866,7 +2866,7 @@
             3,
             6
           ],
-          "block": "steamadvantage:drillbit",
+          "block": "basesteam:drillbit",
           "meta": 1
         },
         {
@@ -2875,7 +2875,7 @@
             2,
             5
           ],
-          "block": "steamadvantage:drillbit",
+          "block": "basesteam:drillbit",
           "meta": 2
         },
         {
@@ -2884,7 +2884,7 @@
             2,
             7
           ],
-          "block": "steamadvantage:drillbit",
+          "block": "basesteam:drillbit",
           "meta": 3
         },
         {
@@ -2893,7 +2893,7 @@
             2,
             6
           ],
-          "block": "steamadvantage:drillbit",
+          "block": "basesteam:drillbit",
           "meta": 4
         },
         {
@@ -2902,7 +2902,7 @@
             2,
             6
           ],
-          "block": "steamadvantage:drillbit",
+          "block": "basesteam:drillbit",
           "meta": 5
         },
         {
@@ -2969,7 +2969,7 @@
             2,
             7
           ],
-          "block": "poweradvantage:infinite_steam",
+          "block": "basepower:infinite_steam",
           "meta": 0
         },
         {
@@ -2979,7 +2979,7 @@
             2,
             7
           ],
-          "block": "poweradvantage:infinite_steam",
+          "block": "basepower:infinite_steam",
           "meta": 0
         },
         {
@@ -2989,7 +2989,7 @@
             2,
             9
           ],
-          "block": "poweradvantage:infinite_steam",
+          "block": "basepower:infinite_steam",
           "meta": 0
         },
         {
@@ -2999,7 +2999,7 @@
             2,
             3
           ],
-          "block": "poweradvantage:infinite_steam",
+          "block": "basepower:infinite_steam",
           "meta": 0
         },
         {
@@ -3009,7 +3009,7 @@
             2,
             7
           ],
-          "block": "poweradvantage:infinite_steam",
+          "block": "basepower:infinite_steam",
           "meta": 0
         },
         {
@@ -3019,7 +3019,7 @@
             2,
             7
           ],
-          "block": "poweradvantage:infinite_steam",
+          "block": "basepower:infinite_steam",
           "meta": 0
         }
       ],
@@ -3082,7 +3082,7 @@
             2,
             6
           ],
-          "block": "steamadvantage:steam_drill",
+          "block": "basesteam:steam_drill",
           "meta": 0
         },
         {
@@ -3093,7 +3093,7 @@
             2,
             6
           ],
-          "block": "steamadvantage:steam_drill",
+          "block": "basesteam:steam_drill",
           "meta": 1
         },
         {
@@ -3104,7 +3104,7 @@
             2,
             6
           ],
-          "block": "steamadvantage:steam_drill",
+          "block": "basesteam:steam_drill",
           "meta": 2
         },
         {
@@ -3115,7 +3115,7 @@
             2,
             6
           ],
-          "block": "steamadvantage:steam_drill",
+          "block": "basesteam:steam_drill",
           "meta": 3
         },
         {
@@ -3126,7 +3126,7 @@
             2,
             6
           ],
-          "block": "steamadvantage:steam_drill",
+          "block": "basesteam:steam_drill",
           "meta": 4
         },
         {
@@ -3137,7 +3137,7 @@
             2,
             6
           ],
-          "block": "steamadvantage:steam_drill",
+          "block": "basesteam:steam_drill",
           "meta": 5
         }
       ],
@@ -3172,8 +3172,8 @@
       "exclusive": true,
       "enclosed": true,
       "requiredMods": [
-        "poweradvantage",
-        "steamadvantage"
+        "basepower",
+        "basesteam"
       ],
       "placements": [
         {
@@ -3182,7 +3182,7 @@
             5,
             10
           ],
-          "block": "steamadvantage:steam_pump",
+          "block": "basesteam:steam_pump",
           "meta": 0
         },
         {
@@ -3191,7 +3191,7 @@
             4,
             10
           ],
-          "block": "steamadvantage:pump_pipe_steam",
+          "block": "basesteam:pump_pipe_steam",
           "meta": 0
         },
         {
@@ -3200,7 +3200,7 @@
             3,
             10
           ],
-          "block": "steamadvantage:pump_pipe_steam",
+          "block": "basesteam:pump_pipe_steam",
           "meta": 0
         },
         {
@@ -3209,7 +3209,7 @@
             5,
             10
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -3218,7 +3218,7 @@
             5,
             10
           ],
-          "block": "poweradvantage:fluid_metal_tank",
+          "block": "basepower:fluid_metal_tank",
           "meta": 0
         },
         {
@@ -3227,7 +3227,7 @@
             5,
             20
           ],
-          "block": "steamadvantage:steam_pump",
+          "block": "basesteam:steam_pump",
           "meta": 0
         },
         {
@@ -3449,7 +3449,7 @@
             5,
             11
           ],
-          "block": "poweradvantage:infinite_steam",
+          "block": "basepower:infinite_steam",
           "meta": 0
         }
       ],
@@ -3490,7 +3490,7 @@
             4,
             10
           ],
-          "block": "steamadvantage:pump_pipe_steam"
+          "block": "basesteam:pump_pipe_steam"
         },
         {
           "id": "pump-fluid-persisted",
@@ -3534,8 +3534,8 @@
       "exclusive": true,
       "enclosed": true,
       "requiredMods": [
-        "poweradvantage",
-        "steamadvantage"
+        "basepower",
+        "basesteam"
       ],
       "placements": [
         {
@@ -3544,7 +3544,7 @@
             1,
             12
           ],
-          "block": "steamadvantage:steam_elevator",
+          "block": "basesteam:steam_elevator",
           "meta": 0
         },
         {
@@ -3553,7 +3553,7 @@
             1,
             12
           ],
-          "block": "steamadvantage:steam_pipe",
+          "block": "basesteam:steam_pipe",
           "meta": 0
         },
         {
@@ -3629,7 +3629,7 @@
             1,
             12
           ],
-          "block": "poweradvantage:infinite_steam",
+          "block": "basepower:infinite_steam",
           "meta": 0
         }
       ],
@@ -3661,7 +3661,7 @@
             2,
             12
           ],
-          "block": "steamadvantage:platform"
+          "block": "basesteam:platform"
         }
       ],
       "manualChecks": [
@@ -3694,8 +3694,8 @@
       "exclusive": true,
       "enclosed": true,
       "requiredMods": [
-        "poweradvantage",
-        "steamadvantage"
+        "basepower",
+        "basesteam"
       ],
       "placements": [
         {
@@ -3807,7 +3807,7 @@
             5
           ],
           "slot": 0,
-          "item": "steamadvantage:musket",
+          "item": "basesteam:musket",
           "count": 1
         },
         {
@@ -3818,7 +3818,7 @@
             5
           ],
           "slot": 1,
-          "item": "steamadvantage:musket",
+          "item": "basesteam:musket",
           "count": 1,
           "nbt": {
             "loaded": 1
@@ -3832,7 +3832,7 @@
             5
           ],
           "slot": 2,
-          "item": "steamadvantage:blackpowder_cartridge",
+          "item": "basesteam:blackpowder_cartridge",
           "count": 64
         },
         {
@@ -3843,7 +3843,7 @@
             5
           ],
           "slot": 3,
-          "item": "steamadvantage:steam_governor",
+          "item": "basesteam:steam_governor",
           "count": 8
         },
         {
@@ -3854,61 +3854,61 @@
             5
           ],
           "slot": 4,
-          "item": "steamadvantage:steam_drill_bit",
+          "item": "basesteam:steam_drill_bit",
           "count": 8
         },
         {
           "type": "setInventory",
           "pos": [3, 1, 5],
           "slot": 5,
-          "item": "steamadvantage:musket",
+          "item": "basesteam:musket",
           "count": 1,
-          "enchantment": "steamadvantage:rapid_reload",
+          "enchantment": "basesteam:rapid_reload",
           "level": 1
         },
         {
           "type": "setInventory",
           "pos": [3, 1, 5],
           "slot": 6,
-          "item": "steamadvantage:musket",
+          "item": "basesteam:musket",
           "count": 1,
-          "enchantment": "steamadvantage:powderless",
+          "enchantment": "basesteam:powderless",
           "level": 1
         },
         {
           "type": "setInventory",
           "pos": [3, 1, 5],
           "slot": 7,
-          "item": "steamadvantage:musket",
+          "item": "basesteam:musket",
           "count": 1,
-          "enchantment": "steamadvantage:high_explosive",
+          "enchantment": "basesteam:high_explosive",
           "level": 1
         },
         {
           "type": "setInventory",
           "pos": [3, 1, 5],
           "slot": 8,
-          "item": "steamadvantage:musket",
+          "item": "basesteam:musket",
           "count": 1,
-          "enchantment": "steamadvantage:high_explosive",
+          "enchantment": "basesteam:high_explosive",
           "level": 5
         },
         {
           "type": "setInventory",
           "pos": [3, 1, 5],
           "slot": 9,
-          "item": "steamadvantage:musket",
+          "item": "basesteam:musket",
           "count": 1,
-          "enchantment": "steamadvantage:recoil",
+          "enchantment": "basesteam:recoil",
           "level": 1
         },
         {
           "type": "setInventory",
           "pos": [3, 1, 5],
           "slot": 10,
-          "item": "steamadvantage:musket",
+          "item": "basesteam:musket",
           "count": 1,
-          "enchantment": "steamadvantage:recoil",
+          "enchantment": "basesteam:recoil",
           "level": 5
         }
       ],
@@ -3919,13 +3919,13 @@
           "id": "musket-item",
           "type": "registryItem",
           "pos": null,
-          "item": "steamadvantage:musket"
+          "item": "basesteam:musket"
         },
         {
           "id": "cartridge-item",
           "type": "registryItem",
           "pos": null,
-          "item": "steamadvantage:blackpowder_cartridge"
+          "item": "basesteam:blackpowder_cartridge"
         },
         {
           "id": "range-chest",
@@ -3940,7 +3940,7 @@
           "id": "stocked-muskets",
           "type": "inventoryCount",
           "pos": [3, 1, 5],
-          "item": "steamadvantage:musket",
+          "item": "basesteam:musket",
           "count": 8,
           "operator": "min"
         }
@@ -3975,8 +3975,8 @@
       "exclusive": true,
       "enclosed": true,
       "requiredMods": [
-        "poweradvantage",
-        "electricadvantage"
+        "basepower",
+        "baseelectric"
       ],
       "placements": [
         {
@@ -3985,7 +3985,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:photovoltaic_generator",
+          "block": "baseelectric:photovoltaic_generator",
           "meta": 0
         },
         {
@@ -3994,7 +3994,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_conduit",
+          "block": "baseelectric:electric_conduit",
           "meta": 0
         },
         {
@@ -4003,7 +4003,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_battery_array",
+          "block": "baseelectric:electric_battery_array",
           "meta": 0
         },
         {
@@ -4228,7 +4228,7 @@
             4,
             12
           ],
-          "block": "electricadvantage:hydroelectric_generator",
+          "block": "baseelectric:hydroelectric_generator",
           "meta": 0
         },
         {
@@ -4237,7 +4237,7 @@
             4,
             12
           ],
-          "block": "electricadvantage:electric_battery_array",
+          "block": "baseelectric:electric_battery_array",
           "meta": 0
         },
         {
@@ -4246,7 +4246,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:steam_powered_generator",
+          "block": "baseelectric:steam_powered_generator",
           "meta": 0
         },
         {
@@ -4255,7 +4255,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_conduit",
+          "block": "baseelectric:electric_conduit",
           "meta": 0
         },
         {
@@ -4264,7 +4264,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_battery_array",
+          "block": "baseelectric:electric_battery_array",
           "meta": 0
         }
       ],
@@ -4276,7 +4276,7 @@
             1,
             7
           ],
-          "item": "electricadvantage:lithium_battery",
+          "item": "baseelectric:lithium_battery",
           "slot": 0,
           "count": 1,
           "nbt": {
@@ -4290,7 +4290,7 @@
             4,
             12
           ],
-          "item": "electricadvantage:lithium_battery",
+          "item": "baseelectric:lithium_battery",
           "slot": 0,
           "count": 1,
           "nbt": {
@@ -4304,7 +4304,7 @@
             1,
             7
           ],
-          "item": "electricadvantage:lithium_battery",
+          "item": "baseelectric:lithium_battery",
           "slot": 0,
           "count": 1,
           "nbt": {
@@ -4328,7 +4328,7 @@
             4,
             12
           ],
-          "item": "electricadvantage:lithium_battery",
+          "item": "baseelectric:lithium_battery",
           "slot": 0,
           "count": 1,
           "nbt": {
@@ -4342,7 +4342,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:infinite_steam",
+          "block": "basepower:infinite_steam",
           "meta": 0
         },
         {
@@ -4400,7 +4400,7 @@
             4,
             12
           ],
-          "block": "electricadvantage:hydroelectric_generator",
+          "block": "baseelectric:hydroelectric_generator",
           "meta": 10
         },
         {
@@ -4455,8 +4455,8 @@
       ],
       "exclusive": false,
       "requiredMods": [
-        "poweradvantage",
-        "electricadvantage"
+        "basepower",
+        "baseelectric"
       ],
       "placements": [
         {
@@ -4465,7 +4465,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_battery_array",
+          "block": "baseelectric:electric_battery_array",
           "meta": 0
         },
         {
@@ -4474,7 +4474,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_conduit",
+          "block": "baseelectric:electric_conduit",
           "meta": 0
         },
         {
@@ -4483,7 +4483,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_switch",
+          "block": "baseelectric:electric_switch",
           "meta": 0
         },
         {
@@ -4492,7 +4492,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_conduit",
+          "block": "baseelectric:electric_conduit",
           "meta": 0
         },
         {
@@ -4501,7 +4501,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_crusher",
+          "block": "baseelectric:electric_crusher",
           "meta": 0
         },
         {
@@ -4510,7 +4510,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_furnace",
+          "block": "baseelectric:electric_furnace",
           "meta": 0
         },
         {
@@ -4519,7 +4519,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_fabricator",
+          "block": "baseelectric:electric_fabricator",
           "meta": 0
         },
         {
@@ -4541,7 +4541,7 @@
             7
           ],
           "slot": 0,
-          "item": "electricadvantage:lead_acid_battery",
+          "item": "baseelectric:lead_acid_battery",
           "count": 1,
           "nbt": {
             "energy": 0
@@ -4555,7 +4555,7 @@
             7
           ],
           "slot": 1,
-          "item": "electricadvantage:nickel_hydride_battery",
+          "item": "baseelectric:nickel_hydride_battery",
           "count": 1,
           "nbt": {
             "energy": 250
@@ -4569,7 +4569,7 @@
             7
           ],
           "slot": 2,
-          "item": "electricadvantage:alkaline_battery",
+          "item": "baseelectric:alkaline_battery",
           "count": 1
         },
         {
@@ -4580,7 +4580,7 @@
             7
           ],
           "slot": 3,
-          "item": "electricadvantage:lithium_battery",
+          "item": "baseelectric:lithium_battery",
           "count": 1
         },
         {
@@ -4591,7 +4591,7 @@
             12
           ],
           "slot": 0,
-          "item": "electricadvantage:blank_circuit_board",
+          "item": "baseelectric:blank_circuit_board",
           "count": 8
         },
         {
@@ -4602,7 +4602,7 @@
             12
           ],
           "slot": 1,
-          "item": "electricadvantage:control_circuit",
+          "item": "baseelectric:control_circuit",
           "count": 8
         },
         {
@@ -4613,7 +4613,7 @@
             12
           ],
           "slot": 2,
-          "item": "electricadvantage:integrated_circuit",
+          "item": "baseelectric:integrated_circuit",
           "count": 8
         },
         {
@@ -4624,7 +4624,7 @@
             12
           ],
           "slot": 3,
-          "item": "electricadvantage:psu",
+          "item": "baseelectric:psu",
           "count": 8
         },
         {
@@ -4635,7 +4635,7 @@
             12
           ],
           "slot": 4,
-          "item": "electricadvantage:silicon_ingot",
+          "item": "baseelectric:silicon_ingot",
           "count": 8
         },
         {
@@ -4646,7 +4646,7 @@
             12
           ],
           "slot": 5,
-          "item": "electricadvantage:silicon_mix",
+          "item": "baseelectric:silicon_mix",
           "count": 8
         },
         {
@@ -4657,7 +4657,7 @@
             12
           ],
           "slot": 6,
-          "item": "electricadvantage:solder_mix",
+          "item": "baseelectric:solder_mix",
           "count": 8
         },
         {
@@ -4668,7 +4668,7 @@
             12
           ],
           "slot": 7,
-          "item": "electricadvantage:solder",
+          "item": "baseelectric:solder",
           "count": 8
         },
         {
@@ -4679,7 +4679,7 @@
             12
           ],
           "slot": 8,
-          "item": "electricadvantage:li_ingot",
+          "item": "baseelectric:li_ingot",
           "count": 8
         },
         {
@@ -4690,7 +4690,7 @@
             12
           ],
           "slot": 9,
-          "item": "electricadvantage:li_powder",
+          "item": "baseelectric:li_powder",
           "count": 8
         },
         {
@@ -4701,7 +4701,7 @@
             12
           ],
           "slot": 10,
-          "item": "electricadvantage:li_nugget",
+          "item": "baseelectric:li_nugget",
           "count": 8
         },
         {
@@ -4712,7 +4712,7 @@
             12
           ],
           "slot": 11,
-          "item": "electricadvantage:sulfur_powder",
+          "item": "baseelectric:sulfur_powder",
           "count": 8
         },
         {
@@ -4723,14 +4723,14 @@
             12
           ],
           "slot": 12,
-          "item": "electricadvantage:petrolplastic_ingot",
+          "item": "baseelectric:petrolplastic_ingot",
           "count": 8
         },
         {
           "type": "setInventory",
           "pos": [3, 1, 12],
           "slot": 13,
-          "item": "electricadvantage:lead_acid_battery",
+          "item": "baseelectric:lead_acid_battery",
           "count": 1,
           "nbt": {"energy": 0}
         },
@@ -4738,7 +4738,7 @@
           "type": "setInventory",
           "pos": [3, 1, 12],
           "slot": 14,
-          "item": "electricadvantage:lead_acid_battery",
+          "item": "baseelectric:lead_acid_battery",
           "count": 1,
           "nbt": {"energy": 500}
         },
@@ -4746,14 +4746,14 @@
           "type": "setInventory",
           "pos": [3, 1, 12],
           "slot": 15,
-          "item": "electricadvantage:lead_acid_battery",
+          "item": "baseelectric:lead_acid_battery",
           "count": 1
         },
         {
           "type": "setInventory",
           "pos": [3, 1, 12],
           "slot": 16,
-          "item": "electricadvantage:nickel_hydride_battery",
+          "item": "baseelectric:nickel_hydride_battery",
           "count": 1,
           "nbt": {"energy": 0}
         },
@@ -4761,7 +4761,7 @@
           "type": "setInventory",
           "pos": [3, 1, 12],
           "slot": 17,
-          "item": "electricadvantage:nickel_hydride_battery",
+          "item": "baseelectric:nickel_hydride_battery",
           "count": 1,
           "nbt": {"energy": 1000}
         },
@@ -4769,14 +4769,14 @@
           "type": "setInventory",
           "pos": [3, 1, 12],
           "slot": 18,
-          "item": "electricadvantage:nickel_hydride_battery",
+          "item": "baseelectric:nickel_hydride_battery",
           "count": 1
         },
         {
           "type": "setInventory",
           "pos": [3, 1, 12],
           "slot": 19,
-          "item": "electricadvantage:alkaline_battery",
+          "item": "baseelectric:alkaline_battery",
           "count": 1,
           "nbt": {"energy": 0}
         },
@@ -4784,7 +4784,7 @@
           "type": "setInventory",
           "pos": [3, 1, 12],
           "slot": 20,
-          "item": "electricadvantage:alkaline_battery",
+          "item": "baseelectric:alkaline_battery",
           "count": 1,
           "nbt": {"energy": 2000}
         },
@@ -4792,14 +4792,14 @@
           "type": "setInventory",
           "pos": [3, 1, 12],
           "slot": 21,
-          "item": "electricadvantage:alkaline_battery",
+          "item": "baseelectric:alkaline_battery",
           "count": 1
         },
         {
           "type": "setInventory",
           "pos": [3, 1, 12],
           "slot": 22,
-          "item": "electricadvantage:lithium_battery",
+          "item": "baseelectric:lithium_battery",
           "count": 1,
           "nbt": {"energy": 0}
         },
@@ -4807,7 +4807,7 @@
           "type": "setInventory",
           "pos": [3, 1, 12],
           "slot": 23,
-          "item": "electricadvantage:lithium_battery",
+          "item": "baseelectric:lithium_battery",
           "count": 1,
           "nbt": {"energy": 4000}
         },
@@ -4815,7 +4815,7 @@
           "type": "setInventory",
           "pos": [3, 1, 12],
           "slot": 24,
-          "item": "electricadvantage:lithium_battery",
+          "item": "baseelectric:lithium_battery",
           "count": 1
         }
       ],
@@ -4827,7 +4827,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         }
       ],
@@ -4859,13 +4859,13 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_switch"
+          "block": "baseelectric:electric_switch"
         },
         {
           "id": "lithium-battery",
           "type": "registryItem",
           "pos": null,
-          "item": "electricadvantage:lithium_battery"
+          "item": "baseelectric:lithium_battery"
         },
         {
           "id": "lead-empty-nbt",
@@ -4933,8 +4933,8 @@
       ],
       "exclusive": false,
       "requiredMods": [
-        "poweradvantage",
-        "electricadvantage"
+        "basepower",
+        "baseelectric"
       ],
       "placements": [
         {
@@ -4943,7 +4943,7 @@
             1,
             6
           ],
-          "block": "electricadvantage:electric_crusher",
+          "block": "baseelectric:electric_crusher",
           "meta": 0
         },
         {
@@ -4952,7 +4952,7 @@
             1,
             6
           ],
-          "block": "electricadvantage:electric_furnace",
+          "block": "baseelectric:electric_furnace",
           "meta": 0
         },
         {
@@ -4961,7 +4961,7 @@
             1,
             6
           ],
-          "block": "electricadvantage:electric_oven",
+          "block": "baseelectric:electric_oven",
           "meta": 0
         },
         {
@@ -4970,7 +4970,7 @@
             1,
             6
           ],
-          "block": "electricadvantage:electric_fabricator",
+          "block": "baseelectric:electric_fabricator",
           "meta": 0
         },
         {
@@ -4988,7 +4988,7 @@
             1,
             10
           ],
-          "block": "poweradvantage:item_conveyor",
+          "block": "basepower:item_conveyor",
           "meta": 5
         },
         {
@@ -5006,7 +5006,7 @@
             1,
             14
           ],
-          "block": "electricadvantage:li_ore",
+          "block": "baseelectric:li_ore",
           "meta": 0
         },
         {
@@ -5015,7 +5015,7 @@
             1,
             14
           ],
-          "block": "electricadvantage:sulfur_ore",
+          "block": "baseelectric:sulfur_ore",
           "meta": 0
         }
       ],
@@ -5028,7 +5028,7 @@
             1,
             5
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         },
         {
@@ -5038,7 +5038,7 @@
             1,
             5
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         },
         {
@@ -5048,7 +5048,7 @@
             1,
             5
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         },
         {
@@ -5058,7 +5058,7 @@
             1,
             5
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         },
         {
@@ -5185,8 +5185,8 @@
       ],
       "exclusive": true,
       "requiredMods": [
-        "poweradvantage",
-        "electricadvantage"
+        "basepower",
+        "baseelectric"
       ],
       "placements": [
         {
@@ -5195,7 +5195,7 @@
             5,
             7
           ],
-          "block": "electricadvantage:electric_pump",
+          "block": "baseelectric:electric_pump",
           "meta": 0
         },
         {
@@ -5204,7 +5204,7 @@
             4,
             7
           ],
-          "block": "electricadvantage:pump_pipe_electric",
+          "block": "baseelectric:pump_pipe_electric",
           "meta": 0
         },
         {
@@ -5213,7 +5213,7 @@
             5,
             7
           ],
-          "block": "electricadvantage:electric_conduit",
+          "block": "baseelectric:electric_conduit",
           "meta": 0
         },
         {
@@ -5222,7 +5222,7 @@
             5,
             7
           ],
-          "block": "poweradvantage:fluid_metal_tank",
+          "block": "basepower:fluid_metal_tank",
           "meta": 0
         },
         {
@@ -5231,7 +5231,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_still",
+          "block": "baseelectric:electric_still",
           "meta": 0
         },
         {
@@ -5240,7 +5240,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:plastic_refinery",
+          "block": "baseelectric:plastic_refinery",
           "meta": 0
         },
         {
@@ -5249,7 +5249,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_storage_tank",
+          "block": "basepower:fluid_storage_tank",
           "meta": 0
         },
         {
@@ -5258,7 +5258,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_storage_tank",
+          "block": "basepower:fluid_storage_tank",
           "meta": 0
         },
         {
@@ -5267,7 +5267,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_storage_tank",
+          "block": "basepower:fluid_storage_tank",
           "meta": 0
         },
         {
@@ -5320,7 +5320,7 @@
             5,
             6
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         },
         {
@@ -5330,7 +5330,7 @@
             1,
             6
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         },
         {
@@ -5340,7 +5340,7 @@
             1,
             6
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         }
       ],
@@ -5414,7 +5414,7 @@
             4,
             7
           ],
-          "block": "electricadvantage:pump_pipe_electric"
+          "block": "baseelectric:pump_pipe_electric"
         }
       ],
       "manualChecks": [
@@ -5446,8 +5446,8 @@
       ],
       "exclusive": false,
       "requiredMods": [
-        "poweradvantage",
-        "electricadvantage"
+        "basepower",
+        "baseelectric"
       ],
       "placements": [
         {
@@ -5456,7 +5456,7 @@
             1,
             8
           ],
-          "block": "electricadvantage:growth_chamber_controller",
+          "block": "baseelectric:growth_chamber_controller",
           "meta": 0
         },
         {
@@ -5465,7 +5465,7 @@
             1,
             8
           ],
-          "block": "electricadvantage:growth_chamber",
+          "block": "baseelectric:growth_chamber",
           "meta": 0
         },
         {
@@ -5474,7 +5474,7 @@
             1,
             8
           ],
-          "block": "electricadvantage:growth_chamber",
+          "block": "baseelectric:growth_chamber",
           "meta": 0
         },
         {
@@ -5483,7 +5483,7 @@
             1,
             8
           ],
-          "block": "electricadvantage:growth_chamber",
+          "block": "baseelectric:growth_chamber",
           "meta": 0
         },
         {
@@ -5492,7 +5492,7 @@
             1,
             9
           ],
-          "block": "electricadvantage:growth_chamber",
+          "block": "baseelectric:growth_chamber",
           "meta": 0
         },
         {
@@ -5501,7 +5501,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_conduit",
+          "block": "baseelectric:electric_conduit",
           "meta": 0
         },
         {
@@ -5510,7 +5510,7 @@
             1,
             8
           ],
-          "block": "poweradvantage:fluid_storage_tank",
+          "block": "basepower:fluid_storage_tank",
           "meta": 0
         },
         {
@@ -5587,7 +5587,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         }
       ],
@@ -5660,8 +5660,8 @@
       "exclusive": true,
       "enclosed": true,
       "requiredMods": [
-        "poweradvantage",
-        "electricadvantage"
+        "basepower",
+        "baseelectric"
       ],
       "placements": [
         {
@@ -5670,7 +5670,7 @@
             2,
             6
           ],
-          "block": "electricadvantage:electric_drill",
+          "block": "baseelectric:electric_drill",
           "property": "facing",
           "expectedText": "down"
         },
@@ -5680,7 +5680,7 @@
             2,
             6
           ],
-          "block": "electricadvantage:electric_drill",
+          "block": "baseelectric:electric_drill",
           "meta": 1
         },
         {
@@ -5689,7 +5689,7 @@
             2,
             6
           ],
-          "block": "electricadvantage:electric_drill",
+          "block": "baseelectric:electric_drill",
           "meta": 2
         },
         {
@@ -5698,7 +5698,7 @@
             2,
             6
           ],
-          "block": "electricadvantage:electric_drill",
+          "block": "baseelectric:electric_drill",
           "meta": 3
         },
         {
@@ -5707,7 +5707,7 @@
             2,
             6
           ],
-          "block": "electricadvantage:electric_drill",
+          "block": "baseelectric:electric_drill",
           "meta": 4
         },
         {
@@ -5716,7 +5716,7 @@
             2,
             6
           ],
-          "block": "electricadvantage:electric_drill",
+          "block": "baseelectric:electric_drill",
           "meta": 5
         },
         {
@@ -5725,7 +5725,7 @@
             3,
             6
           ],
-          "block": "electricadvantage:electric_track",
+          "block": "baseelectric:electric_track",
           "meta": 0
         },
         {
@@ -5734,7 +5734,7 @@
             1,
             6
           ],
-          "block": "electricadvantage:electric_track",
+          "block": "baseelectric:electric_track",
           "meta": 0
         },
         {
@@ -5743,7 +5743,7 @@
             2,
             7
           ],
-          "block": "electricadvantage:electric_track",
+          "block": "baseelectric:electric_track",
           "meta": 0
         },
         {
@@ -5752,7 +5752,7 @@
             2,
             5
           ],
-          "block": "electricadvantage:electric_track",
+          "block": "baseelectric:electric_track",
           "meta": 0
         },
         {
@@ -5761,7 +5761,7 @@
             2,
             6
           ],
-          "block": "electricadvantage:electric_track",
+          "block": "baseelectric:electric_track",
           "meta": 0
         },
         {
@@ -5770,7 +5770,7 @@
             2,
             6
           ],
-          "block": "electricadvantage:electric_track",
+          "block": "baseelectric:electric_track",
           "meta": 0
         },
         {
@@ -5837,7 +5837,7 @@
             2,
             7
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         },
         {
@@ -5847,7 +5847,7 @@
             2,
             7
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         },
         {
@@ -5857,7 +5857,7 @@
             2,
             9
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         },
         {
@@ -5867,7 +5867,7 @@
             2,
             3
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         },
         {
@@ -5877,7 +5877,7 @@
             2,
             7
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         },
         {
@@ -5887,7 +5887,7 @@
             2,
             7
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         }
       ],
@@ -5950,7 +5950,7 @@
             2,
             6
           ],
-          "block": "electricadvantage:electric_drill",
+          "block": "baseelectric:electric_drill",
           "property": "facing",
           "expectedText": "down"
         },
@@ -5962,7 +5962,7 @@
             2,
             6
           ],
-          "block": "electricadvantage:electric_drill",
+          "block": "baseelectric:electric_drill",
           "property": "facing",
           "expectedText": "up"
         },
@@ -5974,7 +5974,7 @@
             2,
             6
           ],
-          "block": "electricadvantage:electric_drill",
+          "block": "baseelectric:electric_drill",
           "property": "facing",
           "expectedText": "north"
         },
@@ -5986,7 +5986,7 @@
             2,
             6
           ],
-          "block": "electricadvantage:electric_drill",
+          "block": "baseelectric:electric_drill",
           "property": "facing",
           "expectedText": "south"
         },
@@ -5998,7 +5998,7 @@
             2,
             6
           ],
-          "block": "electricadvantage:electric_drill",
+          "block": "baseelectric:electric_drill",
           "property": "facing",
           "expectedText": "west"
         },
@@ -6010,7 +6010,7 @@
             2,
             6
           ],
-          "block": "electricadvantage:electric_drill",
+          "block": "baseelectric:electric_drill",
           "property": "facing",
           "expectedText": "east"
         }
@@ -6046,8 +6046,8 @@
       "exclusive": true,
       "enclosed": true,
       "requiredMods": [
-        "poweradvantage",
-        "electricadvantage"
+        "basepower",
+        "baseelectric"
       ],
       "placements": [
         {
@@ -6056,7 +6056,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:led_bar",
+          "block": "baseelectric:led_bar",
           "meta": 0
         },
         {
@@ -6065,7 +6065,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_conduit",
+          "block": "baseelectric:electric_conduit",
           "meta": 0
         },
         {
@@ -6074,7 +6074,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_switch",
+          "block": "baseelectric:electric_switch",
           "meta": 0
         },
         {
@@ -6083,7 +6083,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:laser_turret",
+          "block": "baseelectric:laser_turret",
           "meta": 0
         },
         {
@@ -6092,7 +6092,7 @@
             1,
             7
           ],
-          "block": "electricadvantage:electric_conduit",
+          "block": "baseelectric:electric_conduit",
           "meta": 0
         },
         {
@@ -6101,7 +6101,7 @@
             1,
             20
           ],
-          "block": "electricadvantage:laser_turret_evil",
+          "block": "baseelectric:laser_turret_evil",
           "meta": 0
         },
         {
@@ -6159,7 +6159,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         },
         {
@@ -6169,7 +6169,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         }
       ],
@@ -6249,8 +6249,8 @@
       ],
       "exclusive": true,
       "requiredMods": [
-        "poweradvantage",
-        "electricadvantage"
+        "basepower",
+        "baseelectric"
       ],
       "placements": [
         {
@@ -6259,7 +6259,7 @@
             1,
             10
           ],
-          "block": "electricadvantage:electric_fabricator",
+          "block": "baseelectric:electric_fabricator",
           "meta": 0
         },
         {
@@ -6268,7 +6268,7 @@
             1,
             10
           ],
-          "block": "electricadvantage:electric_conduit",
+          "block": "baseelectric:electric_conduit",
           "meta": 0
         },
         {
@@ -6358,7 +6358,7 @@
             1,
             9
           ],
-          "block": "poweradvantage:infinite_electricity",
+          "block": "basepower:infinite_electricity",
           "meta": 0
         }
       ],
@@ -6431,7 +6431,7 @@
       ],
       "exclusive": false,
       "requiredMods": [
-        "poweradvantage"
+        "basepower"
       ],
       "placements": [
         {
@@ -6440,7 +6440,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_pipe",
+          "block": "basepower:fluid_pipe",
           "meta": 0
         },
         {
@@ -6449,7 +6449,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_storage_tank",
+          "block": "basepower:fluid_storage_tank",
           "meta": 0
         },
         {
@@ -6523,7 +6523,7 @@
             1,
             7
           ],
-          "block": "poweradvantage:fluid_pipe"
+          "block": "basepower:fluid_pipe"
         },
         {
           "id": "api-tank-filled",
diff --git a/test-rig/src/runner/java/zone/moddev/mc/advantageworks/runner/WorksRunner.java b/test-rig/src/runner/java/zone/moddev/mc/advantageworks/runner/WorksRunner.java
index f7114cf0..895de358 100644
--- a/test-rig/src/runner/java/zone/moddev/mc/advantageworks/runner/WorksRunner.java
+++ b/test-rig/src/runner/java/zone/moddev/mc/advantageworks/runner/WorksRunner.java
@@ -473,7 +473,7 @@ private static void writeRuntimeFiles(File runtime, Profile profile) throws Exce
         if (!config.isDirectory() && !config.mkdirs()) {
             throw new IllegalStateException("Cannot create config directory " + config);
         }
-        write(new File(config, "poweradvantage.cfg"),
+        write(new File(config, "basepower.cfg"),
                 "options {\n    S:recipe_mode=" + profile.recipeMode + "\n}\n");
         String properties = "allow-flight=true\n"
                 + "difficulty=0\n"
diff --git a/test-rig/src/test/java/zone/moddev/mc/advantageworks/AssertionChecksTest.java b/test-rig/src/test/java/zone/moddev/mc/advantageworks/AssertionChecksTest.java
index af32face..5165acf2 100644
--- a/test-rig/src/test/java/zone/moddev/mc/advantageworks/AssertionChecksTest.java
+++ b/test-rig/src/test/java/zone/moddev/mc/advantageworks/AssertionChecksTest.java
@@ -52,7 +52,7 @@ public class AssertionChecksTest {
         tank.setInt("Amount", 1000);
         tank.setString("FluidName", "minecraft:water");
         assertEquals(1000, AssertionChecks.fluidAmount(tile, "Tank", "minecraft:water"));
-        assertEquals(0, AssertionChecks.fluidAmount(tile, "Tank", "poweradvantage:crude_oil"));
+        assertEquals(0, AssertionChecks.fluidAmount(tile, "Tank", "basepower:crude_oil"));
     }
 
     private Map row(String status) { return Collections.singletonMap("status", status); }
diff --git a/test-rig/src/test/java/zone/moddev/mc/advantageworks/ConnectedSessionTest.java b/test-rig/src/test/java/zone/moddev/mc/advantageworks/ConnectedSessionTest.java
index dc96171d..c2d9f40d 100644
--- a/test-rig/src/test/java/zone/moddev/mc/advantageworks/ConnectedSessionTest.java
+++ b/test-rig/src/test/java/zone/moddev/mc/advantageworks/ConnectedSessionTest.java
@@ -15,7 +15,7 @@ private JsonObject definition(String blocks) {
     }
 
     @Test(expected = IllegalArgumentException.class) public void rejectsInfinitePower() {
-        ConnectedSession.validate(definition("{id:'source',x:1,y:80,z:1,name:'poweradvantage:infinite_steam'}"));
+        ConnectedSession.validate(definition("{id:'source',x:1,y:80,z:1,name:'basepower:infinite_steam'}"));
     }
 
     @Test(expected = IllegalArgumentException.class) public void rejectsOverlappingPlacements() {
diff --git a/test-rig/src/test/java/zone/moddev/mc/advantageworks/LifecycleProbeTest.java b/test-rig/src/test/java/zone/moddev/mc/advantageworks/LifecycleProbeTest.java
index 6896ce6e..753d9980 100644
--- a/test-rig/src/test/java/zone/moddev/mc/advantageworks/LifecycleProbeTest.java
+++ b/test-rig/src/test/java/zone/moddev/mc/advantageworks/LifecycleProbeTest.java
@@ -13,7 +13,7 @@ private LifecycleProbe.Fixture fixture() {
         fixture.from = new int[] {2063, 80, 2063};
         fixture.to = new int[] {2063, 80, 2064};
         fixture.hold = new int[] {2063, 81, 2064};
-        fixture.block = "steamadvantage:steam_drill";
+        fixture.block = "basesteam:steam_drill";
         fixture.energyType = "steam";
         fixture.initialEnergy = 40;
         fixture.witnesses = Arrays.asList(fixture.from, fixture.to, fixture.hold);
@@ -22,11 +22,11 @@ private LifecycleProbe.Fixture fixture() {
 
     @Test public void boundedMoveAccepted() { LifecycleProbe.validate(fixture()); }
     @Test public void boundedOilBucketAccepted() {
-        LifecycleProbe.Fixture f = fixture(); f.bucket = "poweradvantage:crude_oil_bucket";
+        LifecycleProbe.Fixture f = fixture(); f.bucket = "basepower:crude_oil_bucket";
         f.source = new int[] {2060, 80, 2060}; LifecycleProbe.validate(f);
     }
     @Test(expected = IllegalArgumentException.class) public void oilBucketOutsideBoundsRejected() {
-        LifecycleProbe.Fixture f = fixture(); f.bucket = "poweradvantage:crude_oil_bucket";
+        LifecycleProbe.Fixture f = fixture(); f.bucket = "basepower:crude_oil_bucket";
         f.source = new int[] {2080, 80, 2060}; LifecycleProbe.validate(f);
     }
     @Test(expected = IllegalArgumentException.class) public void arbitraryBucketRejected() {
diff --git a/test-rig/src/test/java/zone/moddev/mc/advantageworks/ProfileManifestTest.java b/test-rig/src/test/java/zone/moddev/mc/advantageworks/ProfileManifestTest.java
index 1086cd05..875ca62e 100644
--- a/test-rig/src/test/java/zone/moddev/mc/advantageworks/ProfileManifestTest.java
+++ b/test-rig/src/test/java/zone/moddev/mc/advantageworks/ProfileManifestTest.java
@@ -50,7 +50,7 @@ public void profilesPinEverySuppliedArtifactAndCoverRecipeModes() throws Excepti
                 JsonArray exclusions = profile.getAsJsonArray("stableWorldgenCountExclusions");
                 assertNotNull(exclusions);
                 assertEquals(1, exclusions.size());
-                assertEquals("poweradvantage:crude_oil", exclusions.get(0).getAsString());
+                assertEquals("basepower:crude_oil", exclusions.get(0).getAsString());
                 JsonArray fixtures = profile.getAsJsonArray("configFixtures");
                 assertNotNull(fixtures);
                 assertEquals(2, fixtures.size());
diff --git a/test-rig/src/test/java/zone/moddev/mc/advantageworks/SteamOperationalSourceContractTest.java b/test-rig/src/test/java/zone/moddev/mc/advantageworks/SteamOperationalSourceContractTest.java
index 71748f52..c77c7db6 100644
--- a/test-rig/src/test/java/zone/moddev/mc/advantageworks/SteamOperationalSourceContractTest.java
+++ b/test-rig/src/test/java/zone/moddev/mc/advantageworks/SteamOperationalSourceContractTest.java
@@ -72,7 +72,7 @@ public class SteamOperationalSourceContractTest {
                     } else if (instruction instanceof LdcInsnNode) {
                         Object value = ((LdcInsnNode) instruction).cst;
                         if ("MUSKET_DAMAGE".equals(value)) damageField = true;
-                        if ("zone.moddev.mc.steamadvantage.SteamAdvantage".equals(value)) serverConfig = true;
+                        if ("zone.moddev.mc.basesteam.SteamAdvantage".equals(value)) serverConfig = true;
                     }
                 }
             }
diff --git a/test-rig/src/test/java/zone/moddev/mc/advantageworks/WorksDefinitionTest.java b/test-rig/src/test/java/zone/moddev/mc/advantageworks/WorksDefinitionTest.java
index 5b0de911..d1ca07a7 100644
--- a/test-rig/src/test/java/zone/moddev/mc/advantageworks/WorksDefinitionTest.java
+++ b/test-rig/src/test/java/zone/moddev/mc/advantageworks/WorksDefinitionTest.java
@@ -19,7 +19,7 @@ public void steamNetworkDrillsHaveImmediateBedrockStops() {
                 if (placement.block.equals("minecraft:bedrock")) stops.add(Arrays.toString(placement.pos));
             }
             for (WorksDefinition.Placement placement : station.placements) {
-                if (!placement.block.equals("steamadvantage:steam_drill")) continue;
+                if (!placement.block.equals("basesteam:steam_drill")) continue;
                 int[] target = placement.pos.clone();
                 assertTrue("Network drill must face up or south", placement.meta == 1 || placement.meta == 3);
                 if (placement.meta == 1) target[1]++; else target[2]++;
@@ -42,7 +42,7 @@ public void distillationAssertionsCountTheWholeCircuit() {
                 assertEquals(1000.0, assertion.value, 0.0);
                 assertEquals("Tank", assertion.nbtPath);
                 assertEquals("equals", assertion.operator);
-                if (assertion.id.endsWith("-fluid")) assertEquals("poweradvantage:refined_oil", assertion.fluid);
+                if (assertion.id.endsWith("-fluid")) assertEquals("basepower:refined_oil", assertion.fluid);
             }
         }
     }
@@ -88,58 +88,58 @@ public void completeWorksCoversEveryRegisteredComponent() {
         }
 
         assertContainsAll(blocks,
-                "poweradvantage:fluid_drain", "poweradvantage:fluid_discharge",
-                "poweradvantage:fluid_storage_tank", "poweradvantage:fluid_metal_tank",
-                "poweradvantage:still", "poweradvantage:fluid_pipe",
-                "poweradvantage:fluid_pipe_terminal", "poweradvantage:fluid_switch",
-                "poweradvantage:item_conveyor", "poweradvantage:item_filter_block",
-                "poweradvantage:item_filter_food", "poweradvantage:item_filter_fuel",
-                "poweradvantage:item_filter_inventory", "poweradvantage:item_filter_ore",
-                "poweradvantage:item_filter_plant", "poweradvantage:item_filter_smelt",
-                "poweradvantage:item_filter_overflow", "poweradvantage:steel_frame",
-                "poweradvantage:infinite_steam", "poweradvantage:infinite_electricity",
-                "poweradvantage:infinite_quantum", "poweradvantage:crude_oil",
-                "poweradvantage:refined_oil", "poweradvantage:converter_rf_steam",
-                "poweradvantage:converter_rf_electricity", "poweradvantage:converter_rf_quantum",
-                "poweradvantage:converter_tr_electricity");
+                "basepower:fluid_drain", "basepower:fluid_discharge",
+                "basepower:fluid_storage_tank", "basepower:fluid_metal_tank",
+                "basepower:still", "basepower:fluid_pipe",
+                "basepower:fluid_pipe_terminal", "basepower:fluid_switch",
+                "basepower:item_conveyor", "basepower:item_filter_block",
+                "basepower:item_filter_food", "basepower:item_filter_fuel",
+                "basepower:item_filter_inventory", "basepower:item_filter_ore",
+                "basepower:item_filter_plant", "basepower:item_filter_smelt",
+                "basepower:item_filter_overflow", "basepower:steel_frame",
+                "basepower:infinite_steam", "basepower:infinite_electricity",
+                "basepower:infinite_quantum", "basepower:crude_oil",
+                "basepower:refined_oil", "basepower:converter_rf_steam",
+                "basepower:converter_rf_electricity", "basepower:converter_rf_quantum",
+                "basepower:converter_tr_electricity");
         assertContainsAll(blocks,
-                "steamadvantage:steam_pipe", "steamadvantage:steam_track",
-                "steamadvantage:steam_boiler_coal", "steamadvantage:steam_boiler_electric",
-                "steamadvantage:steam_boiler_geothermal", "steamadvantage:steam_boiler_oil",
-                "steamadvantage:steam_tank", "steamadvantage:steam_furnace",
-                "steamadvantage:steam_crusher", "steamadvantage:steam_drill",
-                "steamadvantage:steam_elevator", "steamadvantage:steam_switch",
-                "steamadvantage:steam_still", "steamadvantage:steam_pump",
-                "steamadvantage:drillbit", "steamadvantage:platform",
-                "steamadvantage:pump_pipe_steam");
+                "basesteam:steam_pipe", "basesteam:steam_track",
+                "basesteam:steam_boiler_coal", "basesteam:steam_boiler_electric",
+                "basesteam:steam_boiler_geothermal", "basesteam:steam_boiler_oil",
+                "basesteam:steam_tank", "basesteam:steam_furnace",
+                "basesteam:steam_crusher", "basesteam:steam_drill",
+                "basesteam:steam_elevator", "basesteam:steam_switch",
+                "basesteam:steam_still", "basesteam:steam_pump",
+                "basesteam:drillbit", "basesteam:platform",
+                "basesteam:pump_pipe_steam");
         assertContainsAll(blocks,
-                "electricadvantage:electric_conduit", "electricadvantage:li_ore",
-                "electricadvantage:sulfur_ore", "electricadvantage:electric_track",
-                "electricadvantage:laser_turret", "electricadvantage:laser_turret_evil",
-                "electricadvantage:led_bar", "electricadvantage:photovoltaic_generator",
-                "electricadvantage:hydroelectric_generator", "electricadvantage:steam_powered_generator",
-                "electricadvantage:electric_furnace", "electricadvantage:electric_battery_array",
-                "electricadvantage:electric_crusher", "electricadvantage:electric_drill",
-                "electricadvantage:electric_fabricator", "electricadvantage:growth_chamber",
-                "electricadvantage:growth_chamber_controller", "electricadvantage:electric_oven",
-                "electricadvantage:electric_switch", "electricadvantage:electric_pump",
-                "electricadvantage:electric_still", "electricadvantage:plastic_refinery",
-                "electricadvantage:pump_pipe_electric");
+                "baseelectric:electric_conduit", "baseelectric:li_ore",
+                "baseelectric:sulfur_ore", "baseelectric:electric_track",
+                "baseelectric:laser_turret", "baseelectric:laser_turret_evil",
+                "baseelectric:led_bar", "baseelectric:photovoltaic_generator",
+                "baseelectric:hydroelectric_generator", "baseelectric:steam_powered_generator",
+                "baseelectric:electric_furnace", "baseelectric:electric_battery_array",
+                "baseelectric:electric_crusher", "baseelectric:electric_drill",
+                "baseelectric:electric_fabricator", "baseelectric:growth_chamber",
+                "baseelectric:growth_chamber_controller", "baseelectric:electric_oven",
+                "baseelectric:electric_switch", "baseelectric:electric_pump",
+                "baseelectric:electric_still", "baseelectric:plastic_refinery",
+                "baseelectric:pump_pipe_electric");
 
         assertContainsAll(items,
-                "poweradvantage:starch", "poweradvantage:bioplastic_ingot",
-                "poweradvantage:sprocket", "poweradvantage:rotator_tool",
-                "steamadvantage:steam_governor", "steamadvantage:steam_drill_bit",
-                "steamadvantage:blackpowder_cartridge", "steamadvantage:musket",
-                "electricadvantage:blank_circuit_board", "electricadvantage:control_circuit",
-                "electricadvantage:integrated_circuit", "electricadvantage:psu",
-                "electricadvantage:silicon_ingot", "electricadvantage:silicon_mix",
-                "electricadvantage:solder_mix", "electricadvantage:solder",
-                "electricadvantage:lead_acid_battery", "electricadvantage:nickel_hydride_battery",
-                "electricadvantage:alkaline_battery", "electricadvantage:lithium_battery",
-                "electricadvantage:li_ingot", "electricadvantage:li_powder",
-                "electricadvantage:li_nugget", "electricadvantage:sulfur_powder",
-                "electricadvantage:petrolplastic_ingot");
+                "basepower:starch", "basepower:bioplastic_ingot",
+                "basepower:sprocket", "basepower:rotator_tool",
+                "basesteam:steam_governor", "basesteam:steam_drill_bit",
+                "basesteam:blackpowder_cartridge", "basesteam:musket",
+                "baseelectric:blank_circuit_board", "baseelectric:control_circuit",
+                "baseelectric:integrated_circuit", "baseelectric:psu",
+                "baseelectric:silicon_ingot", "baseelectric:silicon_mix",
+                "baseelectric:solder_mix", "baseelectric:solder",
+                "baseelectric:lead_acid_battery", "baseelectric:nickel_hydride_battery",
+                "baseelectric:alkaline_battery", "baseelectric:lithium_battery",
+                "baseelectric:li_ingot", "baseelectric:li_powder",
+                "baseelectric:li_nugget", "baseelectric:sulfur_powder",
+                "baseelectric:petrolplastic_ingot");
 
         assertTrue(manual.toString().contains("SA-110-001"));
         assertTrue(manual.toString().contains("SA-110-002"));