From 940899eebecf771d722cb568e7ead7e4627560ff Mon Sep 17 00:00:00 2001
From: m2r1k5 <61507029+m2r1k5@users.noreply.github.com>
Date: Sun, 27 Feb 2022 21:51:24 +0800
Subject: [PATCH] b0.7 scripts

---
 overrides/scripts/AE2.zs                  |  4 +-
 overrides/scripts/AdvRocketry.zs          | 20 +++----
 overrides/scripts/BlastFurnace.zs         | 69 +++++++++++++++++++++++
 overrides/scripts/Earlygame.zs            | 48 +++++++++++++---
 overrides/scripts/Endgame.zs              |  4 +-
 overrides/scripts/Midgame.zs              | 16 +++++-
 overrides/scripts/Nuclearcraft.zs         | 18 ++++--
 overrides/scripts/ThermalExpansion.zs     |  4 +-
 overrides/scripts/_oreDict.zs             |  2 +-
 overrides/scripts/aa xu2.zs               | 12 ++--
 overrides/scripts/coins.zs                |  2 +-
 overrides/scripts/electronics.zs          | 11 +++-
 overrides/scripts/extractor_solidifier.zs |  4 +-
 overrides/scripts/materials.zs            |  4 +-
 overrides/scripts/multiblocks.zs          |  5 +-
 15 files changed, 179 insertions(+), 44 deletions(-)

diff --git a/overrides/scripts/AE2.zs b/overrides/scripts/AE2.zs
index 48fdb32..b49af16 100644
--- a/overrides/scripts/AE2.zs
+++ b/overrides/scripts/AE2.zs
@@ -106,8 +106,8 @@ assembler.recipeBuilder()
 	.duration(20).EUt(16).buildAndRegister();
 	
 //ME Conduit
-//recipes.remove(<enderio:item_me_conduit>);	
-//assembler.recipeBuilder().inputs([<appliedenergistics2:part:36> * 3, <enderio:item_material:4> * 6]).outputs(<enderio:item_me_conduit> * 8).duration(100).EUt(16).buildAndRegister();	
+recipes.remove(<enderio:item_me_conduit>);	
+assembler.recipeBuilder().inputs([<appliedenergistics2:part:36> * 3, <enderio:item_material:4> * 6]).outputs(<enderio:item_me_conduit> * 8).duration(100).EUt(16).buildAndRegister();	
 
 recipes.remove(<appliedenergistics2:sky_compass>);
 recipes.addShaped(<appliedenergistics2:sky_compass>,[
diff --git a/overrides/scripts/AdvRocketry.zs b/overrides/scripts/AdvRocketry.zs
index 2f2a19b..c8a5f75 100644
--- a/overrides/scripts/AdvRocketry.zs
+++ b/overrides/scripts/AdvRocketry.zs
@@ -588,16 +588,16 @@ makeShaped("ar_fuel_tank",
 	});
 
 // Concrete
-mixer.recipeBuilder()
-	.inputs([
-		<minecraft:gravel> * 3,
-		<ore:dustClay>
-	])
-	.fluidInputs([<liquid:water> * 500])
-	.fluidOutputs(<liquid:concrete> * 1000)
-	.EUt(16)
-	.duration(200)
-	.buildAndRegister();
+//mixer.recipeBuilder()
+//	.inputs([
+//		<minecraft:gravel> * 3,
+//		<ore:dustClay>
+//	])
+//	.fluidInputs([<liquid:water> * 500])
+//	.fluidOutputs(<liquid:concrete> * 1000)
+//	.EUt(16)
+//	.duration(200)
+//	.buildAndRegister();
 
 // Guidance Computer
 recipes.remove(<advancedrocketry:guidancecomputer>);
diff --git a/overrides/scripts/BlastFurnace.zs b/overrides/scripts/BlastFurnace.zs
index 4b67128..3de4f55 100644
--- a/overrides/scripts/BlastFurnace.zs
+++ b/overrides/scripts/BlastFurnace.zs
@@ -237,6 +237,28 @@ mixer.recipeBuilder()
 	.duration(300)
 	.EUt(1920)
 	.buildAndRegister();
+// Molten Signalum * 1152
+<recipemap:alloy_blast_smelter>.findRecipe(120, [<metaitem:dustAnnealedCopper> * 4, <metaitem:dustArdite> * 2, <metaitem:dustRedAlloy> * 2, <metaitem:circuit.integrated>.withTag({Configuration: 13})], [<liquid:helium> * 800]).remove();
+// Molten Signalum * 1152
+<recipemap:alloy_blast_smelter>.findRecipe(120, [<metaitem:dustAnnealedCopper> * 4, <metaitem:dustArdite> * 2, <metaitem:dustRedAlloy> * 2, <metaitem:circuit.integrated>.withTag({Configuration: 3})], null).remove();
+alloy_blast_smelter.recipeBuilder()
+	.inputs([<metaitem:dustAnnealedCopper> * 4, <metaitem:dustArdite> * 2, <metaitem:dustRedAlloy> * 2,<thermalfoundation:material:893>])
+	.fluidInputs(<liquid:mana> * 1000)
+	.circuit(4)
+	.fluidOutputs(<liquid:molten.signalum> * 576)
+	.property("temperature", 4000)
+	.duration(51200)
+	.EUt(120)
+	.buildAndRegister();
+alloy_blast_smelter.recipeBuilder()
+	.inputs([<metaitem:dustAnnealedCopper> * 4, <metaitem:dustArdite> * 2, <metaitem:dustRedAlloy> * 2,<thermalfoundation:material:893>])
+	.fluidInputs([<liquid:mana> * 1000, <liquid:helium> * 400])
+	.circuit(14)
+	.fluidOutputs(<liquid:molten.signalum> * 576)
+	.property("temperature", 4000)
+	.duration(34133)
+	.EUt(120)
+	.buildAndRegister();
 //blast_furnace.recipeBuilder().inputs([<ore:dustSignalum>]).fluidInputs([<liquid:mana>*250]).outputs([<metaitem:ingotHotSignalum>]).property("temperature", 4000).duration(12800).EUt(120).buildAndRegister();
 
 // Signalum Ingot * 1
@@ -264,6 +286,30 @@ mixer.recipeBuilder()
 	.duration(300)
 	.EUt(1920)
 	.buildAndRegister();
+// Molten Lumium * 864
+<recipemap:alloy_blast_smelter>.findRecipe(120, [<metaitem:dustTinAlloy> * 4, <metaitem:dustSterlingSilver> * 2, <metaitem:circuit.integrated>.withTag({Configuration: 12})], [<liquid:helium> * 600]).remove();
+// Molten Lumium * 864
+<recipemap:alloy_blast_smelter>.findRecipe(120, [<metaitem:dustTinAlloy> * 4, <metaitem:dustSterlingSilver> * 2, <metaitem:circuit.integrated>.withTag({Configuration: 2})], null).remove();
+
+alloy_blast_smelter.recipeBuilder()
+	.inputs([<metaitem:dustTinAlloy> * 4, <metaitem:dustSterlingSilver> * 2,<extendedcrafting:material:7> * 2,<thermalfoundation:material:894>])
+	.fluidInputs(<liquid:mana> * 1000)
+	.circuit(4)
+	.fluidOutputs(<liquid:molten.lumium> * 576)
+	.property("temperature", 4500)
+	.duration(57600)
+	.EUt(120)
+	.buildAndRegister();
+
+alloy_blast_smelter.recipeBuilder()
+	.inputs([<metaitem:dustTinAlloy> * 4, <metaitem:dustSterlingSilver> * 2,<extendedcrafting:material:7> * 2,<thermalfoundation:material:894>])
+	.fluidInputs([<liquid:mana> * 1000, <liquid:helium> * 400])
+	.circuit(14)
+	.fluidOutputs(<liquid:molten.lumium> * 576)
+	.property("temperature", 4500)
+	.duration(38400)
+	.EUt(120)
+	.buildAndRegister();
 
 // Lumium Ingot * 1
 //<recipemap:vacuum_freezer>.findRecipe(120, [<metaitem:ingotHotLumium>], null).remove();
@@ -308,6 +354,29 @@ mixer.recipeBuilder()
 	.EUt(1920)
 	.buildAndRegister();
 
+// Molten Enderium * 1152
+<recipemap:alloy_blast_smelter>.findRecipe(120, [<metaitem:dustLead> * 4, <metaitem:dustPlatinum> * 2, <metaitem:dustBlueSteel>, <metaitem:dustOsmium>, <metaitem:circuit.integrated>.withTag({Configuration: 14})], [<liquid:krypton> * 80]).remove();
+// Molten Enderium * 1152
+<recipemap:alloy_blast_smelter>.findRecipe(120, [<metaitem:dustLead> * 4, <metaitem:dustPlatinum> * 2, <metaitem:dustBlueSteel>, <metaitem:dustOsmium>, <metaitem:circuit.integrated>.withTag({Configuration: 4})], null).remove();
+alloy_blast_smelter.recipeBuilder()
+	.inputs([<metaitem:dustLead> * 4,<metaitem:dustPlatinum> * 2,<metaitem:dustBlueSteel>,<ore:dustOsmium>,<thermalfoundation:material:895>])
+	.fluidInputs(<liquid:mana> * 1000)
+	.circuit(5)
+	.fluidOutputs(<liquid:molten.enderium> * 576)
+	.property("temperature", 6400)
+	.duration(83200)
+	.EUt(120)
+	.buildAndRegister();
+alloy_blast_smelter.recipeBuilder()
+	.inputs([<metaitem:dustLead> * 4,<metaitem:dustPlatinum> * 2,<metaitem:dustBlueSteel>,<ore:dustOsmium>,<thermalfoundation:material:895>])
+	.fluidInputs([<liquid:mana> * 1000, <liquid:krypton> * 40])
+	.circuit(15)
+	.fluidOutputs(<liquid:molten.enderium> * 576)
+	.property("temperature", 6400)
+	.duration(55467)
+	.EUt(120)
+	.buildAndRegister();
+
 //blast_furnace.recipeBuilder().inputs([<metaitem:dustEnderium>]).fluidInputs([<liquid:mana>*250]).outputs([<metaitem:ingotHotEnderium>]).property("temperature", 6400).duration(20800).EUt(120).buildAndRegister();
 // Hot Enderium Ingot * 1
 //<recipemap:electric_blast_furnace>.findRecipe(120, [<metaitem:dustEnderium>], null).remove();
diff --git a/overrides/scripts/Earlygame.zs b/overrides/scripts/Earlygame.zs
index 1c6f7c4..dbc15d4 100644
--- a/overrides/scripts/Earlygame.zs
+++ b/overrides/scripts/Earlygame.zs
@@ -410,6 +410,9 @@ recipes.addShaped(<morefurnaces:furnaceblock:3>, [
 //recipes.removeByRecipeName("gregtech:conductive_iron_cable_1");
 //recipes.addShapeless(<gregtech:cable:5700>,[<gregtech:cable:700>,<metaitem:plateRubber>]);
 
+// Battery Alloy
+recipes.addShapeless(<metaitem:dustBatteryAlloy> * 4, [<ore:dustLead>,<ore:dustLead>,<ore:dustLead>,<ore:dustLead>,<ore:dustAntimony>]);
+
 recipes.addShapeless(<metaitem:battery.re.lv.cadmium>,[<metaitem:battery.hull.lv>,<metaitem:dustCadmium>,<metaitem:dustCadmium>]);	//Small Cadmium
 recipes.addShapeless(<metaitem:battery.re.lv.sodium>,[<metaitem:battery.hull.lv>,<metaitem:dustSodium>,<metaitem:dustSodium>]);	//Small Sodium
 recipes.addShapeless(<metaitem:battery.re.lv.lithium>,[<metaitem:battery.hull.lv>,<metaitem:dustLithium>,<metaitem:dustLithium>]);	//Small Lithium
@@ -737,7 +740,7 @@ furnace.setFuel(<metaitem:dustGraphite>, 1200);
 //recipes.removeByRecipeName("gregtech:conductive_iron_cable_2");
 //recipes.removeByRecipeName("gregtech:conductive_iron_cable_4");
 recipes.removeByRecipeName("gregtech:block_decompress_clay");
-recipes.removeByRecipeName("gregtech:gravel_to_flint");
+//recipes.removeByRecipeName("gregtech:gravel_to_flint");
 
 
 
@@ -793,7 +796,7 @@ furnace.addRecipe(<minecraft:iron_nugget> * 2, <metaitem:dustImpureVanadiumMagne
 //furnace.remove(<metaitem:ingotConductiveIron>);
 //furnace.addRecipe(<enderio:item_alloy_ingot:4>, <metaitem:dustConductiveIron>, 0.0);
 
-recipes.addShaped(<metaitem:gearIron>, [[<metaitem:stickIron>, <ore:plateIron>, <metaitem:stickIron>],[<ore:plateIron>, <gregtech:meta_tool:11>, <ore:plateIron>], [<metaitem:stickIron>, <ore:plateIron>, <metaitem:stickIron>]]);
+//recipes.addShaped(<metaitem:gearIron>, [[<metaitem:stickIron>, <ore:plateIron>, <metaitem:stickIron>],[<ore:plateIron>, <gregtech:meta_tool:11>, <ore:plateIron>], [<metaitem:stickIron>, <ore:plateIron>, <metaitem:stickIron>]]);
 
 
 //makeShaped("of_sponge", <minecraft:sponge>,
@@ -1051,12 +1054,12 @@ electrolyzer.recipeBuilder()
 //	.duration(150).EUt(8).buildAndRegister();
 
 //Adjust the recipe of the Rotor mold
-recipes.removeByRecipeName("gregtech:shape/mold/shape_mold_rotor");
-recipes.addShaped("gtce_rotor_mold", <metaitem:shape.mold.rotor>, [
-	[<ore:gtceHardHammers>, null, null],
-	[null, null, null],
-	[null, null, <metaitem:shape.empty>]
-]);
+//recipes.removeByRecipeName("gregtech:shape/mold/shape_mold_rotor");
+//recipes.addShaped("gtce_rotor_mold", <metaitem:shape.mold.rotor>, [
+//	[<ore:gtceHardHammers>, null, null],
+//	[null, null, null],
+//	[null, null, <metaitem:shape.empty>]
+//]);
 
 //recipes.removeByRecipeName("gregtech:scanner_battery.re.lv.lithium");
 //recipes.removeByRecipeName("gregtech:scanner_battery.re.lv.cadmium");
@@ -1115,6 +1118,11 @@ furnace.remove(<metaitem:brick.fireclay>);
 furnace.addRecipe(<metaitem:brick.fireclay>, <metaitem:dustFireclay>, 0.5);
 recipes.removeByRecipeName("gregtech:fireclay_dust");
 recipes.addShapeless("fireclay_dust", <metaitem:dustFireclay> * 16, [<metaitem:dustClay>, <metaitem:dustBrick>]);
+// Compressed Fireclay * 1
+<recipemap:compressor>.findRecipe(4, [<metaitem:dustFireclay>], null).remove();
+// Clay Dust * 1
+<recipemap:centrifuge>.findRecipe(30, [<metaitem:dustFireclay> * 2], null).remove();
+
 
 // PBF recipe removals
 // Steel Ingot * 1
@@ -1185,3 +1193,27 @@ primitive_blast_furnace.recipeBuilder()
 // Kill Glowstone Decomp
 // Small Pile of Redstone Dust * 2
 <recipemap:centrifuge>.findRecipe(80, [<minecraft:glowstone_dust:0>], null).remove();
+
+cutter.recipeBuilder()
+	.inputs(<appliedenergistics2:fluix_block>)
+	.fluidInputs(<liquid:water> * 73)
+	.outputs(<moreplates:fluix_plate> * 8)
+	.duration(1568)
+	.EUt(30)
+	.buildAndRegister();
+
+cutter.recipeBuilder()
+	.inputs(<appliedenergistics2:fluix_block>)
+	.fluidInputs(<liquid:distilled_water> * 55)
+	.outputs(<moreplates:fluix_plate> * 8)
+	.duration(1176)
+	.EUt(30)
+	.buildAndRegister();
+
+cutter.recipeBuilder()
+	.inputs(<appliedenergistics2:fluix_block>)
+	.fluidInputs(<liquid:lubricant> * 18)
+	.outputs(<moreplates:fluix_plate> * 8)
+	.duration(784)
+	.EUt(30)
+	.buildAndRegister();
\ No newline at end of file
diff --git a/overrides/scripts/Endgame.zs b/overrides/scripts/Endgame.zs
index cd16dc9..a22a5db 100644
--- a/overrides/scripts/Endgame.zs
+++ b/overrides/scripts/Endgame.zs
@@ -477,9 +477,9 @@ recipes.addShaped(<metaitem:battery_buffer.uhv.16>, [
 
 // Assembly Line
 // ZPM Field Generator * 1
-<recipemap:assembly_line>.findRecipe(24000, [<metaitem:frameNaquadahAlloy>, <metaitem:plateNaquadahAlloy> * 6, <metaitem:quantumstar>, <metaitem:emitter.zpm> * 2, <metaitem:circuit.quantum_mainframe> * 2, <metaitem:wireFineEuropium> * 64, <metaitem:wireFineEuropium> * 64, <metaitem:cableGtSingleVanadiumGallium> * 4], [<liquid:soldering_alloy> * 1152]).remove();
+<recipemap:assembly_line>.findRecipe(24000, [<metaitem:frameNaquadahAlloy>, <metaitem:plateNaquadahAlloy> * 6, <metaitem:quantumstar>, <metaitem:emitter.zpm> * 2, <metaitem:circuit.quantum_mainframe> * 2, <metaitem:wireFineUraniumRhodiumDinaquadide> * 64, <metaitem:wireFineUraniumRhodiumDinaquadide> * 64, <metaitem:cableGtSingleVanadiumGallium> * 4], [<liquid:soldering_alloy> * 1152]).remove();
 assembly_line.recipeBuilder()
-    .inputs([<metaitem:frameNaquadahAlloy>, <metaitem:plateNaquadahAlloy> * 6, <metaitem:quantumstar>, <metaitem:emitter.zpm> * 2, <metaitem:circuit.quantum_mainframe> * 2, <metaitem:wireFineEuropium> * 64, <metaitem:wireFineEuropium> * 64, <metaitem:cableGtSingleVanadiumGallium> * 4, <metaitem:plateDenseAwakenedDraconium>, <metaitem:plateDenseAwakenedDraconium>])
+    .inputs([<metaitem:frameNaquadahAlloy>, <metaitem:plateNaquadahAlloy> * 6, <metaitem:quantumstar>, <metaitem:emitter.zpm> * 2, <metaitem:circuit.quantum_mainframe> * 2, <metaitem:wireFineUraniumRhodiumDinaquadide> * 64, <metaitem:wireFineUraniumRhodiumDinaquadide> * 64, <metaitem:cableGtSingleVanadiumGallium> * 4, <metaitem:plateDenseAwakenedDraconium>])
     .fluidInputs([<liquid:soldering_alloy> * 1152])
     .outputs(<metaitem:field.generator.zpm>)
     .duration(600)
diff --git a/overrides/scripts/Midgame.zs b/overrides/scripts/Midgame.zs
index b2f6a2e..bc6f25b 100644
--- a/overrides/scripts/Midgame.zs
+++ b/overrides/scripts/Midgame.zs
@@ -41,6 +41,16 @@ chemical_reactor.recipeBuilder().inputs(<metaitem:dustTinySodiumHydroxide>).flui
 chemical_reactor.recipeBuilder().inputs(<metaitem:dustTinySodiumHydroxide>).fluidInputs([<liquid:empoweredoil> * 250,<liquid:methanol> * 1500]).fluidOutputs([<liquid:glycerol> * 1000,<liquid:bio_diesel> * 6000]).duration(300).EUt(30).buildAndRegister();
 chemical_reactor.recipeBuilder().inputs(<metaitem:dustTinySodiumHydroxide>).fluidInputs([<liquid:empoweredoil> * 250,<liquid:ethanol> * 1500]).fluidOutputs([<liquid:glycerol> * 1000,<liquid:bio_diesel> * 6000]).duration(300).EUt(30).buildAndRegister();
 
+
+large_chemical_reactor.recipeBuilder().inputs(<metaitem:dustSodiumHydroxide>).fluidInputs([<liquid:canolaoil> * 9000,<liquid:methanol> * 54000])			.fluidOutputs([<liquid:glycerol> * 9000,<liquid:bio_diesel> * 54000]).duration(2700).EUt(30).buildAndRegister();
+large_chemical_reactor.recipeBuilder().inputs(<metaitem:dustSodiumHydroxide>).fluidInputs([<liquid:canolaoil> * 9000,<liquid:ethanol> * 54000])			.fluidOutputs([<liquid:glycerol> * 9000,<liquid:bio_diesel> * 54000]).duration(2700).EUt(30).buildAndRegister();
+large_chemical_reactor.recipeBuilder().inputs(<metaitem:dustSodiumHydroxide>).fluidInputs([<liquid:refinedcanolaoil> * 6750,<liquid:methanol> * 40500])		.fluidOutputs([<liquid:glycerol> * 9000,<liquid:bio_diesel> * 54000]).duration(2700).EUt(30).buildAndRegister();
+large_chemical_reactor.recipeBuilder().inputs(<metaitem:dustSodiumHydroxide>).fluidInputs([<liquid:refinedcanolaoil> * 6750,<liquid:ethanol> * 40500])	.fluidOutputs([<liquid:glycerol> * 9000,<liquid:bio_diesel> * 54000]).duration(2700).EUt(30).buildAndRegister();
+large_chemical_reactor.recipeBuilder().inputs(<metaitem:dustSodiumHydroxide>).fluidInputs([<liquid:crystaloil> * 4500,<liquid:methanol> * 27000])			.fluidOutputs([<liquid:glycerol> * 9000,<liquid:bio_diesel> * 54000]).duration(2700).EUt(30).buildAndRegister();
+large_chemical_reactor.recipeBuilder().inputs(<metaitem:dustSodiumHydroxide>).fluidInputs([<liquid:crystaloil> * 4500,<liquid:ethanol> * 27000])		.fluidOutputs([<liquid:glycerol> * 9000,<liquid:bio_diesel> * 54000]).duration(2700).EUt(30).buildAndRegister();
+large_chemical_reactor.recipeBuilder().inputs(<metaitem:dustSodiumHydroxide>).fluidInputs([<liquid:empoweredoil> * 2250,<liquid:methanol> * 13500])			.fluidOutputs([<liquid:glycerol> * 9000,<liquid:bio_diesel> * 54000]).duration(2700).EUt(30).buildAndRegister();
+large_chemical_reactor.recipeBuilder().inputs(<metaitem:dustSodiumHydroxide>).fluidInputs([<liquid:empoweredoil> * 2250,<liquid:ethanol> * 13500])		.fluidOutputs([<liquid:glycerol> * 9000,<liquid:bio_diesel> * 54000]).duration(2700).EUt(30).buildAndRegister();
+
 chemical_reactor.recipeBuilder().inputs(<actuallyadditions:item_misc:23>).fluidInputs([<liquid:canolaoil> * 1000]).fluidOutputs([<liquid:crystaloil> * 1000]).duration(100).EUt(120).buildAndRegister();
 chemical_reactor.recipeBuilder().inputs(<actuallyadditions:item_misc:24>).fluidInputs([<liquid:canolaoil> * 1000]).fluidOutputs([<liquid:empoweredoil> * 1000]).duration(100).EUt(500).buildAndRegister();
 
@@ -63,6 +73,10 @@ centrifuge.findRecipe(20, [], [<liquid:hydrogen> * 160]).remove();
 centrifuge.recipeBuilder().fluidInputs(<liquid:hydrogen> * 500).fluidOutputs([<liquid:deuterium> * 10]).duration(800).EUt(30).buildAndRegister();
 centrifuge.recipeBuilder().inputs(<contenttweaker:moondust>).fluidOutputs([<liquid:deuterium> * 100]).duration(200).EUt(20).buildAndRegister();
 
+recipes.removeByRecipeName("deepmoblearning:recipe1_deep_learner");
+recipes.addShaped(<deepmoblearning:deep_learner>, [[null,null,null],[<metaitem:sensor.lv>,<metaitem:tricorder_scanner>,<metaitem:sensor.lv>],[null,null,null]]);
+
+
 //// Stone Dust
 //centrifuge.recipeBuilder()
 //	.inputs(<metaitem:dustStone> * 3)
@@ -145,7 +159,7 @@ centrifuge.recipeBuilder()
 macerator.recipeBuilder()
 	.inputs([<gregtech:stone_smooth:0>])
 	.outputs([<metaitem:dustGraniteBlack>])
-	.chancedOutput(<metaitem:dustThorium>, 100, 300)
+	.chancedOutput(<metaitem:dustThorium>, 100, 700)
 	.duration(150)
 	.EUt(2)
 	.buildAndRegister();
diff --git a/overrides/scripts/Nuclearcraft.zs b/overrides/scripts/Nuclearcraft.zs
index 1a3cf25..8c4281f 100644
--- a/overrides/scripts/Nuclearcraft.zs
+++ b/overrides/scripts/Nuclearcraft.zs
@@ -928,7 +928,7 @@ compressor.recipeBuilder()
 // Gelatin from CEu Gelatin
 extractor.recipeBuilder()
     .inputs(<ore:dustGelatin>)
-    .fluidOutputs(<fluid:gelatin>)
+    .fluidOutputs(<fluid:gelatin> * 144)
     .duration(100)
     .EUt(7)
     .buildAndRegister();
@@ -1169,18 +1169,21 @@ fluid_extractor.recipeBuilder()
     .duration(720).EUt(32).buildAndRegister();
 
 //Remove Duping Thorium via extra Thorium230 tiny Pile
-//thermal_sep.findRecipe(48, [<metaitem:dustThorium>], [null]).remove();
-//thermal_sep.findRecipe(48, [<metaitem:ingotThorium>], [null]).remove();
+// Thorium-232 * 1
+<recipemap:thermal_centrifuge>.findRecipe(48, [<metaitem:ingotThorium>], null).remove();
+// Thorium-232 * 1
+<recipemap:thermal_centrifuge>.findRecipe(48, [<metaitem:dustThorium>], null).remove();
+
 
 thermal_sep.recipeBuilder()
     .inputs(<metaitem:dustThorium>)
     .outputs(<nuclearcraft:thorium:4>)
-    .duration(3200).EUt(48).buildAndRegister();
+    .duration(1280).EUt(48).buildAndRegister();
 
 thermal_sep.recipeBuilder()
     .inputs(<metaitem:ingotThorium>)
     .outputs(<nuclearcraft:thorium:4>)
-    .duration(3200).EUt(48).buildAndRegister();
+    .duration(1280).EUt(48).buildAndRegister();
 
 //Remove Duping Uranium via extra Uranium 235 tiny Pile
 // Uranium-238 * 1
@@ -1188,6 +1191,11 @@ thermal_sep.recipeBuilder()
 // Uranium-238 * 1
 <recipemap:thermal_centrifuge>.findRecipe(48, [<metaitem:ingotUranium>], null).remove();
 
+// Pu dupe
+// Plutonium-239 * 1
+<recipemap:thermal_centrifuge>.findRecipe(48, [<metaitem:ingotPlutonium>], null).remove();
+
+
 
 //thermal_sep.findRecipe(48, [<metaitem:dustUranium>], [null]).remove();
 //thermal_sep.findRecipe(48, [<metaitem:ingotUranium>], [null]).remove();
diff --git a/overrides/scripts/ThermalExpansion.zs b/overrides/scripts/ThermalExpansion.zs
index 66d355e..e95c217 100644
--- a/overrides/scripts/ThermalExpansion.zs
+++ b/overrides/scripts/ThermalExpansion.zs
@@ -175,9 +175,9 @@ recipes.addShaped(<thermalfoundation:material:513>, [
 //Auxiliary Transmission Coil
 recipes.remove(<thermalexpansion:augment:512>);
 recipes.addShaped(<thermalexpansion:augment:512>, [
-	[<metaitem:ingotSterlingSilver>, <ore:ingotEnergeticAlloy>, <enderio:block_alloy:4>],
+	[<metaitem:ingotSterlingSilver>, <ore:ingotEnergeticAlloy>, <ore:blockConductiveIron>],
 	[<ore:ingotEnergeticAlloy>, <thermalfoundation:material:514>, <ore:ingotEnergeticAlloy>],
-	[<enderio:block_alloy:4>, <ore:ingotEnergeticAlloy>, <metaitem:ingotSterlingSilver>]]);
+	[<ore:blockConductiveIron>, <ore:ingotEnergeticAlloy>, <metaitem:ingotSterlingSilver>]]);
 
 //Auxiliary Reception Coil
 recipes.remove(<thermalexpansion:augment:128>);
diff --git a/overrides/scripts/_oreDict.zs b/overrides/scripts/_oreDict.zs
index fa76c5e..a0fe3de 100644
--- a/overrides/scripts/_oreDict.zs
+++ b/overrides/scripts/_oreDict.zs
@@ -427,7 +427,7 @@ var dustsDisabled as IItemStack[][IOreDictEntry] = {
 
 	#dustPlutonium
 	<ore:dustPlutonium> : [
-		<metaitem:dustPlutonium>
+//		<metaitem:dustPlutonium>
 	],
 
 	#dustSaltpeter
diff --git a/overrides/scripts/aa xu2.zs b/overrides/scripts/aa xu2.zs
index c7b79cf..30864e4 100644
--- a/overrides/scripts/aa xu2.zs	
+++ b/overrides/scripts/aa xu2.zs	
@@ -363,17 +363,17 @@ recipes.addShaped(<extrautils2:drum:1>, [
 //Reinforced Drum
 recipes.removeByRecipeName("extrautils2:drum_4096");
 recipes.addShaped(<extrautils2:drum:2>, [
-	[<metaitem:plateVibrantAlloy>, <meta_tile_entity:drum.stainless_steel>, <metaitem:plateVibrantAlloy>], 
-	[<metaitem:plateVibrantAlloy>, <extrautils2:drum:1>, <metaitem:plateVibrantAlloy>], 
-	[<metaitem:plateVibrantAlloy>, <meta_tile_entity:drum.stainless_steel>, <metaitem:plateVibrantAlloy>]]);
+	[<metaitem:blockPolyvinylChloride>, <meta_tile_entity:drum.stainless_steel>, <metaitem:blockPolyvinylChloride>], 
+	[<metaitem:blockPolyvinylChloride>, <extrautils2:drum:1>, <metaitem:blockPolyvinylChloride>], 
+	[<metaitem:blockPolyvinylChloride>, <meta_tile_entity:drum.stainless_steel>, <metaitem:blockPolyvinylChloride>]]);
 	
 //Demonic	
 recipes.removeByRecipeName("extrautils2:drum_65536");
 mods.extendedcrafting.TableCrafting.addShaped(<extrautils2:drum:3>,[
 	[<extrautils2:simpledecorative:1>,<moreplates:demon_plate>,<moreplates:demon_plate>,<moreplates:demon_plate>,<extrautils2:simpledecorative:1>],
-	[<extrautils2:simpledecorative:1>,<meta_tile_entity:drum.titanium>,<meta_tile_entity:drum.titanium>,<meta_tile_entity:drum.titanium>,<extrautils2:simpledecorative:1>],
-	[<extrautils2:simpledecorative:1>,<meta_tile_entity:drum.titanium>,<extrautils2:drum:2>,<meta_tile_entity:drum.titanium>,<extrautils2:simpledecorative:1>],
-	[<extrautils2:simpledecorative:1>,<meta_tile_entity:drum.titanium>,<meta_tile_entity:drum.titanium>,<meta_tile_entity:drum.titanium>,<extrautils2:simpledecorative:1>],
+	[<extrautils2:simpledecorative:1>,<metaitem:plateDoubleWatertightSteel>,<metaitem:plateDoubleWatertightSteel>,<metaitem:plateDoubleWatertightSteel>,<extrautils2:simpledecorative:1>],
+	[<extrautils2:simpledecorative:1>,<metaitem:plateDoubleWatertightSteel>,<extrautils2:drum:2>,<metaitem:plateDoubleWatertightSteel>,<extrautils2:simpledecorative:1>],
+	[<extrautils2:simpledecorative:1>,<metaitem:plateDoubleWatertightSteel>,<metaitem:plateDoubleWatertightSteel>,<metaitem:plateDoubleWatertightSteel>,<extrautils2:simpledecorative:1>],
 	[<extrautils2:simpledecorative:1>,<moreplates:demon_plate>,<moreplates:demon_plate>,<moreplates:demon_plate>,<extrautils2:simpledecorative:1>]]);		
 	
 //Solar
diff --git a/overrides/scripts/coins.zs b/overrides/scripts/coins.zs
index 9141032..87306ad 100644
--- a/overrides/scripts/coins.zs
+++ b/overrides/scripts/coins.zs
@@ -76,6 +76,7 @@ recipes.addShaped(<gregtech:ore_sapphire_0> * 32, [[<contenttweaker:omnicoin5>,
 recipes.addShaped(<gregtech:ore_cobaltite_0> * 32, [[<contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>],[<contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>, null], [null, <contenttweaker:omnicoin5>, null]]);
 recipes.addShaped(<gregtech:ore_neodymium_0> * 32, [[<contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>],[<contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>, null], [<contenttweaker:omnicoin5>, null, null]]);
 recipes.addShaped(<gregtech:ore_realgar_0> * 32, [[<contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>],[<contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>, null], [<contenttweaker:omnicoin5>, null, <contenttweaker:omnicoin5>]]);
+recipes.addShaped(<gregtech:ore_electrotine_0> * 32, [[<contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>],[<contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>, null], [<contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>]]);
 recipes.addShaped(<gregtech:ore_tantalite_0> * 32, [[null, <contenttweaker:omnicoin5>, null],[<contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>], [null, null, null]]);
 recipes.addShaped(<gregtech:ore_pitchblende_0> * 32, [[<contenttweaker:omnicoin>, null, null],[<contenttweaker:omnicoin>, <contenttweaker:omnicoin>, <contenttweaker:omnicoin>], [null, null, <contenttweaker:omnicoin>]]);
 recipes.addShaped(<gregtech:ore_saltpeter_0> * 32, [[null, <contenttweaker:omnicoin>, null],[<contenttweaker:omnicoin>, <contenttweaker:omnicoin>, <contenttweaker:omnicoin>], [null, null, <contenttweaker:omnicoin>]]);
@@ -142,7 +143,6 @@ recipes.addShaped(<gregtech:ore_aluminium_0> * 32, [[null, null, null],[null, <c
 recipes.addShaped(<gregtech:ore_bauxite_0> * 32, [[null, null, null],[null, <contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>], [null, null, null]]);
 recipes.addShaped(<gregtech:ore_grossular_0> * 32, [[null, null, null],[<contenttweaker:omnicoin5>, null, null], [null, null, <contenttweaker:omnicoin5>]]);
 recipes.addShaped(<gregtech:ore_pyrolusite_0> * 32, [[null, null, null],[<contenttweaker:omnicoin5>, null, null], [null, <contenttweaker:omnicoin5>, null]]);
-recipes.addShaped(<gregtech:ore_tantalite_0> * 32, [[null, null, null],[<contenttweaker:omnicoin5>, null, null], [<contenttweaker:omnicoin5>, null, null]]);
 recipes.addShaped(<gregtech:ore_magnesite_0> * 32, [[null, null, null],[<contenttweaker:omnicoin5>, null, <contenttweaker:omnicoin5>], [null, null, null]]);
 recipes.addShaped(<gregtech:ore_olivine_0> * 32, [[null, null, null],[<contenttweaker:omnicoin5>, <contenttweaker:omnicoin5>, null], [null, null, null]]);
 recipes.addShaped(<gregtech:ore_tin_0> * 32, [[null, null, <contenttweaker:omnicoin5>],[null, null, null], [null, null, <contenttweaker:omnicoin5>]]);
diff --git a/overrides/scripts/electronics.zs b/overrides/scripts/electronics.zs
index 4807d56..b872689 100644
--- a/overrides/scripts/electronics.zs
+++ b/overrides/scripts/electronics.zs
@@ -178,15 +178,24 @@ makeShaped("of_microverse_casing", <contenttweaker:microverse_casing> * 2,
 //	[<ore:plateWroughtIron>, <ore:plateWroughtIron>, <ore:plateWroughtIron>], 
 //	[<ore:cableGtSingleTin>, <gregtech:machine_casing:1>, <ore:cableGtSingleTin>]]);	
 
-// remove steel LV Motor recipes
+// remove LV Motor recipes
 recipes.removeByRecipeName("gregtech:electric_motor_lv_steel");
+recipes.removeByRecipeName("gregtech:electric_motor_lv_iron");
 assembler.findRecipe(30, [<metaitem:cableGtSingleTin> * 2, <metaitem:stickSteel> * 2, <metaitem:stickSteelMagnetic>, <metaitem:wireGtSingleCopper> * 4], [null]).remove();
+<recipemap:assembler>.findRecipe(30, [<metaitem:cableGtSingleTin> * 2, <metaitem:stickIron> * 2, <metaitem:stickIronMagnetic>, <metaitem:wireGtSingleCopper> * 4], null).remove();
+
 
 //LV Motor - with Fine Copper Wires
 recipes.addShaped(<metaitem:electric.motor.lv>, [
 	[<ore:cableGtSingleTin>, <metaitem:wireFineCopper>, <ore:stickIron>], 
 	[<metaitem:wireFineCopper>, <ore:stickIronMagnetic>, <metaitem:wireFineCopper>],
 	[<ore:stickIron>, <metaitem:wireFineCopper>, <ore:cableGtSingleTin>]]);
+assembler.recipeBuilder()
+	.inputs([<metaitem:cableGtSingleTin> * 2, <metaitem:stickIron> * 2, <metaitem:stickIronMagnetic>, <metaitem:wireFineCopper> * 4])
+	.outputs(<metaitem:electric.motor.lv>)
+	.duration(100)
+	.EUt(30)
+	.buildAndRegister();
 
 //Wood Pulp
 recipes.addShapeless(<metaitem:dustWood> * 4,[<ore:logWood>,<gregtech:meta_tool:12>]);	
diff --git a/overrides/scripts/extractor_solidifier.zs b/overrides/scripts/extractor_solidifier.zs
index 1c964c6..ddddf8d 100644
--- a/overrides/scripts/extractor_solidifier.zs
+++ b/overrides/scripts/extractor_solidifier.zs
@@ -422,12 +422,12 @@ fluid_extractor.recipeBuilder()
 
 fluid_extractor.recipeBuilder()
     .inputs([<nuclearcraft:plutonium:4>])
-    .fluidOutputs([<liquid:plutonium2> * 144])
+    .fluidOutputs([<liquid:plutonium> * 144])
     .duration(180).EUt(16).buildAndRegister();
 
 fluid_extractor.recipeBuilder()
     .inputs([<nuclearcraft:plutonium:6>])
-    .fluidOutputs([<liquid:plutonium2> * 16])
+    .fluidOutputs([<liquid:plutonium> * 16])
     .duration(20).EUt(16).buildAndRegister();
 
 fluid_extractor.recipeBuilder()
diff --git a/overrides/scripts/materials.zs b/overrides/scripts/materials.zs
index ea1426a..24ae42c 100644
--- a/overrides/scripts/materials.zs
+++ b/overrides/scripts/materials.zs
@@ -25,7 +25,7 @@ var element_draconium_awakened = Elements.add(149, 267, -1, null, "AwakenedDraco
 
 var draconium = MaterialBuilder(32001, "draconium")
     .element("Draconium")
-    .ingot().fluid().ore()
+    .ingot().fluid("fluid", false).ore()
     .color(0xbe49ed).iconSet("metallic")
     .blastTemp(6800, "HIGHER")
     .cableProperties(524288, 1, 0, true)
@@ -235,6 +235,7 @@ var iridosmine_8020 = MaterialBuilder(32030, "iridosmine_8020")
 <material:californium>.addIngot();
 <material:einsteinium>.addIngot();
 <material:graphite>.addIngot();
+<material:graphene>.addIngot();
 
 <material:uranium_235>.addFluid();
 <material:neptunium>.addFluid();
@@ -254,6 +255,7 @@ var iridosmine_8020 = MaterialBuilder(32030, "iridosmine_8020")
 <material:naquadria>.addFlags(["generate_bolt_screw"]);
 <material:redstone>.addFlags(["generate_dense"]);
 <material:lapis>.addFlags(["generate_dense"]);
+<material:graphene>.addFlags(["generate_foil"]);
 // Prevent TE Gears from showing up
 <material:tin>.addFlags(["generate_gear"]);
 <material:copper>.addFlags(["generate_gear"]);
diff --git a/overrides/scripts/multiblocks.zs b/overrides/scripts/multiblocks.zs
index cf670dd..15bc0bf 100644
--- a/overrides/scripts/multiblocks.zs
+++ b/overrides/scripts/multiblocks.zs
@@ -575,8 +575,9 @@ microverse_projector_basic.recipeMap
              <gregtech:ore_cassiterite_0> * 64,
              <gregtech:ore_redstone_0> * 64,
              <gregtech:ore_nickel_0> * 64,
-             <gregtech:ore_bauxite_0> * 64,
-             <gregtech:ore_bauxite_0> * 64,
+             <gregtech:ore_ilmenite_0> * 64,
+             <gregtech:ore_ilmenite_0> * 64,
+             <gregtech:ore_ilmenite_0> * 64,
              <gregtech:ore_uraninite_0> * 64,
              <gregtech:ore_galena_0> * 64,
              <gregtech:ore_galena_0> * 64,