From bfdfdadf6999c2bbfb061d6cf9a3a4c3dff2ba88 Mon Sep 17 00:00:00 2001
From: IntegerLimit <isaacwonglh111@gmail.com>
Date: Fri, 3 Feb 2023 09:16:08 +1100
Subject: [PATCH] Cleanup JetpacksAndEnergyStorage.zs

---
 overrides/scripts/AE2.zs                      |  18 +-
 overrides/scripts/EnderIO.zs                  | 272 +++++++++++++++
 overrides/scripts/JetpacksAndEnergyStorage.zs | 319 +-----------------
 overrides/scripts/Midgame.zs                  |  26 +-
 overrides/scripts/aa xu2.zs                   |  23 +-
 5 files changed, 339 insertions(+), 319 deletions(-)

diff --git a/overrides/scripts/AE2.zs b/overrides/scripts/AE2.zs
index 6e993c5..5af263b 100644
--- a/overrides/scripts/AE2.zs
+++ b/overrides/scripts/AE2.zs
@@ -107,6 +107,15 @@ assembler.recipeBuilder()
 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();	
 
+// Vibrant Quartz Glass
+recipes.remove(<appliedenergistics2:quartz_vibrant_glass>);
+
+alloy.recipeBuilder()
+    .inputs([<appliedenergistics2:quartz_glass>,<ore:ingotVibrantAlloy>])
+    .outputs([<appliedenergistics2:quartz_vibrant_glass>])
+    .duration(80).EUt(16).buildAndRegister();
+
+// Meteorite Compass
 recipes.remove(<appliedenergistics2:sky_compass>);
 recipes.addShaped(<appliedenergistics2:sky_compass>,[
 	[<actuallyadditions:item_crystal:3>,<metaitem:plateDarkSteel>,<actuallyadditions:item_crystal:3>],
@@ -221,6 +230,7 @@ Inscriber.removeRecipe(<appliedenergistics2:material:14>);
 Inscriber.removeRecipe(<appliedenergistics2:material:13>); 	
 Inscriber.removeRecipe(<appliedenergistics2:material:19>); 	
 Inscriber.removeRecipe(<appliedenergistics2:material:15>); 	
+
 // Presses
 laser_engraver.recipeBuilder().inputs([<metaitem:blockVanadiumSteel>]).notConsumable(<ore:craftingLensRed>).outputs([<appliedenergistics2:material:14>]).EUt(120).duration(1600).buildAndRegister();
 laser_engraver.recipeBuilder().inputs([<metaitem:blockVanadiumSteel>]).notConsumable(<ore:craftingLensBlue>).outputs([<appliedenergistics2:material:13>]).EUt(120).duration(1600).buildAndRegister();
@@ -318,10 +328,6 @@ recipes.removeByRecipeName("appliedenergistics2:network/cells/fluid_storage_cell
 recipes.removeByRecipeName("appliedenergistics2:network/cells/fluid_storage_cell_4k");
 recipes.removeByRecipeName("appliedenergistics2:network/cells/fluid_storage_cell_16k");
 recipes.removeByRecipeName("appliedenergistics2:network/cells/fluid_storage_cell_64k");
-
-<appliedenergistics2:material:10>.addTooltip(format.red("Made in a Crystal Growth Chamber from a Certus Quartz Seed."));
-<appliedenergistics2:material:11>.addTooltip(format.red("Made in a Crystal Growth Chamber from a Nether Quartz Seed."));
-<appliedenergistics2:material:12>.addTooltip(format.red("Made in a Crystal Growth Chamber from a Fluix Seed."));
 	
 // 1k Storage
 recipes.remove(<appliedenergistics2:material:35>);	
@@ -410,5 +416,9 @@ recipes.addShapeless(<metaitem:gemCertusQuartz> * 4, [<appliedenergistics2:chise
 
 mods.jei.JEI.removeAndHide(<appliedenergistics2:material:0>);
 
+
+<appliedenergistics2:material:10>.addTooltip(format.red("Made in a Crystal Growth Chamber from a Certus Quartz Seed."));
+<appliedenergistics2:material:11>.addTooltip(format.red("Made in a Crystal Growth Chamber from a Nether Quartz Seed."));
+<appliedenergistics2:material:12>.addTooltip(format.red("Made in a Crystal Growth Chamber from a Fluix Seed."));
 <appliedenergistics2:material:1>.addTooltip(format.aqua(format.italic(
     "Obtained by charging with RF power in the AE2 Charger.")));
diff --git a/overrides/scripts/EnderIO.zs b/overrides/scripts/EnderIO.zs
index f58365e..59506c7 100644
--- a/overrides/scripts/EnderIO.zs
+++ b/overrides/scripts/EnderIO.zs
@@ -164,6 +164,13 @@ alloy.recipeBuilder()
     .outputs(<enderio:block_dark_fused_glass>)
     .duration(200).EUt(32).buildAndRegister();
 
+// Fused quartz
+alloy.recipeBuilder()
+    .inputs([<minecraft:quartz> * 3])
+    .notConsumable(<metaitem:shape.mold.block>)
+    .outputs([<enderio:block_fused_quartz>])
+    .duration(80).EUt(16).buildAndRegister();
+
 // Enlightened Fused Quartz
 alloy.recipeBuilder()
     .inputs([<enderio:block_fused_quartz:*>, <minecraft:glowstone>])
@@ -180,6 +187,86 @@ alloy.recipeBuilder()
     .EUt(32)
     .buildAndRegister();
 
+/* More Ender IO Alloy Recipes */
+
+// Dark steel rod + grains of infinity => infinity rod
+alloy.recipeBuilder()
+    .inputs([<metaitem:stickDarkSteel>,<enderio:item_material:20>])
+    .outputs([<enderio:item_material:71>])
+    .duration(200).EUt(30).buildAndRegister();
+
+// End steel + grains => stellar
+alloy.recipeBuilder()
+    .inputs([<ore:ingotEndSteel>,<enderio:item_material:20> * 8])
+    .outputs([<enderio:item_alloy_endergy_ingot:3>])
+    .duration(200).EUt(2000).buildAndRegister();
+
+// Simple machine chassis + grains => industrial machine chassis
+alloy.recipeBuilder()
+    .inputs([<enderio:item_material>,<enderio:item_material:20> * 2])
+    .outputs([<enderio:item_material:1>])
+    .duration(200).EUt(30).buildAndRegister();
+
+// End steel plate + industrial machine chassis => end steel chassis
+alloy.recipeBuilder()
+    .inputs([<enderio:item_material:1>,<metaitem:plateEndSteel> * 8])
+    .outputs([<enderio:item_material:66>])
+    .duration(800).EUt(30).buildAndRegister();
+
+//Staff of Travel
+recipes.remove(<enderio:item_travel_staff>);
+recipes.addShaped(<enderio:item_travel_staff>, [
+    [null,null,<enderio:item_material:15>],
+    [null,<metaitem:stickDarkSteel>,null],
+    [<metaitem:stickDarkSteel>,null,null]]);
+
+//Rod of Return
+recipes.remove(<enderio:item_rod_of_return>);
+recipes.addShaped(<enderio:item_rod_of_return>, [
+    [null, <ore:itemPulsatingCrystal>, <ore:itemEnderCrystal>],
+    [null, <metaitem:stickDarkSteel>, <ore:itemPulsatingCrystal>],
+    [<metaitem:stickDarkSteel>, null, null]]);
+
+//Ender Generator
+recipes.remove(<enderio:block_ender_generator>);
+recipes.addShaped(<enderio:block_ender_generator>, [
+    [<metaitem:plateEndSteel>,<metaitem:plateEndSteel>, <metaitem:plateEndSteel>],
+    [<appliedenergistics2:quartz_vibrant_glass>, <ore:skullEnderResonator>, <appliedenergistics2:quartz_vibrant_glass>],
+    [<metaitem:gearEndSteel>, <metaitem:plateEndSteel>, <metaitem:gearEndSteel>]]);
+
+//Wireless Dish
+recipes.remove(<enderio:item_material:65>);
+recipes.addShaped(<enderio:item_material:65>,
+    [[<metaitem:emitter.lv>],[<metaitem:stickElectricalSteel>]]);
+
+recipes.remove(<enderio:item_material>); // simple machine chassis
+recipes.remove(<enderio:item_material:66>); // end steel chassis
+
+// simple machine chassis
+recipes.addShaped(<enderio:item_material>, [
+    [<ore:barsIron>, <metaitem:plateIron>, <ore:barsIron>],
+    [<metaitem:plateIron>, <ore:dustBedrock>, <metaitem:plateIron>],
+    [<ore:barsIron>, <metaitem:plateIron>, <ore:barsIron>]]);
+
+//Capacitors
+recipes.remove(<enderio:item_basic_capacitor>);
+recipes.addShaped(<enderio:item_basic_capacitor>, [
+    [null, <ore:nuggetElectricalSteel>,null],
+    [<ore:nuggetElectricalSteel>, <metaitem:circuit.vacuum_tube>, <ore:nuggetElectricalSteel>],
+    [<ore:wireGtSingleTin>,null,<ore:wireGtSingleTin>]]);
+recipes.addShaped(<enderio:item_basic_capacitor> * 3, [
+    [null, <ore:nuggetElectricalSteel>,null],
+    [<ore:nuggetElectricalSteel>, <metaitem:component.smd.capacitor>, <ore:nuggetElectricalSteel>],
+    [<ore:wireGtSingleTin>,null,<ore:wireGtSingleTin>]]);
+recipes.addShaped(<enderio:item_basic_capacitor> * 2, [
+    [null, <ore:nuggetElectricalSteel>,null],
+    [<ore:nuggetElectricalSteel>, <metaitem:component.capacitor>, <ore:nuggetElectricalSteel>],
+    [<ore:wireGtSingleTin>,null,<ore:wireGtSingleTin>]]);
+recipes.addShaped(<enderio:item_basic_capacitor> * 12, [
+    [null, <ore:nuggetElectricalSteel>,null],
+    [<ore:nuggetElectricalSteel>, <metaitem:component.advanced_smd.capacitor>, <ore:nuggetElectricalSteel>],
+    [<ore:wireGtSingleTin>,null,<ore:wireGtSingleTin>]]);
+
 recipes.addShaped(compressedoctadiccap, [
 	[<enderio:item_basic_capacitor:2>,<enderio:item_basic_capacitor:2>,<enderio:item_basic_capacitor:2>],
 	[<enderio:item_basic_capacitor:2>,<enderio:item_basic_capacitor:2>,<enderio:item_basic_capacitor:2>],
@@ -200,6 +287,178 @@ mods.jei.JEI.addItem(doublecompressedoctadiccap);
 <contenttweaker:compressedoctadiccapacitor>.addTooltip(format.white("Put the item into a crafting window if it has no lore"));
 <contenttweaker:doublecompressedoctadiccapacitor>.addTooltip(format.white("Put the item into a crafting window if it has no lore"));
 
+// Crafter
+recipes.remove(<enderio:block_crafter>);
+recipes.addShaped(<enderio:block_crafter>, [
+    [<extrautils2:ingredients>,<avaritia:compressed_crafting_table>,<extrautils2:ingredients>],
+    [<ore:gearIronInfinity>, <ore:itemMachineChassi>, <ore:gearIronInfinity>],
+    [<enderio:item_item_conduit>,<enderio:item_item_conduit>,<enderio:item_item_conduit>]]);
+
+// Buffer
+recipes.remove(<enderio:block_buffer:1>);
+recipes.addShaped(<enderio:block_buffer:1>,  [
+    [<metaitem:plateIron>, <metaitem:plateRedAlloy>, <metaitem:plateIron>],
+    [<metaitem:plateRedAlloy>, <ore:blockRedstone>, <metaitem:plateRedAlloy>],
+    [<metaitem:plateIron>, <metaitem:plateRedAlloy>, <metaitem:plateIron>]]);
+
+//Zombie Generator
+recipes.remove(<enderio:block_zombie_generator>);
+recipes.addShaped(<enderio:block_zombie_generator>, [
+    [<metaitem:plateElectricalSteel>,<metaitem:plateElectricalSteel>,<metaitem:plateElectricalSteel>],
+    [<appliedenergistics2:quartz_vibrant_glass>,<enderio:item_material:41>,<appliedenergistics2:quartz_vibrant_glass>],
+    [<metaitem:gearPulsatingIron>,<metaitem:plateElectricalSteel>,<metaitem:gearPulsatingIron>]]);
+
+recipes.remove(<enderio:block_franken_zombie_generator>);
+recipes.addShaped(<enderio:block_franken_zombie_generator>, [
+    [<ore:plateSoularium>, <ore:plateSoularium>, <ore:plateSoularium>],
+    [<ore:skullZombieFrankenstein>, <enderio:block_zombie_generator>, <ore:skullZombieFrankenstein>],
+    [<metaitem:gearElectricalSteel>, <ore:plateSoularium>, <metaitem:gearElectricalSteel>]]);
+
+//The Vat
+recipes.remove(<enderio:block_vat>);
+recipes.addShaped(<enderio:block_vat>, [
+    [<metaitem:plateDarkSteel>, <minecraft:cauldron>, <metaitem:plateDarkSteel>],
+    [<enderio:block_tank>, <ore:itemMachineChassi>, <enderio:block_tank>],
+    [<metaitem:electric.pump.mv>, <morefurnaces:furnaceblock:3>, <metaitem:electric.pump.mv>]]);
+
+//Solar Cells
+recipes.remove(<appliedenergistics2:quartz_fixture>);
+recipes.addShaped(<appliedenergistics2:quartz_fixture> * 4, [
+    [<appliedenergistics2:quartz_glass>,<appliedenergistics2:quartz_glass>,<appliedenergistics2:quartz_glass>],
+    [<appliedenergistics2:material:1>,<appliedenergistics2:material:1>,<appliedenergistics2:material:1>],
+    [<metaitem:plateElectricalSteel>,<metaitem:plateElectricalSteel>,<metaitem:plateElectricalSteel>]]);
+
+//Wired Charger
+recipes.remove(<enderio:block_wired_charger>);
+recipes.addShaped(<enderio:block_wired_charger> , [
+    [<metaitem:plateDarkSteel>, <appliedenergistics2:charger>, <metaitem:plateDarkSteel>],
+    [<enderio:item_power_conduit>, <enderio:item_material:1>, <enderio:item_power_conduit>],
+    [<metaitem:plateElectricalSteel>,<enderio:item_power_conduit>,<metaitem:plateElectricalSteel>]]);
+
+//Coordinate Selector
+recipes.remove(<enderio:item_coord_selector>);
+recipes.addShaped(<enderio:item_coord_selector> , [
+    [<metaitem:emitter.mv>, <metaitem:blockEnderEye>, <metaitem:plateElectricalSteel>], //Ender Eye Block
+    [null, <enderio:item_material:13>, <metaitem:plateElectricalSteel>],
+    [null,null,<metaitem:plateElectricalSteel>]]);
+
+recipes.remove(<enderio:item_material:11>); // infinity bimetal gear
+recipes.remove(<enderio:item_material:12>); // energized bimetal gear
+recipes.remove(<enderio:item_material:13>); // vibrant bimetal gear
+recipes.remove(<enderio:item_material:14>); // pulsating crystal
+recipes.remove(<enderio:item_material:15>); // vibrant crystal
+recipes.remove(<enderio:item_material:73>); // dark bimetal gear
+recipes.remove(<minecraft:stone:2>);
+recipes.remove(<minecraft:stone:4>);
+recipes.remove(<minecraft:stone:6>);
+
+<enderio:block_enchanter>.displayName = "Dark Steel Enchanter";
+recipes.remove(<enderio:block_enchanter>);
+recipes.addShaped(<enderio:block_enchanter>, [
+    [<ore:gemDiamond>, <minecraft:book>, <ore:gemDiamond>],
+    [<ore:ingotDarkSteel>, <extrautils2:machine>.withTag({Type: "extrautils2:enchanter"}), <ore:ingotDarkSteel>],
+    [null, <ore:ingotDarkSteel>, null]]);
+
+    
+recipes.remove(<enderio:block_soul_binder>);
+mods.extendedcrafting.TableCrafting.addShaped(<enderio:block_soul_binder>, [
+    [<ore:plateSoularium>, <ore:plateSoularium>, <ore:plateSoularium>,  <ore:plateSoularium>,<ore:plateSoularium>],
+    [<ore:plateSoularium>, <metaitem:plateTungstenSteel>, <enderio:block_enderman_skull>,<metaitem:plateTungstenSteel>,<ore:plateSoularium>],
+    [<ore:plateSoularium>, <minecraft:skull:4>,          <ore:itemSoulMachineChassi>,   <minecraft:skull:2>,         <ore:plateSoularium>],
+    [<ore:plateSoularium>, <metaitem:plateTungstenSteel>, <minecraft:skull>,             <metaitem:plateTungstenSteel>,<ore:plateSoularium>],
+    [<ore:plateSoularium>, <ore:plateSoularium>, <ore:plateSoularium>,  <ore:plateSoularium>,<ore:plateSoularium>]]);
+
+// Pulsating crystal
+autoclave.recipeBuilder()
+    .inputs([<minecraft:diamond>])
+    .fluidInputs([<liquid:pulsating_iron> * 144])
+    .outputs([<enderio:item_material:14>])
+    .duration(100).EUt(30).buildAndRegister();
+
+// Vibrant crystal
+autoclave.recipeBuilder()
+    .inputs([<minecraft:emerald>]).fluidInputs([<liquid:vibrant_alloy> * 144])
+    .outputs([<enderio:item_material:15>])
+    .duration(200).EUt(30).buildAndRegister();
+
+alloy.recipeBuilder()
+    .inputs([<metaitem:gearIron>,<enderio:item_material:20> * 2])
+    .outputs([<enderio:item_material:11>])
+    .duration(100).EUt(16).buildAndRegister();
+
+alloy.recipeBuilder()
+    .inputs([<enderio:item_material:11>,<ore:ingotDarkSteel> * 4])
+    .outputs([<enderio:item_material:73>])
+    .duration(150).EUt(16).buildAndRegister();
+
+alloy.recipeBuilder()
+    .inputs([<enderio:item_material:11>,<ore:ingotEnergeticAlloy> * 4])
+    .outputs([<enderio:item_material:12>])
+    .duration(150).EUt(16).buildAndRegister();
+
+alloy.recipeBuilder()
+    .inputs([<enderio:item_material:12>,<ore:ingotVibrantAlloy> * 4])
+    .outputs([<enderio:item_material:13>])
+    .duration(200).EUt(16).buildAndRegister();
+
+alloy.recipeBuilder()
+    .inputs([<enderio:item_material:1>,<ore:dustSoularium> * 8])
+    .outputs([<enderio:item_material:53>])
+    .duration(200).EUt(16).buildAndRegister();
+
+alloy.recipeBuilder()
+    .inputs([<enderio:item_material:1>,<simplyjetpacks:metaitemmods:3>])
+    .outputs([<enderio:item_material:54>])
+    .duration(2000).EUt(30).buildAndRegister();
+
+recipes.remove(<enderio:block_travel_anchor>);
+recipes.addShaped(<enderio:block_travel_anchor>, [
+    [<metaitem:plateDarkSteel>,<metaitem:plateVibrantAlloy>,<metaitem:plateDarkSteel>],
+    [<metaitem:plateVibrantAlloy>,<enderio:item_material:14>,<metaitem:plateVibrantAlloy>],
+    [<metaitem:plateDarkSteel>,<metaitem:plateVibrantAlloy>,<metaitem:plateDarkSteel>]]);
+recipes.remove(<enderio:block_tele_pad>);
+recipes.addShaped(<enderio:block_tele_pad>, [
+    [<appliedenergistics2:quartz_vibrant_glass>,<appliedenergistics2:quartz_vibrant_glass>,<appliedenergistics2:quartz_vibrant_glass>],
+    [<metaitem:plateDarkSteel>,<enderio:block_travel_anchor>,<metaitem:plateDarkSteel>],
+    [<metaitem:plateDarkSteel>,<enderio:item_basic_capacitor:2>,<metaitem:plateDarkSteel>]]);
+
+recipes.removeByRecipeName("enderio:enhanced_combustion_generator");
+recipes.removeByRecipeName("enderio:enhanced_wired_charger");
+recipes.removeByRecipeName("enderio:the_enhanced_vat");
+
+//Killer Joe
+recipes.remove(<enderio:block_killer_joe>);
+recipes.addShaped(<enderio:block_killer_joe>, [
+    [<metaitem:plateDarkSteel>,<metaitem:plateDarkSteel>,<metaitem:plateDarkSteel>],
+    [<armorplus:infused_lava_sword>, <ore:skullZombieFrankenstein>, <armorplus:infused_lava_sword>  ],
+    [<ore:gearDraconium>, <enderio:block_tank:1>, <ore:gearDraconium>]]);
+
+recipes.remove(<enderio:block_dark_steel_trapdoor>);
+recipes.addShaped(<enderio:block_dark_steel_trapdoor>, [
+    [<metaitem:plateDarkSteel>,<metaitem:plateDarkSteel>],
+    [<metaitem:plateDarkSteel>,<metaitem:plateDarkSteel>]]);
+
+recipes.remove(<enderio:item_xp_transfer>);
+recipes.addShaped(<enderio:item_xp_transfer>, [
+    [null,null,<enderio:item_material:15>],
+    [null,<metaitem:stickVibrantAlloy>,null],
+    [<metaitem:stickVibrantAlloy>,null,null]]);
+
+recipes.remove(<enderio:block_xp_vacuum>);
+recipes.addShaped(<enderio:block_xp_vacuum>, [
+    [<metaitem:plateDarkSteel>, <metaitem:plateDarkSteel>, <metaitem:plateDarkSteel>],
+    [<metaitem:plateDarkSteel>, <enderio:item_xp_transfer>, <metaitem:plateDarkSteel>],
+    [<metaitem:plateDarkSteel>, <ore:itemPulsatingCrystal>, <metaitem:plateDarkSteel>]]);
+
+
+// Slice'n'Splice
+recipes.remove(<enderio:block_slice_and_splice>);
+recipes.addShaped(<enderio:block_slice_and_splice>, [
+    [<metaitem:plateTungstenSteel>, <ore:itemSkull>, <metaitem:plateTungstenSteel>],
+    [<metaitem:plateTungstenSteel>, <ore:itemSoulMachineChassi>, <metaitem:plateTungstenSteel>],
+    [<ore:gearEnergized>, <enderio:block_dark_iron_bars>, <ore:gearEnergized>]]);
+
+
 /*
 
   Extra Slice'n'Splice Recipes
@@ -235,6 +494,19 @@ for i, wafer in wafers {
     });
 }
 
+//Wireless Dish
+recipes.remove(<enderio:item_material:65>);
+recipes.addShaped(<enderio:item_material:65>,
+    [[<metaitem:emitter.lv>],[<metaitem:stickElectricalSteel>]]);
+
+recipes.remove(<enderio:item_material>); // simple machine chassis
+recipes.remove(<enderio:item_material:66>); // end steel chassis
+
+// simple machine chassis
+recipes.addShaped(<enderio:item_material>, [
+    [<ore:barsIron>, <metaitem:plateIron>, <ore:barsIron>],
+    [<metaitem:plateIron>, <ore:dustBedrock>, <metaitem:plateIron>],
+    [<ore:barsIron>, <metaitem:plateIron>, <ore:barsIron>]]);
 
 //Alloy Smelter recipe for Organic Black Dye
 alloy.recipeBuilder()
diff --git a/overrides/scripts/JetpacksAndEnergyStorage.zs b/overrides/scripts/JetpacksAndEnergyStorage.zs
index 6417dba..be7745b 100644
--- a/overrides/scripts/JetpacksAndEnergyStorage.zs
+++ b/overrides/scripts/JetpacksAndEnergyStorage.zs
@@ -74,13 +74,6 @@ recipes.addShaped(<simplyjetpacks:metaitemmods:30>, [
 	[<redstonearsenal:material:224>, <simplyjetpacks:metaitemmods:19>, <redstonearsenal:material:224>],
 	[<ore:plateSignalum>, <simplyjetpacks:metaitemmods:29>, <ore:plateSignalum>]]);
 
-recipes.remove(<redstonearsenal:material:224>);
-recipes.addShaped(<redstonearsenal:material:224> * 4, [
-	[null, <ore:plateElectrumFlux>, null],
-	[<ore:plateElectrumFlux>, <ore:gemCrystalFlux>, <ore:plateElectrumFlux>],
-	[null, <ore:plateElectrumFlux>, null]]);
-
-
 recipes.remove(<simplyjetpacks:metaitemmods:5>);
 recipes.addShaped(<simplyjetpacks:metaitemmods:5>, [
 	[<ore:ingot_dark_soularium>, <ore:ingotElectricalSteel>, <ore:ingot_dark_soularium>],
@@ -99,21 +92,23 @@ recipes.addShaped(<simplyjetpacks:metaitemmods:20>, [
 	[<ore:ingotSignalum>, <enderio:block_fused_quartz>, <ore:ingotSignalum>],
 	[<ore:ingotElectrumFlux>, <ore:ingotSignalum>, <ore:ingotElectrumFlux>]]);
 
-// fluxed electrum blend
-recipes.remove(<redstonearsenal:material>);
-//crafter
-recipes.remove(<enderio:block_crafter>);
-recipes.addShaped(<enderio:block_crafter>, [
-	[<extrautils2:ingredients>,<avaritia:compressed_crafting_table>,<extrautils2:ingredients>],
-	[<ore:gearIronInfinity>, <ore:itemMachineChassi>, <ore:gearIronInfinity>],
-	[<enderio:item_item_conduit>,<enderio:item_item_conduit>,<enderio:item_item_conduit>]]);
+// Elevation Unit
+canner.recipeBuilder()
+	.inputs(<simplyjetpacks:metaitemmods:18>)
+	.fluidInputs(<liquid:glowstone> * 4032)
+	.outputs(<simplyjetpacks:metaitemmods:19>)
+	.duration(100)
+	.EUt(7)
+	.buildAndRegister();
 
-// buffer
-recipes.remove(<enderio:block_buffer:1>);
-recipes.addShaped(<enderio:block_buffer:1>,  [
-	[<metaitem:plateIron>, <metaitem:plateRedAlloy>, <metaitem:plateIron>],
-	[<metaitem:plateRedAlloy>, <ore:blockRedstone>, <metaitem:plateRedAlloy>],
-	[<metaitem:plateIron>, <metaitem:plateRedAlloy>, <metaitem:plateIron>]]);
+// Coolant Unit
+canner.recipeBuilder()
+	.inputs(<simplyjetpacks:metaitemmods:20>)
+	.fluidInputs(<liquid:cryotheum> * 6000)
+	.outputs(<simplyjetpacks:metaitemmods:21>)
+	.duration(100)
+	.EUt(7)
+	.buildAndRegister();
 
 // basic capacitor bank
 recipes.remove(<enderio:block_cap_bank:1>);
@@ -152,21 +147,6 @@ recipes.addShaped(<enderio:block_cap_bank:3>,  [
 	[<metaitem:plateVibrantAlloy>,<metaitem:plateVibrantAlloy>,<metaitem:plateVibrantAlloy>]],
 	sumCapacitorBankPower);
 
-//slice and splice
-recipes.remove(<enderio:block_slice_and_splice>);
-recipes.addShaped(<enderio:block_slice_and_splice>, [
-	[<metaitem:plateTungstenSteel>, <ore:itemSkull>, <metaitem:plateTungstenSteel>],
-	[<metaitem:plateTungstenSteel>, <ore:itemSoulMachineChassi>, <metaitem:plateTungstenSteel>],
-	[<ore:gearEnergized>, <enderio:block_dark_iron_bars>, <ore:gearEnergized>]]);
-
-// replaces default flux crystal recipe with one for autoclave
-recipes.remove(<redstonearsenal:material:160>);
-autoclave.recipeBuilder()
-    .inputs([<minecraft:diamond>])
-    .fluidInputs([<liquid:redstone> * 720])
-    .outputs([<redstonearsenal:material:160>])
-    .duration(200).EUt(400).buildAndRegister();
-
 //Conductive Iron Jetpack
 recipes.removeByRecipeName("simplyjetpacks:upgraderecipe1");
 recipes.addShaped(conductiveironjetpack, [
@@ -321,234 +301,6 @@ recipes.addShaped(<openglider:hang_glider_part:2>, [
 	[<metaitem:stickIron>, null, <metaitem:stickIron>],
 	[<metaitem:stickIron>, <metaitem:stickIron>,<metaitem:stickIron>]]);
 
-
-//Staff of Travel
-recipes.remove(<enderio:item_travel_staff>);
-recipes.addShaped(<enderio:item_travel_staff>, [
-    [null,null,<enderio:item_material:15>],
-    [null,<metaitem:stickDarkSteel>,null],
-    [<metaitem:stickDarkSteel>,null,null]]);
-
-//Rod of Return
-recipes.remove(<enderio:item_rod_of_return>);
-recipes.addShaped(<enderio:item_rod_of_return>, [
-	[null, <ore:itemPulsatingCrystal>, <ore:itemEnderCrystal>],
-	[null, <metaitem:stickDarkSteel>, <ore:itemPulsatingCrystal>],
-	[<metaitem:stickDarkSteel>, null, null]]);
-
-//Ender Generator
-recipes.remove(<enderio:block_ender_generator>);
-recipes.addShaped(<enderio:block_ender_generator>, [
-	[<metaitem:plateEndSteel>,<metaitem:plateEndSteel>, <metaitem:plateEndSteel>],
-	[<appliedenergistics2:quartz_vibrant_glass>, <ore:skullEnderResonator>, <appliedenergistics2:quartz_vibrant_glass>],
-	[<metaitem:gearEndSteel>, <metaitem:plateEndSteel>, <metaitem:gearEndSteel>]]);
-
-
-//Wireless Dish
-recipes.remove(<enderio:item_material:65>);
-recipes.addShaped(<enderio:item_material:65>,
-    [[<metaitem:emitter.lv>],[<metaitem:stickElectricalSteel>]]);
-
-recipes.remove(<enderio:item_material>); // simple machine chassis
-recipes.remove(<enderio:item_material:66>); // end steel chassis
-
-// simple machine chassis
-recipes.addShaped(<enderio:item_material>, [
-    [<ore:barsIron>, <metaitem:plateIron>, <ore:barsIron>],
-    [<metaitem:plateIron>, <ore:dustBedrock>, <metaitem:plateIron>],
-    [<ore:barsIron>, <metaitem:plateIron>, <ore:barsIron>]]);
-
-// dark steel rod + grains of infinity => infinity rod
-alloy.recipeBuilder()
-    .inputs([<metaitem:stickDarkSteel>,<enderio:item_material:20>])
-    .outputs([<enderio:item_material:71>])
-    .duration(200).EUt(30).buildAndRegister();
-
-// end steel + grains => stellar
-alloy.recipeBuilder()
-    .inputs([<ore:ingotEndSteel>,<enderio:item_material:20> * 8])
-    .outputs([<enderio:item_alloy_endergy_ingot:3>])
-    .duration(200).EUt(2000).buildAndRegister();
-
-// simple machine chassis + grains => industrial machine chassis
-alloy.recipeBuilder()
-    .inputs([<enderio:item_material>,<enderio:item_material:20> * 2])
-    .outputs([<enderio:item_material:1>])
-    .duration(200).EUt(30).buildAndRegister();
-
-// end steel plate + industrial machine chassis => end steel chassis
-alloy.recipeBuilder()
-    .inputs([<enderio:item_material:1>,<metaitem:plateEndSteel> * 8])
-    .outputs([<enderio:item_material:66>])
-    .duration(800).EUt(30).buildAndRegister();
-
-// fused quartz
-alloy.recipeBuilder()
-    .inputs([<minecraft:quartz> * 3])
-	.notConsumable(<metaitem:shape.mold.block>)
-    .outputs([<enderio:block_fused_quartz>])
-    .duration(80).EUt(16).buildAndRegister();
-
-//Zombie Generator
-recipes.remove(<enderio:block_zombie_generator>);
-recipes.addShaped(<enderio:block_zombie_generator>, [
-	[<metaitem:plateElectricalSteel>,<metaitem:plateElectricalSteel>,<metaitem:plateElectricalSteel>],
-	[<appliedenergistics2:quartz_vibrant_glass>,<enderio:item_material:41>,<appliedenergistics2:quartz_vibrant_glass>],
-	[<metaitem:gearPulsatingIron>,<metaitem:plateElectricalSteel>,<metaitem:gearPulsatingIron>]]);
-
-recipes.remove(<enderio:block_franken_zombie_generator>);
-recipes.addShaped(<enderio:block_franken_zombie_generator>, [
-	[<ore:plateSoularium>, <ore:plateSoularium>, <ore:plateSoularium>],
-	[<ore:skullZombieFrankenstein>, <enderio:block_zombie_generator>, <ore:skullZombieFrankenstein>],
-	[<metaitem:gearElectricalSteel>, <ore:plateSoularium>, <metaitem:gearElectricalSteel>]]);
-
-//The Vat
-recipes.remove(<enderio:block_vat>);
-recipes.addShaped(<enderio:block_vat>, [
-	[<metaitem:plateDarkSteel>, <minecraft:cauldron>, <metaitem:plateDarkSteel>],
-	[<enderio:block_tank>, <ore:itemMachineChassi>, <enderio:block_tank>],
-	[<metaitem:electric.pump.mv>, <morefurnaces:furnaceblock:3>, <metaitem:electric.pump.mv>]]);
-
-//Solar Cells
-recipes.remove(<appliedenergistics2:quartz_fixture>);
-recipes.addShaped(<appliedenergistics2:quartz_fixture> * 4, [
-    [<appliedenergistics2:quartz_glass>,<appliedenergistics2:quartz_glass>,<appliedenergistics2:quartz_glass>],
-    [<appliedenergistics2:material:1>,<appliedenergistics2:material:1>,<appliedenergistics2:material:1>],
-    [<metaitem:plateElectricalSteel>,<metaitem:plateElectricalSteel>,<metaitem:plateElectricalSteel>]]);
-
-//Capacitor
-recipes.remove(<enderio:item_basic_capacitor>);
-recipes.addShaped(<enderio:item_basic_capacitor>, [
-	[null, <ore:nuggetElectricalSteel>,null],
-	[<ore:nuggetElectricalSteel>, <metaitem:circuit.vacuum_tube>, <ore:nuggetElectricalSteel>],
-	[<ore:wireGtSingleTin>,null,<ore:wireGtSingleTin>]]);
-recipes.addShaped(<enderio:item_basic_capacitor> * 3, [
-	[null, <ore:nuggetElectricalSteel>,null],
-	[<ore:nuggetElectricalSteel>, <metaitem:component.smd.capacitor>, <ore:nuggetElectricalSteel>],
-	[<ore:wireGtSingleTin>,null,<ore:wireGtSingleTin>]]);
-recipes.addShaped(<enderio:item_basic_capacitor> * 2, [
-	[null, <ore:nuggetElectricalSteel>,null],
-	[<ore:nuggetElectricalSteel>, <metaitem:component.capacitor>, <ore:nuggetElectricalSteel>],
-	[<ore:wireGtSingleTin>,null,<ore:wireGtSingleTin>]]);
-recipes.addShaped(<enderio:item_basic_capacitor> * 12, [
-	[null, <ore:nuggetElectricalSteel>,null],
-	[<ore:nuggetElectricalSteel>, <metaitem:component.advanced_smd.capacitor>, <ore:nuggetElectricalSteel>],
-	[<ore:wireGtSingleTin>,null,<ore:wireGtSingleTin>]]);
-
-//Wired Charger
-recipes.remove(<enderio:block_wired_charger>);
-recipes.addShaped(<enderio:block_wired_charger>	, [
-	[<metaitem:plateDarkSteel>, <appliedenergistics2:charger>, <metaitem:plateDarkSteel>],
-	[<enderio:item_power_conduit>, <enderio:item_material:1>, <enderio:item_power_conduit>],
-	[<metaitem:plateElectricalSteel>,<enderio:item_power_conduit>,<metaitem:plateElectricalSteel>]]);
-
-//Coordinate Selector
-recipes.remove(<enderio:item_coord_selector>);
-recipes.addShaped(<enderio:item_coord_selector>	, [
-	[<metaitem:emitter.mv>, <metaitem:blockEnderEye>, <metaitem:plateElectricalSteel>], //Ender Eye Block
-	[null, <enderio:item_material:13>, <metaitem:plateElectricalSteel>],
-	[null,null,<metaitem:plateElectricalSteel>]]);
-
-recipes.remove(<enderio:item_material:11>); // infinity bimetal gear
-recipes.remove(<enderio:item_material:12>); // energized bimetal gear
-recipes.remove(<enderio:item_material:13>); // vibrant bimetal gear
-recipes.remove(<enderio:item_material:14>); // pulsating crystal
-recipes.remove(<enderio:item_material:15>); // vibrant crystal
-recipes.remove(<enderio:item_material:73>); // dark bimetal gear
-recipes.remove(<minecraft:stone:2>);
-recipes.remove(<minecraft:stone:4>);
-recipes.remove(<minecraft:stone:6>);
-
-// pulsating crystal
-autoclave.recipeBuilder()
-    .inputs([<minecraft:diamond>])
-    .fluidInputs([<liquid:pulsating_iron> * 144])
-    .outputs([<enderio:item_material:14>])
-    .duration(100).EUt(30).buildAndRegister();
-
-// vibrant crystal
-autoclave.recipeBuilder()
-    .inputs([<minecraft:emerald>]).fluidInputs([<liquid:vibrant_alloy> * 144])
-    .outputs([<enderio:item_material:15>])
-    .duration(200).EUt(30).buildAndRegister();
-
-recipes.remove(<appliedenergistics2:quartz_vibrant_glass>);
-
-alloy.recipeBuilder()
-    .inputs([<appliedenergistics2:quartz_glass>,<ore:ingotVibrantAlloy>])
-    .outputs([<appliedenergistics2:quartz_vibrant_glass>])
-    .duration(80).EUt(16).buildAndRegister();
-
-alloy.recipeBuilder()
-    .inputs([<metaitem:gearIron>,<enderio:item_material:20> * 2])
-    .outputs([<enderio:item_material:11>])
-    .duration(100).EUt(16).buildAndRegister();
-
-alloy.recipeBuilder()
-    .inputs([<enderio:item_material:11>,<ore:ingotDarkSteel> * 4])
-    .outputs([<enderio:item_material:73>])
-    .duration(150).EUt(16).buildAndRegister();
-
-alloy.recipeBuilder()
-    .inputs([<enderio:item_material:11>,<ore:ingotEnergeticAlloy> * 4])
-    .outputs([<enderio:item_material:12>])
-    .duration(150).EUt(16).buildAndRegister();
-
-alloy.recipeBuilder()
-    .inputs([<enderio:item_material:12>,<ore:ingotVibrantAlloy> * 4])
-    .outputs([<enderio:item_material:13>])
-    .duration(200).EUt(16).buildAndRegister();
-
-alloy.recipeBuilder()
-    .inputs([<enderio:item_material:1>,<ore:dustSoularium> * 8])
-    .outputs([<enderio:item_material:53>])
-    .duration(200).EUt(16).buildAndRegister();
-
-alloy.recipeBuilder()
-    .inputs([<enderio:item_material:1>,<simplyjetpacks:metaitemmods:3>])
-    .outputs([<enderio:item_material:54>])
-    .duration(2000).EUt(30).buildAndRegister();
-
-recipes.remove(<enderio:block_travel_anchor>);
-recipes.addShaped(<enderio:block_travel_anchor>, [
-	[<metaitem:plateDarkSteel>,<metaitem:plateVibrantAlloy>,<metaitem:plateDarkSteel>],
-	[<metaitem:plateVibrantAlloy>,<enderio:item_material:14>,<metaitem:plateVibrantAlloy>],
-	[<metaitem:plateDarkSteel>,<metaitem:plateVibrantAlloy>,<metaitem:plateDarkSteel>]]);
-recipes.remove(<enderio:block_tele_pad>);
-recipes.addShaped(<enderio:block_tele_pad>, [
-	[<appliedenergistics2:quartz_vibrant_glass>,<appliedenergistics2:quartz_vibrant_glass>,<appliedenergistics2:quartz_vibrant_glass>],
-	[<metaitem:plateDarkSteel>,<enderio:block_travel_anchor>,<metaitem:plateDarkSteel>],
-	[<metaitem:plateDarkSteel>,<enderio:item_basic_capacitor:2>,<metaitem:plateDarkSteel>]]);
-
-recipes.removeByRecipeName("enderio:enhanced_combustion_generator");
-recipes.removeByRecipeName("enderio:enhanced_wired_charger");
-recipes.removeByRecipeName("enderio:the_enhanced_vat");
-
-//Killer Joe
-recipes.remove(<enderio:block_killer_joe>);
-recipes.addShaped(<enderio:block_killer_joe>, [
-	[<metaitem:plateDarkSteel>,<metaitem:plateDarkSteel>,<metaitem:plateDarkSteel>],
-	[<armorplus:infused_lava_sword>, <ore:skullZombieFrankenstein>, <armorplus:infused_lava_sword>	],
-	[<ore:gearDraconium>, <enderio:block_tank:1>, <ore:gearDraconium>]]);
-
-recipes.remove(<enderio:block_dark_steel_trapdoor>);
-recipes.addShaped(<enderio:block_dark_steel_trapdoor>, [
-	[<metaitem:plateDarkSteel>,<metaitem:plateDarkSteel>],
-	[<metaitem:plateDarkSteel>,<metaitem:plateDarkSteel>]]);
-
-recipes.remove(<enderio:item_xp_transfer>);
-recipes.addShaped(<enderio:item_xp_transfer>, [
-	[null,null,<enderio:item_material:15>],
-	[null,<metaitem:stickVibrantAlloy>,null],
-	[<metaitem:stickVibrantAlloy>,null,null]]);
-
-recipes.remove(<enderio:block_xp_vacuum>);
-recipes.addShaped(<enderio:block_xp_vacuum>, [
-	[<metaitem:plateDarkSteel>, <metaitem:plateDarkSteel>, <metaitem:plateDarkSteel>],
-	[<metaitem:plateDarkSteel>, <enderio:item_xp_transfer>, <metaitem:plateDarkSteel>],
-	[<metaitem:plateDarkSteel>, <ore:itemPulsatingCrystal>, <metaitem:plateDarkSteel>]]);
-
-
 //<thermalexpansion:frame:128>.displayName = "Leadstone Energy Cell Frame";
 //<thermalexpansion:cell>.displayName = "Leadstone Energy Cell";
 <thermalexpansion:frame:130>.displayName = "Micro Miner Engine Frame";
@@ -680,42 +432,3 @@ mods.jei.JEI.addItem(hardenedcell);
 mods.jei.JEI.addItem(reinforcedcell);
 mods.jei.JEI.addItem(signalumcell);
 mods.jei.JEI.addItem(resonantcell);
-
-<enderio:block_enchanter>.displayName = "Dark Steel Enchanter";
-recipes.remove(<enderio:block_enchanter>);
-recipes.addShaped(<enderio:block_enchanter>, [
-	[<ore:gemDiamond>, <minecraft:book>, <ore:gemDiamond>],
-	[<ore:ingotDarkSteel>, <extrautils2:machine>.withTag({Type: "extrautils2:enchanter"}), <ore:ingotDarkSteel>],
-	[null, <ore:ingotDarkSteel>, null]]);
-
-recipes.remove(<extrautils2:machine>.withTag({Type: "extrautils2:enchanter"}));
-recipes.addShaped(<extrautils2:machine>.withTag({Type: "extrautils2:enchanter"}), [
-	[null, <minecraft:writable_book>, null],
-	[<ore:gemDiamond>, <extrautils2:machine>, <ore:gemDiamond>],
-	[<metaitem:plateSteel>,<metaitem:plateSteel>,<metaitem:plateSteel>]]);
-
-recipes.remove(<enderio:block_soul_binder>);
-mods.extendedcrafting.TableCrafting.addShaped(<enderio:block_soul_binder>, [
-	[<ore:plateSoularium>, <ore:plateSoularium>, <ore:plateSoularium>,  <ore:plateSoularium>,<ore:plateSoularium>],
-	[<ore:plateSoularium>, <metaitem:plateTungstenSteel>, <enderio:block_enderman_skull>,<metaitem:plateTungstenSteel>,<ore:plateSoularium>],
-	[<ore:plateSoularium>, <minecraft:skull:4>,          <ore:itemSoulMachineChassi>,   <minecraft:skull:2>,         <ore:plateSoularium>],
-	[<ore:plateSoularium>, <metaitem:plateTungstenSteel>, <minecraft:skull>,             <metaitem:plateTungstenSteel>,<ore:plateSoularium>],
-	[<ore:plateSoularium>, <ore:plateSoularium>, <ore:plateSoularium>,  <ore:plateSoularium>,<ore:plateSoularium>]]);
-
-// Elevation Unit
-canner.recipeBuilder()
-	.inputs(<simplyjetpacks:metaitemmods:18>)
-	.fluidInputs(<liquid:glowstone> * 4032)
-	.outputs(<simplyjetpacks:metaitemmods:19>)
-	.duration(100)
-	.EUt(7)
-	.buildAndRegister();
-
-// Coolant Unit
-canner.recipeBuilder()
-	.inputs(<simplyjetpacks:metaitemmods:20>)
-	.fluidInputs(<liquid:cryotheum> * 6000)
-	.outputs(<simplyjetpacks:metaitemmods:21>)
-	.duration(100)
-	.EUt(7)
-	.buildAndRegister();
diff --git a/overrides/scripts/Midgame.zs b/overrides/scripts/Midgame.zs
index 0806c8f..632b71c 100644
--- a/overrides/scripts/Midgame.zs
+++ b/overrides/scripts/Midgame.zs
@@ -53,13 +53,6 @@ large_chemical_reactor.recipeBuilder().inputs(<metaitem:dustSodiumHydroxide>).fl
 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();
 
-recipes.removeByRecipeName("actuallyadditions:recipes132");
-recipes.addShaped(<actuallyadditions:block_canola_press>, [
-	[<metaitem:plateSteel>, <actuallyadditions:block_crystal:5>, <metaitem:plateSteel>], 
-	[<metaitem:electric.piston.mv>, null, <metaitem:electric.piston.mv>], 
-	[<metaitem:plateSteel>, <actuallyadditions:item_misc:8>, <metaitem:plateSteel>]]);
-<actuallyadditions:block_canola_press>.addTooltip(format.green("Turns Canola into Canola Oil. Requires RF."));  
-
 //Moon Materials
 macerator.recipeBuilder().inputs([<advancedrocketry:moonturf>]).outputs([<contenttweaker:moondust>]).duration(200).EUt(400).buildAndRegister();
 macerator.recipeBuilder().inputs([<advancedrocketry:moonturf_dark>]).outputs([<contenttweaker:moondust>]).duration(200).EUt(400).buildAndRegister();
@@ -72,6 +65,25 @@ 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();
 
+// Fluxed electrum blend
+recipes.remove(<redstonearsenal:material>);
+
+// Replaces default flux crystal recipe with one for autoclave
+recipes.remove(<redstonearsenal:material:160>);
+autoclave.recipeBuilder()
+    .inputs([<minecraft:diamond>])
+    .fluidInputs([<liquid:redstone> * 720])
+    .outputs([<redstonearsenal:material:160>])
+    .duration(200).EUt(400).buildAndRegister();
+
+// Flux Armour Plating    
+recipes.remove(<redstonearsenal:material:224>);
+recipes.addShaped(<redstonearsenal:material:224> * 4, [
+	[null, <ore:plateElectrumFlux>, null],
+	[<ore:plateElectrumFlux>, <ore:gemCrystalFlux>, <ore:plateElectrumFlux>],
+	[null, <ore:plateElectrumFlux>, null]]);
+
+
 //Manyullyn
 mixer.recipeBuilder()
     .outputs(<metaitem:dustManyullyn> * 4)
diff --git a/overrides/scripts/aa xu2.zs b/overrides/scripts/aa xu2.zs
index 2898e26..0cb8de6 100644
--- a/overrides/scripts/aa xu2.zs	
+++ b/overrides/scripts/aa xu2.zs	
@@ -291,11 +291,6 @@ recipes.addShaped(<actuallyadditions:item_drill:3>, [
 	[<actuallyadditions:block_crystal:3>, <actuallyadditions:block_crystal:2>, <metaitem:toolHeadDrillDiamond>], 
 	[<metaitem:gearEnergeticAlloy>, <actuallyadditions:item_misc:16>, <actuallyadditions:block_crystal:2>], 
 	[<metaitem:blockEnergeticAlloy>, <metaitem:gearEnergeticAlloy>, <actuallyadditions:block_crystal:3>]]);	
-	
-//Drill Core
-recipes.remove(<actuallyadditions:item_misc:16>);
-<actuallyadditions:item_misc:16>.addTooltip(format.red("Acquired by exploration of Lost Cities buildings or vanilla dungeons."));
-<actuallyadditions:item_misc:16>.addTooltip(format.red("Also can be purchased for Nomicoins."));
 
 //Vertical Digger	
 recipes.remove(<actuallyadditions:block_miner>);
@@ -410,12 +405,30 @@ mods.extendedcrafting.TableCrafting.addShaped(<extrautils2:drum:3>,[
 	[<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>]]);		
+recipes.remove(<extrautils2:machine>.withTag({Type: "extrautils2:enchanter"}));
+recipes.addShaped(<extrautils2:machine>.withTag({Type: "extrautils2:enchanter"}), [
+	[null, <minecraft:writable_book>, null],
+	[<ore:gemDiamond>, <extrautils2:machine>, <ore:gemDiamond>],
+	[<metaitem:plateSteel>,<metaitem:plateSteel>,<metaitem:plateSteel>]]);
 	
 //Solar
 recipes.remove(<actuallyadditions:block_furnace_solar>);
 recipes.addShaped(<actuallyadditions:block_furnace_solar>, [
 	[<extrautils2:ingredients>, <solarflux:solar_panel_1>, <extrautils2:ingredients>],
 	[null,<extrautils2:decorativesolid:3>,null]]);
+
+//Drill Core
+recipes.remove(<actuallyadditions:item_misc:16>);
+<actuallyadditions:item_misc:16>.addTooltip(format.red("Acquired by exploration of Lost Cities buildings or vanilla dungeons."));
+<actuallyadditions:item_misc:16>.addTooltip(format.red("Also can be purchased for Nomicoins."));
+
+recipes.removeByRecipeName("actuallyadditions:recipes132");
+recipes.addShaped(<actuallyadditions:block_canola_press>, [
+	[<metaitem:plateSteel>, <actuallyadditions:block_crystal:5>, <metaitem:plateSteel>], 
+	[<metaitem:electric.piston.mv>, null, <metaitem:electric.piston.mv>], 
+	[<metaitem:plateSteel>, <actuallyadditions:item_misc:8>, <metaitem:plateSteel>]]);
+<actuallyadditions:block_canola_press>.addTooltip(format.green("Turns Canola into Canola Oil. Requires RF."));  
+
 	
 <actuallyadditions:item_misc:13>.addTooltip(format.green("Canola can be turned into Canola Oil via a Canola Press. This is a somewhat slow machine and requres RF to function."));