Merge branch 'master-ceu' into pr/676

config/chesttransporter.cfg

@@ -14,31 +14,31 @@ general {
     B:debuffSlowness=true
 
     # Set this to false to prevent picking up of mob spawners [default: true]
-    B:pickupSpawners=true
+    B:pickupSpawners=false
 
     # Set this to false to prevent the copper transporter to pick up mob spawners [default: true]
-    B:spawnerWithCopper=true
+    B:spawnerWithCopper=false
 
     # Set this to false to prevent the diamond transporter to pick up mob spawners [default: true]
-    B:spawnerWithDiamond=true
+    B:spawnerWithDiamond=false
 
     # Set this to false to prevent the gold transporter to pick up mob spawners [default: true]
-    B:spawnerWithGold=true
+    B:spawnerWithGold=false
 
     # Set this to false to prevent the iron transporter to pick up mob spawners [default: true]
-    B:spawnerWithIron=true
+    B:spawnerWithIron=false
 
     # Set this to false to prevent the obsidian transporter to pick up mob spawners [default: true]
-    B:spawnerWithObsidian=true
+    B:spawnerWithObsidian=false
 
     # Set this to false to prevent the silver transporter to pick up mob spawners [default: true]
-    B:spawnerWithSilver=true
+    B:spawnerWithSilver=false
 
     # Set this to false to prevent the tin transporter to pick up mob spawners [default: true]
-    B:spawnerWithTin=true
+    B:spawnerWithTin=false
 
     # Set this to false to prevent the wood transporter to pick up mob spawners [default: true]
-    B:spawnerWithWood=true
+    B:spawnerWithWood=false
 }
 
 

groovy/classes/ChangeFlags.groovy

@@ -13,6 +13,8 @@ import gregtech.api.unification.material.properties.PropertyKey;
 import static material.SuSyMaterials.*
 import gregtech.api.unification.material.properties.BlastProperty.GasTier;
 import supersymmetry.api.recipes.SuSyRecipeMaps;
+import supersymmetry.api.unification.material.properties.SuSyPropertyKey;
+import supersymmetry.api.unification.material.properties.FiberProperty;
 import gregtech.api.recipes.RecipeMap;
 import gregtech.api.recipes.RecipeMaps;
 import gregtech.api.fluids.fluidType.FluidTypes;
@@ -72,7 +74,7 @@ class ChangeFlags {
         AquaRegia.setFormula("(HNO3)(HCl)3", true);
         Tantalite.setFormula("(Fe,Mn)Ta2O6", true);
 
-	Borax.setProperty(PropertyKey.ORE, new OreProperty());
+        Borax.setProperty(PropertyKey.ORE, new OreProperty());
 
         Asbestos.setProperty(PropertyKey.INGOT, new IngotProperty());
         Asbestos.addFlags("generate_foil");
@@ -84,6 +86,7 @@ class ChangeFlags {
         SiliconDioxide.setProperty(PropertyKey.FLUID, new FluidProperty());
         Chlorine.setProperty(PropertyKey.PLASMA, new PlasmaProperty());
 
+        Polytetrafluoroethylene.setProperty(SuSyPropertyKey.FIBER, new FiberProperty(false, true))
         Polydimethylsiloxane.setProperty(PropertyKey.FLUID, new FluidProperty());
 
         Cadmium.setProperty(PropertyKey.INGOT, new IngotProperty());

groovy/globals/Globals.groovy

@@ -62,6 +62,9 @@ class Globals {
 
     public static lubricants = [
         new Lubricant('lubricating_oil', 1, 1.1),
-        new Lubricant('lubricant', 2, 1.2)
+        new Lubricant('lubricant', 2, 1.2),
+        new Lubricant('midgrade_lubricant', 2, 1.3),
+        new Lubricant('premium_lubricant', 1, 1.4),
+        new Lubricant('supreme_lubricant', 1, 1.5)
     ]
 }

groovy/material/FirstDegreeMaterials.groovy

@@ -892,7 +892,7 @@ public class FirstDegreeMaterials{
 
         VeryDilutedSulfuricAcid = new Material.Builder(8219, SuSyUtility.susyId('very_diluted_sulfuric_acid'))
                 .fluid(FluidTypes.ACID)
-                .components(Water, 2, SulfuricAcid, 1)
+                .components(SulfuricAcid, 1, Water, 2)
                 .color(0x54362c)
                 .build()
 
@@ -2014,7 +2014,7 @@ public class FirstDegreeMaterials{
                 .build()
                 .setFormula("Mn(NO3)2", true)
 
-        PurifiedManganeseDioxide = new Material.Builder(8395, SuSyUtility.susyId('purified_manganese_dioxide'))
+        ManganeseDioxide = new Material.Builder(8395, SuSyUtility.susyId('manganese_dioxide'))
                 .dust()
                 .iconSet('SHINY')
                 .components(Manganese, 1, Oxygen, 2)
@@ -2811,12 +2811,10 @@ public class FirstDegreeMaterials{
                 .iconSet(GLASS)
                 .build();
 
-        UltraHighMolecularWeightPolyethylene = new Material.Builder(8510, SuSyUtility.susyId('ultra_high_molecular_weight_polyethylene'))
-                .polymer()
-                .flags(GENERATE_PLATE)
-                .components(Carbon, 2, Hydrogen, 4)
-                .color(0xc5e3de)
-                .iconSet(SHINY)
+        HydrogenIodide = new Material.Builder(8510, SuSyUtility.susyId('hydrogen_iodide'))
+                .fluid(FluidTypes.GAS)
+                .components(Hydrogen, 1, Iodine, 1)
+                .colorAverage()
                 .build();
 
         AntimonyTrichloride = new Material.Builder(8511, SuSyUtility.susyId('antimony_trichloride'))
@@ -2968,11 +2966,7 @@ public class FirstDegreeMaterials{
 
         SodiumMolybdateSolution.setFormula("(Na2MoO4)(H2O)", true)
 
-        ManganeseIISulfate = new Material.Builder(8532, SuSyUtility.susyId('manganese_ii_sulfate'))
-                .dust()
-                .components(Manganese, 1, Sulfur, 1, Oxygen, 4)
-                .colorAverage()
-                .build();
+        // FREE ID: 8532
 
         DilutedSilverNitrateSolution = new Material.Builder(8533, SuSyUtility.susyId('diluted_silver_nitrate_solution'))
                 .fluid()
@@ -3280,13 +3274,43 @@ public class FirstDegreeMaterials{
 
         CobaltIIAcetate.setFormula("Co(C2H3O2)2", true)
 
-        AcrylicCatalyst = new Material.Builder(8578, SuSyUtility.susyId("acrylic_catalyst"))
+        ChlorosulfuricAcid = new Material.Builder(8578, SuSyUtility.susyId("chlorosulfuric_acid"))
+                .fluid(FluidTypes.ACID)
+                .components(Hydrogen, 1, Sulfur, 1, Oxygen, 3, Chlorine, 1)
+                .colorAverage()
+                .build();
+
+        ManganeseIIChloride = new Material.Builder(8579, SuSyUtility.susyId("manganese_ii_chloride"))
+                .dust()
+                .components(Manganese, 1, Chlorine, 2)
+                .colorAverage()
+                .build();
+
+        ChloroplatinicAcidSolution = new Material.Builder(8580, SuSyUtility.susyId("chloroplatinic_acid_solution"))
+                .fluid(FluidTypes.ACID)
+                .components(Hydrogen, 2, Platinum, 1, Chlorine, 6, Water, 4)
+                .colorAverage()
+                .build();
+
+        MolybdenumDisulfide = new Material.Builder(8581, SuSyUtility.susyId("molybdenum_disulfide"))
+                .dust()
+                .components(Molybdenum, 1, Sulfur, 2)
+                .colorAverage()
+                .build();
+
+        FluorinatedGraphite = new Material.Builder(8582, SuSyUtility.susyId("fluorinated_graphite"))
+                .dust()
+                .components(Carbon, 1, Fluorine, 1)
+                .colorAverage()
+                .build();
+
+        AcrylicCatalyst = new Material.Builder(8583, SuSyUtility.susyId("acrylic_catalyst"))
                 .dust()
                 .components(Copper, 1, Nickel, 1, Bromine, 4)
                 .colorAverage()
                 .build();
 
-        GelatinSolution = new Material.Builder(8579, SuSyUtility.susyId("gelatin_solution"))
+        GelatinSolution = new Material.Builder(8584, SuSyUtility.susyId("gelatin_solution"))
                 .fluid()
                 .fluidTemp(323)
                 .components(Gelatin, 1, Water, 1)