diff --git a/config/gregtech/worldgen/vein/overworld/talc_vein.json b/config/gregtech/worldgen/vein/overworld/talc_vein.json new file mode 100644 index 000000000..3aad9369b --- /dev/null +++ b/config/gregtech/worldgen/vein/overworld/talc_vein.json @@ -0,0 +1,34 @@ +{ + "weight": 90, + "density": 1, + "max_height": 60, + "min_height": 0, + "vein_populator": { + "type": "surface_rock", + "material": "talc" + }, + "generator": { + "type": "layered", + "radius": [ + 15, + 15 + ] + }, + "filler": { + "type": "layered", + "values": [ + { + "primary": "ore:talc" + }, + { + "secondary": "ore:soapstone" + }, + { + "between": "ore:calcite" + }, + { + "sporadic": "ore:magnesite" + } + ] + } +} diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy old mode 100755 new mode 100644 index f396c8654..2911388da --- a/groovy/material/FirstDegreeMaterials.groovy +++ b/groovy/material/FirstDegreeMaterials.groovy @@ -3175,5 +3175,11 @@ public class FirstDegreeMaterials { .components(Silicon, 1, Chlorine, 4) .color(0x7fa3a0) .build(); + + SaltyHydrofluoricAcid = new Material.Builder(8592, SuSyUtility.susyId("salty_hydrofluoric_acid")) + .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) + .components(Salt, 1, HydrofluoricAcid, 1) + .colorAverage() + .build(); } } diff --git a/groovy/material/OrganicChemistryMaterials.groovy b/groovy/material/OrganicChemistryMaterials.groovy old mode 100755 new mode 100644 index 60ed85b8e..ed63b2cf6 --- a/groovy/material/OrganicChemistryMaterials.groovy +++ b/groovy/material/OrganicChemistryMaterials.groovy @@ -1364,11 +1364,7 @@ public class OrganicChemistryMaterials { .color(0x403c32) .build(); - CyclopentadieneSolution = new Material.Builder(15226, SuSyUtility.susyId('cyclopentadiene_solution')) - .liquid() - .components(Cyclopentadiene, 1, Benzene, 1) - .colorAverage() - .build(); + //FREE ID: 15226 Ferrocene = new Material.Builder(15227, SuSyUtility.susyId('ferrocene')) .dust() @@ -2481,5 +2477,17 @@ public class OrganicChemistryMaterials { .components(Carbon, 1, Hydrogen, 1, Chlorine, 1, Fluorine, 2) .color(0x8c5a99) .build(); + + Acrolein = new Material.Builder(15402, SuSyUtility.susyId('acrolein')) + .fluid() + .components(Carbon, 3, Hydrogen, 4, Oxygen, 1) + .color(0x389c7a) + .build(); + + Dicyclopentadiene = new Material.Builder(15403, SuSyUtility.susyId('dicyclopentadiene')) + .fluid(new FluidBuilder().temperature(306)) + .components(Carbon, 10, Hydrogen, 12) + .color(0x9c388b) + .build(); } } diff --git a/groovy/material/PetrochemistryMaterials.groovy b/groovy/material/PetrochemistryMaterials.groovy index 4a620d0bd..b4286cbab 100644 --- a/groovy/material/PetrochemistryMaterials.groovy +++ b/groovy/material/PetrochemistryMaterials.groovy @@ -316,5 +316,15 @@ public class PetrochemistryMaterials { .liquid() .color(0x7d782e) .build(); + + CFiveFraction = new Material.Builder(20075, SuSyUtility.susyId('c_five_fraction')) + .fluid() + .color(0x9c8638) + .build(); + + DimerizedCFiveFraction = new Material.Builder(20076, SuSyUtility.susyId('c_five_fraction')) + .fluid() + .color(0x9c9538) + .build(); } } \ No newline at end of file diff --git a/groovy/material/SecondDegreeMaterials.groovy b/groovy/material/SecondDegreeMaterials.groovy index c3fdd58ba..aa6033874 100644 --- a/groovy/material/SecondDegreeMaterials.groovy +++ b/groovy/material/SecondDegreeMaterials.groovy @@ -646,5 +646,12 @@ public class SecondDegreeMaterials { .components(BerylliumChloride, 3, AluminiumChloride, 2, SiliconTetrachloride, 6, CarbonMonoxide, 18) .colorAverage() .build(); + + SupportedMolybdenumVanadium = new Material.Builder(13107, SuSyUtility.susyId("supported_molybdenum_vanadium")) + .dust() + .flags(GENERATE_CATALYST_BED) + .components(MolybdenumTrioxide, 1, VanadiumPentoxide, 1, Alumina, 1) + .colorAverage() + .build(); } } diff --git a/groovy/material/SuSyMaterials.groovy b/groovy/material/SuSyMaterials.groovy old mode 100755 new mode 100644 index 4143e878a..44df00a0e --- a/groovy/material/SuSyMaterials.groovy +++ b/groovy/material/SuSyMaterials.groovy @@ -346,10 +346,6 @@ class SuSyMaterials { public static Material MidgradeGasoline; public static Material PremiumGasoline; public static Material SupremeGasoline; - public static Material PotassiumMolecularSieve; - public static Material CesiumMolecularSieve; - public static Material SaturatedPotassiumMolecularSieve; - public static Material SaturatedCesiumMolecularSieve; public static Material AcidicWastewater; public static Material ImpureTitaniumTetrachloride; public static Material DistilledTitaniumTetrachloride; @@ -562,6 +558,8 @@ class SuSyMaterials { public static Material ColdSolventLubricantMixture; public static Material SulfuricLubricatingOil; public static Material DewaxedLubricantMixture; + public static Material CFiveFraction; + public static Material DimerizedCFiveFraction; // First Degree Materials @@ -1006,6 +1004,7 @@ class SuSyMaterials { public static Material PhosphomolybdicAcid; public static Material UraniumDioxide; public static Material UraniumTetrafluoride; + public static Material SaltyHydrofluoricAcid; public static Material SiliconTetrachloride; public static Material PurifiedSiliconTetrachloride; @@ -1184,6 +1183,7 @@ class SuSyMaterials { public static Material DilutedManganeseIIChlorideSolution; public static Material SupportedPalladium; public static Material MixedCyanideSolution; + public static Material SupportedMolybdenumVanadium; public static Material ChlorinatedBeryl; // Organic Chemistry Materials @@ -1397,7 +1397,6 @@ class SuSyMaterials { public static Material IsoOctane; public static Material PurifiedIsoprene; public static Material Cyclopentadiene; - public static Material CyclopentadieneSolution; public static Material Ferrocene; public static Material Polyisoprene; public static Material Chloroethane; @@ -1565,6 +1564,8 @@ class SuSyMaterials { public static Material GaseousMethacroleinMixture; public static Material GaseousMethacroleinResidue; public static Material AbsorbedMethacrolein; + public static Material Acrolein; + public static Material Dicyclopentadiene; public static Material EthyleneCarbonate; public static Material Tetraethyllead; public static Material TertButylHydroperoxide; diff --git a/groovy/material/UnknownCompositionMaterials.groovy b/groovy/material/UnknownCompositionMaterials.groovy index 3e6f19ee3..bd29c974e 100644 --- a/groovy/material/UnknownCompositionMaterials.groovy +++ b/groovy/material/UnknownCompositionMaterials.groovy @@ -1119,29 +1119,7 @@ public class UnknownCompositionMaterials { .color(0xf26d1b) .build(); - PotassiumMolecularSieve = new Material.Builder(4225, SuSyUtility.susyId('potassium_molecular_sieve')) - .dust() - .iconSet(SHINY) - .color(0x7c8e94) - .build(); - - CesiumMolecularSieve = new Material.Builder(4226, SuSyUtility.susyId('cesium_molecular_sieve')) - .dust() - .iconSet(SHINY) - .color(0x9c7f73) - .build(); - - SaturatedPotassiumMolecularSieve = new Material.Builder(4227, SuSyUtility.susyId('saturated_potassium_molecular_sieve')) - .dust() - .color(0x7c8e94) - .build(); - - SaturatedCesiumMolecularSieve = new Material.Builder(4228, SuSyUtility.susyId('saturated_cesium_molecular_sieve')) - .dust() - .color(0x9c7f73) - .build(); - - //FREE IDs: 4229-4231 + //FREE IDs: 4225-4231 TitanylSulfateSolution = new Material.Builder(4232, SuSyUtility.susyId('titanyl_sulfate_solution')) .liquid() diff --git a/groovy/postInit/chemistry/ChemistryOverhaul.groovy b/groovy/postInit/chemistry/ChemistryOverhaul.groovy old mode 100755 new mode 100644 index a0e826b41..c59ed2f16 --- a/groovy/postInit/chemistry/ChemistryOverhaul.groovy +++ b/groovy/postInit/chemistry/ChemistryOverhaul.groovy @@ -1664,12 +1664,11 @@ DISTILLERY.recipeBuilder() //acetylene for (carbon in CarbonGlobals.sources) { - EBF.recipeBuilder() + ADVANCED_ARC_FURNACE.recipeBuilder() .inputs(ore('dustQuicklime') * 2) .inputs(ore(carbon.name) * carbon.equivalent(3)) .outputs(metaitem('dustCalciumCarbide') * 3) .fluidOutputs(fluid('carbon_monoxide') * 1000) - .blastFurnaceTemp(2473) .EUt(120) .duration(400) .buildAndRegister() @@ -3388,7 +3387,24 @@ BCR.recipeBuilder() .fluidInputs(fluid('water') * 100) .fluidInputs(fluid('ammonia') * 50) .fluidOutputs(fluid('diluted_ammonia_solution') * 100) - .duration(5) + .duration(1) + .EUt(30) + .buildAndRegister() + +MIXER.recipeBuilder() + .fluidInputs(fluid('ammonia_solution') * 1000) + .fluidInputs(fluid('water') * 1000) + .fluidOutputs(fluid('diluted_ammonia_solution') * 1000) + .duration(20) + .EUt(Globals.voltAmps[1]) + .buildAndRegister() + + +DISTILLATION_TOWER.recipeBuilder() + .fluidInputs(fluid('diluted_ammonia_solution') * 1000) + .fluidOutputs(fluid('water') * 1000) + .fluidOutputs(fluid('ammonia_solution') * 1000) + .duration(150) .EUt(30) .buildAndRegister() @@ -3432,7 +3448,7 @@ DISTILLATION_TOWER.recipeBuilder() .fluidOutputs(fluid('diethylene_glycol') * 100) .fluidOutputs(fluid('ethylene_glycol') * 500) .fluidOutputs(fluid('water') * 400) - .duration(300) + .duration(200) .EUt(30) .buildAndRegister() @@ -4344,3 +4360,38 @@ MIXER.recipeBuilder() .EUt(30) .duration(80) .buildAndRegister() + +// NaF Chemistry + +MIXER.recipeBuilder() + .inputs(ore('dustSodiumFluoride') * 2) + .fluidInputs(fluid('water') * 1000) + .fluidOutputs(fluid('sodium_fluoride_solution') * 1000) + .duration(20) + .EUt(30) + .buildAndRegister() + +BCR.recipeBuilder() + .fluidInputs(fluid('sodium_fluoride_solution') * 50) + .fluidOutputs(fluid('hydrogen_chloride') * 50) + .fluidOutputs(fluid('salty_hydrofluoric_acid') * 50) + .duration(2) + .EUt(30) + .buildAndRegister() + +DISTILLERY.recipeBuilder() + .fluidInputs(fluid('salty_hydrofluoric_acid') * 1000) + .outputs(metaitem('dustSalt') * 2) + .fluidOutputs(fluid('hydrofluoric_acid') * 1000) + .duration(20) + .EUt(30) + .buildAndRegister() + +//Ca(OH)2.H2O +MIXER.recipeBuilder() + .inputs(ore('dustCalciumHydroxide') * 5) + .fluidInputs(fluid('water') * 1000) + .fluidOutputs(fluid('calcium_hydroxide_solution') * 1000) + .EUt(16) + .duration(100) + .buildAndRegister() diff --git a/groovy/postInit/chemistry/OreSorting.groovy b/groovy/postInit/chemistry/OreSorting.groovy index 9f66f0621..f1d638c8a 100755 --- a/groovy/postInit/chemistry/OreSorting.groovy +++ b/groovy/postInit/chemistry/OreSorting.groovy @@ -306,7 +306,8 @@ def alluvial_tier_1 = [ def alluvial_tier_2 = [ 'gregtech:ore_cassiterite_0' : 10000, - 'susy:resource_block:11' : 10000 + 'susy:resource_block:10' : 100, + 'susy:resource_block:11' : 5000 ]; @@ -314,7 +315,7 @@ def alluvial_tier_3 = [ 'minecraft:soul_sand' : 10000, 'gregtech:ore_cassiterite_0' : 10000, 'susy:resource_block:10' : 100, - 'susy:resource_block:11' : 1000 + 'susy:resource_block:11' : 5000 ]; def alluvial_tier_4 = [ diff --git a/groovy/postInit/chemistry/Quenching.groovy b/groovy/postInit/chemistry/Quenching.groovy index 389be3158..76117edfd 100644 --- a/groovy/postInit/chemistry/Quenching.groovy +++ b/groovy/postInit/chemistry/Quenching.groovy @@ -164,3 +164,16 @@ for (entry in fluidMap) { } } +// Air cooling +recipemap('radiator').recipeBuilder() + .fluidInputs(fluid('hot_air') * 1000) + .fluidOutputs(liquid('air') * 1000) + .duration(100) + .buildAndRegister(); + +recipemap('cooling_unit').recipeBuilder() + .fluidInputs(fluid('hot_air') * 1000) + .fluidOutputs(liquid('air') * 1000) + .duration(50) + .EUt(480) + .buildAndRegister(); \ No newline at end of file diff --git a/groovy/postInit/chemistry/WaterPurificationChain.groovy b/groovy/postInit/chemistry/WaterPurificationChain.groovy index b661dc3a0..dd1b7089f 100755 --- a/groovy/postInit/chemistry/WaterPurificationChain.groovy +++ b/groovy/postInit/chemistry/WaterPurificationChain.groovy @@ -125,7 +125,7 @@ BR.recipeBuilder() .outputs(metaitem('dustBoricAcid') * 7) .fluidOutputs(fluid('boron_free_brine') * 1000) .duration(120) - .EUt(480) + .EUt(120) .buildAndRegister() BR.recipeBuilder() @@ -134,7 +134,7 @@ BR.recipeBuilder() .outputs(metaitem('gregtechfoodoption:lithium_carbonate_dust') * 6) .fluidOutputs(fluid('lithium_free_brine') * 1000) .duration(120) - .EUt(480) + .EUt(120) .buildAndRegister() BCR.recipeBuilder() @@ -142,7 +142,7 @@ BCR.recipeBuilder() .fluidInputs(fluid('chlorine') * 10) .fluidOutputs(fluid('chlorinated_brine') * 50) .duration(1) - .EUt(480) + .EUt(120) .buildAndRegister() VACUUM_CHAMBER.recipeBuilder() @@ -151,7 +151,7 @@ VACUUM_CHAMBER.recipeBuilder() .fluidOutputs(fluid('impure_bromine') * 100) .fluidOutputs(fluid('wastewater_sludge') * 500) .duration(120) - .EUt(480) + .EUt(120) .buildAndRegister() CENTRIFUGE.recipeBuilder() @@ -159,7 +159,7 @@ CENTRIFUGE.recipeBuilder() .fluidOutputs(fluid('bromine') * 1000) .chancedOutput(metaitem('dustIodine'), 1000, 1000) .duration(120) - .EUt(480) + .EUt(120) .buildAndRegister() MSFD.recipeBuilder() diff --git a/groovy/postInit/chemistry/elements/GoldChain.groovy b/groovy/postInit/chemistry/elements/GoldChain.groovy index 67aa6f45a..b467d1cb8 100755 --- a/groovy/postInit/chemistry/elements/GoldChain.groovy +++ b/groovy/postInit/chemistry/elements/GoldChain.groovy @@ -11,6 +11,7 @@ DISTILLATION_TOWER = recipemap('distillation_tower') // Silver Dust * 1 mods.gregtech.centrifuge.removeByInput(30, [metaitem('dustRawElectrum') * 2], null) +mods.gregtech.mixer.removeByInput(30, [fluid('hydrochloric_acid') * 2000], [fluid('nitric_acid') * 1000]) //GOLD AMALGAMATION (50% EFFICIENCY) MIXER.recipeBuilder() diff --git a/groovy/postInit/chemistry/elements/ManganeseChain.groovy b/groovy/postInit/chemistry/elements/ManganeseChain.groovy index cd585e024..a10b598e2 100755 --- a/groovy/postInit/chemistry/elements/ManganeseChain.groovy +++ b/groovy/postInit/chemistry/elements/ManganeseChain.groovy @@ -190,3 +190,13 @@ ROASTER.recipeBuilder() .duration(100) .EUt(120) .buildAndRegister() + +// Manganese hydroxide calcination + +ROASTER.recipeBuilder() + .inputs(ore('dustManganeseIiHydroxide') * 5) + .fluidOutputs(fluid('steam') * 1000) + .outputs(metaitem('dustManganeseIiOxide') * 2) + .duration(200) + .EUt(30) + .buildAndRegister() \ No newline at end of file diff --git a/groovy/postInit/chemistry/elements/PlatinumGroupChain.groovy b/groovy/postInit/chemistry/elements/PlatinumGroupChain.groovy index 5a58a691b..8e5ebe6f0 100755 --- a/groovy/postInit/chemistry/elements/PlatinumGroupChain.groovy +++ b/groovy/postInit/chemistry/elements/PlatinumGroupChain.groovy @@ -27,13 +27,13 @@ SIFTER.recipeBuilder() .buildAndRegister() BR.recipeBuilder() - .inputs(ore('dustAlluvialPgm') * 4) - .fluidInputs(fluid('aqua_regia') * 24000) - .fluidInputs(fluid('nitric_acid') * 2000) - .fluidOutputs(fluid('alluvial_pgm_solution') * 10000) - .fluidOutputs(fluid('hydrogen') * 2000) - .fluidOutputs(fluid('nitrogen_dioxide') * 10000) - .duration(240) + .inputs(ore('dustAlluvialPgm') * 2) + .fluidInputs(fluid('aqua_regia') * 12000) + .fluidInputs(fluid('nitric_acid') * 1000) + .fluidOutputs(fluid('alluvial_pgm_solution') * 5000) + .fluidOutputs(fluid('hydrogen') * 1000) + .fluidOutputs(fluid('nitrogen_dioxide') * 5000) + .duration(120) .EUt(Globals.voltAmps[2]) .buildAndRegister() diff --git a/groovy/postInit/chemistry/elements/TantalumChain.groovy b/groovy/postInit/chemistry/elements/TantalumChain.groovy index b52858146..1497184ad 100755 --- a/groovy/postInit/chemistry/elements/TantalumChain.groovy +++ b/groovy/postInit/chemistry/elements/TantalumChain.groovy @@ -100,14 +100,6 @@ CENTRIFUGE.recipeBuilder() // Tantalum Extract .EUt(Globals.voltAmps[3]) .buildAndRegister() -MIXER.recipeBuilder() - .fluidInputs(fluid('ammonia_solution') * 1000) - .fluidInputs(fluid('water') * 1000) - .fluidOutputs(fluid('diluted_ammonia_solution') * 1000) - .duration(20) - .EUt(Globals.voltAmps[1]) - .buildAndRegister() - CENTRIFUGE.recipeBuilder() // Fluorotantalic Acid Solution .fluidInputs(fluid('tantalum_extract') * 8000) .fluidInputs(fluid('diluted_ammonia_solution') * 2000) diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy index 0402f8773..ccf5c9b71 100755 --- a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy +++ b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy @@ -187,74 +187,6 @@ CSTR.recipeBuilder() // Ferrocene - ALLOY_SMELTER.recipeBuilder() - .inputs(ore('dustAnyPurityPotassium')) - .inputs(ore('dustMolecularSieve') * 4) - .outputs(metaitem('dustPotassiumMolecularSieve') * 4) - .duration(300) - .EUt(120) - .buildAndRegister() - - ALLOY_SMELTER.recipeBuilder() - .inputs(ore('dustCaesium')) - .inputs(ore('dustMolecularSieve') * 4) - .outputs(metaitem('dustCesiumMolecularSieve') * 4) - .duration(400) - .EUt(120) - .buildAndRegister() - - ALLOY_SMELTER.recipeBuilder() - .inputs(ore('dustAnyPuritySodium')) - .inputs(ore('dustAnyPurityLead')) - .outputs(metaitem('ingotSodiumLeadAlloy') * 2) - .duration(300) - .EUt(30) - .buildAndRegister() - - SIFTER.recipeBuilder() - .fluidInputs(fluid('isoprene') * 4000) - .inputs(ore('dustCesiumMolecularSieve') * 1) - .fluidOutputs(fluid('purified_isoprene') * 4000) - .outputs(metaitem('dustSaturatedCesiumMolecularSieve') * 1) - .duration(200) - .EUt(120) - .buildAndRegister() - - SIFTER.recipeBuilder() - .fluidInputs(fluid('isoprene') * 4000) - .inputs(ore('dustPotassiumMolecularSieve') * 1) - .fluidOutputs(fluid('purified_isoprene') * 4000) - .outputs(metaitem('dustSaturatedPotassiumMolecularSieve') * 1) - .duration(300) - .EUt(120) - .buildAndRegister() - - CENTRIFUGE.recipeBuilder() - .fluidInputs(fluid('benzene') * 50) - .inputs(ore('dustSaturatedPotassiumMolecularSieve') * 1) - .fluidOutputs(fluid('cyclopentadiene_solution') * 100) - .outputs(metaitem('dustPotassiumMolecularSieve') * 1) - .duration(200) - .EUt(120) - .buildAndRegister() - - CENTRIFUGE.recipeBuilder() - .fluidInputs(fluid('benzene') * 100) - .inputs(ore('dustSaturatedCesiumMolecularSieve') * 1) - .fluidOutputs(fluid('cyclopentadiene_solution') * 200) - .outputs(metaitem('dustCesiumMolecularSieve') * 1) - .duration(200) - .EUt(120) - .buildAndRegister() - - DT.recipeBuilder() - .fluidInputs(fluid('cyclopentadiene_solution') * 2000) - .fluidOutputs(fluid('benzene') * 1000) - .fluidOutputs(fluid('cyclopentadiene') * 1000) - .duration(200) - .EUt(120) - .buildAndRegister() - BR.recipeBuilder() .fluidInputs(fluid('iron_pentacarbonyl') * 1000) .fluidInputs(fluid('cyclopentadiene') * 2000) @@ -316,6 +248,22 @@ CSTR.recipeBuilder() // Tetraethyl Lead + ALLOY_SMELTER.recipeBuilder() + .inputs(ore('dustAnyPuritySodium')) + .inputs(ore('dustAnyPurityLead')) + .outputs(metaitem('ingotSodiumLeadAlloy') * 2) + .duration(300) + .EUt(30) + .buildAndRegister() + + ALLOY_SMELTER.recipeBuilder() + .inputs(ore('dustAnyPuritySodium')) + .inputs(ore('ingotLead')) + .outputs(metaitem('ingotSodiumLeadAlloy') * 2) + .duration(300) + .EUt(30) + .buildAndRegister() + BCR.recipeBuilder() .fluidInputs(fluid('hydrogen_chloride') * 50) .fluidInputs(fluid('ethylene') * 50) @@ -445,25 +393,25 @@ BR.recipeBuilder() .buildAndRegister() // Corrosion inhibitors - +for (inertGas in Globals.inertGases) { REACTION_FURNACE.recipeBuilder() .notConsumable(ore('dustAluminiumSilicate')) - .notConsumable(fluid('argon') * 2000) + .notConsumable(fluid(inertGas.name) * inertGas.amount_required) .fluidInputs(fluid('linoleic_acid') * 2000) .fluidOutputs(fluid('corrosion_inhibitor') * 2000) - .duration(200) + .duration(200 * inertGas.duration) .EUt(120) .buildAndRegister() REACTION_FURNACE.recipeBuilder() .notConsumable(ore('dustAluminiumSilicate')) - .notConsumable(fluid('argon') * 2000) + .notConsumable(fluid(inertGas.name) * inertGas.amount_required) .fluidInputs(fluid('oleic_acid') * 2000) .fluidOutputs(fluid('corrosion_inhibitor') * 2000) - .duration(200) + .duration(200 * inertGas.duration) .EUt(120) .buildAndRegister() - +} def OxygenateMap = [ 'methanol': 1000, 'ethanol': 1000, diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Lubricants.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Lubricants.groovy index 1a2987df7..8f81e4fcb 100755 --- a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Lubricants.groovy +++ b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Lubricants.groovy @@ -676,7 +676,7 @@ DUMPER = recipemap('dumping') POLYMERIZATION.recipeBuilder() .fluidInputs(fluid('ethylene_oxide') * 1000) - .fluidInputs(fluid('boron_trifluoride') * 50) + .notConsumable(fluid('boron_trifluoride') * 50) .fluidOutputs(fluid('polyethylene_glycol') * 1000) .duration(200) .EUt(240) @@ -859,7 +859,7 @@ DUMPER = recipemap('dumping') .fluidInputs(fluid('phenol') * 1000) .fluidInputs(fluid('tripropylene') * 1000) .notConsumable(fluid('hydrofluoric_acid') * 100) - .fluidOutputs(fluid('nonylphenol')) + .fluidOutputs(fluid('nonylphenol') * 1000) .duration(200) .EUt(Globals.voltAmps[2]) .buildAndRegister() @@ -1045,22 +1045,22 @@ def antioxidantMap = [ // Base baseOilMap.each { oil, multiplier1 -> solidFrictionModifierMap.each { sfm, multiplier2 -> - BLENDER.recipeBuilder() + MIXER.recipeBuilder() .inputs(ore(sfm)) .fluidInputs(fluid(oil) * (1000 * multiplier2 * 4)) .fluidOutputs(fluid('lubricant') * (1000 * multiplier1 * multiplier2 * 4)) .duration(200) - .EUt(120) + .EUt(7) .buildAndRegister() } liquidFrictionModifierMap.each { lfm, multiplier3 -> - BLENDER.recipeBuilder() + MIXER.recipeBuilder() .fluidInputs(fluid(oil) * (1000 * multiplier3)) .fluidInputs(fluid(lfm) * 250) .fluidOutputs(fluid('lubricant') * (1000 * multiplier1 * multiplier3)) .duration(200) - .EUt(120) + .EUt(7) .buildAndRegister() } } diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/OilOverhaul.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/OilOverhaul.groovy index 2b766f041..9a03990bf 100755 --- a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/OilOverhaul.groovy +++ b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/OilOverhaul.groovy @@ -30,6 +30,7 @@ LCR = recipemap('large_chemical_reactor') AUTOCLAVE = recipemap('autoclave') HEAT_EXCHANGER = recipemap('heat_exchanger') UV_LIGHT_BOX = recipemap('uv_light_box') +FLUID_HEATER = recipemap('fluid_heater') class Oil { String name @@ -328,12 +329,12 @@ CENTRIFUGE.recipeBuilder() // Solvent Dewaxing VACUUM_DT.recipeBuilder() .fluidInputs(fluid('sulfuric_oil_residue') * 1000) + .outputs(metaitem('bituminous_residue')) + .fluidOutputs(fluid('crude_lubricating_oil') * 850) .fluidOutputs(fractions.fuel_oil.getSulfuric(200)) .fluidOutputs(fractions.diesel.getSulfuric(200)) .fluidOutputs(fractions.kerosene.getSulfuric(150)) .fluidOutputs(fractions.naphtha.getSulfuric(100)) - .fluidOutputs(fluid('crude_lubricating_oil') * 850) - .outputs(metaitem('bituminous_residue')) .duration(600) .EUt(30) .buildAndRegister() @@ -522,7 +523,7 @@ DT.recipeBuilder() .fluidOutputs(fluid('ethylene') * 800) .fluidOutputs(fluid('methane') * 50) .fluidOutputs(fluid('hydrogen') * 50) -.duration(600) +.duration(150) .EUt(Globals.voltAmps[1] * 2) .buildAndRegister() @@ -533,7 +534,7 @@ DT.recipeBuilder() .fluidOutputs(fluid('ethylene') * 500) .fluidOutputs(fluid('methane') * 150) .fluidOutputs(fluid('hydrogen') * 150) -.duration(600) +.duration(150) .EUt(Globals.voltAmps[1] * 2) .buildAndRegister() @@ -544,7 +545,7 @@ DT.recipeBuilder() .fluidOutputs(fluid('ethylene') * 350) .fluidOutputs(fluid('methane') * 150) .fluidOutputs(fluid('hydrogen') * 100) -.duration(600) +.duration(150) .EUt(Globals.voltAmps[1] * 2) .buildAndRegister() @@ -823,7 +824,7 @@ DT.recipeBuilder() .fluidOutputs(fluid('gasoline') * 150) .fluidOutputs(fluid('toluene') * 40) .fluidOutputs(fluid('benzene') * 150) -.fluidOutputs(fluid('isoprene') * 150) +.fluidOutputs(fluid('c_five_fraction') * 150) .fluidOutputs(fluid('butene') * 80) .fluidOutputs(fluid('butadiene') * 150) .fluidOutputs(fluid('propane') * 15) @@ -841,7 +842,7 @@ DT.recipeBuilder() .fluidOutputs(fluid('gasoline') * 50) .fluidOutputs(fluid('toluene') * 20) .fluidOutputs(fluid('benzene') * 100) -.fluidOutputs(fluid('isoprene') * 350) +.fluidOutputs(fluid('c_five_fraction') * 350) .fluidOutputs(fluid('butene') * 50) .fluidOutputs(fluid('butadiene') * 50) .fluidOutputs(fluid('propane') * 15) @@ -1003,6 +1004,14 @@ CRYSTALLIZER.recipeBuilder() .EUt(Globals.voltAmps[1]) .buildAndRegister() +mods.gregtech.extractor.removeByInput(30, [metaitem('dustParaXylene')]) +EXTRACTOR.recipeBuilder() +.inputs(ore('dustParaXylene')) +.fluidOutputs(fluid('para_xylene') * 1000) +.duration(5) +.EUt(30) +.buildAndRegister() + BR.recipeBuilder() .inputs(ore('dustDicobaltOctacarbonyl') * 18) .fluidInputs(fluid('hydrogen') * 2000) @@ -1078,3 +1087,30 @@ REFORMER.recipeBuilder() .duration(60) .EUt(Globals.voltAmps[1] * 2) .buildAndRegister() + +// Steam-cracked naphtha C5-fraction separation + + // Dimerization of CPD + + FLUID_HEATER.recipeBuilder() + .fluidInputs(fluid('c_five_fraction') * 1000) + .fluidOutputs(fluid('dimerized_c_five_fraction') * 875) + .duration(60) + .EUt(Globals.voltAmps[1]) + .buildAndRegister() + + DT.recipeBuilder() + .fluidInputs(fluid('dimerized_c_five_fraction') * 875) + .fluidOutputs(fluid('dicyclopentadiene') * 125) + .fluidOutputs(fluid('pentane') * 375) + .fluidOutputs(fluid('isoprene') * 375) + .duration(60) + .EUt(Globals.voltAmps[1]) + .buildAndRegister() + + FLUID_HEATER.recipeBuilder() + .fluidInputs(fluid('dicyclopentadiene') * 1000) + .fluidOutputs(fluid('cyclopentadiene') * 2000) + .duration(60) + .EUt(Globals.voltAmps[1]) + .buildAndRegister() \ No newline at end of file diff --git a/groovy/postInit/chemistry/organic_chemistry/polymers/EpoxyChain.groovy b/groovy/postInit/chemistry/organic_chemistry/polymers/EpoxyChain.groovy old mode 100755 new mode 100644 diff --git a/groovy/postInit/chemistry/organic_chemistry/polymers/PolyesterChain.groovy b/groovy/postInit/chemistry/organic_chemistry/polymers/PolyesterChain.groovy index 82f4dac2f..8a2039fc7 100755 --- a/groovy/postInit/chemistry/organic_chemistry/polymers/PolyesterChain.groovy +++ b/groovy/postInit/chemistry/organic_chemistry/polymers/PolyesterChain.groovy @@ -28,7 +28,7 @@ POLYMERIZATION.recipeBuilder() .fluidInputs(fluid('dimethyl_terephthalate') * 3456) .outputs(metaitem('dustPolyethyleneTerephthalate') * 2) .fluidOutputs(fluid('methanol') * 2000) - .EUt(Globals.voltAmps[3]) + .EUt(Globals.voltAmps[2]) .duration(80) .buildAndRegister() diff --git a/groovy/postInit/chemistry/organic_chemistry/polymers/RubberChain.groovy b/groovy/postInit/chemistry/organic_chemistry/polymers/RubberChain.groovy index c57813b42..72e30804c 100755 --- a/groovy/postInit/chemistry/organic_chemistry/polymers/RubberChain.groovy +++ b/groovy/postInit/chemistry/organic_chemistry/polymers/RubberChain.groovy @@ -9,6 +9,7 @@ POLYMERIZATION_TANK = recipemap('polymerization_tank') MIXER = recipemap('mixer') SIFTER = recipemap('sifter') DRYER = recipemap('dryer') +EXTRACTOR = recipemap('extractor') //REMOVALS // Raw Rubber Pulp * 2 @@ -218,6 +219,14 @@ for (coagulant in coagulants) { CoagulationRecipe(coagulant, 16, 2500, 5) } +mods.gregtech.extractor.removeByInput(30, [metaitem('dustLatex')]) +EXTRACTOR.recipeBuilder() +.inputs(ore('dustLatex')) +.fluidOutputs(fluid('latex') * 1000) +.duration(98) +.EUt(30) +.buildAndRegister() + // Polyisoprene POLYMERIZATION_TANK.recipeBuilder() .fluidInputs(fluid('isoprene') * 1000) diff --git a/groovy/postInit/electronics/Photomasks.groovy b/groovy/postInit/electronics/Photomasks.groovy index caf993e75..f3b01fd14 100755 --- a/groovy/postInit/electronics/Photomasks.groovy +++ b/groovy/postInit/electronics/Photomasks.groovy @@ -2,41 +2,75 @@ import globals.Globals ASSEMBLER = recipemap('assembler') BR = recipemap('batch_reactor') +FBR = recipemap('fixed_bed_reactor') REACTION_FURNACE = recipemap('reaction_furnace') ROASTER = recipemap('roaster') MIXER = recipemap('mixer') UV_LIGHT_BOX = recipemap('uv_light_box') -// TMPTA +// Acrylic Acid -BR.recipeBuilder() - .fluidInputs(fluid('butyraldehyde') * 1000) - .fluidInputs(fluid('formaldehyde') * 3000) - .fluidInputs(fluid('sodium_hydroxide_solution') * 1000) - .outputs(metaitem('dustTrimethylolpropane')) - .fluidOutputs(fluid('wastewater') * 1000) - .duration(200) - .EUt(120) - .buildAndRegister() + // Reppe route + BR.recipeBuilder() + .fluidInputs(fluid('butyraldehyde') * 1000) + .fluidInputs(fluid('formaldehyde') * 3000) + .fluidInputs(fluid('sodium_hydroxide_solution') * 1000) + .outputs(metaitem('dustTrimethylolpropane')) + .fluidOutputs(fluid('wastewater') * 1000) + .duration(200) + .EUt(120) + .buildAndRegister() -ROASTER.recipeBuilder() - .inputs(ore('dustCopper')) - .inputs(ore('dustNickel')) - .fluidInputs(fluid('bromine') * 4000) - .outputs(metaitem('dustAcrylicCatalyst')) - .duration(200) - .EUt(120) - .buildAndRegister() + ROASTER.recipeBuilder() + .inputs(ore('dustCopper')) + .inputs(ore('dustNickel')) + .fluidInputs(fluid('bromine') * 4000) + .outputs(metaitem('dustAcrylicCatalyst')) + .duration(200) + .EUt(120) + .buildAndRegister() -REACTION_FURNACE.recipeBuilder() - .notConsumable(ore('dustAcrylicCatalyst')) - .fluidInputs(fluid('acetylene') * 1000) - .fluidInputs(fluid('carbon_monoxide') * 1000) - .fluidInputs(fluid('water') * 1000) - .fluidOutputs(fluid('acrylic_acid') * 1000) - .duration(200) - .EUt(120) - .buildAndRegister() + REACTION_FURNACE.recipeBuilder() + .notConsumable(ore('dustAcrylicCatalyst')) + .fluidInputs(fluid('acetylene') * 1000) + .fluidInputs(fluid('carbon_monoxide') * 1000) + .fluidInputs(fluid('water') * 1000) + .fluidOutputs(fluid('acrylic_acid') * 1000) + .duration(200) + .EUt(120) + .buildAndRegister() + + // Propene route + + ROASTER.recipeBuilder() + .inputs(ore('dustMolybdenumTrioxide') * 4) + .inputs(ore('dustVanadiumPentoxide') * 7) + .inputs(ore('dustAlumina') * 5) + .outputs(metaitem('dustSupportedMolybdenumVanadium')) + .duration(200) + .EUt(120) + .buildAndRegister() + + FBR.recipeBuilder() + .notConsumable(ore('dustPhosphomolybdicAcid')) + .fluidInputs(fluid('propene') * 50) + .fluidInputs(fluid('oxygen') * 100) + .fluidOutputs(fluid('acrolein') * 50) + .fluidOutputs(fluid('steam') * 50) + .duration(8) + .EUt(120) + .buildAndRegister() + + FBR.recipeBuilder() + .notConsumable(ore('catalystBedSupportedMolybdenumVanadium')) + .fluidInputs(fluid('acrolein') * 50) + .fluidInputs(fluid('oxygen') * 50) + .fluidOutputs(fluid('acrylic_acid') * 50) + .duration(8) + .EUt(120) + .buildAndRegister() + +// TMPTA BR.recipeBuilder() .notConsumable(ore('springCupronickel')) diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy index 82bf95740..f123203f8 100644 --- a/groovy/postInit/mod/GregTech.groovy +++ b/groovy/postInit/mod/GregTech.groovy @@ -448,9 +448,9 @@ mods.gregtech.assembler.removeByInput(480, [metaitem('plateEnderPearl') * 9, met crafting.addShapeless('convert_old_slaked_lime', metaitem('dustCalciumHydroxide'), [metaitem('slaked_lime')]) mods.gregtech.chemical_bath.recipeBuilder() - .inputs(ore('dustQuicklime')) - .fluidInputs(fluid('water') * 500) - .outputs(metaitem('dustCalciumHydroxide')) + .inputs(ore('dustQuicklime') * 2) + .fluidInputs(fluid('water') * 1000) + .outputs(metaitem('dustCalciumHydroxide') * 5) .duration(20) .EUt(30) .buildAndRegister(); @@ -1390,6 +1390,26 @@ crafting.addShaped("gregtech:fluid_hatch.export.ulv", metaitem('fluid_hatch.expo [null, item('minecraft:glass'), null] ]) +// Black Granite Dust * 1 +mods.gregtech.macerator.removeByInput(2, [item('gregtech:stone_smooth')], null) + +mods.gregtech.Dust.recipeBuilder() + .inputs(ore('stoneGraniteBlack')) + .outputs(metaitem('dustGraniteBlack') * 1) + .duration(150) + .EUt(2) + .buildAndRegister() + +// Red Granite Dust * 1 +mods.gregtech.macerator.removeByInput(2, [item('gregtech:stone_smooth', 1)], null) + +mods.gregtech.Dust.recipeBuilder() + .inputs(ore('stoneGraniteRed')) + .outputs(metaitem('dustGraniteRed') * 1) + .duration(150) + .EUt(2) + .buildAndRegister() + // Multiblock Builder crafting.replaceShaped("gregtech:multiblock_builder", metaitem('tool.multiblock_builder'), [ diff --git a/groovy/postInit/mod/MachineRecipes.groovy b/groovy/postInit/mod/MachineRecipes.groovy index 6f50bfeeb..f08a20dc0 100755 --- a/groovy/postInit/mod/MachineRecipes.groovy +++ b/groovy/postInit/mod/MachineRecipes.groovy @@ -536,7 +536,7 @@ crafting.addShaped("steel_turbine_rotor", item('susy:turbine_rotor'), [ crafting.addShaped("steel_turbine_controller", metaitem('basic_steam_turbine'), [ [ore('plateSteel'), metaitem('cableGtSingleTin'), ore('plateSteel')], - [ore('circuitLv'), item('gregtech:machine_casing', 1), ore('circuitLv')], + [ore('circuitLv'), metaitem('hull.lv'), ore('circuitLv')], [metaitem('cableGtSingleTin'), ore('circuitLv'), metaitem('cableGtSingleTin')] ]) @@ -876,6 +876,26 @@ for (i = 1; i <= 8; i++) { ]) } +// Polishing Machine + +for (i = 1; i <= 8; i++) { + crafting.addShaped("gregtech:polishing_machine." + Globals.voltageTiers[i], metaitem('polishing_machine.' + Globals.voltageTiers[i]), [ + [robotArms[i], circuits[i], pumps[i]], + [tieredGlass[i], hulls[i], tieredGlass[i]], + [tieredCables[i], motors[i], tieredCables[i]] + ]) +} + +// Textile Spinner + +for (i = 1; i <= 8; i++) { + crafting.addShaped("gregtech:spinning." + Globals.voltageTiers[i], metaitem('polishing_machine.' + Globals.voltageTiers[i]), [ + [circuits[i], tieredCables[i], circuits[i]], + [pumps[i], hulls[i], motor[i]], + [tieredCables[i], motor[i], motor[i]] + ]) +} + // Bath Condenser crafting.addShaped("gregtech:bath_condenser", metaitem('bath_condenser.lv'), [ diff --git a/groovy/postInit/mod/NoTreePunching.groovy b/groovy/postInit/mod/NoTreePunching.groovy index ef2ab99c5..5d257b63b 100644 --- a/groovy/postInit/mod/NoTreePunching.groovy +++ b/groovy/postInit/mod/NoTreePunching.groovy @@ -2,4 +2,6 @@ for(int i = 1; i < 35; i++){ crafting.remove("notreepunching:saw_planks_" + i.toString()); } + crafting.remove("notreepunching:saw_log_sticks"); + furnace.removeByInput(item('notreepunching:pottery/small_vessel')) \ No newline at end of file diff --git a/groovy/postInit/mod/XNet.groovy b/groovy/postInit/mod/XNet.groovy index b7f02cdee..8642cd2dc 100644 --- a/groovy/postInit/mod/XNet.groovy +++ b/groovy/postInit/mod/XNet.groovy @@ -77,7 +77,7 @@ crafting.addShaped("xnet_routing_connector", item('xnet:connector:4'), [ crafting.addShaped("xnet_connector_upgrade", item('xnet:connector_upgrade'), [ [ore('plateAluminium'), ore('plateAluminium'), ore('plateAluminium')], - [metaitem('robot.arm.mv'), ore('circuitMv'), metaitem('pump.mv')], + [metaitem('robot.arm.mv'), ore('circuitMv'), metaitem('electric.pump.mv')], [ore('plateAluminium'), ore('plateAluminium'), ore('plateAluminium')] ]); diff --git a/groovy/prePostInit/Thermodynamics.groovy b/groovy/prePostInit/Thermodynamics.groovy index 3eadb0a62..05d913a04 100755 --- a/groovy/prePostInit/Thermodynamics.groovy +++ b/groovy/prePostInit/Thermodynamics.groovy @@ -1,5 +1,5 @@ import classes.*; -import globals.Globals; +import globals.Globals.*; import java.lang.Math; @@ -674,7 +674,7 @@ for (FluidFuel in FluidFuels) { .fluidInputs(liquid('air') * 100) .fluidOutputs(liquid(FluidFuel.byproduct) * FluidFuel.byproduct_amount) .duration(FluidFuel.duration) - .EUt(-128) + .EUt(128) .buildAndRegister(); recipemap('gas_turbine').recipeBuilder() @@ -683,7 +683,7 @@ for (FluidFuel in FluidFuels) { .fluidInputs(liquid('oxygen') * 20) .fluidOutputs(liquid(FluidFuel.byproduct) * ((int) (FluidFuel.byproduct_amount * 1.5))) .duration((int) (FluidFuel.duration * 1.5)) - .EUt(-128) + .EUt(128) .buildAndRegister(); } else { recipemap('gas_turbine').recipeBuilder() @@ -692,7 +692,7 @@ for (FluidFuel in FluidFuels) { .fluidInputs(liquid('air') * 100) .fluidOutputs(liquid(FluidFuel.byproduct) * FluidFuel.byproduct_amount) .duration(FluidFuel.duration) - .EUt(-32) + .EUt(32) .buildAndRegister(); recipemap('gas_turbine').recipeBuilder() @@ -701,7 +701,7 @@ for (FluidFuel in FluidFuels) { .fluidInputs(liquid('oxygen') * 20) .fluidOutputs(liquid(FluidFuel.byproduct) * ((int) (FluidFuel.byproduct_amount * 1.5))) .duration((int) (FluidFuel.duration * 1.5)) - .EUt(-32) + .EUt(32) .buildAndRegister(); } @@ -713,7 +713,7 @@ for (FluidFuel in FluidFuels) { .fluidInputs(liquid('oxygen') * 20) .fluidOutputs(liquid(FluidFuel.byproduct) * ((int) (FluidFuel.byproduct_amount * 1.5))) .duration((int) (FluidFuel.duration * lubricant.boost * 1.5)) - .EUt(-128) + .EUt(128) .buildAndRegister(); } else { recipemap('gas_turbine').recipeBuilder() @@ -722,7 +722,7 @@ for (FluidFuel in FluidFuels) { .fluidInputs(liquid('oxygen') * 20) .fluidOutputs(liquid(FluidFuel.byproduct) * ((int) (FluidFuel.byproduct_amount * 1.5))) .duration((int) (FluidFuel.duration * lubricant.boost * 1.5)) - .EUt(-32) + .EUt(32) .buildAndRegister(); } } @@ -738,7 +738,7 @@ for (FluidFuel in FluidFuels) { recipemap('combustion_generator').recipeBuilder() .fluidInputs(liquid(FluidFuel.liquid_fuel) * 25) .duration(100) - .EUt(-1) + .EUt(1) .buildAndRegister(); recipemap('canner').recipeBuilder() diff --git a/manifest.json b/manifest.json index 84e40e7ee..af551f982 100644 --- a/manifest.json +++ b/manifest.json @@ -11,7 +11,7 @@ "manifestType": "minecraftModpack", "manifestVersion": 1, "name": "Supersymmetry", - "version": "0.1.10", + "version": "0.1.12", "author": "SymmetricDevs", "externalDeps": [], "files": [ diff --git a/resources/langfiles/lang/en_us.lang b/resources/langfiles/lang/en_us.lang index e60f706cf..74ac0a42b 100644 --- a/resources/langfiles/lang/en_us.lang +++ b/resources/langfiles/lang/en_us.lang @@ -1402,7 +1402,6 @@ susy.material.di_tert_butylphenol=2,6-Di-tert-butylphenol susy.material.isooctane=iso-Octane susy.material.purified_isoprene=Purified Isoprene susy.material.cyclopentadiene=Cyclopentadiene -susy.material.cyclopentadiene_solution=Cyclopentadiene Solution susy.material.ferrocene=Ferrocene susy.material.polyisoprene=Polyisoprene susy.material.chloroethane=Chloroethane @@ -1889,6 +1888,12 @@ susy.material.gaseous_methacrylic_acid_mixture=Gaseous Methacrylic Acid Mixture susy.material.methacrylic_acid_solution=Methacrylic Acid Solution susy.material.uranium_dioxide=Uranium Dioxide susy.material.uranium_tetrafluoride=Uranium Tetrafluoride +susy.material.salty_hydrofluoric_acid=Salty Hydrofluoric Acid +susy.material.supported_molybdenum_vanadium=Supported Molybdenum Vanadium +susy.material.acrolein=Acrolein +susy.material.c_five_fraction=C5 Fraction +susy.material.dimerized_c_five_fraction=Dimerized C5 Fraction +susy.material.dicyclopentadiene=Dicyclopentadiene susy.material.ethylene_carbonate=Ethylene Carbonate susy.material.lithium_hexafluorophosphate_electrolyte=Lithium Hexafluorophosphate Electrolyte diff --git a/resources/langfiles/lang/zh_cn.lang b/resources/langfiles/lang/zh_cn.lang index b61826e72..417c1a274 100644 --- a/resources/langfiles/lang/zh_cn.lang +++ b/resources/langfiles/lang/zh_cn.lang @@ -1403,7 +1403,6 @@ susy.material.di_tert_butylphenol=2,6-二叔丁基苯酚 susy.material.isooctane=异辛烷 susy.material.purified_isoprene=纯净异戊二烯 susy.material.cyclopentadiene=环戊二烯 -susy.material.cyclopentadiene_solution=环戊二烯溶液 susy.material.ferrocene=二茂铁 susy.material.polyisoprene=聚异戊二烯 susy.material.chloroethane=氯乙烷