From 3190185a54cf4d8a648dd317cd420cea424e7d48 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Sat, 1 Sep 2018 02:46:25 +0300 Subject: [PATCH] Cleaned fluid translation keys. --- .../java/techreborn/init/ModTileEntities.java | 192 +++++++++--------- .../assets/techreborn/lang/en_us.lang | 107 ++++------ 2 files changed, 135 insertions(+), 164 deletions(-) diff --git a/src/main/java/techreborn/init/ModTileEntities.java b/src/main/java/techreborn/init/ModTileEntities.java index 67ac3a02a..1f7024a06 100644 --- a/src/main/java/techreborn/init/ModTileEntities.java +++ b/src/main/java/techreborn/init/ModTileEntities.java @@ -58,98 +58,65 @@ import java.util.Optional; public enum ModTileEntities { - THERMAL_GEN(TileThermalGenerator.class, "thermal_generator", "TileThermalGeneratorTR"), - QUANTUM_TANK(TileQuantumTank.class, "quantum_tank", "TileQuantumTankTR"), - CREATIVE_QUANTUM_TANK(TileCreativeQuantumTank.class, "creative_quantum_tank"), - QUANTUM_CHEST(TileQuantumChest.class, "quantum_chest", "TileQuantumChestTR"), - CREATIVE_QUANTUM_CHEST(TileCreativeQuantumChest.class, "creative_quantum_chest"), - DIGITAL_CHEST(TileDigitalChest.class, "digital_chest", "TileDigitalChestTR"), - INDUSTRIAL_CENTRIFUGE(TileIndustrialCentrifuge.class, "industrial_centrifuge", "TileIndustrialCentrifugeTR"), - ROLLING_MACHINE(TileRollingMachine.class, "rolling_machine", "TileRollingMachineTR"), - INDUSTRIAL_BLAST_FURNACE(TileIndustrialBlastFurnace.class, "industrial_blast_furnace", "TileIndustrialBlastFurnaceTR"), - ALLOY_SMELTER(TileAlloySmelter.class, "alloy_smelter", "TileAlloySmalterTR"), - INDUSTRIAL_GRINDER(TileIndustrialGrinder.class, "industrial_grinder", "TileIndustrialGrinderTR"), - IMPLOSION_COMPRESSOR(TileImplosionCompressor.class, "implosion_compressor", "TileImplosionCompressorTR"), - MATTER_FABRICATOR(TileMatterFabricator.class, "matter_fabricator", "TileMatterFabricatorTR"), - CHUNK_LOADER(TileChunkLoader.class, "chunk_loader", "TileChunkLoaderTR"), - CHARGE_O_MAT(TileChargeOMat.class, "charge_o_mat", "TileChargeOMatTR"), - PLAYER_DETECTOR(TilePlayerDectector.class, "player_detector", "TilePlayerDectectorTR"), - CABLE(TileCable.class, "cable", "TileCableTR"), - MACHINE_CASINGS(TileMachineCasing.class, "machine_casing", "TileMachineCasingTR"), - DRAGON_EGG_SYPHON(TileDragonEggSyphon.class, "dragon_egg_syphon", "TileDragonEggSyphonTR"), - ASSEMBLY_MACHINE(TileAssemblingMachine.class, "assembly_machine", "TileAssemblyMachineTR"), - DIESEL_GENERATOR(TileDieselGenerator.class, "diesel_generator", "TileDieselGeneratorTR"), - INDUSTRIAL_ELECTROLYZER(TileIndustrialElectrolyzer.class, "industrial_electrolyzer", "TileIndustrialElectrolyzerTR"), - SEMI_FLUID_GENERATOR(TileSemiFluidGenerator.class, "semi_fluid_generator", "TileSemiFluidGeneratorTR"), - GAS_TURBINE(TileGasTurbine.class, "gas_turbine", "TileGasTurbineTR"), - IRON_ALLOY_FURNACE(TileIronAlloyFurnace.class, "iron_alloy_furnace", "TileIronAlloyFurnaceTR"), - CHEMICAL_REACTOR(TileChemicalReactor.class, "chemical_reactor", "TileChemicalReactorTR"), - INTERDIMENSIONAL_SU(TileInterdimensionalSU.class, "interdimensional_su", "TileInterdimensionalSUTR"), ADJUSTABLE_SU(TileAdjustableSU.class, "adjustable_su", "TileAdjustableSUTR"), - LAPOTRONIC_SU(TileLapotronicSU.class, "lapotronic_su", "TileLapotronicSUTR"), - LSU_STORAGE(TileLSUStorage.class, "lsu_storage", "TileLSUStorageTR"), - DISTILLATION_TOWER(TileDistillationTower.class, "distillation_tower", "TileDistillationTowerTR"), - VACUUM_FREEZER(TileVacuumFreezer.class, "vacuum_freezer", "TileVacuumFreezerTR"), - FUSION_CONTROL_COMPUTER(TileFusionControlComputer.class, "fusion_control_computer", "TileFusionControlComputerTR"), - LIGHTNING_ROD(TileLightningRod.class, "lightning_rod", "TileLightningRodTR"), - INDUSTRIAL_SAWMILL(TileIndustrialSawmill.class, "industrial_sawmill", "TileIndustrialSawmillTR"), - GRINDER(TileGrinder.class, "grinder", "TileGrinderTR"), - SOLID_FUEL_GENEREATOR(TileSolidFuelGenerator.class, "solid_fuel_generator", "TileSolidFuelGeneratorTR"), - EXTRACTOR(TileExtractor.class, "extractor", "TileExtractorTR"), - COMPRESSOR(TileCompressor.class, "compressor", "TileCompressorTR"), - ELECTRIC_FURNACE(TileElectricFurnace.class, "electric_furnace", "TileElectricFurnaceTR"), - SOLAR_PANEL(TileSolarPanel.class, "solar_panel", "TileSolarPanelTR"), - CREATIVE_SOLAR_PANEL(TileCreativeSolarPanel.class, "creative_solar_panel", "TileCreativeSolarPanelTR"), - WATER_MILL(TileWaterMill.class, "water_mill", "TileWaterMillTR"), - WIND_MILL(TileWindMill.class, "wind_mill", "TileWindMillTR"), - MACHINE_BASE(TileLegacyMachineBase.class, "machine_base", "TileMachineBaseTR"), - RECYCLER(TileRecycler.class, "recycler", "TileRecyclerTR"), - LOW_VOLTAGE_SU(TileLowVoltageSU.class, "low_voltage_su", "TileLowVoltageSUTR"), - MEDIUM_VOLTAGE_SU(TileMediumVoltageSU.class, "medium_voltage_su", "TileMediumVoltageSUTR"), - HIGH_VOLTAGE_SU(TileHighVoltageSU.class, "high_voltage_su", "TileHighVoltageSUTR"), - LV_TRANSFORMER(TileLVTransformer.class, "lv_transformer", "TileLVTransformerTR"), - MV_TRANSFORMER(TileMVTransformer.class, "mv_transformer", "TileMVTransformerTR"), - HV_TRANSFORMER(TileHVTransformer.class, "hv_transformer", "TileHVTransformerTR"), - AUTO_CRAFTING_TABLE(TileAutoCraftingTable.class, "auto_crafting_table", "TileAutoCraftingTableTR"), - IRON_FURNACE(TileIronFurnace.class, "iron_furnace", "TileIronFurnaceTR"), - SCRAPBOXINATOR(TileScrapboxinator.class, "scrapboxinator", "TileScrapboxinatorTR"), - PLASMA_GENERATOR(TilePlasmaGenerator.class, "plasma_generator", "TilePlasmalGeneratorTR"), - LAMP(TileLamp.class, "lamp", "TileLampTR"), ALARM(TileAlarm.class, "alarm", "TileAlarmTR"), - FLUID_REPLICATOR(TileFluidReplicator.class, "fluid_replicator", "TileFluidReplicatorTR"); - - public Class tileClass; - public ResourceLocation name; - public Optional oldName; - - ModTileEntities(Class tileClass, ResourceLocation name, String oldName) { - this.tileClass = tileClass; - this.name = name; - this.oldName = Optional.of(oldName); - } - - ModTileEntities(Class tileClass, ResourceLocation name) { - this.tileClass = tileClass; - this.name = name; - this.oldName = Optional.empty(); - } - - ModTileEntities(Class tileClass, String name, String oldName) { - this(tileClass, new ResourceLocation(ModInfo.MOD_ID, name), oldName); - } - - ModTileEntities(Class tileClass, String name) { - this(tileClass, new ResourceLocation(ModInfo.MOD_ID, name)); - } - - public boolean hasUpgradePath(){ - return oldName.isPresent(); - } - - public static void init(){ - Arrays.stream(ModTileEntities.values()) - .forEach(modTileEntities -> GameRegistry.registerTileEntity(modTileEntities.tileClass, modTileEntities.name)); - } + ALLOY_SMELTER(TileAlloySmelter.class, "alloy_smelter", "TileAlloySmalterTR"), + ASSEMBLY_MACHINE(TileAssemblingMachine.class, "assembly_machine", "TileAssemblyMachineTR"), + AUTO_CRAFTING_TABLE(TileAutoCraftingTable.class, "auto_crafting_table", "TileAutoCraftingTableTR"), + CABLE(TileCable.class, "cable", "TileCableTR"), + CHARGE_O_MAT(TileChargeOMat.class, "charge_o_mat", "TileChargeOMatTR"), + CHEMICAL_REACTOR(TileChemicalReactor.class, "chemical_reactor", "TileChemicalReactorTR"), + CHUNK_LOADER(TileChunkLoader.class, "chunk_loader", "TileChunkLoaderTR"), + COMPRESSOR(TileCompressor.class, "compressor", "TileCompressorTR"), + CREATIVE_QUANTUM_CHEST(TileCreativeQuantumChest.class, "creative_quantum_chest"), + CREATIVE_QUANTUM_TANK(TileCreativeQuantumTank.class, "creative_quantum_tank"), + CREATIVE_SOLAR_PANEL(TileCreativeSolarPanel.class, "creative_solar_panel", "TileCreativeSolarPanelTR"), + DIESEL_GENERATOR(TileDieselGenerator.class, "diesel_generator", "TileDieselGeneratorTR"), + DIGITAL_CHEST(TileDigitalChest.class, "digital_chest", "TileDigitalChestTR"), + DISTILLATION_TOWER(TileDistillationTower.class, "distillation_tower", "TileDistillationTowerTR"), + DRAGON_EGG_SYPHON(TileDragonEggSyphon.class, "dragon_egg_syphon", "TileDragonEggSyphonTR"), + ELECTRIC_FURNACE(TileElectricFurnace.class, "electric_furnace", "TileElectricFurnaceTR"), + EXTRACTOR(TileExtractor.class, "extractor", "TileExtractorTR"), + FLUID_REPLICATOR(TileFluidReplicator.class, "fluid_replicator", "TileFluidReplicatorTR"), + FUSION_CONTROL_COMPUTER(TileFusionControlComputer.class, "fusion_control_computer", "TileFusionControlComputerTR"), + GAS_TURBINE(TileGasTurbine.class, "gas_turbine", "TileGasTurbineTR"), + GRINDER(TileGrinder.class, "grinder", "TileGrinderTR"), + HIGH_VOLTAGE_SU(TileHighVoltageSU.class, "high_voltage_su", "TileHighVoltageSUTR"), + HV_TRANSFORMER(TileHVTransformer.class, "hv_transformer", "TileHVTransformerTR"), + IMPLOSION_COMPRESSOR(TileImplosionCompressor.class, "implosion_compressor", "TileImplosionCompressorTR"), + INDUSTRIAL_BLAST_FURNACE(TileIndustrialBlastFurnace.class, "industrial_blast_furnace", "TileIndustrialBlastFurnaceTR"), + INDUSTRIAL_CENTRIFUGE(TileIndustrialCentrifuge.class, "industrial_centrifuge", "TileIndustrialCentrifugeTR"), + INDUSTRIAL_ELECTROLYZER(TileIndustrialElectrolyzer.class, "industrial_electrolyzer", "TileIndustrialElectrolyzerTR"), + INDUSTRIAL_GRINDER(TileIndustrialGrinder.class, "industrial_grinder", "TileIndustrialGrinderTR"), + INDUSTRIAL_SAWMILL(TileIndustrialSawmill.class, "industrial_sawmill", "TileIndustrialSawmillTR"), + INTERDIMENSIONAL_SU(TileInterdimensionalSU.class, "interdimensional_su", "TileInterdimensionalSUTR"), + IRON_ALLOY_FURNACE(TileIronAlloyFurnace.class, "iron_alloy_furnace", "TileIronAlloyFurnaceTR"), + IRON_FURNACE(TileIronFurnace.class, "iron_furnace", "TileIronFurnaceTR"), + LAMP(TileLamp.class, "lamp", "TileLampTR"), + LAPOTRONIC_SU(TileLapotronicSU.class, "lapotronic_su", "TileLapotronicSUTR"), + LIGHTNING_ROD(TileLightningRod.class, "lightning_rod", "TileLightningRodTR"), + LOW_VOLTAGE_SU(TileLowVoltageSU.class, "low_voltage_su", "TileLowVoltageSUTR"), + LSU_STORAGE(TileLSUStorage.class, "lsu_storage", "TileLSUStorageTR"), + LV_TRANSFORMER(TileLVTransformer.class, "lv_transformer", "TileLVTransformerTR"), + MACHINE_BASE(TileLegacyMachineBase.class, "machine_base", "TileMachineBaseTR"), + MACHINE_CASINGS(TileMachineCasing.class, "machine_casing", "TileMachineCasingTR"), + MATTER_FABRICATOR(TileMatterFabricator.class, "matter_fabricator", "TileMatterFabricatorTR"), + MEDIUM_VOLTAGE_SU(TileMediumVoltageSU.class, "medium_voltage_su", "TileMediumVoltageSUTR"), + MV_TRANSFORMER(TileMVTransformer.class, "mv_transformer", "TileMVTransformerTR"), + PLASMA_GENERATOR(TilePlasmaGenerator.class, "plasma_generator", "TilePlasmalGeneratorTR"), + PLAYER_DETECTOR(TilePlayerDectector.class, "player_detector", "TilePlayerDectectorTR"), + QUANTUM_CHEST(TileQuantumChest.class, "quantum_chest", "TileQuantumChestTR"), + QUANTUM_TANK(TileQuantumTank.class, "quantum_tank", "TileQuantumTankTR"), + RECYCLER(TileRecycler.class, "recycler", "TileRecyclerTR"), + ROLLING_MACHINE(TileRollingMachine.class, "rolling_machine", "TileRollingMachineTR"), + SCRAPBOXINATOR(TileScrapboxinator.class, "scrapboxinator", "TileScrapboxinatorTR"), + SEMI_FLUID_GENERATOR(TileSemiFluidGenerator.class, "semi_fluid_generator", "TileSemiFluidGeneratorTR"), + SOLAR_PANEL(TileSolarPanel.class, "solar_panel", "TileSolarPanelTR"), + SOLID_FUEL_GENEREATOR(TileSolidFuelGenerator.class, "solid_fuel_generator", "TileSolidFuelGeneratorTR"), + THERMAL_GEN(TileThermalGenerator.class, "thermal_generator", "TileThermalGeneratorTR"), + VACUUM_FREEZER(TileVacuumFreezer.class, "vacuum_freezer", "TileVacuumFreezerTR"), + WATER_MILL(TileWaterMill.class, "water_mill", "TileWaterMillTR"), + WIND_MILL(TileWindMill.class, "wind_mill", "TileWindMillTR"); public static Optional getFromOldName(String name){ for(ModTileEntities entry : ModTileEntities.values()){ @@ -159,14 +126,12 @@ public enum ModTileEntities { } return Optional.empty(); } - + public static void init(){ + Arrays.stream(ModTileEntities.values()) + .forEach(modTileEntities -> GameRegistry.registerTileEntity(modTileEntities.tileClass, modTileEntities.name)); + } public static void initDataFixer(ModFixs dataFixes){ dataFixes.registerFix(FixTypes.BLOCK_ENTITY, new IFixableData() { - @Override - public int getFixVersion() { - return 1; - } - @Override public NBTTagCompound fixTagCompound(NBTTagCompound compound) { ResourceLocation tileEntityLocation = new ResourceLocation(compound.getString("id")); @@ -176,6 +141,41 @@ public enum ModTileEntities { } return compound; } + + @Override + public int getFixVersion() { + return 1; + } }); } + + public ResourceLocation name; + + public Optional oldName; + + public Class tileClass; + + ModTileEntities(Class tileClass, ResourceLocation name) { + this.tileClass = tileClass; + this.name = name; + this.oldName = Optional.empty(); + } + + ModTileEntities(Class tileClass, ResourceLocation name, String oldName) { + this.tileClass = tileClass; + this.name = name; + this.oldName = Optional.of(oldName); + } + + ModTileEntities(Class tileClass, String name) { + this(tileClass, new ResourceLocation(ModInfo.MOD_ID, name)); + } + + ModTileEntities(Class tileClass, String name, String oldName) { + this(tileClass, new ResourceLocation(ModInfo.MOD_ID, name), oldName); + } + + public boolean hasUpgradePath(){ + return oldName.isPresent(); + } } diff --git a/src/main/resources/assets/techreborn/lang/en_us.lang b/src/main/resources/assets/techreborn/lang/en_us.lang index 5c6c5990e..221fbaac7 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.lang +++ b/src/main/resources/assets/techreborn/lang/en_us.lang @@ -25,7 +25,6 @@ tile.techreborn.industrial_grinder.name=Industrial Grinder tile.techreborn.chunk_loader.name=Industrial Chunkloader tile.techreborn.magic_energy_converter.name=Magic Energy Converter tile.techreborn.diesel_generator.name=Diesel Generator -tile.techreborn.heat_generator.name=Heat Generator tile.techreborn.industrial_electrolyzer.name=Industrial Electrolyzer tile.techreborn.magic_energy_absorber.name=Magic Energy Absorber tile.techreborn.assembly_machine.name=Assembling Machine @@ -38,7 +37,6 @@ tile.techreborn.adjustable_su.name=Adjustable SU tile.techreborn.lapotronic_su.name=LESU Controller tile.techreborn.lsu_storage.name=LESU Storage tile.techreborn.distillation_tower.name=Distillation Tower -tile.techreborn.electric_crafting_table.name=Auto Crafting Table tile.techreborn.vacuum_freezer.name=Vacuum Freezer tile.techreborn.plasma_generator.name=Plasma Generator tile.techreborn.fusion_control_computer.name=Fusion Control Computer @@ -151,78 +149,53 @@ tile.techreborn.cable.insulatedcopper.name=Insulated Copper Cable tile.techreborn.cable.insulatedgold.name=Insulated Gold Cable tile.techreborn.cable.insulatedhv.name=Insulated HV Cable +#Fluid blocks +tile.techreborn.berylium.name=Beryllium +tile.techreborn.calcium.name=Calcium +tile.techreborn.calciumcarbonate.name=Calciumcarbonate +tile.techreborn.carbon.name=Carbon +tile.techreborn.carbonfiber.name=Carbon Fiber +tile.techreborn.chlorite.name=Chlorite +tile.techreborn.compressedair.name=Compressed Air +tile.techreborn.deuterium.name=Deuterium +tile.techreborn.diesel.name=Diesel +tile.techreborn.electrolyzedwater.name=Electrolyzed Water +tile.techreborn.glyceryl.name=Glyceryl +tile.techreborn.helium.name=Helium +tile.techreborn.helium3.name=Helium3 +tile.techreborn.heliumplasma.name=Heliumplasma +tile.techreborn.hydrogen.name=Hydrogen +tile.techreborn.lithium.name=Lithium +tile.techreborn.mercury.name=Mercury +tile.techreborn.methane.name=Methane +tile.techreborn.nitrocarbon.name=Nitrocarbon +tile.techreborn.nitrocoalfuel.name=Nitrocoalfuel +tile.techreborn.nitrodiesel.name=Nitrodiesel +tile.techreborn.nitrofuel.name=Nitrofuel +tile.techreborn.nitrogen.name=Nitrogen +tile.techreborn.nitrogendioxide.name=Nitrogendioxide +tile.techreborn.oil.name=Oil +tile.techreborn.potassium.name=Potassium +tile.techreborn.silicon.name=Silicon +tile.techreborn.sodium.name=Sodium +tile.techreborn.sodiumpersulfate.name=Sodiumpersulfate +tile.techreborn.sodiumsulfide.name=Sodium Sulfide +tile.techreborn.sulfur.name=Sulfur +tile.techreborn.sulfuricacid.name=Sulfuric Acid +tile.techreborn.tritium.name=Tritium +tile.techreborn.wolframium.name=Wolframium + #Fluids -tile.techreborn.berylium.name=Beryllium Source -tile.techreborn.calcium.name=Calcium Source -tile.techreborn.calciumcarbonate.name=Calciumcarbonate Source -tile.techreborn.chlorite.name=Chlorite Source -tile.techreborn.deuterium.name=Deuterium Source -tile.techreborn.glyceryl.name=Glyceryl Source -tile.techreborn.helium.name=Helium Source -tile.techreborn.helium3.name=Helium3 Source -tile.techreborn.heliumplasma.name=Heliumplasma Source -tile.techreborn.hydrogen.name=Hydrogen Source -tile.techreborn.lithium.name=Lithium Source -tile.techreborn.mercury.name=Mercury Source -tile.techreborn.methane.name=Methane Source -tile.techreborn.nitrocoalfuel.name=Nitrocoalfuel Source -tile.techreborn.nitrofuel.name=Nitrofuel Source -tile.techreborn.nitrogen.name=Nitrogen Source -tile.techreborn.nitrogendioxide.name=Nitrogendioxide Source -tile.techreborn.potassium.name=Potassium Source -tile.techreborn.silicon.name=Silicon Source -tile.techreborn.sodium.name=Sodium Source -tile.techreborn.sodiumpersulfate.name=Sodiumpersulfate Source -tile.techreborn.tritium.name=Tritium Source -tile.techreborn.wolframium.name=Wolframium Source -tile.techreborn.compressedair.name=Compressed Air Source -tile.techreborn.electrolyzedwater.name=Electrolyzed Water Source -fluid.fluid.fluidberylium=Beryllium -fluid.fluid.fluidcalcium=Calcium -fluid.fluid.fluidcalciumcarbonate=Calciumcarbonate -fluid.fluid.fluidchlorite=Chlorite -fluid.fluid.fluiddeuterium=Deuterium -fluid.fluid.fluidglyceryl=Glyceryl -fluid.fluid.fluidhelium=Helium -fluid.fluid.fluidhelium3=Helium3 -fluid.fluid.fluidheliumplasma=Heliumplasma -fluid.fluid.fluidhydrogen=Hydrogen -fluid.fluid.fluidlithium=Lithium -fluid.fluid.fluidmercury=Mercury -fluid.fluid.fluidmethane=Methane -fluid.fluid.fluidnitrocoalfuel=Nitrocoalfuel -fluid.fluid.fluidnitrofuel=Nitrofuel -fluid.fluid.fluidnitrogen=Nitrogen -fluid.fluid.fluidnitrogendioxide=Nitrogendioxide -fluid.fluid.fluidpotassium=Potassium -fluid.fluid.fluidsilicon=Silicon -fluid.fluid.fluidsodium=Sodium -fluid.fluid.fluidsodiumpersulfate=Sodiumpersulfate -fluid.fluid.fluidtritium=Tritium -fluid.fluid.fluidwolframium=Wolframium -fluid.fluid.electrolyzedwater=Electrolyzed Water -fluid.fluid.compresseair=Compressed Air -fluid.tile.techreborn.glyceryl=Glyceryl -fluid.tile.techreborn.berylium=Beryllium -fluid.tile.techreborn.chlorite=Chlorite -fluid.tile.techreborn.helium3=Helium3 -fluid.tile.techreborn.deuterium=Deuterium -fluid.tile.techreborn.helium=Helium -fluid.tile.techreborn.calciumcarbonate=Calcium Carbonate -fluid.titanium.name=Molten Titanium -fluid.chrome.name=Molten Chrome -fluid.platinum.name=Molten Platinum -fluid.iridium.name=Molten Iridium -fluid.invar.name=Molten Invar -fluid.tungsten.name=Molten Tungsten fluid.fluidberylium=Beryllium fluid.fluidcalcium=Calcium fluid.fluidcalciumcarbonate=Calciumcarbonate fluid.fluidcarbon=Carbon fluid.fluidcarbonfiber=Carbon Fiber fluid.fluidchlorite=Chlorite +fluid.fluidcompressedair=Compressed Air fluid.fluiddeuterium=Deuterium fluid.fluiddiesel=Diesel +fluid.fluidelectrolyzedwater=Electrolyzed Water fluid.fluidglyceryl=Glyceryl fluid.fluidhelium=Helium fluid.fluidhelium3=Helium3 @@ -241,12 +214,10 @@ fluid.fluidoil=Oil fluid.fluidpotassium=Potassium fluid.fluidsilicon=Silicon fluid.fluidsodium=Sodium +fluid.fluidsodiumpersulfate=Sodiumpersulfate fluid.fluidsodiumSulfide=Sodium Sulfide fluid.fluidSulfur=Sulfur fluid.fluidsulfuricacid=Sulfuric Acid -fluid.fluidcompressedair=Compressed Air -fluid.fluidelectrolyzedwater=Electrolyzed Water -fluid.fluidsodiumpersulfate=Sodiumpersulfate fluid.fluidtritium=Tritium fluid.fluidwolframium=Wolframium