diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy index db34aee87..732bbf5cb 100644 --- a/groovy/material/FirstDegreeMaterials.groovy +++ b/groovy/material/FirstDegreeMaterials.groovy @@ -1155,7 +1155,6 @@ public class FirstDegreeMaterials { .dust() .components(Manganese, Oxygen) .color(0x472400) - .iconSet(SAND) .build() RaneyCobalt = new Material.Builder(8266, SuSyUtility.susyId('raney_cobalt')) @@ -2010,7 +2009,7 @@ public class FirstDegreeMaterials { .dust() .iconSet('SHINY') .components(Manganese, Oxygen * 2) - .colorAverage() + .color(0x38251e) .build() BariumTitanate = new Material.Builder(8396, SuSyUtility.susyId('barium_titanate')) @@ -2548,7 +2547,13 @@ public class FirstDegreeMaterials { AmmoniumDihydrogenPhosphate.setFormula("NH4H2PO4", true) - //FREE ID: 8474 + CrudeManganeseIIOxide = new Material.Builder(8474, SuSyUtility.susyId('crude_manganese_ii_oxide')) + .dust() + .components(Manganese, Oxygen) + .color(0x472400) + .iconSet(SAND) + .build() + .setFormula("(?)(MnO)", true) IronCarbonate = new Material.Builder(8475, SuSyUtility.susyId('iron_carbonate')) .dust() @@ -2589,8 +2594,22 @@ public class FirstDegreeMaterials { .components(Carbon) .flags(FLAMMABLE, NO_SMELTING, NO_SMASHING, MORTAR_GRINDABLE) .build(); - - //FREE IDs: 8482-8485 + + ManganeseIINitrateSolution = new Material.Builder(8482, SuSyUtility.susyId('manganese_ii_nitrate_solution')) + .liquid() + .components(Manganese, Nitrogen * 2, Oxygen * 6, Water) + .colorAverage() + .build() + .setFormula("(Mn(NO3)2)(H2O)", true) + + CrudeManganeseIINitrateSolution = new Material.Builder(8483, SuSyUtility.susyId('crude_manganese_ii_nitrate_solution')) + .liquid() + .components(Manganese, Nitrogen * 2, Oxygen * 6, Water) + .colorAverage() + .build() + .setFormula("(?)(Mn(NO3)2)(H2O)", true) + + //FREE IDs: 8484-8485 UltramaficTailingSlurry = new Material.Builder(8486, SuSyUtility.susyId('ultramafic_tailing_slurry')) .liquid() @@ -2660,7 +2679,13 @@ public class FirstDegreeMaterials { .color(0x887866) .build(); - //FREE IDs: 8496-8498 + //FREE IDs: 8496-8497 + + NickelSulfate = new Material.Builder(8498, SuSyUtility.susyId('nickel_sulfate')) + .dust() + .components(Nickel * 1, Sulfur * 1, Oxygen * 4) + .color(0xcad3a7) + .build() SodiumNitrite = new Material.Builder(8499, SuSyUtility.susyId('sodium_nitrite')) .dust().liquid(new FluidBuilder().temperature(544)) @@ -2706,10 +2731,9 @@ public class FirstDegreeMaterials { NickelSulfateSolution = new Material.Builder(8505, SuSyUtility.susyId('nickel_sulfate_solution')) .liquid() - .components(Nickel, Sulfur, Oxygen * 4, Water) + .components(NickelSulfate, Water) .color(0x38add1) .build(); - NickelSulfateSolution.setFormula("(NiSO4)(H2O)", true) DisulfurDichloride = new Material.Builder(8506, SuSyUtility.susyId('disulfur_dichloride')) .liquid() @@ -2783,7 +2807,7 @@ public class FirstDegreeMaterials { ManganeseIIHydroxide = new Material.Builder(8520, SuSyUtility.susyId('manganese_ii_hydroxide')) .dust() .components(Manganese, Oxygen * 2, Hydrogen * 2) - .colorAverage() + .color(0xe4cfb1) .build(); ManganeseIIHydroxide.setFormula("Mn(OH)2", true) @@ -3544,5 +3568,17 @@ public class FirstDegreeMaterials { .components(Iron * 24, Nickel * 5, Chrome * 8, Manganese, Molybdenum * 2) .colorAverage() .build() + + CobaltSulfate = new Material.Builder(8636, SuSyUtility.susyId('cobalt_sulfate')) + .dust() + .components(Cobalt * 1, Sulfur * 1, Oxygen * 4) + .color(0xbb7694) + .build() + + CobaltSulfateSolution = new Material.Builder(8637, SuSyUtility.susyId('cobalt_sulfate_solution')) + .liquid() + .components(CobaltSulfate * 1, Water * 1) + .colorAverage() + .build() } } diff --git a/groovy/material/SuSyMaterials.groovy b/groovy/material/SuSyMaterials.groovy index 878cf4d7c..d486ed319 100644 --- a/groovy/material/SuSyMaterials.groovy +++ b/groovy/material/SuSyMaterials.groovy @@ -834,6 +834,7 @@ class SuSyMaterials { public static Material IronThioantimonite; public static Material AntimonyIIISulfide; public static Material IronThioarsenite; + public static Material CrudeManganeseIIOxide; public static Material ManganeseIIOxide; public static Material IronIIIHydroxide; public static Material Cellulose; @@ -963,6 +964,8 @@ class SuSyMaterials { public static Material SodiumBismuthate; public static Material BismuthIIIOxide; public static Material ManganeseIINitrate; + public static Material ManganeseIINitrateSolution; + public static Material CrudeManganeseIINitrateSolution; public static Material ManganeseDioxide; public static Material BariumTitanate; public static Material RawElectrum; @@ -1044,6 +1047,7 @@ class SuSyMaterials { public static Material SodiumHexachloroplatinateSolution; public static Material AmmoniumHexachloroplatinate; public static Material DilutedCopperSulfateSolution; + public static Material NickelSulfate; public static Material NickelSulfateSolution; public static Material AluminiumNitride; public static Material AluminiumOxynitride; @@ -1182,6 +1186,8 @@ class SuSyMaterials { public static Material StelliteSix; public static Material HSLAEightyX; public static Material FoodGradeStainlessSteel; + public static Material CobaltSulfate; + public static Material CobaltSulfateSolution; // HP Materials diff --git a/groovy/postInit/chemistry/inorganic_chemistry/Dyes.groovy b/groovy/postInit/chemistry/inorganic_chemistry/Dyes.groovy index 5b022741f..7f60390b1 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/Dyes.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/Dyes.groovy @@ -11,13 +11,16 @@ BR.recipeBuilder() .duration(200) .buildAndRegister() -MIXER.recipeBuilder() - .inputs(ore('dustManganeseIiOxide')) - .inputs(ore('dustIronIiiOxide')) - .outputs(metaitem('dustSienna') * 2) - .EUt(30) - .duration(200) - .buildAndRegister() +def mn_ii_oxides = ['dustManganeseIiOxide', 'dustCrudeManganeseIiOxide'] +for (mn_ii_oxide in mn_ii_oxides) { + MIXER.recipeBuilder() + .inputs(ore(mn_ii_oxide)) + .inputs(ore('dustIronIiiOxide')) + .outputs(metaitem('dustSienna') * 2) + .EUt(30) + .duration(200) + .buildAndRegister() +} furnace.add(metaitem('dustSienna'), metaitem('dustBurntSienna')) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group10/NickelChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group10/NickelChain.groovy index c42891765..a07161776 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group10/NickelChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group10/NickelChain.groovy @@ -7,6 +7,8 @@ EBF = recipemap('electric_blast_furnace') ROASTER = recipemap('roaster') REACTION_FURNACE = recipemap('reaction_furnace') BR = recipemap('batch_reactor') +DISTILLERY = recipemap('distillery') +MIXER = recipemap('mixer') // Garnierite Dust * 1 mods.gregtech.electric_blast_furnace.removeByInput(120, [metaitem('dustPentlandite')], [fluid('oxygen') * 3000]) @@ -58,16 +60,16 @@ for (combustible in combustibles()) { } ELECTROLYTIC_CELL.recipeBuilder() - .fluidInputs(fluid('nickel_sulfate_solution') * 1000) - .fluidInputs(fluid('water') * 2000) - .notConsumable(metaitem('stickNickel')) - .notConsumable(metaitem('graphite_electrode')) - .outputs(metaitem('dustNickel')) - .fluidOutputs(fluid('diluted_sulfuric_acid') * 2000) - .fluidOutputs(fluid('oxygen') * 1000) - .duration(240) - .EUt(Globals.voltAmps[2]) - .buildAndRegister() + .fluidInputs(fluid('nickel_sulfate_solution') * 1000) + .fluidInputs(fluid('water') * 2000) + .notConsumable(metaitem('stickNickel')) + .notConsumable(metaitem('graphite_electrode')) + .outputs(metaitem('dustNickel')) + .fluidOutputs(fluid('diluted_sulfuric_acid') * 2000) + .fluidOutputs(fluid('oxygen') * 1000) + .duration(240) + .EUt(Globals.voltAmps[2]) + .buildAndRegister() //MOND PROCESS @@ -96,3 +98,67 @@ REACTION_FURNACE.recipeBuilder() .duration(40) .buildAndRegister() +// NiCl2 + +ROASTER.recipeBuilder() + .inputs(ore('dustNickel') * 1) + .fluidInputs(fluid('chlorine') * 2000) + .outputs(metaitem('dustNickelChloride') * 3) + .duration(100) + .EUt(30) + .buildAndRegister() + +// Ni(OH)2 + +BR.recipeBuilder() + .inputs(ore('dustNickelChloride') * 3) + .fluidInputs(fluid('potassium_hydroxide_solution') * 2000) + .outputs(metaitem('dustNickelHydroxide') * 5) + .fluidOutputs(fluid('potassium_chloride_solution') * 2000) + .duration(100) + .EUt(30) + .buildAndRegister() + +// NiO + +ROASTER.recipeBuilder() + .inputs(ore('dustNickel')) + .fluidInputs(fluid('oxygen') * 1000) + .outputs(metaitem('dustNickelIiOxide') * 2) + .duration(200) + .EUt(30) + .buildAndRegister() + +ROASTER.recipeBuilder() + .inputs(ore('dustNickelHydroxide') * 5) + .outputs(metaitem('dustNickelIiOxide') * 2) + .fluidOutputs(fluid('dense_steam') * 1000) + .EUt(30) + .duration(200) + .buildAndRegister() + +// NiSO4 + +BR.recipeBuilder() + .inputs(ore('dustNickelIiOxide') * 2) + .fluidInputs(fluid('sulfuric_acid') * 1000) + .fluidOutputs(fluid('nickel_sulfate_solution') * 1000) + .duration(80) + .EUt(30) + .buildAndRegister() + +DISTILLERY.recipeBuilder() + .fluidInputs(fluid('nickel_sulfate_solution') * 1000) + .fluidOutputs(fluid('water') * 1000) + .outputs(metaitem('dustNickelSulfate') * 6) + .duration(80) + .EUt(30) + .buildAndRegister() + +MIXER.recipeBuilder() + .inputs(ore('dustNickelSulfate') * 6) + .fluidInputs(fluid('water') * 1000) + .fluidOutputs(fluid('nickel_sulfate_solution') * 1000) + .duration(80) + .EUt(30) + .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group5/NiobiumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group5/NiobiumChain.groovy index 6182671d8..b836e77ee 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group5/NiobiumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group5/NiobiumChain.groovy @@ -286,11 +286,3 @@ ROASTER.recipeBuilder() .duration(80) .EUt(Globals.voltAmps[3]) .buildAndRegister() - -MIXER.recipeBuilder() - .inputs(ore('dustManganeseIiSulfate') * 6) - .fluidInputs(fluid('water') * 1000) - .fluidOutputs(fluid('manganese_ii_sulfate_solution') * 1000) - .duration(160) - .EUt(Globals.voltAmps[1]) - .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/ManganeseChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/ManganeseChain.groovy index 8e9dd538d..ea3801f73 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/ManganeseChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/ManganeseChain.groovy @@ -10,7 +10,9 @@ import static globals.CarbonGlobals.* EBF = recipemap('electric_blast_furnace') ROASTER = recipemap('roaster') -BATCH_REACTOR = recipemap('batch_reactor') +BR = recipemap('batch_reactor') +MIXER = recipemap('mixer') +DISTILLERY = recipemap('distillery') REACTION_FURNACE = recipemap('reaction_furnace') ELECTROLYTIC_CELL = recipemap('electrolytic_cell') @@ -39,7 +41,7 @@ ROASTER.recipeBuilder() for (highPurityCombustible in highPurityCombustibles()) { ROASTER.recipeBuilder() - .inputs(ore('dustManganeseIiOxide') * 2) + .inputs(ore('dustCrudeManganeseIiOxide') * 2) .inputs(ore(highPurityCombustible.name) * highPurityCombustible.equivalent(1)) .chancedOutput(metaitem('dustManganese'), 8500, 0) .chancedOutput(metaitem(highPurityCombustible.byproduct), 1000, 0) @@ -84,7 +86,7 @@ for (reductant in hydrocarbonReductants) { REACTION_FURNACE.recipeBuilder() .inputs(ore('dustPyrolusite')) .fluidInputs(fluid(reductant.name) * reductant.amount_required) - .outputs(metaitem('dustManganeseIiOxide') * 2) + .outputs(metaitem('dustCrudeManganeseIiOxide') * 2) .fluidOutputs(fluid(reductant.byproduct) * reductant.byproduct_amount) .fluidOutputs(fluid('dense_steam') * (1000 - reductant.byproduct_amount)) .duration(120) @@ -96,7 +98,7 @@ for (reductant in reductants) { REACTION_FURNACE.recipeBuilder() .inputs(ore('dustPyrolusite')) .fluidInputs(fluid(reductant.name) * reductant.amount_required) - .outputs(metaitem('dustManganeseIiOxide') * 2) + .outputs(metaitem('dustCrudeManganeseIiOxide') * 2) .fluidOutputs(fluid(reductant.byproduct) * reductant.byproduct_amount) .duration(120) .EUt(Globals.voltAmps[3]) @@ -104,15 +106,15 @@ for (reductant in reductants) { } //HYDROMETALLURGICAL MANGANESE PROCESSING -BATCH_REACTOR.recipeBuilder() - .inputs(ore('dustManganeseIiOxide')) +BR.recipeBuilder() + .inputs(ore('dustCrudeManganeseIiOxide') * 2) .fluidInputs(fluid('sulfuric_acid') * 1000) .fluidOutputs(fluid('crude_manganese_ii_sulfate_solution') * 1000) .duration(120) .EUt(Globals.voltAmps[2]) .buildAndRegister() -BATCH_REACTOR.recipeBuilder() +BR.recipeBuilder() .inputs(ore('dustTinySodiumHydroxide') * 2) .fluidInputs(fluid('crude_manganese_ii_sulfate_solution') * 4000) .chancedOutput(metaitem('dustIronIiiHydroxide') * 7, 500, 0) @@ -131,6 +133,32 @@ ELECTROLYTIC_CELL.recipeBuilder() .EUt(Globals.voltAmps[2]) .buildAndRegister() +// MnSO4 + +BR.recipeBuilder() + .inputs(ore('dustManganeseIiOxide') * 2) + .fluidInputs(fluid('sulfuric_acid') * 1000) + .fluidOutputs(fluid('manganese_ii_sulfate_solution') * 1000) + .duration(80) + .EUt(30) + .buildAndRegister() + +DISTILLERY.recipeBuilder() + .fluidInputs(fluid('manganese_ii_sulfate_solution') * 1000) + .fluidOutputs(fluid('water') * 1000) + .outputs(metaitem('dustManganeseIiSulfate') * 6) + .duration(80) + .EUt(30) + .buildAndRegister() + +MIXER.recipeBuilder() + .inputs(ore('dustManganeseIiSulfate') * 6) + .fluidInputs(fluid('water') * 1000) + .fluidOutputs(fluid('manganese_ii_sulfate_solution') * 1000) + .duration(80) + .EUt(30) + .buildAndRegister() + // MnCl2 BR.recipeBuilder() @@ -174,11 +202,32 @@ DISTILLERY.recipeBuilder() .EUt(30) .buildAndRegister() -// MnO2 +// Manganese Nitrate process developed by IG Farbenindustrie +// doi:10.1002/14356007.a16_123 BR.recipeBuilder() .inputs(ore('dustPyrolusite') * 3) .fluidInputs(fluid('nitrogen_dioxide') * 2000) + .fluidInputs(fluid('water') * 1000) + .fluidOutputs(fluid('crude_manganese_ii_nitrate_solution') * 1000) + .duration(100) + .EUt(120) + .buildAndRegister() + +ROASTER.recipeBuilder() + .fluidInputs(fluid('crude_manganese_ii_nitrate_solution') * 1000) + .outputs(metaitem('dustManganeseDioxide') * 3) + .fluidOutputs(fluid('nitrogen_dioxide') * 2000) + .fluidOutputs(fluid('dense_steam') * 1000) + .duration(100) + .EUt(120) + .buildAndRegister() + +// MnO2 & Mn(NO3)2 + +BR.recipeBuilder() + .inputs(ore('dustManganeseDioxide') * 3) + .fluidInputs(fluid('nitrogen_dioxide') * 2000) .outputs(metaitem('dustManganeseIiNitrate') * 9) .duration(100) .EUt(120) @@ -192,7 +241,16 @@ ROASTER.recipeBuilder() .EUt(120) .buildAndRegister() -// Manganese hydroxide calcination +ROASTER.recipeBuilder() + .circuitMeta(2) + .inputs(ore('dustManganese') * 1) + .fluidInputs(fluid('oxygen') * 2000) + .outputs(metaitem('dustManganeseDioxide') * 3) + .duration(100) + .EUt(30) + .buildAndRegister() + +// MnO ROASTER.recipeBuilder() .inputs(ore('dustManganeseIiHydroxide') * 5) @@ -202,6 +260,51 @@ ROASTER.recipeBuilder() .EUt(30) .buildAndRegister() +ROASTER.recipeBuilder() + .circuitMeta(1) + .inputs(ore('dustManganese') * 1) + .fluidInputs(fluid('oxygen') * 1000) + .outputs(metaitem('dustManganeseIiOxide') * 2) + .duration(100) + .EUt(30) + .buildAndRegister() + +REACTION_FURNACE.recipeBuilder() + .inputs(ore('dustManganeseDioxide') * 3) + .fluidInputs(fluid('hydrogen') * 2000) + .outputs(metaitem('dustManganeseIiOxide') * 2) + .fluidOutputs(fluid('dense_steam') * 1000) + .duration(100) + .EUt(120) + .buildAndRegister() + +REACTION_FURNACE.recipeBuilder() + .inputs(ore('dustManganeseDioxide') * 3) + .fluidInputs(fluid('carbon_monoxide') * 1000) + .outputs(metaitem('dustManganeseIiOxide') * 2) + .fluidOutputs(fluid('carbon_dioxide') * 1000) + .duration(100) + .EUt(120) + .buildAndRegister() + +// MnO & Mn(NO3)2 + +BR.recipeBuilder() + .inputs(ore('dustManganeseIiOxide') * 2) + .fluidInputs(fluid('nitric_acid') * 2000) + .fluidOutputs(fluid('manganese_ii_nitrate_solution') * 1000) + .duration(100) + .EUt(120) + .buildAndRegister() + +DISTILLERY.recipeBuilder() + .fluidInputs(fluid('manganese_ii_nitrate_solution') * 1000) + .fluidOutputs(fluid('water') * 1000) + .outputs(metaitem('dustManganeseIiNitrate') * 9) + .duration(80) + .EUt(30) + .buildAndRegister() + // Potassium permanganate ROASTER.recipeBuilder() @@ -231,4 +334,4 @@ CRYSTALLIZER.recipeBuilder() .fluidOutputs(fluid('potassium_hydroxide_solution') * 1000) .duration(200) .EUt(30) - .buildAndRegister() \ No newline at end of file + .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group9/CobaltChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group9/CobaltChain.groovy index d9f5bec62..9f9b3958f 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group9/CobaltChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group9/CobaltChain.groovy @@ -6,6 +6,8 @@ EBF = recipemap('electric_blast_furnace') PBF_RECIPES = recipemap("primitive_blast_furnace") FLUIDIZEDBR = recipemap('fluidized_bed_reactor') BR = recipemap('batch_reactor') +DISTILLERY = recipemap('distillery') +MIXER = recipemap('mixer') ELECTROLYTIC_CELL = recipemap('electrolytic_cell') //ROAST RECOVERY OF As2O3 @@ -65,14 +67,6 @@ for (combustible in combustibles()) { .buildAndRegister() } -ROASTER.recipeBuilder() - .inputs(ore('dustCobalt')) - .fluidInputs(fluid('oxygen') * 1000) - .outputs(metaitem('dustCobaltOxide') * 2) - .EUt(Globals.voltAmps[1]) - .duration(120) - .buildAndRegister() - // Primitive ways for getting impure cobalt (cobalt matte) for Kovar. def cobalt_matte_recipes = [ ["oreCobaltite", 1], @@ -90,4 +84,40 @@ cobalt_matte_recipes.forEach { recipe -> .duration(80 * recipe[1]) .buildAndRegister() } -} \ No newline at end of file +} + +// CoO + +ROASTER.recipeBuilder() + .inputs(ore('dustCobalt')) + .fluidInputs(fluid('oxygen') * 1000) + .outputs(metaitem('dustCobaltOxide') * 2) + .duration(120) + .EUt(30) + .buildAndRegister() + +// CoSO4 + +BR.recipeBuilder() + .inputs(ore('dustCobaltOxide') * 2) + .fluidInputs(fluid('sulfuric_acid') * 1000) + .fluidOutputs(fluid('cobalt_sulfate_solution') * 1000) + .duration(80) + .EUt(30) + .buildAndRegister() + +DISTILLERY.recipeBuilder() + .fluidInputs(fluid('cobalt_sulfate_solution') * 1000) + .outputs(metaitem('dustCobaltSulfate') * 6) + .fluidOutputs(fluid('water') * 1000) + .duration(80) + .EUt(30) + .buildAndRegister() + +MIXER.recipeBuilder() + .inputs(ore('dustCobaltSulfate') * 6) + .fluidInputs(fluid('water') * 1000) + .fluidOutputs(fluid('cobalt_sulfate_solution') * 1000) + .duration(80) + .EUt(30) + .buildAndRegister() diff --git a/groovy/postInit/components/Batteries.groovy b/groovy/postInit/components/Batteries.groovy index 2e9acf24f..1c3bb78f2 100644 --- a/groovy/postInit/components/Batteries.groovy +++ b/groovy/postInit/components/Batteries.groovy @@ -119,23 +119,6 @@ ROASTER.recipeBuilder() .EUt(30) .buildAndRegister() -ROASTER.recipeBuilder() - .inputs(ore('dustNickel') * 1) - .fluidInputs(fluid('chlorine') * 2000) - .outputs(metaitem('dustNickelChloride') * 3) - .duration(100) - .EUt(30) - .buildAndRegister() - -BR.recipeBuilder() - .inputs(ore('dustNickelChloride') * 3) - .fluidInputs(fluid('potassium_hydroxide_solution') * 2000) - .outputs(metaitem('dustNickelHydroxide') * 5) - .fluidOutputs(fluid('potassium_chloride_solution') * 2000) - .duration(100) - .EUt(30) - .buildAndRegister() - BR.recipeBuilder() .inputs(ore('dustNickelHydroxide') * 10) .fluidInputs(fluid('potassium_hydroxide_solution') * 2000) diff --git a/groovy/postInit/components/SMDComponents.groovy b/groovy/postInit/components/SMDComponents.groovy index eebb845e4..9aff11aea 100644 --- a/groovy/postInit/components/SMDComponents.groovy +++ b/groovy/postInit/components/SMDComponents.groovy @@ -242,22 +242,6 @@ ROASTER.recipeBuilder() .EUt(30) .buildAndRegister() -ROASTER.recipeBuilder() - .inputs(ore('dustNickel')) - .fluidInputs(fluid('oxygen') * 1000) - .outputs(metaitem('dustNickelIiOxide') * 2) - .duration(200) - .EUt(30) - .buildAndRegister() - -ROASTER.recipeBuilder() - .inputs(ore('dustCobalt')) - .fluidInputs(fluid('oxygen') * 1000) - .outputs(metaitem('dustCobaltOxide') * 2) - .duration(200) - .EUt(30) - .buildAndRegister() - REACTION_FURNACE.recipeBuilder() .inputs(ore('dustTantalum')) .fluidInputs(fluid('nitrogen') * 1000) diff --git a/resources/langfiles/lang/en_us.lang b/resources/langfiles/lang/en_us.lang index 2b7f8595b..af43d5b5c 100644 --- a/resources/langfiles/lang/en_us.lang +++ b/resources/langfiles/lang/en_us.lang @@ -646,6 +646,7 @@ susy.material.arsine=Arsine susy.material.sodium_bromide_solution=Sodium Bromide Solution susy.material.sperrylite_waste=Sperrylite Waste susy.material.gallium_trichloride=Gallium Trichloride +susy.material.crude_manganese_ii_oxide=Crude Manganese II Oxide susy.material.manganese_ii_oxide=Manganese II Oxide susy.material.crude_manganese_ii_sulfate_solution=Crude Manganese II Sulfate Solution susy.material.manganese_ii_sulfate_solution=Manganese II Sulfate Solution @@ -1149,6 +1150,8 @@ susy.material.bismuth_iridate=Bismuth Iridate susy.material.sodium_bismuthate=Sodium Bismuthate susy.material.bismuth_iii_oxide=Bismuth III Oxide susy.material.manganese_ii_nitrate=Manganese II Nitrate +susy.material.manganese_ii_nitrate_solution=Manganese II Nitrate Solution +susy.material.crude_manganese_ii_nitrate_solution=Crude Manganese II Nitrate Solution susy.material.manganese_dioxide=Manganese Dioxide susy.material.borax_electrolyte=Borax Electrolyte susy.material.ferroelectric_ceramic_binding=Ferroelectric Ceramic Binding @@ -1453,6 +1456,7 @@ susy.material.copper_concentrate=Copper Concentrate susy.material.octyl_hydroxamic_acid=Octyl Hydroxamic Acid susy.material.potassium_octyl_hydroxamate=Potassium Octyl Hydroxamate susy.material.diluted_copper_sulfate_solution=Diluted Copper Sulfate Solution +susy.material.nickel_sulfate=Nickel Sulfate susy.material.nickel_sulfate_solution=Nickel Sulfate Solution susy.material.palladium_containing_solution=Palladium Containing Solution susy.material.aluminium_nitride=Aluminium Nitride @@ -1993,6 +1997,8 @@ susy.material.type_y_zeolite=Type Y Zeolite susy.material.type_y_zeolite_solution=Type Y Zeolite Solution susy.material.pyrolysis_gasoline=Pyrolysis Gasoline susy.material.galvanized_steel=Galvanized Steel +susy.material.cobalt_sulfate=Cobalt Sulfate +susy.material.cobalt_sulfate_solution=Cobalt Sulfate Solution susy.material.chlorided_alumina=Chlorided Alumina susy.material.sulfated_metal_oxide=Sulfated Metal Oxide (SMO) susy.material.solid_phosphoric_acid=Solid Phosphoric Acid (SPA) diff --git a/resources/langfiles/lang/ru_RU.lang b/resources/langfiles/lang/ru_RU.lang index c389068a1..7b6cb3721 100644 --- a/resources/langfiles/lang/ru_RU.lang +++ b/resources/langfiles/lang/ru_RU.lang @@ -673,6 +673,7 @@ susy.material.arsine=Арсин susy.material.sodium_bromide_solution=Раствор бромида натрия susy.material.sperrylite_waste=Сперрилитовые отходы susy.material.gallium_trichloride=Трихлорид галлия +susy.material.crude_manganese_ii_oxide=Сырой оксид марганца II susy.material.manganese_ii_oxide=Оксид марганца II susy.material.crude_manganese_ii_sulfate_solution=Раствор сырого сульфата марганца II susy.material.manganese_ii_sulfate_solution=Раствор сульфата марганца II @@ -1172,6 +1173,8 @@ susy.material.bismuth_iridate=Иридат висмута susy.material.sodium_bismuthate=Висмутат натрия susy.material.bismuth_iii_oxide=Оксид висмута III susy.material.manganese_ii_nitrate=Нитрат марганца II +susy.material.manganese_ii_nitrate_solution=Раствор нитрата марганца II +susy.material.crude_manganese_ii_nitrate_solution=Раствор сырого нитрата марганца II susy.material.manganese_dioxide=Диоксид марганца susy.material.borax_electrolyte=Электролит буры susy.material.ferroelectric_ceramic_binding=Сегнетоэлектрическая керамическая связка @@ -1476,6 +1479,7 @@ susy.material.copper_concentrate=Медный концентрат susy.material.octyl_hydroxamic_acid=Октилгидроксамовая кислота susy.material.potassium_octyl_hydroxamate=Октилгидроксамат калия susy.material.diluted_copper_sulfate_solution=Разбавленный раствор медного купороса +susy.material.nickel_sulfate=Сульфат никеля susy.material.nickel_sulfate_solution=Раствор сульфата никеля susy.material.palladium_containing_solution=Раствор, содержащий палладий susy.material.aluminium_nitride=Нитрид алюминия @@ -1979,6 +1983,8 @@ susy.material.potassium_manganate=Манганат калия susy.material.lead_free_solder=Припой без свинца susy.material.cryogenic_solder=Криогенный припой susy.material.oxidized_manganate_solution=Раствор окисленного манганата +susy.material.cobalt_sulfate=Сульфат кобальта +susy.material.cobalt_sulfate_solution=Раствор сульфата кобальта # Изотопы