From 7778dec56fcf279a049e3f3aa341657656a96ace Mon Sep 17 00:00:00 2001
From: Timo Ley <timo@leyt.xyz>
Date: Wed, 17 Feb 2021 11:33:27 +0100
Subject: [PATCH] - Added Modular Router - Added Ender-Rift - Added Nether
 Reactor - Fixed ALM steel recipes - Added utility recipes - Added pulverizer
 recipe for certus quartz

---
 src/kubejs/server/src/Main.hx                 | 38 ++++++++++++++-
 src/modpack.json                              | 47 ++++++++++++++++++-
 .../press/press_steel_ingot_to_plate.json     | 11 +++++
 .../pulverizer_certus_quartz_to_dust.json     | 13 +++++
 4 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 src/overrides/kubejs/data/thermal/recipes/machine/press/press_steel_ingot_to_plate.json
 create mode 100644 src/overrides/kubejs/data/thermal/recipes/machine/pulverizer/pulverizer_certus_quartz_to_dust.json

diff --git a/src/kubejs/server/src/Main.hx b/src/kubejs/server/src/Main.hx
index 83cbd45..d348229 100644
--- a/src/kubejs/server/src/Main.hx
+++ b/src/kubejs/server/src/Main.hx
@@ -35,7 +35,13 @@ class Main {
             "ring_of_teleport:ring_of_teleport",
             "ring_of_enderchest:ring_of_enderchest",
             "ring_of_repair:ring_of_repair",
-            "ring_of_blink:ring_of_blink"
+            "ring_of_blink:ring_of_blink",
+            "crossroads:gear_facade_glass",
+            "assemblylinemachines:simple_grinder",
+            "assemblylinemachines:steel_blade_piece",
+            "assemblylinemachines:steel_fluid_tank",
+            "enderrift:rift",
+            "enderrift:rift_orb"
         ];
         // @formatter:on
         for (i in removeByOutput) {
@@ -138,6 +144,36 @@ class Main {
             W: "#minecraft:logs"
         });
 
+        event.shaped("minecraft:hopper", ["IWI", "IWI", " I "], {I: "#forge:ingots/iron", W: "#minecraft:logs"});
+
+        event.shaped("minecraft:repeater", ["R R", "SRS", "sss"], {R: "#forge:dusts/redstone", S: "#forge:rods/wooden", s: "minecraft:stone"});
+
+        event.shaped("enderrift:rift", ["LEL", "ECE", "LEL"], {
+            L: "#forge:ingots/lawrencium",
+            E: "minecraft:ender_eye",
+            C: "mekanism:teleportation_core"
+        });
+
+        //Steel Fix
+        event.shaped("assemblylinemachines:simple_grinder", ["sss", "rdr","iii"],{
+      		"s": "#forge:ingots/steel",
+      		"i": "#forge:ingots/iron",
+      		"r": "#forge:dusts/redstone",
+      		"d": "assemblylinemachines:hand_grinder"
+      	});
+
+        event.shaped("assemblylinemachines:steel_blade_piece", [" y ", "yxy"], {
+      		"x": "#forge:ingots/steel",
+      		"y": "#forge:nuggets/steel"
+      	});
+
+        event.shaped("assemblylinemachines:steel_fluid_tank", ["rsr", "gwg", "rsr"], {
+      		"r": "assemblylinemachines:steel_rod",
+      		"g": "#forge:glass_panes",
+      		"s": "#forge:ingots/steel",
+      		"w": "assemblylinemachines:wooden_fluid_tank"
+      	});
+
         // SHAPELESS RECIPES
         event.shapeless("ring_of_blink:ring_of_blink", ["ring_of_teleport:ring_of_teleport", "botania:terrasteel_ingot"]);
     }
diff --git a/src/modpack.json b/src/modpack.json
index 6d30bda..2082f4f 100644
--- a/src/modpack.json
+++ b/src/modpack.json
@@ -3,7 +3,7 @@
   "type": "modpack",
   "versions": [
     {
-      "version": "3.2.1",
+      "version": "3.2.2",
       "versionid": -1,
       "mcversion": [
         "1.16.4"
@@ -21,6 +21,51 @@
         }
       ],
       "relations": [
+        {
+          "id": "380060",
+          "file": {
+            "installer": "internal.dir:mods",
+            "artifact": "curse.maven:380060:3165730",
+            "repository": "curse"
+          },
+          "type": "mod",
+          "options": [
+            "required",
+            "client",
+            "server",
+            "included"
+          ]
+        },
+        {
+          "id": "233780",
+          "file": {
+            "installer": "internal.dir:mods",
+            "artifact": "curse.maven:233780:3045816",
+            "repository": "curse"
+          },
+          "type": "mod",
+          "options": [
+            "required",
+            "client",
+            "server",
+            "included"
+          ]
+        },
+        {
+          "id": "250294",
+          "file": {
+            "installer": "internal.dir:mods",
+            "artifact": "curse.maven:250294:3176107",
+            "repository": "curse"
+          },
+          "type": "mod",
+          "options": [
+            "required",
+            "client",
+            "server",
+            "included"
+          ]
+        },
         {
           "id": "227782",
           "file": {
diff --git a/src/overrides/kubejs/data/thermal/recipes/machine/press/press_steel_ingot_to_plate.json b/src/overrides/kubejs/data/thermal/recipes/machine/press/press_steel_ingot_to_plate.json
new file mode 100644
index 0000000..2b7cd7a
--- /dev/null
+++ b/src/overrides/kubejs/data/thermal/recipes/machine/press/press_steel_ingot_to_plate.json
@@ -0,0 +1,11 @@
+{
+  "type": "thermal:press",
+  "ingredient": {
+    "tag": "forge:ingots/steel"
+  },
+  "result": [
+    {
+      "item": "immersiveengineering:plate_steel"
+    }
+  ]
+}
diff --git a/src/overrides/kubejs/data/thermal/recipes/machine/pulverizer/pulverizer_certus_quartz_to_dust.json b/src/overrides/kubejs/data/thermal/recipes/machine/pulverizer/pulverizer_certus_quartz_to_dust.json
new file mode 100644
index 0000000..820e6dd
--- /dev/null
+++ b/src/overrides/kubejs/data/thermal/recipes/machine/pulverizer/pulverizer_certus_quartz_to_dust.json
@@ -0,0 +1,13 @@
+{
+  "type": "thermal:pulverizer",
+  "ingredient": {
+    "tag": "forge:gems/certus_quartz"
+  },
+  "result": [
+    {
+      "item": "appliedenergistics2:certus_quartz_dust",
+      "count": 1
+    }
+  ],
+  "energy_mod": 0.5
+}