update gregicality, mechtech, fix scripts (#81)

GregTechCEu · Oct 24, 2021 · 259f93e · 259f93e
1 parent 212b2c0
commit 259f93e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 27 deletions.
diff --git a/config/jei/itemBlacklist.cfg b/config/jei/itemBlacklist.cfg
@@ -39,6 +39,9 @@ advanced {
         advancedrocketry:unlittorch
         enderio:block_pasture_enlightened_fused_glass:15
         enderio:block_pasture_enlightened_fused_glass:14
+        enderio:block_solar_panel:6
+        enderio:block_solar_panel:4
+        enderio:block_solar_panel:5
         gregtech:frame_inconel_b:15
         gregtech:frame_zeron:11
         gregtech:frame_zeron:10
@@ -375,6 +378,7 @@ advanced {
         gregtech:frame_enriched_naquadah_alloy:9
         gregtech:frame_enriched_naquadah_alloy:7
         gregtech:frame_enriched_naquadah_alloy:8
+        enderio:item_soul_vial:Elder Guardian
         gregtech:frame_tungsten_steel:9
         gregtech:frame_tungsten_steel:7
         gregtech:frame_steel:7
@@ -756,6 +760,7 @@ advanced {
         enderio:block_not_pasture_fused_quartz:13
         enderio:block_not_pasture_fused_quartz:14
         enderio:block_not_pasture_fused_quartz:15
+        enderio:item_soul_vial:Italian Buffalo
         enderio:block_not_pasture_fused_quartz:10
         gregtech:frame_adamantium:8
         gregtech:frame_adamantium:9
@@ -815,6 +820,7 @@ advanced {
         enderio:block_unholy_enlightened_fused_glass:11
         enderio:block_not_holy_dark_fused_glass:13
         enderio:block_unholy_enlightened_fused_glass:10
+        enderio:item_material:81
         gregtech:frame_potin:15
         gregtech:frame_potin:14
         enderio:item_dark_steel_upgrade:enderio:depth:on
@@ -824,6 +830,7 @@ advanced {
         gregtech:frame_potin:10
         gregtech:frame_potin:13
         gregtech:frame_potin:12
+        enderio:item_material:70
         enderio:block_holy_fused_quartz:6
         enderio:block_holy_fused_quartz:7
         enderio:block_holy_enlightened_fused_glass:9
@@ -1383,19 +1390,23 @@ advanced {
         gregtech:frame_fermium:10
         gregtech:frame_metastable_oganesson:9
         gregtech:frame_fermium:11
+        enderio:block_painted_pressure_plate:7
         gregtech:frame_fermium:12
         gregtech:frame_fermium:13
+        enderio:block_painted_pressure_plate:9
         gregtech:frame_fermium:14
         gregtech:frame_aluminium:1
         gregtech:frame_maraging_steel_a:5
         gregtech:frame_metastable_oganesson:4
         gregtech:frame_aluminium:2
+        enderio:block_painted_pressure_plate:3
         gregtech:frame_maraging_steel_a:6
         gregtech:frame_metastable_oganesson:3
         gregtech:frame_aluminium:3
         gregtech:frame_maraging_steel_a:7
         gregtech:frame_metastable_oganesson:2
         gregtech:frame_aluminium:4
+        enderio:block_painted_pressure_plate:5
         gregtech:frame_maraging_steel_a:8
         gregtech:frame_metastable_oganesson:1
         gregtech:frame_aluminium:5
@@ -1406,6 +1417,7 @@ advanced {
         gregtech:frame_aluminium:7
         gregtech:frame_metastable_oganesson:6
         gregtech:frame_aluminium:8
+        enderio:block_painted_pressure_plate:1
         gregtech:frame_metastable_oganesson:5
         gregtech:frame_aluminium:9
         enderio:block_not_unholy_fused_quartz:1
@@ -1814,6 +1826,7 @@ advanced {
         gregtech:frame_titanium:8
         gregtech:frame_bronze:2
         gregtech:frame_bronze:1
+        enderio:block_death_pouch
         gregtech:frame_titanium:1
         gregtech:frame_bronze:6
         gregtech:frame_bronze:5
@@ -1965,6 +1978,7 @@ advanced {
         enderio:block_not_holy_dark_fused_glass:5
         enderio:block_not_holy_dark_fused_glass:2
         enderio:block_not_holy_dark_fused_glass:3
+        enderio:item_soul_vial:Wither
         enderio:block_not_holy_dark_fused_glass:1
         enderio:item_dark_steel_upgrade:enderio:speedboost2:on
         gregtech:frame_trinium:11
@@ -1978,3 +1992,4 @@ advanced {
 }
 
 
+
diff --git a/manifest.json b/manifest.json
@@ -194,7 +194,7 @@
         },
         {
             "projectID":364851,
-            "fileID":3388278,
+            "fileID":3479349,
             "required":true
         },
         {
@@ -569,7 +569,7 @@
         },
         {
             "projectID":462540,
-            "fileID":3339252,
+            "fileID":3428944,
             "required":true
         },
         {

diff --git a/scripts/enderio/eio.zs b/scripts/enderio/eio.zs
@@ -168,12 +168,6 @@ forge_hammer.recipeBuilder().EUt(2).duration(400)
     .outputs(<ore:ingotConstructionAlloy>.firstItem * 9)
     .buildAndRegister();
 
-large_forge_hammer.recipeBuilder().EUt(2).duration(400)
-    .inputs(<ore:blockConstructionAlloy>)
-    .fluidInputs([<fluid:lubricant> * 2])
-    .outputs(<ore:ingotConstructionAlloy>.firstItem * 9)
-    .buildAndRegister();
-
 // Simple Chassis Parts
 metal_bender.recipeBuilder().EUt(30).duration(200)
     .inputs(<ore:ingotConstructionAlloy> * 16)
@@ -617,12 +611,6 @@ while i < 6 {
     i += 2;
 }
 
-// Cake Base
-alloy_smelter.recipeBuilder().EUt(20).duration(1200)
-    .inputs(<ore:dustRegularWheat> * 3, <ore:egg>)
-    .outputs(<ore:itemCakeBase>.firstItem)
-    .buildAndRegister();
-
 // Infinity Rod
 alloy_smelter.recipeBuilder().EUt(24).duration(600)
     .inputs(<ore:stickLongSteelMagnetic> * 2, <ore:stickLongIronMagnetic> * 2)
@@ -775,12 +763,6 @@ forge_hammer.recipeBuilder().EUt(2).duration(400)
     .outputs(<ore:ingotDarkSteel>.firstItem * 9)
     .buildAndRegister();
 
-large_forge_hammer.recipeBuilder().EUt(2).duration(400)
-    .inputs(<ore:blockDarkSteel>)
-    .fluidInputs([<fluid:lubricant> * 2])
-    .outputs(<ore:ingotDarkSteel>.firstItem * 9)
-    .buildAndRegister();
-
 extruder.recipeBuilder().EUt(48).duration(150)
     .inputs(<ore:ingotDarkSteel>)
     .notConsumable(<metaitem:shape.extruder.rod>)
@@ -857,12 +839,6 @@ forge_hammer.recipeBuilder().EUt(2).duration(400)
     .outputs(<ore:ingotEndSteel>.firstItem * 9)
     .buildAndRegister();
 
-large_forge_hammer.recipeBuilder().EUt(2).duration(400)
-    .inputs(<ore:blockEndSteel>)
-    .fluidInputs([<fluid:lubricant> * 2])
-    .outputs(<ore:ingotEndSteel>.firstItem * 9)
-    .buildAndRegister();
-
 extruder.recipeBuilder().EUt(192).duration(150)
     .inputs(<ore:ingotEndSteel>)
     .notConsumable(<metaitem:shape.extruder.rod>)

diff --git a/scripts/gregtech_globals.zs b/scripts/gregtech_globals.zs
@@ -50,7 +50,6 @@ global green_house as RecipeMap =                   RecipeMap.getByName("green_h
 global implosion_compressor as RecipeMap =          RecipeMap.getByName("implosion_compressor");
 global large_centrifuge as RecipeMap =              LargeRecipeMap.of(GARecipeMaps.LARGE_CENTRIFUGE_RECIPES);
 global large_chemical_reactor as RecipeMap =        RecipeMap.getByName("large_chemical_reactor");
-global large_forge_hammer as RecipeMap =            LargeRecipeMap.of(GARecipeMaps.LARGE_FORGE_HAMMER_RECIPES);
 global large_mixer as RecipeMap =                   RecipeMap.getByName("large_mixer");
 global laser_engraver as RecipeMap =                RecipeMap.getByName("laser_engraver");
 global lathe as RecipeMap =                         RecipeMap.getByName("lathe");