tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Sulphur dioxide and sulphur trioxide

Browse source
This commit is contained in:
Ben Spiers 2013-12-31 22:21:28 +00:00
parent 69032ed2a0
commit 571ad3944f
7 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/mekanism/client/render/MekanismRenderer.java
View file

@ -66,7 +66,8 @@ public class MekanismRenderer
GasRegistry.getGas("hydrogen").setIcon(event.map.registerIcon("mekanism:LiquidHydrogen")); GasRegistry.getGas("hydrogen").setIcon(event.map.registerIcon("mekanism:LiquidHydrogen"));
GasRegistry.getGas("oxygen").setIcon(event.map.registerIcon("mekanism:LiquidOxygen")); GasRegistry.getGas("oxygen").setIcon(event.map.registerIcon("mekanism:LiquidOxygen"));
GasRegistry.getGas("sulfuricGas").setIcon(event.map.registerIcon("mekanism:LiquidSulfuricGas")); GasRegistry.getGas("sulfurDioxideGas").setIcon(event.map.registerIcon("mekanism:LiquidSulfurDioxide"));
GasRegistry.getGas("sulfurTrioxideGas").setIcon(event.map.registerIcon("mekanism:LiquidSulfurTrioxide"));
GasRegistry.getGas("sulfuricAcid").setIcon(event.map.registerIcon("mekanism:LiquidSulfuricAcid")); GasRegistry.getGas("sulfuricAcid").setIcon(event.map.registerIcon("mekanism:LiquidSulfuricAcid"));
} }
} }

7
common/mekanism/common/Mekanism.java
View file

@ -614,10 +614,10 @@ public class Mekanism
} }
//Chemical Formulator Recipes //Chemical Formulator Recipes
RecipeHandler.addChemicalOxidizerRecipe(new ItemStack(Mekanism.Dust, 1, 10), new GasStack(GasRegistry.getGas("sulfuricGas"), 100)); RecipeHandler.addChemicalOxidizerRecipe(new ItemStack(Mekanism.Dust, 1, 10), new GasStack(GasRegistry.getGas("sulfurDioxideGas"), 100));
//Chemical Infuser Recipes //Chemical Infuser Recipes
RecipeHandler.addChemicalInfuserRecipe(new ChemicalInput(new GasStack(GasRegistry.getGas("hydrogen"), 1), new GasStack(GasRegistry.getGas("sulfuricGas"), 1)), new GasStack(GasRegistry.getGas("sulfuricAcid"), 1)); RecipeHandler.addChemicalInfuserRecipe(new ChemicalInput(new GasStack(GasRegistry.getGas("oxygen"), 1), new GasStack(GasRegistry.getGas("sulfurDioxideGas"), 2)), new GasStack(GasRegistry.getGas("sulfurTrioxideGas"), 2));
//Infuse objects //Infuse objects
InfuseRegistry.registerInfuseObject(new ItemStack(Item.coal, 1, 0), new InfuseObject(InfuseRegistry.get("CARBON"), 10)); InfuseRegistry.registerInfuseObject(new ItemStack(Item.coal, 1, 0), new InfuseObject(InfuseRegistry.get("CARBON"), 10));
@ -944,7 +944,8 @@ public class Mekanism
GasRegistry.register(new Gas("hydrogen")).registerFluid(); GasRegistry.register(new Gas("hydrogen")).registerFluid();
GasRegistry.register(new Gas("oxygen")).registerFluid(); GasRegistry.register(new Gas("oxygen")).registerFluid();
GasRegistry.register(new Gas("sulfuricGas")).registerFluid(); GasRegistry.register(new Gas("sulfurDioxideGas")).registerFluid();
GasRegistry.register(new Gas("sulfurTrioxideGas")).registerFluid();
GasRegistry.register(new Gas("sulfuricAcid")).registerFluid(); GasRegistry.register(new Gas("sulfuricAcid")).registerFluid();
Mekanism.proxy.preInit(); Mekanism.proxy.preInit();

4
resources/assets/mekanism/lang/de_DE.lang
View file

@ -151,13 +151,13 @@ item.tinIngot.name=Zinnbarren
//Gasses //Gasses
gas.hydrogen=Wasserstoff gas.hydrogen=Wasserstoff
gas.oxygen=Sauerstoff gas.oxygen=Sauerstoff
gas.sulfuricGas=Schwefeldioxid gas.sulfurDioxideGas=Schwefeldioxid
gas.sulfuricAcid=Schwefelsäure gas.sulfuricAcid=Schwefelsäure
//Fluids //Fluids
fluid.hydrogen=Flüssiger Wasserstoff fluid.hydrogen=Flüssiger Wasserstoff
fluid.oxygen=Flüssiger Sauerstoff fluid.oxygen=Flüssiger Sauerstoff
fluid.sulfuricGas=Flüssiges Schwefeldioxid fluid.sulfurDioxideGas=Flüssiges Schwefeldioxid
fluid.sulfuricAcid=Flüssige Schwefelsäure fluid.sulfuricAcid=Flüssige Schwefelsäure
//Gui text //Gui text

4
resources/assets/mekanism/lang/en_GB.lang
View file

@ -3,9 +3,9 @@ tile.Transmitter.PressurizedTube.name=Pressurised Tube
tile.MachineBlock2.ChemicalOxidizer=Chemical Oxidiser tile.MachineBlock2.ChemicalOxidizer=Chemical Oxidiser
item.MultipartTransmitter.PressurizedTube.name=Pressurised Tube item.MultipartTransmitter.PressurizedTube.name=Pressurised Tube
item.sulfurDust.name=Sulphur Dust item.sulfurDust.name=Sulphur Dust
gas.sulfuricGas=Sulphur Dioxide gas.sulfurDioxideGas=Sulphur Dioxide
gas.sulfuricAcid=Aerosolised Sulphuric Acid gas.sulfuricAcid=Aerosolised Sulphuric Acid
fluid.sulfuricGas=Liquid Sulphur Dioxide fluid.sulfurDioxideGas=Liquid Sulphur Dioxide
fluid.sulfuricAcid=Sulphuric Acid fluid.sulfuricAcid=Sulphuric Acid
tooltip.EnergizedSmelter=A simple machine that serves as a Mekanism-based !nfurnace that runs off of energy. tooltip.EnergizedSmelter=A simple machine that serves as a Mekanism-based !nfurnace that runs off of energy.
tooltip.Chargepad=A universal chargepad that can charge any energised item !nfrom any mod. tooltip.Chargepad=A universal chargepad that can charge any energised item !nfrom any mod.

4
resources/assets/mekanism/lang/en_US.lang
View file

@ -151,13 +151,13 @@ item.tinIngot.name=Tin Ingot
//Gasses //Gasses
gas.hydrogen=Hydrogen gas.hydrogen=Hydrogen
gas.oxygen=Oxygen gas.oxygen=Oxygen
gas.sulfuricGas=Sulfur Dioxide gas.sulfurDioxideGas=Sulfur Dioxide
gas.sulfuricAcid=Sulfuric Acid gas.sulfuricAcid=Sulfuric Acid
//Fluids //Fluids
fluid.hydrogen=Liquid Hydrogen fluid.hydrogen=Liquid Hydrogen
fluid.oxygen=Liquid Oxygen fluid.oxygen=Liquid Oxygen
fluid.sulfuricGas=Liquid Sulfur Dioxide fluid.sulfurDioxideGas=Liquid Sulfur Dioxide
fluid.sulfuricAcid=Liquid Sulfuric Acid fluid.sulfuricAcid=Liquid Sulfuric Acid
//Gui text //Gui text

4
resources/assets/mekanism/lang/ru_RU.lang
View file

@ -151,13 +151,13 @@ item.tinIngot.name=Оловянный слиток
//Gasses //Gasses
gas.hydrogen=Водород gas.hydrogen=Водород
gas.oxygen=Кислород gas.oxygen=Кислород
gas.sulfuricGas=Диоксид серы gas.sulfurDioxideGas=Диоксид серы
gas.sulfuricAcid=Аэрозольная серная кислота gas.sulfuricAcid=Аэрозольная серная кислота
//Fluids //Fluids
fluid.hydrogen=Жидкий водород fluid.hydrogen=Жидкий водород
fluid.oxygen=Жидкий кислород fluid.oxygen=Жидкий кислород
fluid.sulfuricGas=Жидкий диоксид серы fluid.sulfurDioxideGas=Жидкий диоксид серы
fluid.sulfuricAcid=Серная кислота fluid.sulfuricAcid=Серная кислота
//Gui text //Gui text

4
resources/assets/mekanism/lang/zh_CN.lang
View file

@ -132,13 +132,13 @@ item.tinIngot.name=锡锭
//Gasses //Gasses
gas.hydrogen=氢气 gas.hydrogen=氢气
gas.oxygen=氧气 gas.oxygen=氧气
gas.sulfuricGas=硫气 gas.sulfurDioxideGas=硫气
gas.sulfuricAcid=硫酸气 gas.sulfuricAcid=硫酸气
//Fluids //Fluids
fluid.hydrogen=液氢 fluid.hydrogen=液氢
fluid.oxygen=液氧 fluid.oxygen=液氧
fluid.sulfuricGas=液化硫气 fluid.sulfurDioxideGas=液化硫气
fluid.sulfuricAcid=硫酸 fluid.sulfuricAcid=硫酸
//Gui text //Gui text