From a1c5395d75ec41d37822ceb12f2f53b0fa73d5f7 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Tue, 19 Oct 2021 12:07:21 -0400
Subject: [PATCH 001/130] portality stuff

---
 .../recipetypes/create/mechanical_crafting.js | 14 ++++++++++++
 .../expert/recipetypes/portality/shaped.js    | 22 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/portality/shaped.js

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
index 6d41f80e1b..54f92011b9 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
@@ -255,6 +255,20 @@ onEvent('recipes', (event) => {
                 I: 'pneumaticcraft:remote'
             },
             id: 'integrateddynamics:crafting/logic_programmer'
+        },
+        {
+            output: Item.of('2x portality:controller'),
+            pattern: ['ABBBA', 'CDEDC', 'CFGFC', 'CDEDC', 'ABBBA'],
+            key: {
+                A: 'portality:frame',
+                B: 'immersiveengineering:coil_lv',
+                C: 'immersiveengineering:electron_tube',
+                D: 'immersiveengineering:wirecoil_redstone',
+                E: ['immersiveengineering:logic_circuit', 'pneumaticcraft:printed_circuit_board'],
+                F: 'immersiveengineering:current_transformer',
+                G: 'xnet:controller'
+            },
+            id: 'portality:controller'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/portality/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/portality/shaped.js
new file mode 100644
index 0000000000..5b516a6ab7
--- /dev/null
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/portality/shaped.js
@@ -0,0 +1,22 @@
+onEvent('recipes', (event) => {
+    if (global.isExpertMode == false) {
+        return;
+    }
+
+    const recipes = [
+        {
+            output: Item.of('4x portality:frame'),
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: '#enigmatica:stonecuttables/arcane_stone',
+                B: 'immersiveengineering:coil_lv',
+                C: 'immersiveengineering:electron_tube'
+            },
+            id: 'portality:frame'
+        }
+    ];
+
+    recipes.forEach((recipe) => {
+        event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id);
+    });
+});

From d9262ac063eb68ac01d4b2230ea8cb7d29fc98ce Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Tue, 19 Oct 2021 12:45:15 -0400
Subject: [PATCH 002/130] portality modules

---
 .../expert/recipetypes/portality/shaped.js    | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/portality/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/portality/shaped.js
index 5b516a6ab7..4733cbf5a1 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/portality/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/portality/shaped.js
@@ -13,6 +13,50 @@ onEvent('recipes', (event) => {
                 C: 'immersiveengineering:electron_tube'
             },
             id: 'portality:frame'
+        },
+        {
+            output: Item.of('portality:module_energy'),
+            pattern: ['ABA', 'CDC', 'ABA'],
+            key: {
+                A: 'portality:frame',
+                B: 'thermal:energy_cell',
+                C: 'pneumaticcraft:logistics_core',
+                D: 'xnet:wireless_router'
+            },
+            id: 'portality:energy_input'
+        },
+        {
+            output: Item.of('portality:module_items'),
+            pattern: ['ABA', 'CDC', 'ABA'],
+            key: {
+                A: 'portality:frame',
+                B: 'immersiveengineering:sorter',
+                C: 'pneumaticcraft:logistics_core',
+                D: 'xnet:wireless_router'
+            },
+            id: 'portality:items_input'
+        },
+        {
+            output: Item.of('portality:module_fluids'),
+            pattern: ['ABA', 'CDC', 'ABA'],
+            key: {
+                A: 'portality:frame',
+                B: 'immersiveengineering:fluid_sorter',
+                C: 'pneumaticcraft:logistics_core',
+                D: 'xnet:wireless_router'
+            },
+            id: 'portality:fluids_input'
+        },
+        {
+            output: Item.of('portality:module_interdimensional'),
+            pattern: ['ABA', 'CDC', 'ABA'],
+            key: {
+                A: 'portality:frame',
+                B: 'occultism:stable_wormhole',
+                C: 'pneumaticcraft:logistics_core',
+                D: 'xnet:wireless_router'
+            },
+            id: 'portality:interdimensional'
         }
     ];
 

From 9dda0e49febcef43211ce9491c96e40d7ef762c7 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Tue, 19 Oct 2021 14:18:29 -0400
Subject: [PATCH 003/130] blazing blades

---
 config/ftbquests/quests/chapters/tech_t3.snbt | 20 +++++++++
 .../expert/recipetypes/minecraft/smithing.js  | 11 +++--
 .../expert/recipetypes/wstweaks/shaped.js     | 44 +++++++++++++++++++
 3 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/wstweaks/shaped.js

diff --git a/config/ftbquests/quests/chapters/tech_t3.snbt b/config/ftbquests/quests/chapters/tech_t3.snbt
index 988ea06586..cea3ef15b3 100644
--- a/config/ftbquests/quests/chapters/tech_t3.snbt
+++ b/config/ftbquests/quests/chapters/tech_t3.snbt
@@ -117,5 +117,25 @@
 				item: "industrialforegoing:pink_slime_bucket"
 			}]
 		}
+		{
+			x: 5.0d
+			y: 3.0d
+			id: "3B9B0EB73BF19CBD"
+			tasks: [{
+				id: "65AF9984F551512B"
+				type: "item"
+				item: "mekanism:metallurgic_infuser"
+			}]
+		}
+		{
+			x: 5.0d
+			y: 2.0d
+			id: "20C024EA7A79FBB4"
+			tasks: [{
+				id: "42D68FA716910115"
+				type: "item"
+				item: "rftoolspower:blazing_rod"
+			}]
+		}
 	]
 }
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/minecraft/smithing.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/minecraft/smithing.js
index 311f81c87b..2c863cb214 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/minecraft/smithing.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/minecraft/smithing.js
@@ -8,12 +8,15 @@ onEvent('recipes', (event) => {
             input2: '#forge:ingots/arcane_gold',
             output: 'eidolon:basic_amulet',
             id: 'eidolon:basic_amulet'
+        },
+        {
+            input1: '#forge:ingots/aeternium',
+            input2: 'betterendforge:leather_wrapped_stick',
+            output: 'betterendforge:aeternium_sword_handle',
+            id: 'betterendforge:aeternium_sword_handle_smithing'
         }
     ];
     recipes.forEach((recipe) => {
-        const re = event.smithing(recipe.output, recipe.input1, recipe.input2);
-        if (recipe.id) {
-            re.id(recipe.id);
-        }
+        event.smithing(recipe.output, recipe.input1, recipe.input2).id(recipe.id);
     });
 });
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/wstweaks/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/wstweaks/shaped.js
new file mode 100644
index 0000000000..dc57cfae48
--- /dev/null
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/wstweaks/shaped.js
@@ -0,0 +1,44 @@
+onEvent('recipes', (event) => {
+    if (global.isExpertMode == false) {
+        return;
+    }
+
+    /*
+        ,
+        {
+            output: '',
+            pattern: ['', '', ''],
+            key: {
+                A: ''
+            },
+            id: ''
+        }
+    */
+
+    const recipes = [
+        {
+            output: 'wstweaks:lava_blade',
+            pattern: [' AB', 'ACA', 'DA '],
+            key: {
+                A: 'rftoolspower:blazing_rod',
+                B: 'betterendforge:aeternium_sword_blade',
+                C: '#forge:gems/nitro',
+                D: 'betterendforge:aeternium_sword_handle'
+            },
+            id: 'wstweaks:lava_blade'
+        },
+        {
+            output: 'wstweaks:blaze_blade',
+            pattern: [' A ', 'ABA', ' A '],
+            key: {
+                A: 'tconstruct:blazing_bone',
+                B: 'wstweaks:lava_blade'
+            },
+            id: 'wstweaks:blaze_blade'
+        }
+    ];
+
+    recipes.forEach((recipe) => {
+        event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id);
+    });
+});

From 02a85c8e1846168827ad3a73737e8f14dfd0dfda Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Wed, 20 Oct 2021 00:23:12 -0400
Subject: [PATCH 004/130] rftools to Mek progression

---
 config/ftbquests/quests/chapters/tech_t3.snbt | 15 +++++-
 .../item_modifiers/jei_descriptions.js        |  4 ++
 .../expert/recipetypes/mekanism/shaped.js     | 14 ++++-
 .../pneumaticcraft/thermo_plant.js            | 13 +++--
 .../expert/recipetypes/powah/energizing.js    | 11 ++++
 .../expert/recipetypes/rftools/shaped.js      | 54 ++++++++++++++++---
 6 files changed, 98 insertions(+), 13 deletions(-)

diff --git a/config/ftbquests/quests/chapters/tech_t3.snbt b/config/ftbquests/quests/chapters/tech_t3.snbt
index cea3ef15b3..3b527ba926 100644
--- a/config/ftbquests/quests/chapters/tech_t3.snbt
+++ b/config/ftbquests/quests/chapters/tech_t3.snbt
@@ -120,6 +120,7 @@
 		{
 			x: 5.0d
 			y: 3.0d
+			dependencies: ["72945D9390F479E7"]
 			id: "3B9B0EB73BF19CBD"
 			tasks: [{
 				id: "65AF9984F551512B"
@@ -129,7 +130,8 @@
 		}
 		{
 			x: 5.0d
-			y: 2.0d
+			y: 1.0d
+			dependencies: ["1E4DC3A7546EC894"]
 			id: "20C024EA7A79FBB4"
 			tasks: [{
 				id: "42D68FA716910115"
@@ -137,5 +139,16 @@
 				item: "rftoolspower:blazing_rod"
 			}]
 		}
+		{
+			x: 5.0d
+			y: 2.0d
+			dependencies: ["20C024EA7A79FBB4"]
+			id: "72945D9390F479E7"
+			tasks: [{
+				id: "3C415238A247D89A"
+				type: "item"
+				item: "rftoolspower:blazing_agitator"
+			}]
+		}
 	]
 }
diff --git a/kubejs/client_scripts/item_modifiers/jei_descriptions.js b/kubejs/client_scripts/item_modifiers/jei_descriptions.js
index 089e346c47..bdefb7dff5 100644
--- a/kubejs/client_scripts/item_modifiers/jei_descriptions.js
+++ b/kubejs/client_scripts/item_modifiers/jei_descriptions.js
@@ -355,6 +355,10 @@ onEvent('jei.information', (event) => {
             text: [
                 `Tiered Beehives have been depreciated. Use the Hive Upgrade items on nests found in the world instead. Tiered Beehives can be converted to Hive Upgrades in a crafting grid.`
             ]
+        },
+        {
+            items: ['upgrade_aquatic:flare_spawn_egg'],
+            text: [`Splash a Phantom with a Potion of Insomnia to convert it to a Flare.`]
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index 290f4ee03e..7e791eefb6 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -35,10 +35,22 @@ onEvent('recipes', (event) => {
                 A: '#forge:circuits/advanced',
                 B: 'engineersdecor:clinker_brick_block',
                 C: 'immersiveengineering:coil_hv',
-                D: 'mekanism:steel_casing',
+                D: '#industrialforegoing:machine_frame/simple',
                 E: 'pneumaticcraft:heat_sink'
             },
             id: 'mekanism:resistive_heater'
+        },
+        {
+            output: 'mekanism:metallurgic_infuser',
+            pattern: ['ABA', 'CDC', 'AEA'],
+            key: {
+                A: '#forge:gears/osmium',
+                B: 'rftoolspower:blazing_agitator',
+                C: '#forge:circuits/basic',
+                D: 'thermal:machine_bottler',
+                E: 'rftoolspower:cell1'
+            },
+            id: 'mekanism:metallurgic_infuser'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/thermo_plant.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/thermo_plant.js
index 1ca9f1fab4..cd4a30aed4 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/thermo_plant.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/thermo_plant.js
@@ -79,7 +79,6 @@ onEvent('recipes', (event) => {
             id: 'pneumaticcraft:thermo_plant/upgrade_matrix'
         },
         {
-            type: 'pneumaticcraft:thermo_plant',
             item_input: { item: 'atum:crystal_glass' },
             item_output: { item: 'integratedterminals:menril_glass' },
             fluid_input: { type: 'pneumaticcraft:fluid', fluid: 'integrateddynamics:menril_resin', amount: 1000 },
@@ -90,7 +89,6 @@ onEvent('recipes', (event) => {
             id: `${id_prefix}menril_glass`
         },
         {
-            type: 'pneumaticcraft:thermo_plant',
             item_input: { item: 'atum:crystal_glass' },
             item_output: { item: 'integratedterminals:chorus_glass' },
             fluid_input: { type: 'pneumaticcraft:fluid', fluid: 'integrateddynamics:liquid_chorus', amount: 1000 },
@@ -101,7 +99,6 @@ onEvent('recipes', (event) => {
             id: `${id_prefix}chorus_glass`
         },
         {
-            type: 'pneumaticcraft:thermo_plant',
             item_input: { item: 'minecraft:popped_chorus_fruit' },
             fluid_output: { fluid: 'integrateddynamics:liquid_chorus', amount: 125 },
             pressure: 3.0,
@@ -109,12 +106,20 @@ onEvent('recipes', (event) => {
             id: `${id_prefix}liquid_chorus_from_chorus_fruit`
         },
         {
-            type: 'pneumaticcraft:thermo_plant',
             item_input: { item: 'integrateddynamics:proto_chorus' },
             fluid_output: { fluid: 'integrateddynamics:liquid_chorus', amount: 125 },
             pressure: 3.0,
             exothermic: false,
             id: `${id_prefix}liquid_chorus_from_proto_chorus`
+        },
+        {
+            item_input: { item: 'rftoolsbase:machine_base' },
+            item_output: { item: 'rftoolspower:power_core1' },
+            fluid_input: { type: 'pneumaticcraft:fluid', fluid: 'thermal:redstone', amount: 9000 },
+            pressure: 2.0,
+            exothermic: false,
+            temperature: { min_temp: 1973 },
+            id: 'rftoolspower:power_core1'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
index fdc93a8344..eff621a241 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
@@ -170,6 +170,17 @@ onEvent('recipes', (event) => {
                 count: 2
             },
             id: `${id_prefix}uraninite`
+        },
+        {
+            ingredients: [{ item: 'minecraft:blaze_rod' }],
+            energy: '10000000',
+            result: {
+                type: 'forge:nbt',
+                item: 'rftoolspower:blazing_rod',
+                count: 1,
+                nbt: '{duration:5000.0f,time:0.0f,quality:200000.0f}'
+            },
+            id: `${id_prefix}blazing_rod`
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
index 00dda2d380..fc4638bf9a 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
@@ -15,7 +15,7 @@ onEvent('recipes', (event) => {
         }
     */
 
-    const newRecipes = [
+    const recipes = [
         {
             output: 'rftoolsutility:screen_controller',
             pattern: ['ABA', 'DCD', 'ADA'],
@@ -123,14 +123,54 @@ onEvent('recipes', (event) => {
                 B: 'pneumaticcraft:reinforced_stone_slab'
             },
             id: 'rftoolsbase:machine_base'
+        },
+        {
+            output: 'rftoolsutility:flight_module',
+            pattern: ['ABA', 'CDC', 'EFG'],
+            key: {
+                A: 'alexsmobs:mysterious_worm',
+                B: Item.of(
+                    'rftoolsutility:syringe',
+                    '{mobName:"alexsmobs:warped_mosco",mobId:"alexsmobs:warped_mosco",level:10}'
+                ),
+                C: 'meetyourfight:aether_glazed_cupcake',
+                D: 'rftoolsutility:moduleplus_template',
+                E: Item.of(
+                    'rftoolsutility:syringe',
+                    '{mobName:"upgrade_aquatic:flare",mobId:"upgrade_aquatic:flare",level:10}'
+                ),
+                F: 'alexsmobs:tarantula_hawk_elytra',
+                G: Item.of(
+                    'rftoolsutility:syringe',
+                    '{mobName:"alexsmobs:void_worm",mobId:"alexsmobs:void_worm",level:10}'
+                )
+            },
+            id: 'rftoolsutility:flight_module'
+        },
+        {
+            output: 'rftoolspower:blazing_agitator',
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: 'rftoolspower:blazing_rod',
+                B: 'powah:energizing_rod_blazing',
+                C: 'rftoolsbase:machine_base'
+            },
+            id: 'rftoolspower:blazing_agitator'
+        },
+        {
+            output: 'rftoolspower:cell1',
+            pattern: ['ABA', 'CDC', 'ACA'],
+            key: {
+                A: 'rftoolspower:power_core1',
+                B: 'immersiveengineering:transformer_hv',
+                C: 'mekanism:basic_universal_cable',
+                D: 'rftoolsbase:machine_frame'
+            },
+            id: 'rftoolspower:cell1'
         }
     ];
 
-    newRecipes.forEach((recipe) => {
-        if (recipe.id) {
-            event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id);
-        } else {
-            event.shaped(recipe.output, recipe.pattern, recipe.key);
-        }
+    recipes.forEach((recipe) => {
+        event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id);
     });
 });

From 9cf165f83c51ac73a5284ee6daa0eecadd02a112 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Wed, 20 Oct 2021 10:25:07 -0400
Subject: [PATCH 005/130] enviro controller

---
 config/Mekanism/tools-1.toml.bak              | 627 ++++++++++++++++++
 kubejs/assets/kubejs/lang/en_us.json          |  16 +-
 ...hanger.png => spirit_entropic_gateway.png} | Bin
 ...eta => spirit_entropic_gateway.png.mcmeta} |   0
 .../recipetypes/create/mechanical_crafting.js |  17 +-
 .../expert/recipetypes/occultism/ritual.js    |   6 +-
 .../occultism/occultism_spirit_tooltip.js     |   2 +-
 kubejs/startup_scripts/item_registry.js       |   4 +-
 8 files changed, 657 insertions(+), 15 deletions(-)
 create mode 100644 config/Mekanism/tools-1.toml.bak
 rename kubejs/assets/kubejs/textures/item/{spirit_heat_exchanger.png => spirit_entropic_gateway.png} (100%)
 rename kubejs/assets/kubejs/textures/item/{spirit_heat_exchanger.png.mcmeta => spirit_entropic_gateway.png.mcmeta} (100%)

diff --git a/config/Mekanism/tools-1.toml.bak b/config/Mekanism/tools-1.toml.bak
new file mode 100644
index 0000000000..b52731ce35
--- /dev/null
+++ b/config/Mekanism/tools-1.toml.bak
@@ -0,0 +1,627 @@
+
+#Mekanism Tools Config. This config is synced from server to client.
+[tools]
+
+	# Material Settings for steel
+	[tools.steel]
+		#Protection value of steel boots.
+		#Range: > 0
+		steelBootArmor = 3
+		#Attack speed of steel axes.
+		steelAxeAtkSpeed = -3.0
+		#Base armor toughness value of steel armor.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		steelToughness = 1.0
+		#Protection value of steel chestplates.
+		#Range: > 0
+		steelChestplateArmor = 7
+		#Base attack damage of steel items.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		steelAttackDamage = 3.0
+		#Attack speed of steel swords.
+		steelSwordAtkSpeed = -2.4000000953674316
+		#Maximum durability of steel paxels.
+		#Range: > 1
+		steelPaxelMaxUses = 1750
+		#Maximum durability of steel leggings.
+		#Range: > 1
+		steelLeggingDurability = 600
+		#Harvest level of steel paxels.
+		#Range: > 0
+		steelPaxelHarvestLevel = 3
+		#Attack damage modifier of steel paxels.
+		steelPaxelDamage = 4.0
+		#Attack damage modifier of steel pickaxes.
+		steelPickaxeDamage = 1.0
+		#Attack damage modifier of steel swords.
+		steelSwordDamage = 3.0
+		#Attack damage modifier of steel hoes.
+		steelHoeDamage = -4.0
+		#Attack speed of steel pickaxes.
+		steelPickaxeAtkSpeed = -2.799999952316284
+		#Maximum durability of steel tools.
+		#Range: > 1
+		steelToolMaxUses = 1561
+		#Protection value of steel leggings.
+		#Range: > 0
+		steelLeggingArmor = 6
+		#Natural enchantability factor of steel paxels.
+		#Range: > 0
+		steelPaxelEnchantability = 12
+		#Efficiency of steel tools.
+		steelEfficiency = 8.0
+		#Base armor knockback resistance value of steel armor.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		steelKnockbackResistance = 0.0
+		#Maximum durability of steel helmets.
+		#Range: > 1
+		steelHelmetDurability = 440
+		#Maximum durability of steel shields.
+		#Range: > 0
+		steelShieldDurability = 1792
+		#Maximum durability of steel boots.
+		#Range: > 1
+		steelBootDurability = 520
+		#Attack speed of steel paxels.
+		steelPaxelAtkSpeed = -2.4000000953674316
+		#Attack damage modifier of steel axes.
+		steelAxeDamage = 1.5
+		#Attack damage modifier of steel shovels.
+		steelShovelDamage = 1.0
+		#Attack speed of steel shovels.
+		steelShovelAtkSpeed = -3.0
+		#Maximum durability of steel chestplates.
+		#Range: > 1
+		steelChestplateDurability = 640
+		#Efficiency of steel paxels.
+		steelPaxelEfficiency = 10.0
+		#Protection value of steel helmets.
+		#Range: > 0
+		steelHelmetArmor = 3
+		#Harvest level of steel tools.
+		#Range: > 0
+		steelHarvestLevel = 3
+		#Natural enchantability factor of steel items.
+		#Range: > 0
+		steelEnchantability = 10
+		#Attack speed of steel hoes.
+		steelHoeAtkSpeed = 1.0
+
+	# Material Settings for refined_glowstone
+	[tools.refined_glowstone]
+		#Attack speed of refined_glowstone paxels.
+		refined_glowstonePaxelAtkSpeed = -2.4000000953674316
+		#Protection value of refined_glowstone leggings.
+		#Range: > 0
+		refined_glowstoneLeggingArmor = 6
+		#Maximum durability of refined_glowstone shields.
+		#Range: > 0
+		refined_glowstoneShieldDurability = 806
+		#Attack speed of refined_glowstone axes.
+		refined_glowstoneAxeAtkSpeed = -3.0999999046325684
+		#Attack speed of refined_glowstone hoes.
+		refined_glowstoneHoeAtkSpeed = 2.0
+		#Base armor toughness value of refined_glowstone armor.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		refined_glowstoneToughness = 0.0
+		#Maximum durability of refined_glowstone helmets.
+		#Range: > 1
+		refined_glowstoneHelmetDurability = 198
+		#Attack damage modifier of refined_glowstone pickaxes.
+		refined_glowstonePickaxeDamage = 1.0
+		#Maximum durability of refined_glowstone paxels.
+		#Range: > 1
+		refined_glowstonePaxelMaxUses = 400
+		#Attack speed of refined_glowstone swords.
+		refined_glowstoneSwordAtkSpeed = -2.4000000953674316
+		#Natural enchantability factor of refined_glowstone items.
+		#Range: > 0
+		refined_glowstoneEnchantability = 18
+		#Protection value of refined_glowstone chestplates.
+		#Range: > 0
+		refined_glowstoneChestplateArmor = 7
+		#Harvest level of refined_glowstone tools.
+		#Range: > 0
+		refined_glowstoneHarvestLevel = 2
+		#Attack speed of refined_glowstone shovels.
+		refined_glowstoneShovelAtkSpeed = -3.0
+		#Protection value of refined_glowstone helmets.
+		#Range: > 0
+		refined_glowstoneHelmetArmor = 3
+		#Maximum durability of refined_glowstone tools.
+		#Range: > 1
+		refined_glowstoneToolMaxUses = 250
+		#Attack damage modifier of refined_glowstone hoes.
+		refined_glowstoneHoeDamage = -5.0
+		#Efficiency of refined_glowstone paxels.
+		refined_glowstonePaxelEfficiency = 11.0
+		#Efficiency of refined_glowstone tools.
+		refined_glowstoneEfficiency = 11.0
+		#Harvest level of refined_glowstone paxels.
+		#Range: > 0
+		refined_glowstonePaxelHarvestLevel = 3
+		#Attack damage modifier of refined_glowstone axes.
+		refined_glowstoneAxeDamage = 1.5
+		#Maximum durability of refined_glowstone boots.
+		#Range: > 1
+		refined_glowstoneBootDurability = 234
+		#Maximum durability of refined_glowstone chestplates.
+		#Range: > 1
+		refined_glowstoneChestplateDurability = 288
+		#Attack damage modifier of refined_glowstone shovels.
+		refined_glowstoneShovelDamage = 1.0
+		#Attack speed of refined_glowstone pickaxes.
+		refined_glowstonePickaxeAtkSpeed = -2.799999952316284
+		#Attack damage modifier of refined_glowstone swords.
+		refined_glowstoneSwordDamage = 3.0
+		#Base armor knockback resistance value of refined_glowstone armor.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		refined_glowstoneKnockbackResistance = 0.0
+		#Natural enchantability factor of refined_glowstone paxels.
+		#Range: > 0
+		refined_glowstonePaxelEnchantability = 18
+		#Attack damage modifier of refined_glowstone paxels.
+		refined_glowstonePaxelDamage = 3.0
+		#Maximum durability of refined_glowstone leggings.
+		#Range: > 1
+		refined_glowstoneLeggingDurability = 270
+		#Base attack damage of refined_glowstone items.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		refined_glowstoneAttackDamage = 3.3
+		#Protection value of refined_glowstone boots.
+		#Range: > 0
+		refined_glowstoneBootArmor = 3
+
+	# Material Settings for lapis_lazuli
+	[tools.lapis_lazuli]
+		#Harvest level of lapis_lazuli paxels.
+		#Range: > 0
+		lapis_lazuliPaxelHarvestLevel = 2
+		#Attack speed of lapis_lazuli pickaxes.
+		lapis_lazuliPickaxeAtkSpeed = -2.799999952316284
+		#Maximum durability of lapis_lazuli shields.
+		#Range: > 0
+		lapis_lazuliShieldDurability = 582
+		#Protection value of lapis_lazuli helmets.
+		#Range: > 0
+		lapis_lazuliHelmetArmor = 2
+		#Attack damage modifier of lapis_lazuli paxels.
+		lapis_lazuliPaxelDamage = 6.0
+		#Efficiency of lapis_lazuli tools.
+		lapis_lazuliEfficiency = 5.0
+		#Base armor knockback resistance value of lapis_lazuli armor.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		lapis_lazuliKnockbackResistance = 0.0
+		#Attack speed of lapis_lazuli hoes.
+		lapis_lazuliHoeAtkSpeed = -1.0
+		#Protection value of lapis_lazuli boots.
+		#Range: > 0
+		lapis_lazuliBootArmor = 2
+		#Efficiency of lapis_lazuli paxels.
+		lapis_lazuliPaxelEfficiency = 6.0
+		#Natural enchantability factor of lapis_lazuli paxels.
+		#Range: > 0
+		lapis_lazuliPaxelEnchantability = 10
+		#Attack speed of lapis_lazuli paxels.
+		lapis_lazuliPaxelAtkSpeed = -2.4000000953674316
+		#Attack damage modifier of lapis_lazuli pickaxes.
+		lapis_lazuliPickaxeDamage = 1.0
+		#Maximum durability of lapis_lazuli tools.
+		#Range: > 1
+		lapis_lazuliToolMaxUses = 200
+		#Protection value of lapis_lazuli leggings.
+		#Range: > 0
+		lapis_lazuliLeggingArmor = 6
+		#Attack speed of lapis_lazuli swords.
+		lapis_lazuliSwordAtkSpeed = -2.4000000953674316
+		#Attack damage modifier of lapis_lazuli axes.
+		lapis_lazuliAxeDamage = 6.0
+		#Maximum durability of lapis_lazuli leggings.
+		#Range: > 1
+		lapis_lazuliLeggingDurability = 195
+		#Maximum durability of lapis_lazuli boots.
+		#Range: > 1
+		lapis_lazuliBootDurability = 169
+		#Attack damage modifier of lapis_lazuli shovels.
+		lapis_lazuliShovelDamage = 1.5
+		#Attack damage modifier of lapis_lazuli swords.
+		lapis_lazuliSwordDamage = 3.0
+		#Base armor toughness value of lapis_lazuli armor.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		lapis_lazuliToughness = 0.0
+		#Base attack damage of lapis_lazuli items.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		lapis_lazuliAttackDamage = 2.0
+		#Maximum durability of lapis_lazuli paxels.
+		#Range: > 1
+		lapis_lazuliPaxelMaxUses = 250
+		#Attack damage modifier of lapis_lazuli hoes.
+		lapis_lazuliHoeDamage = -2.0
+		#Harvest level of lapis_lazuli tools.
+		#Range: > 0
+		lapis_lazuliHarvestLevel = 2
+		#Maximum durability of lapis_lazuli helmets.
+		#Range: > 1
+		lapis_lazuliHelmetDurability = 143
+		#Natural enchantability factor of lapis_lazuli items.
+		#Range: > 0
+		lapis_lazuliEnchantability = 8
+		#Maximum durability of lapis_lazuli chestplates.
+		#Range: > 1
+		lapis_lazuliChestplateDurability = 208
+		#Attack speed of lapis_lazuli axes.
+		lapis_lazuliAxeAtkSpeed = -3.0999999046325684
+		#Protection value of lapis_lazuli chestplates.
+		#Range: > 0
+		lapis_lazuliChestplateArmor = 5
+		#Attack speed of lapis_lazuli shovels.
+		lapis_lazuliShovelAtkSpeed = -3.0
+
+	# Material Settings for osmium
+	[tools.osmium]
+		#Attack damage modifier of osmium swords.
+		osmiumSwordDamage = 3.0
+		#Protection value of osmium chestplates.
+		#Range: > 0
+		osmiumChestplateArmor = 5
+		#Efficiency of osmium paxels.
+		osmiumPaxelEfficiency = 9.0
+		#Efficiency of osmium tools.
+		osmiumEfficiency = 6.5
+		#Attack speed of osmium pickaxes.
+		osmiumPickaxeAtkSpeed = -2.799999952316284
+		#Maximum durability of osmium tools.
+		#Range: > 1
+		osmiumToolMaxUses = 500
+		#Maximum durability of osmium shields.
+		#Range: > 0
+		osmiumShieldDurability = 1344
+		#Harvest level of osmium tools.
+		#Range: > 0
+		osmiumHarvestLevel = 2
+		#Natural enchantability factor of osmium items.
+		#Range: > 0
+		osmiumEnchantability = 12
+		#Attack speed of osmium shovels.
+		osmiumShovelAtkSpeed = -3.0
+		#Attack damage modifier of osmium hoes.
+		osmiumHoeDamage = -4.0
+		#Base armor knockback resistance value of osmium armor.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		osmiumKnockbackResistance = 0.0
+		#Attack damage modifier of osmium paxels.
+		osmiumPaxelDamage = 4.0
+		#Attack speed of osmium hoes.
+		osmiumHoeAtkSpeed = 1.0
+		#Maximum durability of osmium boots.
+		#Range: > 1
+		osmiumBootDurability = 390
+		#Maximum durability of osmium helmets.
+		#Range: > 1
+		osmiumHelmetDurability = 330
+		#Attack damage modifier of osmium axes.
+		osmiumAxeDamage = 1.5
+		#Protection value of osmium helmets.
+		#Range: > 0
+		osmiumHelmetArmor = 3
+		#Attack damage modifier of osmium shovels.
+		osmiumShovelDamage = 1.0
+		#Base attack damage of osmium items.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		osmiumAttackDamage = 2.2
+		#Maximum durability of osmium paxels.
+		#Range: > 1
+		osmiumPaxelMaxUses = 500
+		#Base armor toughness value of osmium armor.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		osmiumToughness = 1.0
+		#Harvest level of osmium paxels.
+		#Range: > 0
+		osmiumPaxelHarvestLevel = 3
+		#Natural enchantability factor of osmium paxels.
+		#Range: > 0
+		osmiumPaxelEnchantability = 12
+		#Maximum durability of osmium chestplates.
+		#Range: > 1
+		osmiumChestplateDurability = 480
+		#Attack speed of osmium axes.
+		osmiumAxeAtkSpeed = -3.0
+		#Attack speed of osmium paxels.
+		osmiumPaxelAtkSpeed = -2.4000000953674316
+		#Attack damage modifier of osmium pickaxes.
+		osmiumPickaxeDamage = 1.0
+		#Protection value of osmium boots.
+		#Range: > 0
+		osmiumBootArmor = 3
+		#Protection value of osmium leggings.
+		#Range: > 0
+		osmiumLeggingArmor = 6
+		#Maximum durability of osmium leggings.
+		#Range: > 1
+		osmiumLeggingDurability = 450
+		#Attack speed of osmium swords.
+		osmiumSwordAtkSpeed = -2.4000000953674316
+
+	# Material Settings for refined_obsidian
+	[tools.refined_obsidian]
+		#Protection value of refined_obsidian chestplates.
+		#Range: > 0
+		refined_obsidianChestplateArmor = 9
+		#Attack damage modifier of refined_obsidian axes.
+		refined_obsidianAxeDamage = 5.0
+		#Attack speed of refined_obsidian pickaxes.
+		refined_obsidianPickaxeAtkSpeed = -2.799999952316284
+		#Harvest level of refined_obsidian paxels.
+		#Range: > 0
+		refined_obsidianPaxelHarvestLevel = 3
+		#Base armor toughness value of refined_obsidian armor.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		refined_obsidianToughness = 3.0
+		#Attack speed of refined_obsidian hoes.
+		refined_obsidianHoeAtkSpeed = 6.0
+		#Base attack damage of refined_obsidian items.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		refined_obsidianAttackDamage = 5.0
+		#Attack speed of refined_obsidian swords.
+		refined_obsidianSwordAtkSpeed = -2.4000000953674316
+		#Natural enchantability factor of refined_obsidian items.
+		#Range: > 0
+		refined_obsidianEnchantability = 12
+		#Maximum durability of refined_obsidian shields.
+		#Range: > 0
+		refined_obsidianShieldDurability = 2240
+		#Attack speed of refined_obsidian axes.
+		refined_obsidianAxeAtkSpeed = -2.0
+		#Attack damage modifier of refined_obsidian paxels.
+		refined_obsidianPaxelDamage = 3.0
+		#Natural enchantability factor of refined_obsidian paxels.
+		#Range: > 0
+		refined_obsidianPaxelEnchantability = 12
+		#Attack damage modifier of refined_obsidian swords.
+		refined_obsidianSwordDamage = 3.0
+		#Attack damage modifier of refined_obsidian shovels.
+		refined_obsidianShovelDamage = 1.0
+		#Attack damage modifier of refined_obsidian hoes.
+		refined_obsidianHoeDamage = -10.0
+		#Maximum durability of refined_obsidian boots.
+		#Range: > 1
+		refined_obsidianBootDurability = 650
+		#Efficiency of refined_obsidian paxels.
+		refined_obsidianPaxelEfficiency = 11.0
+		#Efficiency of refined_obsidian tools.
+		refined_obsidianEfficiency = 10.0
+		#Maximum durability of refined_obsidian tools.
+		#Range: > 1
+		refined_obsidianToolMaxUses = 1500
+		#Maximum durability of refined_obsidian chestplates.
+		#Range: > 1
+		refined_obsidianChestplateDurability = 800
+		#Maximum durability of refined_obsidian leggings.
+		#Range: > 1
+		refined_obsidianLeggingDurability = 750
+		#Attack damage modifier of refined_obsidian pickaxes.
+		refined_obsidianPickaxeDamage = 1.0
+		#Base armor knockback resistance value of refined_obsidian armor.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		refined_obsidianKnockbackResistance = 0.10000000149011612
+		#Harvest level of refined_obsidian tools.
+		#Range: > 0
+		refined_obsidianHarvestLevel = 3
+		#Attack speed of refined_obsidian paxels.
+		refined_obsidianPaxelAtkSpeed = -2.4000000953674316
+		#Protection value of refined_obsidian boots.
+		#Range: > 0
+		refined_obsidianBootArmor = 4
+		#Protection value of refined_obsidian helmets.
+		#Range: > 0
+		refined_obsidianHelmetArmor = 4
+		#Attack speed of refined_obsidian shovels.
+		refined_obsidianShovelAtkSpeed = -3.0
+		#Protection value of refined_obsidian leggings.
+		#Range: > 0
+		refined_obsidianLeggingArmor = 7
+		#Maximum durability of refined_obsidian helmets.
+		#Range: > 1
+		refined_obsidianHelmetDurability = 550
+		#Maximum durability of refined_obsidian paxels.
+		#Range: > 1
+		refined_obsidianPaxelMaxUses = 1800
+
+	[tools.mobArmorSpawnRate]
+		#The chance that Mekanism Armor can spawn on mobs.
+		#Range: 0.0 ~ 1.0
+		general = 0.03
+
+		#Spawn chances for pieces of Steel gear. Note: These values are after the general mobArmorSpawnRate has been checked, and after an even split between armor types has been done.
+		[tools.mobArmorSpawnRate.steel]
+			#The chance that mobs can spawn with Steel Chestplates.
+			#Range: 0.0 ~ 1.0
+			chestplateChance = 0.5
+			#The chance that mobs can spawn with Steel Boots.
+			#Range: 0.0 ~ 1.0
+			bootsChance = 0.5
+			#The chance that mobs can spawn with Steel Leggings.
+			#Range: 0.0 ~ 1.0
+			leggingsChance = 0.5
+			#The chance that mobs can spawn with Steel Helmets.
+			#Range: 0.0 ~ 1.0
+			helmetChance = 0.5
+			#The chance that mobs can spawn with Steel Swords.
+			#Range: 0.0 ~ 1.0
+			swordChance = 0.5
+
+		#Spawn chances for pieces of Refined Glowstone gear. Note: These values are after the general mobArmorSpawnRate has been checked, and after an even split between armor types has been done.
+		[tools.mobArmorSpawnRate.refined_glowstone]
+			#The chance that mobs can spawn with Refined Glowstone Chestplates.
+			#Range: 0.0 ~ 1.0
+			chestplateChance = 0.5
+			#The chance that mobs can spawn with Refined Glowstone Boots.
+			#Range: 0.0 ~ 1.0
+			bootsChance = 0.5
+			#The chance that mobs can spawn with Refined Glowstone Leggings.
+			#Range: 0.0 ~ 1.0
+			leggingsChance = 0.5
+			#The chance that mobs can spawn with Refined Glowstone Helmets.
+			#Range: 0.0 ~ 1.0
+			helmetChance = 0.5
+			#The chance that mobs can spawn with Refined Glowstone Swords.
+			#Range: 0.0 ~ 1.0
+			swordChance = 0.5
+
+		#Spawn chances for pieces of Lapis Lazuli gear. Note: These values are after the general mobArmorSpawnRate has been checked, and after an even split between armor types has been done.
+		[tools.mobArmorSpawnRate.lapis_lazuli]
+			#The chance that mobs can spawn with Lapis Lazuli Chestplates.
+			#Range: 0.0 ~ 1.0
+			chestplateChance = 0.5
+			#The chance that mobs can spawn with Lapis Lazuli Boots.
+			#Range: 0.0 ~ 1.0
+			bootsChance = 0.5
+			#The chance that mobs can spawn with Lapis Lazuli Leggings.
+			#Range: 0.0 ~ 1.0
+			leggingsChance = 0.5
+			#The chance that mobs can spawn with Lapis Lazuli Helmets.
+			#Range: 0.0 ~ 1.0
+			helmetChance = 0.5
+			#The chance that mobs can spawn with Lapis Lazuli Swords.
+			#Range: 0.0 ~ 1.0
+			swordChance = 0.5
+
+		#Spawn chances for pieces of Osmium gear. Note: These values are after the general mobArmorSpawnRate has been checked, and after an even split between armor types has been done.
+		[tools.mobArmorSpawnRate.osmium]
+			#The chance that mobs can spawn with Osmium Chestplates.
+			#Range: 0.0 ~ 1.0
+			chestplateChance = 0.5
+			#The chance that mobs can spawn with Osmium Boots.
+			#Range: 0.0 ~ 1.0
+			bootsChance = 0.5
+			#The chance that mobs can spawn with Osmium Leggings.
+			#Range: 0.0 ~ 1.0
+			leggingsChance = 0.5
+			#The chance that mobs can spawn with Osmium Helmets.
+			#Range: 0.0 ~ 1.0
+			helmetChance = 0.5
+			#The chance that mobs can spawn with Osmium Swords.
+			#Range: 0.0 ~ 1.0
+			swordChance = 0.5
+
+		#Spawn chances for pieces of Refined Obsidian gear. Note: These values are after the general mobArmorSpawnRate has been checked, and after an even split between armor types has been done.
+		[tools.mobArmorSpawnRate.refined_obsidian]
+			#The chance that mobs can spawn with Refined Obsidian Chestplates.
+			#Range: 0.0 ~ 1.0
+			chestplateChance = 0.5
+			#The chance that mobs can spawn with Refined Obsidian Boots.
+			#Range: 0.0 ~ 1.0
+			bootsChance = 0.5
+			#The chance that mobs can spawn with Refined Obsidian Leggings.
+			#Range: 0.0 ~ 1.0
+			leggingsChance = 0.5
+			#The chance that mobs can spawn with Refined Obsidian Helmets.
+			#Range: 0.0 ~ 1.0
+			helmetChance = 0.5
+			#The chance that mobs can spawn with Refined Obsidian Swords.
+			#Range: 0.0 ~ 1.0
+			swordChance = 0.5
+
+		#Spawn chances for pieces of Bronze gear. Note: These values are after the general mobArmorSpawnRate has been checked, and after an even split between armor types has been done.
+		[tools.mobArmorSpawnRate.bronze]
+			#The chance that mobs can spawn with Bronze Chestplates.
+			#Range: 0.0 ~ 1.0
+			chestplateChance = 0.5
+			#The chance that mobs can spawn with Bronze Boots.
+			#Range: 0.0 ~ 1.0
+			bootsChance = 0.5
+			#The chance that mobs can spawn with Bronze Leggings.
+			#Range: 0.0 ~ 1.0
+			leggingsChance = 0.5
+			#The chance that mobs can spawn with Bronze Helmets.
+			#Range: 0.0 ~ 1.0
+			helmetChance = 0.5
+			#The chance that mobs can spawn with Bronze Swords.
+			#Range: 0.0 ~ 1.0
+			swordChance = 0.5
+
+	# Material Settings for bronze
+	[tools.bronze]
+		#Base armor toughness value of bronze armor.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		bronzeToughness = 0.0
+		#Protection value of bronze boots.
+		#Range: > 0
+		bronzeBootArmor = 2
+		#Attack speed of bronze hoes.
+		bronzeHoeAtkSpeed = 3.0
+		#Harvest level of bronze tools.
+		#Range: > 0
+		bronzeHarvestLevel = 2
+		#Protection value of bronze chestplates.
+		#Range: > 0
+		bronzeChestplateArmor = 6
+		#Attack damage modifier of bronze pickaxes.
+		bronzePickaxeDamage = 1.0
+		#Attack speed of bronze axes.
+		bronzeAxeAtkSpeed = -3.0999999046325684
+		#Maximum durability of bronze paxels.
+		#Range: > 1
+		bronzePaxelMaxUses = 250
+		#Maximum durability of bronze shields.
+		#Range: > 0
+		bronzeShieldDurability = 1568
+		#Attack speed of bronze pickaxes.
+		bronzePickaxeAtkSpeed = -2.799999952316284
+		#Protection value of bronze helmets.
+		#Range: > 0
+		bronzeHelmetArmor = 3
+		#Attack damage modifier of bronze axes.
+		bronzeAxeDamage = 1.5
+		#Maximum durability of bronze tools.
+		#Range: > 1
+		bronzeToolMaxUses = 250
+		#Maximum durability of bronze boots.
+		#Range: > 1
+		bronzeBootDurability = 455
+		#Protection value of bronze leggings.
+		#Range: > 0
+		bronzeLeggingArmor = 5
+		#Harvest level of bronze paxels.
+		#Range: > 0
+		bronzePaxelHarvestLevel = 3
+		#Base armor knockback resistance value of bronze armor.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		bronzeKnockbackResistance = 0.0
+		#Efficiency of bronze tools.
+		bronzeEfficiency = 7.0
+		#Natural enchantability factor of bronze items.
+		#Range: > 0
+		bronzeEnchantability = 9
+		#Attack damage modifier of bronze swords.
+		bronzeSwordDamage = 3.0
+		#Attack speed of bronze shovels.
+		bronzeShovelAtkSpeed = -3.0
+		#Maximum durability of bronze chestplates.
+		#Range: > 1
+		bronzeChestplateDurability = 560
+		#Maximum durability of bronze leggings.
+		#Range: > 1
+		bronzeLeggingDurability = 525
+		#Natural enchantability factor of bronze paxels.
+		#Range: > 0
+		bronzePaxelEnchantability = 10
+		#Base attack damage of bronze items.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		bronzeAttackDamage = 2.0
+		#Attack speed of bronze swords.
+		bronzeSwordAtkSpeed = -2.4000000953674316
+		#Maximum durability of bronze helmets.
+		#Range: > 1
+		bronzeHelmetDurability = 385
+		#Attack damage modifier of bronze shovels.
+		bronzeShovelDamage = 0.5
+		#Attack damage modifier of bronze hoes.
+		bronzeHoeDamage = -6.0
+		#Attack speed of bronze paxels.
+		bronzePaxelAtkSpeed = -2.4000000953674316
+		#Attack damage modifier of bronze paxels.
+		bronzePaxelDamage = 3.0
+		#Efficiency of bronze paxels.
+		bronzePaxelEfficiency = 9.0
+
diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json
index 8ae48ec719..d237b5e7e9 100644
--- a/kubejs/assets/kubejs/lang/en_us.json
+++ b/kubejs/assets/kubejs/lang/en_us.json
@@ -36,8 +36,8 @@
     "item.kubejs.dynamo_fuel_augment_mk3": "Dynamo Efficiency MK3",
     "item.kubejs.dynamo_fuel_augment_mk4": "Dynamo Efficiency MK4",
 
-    "item.kubejs.spirit_heat_exchanger": "Maxwellian Heat Exchanger",
-    "item.kubejs.spirit_heat_exchanger.occultism_spirit_tooltip": "%s resides within, ever vigilant against entropy.",
+    "item.kubejs.spirit_entropic_gateway": "Maxwellian Entropic Gateway",
+    "item.kubejs.spirit_entropic_gateway.occultism_spirit_tooltip": "%s resides within, ever vigilant against entropy.",
     "item.magicfeather.magicfeather.occultism_spirit_tooltip": "%s is bound to this feather.",
     "item.bloodmagic.soulsword.occultism_spirit_tooltip": "%s is bound to this sword.",
     "item.bloodmagic.soulaxe.occultism_spirit_tooltip": "%s is bound to this axe.",
@@ -87,12 +87,12 @@
     "ritual.enigmatica.occultism/ritual/pink_wither.interrupted": "I'll be burnin' rubber, you'll be kissin' my ...",
     "ritual.enigmatica.occultism/ritual/pink_wither.conditions": "Not all requirements for this ritual are met.",
 
-    "item.kubejs.craft_spirit_heat_exchanger": "Ritual: Craft Maxwellian Heat Exchanger",
-    "item.kubejs.craft_spirit_heat_exchanger.tooltip": "Fission, brought to you by the Spirits of the Otherworld.",
-    "ritual.enigmatica.occultism/ritual/spirit_heat_exchanger.started": "Started binding Maxwell's Spirit.",
-    "ritual.enigmatica.occultism/ritual/spirit_heat_exchanger.finished": "Maxwell's Spirit bound successfully.",
-    "ritual.enigmatica.occultism/ritual/spirit_heat_exchanger.interrupted": "Maxwell's Spirit interrupted.",
-    "ritual.enigmatica.occultism/ritual/spirit_heat_exchanger.conditions": "Not all requirements for this ritual are met.",
+    "item.kubejs.craft_spirit_entropic_gateway": "Ritual: Craft Maxwellian Entropic Gateway.",
+    "item.kubejs.craft_spirit_entropic_gateway.tooltip": "Fission, brought to you by the Spirits of the Otherworld.",
+    "ritual.enigmatica.occultism/ritual/spirit_entropic_gateway.started": "Started binding Maxwell's Spirit.",
+    "ritual.enigmatica.occultism/ritual/spirit_entropic_gateway.finished": "Maxwell's Spirit bound successfully.",
+    "ritual.enigmatica.occultism/ritual/spirit_entropic_gateway.interrupted": "Maxwell's Spirit interrupted.",
+    "ritual.enigmatica.occultism/ritual/spirit_entropic_gateway.conditions": "Not all requirements for this ritual are met.",
 
     "item.kubejs.craft_soulsword": "Ritual: Craft Sentient Sword.",
     "item.kubejs.craft_soulsword.tooltip": "Bind a spirit into a Sentient Sword",
diff --git a/kubejs/assets/kubejs/textures/item/spirit_heat_exchanger.png b/kubejs/assets/kubejs/textures/item/spirit_entropic_gateway.png
similarity index 100%
rename from kubejs/assets/kubejs/textures/item/spirit_heat_exchanger.png
rename to kubejs/assets/kubejs/textures/item/spirit_entropic_gateway.png
diff --git a/kubejs/assets/kubejs/textures/item/spirit_heat_exchanger.png.mcmeta b/kubejs/assets/kubejs/textures/item/spirit_entropic_gateway.png.mcmeta
similarity index 100%
rename from kubejs/assets/kubejs/textures/item/spirit_heat_exchanger.png.mcmeta
rename to kubejs/assets/kubejs/textures/item/spirit_entropic_gateway.png.mcmeta
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
index 54f92011b9..05d34a1ef5 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
@@ -269,6 +269,21 @@ onEvent('recipes', (event) => {
                 G: 'xnet:controller'
             },
             id: 'portality:controller'
+        },
+        {
+            output: Item.of('rftoolsutility:environmental_controller'),
+            pattern: ['AABAA', 'ACDCA', 'BEFEB', 'AGHGA', 'AABAA'],
+            key: {
+                A: 'powah:dielectric_casing',
+                B: 'thermal:enderium_glass',
+                C: 'immersiveengineering:tesla_coil',
+                D: 'powah:player_aerial_pearl',
+                E: 'powah:aerial_pearl',
+                F: '#industrialforegoing:machine_frame/supreme',
+                G: '#forge:circuits/ultimate',
+                H: 'kubejs:spirit_entropic_gateway'
+            },
+            id: 'rftoolsutility:environmental_controller'
         }
     ];
 
@@ -299,7 +314,7 @@ onEvent('recipes', (event) => {
                 J: 'xnet:advanced_connector_blue',
                 K: 'xnet:netcable_blue',
                 L: 'pneumaticcraft:heat_pipe',
-                M: 'kubejs:spirit_heat_exchanger',
+                M: 'kubejs:spirit_entropic_gateway',
                 N: 'xnet:controller',
                 O: `powah:furnator_${tier}`,
                 P: 'create:fluid_pipe'
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js
index 317a324d34..c70ae76fe4 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js
@@ -695,7 +695,7 @@ onEvent('recipes', (event) => {
             activation_item: { item: 'occultism:book_of_binding_bound_foliot' },
             pentacle_id: 'occultism:craft_foliot',
             duration: 10,
-            ritual_dummy: { item: 'kubejs:craft_spirit_heat_exchanger' },
+            ritual_dummy: { item: 'kubejs:craft_spirit_entropic_gateway' },
             ingredients: [
                 { item: 'ars_nouveau:void_jar' },
                 { item: 'atum:shu_godshard' },
@@ -706,8 +706,8 @@ onEvent('recipes', (event) => {
                 { tag: 'botania:runes/water' },
                 { tag: 'botania:runes/water' }
             ],
-            result: { item: 'kubejs:spirit_heat_exchanger' },
-            id: `${id_prefix}spirit_heat_exchanger`
+            result: { item: 'kubejs:spirit_entropic_gateway' },
+            id: `${id_prefix}spirit_entropic_gateway`
         },
         {
             ritual_type: 'occultism:craft_with_spirit_name',
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/tags/items/occultism/occultism_spirit_tooltip.js b/kubejs/server_scripts/enigmatica/kubejs/expert/tags/items/occultism/occultism_spirit_tooltip.js
index f1e8c9c85b..9905d203d3 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/tags/items/occultism/occultism_spirit_tooltip.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/tags/items/occultism/occultism_spirit_tooltip.js
@@ -8,7 +8,7 @@ onEvent('item.tags', (event) => {
         'bloodmagic:soulpickaxe',
         'bloodmagic:soulshovel',
         'bloodmagic:soulscythe',
-        'kubejs:spirit_heat_exchanger',
+        'kubejs:spirit_entropic_gateway',
         'losttrinkets:magical_feathers',
         'magicfeather:magicfeather'
     ];
diff --git a/kubejs/startup_scripts/item_registry.js b/kubejs/startup_scripts/item_registry.js
index 575346553e..1f4905ca36 100644
--- a/kubejs/startup_scripts/item_registry.js
+++ b/kubejs/startup_scripts/item_registry.js
@@ -25,7 +25,7 @@ onEvent('item.registry', (event) => {
         'superheated_steel_ingot',
         'hot_compressed_iron_ingot',
         'dimensional_storage_crystal',
-        'spirit_heat_exchanger',
+        'spirit_entropic_gateway',
         'amadron_survey_tools',
         'basalt_powder',
         'coke_brick_blend',
@@ -39,7 +39,7 @@ onEvent('item.registry', (event) => {
     const ritualDummies = [
         'summon_pink_wither',
         'summon_pharaoh',
-        'craft_spirit_heat_exchanger',
+        'craft_spirit_entropic_gateway',
         'craft_magical_feathers',
         'craft_magicfeather',
         'craft_soulsword',

From ef3d8a4d850494659b88d4d00d91b707b62f58fe Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Wed, 20 Oct 2021 12:34:18 -0400
Subject: [PATCH 006/130] Update mechanical_crafting.js

---
 .../kubejs/expert/recipetypes/create/mechanical_crafting.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
index 05d34a1ef5..ff2a8d251e 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
@@ -272,7 +272,7 @@ onEvent('recipes', (event) => {
         },
         {
             output: Item.of('rftoolsutility:environmental_controller'),
-            pattern: ['AABAA', 'ACDCA', 'BEFEB', 'AGHGA', 'AABAA'],
+            pattern: ['ABBBA', 'BCDCB', 'BEFEB', 'BGHGB', 'ABBBA'],
             key: {
                 A: 'powah:dielectric_casing',
                 B: 'thermal:enderium_glass',

From e4529f1909d09ce5650eb76ccc0018868e489eea Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Wed, 20 Oct 2021 13:35:47 -0400
Subject: [PATCH 007/130] Update shaped.js

---
 .../expert/recipetypes/rftools/shaped.js      | 45 ++++++++++++-------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
index fc4638bf9a..c1d4f3bc12 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
@@ -22,7 +22,7 @@ onEvent('recipes', (event) => {
             key: {
                 A: '#forge:dusts/redstone',
                 B: 'minecraft:ender_pearl',
-                C: 'rftoolsbase:machine_base',
+                C: '#industrialforegoing:machine_frame/pity',
                 D: '#forge:glass'
             },
             id: 'rftoolsutility:screen_controller'
@@ -39,26 +39,36 @@ onEvent('recipes', (event) => {
         },
         {
             output: 'rftoolsutility:matter_receiver',
-            pattern: ['AAA', 'BCB', 'DDD'],
+            pattern: ['ABA', 'ACA', 'ADA'],
             key: {
-                A: '#forge:ingots/iron_aluminum',
-                B: '#forge:dusts/redstone',
-                C: 'rftoolsbase:machine_base',
-                D: 'minecraft:ender_pearl'
+                A: 'portality:frame',
+                B: 'atum:yellow_stained_crystal_glass',
+                C: 'occultism:stable_wormhole',
+                D: '#industrialforegoing:machine_frame/pity'
             },
             id: 'rftoolsutility:matter_receiver'
         },
         {
             output: 'rftoolsutility:matter_transmitter',
-            pattern: ['DDD', 'BCB', 'AAA'],
+            pattern: ['ABA', 'ACA', 'ADA'],
             key: {
-                A: '#forge:ingots/iron_aluminum',
-                B: '#forge:dusts/redstone',
-                C: 'rftoolsbase:machine_base',
-                D: 'minecraft:ender_pearl'
+                A: 'portality:frame',
+                B: 'atum:cyan_stained_crystal_glass',
+                C: 'occultism:stable_wormhole',
+                D: '#industrialforegoing:machine_frame/pity'
             },
             id: 'rftoolsutility:matter_transmitter'
         },
+        {
+            output: 'rftoolsutility:dialing_device',
+            pattern: ['ABA', 'ACA', 'AAA'],
+            key: {
+                A: 'portality:frame',
+                B: 'portality:controller',
+                C: 'xnet:wireless_router'
+            },
+            id: 'rftoolsutility:dialing_device'
+        },
         {
             output: 'rftoolsutility:charged_porter',
             pattern: [' C ', 'CBC', 'ACA'],
@@ -99,7 +109,7 @@ onEvent('recipes', (event) => {
             key: {
                 A: '#forge:gems/dimensional',
                 B: '#forge:dusts/redstone',
-                C: 'rftoolsbase:machine_base',
+                C: '#industrialforegoing:machine_frame/pity',
                 D: '#forge:gems/diamond'
             },
             id: 'rftoolsbase:machine_infuser'
@@ -109,18 +119,19 @@ onEvent('recipes', (event) => {
             pattern: ['ADA', 'BCB', 'ABA'],
             key: {
                 A: 'minecraft:bricks',
-                B: '#forge:dusts/redstone',
-                C: 'rftoolsbase:machine_base',
-                D: '#forge:gems/ender'
+                B: 'portality:frame',
+                C: '#industrialforegoing:machine_frame/pity',
+                D: 'portality:controller'
             },
             id: 'rftoolsbuilder:builder'
         },
         {
             output: 'rftoolsbase:machine_base',
-            pattern: ['AAA', 'BBB'],
+            pattern: [' A ', 'ACA', 'BBB'],
             key: {
                 A: '#forge:nuggets/invar',
-                B: 'pneumaticcraft:reinforced_stone_slab'
+                B: 'pneumaticcraft:reinforced_stone_slab',
+                C: 'pneumaticcraft:advanced_pcb'
             },
             id: 'rftoolsbase:machine_base'
         },

From ef7dbe4db9bd9149539ae79c5360327c114c93a3 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Wed, 20 Oct 2021 21:27:47 -0400
Subject: [PATCH 008/130] rftools control bits

not to worry, these will likely feature heavily in advanced mek machines
---
 .../immersiveengineering/blueprint.js         |   9 ++
 .../recipetypes/pneumaticcraft/shaped.js      |  10 ++
 .../expert/recipetypes/powah/energizing.js    |   6 +-
 .../recipetypes/refinedstorage/shaped.js      |  29 +++-
 .../expert/recipetypes/rftools/shaped.js      | 142 ++++++++++++++++--
 .../expert/recipetypes/thermal/shaped.js      |  11 ++
 6 files changed, 192 insertions(+), 15 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/blueprint.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/blueprint.js
index 1c719e7975..3148a4f901 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/blueprint.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/blueprint.js
@@ -42,6 +42,15 @@ onEvent('recipes', (event) => {
                 count: 2
             },
             id: 'modularrouters:augment_core'
+        },
+        {
+            inputs: [{ count: 3, base_ingredient: { tag: 'forge:ingots/steel' } }, { item: 'fluxnetworks:flux_dust' }],
+            category: 'components',
+            output: {
+                item: 'engineersdecor:metal_bar',
+                count: 12
+            },
+            id: 'engineersdecor:dependent/metal_bar_recipe'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/shaped.js
index 58fd926918..bc470dfb43 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/shaped.js
@@ -372,6 +372,16 @@ onEvent('recipes', (event) => {
                 G: 'kubejs:dimensional_storage_crystal'
             },
             id: 'pneumaticcraft:vacuum_trap'
+        },
+        {
+            output: 'pneumaticcraft:spawner_core_shell',
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: 'kubejs:dimensional_storage_crystal',
+                B: 'pneumaticcraft:pressure_chamber_glass',
+                C: 'naturesaura:calling_spirit'
+            },
+            id: 'pneumaticcraft:spawner_core_shell'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
index eff621a241..dfb41b275f 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
@@ -148,7 +148,11 @@ onEvent('recipes', (event) => {
             ingredients: [
                 { item: 'botania:ender_eye_block' },
                 { item: 'powah:dielectric_casing' },
-                { tag: 'mekanism:crystals/uranium' }
+                {
+                    type: 'forge:nbt',
+                    item: 'pneumaticcraft:spawner_core',
+                    nbt: '{"pneumaticcraft:SpawnerCoreStats":{"minecraft:enderman":100}}'
+                }
             ],
             energy: '20000000',
             result: {
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js
index f4d9833804..57a5aa66db 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js
@@ -27,7 +27,7 @@ onEvent('recipes', (event) => {
             id: 'refinedstorage:cable'
         },
         {
-            output: Item.of('refinedstorage:importer'),
+            output: 'refinedstorage:importer',
             pattern: [' C ', 'ADB', ' C '],
             key: {
                 A: 'refinedstorage:cable',
@@ -38,7 +38,7 @@ onEvent('recipes', (event) => {
             id: 'refinedstorage:importer'
         },
         {
-            output: Item.of('refinedstorage:exporter'),
+            output: 'refinedstorage:exporter',
             pattern: [' C ', 'ADB', ' C '],
             key: {
                 A: 'refinedstorage:cable',
@@ -49,7 +49,7 @@ onEvent('recipes', (event) => {
             id: 'refinedstorage:exporter'
         },
         {
-            output: Item.of('refinedstorage:external_storage'),
+            output: 'refinedstorage:external_storage',
             pattern: [' C ', 'AEB', ' D '],
             key: {
                 A: 'refinedstorage:cable',
@@ -61,7 +61,7 @@ onEvent('recipes', (event) => {
             id: 'refinedstorage:external_storage'
         },
         {
-            output: Item.of('refinedstorage:crafter'),
+            output: 'refinedstorage:crafter',
             pattern: ['ABA', 'CEC', 'ADA'],
             key: {
                 A: 'create:mechanical_crafter',
@@ -71,6 +71,27 @@ onEvent('recipes', (event) => {
                 E: 'refinedstorage:machine_casing'
             },
             id: 'refinedstorage:crafter'
+        },
+        {
+            output: 'refinedstorage:wireless_transmitter',
+            pattern: [' AC', 'ABA', 'BA '],
+            key: {
+                A: '#forge:wires/aluminum',
+                B: '#forge:rods/aluminum',
+                C: 'refinedstorage:advanced_processor'
+            },
+            id: 'refinedstorage:wireless_transmitter'
+        },
+        {
+            output: 'refinedstorage:range_upgrade',
+            pattern: ['ADA', 'CBC', 'AAA'],
+            key: {
+                A: 'refinedstorage:quartz_enriched_iron',
+                B: 'refinedstorage:upgrade',
+                C: 'refinedstorage:basic_processor',
+                D: 'refinedstorage:wireless_transmitter'
+            },
+            id: 'refinedstorage:range_upgrade'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
index c1d4f3bc12..47ff2dacb7 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
@@ -16,14 +16,14 @@ onEvent('recipes', (event) => {
     */
 
     const recipes = [
+        ,
         {
             output: 'rftoolsutility:screen_controller',
-            pattern: ['ABA', 'DCD', 'ADA'],
+            pattern: ['ABA', 'BCB', 'ABA'],
             key: {
-                A: '#forge:dusts/redstone',
-                B: 'minecraft:ender_pearl',
-                C: '#industrialforegoing:machine_frame/pity',
-                D: '#forge:glass'
+                A: '#forge:gears/signalum',
+                B: '#forge:glass/black',
+                C: 'thermal:charge_bench'
             },
             id: 'rftoolsutility:screen_controller'
         },
@@ -105,12 +105,12 @@ onEvent('recipes', (event) => {
         },
         {
             output: 'rftoolsbase:machine_infuser',
-            pattern: ['ABA', 'DCD', 'ABA'],
+            pattern: ['ABA', 'CDC', 'ABA'],
             key: {
-                A: '#forge:gems/dimensional',
-                B: '#forge:dusts/redstone',
-                C: '#industrialforegoing:machine_frame/pity',
-                D: '#forge:gems/diamond'
+                A: '#forge:gears/enderium',
+                B: 'rftoolsbase:infused_diamond',
+                C: '#forge:storage_blocks/nitro',
+                D: '#industrialforegoing:machine_frame/advanced'
             },
             id: 'rftoolsbase:machine_infuser'
         },
@@ -178,6 +178,128 @@ onEvent('recipes', (event) => {
                 D: 'rftoolsbase:machine_frame'
             },
             id: 'rftoolspower:cell1'
+        },
+        {
+            output: 'rftoolscontrol:program_card',
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: 'pneumaticcraft:plastic',
+                B: 'rftoolscontrol:ram_chip',
+                C: 'pneumaticcraft:printed_circuit_board'
+            },
+            id: 'rftoolscontrol:program_card'
+        },
+        {
+            output: 'rftoolscontrol:ram_chip',
+            pattern: ['AAA', 'BCB', 'AAA'],
+            key: {
+                A: 'redstonepen:relay',
+                B: ['#forge:wires/copper', '#forge:wires/lead'],
+                C: 'immersiveengineering:circuit_board'
+            },
+            id: 'rftoolscontrol:ram_chip'
+        },
+        {
+            output: 'rftoolscontrol:token',
+            pattern: ['AAA', 'ABA', 'AAA'],
+            key: {
+                A: 'minecraft:paper',
+                B: 'pneumaticcraft:programming_puzzle'
+            },
+            id: 'rftoolscontrol:token'
+        },
+        {
+            output: 'rftoolscontrol:craftingstation',
+            pattern: ['ABA', 'CDE', 'ABA'],
+            key: {
+                A: 'create:mechanical_crafter',
+                B: 'pneumaticcraft:printed_circuit_board',
+                C: 'refinedstorage:destruction_core',
+                D: 'rftoolsbase:machine_frame',
+                E: 'refinedstorage:construction_core'
+            },
+            id: 'rftoolscontrol:craftingstation'
+        },
+        {
+            output: 'rftoolscontrol:processor',
+            pattern: [' A ', 'BCB', ' A '],
+            key: {
+                A: 'immersiveengineering:logic_unit',
+                B: 'pneumaticcraft:smart_chest',
+                C: 'rftoolsbase:machine_frame'
+            },
+            id: 'rftoolscontrol:processor'
+        },
+        {
+            output: 'rftoolscontrol:cpu_core_500',
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: '#forge:wires/lead',
+                B: 'refinedstorage:basic_processor',
+                C: 'pneumaticcraft:unassembled_pcb'
+            },
+            id: 'rftoolscontrol:cpu_core_500'
+        },
+        {
+            output: 'rftoolscontrol:cpu_core_1000',
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: '#forge:wires/copper',
+                B: 'refinedstorage:improved_processor',
+                C: 'rftoolscontrol:cpu_core_500'
+            },
+            id: 'rftoolscontrol:cpu_core_1000'
+        },
+        {
+            output: 'rftoolscontrol:cpu_core_2000',
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: '#forge:wires/electrum',
+                B: 'refinedstorage:advanced_processor',
+                C: 'rftoolscontrol:cpu_core_1000'
+            },
+            id: 'rftoolscontrol:cpu_core_2000'
+        },
+        {
+            output: 'rftoolscontrol:graphics_card',
+            pattern: ['ABA', 'CDA', 'EEE'],
+            key: {
+                A: 'pneumaticcraft:heat_sink',
+                B: 'pneumaticcraft:turbine_rotor',
+                C: 'pneumaticcraft:printed_circuit_board',
+                D: 'refinedstorage:advanced_processor',
+                E: '#forge:nuggets/copper'
+            },
+            id: 'rftoolscontrol:graphics_card'
+        },
+        {
+            output: 'rftoolscontrol:network_card',
+            pattern: ['ABC', 'DDD'],
+            key: {
+                A: 'refinedstorage:wireless_transmitter',
+                B: 'pneumaticcraft:printed_circuit_board',
+                C: 'refinedstorage:advanced_processor',
+                D: '#forge:nuggets/copper'
+            },
+            id: 'rftoolscontrol:network_card'
+        },
+        {
+            output: 'rftoolscontrol:network_identifier',
+            pattern: ['AAA', 'A A', 'AAA'],
+            key: {
+                A: 'rftoolscontrol:token'
+            },
+            id: 'rftoolscontrol:network_identifier'
+        },
+        {
+            output: 'rftoolscontrol:advanced_network_card',
+            pattern: ['ABC'],
+            key: {
+                A: 'refinedstorage:range_upgrade',
+                B: 'rftoolscontrol:network_card',
+                C: 'extrastorage:neural_processor'
+            },
+            id: 'rftoolscontrol:advanced_network_card'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/shaped.js
index d4f0e71dab..45fbb68e18 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/shaped.js
@@ -73,6 +73,17 @@ onEvent('recipes', (event) => {
                 B: '#forge:rods/lead'
             },
             id: 'kubejs:thermal_redstone_servo_with_lead'
+        },
+        {
+            output: 'thermal:charge_bench',
+            pattern: ['AAA', 'BCB', 'DBD'],
+            key: {
+                A: '#forge:ingots/electrum',
+                B: 'thermal:rf_coil',
+                C: 'thermal:energy_cell_frame',
+                D: '#forge:ingots/lead'
+            },
+            id: 'thermal:charge_bench'
         }
     ];
 

From 8a700a46c632baf3e4c8abc7046b34b8867fe377 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Wed, 20 Oct 2021 21:43:07 -0400
Subject: [PATCH 009/130] Update shaped.js

---
 .../kubejs/expert/recipetypes/rftools/shaped.js        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
index 47ff2dacb7..26dccd069b 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
@@ -300,6 +300,16 @@ onEvent('recipes', (event) => {
                 C: 'extrastorage:neural_processor'
             },
             id: 'rftoolscontrol:advanced_network_card'
+        },
+        {
+            output: 'rftoolscontrol:node',
+            pattern: [' A ', 'BCB'],
+            key: {
+                A: 'rftoolscontrol:network_card',
+                B: 'pneumaticcraft:printed_circuit_board',
+                C: 'rftoolsbase:machine_frame'
+            },
+            id: 'rftoolscontrol:node'
         }
     ];
 

From c408450e1f3ec2267046c15c45845aa546294bec Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Wed, 20 Oct 2021 22:05:48 -0400
Subject: [PATCH 010/130] Update shaped.js

---
 .../expert/recipetypes/rftools/shaped.js      | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
index 26dccd069b..9c4e3c61a6 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
@@ -310,6 +310,28 @@ onEvent('recipes', (event) => {
                 C: 'rftoolsbase:machine_frame'
             },
             id: 'rftoolscontrol:node'
+        },
+        {
+            output: 'rftoolsutility:syringe',
+            pattern: ['  A', ' B ', 'C  '],
+            key: {
+                A: '#forge:rods/steel',
+                B: 'minecraft:glass_bottle',
+                C: 'pneumaticcraft:plastic'
+            },
+            id: 'rftoolsutility:syringe'
+        },
+        {
+            output: 'rftoolsbase:tablet',
+            pattern: ['AAA', 'BCD', 'EEE'],
+            key: {
+                A: 'rftoolsbase:information_screen',
+                B: 'rftoolscontrol:advanced_network_card',
+                C: 'rftoolscontrol:cpu_core_2000',
+                D: 'rftoolscontrol:graphics_card',
+                E: 'rftoolsbase:machine_base'
+            },
+            id: 'rftoolsbase:tablet'
         }
     ];
 

From 0edefbceeba40835709caa3447fdc12431c68ecc Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Wed, 20 Oct 2021 22:24:11 -0400
Subject: [PATCH 011/130] Update dissolution_chamber.js

---
 .../dissolution_chamber.js                    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
index aa530b897a..964a379b62 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
@@ -72,6 +72,38 @@ onEvent('recipes', (event) => {
             outputFluid: '',
             outputFluidAmount: 0,
             id: 'botanypots:crafting/hopper_botany_pot'
+        },
+        {
+            inputs: [
+                'rftoolsutility:matter_receiver',
+                'industrialforegoing:laser_lens14',
+                '#industrialforegoing:machine_frame/advanced',
+                'minecraft:spawner',
+                'minecraft:spawner'
+            ],
+            inputFluid: 'industrialforegoing:ether_gas',
+            inputFluidAmount: 200,
+            processingTime: 600,
+            outputItem: { item: 'rftoolsutility:spawner', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'rftoolsutility:spawner'
+        },
+        {
+            inputs: [
+                'rftoolsutility:matter_transmitter',
+                'industrialforegoing:laser_lens4',
+                '#industrialforegoing:machine_frame/simple',
+                '#forge:gears/lumium',
+                '#forge:gears/lumium'
+            ],
+            inputFluid: 'kubejs:pink_ender_slime',
+            inputFluidAmount: 500,
+            processingTime: 600,
+            outputItem: { item: 'rftoolsutility:matter_beamer', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'rftoolsutility:matter_beamer'
         }
     ];
 

From f41c443f3c8ed9fab09147219a8a8efecdd8ecc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Thu, 21 Oct 2021 09:43:03 +0200
Subject: [PATCH 012/130] Delete tools-1.toml.bak

---
 config/Mekanism/tools-1.toml.bak | 627 -------------------------------
 1 file changed, 627 deletions(-)
 delete mode 100644 config/Mekanism/tools-1.toml.bak

diff --git a/config/Mekanism/tools-1.toml.bak b/config/Mekanism/tools-1.toml.bak
deleted file mode 100644
index b52731ce35..0000000000
--- a/config/Mekanism/tools-1.toml.bak
+++ /dev/null
@@ -1,627 +0,0 @@
-
-#Mekanism Tools Config. This config is synced from server to client.
-[tools]
-
-	# Material Settings for steel
-	[tools.steel]
-		#Protection value of steel boots.
-		#Range: > 0
-		steelBootArmor = 3
-		#Attack speed of steel axes.
-		steelAxeAtkSpeed = -3.0
-		#Base armor toughness value of steel armor.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		steelToughness = 1.0
-		#Protection value of steel chestplates.
-		#Range: > 0
-		steelChestplateArmor = 7
-		#Base attack damage of steel items.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		steelAttackDamage = 3.0
-		#Attack speed of steel swords.
-		steelSwordAtkSpeed = -2.4000000953674316
-		#Maximum durability of steel paxels.
-		#Range: > 1
-		steelPaxelMaxUses = 1750
-		#Maximum durability of steel leggings.
-		#Range: > 1
-		steelLeggingDurability = 600
-		#Harvest level of steel paxels.
-		#Range: > 0
-		steelPaxelHarvestLevel = 3
-		#Attack damage modifier of steel paxels.
-		steelPaxelDamage = 4.0
-		#Attack damage modifier of steel pickaxes.
-		steelPickaxeDamage = 1.0
-		#Attack damage modifier of steel swords.
-		steelSwordDamage = 3.0
-		#Attack damage modifier of steel hoes.
-		steelHoeDamage = -4.0
-		#Attack speed of steel pickaxes.
-		steelPickaxeAtkSpeed = -2.799999952316284
-		#Maximum durability of steel tools.
-		#Range: > 1
-		steelToolMaxUses = 1561
-		#Protection value of steel leggings.
-		#Range: > 0
-		steelLeggingArmor = 6
-		#Natural enchantability factor of steel paxels.
-		#Range: > 0
-		steelPaxelEnchantability = 12
-		#Efficiency of steel tools.
-		steelEfficiency = 8.0
-		#Base armor knockback resistance value of steel armor.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		steelKnockbackResistance = 0.0
-		#Maximum durability of steel helmets.
-		#Range: > 1
-		steelHelmetDurability = 440
-		#Maximum durability of steel shields.
-		#Range: > 0
-		steelShieldDurability = 1792
-		#Maximum durability of steel boots.
-		#Range: > 1
-		steelBootDurability = 520
-		#Attack speed of steel paxels.
-		steelPaxelAtkSpeed = -2.4000000953674316
-		#Attack damage modifier of steel axes.
-		steelAxeDamage = 1.5
-		#Attack damage modifier of steel shovels.
-		steelShovelDamage = 1.0
-		#Attack speed of steel shovels.
-		steelShovelAtkSpeed = -3.0
-		#Maximum durability of steel chestplates.
-		#Range: > 1
-		steelChestplateDurability = 640
-		#Efficiency of steel paxels.
-		steelPaxelEfficiency = 10.0
-		#Protection value of steel helmets.
-		#Range: > 0
-		steelHelmetArmor = 3
-		#Harvest level of steel tools.
-		#Range: > 0
-		steelHarvestLevel = 3
-		#Natural enchantability factor of steel items.
-		#Range: > 0
-		steelEnchantability = 10
-		#Attack speed of steel hoes.
-		steelHoeAtkSpeed = 1.0
-
-	# Material Settings for refined_glowstone
-	[tools.refined_glowstone]
-		#Attack speed of refined_glowstone paxels.
-		refined_glowstonePaxelAtkSpeed = -2.4000000953674316
-		#Protection value of refined_glowstone leggings.
-		#Range: > 0
-		refined_glowstoneLeggingArmor = 6
-		#Maximum durability of refined_glowstone shields.
-		#Range: > 0
-		refined_glowstoneShieldDurability = 806
-		#Attack speed of refined_glowstone axes.
-		refined_glowstoneAxeAtkSpeed = -3.0999999046325684
-		#Attack speed of refined_glowstone hoes.
-		refined_glowstoneHoeAtkSpeed = 2.0
-		#Base armor toughness value of refined_glowstone armor.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		refined_glowstoneToughness = 0.0
-		#Maximum durability of refined_glowstone helmets.
-		#Range: > 1
-		refined_glowstoneHelmetDurability = 198
-		#Attack damage modifier of refined_glowstone pickaxes.
-		refined_glowstonePickaxeDamage = 1.0
-		#Maximum durability of refined_glowstone paxels.
-		#Range: > 1
-		refined_glowstonePaxelMaxUses = 400
-		#Attack speed of refined_glowstone swords.
-		refined_glowstoneSwordAtkSpeed = -2.4000000953674316
-		#Natural enchantability factor of refined_glowstone items.
-		#Range: > 0
-		refined_glowstoneEnchantability = 18
-		#Protection value of refined_glowstone chestplates.
-		#Range: > 0
-		refined_glowstoneChestplateArmor = 7
-		#Harvest level of refined_glowstone tools.
-		#Range: > 0
-		refined_glowstoneHarvestLevel = 2
-		#Attack speed of refined_glowstone shovels.
-		refined_glowstoneShovelAtkSpeed = -3.0
-		#Protection value of refined_glowstone helmets.
-		#Range: > 0
-		refined_glowstoneHelmetArmor = 3
-		#Maximum durability of refined_glowstone tools.
-		#Range: > 1
-		refined_glowstoneToolMaxUses = 250
-		#Attack damage modifier of refined_glowstone hoes.
-		refined_glowstoneHoeDamage = -5.0
-		#Efficiency of refined_glowstone paxels.
-		refined_glowstonePaxelEfficiency = 11.0
-		#Efficiency of refined_glowstone tools.
-		refined_glowstoneEfficiency = 11.0
-		#Harvest level of refined_glowstone paxels.
-		#Range: > 0
-		refined_glowstonePaxelHarvestLevel = 3
-		#Attack damage modifier of refined_glowstone axes.
-		refined_glowstoneAxeDamage = 1.5
-		#Maximum durability of refined_glowstone boots.
-		#Range: > 1
-		refined_glowstoneBootDurability = 234
-		#Maximum durability of refined_glowstone chestplates.
-		#Range: > 1
-		refined_glowstoneChestplateDurability = 288
-		#Attack damage modifier of refined_glowstone shovels.
-		refined_glowstoneShovelDamage = 1.0
-		#Attack speed of refined_glowstone pickaxes.
-		refined_glowstonePickaxeAtkSpeed = -2.799999952316284
-		#Attack damage modifier of refined_glowstone swords.
-		refined_glowstoneSwordDamage = 3.0
-		#Base armor knockback resistance value of refined_glowstone armor.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		refined_glowstoneKnockbackResistance = 0.0
-		#Natural enchantability factor of refined_glowstone paxels.
-		#Range: > 0
-		refined_glowstonePaxelEnchantability = 18
-		#Attack damage modifier of refined_glowstone paxels.
-		refined_glowstonePaxelDamage = 3.0
-		#Maximum durability of refined_glowstone leggings.
-		#Range: > 1
-		refined_glowstoneLeggingDurability = 270
-		#Base attack damage of refined_glowstone items.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		refined_glowstoneAttackDamage = 3.3
-		#Protection value of refined_glowstone boots.
-		#Range: > 0
-		refined_glowstoneBootArmor = 3
-
-	# Material Settings for lapis_lazuli
-	[tools.lapis_lazuli]
-		#Harvest level of lapis_lazuli paxels.
-		#Range: > 0
-		lapis_lazuliPaxelHarvestLevel = 2
-		#Attack speed of lapis_lazuli pickaxes.
-		lapis_lazuliPickaxeAtkSpeed = -2.799999952316284
-		#Maximum durability of lapis_lazuli shields.
-		#Range: > 0
-		lapis_lazuliShieldDurability = 582
-		#Protection value of lapis_lazuli helmets.
-		#Range: > 0
-		lapis_lazuliHelmetArmor = 2
-		#Attack damage modifier of lapis_lazuli paxels.
-		lapis_lazuliPaxelDamage = 6.0
-		#Efficiency of lapis_lazuli tools.
-		lapis_lazuliEfficiency = 5.0
-		#Base armor knockback resistance value of lapis_lazuli armor.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		lapis_lazuliKnockbackResistance = 0.0
-		#Attack speed of lapis_lazuli hoes.
-		lapis_lazuliHoeAtkSpeed = -1.0
-		#Protection value of lapis_lazuli boots.
-		#Range: > 0
-		lapis_lazuliBootArmor = 2
-		#Efficiency of lapis_lazuli paxels.
-		lapis_lazuliPaxelEfficiency = 6.0
-		#Natural enchantability factor of lapis_lazuli paxels.
-		#Range: > 0
-		lapis_lazuliPaxelEnchantability = 10
-		#Attack speed of lapis_lazuli paxels.
-		lapis_lazuliPaxelAtkSpeed = -2.4000000953674316
-		#Attack damage modifier of lapis_lazuli pickaxes.
-		lapis_lazuliPickaxeDamage = 1.0
-		#Maximum durability of lapis_lazuli tools.
-		#Range: > 1
-		lapis_lazuliToolMaxUses = 200
-		#Protection value of lapis_lazuli leggings.
-		#Range: > 0
-		lapis_lazuliLeggingArmor = 6
-		#Attack speed of lapis_lazuli swords.
-		lapis_lazuliSwordAtkSpeed = -2.4000000953674316
-		#Attack damage modifier of lapis_lazuli axes.
-		lapis_lazuliAxeDamage = 6.0
-		#Maximum durability of lapis_lazuli leggings.
-		#Range: > 1
-		lapis_lazuliLeggingDurability = 195
-		#Maximum durability of lapis_lazuli boots.
-		#Range: > 1
-		lapis_lazuliBootDurability = 169
-		#Attack damage modifier of lapis_lazuli shovels.
-		lapis_lazuliShovelDamage = 1.5
-		#Attack damage modifier of lapis_lazuli swords.
-		lapis_lazuliSwordDamage = 3.0
-		#Base armor toughness value of lapis_lazuli armor.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		lapis_lazuliToughness = 0.0
-		#Base attack damage of lapis_lazuli items.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		lapis_lazuliAttackDamage = 2.0
-		#Maximum durability of lapis_lazuli paxels.
-		#Range: > 1
-		lapis_lazuliPaxelMaxUses = 250
-		#Attack damage modifier of lapis_lazuli hoes.
-		lapis_lazuliHoeDamage = -2.0
-		#Harvest level of lapis_lazuli tools.
-		#Range: > 0
-		lapis_lazuliHarvestLevel = 2
-		#Maximum durability of lapis_lazuli helmets.
-		#Range: > 1
-		lapis_lazuliHelmetDurability = 143
-		#Natural enchantability factor of lapis_lazuli items.
-		#Range: > 0
-		lapis_lazuliEnchantability = 8
-		#Maximum durability of lapis_lazuli chestplates.
-		#Range: > 1
-		lapis_lazuliChestplateDurability = 208
-		#Attack speed of lapis_lazuli axes.
-		lapis_lazuliAxeAtkSpeed = -3.0999999046325684
-		#Protection value of lapis_lazuli chestplates.
-		#Range: > 0
-		lapis_lazuliChestplateArmor = 5
-		#Attack speed of lapis_lazuli shovels.
-		lapis_lazuliShovelAtkSpeed = -3.0
-
-	# Material Settings for osmium
-	[tools.osmium]
-		#Attack damage modifier of osmium swords.
-		osmiumSwordDamage = 3.0
-		#Protection value of osmium chestplates.
-		#Range: > 0
-		osmiumChestplateArmor = 5
-		#Efficiency of osmium paxels.
-		osmiumPaxelEfficiency = 9.0
-		#Efficiency of osmium tools.
-		osmiumEfficiency = 6.5
-		#Attack speed of osmium pickaxes.
-		osmiumPickaxeAtkSpeed = -2.799999952316284
-		#Maximum durability of osmium tools.
-		#Range: > 1
-		osmiumToolMaxUses = 500
-		#Maximum durability of osmium shields.
-		#Range: > 0
-		osmiumShieldDurability = 1344
-		#Harvest level of osmium tools.
-		#Range: > 0
-		osmiumHarvestLevel = 2
-		#Natural enchantability factor of osmium items.
-		#Range: > 0
-		osmiumEnchantability = 12
-		#Attack speed of osmium shovels.
-		osmiumShovelAtkSpeed = -3.0
-		#Attack damage modifier of osmium hoes.
-		osmiumHoeDamage = -4.0
-		#Base armor knockback resistance value of osmium armor.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		osmiumKnockbackResistance = 0.0
-		#Attack damage modifier of osmium paxels.
-		osmiumPaxelDamage = 4.0
-		#Attack speed of osmium hoes.
-		osmiumHoeAtkSpeed = 1.0
-		#Maximum durability of osmium boots.
-		#Range: > 1
-		osmiumBootDurability = 390
-		#Maximum durability of osmium helmets.
-		#Range: > 1
-		osmiumHelmetDurability = 330
-		#Attack damage modifier of osmium axes.
-		osmiumAxeDamage = 1.5
-		#Protection value of osmium helmets.
-		#Range: > 0
-		osmiumHelmetArmor = 3
-		#Attack damage modifier of osmium shovels.
-		osmiumShovelDamage = 1.0
-		#Base attack damage of osmium items.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		osmiumAttackDamage = 2.2
-		#Maximum durability of osmium paxels.
-		#Range: > 1
-		osmiumPaxelMaxUses = 500
-		#Base armor toughness value of osmium armor.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		osmiumToughness = 1.0
-		#Harvest level of osmium paxels.
-		#Range: > 0
-		osmiumPaxelHarvestLevel = 3
-		#Natural enchantability factor of osmium paxels.
-		#Range: > 0
-		osmiumPaxelEnchantability = 12
-		#Maximum durability of osmium chestplates.
-		#Range: > 1
-		osmiumChestplateDurability = 480
-		#Attack speed of osmium axes.
-		osmiumAxeAtkSpeed = -3.0
-		#Attack speed of osmium paxels.
-		osmiumPaxelAtkSpeed = -2.4000000953674316
-		#Attack damage modifier of osmium pickaxes.
-		osmiumPickaxeDamage = 1.0
-		#Protection value of osmium boots.
-		#Range: > 0
-		osmiumBootArmor = 3
-		#Protection value of osmium leggings.
-		#Range: > 0
-		osmiumLeggingArmor = 6
-		#Maximum durability of osmium leggings.
-		#Range: > 1
-		osmiumLeggingDurability = 450
-		#Attack speed of osmium swords.
-		osmiumSwordAtkSpeed = -2.4000000953674316
-
-	# Material Settings for refined_obsidian
-	[tools.refined_obsidian]
-		#Protection value of refined_obsidian chestplates.
-		#Range: > 0
-		refined_obsidianChestplateArmor = 9
-		#Attack damage modifier of refined_obsidian axes.
-		refined_obsidianAxeDamage = 5.0
-		#Attack speed of refined_obsidian pickaxes.
-		refined_obsidianPickaxeAtkSpeed = -2.799999952316284
-		#Harvest level of refined_obsidian paxels.
-		#Range: > 0
-		refined_obsidianPaxelHarvestLevel = 3
-		#Base armor toughness value of refined_obsidian armor.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		refined_obsidianToughness = 3.0
-		#Attack speed of refined_obsidian hoes.
-		refined_obsidianHoeAtkSpeed = 6.0
-		#Base attack damage of refined_obsidian items.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		refined_obsidianAttackDamage = 5.0
-		#Attack speed of refined_obsidian swords.
-		refined_obsidianSwordAtkSpeed = -2.4000000953674316
-		#Natural enchantability factor of refined_obsidian items.
-		#Range: > 0
-		refined_obsidianEnchantability = 12
-		#Maximum durability of refined_obsidian shields.
-		#Range: > 0
-		refined_obsidianShieldDurability = 2240
-		#Attack speed of refined_obsidian axes.
-		refined_obsidianAxeAtkSpeed = -2.0
-		#Attack damage modifier of refined_obsidian paxels.
-		refined_obsidianPaxelDamage = 3.0
-		#Natural enchantability factor of refined_obsidian paxels.
-		#Range: > 0
-		refined_obsidianPaxelEnchantability = 12
-		#Attack damage modifier of refined_obsidian swords.
-		refined_obsidianSwordDamage = 3.0
-		#Attack damage modifier of refined_obsidian shovels.
-		refined_obsidianShovelDamage = 1.0
-		#Attack damage modifier of refined_obsidian hoes.
-		refined_obsidianHoeDamage = -10.0
-		#Maximum durability of refined_obsidian boots.
-		#Range: > 1
-		refined_obsidianBootDurability = 650
-		#Efficiency of refined_obsidian paxels.
-		refined_obsidianPaxelEfficiency = 11.0
-		#Efficiency of refined_obsidian tools.
-		refined_obsidianEfficiency = 10.0
-		#Maximum durability of refined_obsidian tools.
-		#Range: > 1
-		refined_obsidianToolMaxUses = 1500
-		#Maximum durability of refined_obsidian chestplates.
-		#Range: > 1
-		refined_obsidianChestplateDurability = 800
-		#Maximum durability of refined_obsidian leggings.
-		#Range: > 1
-		refined_obsidianLeggingDurability = 750
-		#Attack damage modifier of refined_obsidian pickaxes.
-		refined_obsidianPickaxeDamage = 1.0
-		#Base armor knockback resistance value of refined_obsidian armor.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		refined_obsidianKnockbackResistance = 0.10000000149011612
-		#Harvest level of refined_obsidian tools.
-		#Range: > 0
-		refined_obsidianHarvestLevel = 3
-		#Attack speed of refined_obsidian paxels.
-		refined_obsidianPaxelAtkSpeed = -2.4000000953674316
-		#Protection value of refined_obsidian boots.
-		#Range: > 0
-		refined_obsidianBootArmor = 4
-		#Protection value of refined_obsidian helmets.
-		#Range: > 0
-		refined_obsidianHelmetArmor = 4
-		#Attack speed of refined_obsidian shovels.
-		refined_obsidianShovelAtkSpeed = -3.0
-		#Protection value of refined_obsidian leggings.
-		#Range: > 0
-		refined_obsidianLeggingArmor = 7
-		#Maximum durability of refined_obsidian helmets.
-		#Range: > 1
-		refined_obsidianHelmetDurability = 550
-		#Maximum durability of refined_obsidian paxels.
-		#Range: > 1
-		refined_obsidianPaxelMaxUses = 1800
-
-	[tools.mobArmorSpawnRate]
-		#The chance that Mekanism Armor can spawn on mobs.
-		#Range: 0.0 ~ 1.0
-		general = 0.03
-
-		#Spawn chances for pieces of Steel gear. Note: These values are after the general mobArmorSpawnRate has been checked, and after an even split between armor types has been done.
-		[tools.mobArmorSpawnRate.steel]
-			#The chance that mobs can spawn with Steel Chestplates.
-			#Range: 0.0 ~ 1.0
-			chestplateChance = 0.5
-			#The chance that mobs can spawn with Steel Boots.
-			#Range: 0.0 ~ 1.0
-			bootsChance = 0.5
-			#The chance that mobs can spawn with Steel Leggings.
-			#Range: 0.0 ~ 1.0
-			leggingsChance = 0.5
-			#The chance that mobs can spawn with Steel Helmets.
-			#Range: 0.0 ~ 1.0
-			helmetChance = 0.5
-			#The chance that mobs can spawn with Steel Swords.
-			#Range: 0.0 ~ 1.0
-			swordChance = 0.5
-
-		#Spawn chances for pieces of Refined Glowstone gear. Note: These values are after the general mobArmorSpawnRate has been checked, and after an even split between armor types has been done.
-		[tools.mobArmorSpawnRate.refined_glowstone]
-			#The chance that mobs can spawn with Refined Glowstone Chestplates.
-			#Range: 0.0 ~ 1.0
-			chestplateChance = 0.5
-			#The chance that mobs can spawn with Refined Glowstone Boots.
-			#Range: 0.0 ~ 1.0
-			bootsChance = 0.5
-			#The chance that mobs can spawn with Refined Glowstone Leggings.
-			#Range: 0.0 ~ 1.0
-			leggingsChance = 0.5
-			#The chance that mobs can spawn with Refined Glowstone Helmets.
-			#Range: 0.0 ~ 1.0
-			helmetChance = 0.5
-			#The chance that mobs can spawn with Refined Glowstone Swords.
-			#Range: 0.0 ~ 1.0
-			swordChance = 0.5
-
-		#Spawn chances for pieces of Lapis Lazuli gear. Note: These values are after the general mobArmorSpawnRate has been checked, and after an even split between armor types has been done.
-		[tools.mobArmorSpawnRate.lapis_lazuli]
-			#The chance that mobs can spawn with Lapis Lazuli Chestplates.
-			#Range: 0.0 ~ 1.0
-			chestplateChance = 0.5
-			#The chance that mobs can spawn with Lapis Lazuli Boots.
-			#Range: 0.0 ~ 1.0
-			bootsChance = 0.5
-			#The chance that mobs can spawn with Lapis Lazuli Leggings.
-			#Range: 0.0 ~ 1.0
-			leggingsChance = 0.5
-			#The chance that mobs can spawn with Lapis Lazuli Helmets.
-			#Range: 0.0 ~ 1.0
-			helmetChance = 0.5
-			#The chance that mobs can spawn with Lapis Lazuli Swords.
-			#Range: 0.0 ~ 1.0
-			swordChance = 0.5
-
-		#Spawn chances for pieces of Osmium gear. Note: These values are after the general mobArmorSpawnRate has been checked, and after an even split between armor types has been done.
-		[tools.mobArmorSpawnRate.osmium]
-			#The chance that mobs can spawn with Osmium Chestplates.
-			#Range: 0.0 ~ 1.0
-			chestplateChance = 0.5
-			#The chance that mobs can spawn with Osmium Boots.
-			#Range: 0.0 ~ 1.0
-			bootsChance = 0.5
-			#The chance that mobs can spawn with Osmium Leggings.
-			#Range: 0.0 ~ 1.0
-			leggingsChance = 0.5
-			#The chance that mobs can spawn with Osmium Helmets.
-			#Range: 0.0 ~ 1.0
-			helmetChance = 0.5
-			#The chance that mobs can spawn with Osmium Swords.
-			#Range: 0.0 ~ 1.0
-			swordChance = 0.5
-
-		#Spawn chances for pieces of Refined Obsidian gear. Note: These values are after the general mobArmorSpawnRate has been checked, and after an even split between armor types has been done.
-		[tools.mobArmorSpawnRate.refined_obsidian]
-			#The chance that mobs can spawn with Refined Obsidian Chestplates.
-			#Range: 0.0 ~ 1.0
-			chestplateChance = 0.5
-			#The chance that mobs can spawn with Refined Obsidian Boots.
-			#Range: 0.0 ~ 1.0
-			bootsChance = 0.5
-			#The chance that mobs can spawn with Refined Obsidian Leggings.
-			#Range: 0.0 ~ 1.0
-			leggingsChance = 0.5
-			#The chance that mobs can spawn with Refined Obsidian Helmets.
-			#Range: 0.0 ~ 1.0
-			helmetChance = 0.5
-			#The chance that mobs can spawn with Refined Obsidian Swords.
-			#Range: 0.0 ~ 1.0
-			swordChance = 0.5
-
-		#Spawn chances for pieces of Bronze gear. Note: These values are after the general mobArmorSpawnRate has been checked, and after an even split between armor types has been done.
-		[tools.mobArmorSpawnRate.bronze]
-			#The chance that mobs can spawn with Bronze Chestplates.
-			#Range: 0.0 ~ 1.0
-			chestplateChance = 0.5
-			#The chance that mobs can spawn with Bronze Boots.
-			#Range: 0.0 ~ 1.0
-			bootsChance = 0.5
-			#The chance that mobs can spawn with Bronze Leggings.
-			#Range: 0.0 ~ 1.0
-			leggingsChance = 0.5
-			#The chance that mobs can spawn with Bronze Helmets.
-			#Range: 0.0 ~ 1.0
-			helmetChance = 0.5
-			#The chance that mobs can spawn with Bronze Swords.
-			#Range: 0.0 ~ 1.0
-			swordChance = 0.5
-
-	# Material Settings for bronze
-	[tools.bronze]
-		#Base armor toughness value of bronze armor.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		bronzeToughness = 0.0
-		#Protection value of bronze boots.
-		#Range: > 0
-		bronzeBootArmor = 2
-		#Attack speed of bronze hoes.
-		bronzeHoeAtkSpeed = 3.0
-		#Harvest level of bronze tools.
-		#Range: > 0
-		bronzeHarvestLevel = 2
-		#Protection value of bronze chestplates.
-		#Range: > 0
-		bronzeChestplateArmor = 6
-		#Attack damage modifier of bronze pickaxes.
-		bronzePickaxeDamage = 1.0
-		#Attack speed of bronze axes.
-		bronzeAxeAtkSpeed = -3.0999999046325684
-		#Maximum durability of bronze paxels.
-		#Range: > 1
-		bronzePaxelMaxUses = 250
-		#Maximum durability of bronze shields.
-		#Range: > 0
-		bronzeShieldDurability = 1568
-		#Attack speed of bronze pickaxes.
-		bronzePickaxeAtkSpeed = -2.799999952316284
-		#Protection value of bronze helmets.
-		#Range: > 0
-		bronzeHelmetArmor = 3
-		#Attack damage modifier of bronze axes.
-		bronzeAxeDamage = 1.5
-		#Maximum durability of bronze tools.
-		#Range: > 1
-		bronzeToolMaxUses = 250
-		#Maximum durability of bronze boots.
-		#Range: > 1
-		bronzeBootDurability = 455
-		#Protection value of bronze leggings.
-		#Range: > 0
-		bronzeLeggingArmor = 5
-		#Harvest level of bronze paxels.
-		#Range: > 0
-		bronzePaxelHarvestLevel = 3
-		#Base armor knockback resistance value of bronze armor.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		bronzeKnockbackResistance = 0.0
-		#Efficiency of bronze tools.
-		bronzeEfficiency = 7.0
-		#Natural enchantability factor of bronze items.
-		#Range: > 0
-		bronzeEnchantability = 9
-		#Attack damage modifier of bronze swords.
-		bronzeSwordDamage = 3.0
-		#Attack speed of bronze shovels.
-		bronzeShovelAtkSpeed = -3.0
-		#Maximum durability of bronze chestplates.
-		#Range: > 1
-		bronzeChestplateDurability = 560
-		#Maximum durability of bronze leggings.
-		#Range: > 1
-		bronzeLeggingDurability = 525
-		#Natural enchantability factor of bronze paxels.
-		#Range: > 0
-		bronzePaxelEnchantability = 10
-		#Base attack damage of bronze items.
-		#Range: 0.0 ~ 3.4028234663852886E38
-		bronzeAttackDamage = 2.0
-		#Attack speed of bronze swords.
-		bronzeSwordAtkSpeed = -2.4000000953674316
-		#Maximum durability of bronze helmets.
-		#Range: > 1
-		bronzeHelmetDurability = 385
-		#Attack damage modifier of bronze shovels.
-		bronzeShovelDamage = 0.5
-		#Attack damage modifier of bronze hoes.
-		bronzeHoeDamage = -6.0
-		#Attack speed of bronze paxels.
-		bronzePaxelAtkSpeed = -2.4000000953674316
-		#Attack damage modifier of bronze paxels.
-		bronzePaxelDamage = 3.0
-		#Efficiency of bronze paxels.
-		bronzePaxelEfficiency = 9.0
-

From 36829ab5a58bfdfd49456eab34a3c7b4895d0eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Thu, 21 Oct 2021 09:52:46 +0200
Subject: [PATCH 013/130] Update shaped.js

---
 .../enigmatica/kubejs/expert/recipetypes/rftools/shaped.js       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
index 9c4e3c61a6..8c627ef423 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
@@ -16,7 +16,6 @@ onEvent('recipes', (event) => {
     */
 
     const recipes = [
-        ,
         {
             output: 'rftoolsutility:screen_controller',
             pattern: ['ABA', 'BCB', 'ABA'],

From 6d0d382f595d122758ba0e70659bbc3965d17921 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Thu, 21 Oct 2021 07:35:40 -0400
Subject: [PATCH 014/130] Update Afrit Summon

removes craft loop. Now requires camel sacrifice
---
 kubejs/assets/kubejs/lang/en_us.json                        | 1 +
 .../enigmatica/kubejs/base/tags/entity/enigmatica/camels.js | 3 +++
 .../kubejs/expert/recipetypes/occultism/ritual.js           | 6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 kubejs/server_scripts/enigmatica/kubejs/base/tags/entity/enigmatica/camels.js

diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json
index d237b5e7e9..1a1463d653 100644
--- a/kubejs/assets/kubejs/lang/en_us.json
+++ b/kubejs/assets/kubejs/lang/en_us.json
@@ -58,6 +58,7 @@
     "ritual.occultism.sacrifice.gaia_guardian": "Guardian of Gaia",
     "ritual.occultism.sacrifice.pharaohs": "Pharaoh of Atum",
     "ritual.occultism.sacrifice.wither": "The Wither",
+    "ritual.occultism.sacrifice.camels": "Camel",
 
     "item.kubejs.craft_magical_feathers": "Ritual: Craft Magical Feathers.",
     "item.kubejs.craft_magical_feathers.tooltip": "Binds the Spirit of the Ender Dragon to grant Creative Flight.",
diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/entity/enigmatica/camels.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/entity/enigmatica/camels.js
new file mode 100644
index 0000000000..0c5d6c5f5c
--- /dev/null
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/tags/entity/enigmatica/camels.js
@@ -0,0 +1,3 @@
+onEvent('entity_type.tags', (event) => {
+    event.get('enigmatica:camels').add('atum:camel');
+});
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js
index c70ae76fe4..971851c144 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js
@@ -63,8 +63,8 @@ onEvent('recipes', (event) => {
             pentacle_id: 'occultism:summon_wild_afrit',
             duration: 6,
             entity_to_sacrifice: {
-                tag: 'forge:cows',
-                display_name: 'ritual.occultism.sacrifice.cows'
+                tag: 'enigmatica:camels',
+                display_name: 'ritual.occultism.sacrifice.camels'
             },
             entity_to_summon: 'occultism:afrit_wild',
             ritual_dummy: { item: 'occultism:ritual_dummy/summon_wild_afrit' },
@@ -72,7 +72,7 @@ onEvent('recipes', (event) => {
                 { item: 'eidolon:gold_inlay' },
                 { tag: 'botania:runes/fire' },
                 { item: 'eidolon:crimson_essence' },
-                { tag: 'botania:runes/wrath' },
+                { tag: 'botania:runes/fire' },
                 { item: 'ars_nouveau:red_archwood_wood' },
                 { item: 'ars_nouveau:red_archwood_wood' },
                 { item: 'ars_nouveau:red_archwood_wood' },

From 32cdd353423eca7ba265f64d56adb4985d7ecea4 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Thu, 21 Oct 2021 13:52:45 +0200
Subject: [PATCH 015/130] recpes -> recipes

---
 config/ftbquests/quests/chapters/resourceful_bees.snbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/ftbquests/quests/chapters/resourceful_bees.snbt b/config/ftbquests/quests/chapters/resourceful_bees.snbt
index 8e4f9d77ea..9bbba73685 100644
--- a/config/ftbquests/quests/chapters/resourceful_bees.snbt
+++ b/config/ftbquests/quests/chapters/resourceful_bees.snbt
@@ -955,7 +955,7 @@
 			description: [
 				"Progression in Resourceful Bees has changed as of E6 version 0.5.16."
 				""
-				"Tiered Beehives are no longer craftable, and are not part of Apiary recpes. Instead, the Bee Nests found via World Gen are used for initial Comb Generation, and both they and T4 Tiered Hive Upgrades are used in Apiary recipes."
+				"Tiered Beehives are no longer craftable, and are not part of Apiary recipes. Instead, the Bee Nests found via World Gen are used for initial Comb Generation, and both they and T4 Tiered Hive Upgrades are used in Apiary recipes."
 				""
 				"To upgrade these nests you can use in-world Tiered Hive Upgrades. The quests now reflect this change."
 				""

From 11cfb6cf78f33b68914afaf84e2fd793fe05b714 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Thu, 21 Oct 2021 09:23:00 -0400
Subject: [PATCH 016/130] speed changes

---
 .../enigmatica/kubejs/expert/recipes/remove.js     |  1 +
 .../expert/recipetypes/refinedstorage/shaped.js    | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipes/remove.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipes/remove.js
index 65db871a4e..975577efe9 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipes/remove.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipes/remove.js
@@ -70,6 +70,7 @@ onEvent('recipes', (event) => {
 
         'pneumaticcraft:explosion_crafting/compressed_iron_block',
         'pneumaticcraft:explosion_crafting/compressed_iron_ingot',
+        'pneumaticcraft:speed_upgrade',
 
         'powah:crafting/dielectric_paste_2',
         'powah:energizing/blazing_crystal_2',
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js
index 57a5aa66db..8de1cc7f2d 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js
@@ -92,6 +92,20 @@ onEvent('recipes', (event) => {
                 D: 'refinedstorage:wireless_transmitter'
             },
             id: 'refinedstorage:range_upgrade'
+        },
+        {
+            output: Item.of('4x refinedstorage:speed_upgrade'),
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: 'refinedstorage:upgrade',
+                B: 'pneumaticcraft:glycerol',
+                C: {
+                    type: 'pneumaticcraft:fluid',
+                    tag: 'forge:lubricant',
+                    amount: 1000
+                }
+            },
+            id: 'refinedstorage:speed_upgrade'
         }
     ];
 

From e2f3c3df15192107b67a19758f67209575e0dd92 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Thu, 21 Oct 2021 11:11:08 -0400
Subject: [PATCH 017/130] power cores, speed

---
 .../mekanism/metallurgic_infusing.js          |  8 ++++
 .../expert/recipetypes/powah/energizing.js    | 30 ++++++++++++++
 .../recipetypes/refinedstorage/shaped.js      | 39 +++++++++++++++++++
 .../expert/recipetypes/rftools/shaped.js      | 34 ++++++++++++++++
 4 files changed, 111 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js
index a2587946a5..15956ec407 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js
@@ -2,6 +2,7 @@ onEvent('recipes', (event) => {
     if (global.isExpertMode == false) {
         return;
     }
+    const id_prefix = 'enigmatica:expert/mekanism/metallurgic_infusing/';
     const recipes = [
         {
             output: 'mekanism:alloy_infused',
@@ -9,6 +10,13 @@ onEvent('recipes', (event) => {
             infusionInput: 'mekanism:redstone',
             infusionAmount: 10,
             id: 'mekanism:metallurgic_infusing/alloy/infused'
+        },
+        {
+            output: 'refinedstorage:stack_upgrade',
+            input: Item.of('4x refinedstorage:speed_upgrade'),
+            infusionInput: 'mekanism:redstone',
+            infusionAmount: 80,
+            id: 'refinedstorage:stack_upgrade'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
index dfb41b275f..a6618de700 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
@@ -185,6 +185,36 @@ onEvent('recipes', (event) => {
                 nbt: '{duration:5000.0f,time:0.0f,quality:200000.0f}'
             },
             id: `${id_prefix}blazing_rod`
+        },
+        {
+            ingredients: [
+                { item: 'rftoolsbase:machine_base' },
+                { item: 'powah:capacitor_blazing' },
+                { item: 'powah:capacitor_blazing' },
+                { item: 'powah:capacitor_blazing' },
+                { item: 'powah:capacitor_blazing' }
+            ],
+            energy: '500000',
+            result: {
+                item: 'rftoolspower:power_core2',
+                count: 1
+            },
+            id: 'rftoolspower:power_core2'
+        },
+        {
+            ingredients: [
+                { item: 'rftoolsbase:machine_base' },
+                { item: 'powah:capacitor_nitro' },
+                { item: 'powah:capacitor_nitro' },
+                { item: 'powah:capacitor_nitro' },
+                { item: 'powah:capacitor_nitro' }
+            ],
+            energy: '10000000',
+            result: {
+                item: 'rftoolspower:power_core3',
+                count: 1
+            },
+            id: 'rftoolspower:power_core3'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js
index 8de1cc7f2d..9977495930 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js
@@ -106,6 +106,45 @@ onEvent('recipes', (event) => {
                 }
             },
             id: 'refinedstorage:speed_upgrade'
+        },
+        {
+            output: 'refinedstorage:network_card',
+            pattern: ['ABA', 'ACA', 'ADA'],
+            key: {
+                A: 'refinedstorage:quartz_enriched_iron',
+                B: 'pneumaticcraft:printed_circuit_board',
+                C: 'refinedstorage:upgrade',
+                D: 'refinedstorage:advanced_processor'
+            },
+            id: 'refinedstorage:network_card'
+        },
+        {
+            output: 'refinedstorage:network_transmitter',
+            pattern: ['ABA', 'CDE', 'FGF'],
+            key: {
+                A: '#forge:gears/enderium',
+                B: 'rftoolsutility:matter_transmitter',
+                C: 'refinedstorage:construction_core',
+                D: 'refinedstorage:machine_casing',
+                E: 'refinedstorage:destruction_core',
+                F: '#forge:ingots/aeternium',
+                G: 'rftoolscontrol:cpu_core_2000'
+            },
+            id: 'refinedstorage:network_transmitter'
+        },
+        {
+            output: 'refinedstorage:network_receiver',
+            pattern: ['FGF', 'CDE', 'ABA'],
+            key: {
+                A: '#forge:gears/enderium',
+                B: 'rftoolsutility:matter_receiver',
+                C: 'refinedstorage:construction_core',
+                D: 'refinedstorage:machine_casing',
+                E: 'refinedstorage:destruction_core',
+                F: '#forge:ingots/aeternium',
+                G: 'rftoolscontrol:cpu_core_2000'
+            },
+            id: 'refinedstorage:network_receiver'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
index 8c627ef423..b02f0ee618 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
@@ -331,6 +331,40 @@ onEvent('recipes', (event) => {
                 E: 'rftoolsbase:machine_base'
             },
             id: 'rftoolsbase:tablet'
+        },
+        {
+            output: 'rftoolspower:dimensionalcell_simple',
+            pattern: ['AEA', 'BCB', 'ADA'],
+            key: {
+                A: 'rftoolspower:power_core1',
+                B: 'kubejs:dimensional_storage_crystal',
+                C: 'rftoolsbase:machine_frame',
+                D: 'powah:ender_core',
+                E: 'rftoolscontrol:advanced_network_card'
+            },
+            id: 'rftoolspower:dimensionalcell_simple'
+        },
+        {
+            output: 'rftoolspower:dimensionalcell',
+            pattern: ['ADA', 'BCB', 'ADA'],
+            key: {
+                A: 'rftoolspower:power_core2',
+                B: 'kubejs:dimensional_storage_crystal',
+                C: 'rftoolspower:dimensionalcell_simple',
+                D: 'rftoolsbase:infused_diamond'
+            },
+            id: 'rftoolspower:dimensionalcell'
+        },
+        {
+            output: 'rftoolspower:dimensionalcell_advanced',
+            pattern: ['ADA', 'BCB', 'ADA'],
+            key: {
+                A: 'rftoolspower:power_core3',
+                B: 'kubejs:dimensional_storage_crystal',
+                C: 'rftoolspower:dimensionalcell',
+                D: '#forge:gems/mana_diamond'
+            },
+            id: 'rftoolspower:dimensionalcell_advanced'
         }
     ];
 

From 5a50841c0b19e47eb6072de4d58e9934d05b442f Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Thu, 21 Oct 2021 11:14:38 -0400
Subject: [PATCH 018/130] Update energizing.js

---
 .../enigmatica/kubejs/expert/recipetypes/powah/energizing.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
index a6618de700..c5207295e7 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
@@ -209,7 +209,7 @@ onEvent('recipes', (event) => {
                 { item: 'powah:capacitor_nitro' },
                 { item: 'powah:capacitor_nitro' }
             ],
-            energy: '10000000',
+            energy: '1000000',
             result: {
                 item: 'rftoolspower:power_core3',
                 count: 1

From 1c16be296949469cafe895f80e0ba222c536f5d4 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Thu, 21 Oct 2021 11:15:11 -0400
Subject: [PATCH 019/130] Update energizing.js

---
 .../enigmatica/kubejs/expert/recipetypes/powah/energizing.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
index c5207295e7..a6618de700 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
@@ -209,7 +209,7 @@ onEvent('recipes', (event) => {
                 { item: 'powah:capacitor_nitro' },
                 { item: 'powah:capacitor_nitro' }
             ],
-            energy: '1000000',
+            energy: '10000000',
             result: {
                 item: 'rftoolspower:power_core3',
                 count: 1

From 686899df9e31604e0c293e7429ed2a470f8d7a09 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Thu, 21 Oct 2021 13:47:09 -0400
Subject: [PATCH 020/130] storage

---
 .../expert/recipetypes/rftools/shaped.js      | 54 +++++++++++++++++++
 .../recipetypes/rftools/shaped_coby_nbt.js    | 46 ++++++++++++++++
 2 files changed, 100 insertions(+)
 create mode 100644 kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped_coby_nbt.js

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
index b02f0ee618..5784fe5df0 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
@@ -365,6 +365,60 @@ onEvent('recipes', (event) => {
                 D: '#forge:gems/mana_diamond'
             },
             id: 'rftoolspower:dimensionalcell_advanced'
+        },
+        {
+            output: 'rftoolsutility:crafter1',
+            pattern: ['ABA', 'CDC', 'ABA'],
+            key: {
+                A: 'rftoolscontrol:ram_chip',
+                B: 'pneumaticcraft:smart_chest',
+                C: 'rftoolscontrol:craftingstation',
+                D: 'rftoolsbase:machine_frame'
+            },
+            id: 'rftoolsutility:crafter1'
+        },
+        {
+            output: 'rftoolsutility:crafter2',
+            pattern: ['ABA', 'CDC', 'ABA'],
+            key: {
+                A: 'rftoolscontrol:ram_chip',
+                B: 'powah:capacitor_blazing',
+                C: 'rftoolscontrol:craftingstation',
+                D: 'rftoolsutility:crafter1'
+            },
+            id: 'rftoolsutility:crafter2'
+        },
+        {
+            output: 'rftoolsutility:crafter3',
+            pattern: ['ABA', 'CDC', 'ABA'],
+            key: {
+                A: 'rftoolscontrol:ram_chip',
+                B: 'powah:capacitor_nitro',
+                C: 'rftoolscontrol:craftingstation',
+                D: 'rftoolsutility:crafter2'
+            },
+            id: 'rftoolsutility:crafter3'
+        },
+        {
+            output: 'rftoolsstorage:modular_storage',
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: 'thermal:gray_rockwool',
+                B: '#forge:plates/steel',
+                C: 'thermal:machine_frame'
+            },
+            id: 'rftoolsstorage:modular_storage'
+        },
+        {
+            output: 'rftoolsstorage:storage_module0',
+            pattern: ['ABA', 'CDC', 'ABA'],
+            key: {
+                A: '#thermal:glass/hardened',
+                B: 'ironchest:silver_chest',
+                C: 'buildinggadgets:construction_paste',
+                D: '#forge:gears/osmium'
+            },
+            id: 'rftoolsstorage:storage_module0'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped_coby_nbt.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped_coby_nbt.js
new file mode 100644
index 0000000000..ae6ec9c0f3
--- /dev/null
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped_coby_nbt.js
@@ -0,0 +1,46 @@
+onEvent('recipes', (event) => {
+    if (global.isExpertMode == false) {
+        return;
+    }
+
+    const recipes = [
+        {
+            result: { item: 'rftoolsstorage:storage_module1' },
+            pattern: ['ABA', 'CDC', 'ABA'],
+            key: {
+                A: { tag: 'thermal:glass/hardened' },
+                B: { item: 'ironchest:copper_chest' },
+                C: { item: 'buildinggadgets:construction_paste' },
+                D: { item: 'rftoolsstorage:storage_module0' }
+            },
+            id: 'rftoolsstorage:storage_module1'
+        },
+        {
+            result: { item: 'rftoolsstorage:storage_module2' },
+            pattern: ['ABA', 'CDC', 'ABA'],
+            key: {
+                A: { tag: 'thermal:glass/hardened' },
+                B: { item: 'ironchest:silver_chest' },
+                C: { item: 'buildinggadgets:construction_paste' },
+                D: { item: 'rftoolsstorage:storage_module1' }
+            },
+            id: 'rftoolsstorage:storage_module2'
+        },
+        {
+            result: { item: 'rftoolsstorage:storage_module3' },
+            pattern: ['ABA', 'CDC', 'ABA'],
+            key: {
+                A: { tag: 'thermal:glass/hardened' },
+                B: { item: 'ironchest:diamond_chest' },
+                C: { item: 'buildinggadgets:construction_paste' },
+                D: { item: 'rftoolsstorage:storage_module2' }
+            },
+            id: 'rftoolsstorage:storage_module3'
+        }
+    ];
+
+    recipes.forEach((recipe) => {
+        recipe.type = 'mcjtylib:copy_nbt';
+        event.custom(recipe).id(recipe.id);
+    });
+});

From 76e27c8cf9ef5e604d55544ffdeab7e2d355c1ea Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Thu, 21 Oct 2021 14:06:49 -0400
Subject: [PATCH 021/130] Update shaped.js

---
 .../expert/recipetypes/rftools/shaped.js      | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
index 5784fe5df0..616519f212 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
@@ -70,14 +70,26 @@ onEvent('recipes', (event) => {
         },
         {
             output: 'rftoolsutility:charged_porter',
-            pattern: [' C ', 'CBC', 'ACA'],
+            pattern: ['EAE', 'BCB', 'EDE'],
             key: {
-                A: '#forge:ingots/iron_aluminum',
-                B: 'pneumaticcraft:printed_circuit_board',
-                C: 'minecraft:ender_pearl'
+                A: 'rftoolsutility:matter_beamer',
+                B: 'portality:frame',
+                C: 'rftoolsbase:tablet',
+                D: 'rftoolsutility:matter_transmitter',
+                E: 'powah:capacitor_basic_large'
             },
             id: 'rftoolsutility:charged_porter'
         },
+        {
+            output: 'rftoolsutility:advanced_charged_porter',
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: 'powah:capacitor_nitro',
+                B: 'kubejs:dimensional_storage_crystal',
+                C: 'rftoolsutility:charged_porter'
+            },
+            id: 'rftoolsutility:advanced_charged_porter'
+        },
         {
             output: 'rftoolsbuilder:shape_card_pump',
             pattern: ['ABA', 'CDC', 'AEA'],

From 212a8bac671f4a0ff0281e8960135906a0678811 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Thu, 21 Oct 2021 14:20:02 -0400
Subject: [PATCH 022/130] Update dissolution_chamber.js

---
 .../industrialforegoing/dissolution_chamber.js     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
index 964a379b62..41d6d19cc0 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
@@ -27,14 +27,14 @@ onEvent('recipes', (event) => {
         */
         {
             inputs: [
-                'minecraft:redstone',
+                'immersiveengineering:tesla_coil',
                 'rftoolsbase:machine_frame',
-                'minecraft:redstone',
-                'minecraft:redstone_torch',
-                'minecraft:redstone_torch',
-                '#forge:ingots/gold_copper',
-                '#forge:ingots/gold_copper',
-                '#forge:ingots/gold_copper'
+                'immersiveengineering:tesla_coil',
+                'immersiveengineering:coil_hv',
+                'immersiveengineering:coil_hv',
+                'powah:energy_discharger_spirited',
+                'powah:capacitor_spirited',
+                'powah:energy_discharger_spirited'
             ],
             inputFluid: 'tconstruct:molten_obsidian',
             inputFluidAmount: 1000,

From b5dbb550cc569e10daf5725baaac6f770c344836 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Thu, 21 Oct 2021 15:33:49 -0400
Subject: [PATCH 023/130] early brine/lithium

---
 .../recipetypes/pneumaticcraft/refinery.js    | 31 +++++++++++++++++++
 .../pneumaticcraft/thermo_plant.js            |  8 +++++
 2 files changed, 39 insertions(+)
 create mode 100644 kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/refinery.js

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/refinery.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/refinery.js
new file mode 100644
index 0000000000..c00004fecb
--- /dev/null
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/refinery.js
@@ -0,0 +1,31 @@
+onEvent('recipes', (event) => {
+    if (global.isExpertMode == false) {
+        return;
+    }
+    const id_prefix = 'enigmatica:expert/pneumaticcraft/refinery/';
+    const recipes = [
+        {
+            input: { type: 'pneumaticcraft:fluid', fluid: 'minecraft:water', amount: 100 },
+            temperature: { min_temp: 373 },
+            results: [
+                { fluid: 'mekanism:brine', amount: 8 },
+                { fluid: 'mekanism:brine', amount: 2 }
+            ],
+            id: `${id_prefix}brine`
+        },
+        {
+            input: { type: 'pneumaticcraft:fluid', fluid: 'mekanism:brine', amount: 100 },
+            temperature: { min_temp: 373 },
+            results: [
+                { fluid: 'mekanism:lithium', amount: 8 },
+                { fluid: 'mekanism:lithium', amount: 2 }
+            ],
+            id: `${id_prefix}lithium`
+        }
+    ];
+
+    recipes.forEach((recipe) => {
+        recipe.type = 'pneumaticcraft:refinery';
+        event.custom(recipe).id(recipe.id);
+    });
+});
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/thermo_plant.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/thermo_plant.js
index cd4a30aed4..a55e7c3c75 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/thermo_plant.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/thermo_plant.js
@@ -120,6 +120,14 @@ onEvent('recipes', (event) => {
             exothermic: false,
             temperature: { min_temp: 1973 },
             id: 'rftoolspower:power_core1'
+        },
+        {
+            fluid_input: { type: 'pneumaticcraft:fluid', fluid: 'mekanism:lithium', amount: 100 },
+            item_output: { item: 'emendatusenigmatica:lithium_dust', count: 1 },
+            pressure: 2.0,
+            exothermic: true,
+            temperature: { max_temp: 453 },
+            id: `${id_prefix}lithium_dust`
         }
     ];
 

From 1b110502fc8ed6e7b7fdbef035d7b1bc3ab30a5e Mon Sep 17 00:00:00 2001
From: theboo <virgin6609@gmail.com>
Date: Thu, 21 Oct 2021 19:11:56 -0700
Subject: [PATCH 024/130] adds C&B client config and disables jei injection of
 bits

---
 config/chiselsandbits-client.toml | 111 ++++++++++++++++++++++++++++++
 1 file changed, 111 insertions(+)
 create mode 100644 config/chiselsandbits-client.toml

diff --git a/config/chiselsandbits-client.toml b/config/chiselsandbits-client.toml
new file mode 100644
index 0000000000..47d5a79ebd
--- /dev/null
+++ b/config/chiselsandbits-client.toml
@@ -0,0 +1,111 @@
+
+[client]
+
+	#Configuration entries related to the settings of gameplay aspects.
+	[client.settings]
+		#When enabled allows cycling through the tool modes of the chisel using (sneak) right clicks.
+		enable-right-click-mode-change = false
+		#When enabled changes the "damage"-bar indicator to be completely full when the bag is completely empty.
+		invert-bit-bag-fullness = false
+		#When enabled this gives each chisel its own chisel mode, instead of having a chisel mode globally.
+		per-chisel-mode = true
+		#When enabled notifies you of changes to for example tool modes in the chat.
+		chat-mode-notification = true
+		#When enabled shows the newly selected tool-mode in the item name.
+		item-name-mode-display = true
+
+		[client.settings.enable]
+
+			[client.settings.enable.toolbar]
+				#When enabled shows the tool mode of tools in the toolbar.
+				icons = true
+
+		[client.settings.clipboard]
+			#When enabled stores the data of broken chiseled blocks in your clipboard
+			add-broken-blocks = false
+
+		[client.settings.undo]
+			#The maximum amount of undo operations that are kept in memory. If more operations are added to the undo list, the oldest operations are removed from the list.
+			#Range: > -2147483648
+			max-count = 10
+
+		[client.settings.tape-measure]
+			#The maximum amount measurements stored before the oldest ones are removed.
+			#Range: > -2147483648
+			max-count = 10
+			#When enabled notifies you of measured sizes, measured with the tape measured, in the chat.
+			display-in-chat = true
+
+		[client.settings.radial]
+
+			[client.settings.radial.menu]
+				#The volume of the radial menu. Higher volume, makes the radial menu bigger.
+				#Range: 4.9E-324 ~ 1.7976931348623157E308
+				volume = 0.10000000149011612
+
+	[client.client]
+
+		#Performance related client configuration.
+		[client.client.performance]
+
+			[client.client.performance.bit-storage]
+
+				[client.client.performance.bit-storage.contents]
+
+					[client.client.performance.bit-storage.contents.cache]
+						#Determines the amount of models for the bit storage content, higher means more performance but also more memory usage.
+						#Range: 0 ~ 9223372036854775807
+						size = 100
+
+			[client.client.performance.max-drawn-region]
+				#The max hit box size of a chiselable region. Bigger requires more performance and more memory.
+				#Range: 4.9E-324 ~ 1.7976931348623157E308
+				size = 4.0
+
+			[client.client.performance.lighting]
+				#When enabled dynamic model generation extracts light map data from the models face data.
+				face-lightmap-extraction = true
+				#When enabled extracts the light emittance data from the block-state during dynamic model generation.
+				use-value = true
+
+			[client.client.performance.vertexformats]
+
+				[client.client.performance.vertexformats.custom]
+					#When enabled this prevents custom vertex formats from working.
+					disabled = true
+
+			[client.client.performance.models]
+
+				[client.client.performance.models.cache]
+					#The size of the model cache.
+					#Range: 3500 ~ 20000
+					size = 3500
+
+				[client.client.performance.models.builder]
+					#mod.chiselsandbits.config.client.performance.models.builder.threadcount.comment
+					#Range: 10 ~ 12
+					threadcount = 10
+
+			[client.client.performance.faces]
+
+				[client.client.performance.faces.cache]
+					#mod.chiselsandbits.config.client.performance.faces.cache.size.comment
+					#Range: 3500 ~ 20000
+					size = 10000
+
+		[client.client.client]
+
+			#client.gui
+			[client.client.client.gui]
+
+				[client.client.client.gui.radial-menu]
+					#radial-menu.mouse-indicator
+					mouse-indicator = false
+
+			[client.client.client.compat]
+
+				#mod.chiselsandbits.config.compat.jei.comment
+				[client.client.client.compat.jei]
+					#mod.chiselsandbits.config.compat.jei.inject-bits.comment
+					inject-bits = false
+

From 36e41c7f63c509f0903c2a1b7e507c1e4f69ceb1 Mon Sep 17 00:00:00 2001
From: theboo <virgin6609@gmail.com>
Date: Thu, 21 Oct 2021 20:38:48 -0700
Subject: [PATCH 025/130] Updates occultism chapter

---
 .../ftbquests/quests/chapters/occultism.snbt  | 132 ++++++++++++------
 1 file changed, 88 insertions(+), 44 deletions(-)

diff --git a/config/ftbquests/quests/chapters/occultism.snbt b/config/ftbquests/quests/chapters/occultism.snbt
index b5db4ca5ed..2da5d86232 100644
--- a/config/ftbquests/quests/chapters/occultism.snbt
+++ b/config/ftbquests/quests/chapters/occultism.snbt
@@ -548,22 +548,14 @@
 				type: "item"
 				item: "occultism:storage_controller"
 			}]
-			rewards: [
-				{
-					id: "0000000000000E6B"
-					type: "item"
-					title: "Tier 1 Dimensional Storage Stabilizer"
-					item: "occultism:storage_stabilizer_tier1"
-				}
-				{
-					id: "0000000000000E6C"
-					type: "command"
-					title: "Occultism Epic Loot Box"
-					icon: "kubejs:epic_lootbox"
-					command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:chests/quest_occultism_loot_epic"
-					player_command: false
-				}
-			]
+			rewards: [{
+				id: "0000000000000E6C"
+				type: "command"
+				title: "Occultism Epic Loot Box"
+				icon: "kubejs:epic_lootbox"
+				command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:chests/quest_occultism_loot_epic"
+				player_command: false
+			}]
 		}
 		{
 			x: 5.0d
@@ -591,7 +583,6 @@
 					type: "item"
 					title: "Tier 1 Dimensional Storage Stabilizer"
 					item: "occultism:storage_stabilizer_tier1"
-					count: 2
 				}
 				{
 					id: "0000000000000E5A"
@@ -1024,7 +1015,7 @@
 		}
 		{
 			icon: "minecraft:ender_pearl"
-			x: 4.0d
+			x: 6.0d
 			y: -1.0d
 			shape: "hexagon"
 			dependencies: ["0000000000000DC4"]
@@ -1301,7 +1292,7 @@
 		{
 			title: "Control the Weather!"
 			icon: "minecraft:sunflower"
-			x: -1.0d
+			x: 0.5d
 			y: 1.5d
 			shape: "hexagon"
 			description: [
@@ -1358,7 +1349,7 @@
 		}
 		{
 			icon: "minecraft:clock"
-			x: -1.0d
+			x: 0.5d
 			y: 2.5d
 			shape: "hexagon"
 			subtitle: "What Time is It?!?!"
@@ -1568,27 +1559,20 @@
 			]
 			dependencies: ["0000000000000CF7"]
 			id: "0000000000000E04"
-			tasks: [
-				{
-					id: "0000000000000E05"
-					type: "advancement"
-					title: "Summon Foliot Lumberjack"
-					icon: {
-						id: "occultism:book_of_calling_foliot_lumberjack"
-						Count: 1b
-						tag: {
-							spiritName: "Azurmiriarc"
-						}
+			tasks: [{
+				id: "0000000000000E05"
+				type: "advancement"
+				title: "Summon Foliot Lumberjack"
+				icon: {
+					id: "occultism:book_of_calling_foliot_lumberjack"
+					Count: 1b
+					tag: {
+						spiritName: "Azurmiriarc"
 					}
-					advancement: "occultism:occultism/summon_foliot_lumberjack"
-					criterion: ""
 				}
-				{
-					id: "0000000000000E0D"
-					type: "item"
-					item: "occultism:book_of_binding_foliot"
-				}
-			]
+				advancement: "occultism:occultism/summon_foliot_lumberjack"
+				criterion: ""
+			}]
 			rewards: [{
 				id: "0000000000000E06"
 				type: "command"
@@ -1681,8 +1665,8 @@
 		{
 			title: "Summon Drikwing Familiar"
 			icon: "minecraft:feather"
-			x: 0.0d
-			y: -0.5d
+			x: 2.0d
+			y: 0.0d
 			shape: "hexagon"
 			description: [
 				"The occultist is also able to summon familiars to assist them on their journey."
@@ -1907,7 +1891,7 @@
 			}]
 		}
 		{
-			x: -0.5d
+			x: 1.0d
 			y: 0.5d
 			shape: "hexagon"
 			subtitle: "I wear my sun glasses at night! :catjam:"
@@ -1963,10 +1947,11 @@
 		}
 		{
 			icon: "losttrinkets:octopus_leg"
-			x: 1.0d
-			y: -1.0d
+			x: 3.0d
+			y: 0.0d
 			shape: "hexagon"
 			subtitle: "Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn."
+			description: ["The Cthulu familiar provides the player with water breathing, and when upgraded by the blacksmith familiar he provides a mobile light source!"]
 			dependencies: ["0000000000000D9E"]
 			id: "37BA1FD75B5F474F"
 			tasks: [{
@@ -1986,5 +1971,64 @@
 				player_command: false
 			}]
 		}
+		{
+			x: 4.0d
+			y: 0.0d
+			shape: "hexagon"
+			description: [
+				"The Blacksmith familiar is one of the most useful familiars in the occultist's arsenal."
+				""
+				"While following the player or in the familiar ring, he will eat up all the stones you mine and give a chance to repair your tools/armor!"
+				""
+				"He is also able to upgrade many of your favorite familiars! Add some iron blocks or ingots to his anvil and he will go to work on familiars in the area."
+			]
+			dependencies: ["0000000000000D9E"]
+			id: "5C7B9EA6F5861807"
+			tasks: [{
+				id: "3AE8D0B894D9FAC1"
+				type: "advancement"
+				title: "Summon Blacksmith Familiar"
+				icon: "minecraft:anvil"
+				advancement: "occultism:occultism/familiar/blacksmith_upgrade"
+				criterion: ""
+			}]
+			rewards: [{
+				id: "6DB0BF49C13038F7"
+				type: "command"
+				title: "Occultism Epic Loot Box Reward"
+				icon: "kubejs:epic_lootbox"
+				command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:chests/quest_occultism_loot_epic"
+				player_command: false
+			}]
+		}
+		{
+			icon: "occultism:ritual_dummy/custom_ritual"
+			x: 1.5d
+			y: -1.5d
+			description: [
+				"These are just a few of the great familiars the occultist can summon."
+				""
+				"Check the dictionary of spirits for many more helpful friends!"
+			]
+			dependencies: [
+				"0000000000000F3C"
+				"37BA1FD75B5F474F"
+				"5C7B9EA6F5861807"
+				"7FC9B2436C688AAC"
+			]
+			dependency_requirement: "one_completed"
+			id: "6267BAB65DB567DA"
+			tasks: [{
+				id: "6BEA5559EF14E691"
+				type: "checkmark"
+				title: "MOAR Familiars!"
+			}]
+			rewards: [{
+				id: "751C76DF5C4D8BA3"
+				type: "item"
+				item: "occultism:book_of_binding_djinni"
+				count: 3
+			}]
+		}
 	]
 }

From bb0586a4c08871050a3aa3c1b63512b7225f8a9a Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Fri, 22 Oct 2021 00:24:03 -0400
Subject: [PATCH 026/130] memory sticks

---
 kubejs/assets/kubejs/lang/en_us.json          |  12 ++++++
 .../textures/item/memory_advanced_empty.png   | Bin 0 -> 263 bytes
 .../textures/item/memory_advanced_filled.png  | Bin 0 -> 305 bytes
 .../textures/item/memory_basic_empty.png      | Bin 0 -> 265 bytes
 .../textures/item/memory_basic_filled.png     | Bin 0 -> 308 bytes
 .../textures/item/memory_elite_empty.png      | Bin 0 -> 265 bytes
 .../textures/item/memory_elite_filled.png     | Bin 0 -> 307 bytes
 .../textures/item/memory_ultimate_empty.png   | Bin 0 -> 265 bytes
 .../textures/item/memory_ultimate_filled.png  | Bin 0 -> 307 bytes
 .../recipetypes/integrateddynamics/shaped.js  |   2 +-
 .../expert/recipetypes/kubejs/shaped.js       |  21 +++++++----
 .../expert/recipetypes/mekanism/shaped.js     |  35 ++++++++++++++----
 .../recipetypes/pneumaticcraft/assembly.js    |  14 ++++++-
 .../pneumaticcraft/pressure_chamber.js        |  27 ++++++++++++++
 .../recipetypes/thermal/machine/bottler.js    |  24 ++++++++++++
 kubejs/startup_scripts/item_registry.js       |  13 ++++++-
 16 files changed, 130 insertions(+), 18 deletions(-)
 create mode 100644 kubejs/assets/kubejs/textures/item/memory_advanced_empty.png
 create mode 100644 kubejs/assets/kubejs/textures/item/memory_advanced_filled.png
 create mode 100644 kubejs/assets/kubejs/textures/item/memory_basic_empty.png
 create mode 100644 kubejs/assets/kubejs/textures/item/memory_basic_filled.png
 create mode 100644 kubejs/assets/kubejs/textures/item/memory_elite_empty.png
 create mode 100644 kubejs/assets/kubejs/textures/item/memory_elite_filled.png
 create mode 100644 kubejs/assets/kubejs/textures/item/memory_ultimate_empty.png
 create mode 100644 kubejs/assets/kubejs/textures/item/memory_ultimate_filled.png

diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json
index 1a1463d653..e95b14e4b7 100644
--- a/kubejs/assets/kubejs/lang/en_us.json
+++ b/kubejs/assets/kubejs/lang/en_us.json
@@ -26,6 +26,15 @@
     "item.kubejs.ground_meat": "Ground Meat",
     "item.kubejs.amadron_survey_tools": "Amadron Survey Tools",
 
+    "item.kubejs.memory_basic_empty": "Prepared Basic Memory Chip",
+    "item.kubejs.memory_basic_filled": "Basic Memory Chip",
+    "item.kubejs.memory_advanced_empty": "Prepared Advanced Memory Chip",
+    "item.kubejs.memory_advanced_filled": "Advanced Memory Chip",
+    "item.kubejs.memory_elite_empty": "Prepared Elite Memory Chip",
+    "item.kubejs.memory_elite_filled": "Elite Memory Chip",
+    "item.kubejs.memory_ultimate_empty": "Prepared Ultimate Memory Chip",
+    "item.kubejs.memory_ultimate_filled": "Ultimate Memory Chip",
+
     "item.kubejs.machine_speed_augment_mk2": "Machine Speed MK2",
     "item.kubejs.machine_speed_augment_mk3": "Machine Speed MK3",
     "item.kubejs.machine_speed_augment_mk4": "Machine Speed MK4",
@@ -254,6 +263,9 @@
     "item.kubejs.pneumatic_boots_package": "Pneumatic Boots Assembly Package",
     "item.kubejs.pneumatic_boots_assembly": "Unpacked Pneumatic Boots Assembly Package",
 
+    "item.kubejs.basic_memory_package": "Basic Memory Chip Assembly Package",
+    "item.kubejs.basic_memory_assembly": "Unpacked Basic Memory Chip Assembly Package",
+
     "item.kubejs.1k_storage_part_package": "1k Storage Part Assembly Package",
     "item.kubejs.1k_storage_part_assembly": "Unpacked 1k Storage Part Assembly Package",
     "item.kubejs.4k_storage_part_package": "4k Storage Part Assembly Package",
diff --git a/kubejs/assets/kubejs/textures/item/memory_advanced_empty.png b/kubejs/assets/kubejs/textures/item/memory_advanced_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4232dba6e32126e29d6208c8b47d2375ef8320d
GIT binary patch
literal 263
zcmV+i0r>ujP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#!AV3xR5(v#WS|f*QmCI{kQk7cm-oNCyqux4vy%atCgeS7X=z5V7oI+S`X600
zi0|v`%kcQ|V-#~_Wo6-fS65ev0k~X1$Pg3*3=9kixtQT=b2EbjA0NZ%{CozGOHd2|
z=_X`|>BNZ)y!Q4C`=FL3B_$!e0JENuA;`{z8{o6v|33o*BZIxjFSz`H*UStS!had=
ze`RKP^^+Mcj;yBCb{oV6o7!3bi>r7uyu7oOffU+2bOXcyO29BM008C;U=iON*QEde
N002ovPDHLkV1l>nYc~J@

literal 0
HcmV?d00001

diff --git a/kubejs/assets/kubejs/textures/item/memory_advanced_filled.png b/kubejs/assets/kubejs/textures/item/memory_advanced_filled.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cc2a91a4cd01f14fdf6cc629048659664b783a5
GIT binary patch
literal 305
zcmV-10nYx3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#>q$gGR5(v#WS|f*QmCI{kQk7cm-nB|?=HiyP09@S93L?#?Uw`7n!LXmu774`
zuowBm@Z%o?0|yhThf8g@F@n9|z0U8y@&N^gdye-Rl=dsa4e|B$WqADfF^Vo(Sy?#W
z)zuYZ0LTT;obNM8?L}yYxdfjfC<Yi97!Zt*ug%R24t#tJr}Og}KrTTs0Hm9cA*K^2
zGVt2lGwg#}mXwr)@B++wLWUqa6K;UddjJ0n42%r+BER7B2VOHXSP1`Rxc`-z;nh!O
zxHz&Jcr0vcXZ<g(;?3~#&Q=CeX!Fnw5HC;yhJgV9lNM$XBefLh00000NkvXXu0mjf
DoBV%-

literal 0
HcmV?d00001

diff --git a/kubejs/assets/kubejs/textures/item/memory_basic_empty.png b/kubejs/assets/kubejs/textures/item/memory_basic_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..145d65749da96ec086463bd4a2fa54b37de541ce
GIT binary patch
literal 265
zcmV+k0rvihP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#!%0LzR5(v#WS|f*QmCI{kQk7cm-oNCyqux4vy%atCgeS7X=z5V7oI+S`X600
zi0|v`%kcQ|V-#~_Wo6-fS65ev0k~X1$Pg3*3=9kixtL-4ommXxrV<Q6@BJ7+E<rH>
zq??c->jXD3m`Rv2$Xu5MTb7iRgzy5)dP0UEI}>hz&wBs=3=E76_9DOF@&{fsGgt`!
zWw`&9nc>w>X1F-Ano`?s5EpD}XZ<g(;?3~#&Q=CeX!Fnw5CbRy!@vLl=4@aQ`0F+Y
P00000NkvXXu0mjfuSIG?

literal 0
HcmV?d00001

diff --git a/kubejs/assets/kubejs/textures/item/memory_basic_filled.png b/kubejs/assets/kubejs/textures/item/memory_basic_filled.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc6ce757f815e518fa1284aa9b1858fa70a9d068
GIT binary patch
literal 308
zcmV-40n7f0P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#?ny*JR5(v#WS|f*QmCI{kQk7cm-nB|?=HiyP09@S93L?#?Uw`7n!LXmu774`
zuowBm@Z%o?0|yhThf8g@F@n9|z0U8y@&N^gdye-Rl=dsa4e|B$WqADfF^Vo(Sy?#W
z)zuYZ0LTT;obNM8?L}yYxdfjfC<Yi97!Zt*>33!^h?`0<1iklT0J#Lk0FZ7%hO86Z
z#9$_2${=%H5^PygQWC-oFzX2!g6vGV0Y2;f|1&T!GT4j!g3BLx&CFmS{FmYWS7wG+
zKbhg;$ZFuRu&JH(zqpDw!^=Bc8AzecLpMOYKnWNI1^@t)c4iSLf(Cp50000<MNUMn
GLSTZ_y?^Hb

literal 0
HcmV?d00001

diff --git a/kubejs/assets/kubejs/textures/item/memory_elite_empty.png b/kubejs/assets/kubejs/textures/item/memory_elite_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddf1b9d0769dad84d013cf33056501eb2507c5e2
GIT binary patch
literal 265
zcmV+k0rvihP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#!%0LzR5(v#WS|f*QmCI{kQk7cm-oNCyqux4vy%atCgeS7X=z5V7oI+S`X600
zi0|v`%kcQ|V-#~_Wo6-fS65ev0k~X1$Pg3*3=9kixtJm41`h+Hu@}Saud5h9E<rH>
zq??c-soY@<K2ppK{<oKdElWyDLU;jYJt0Gooe4L<XTAS_1_nk3dy!vo`2(++87zeV
zGTi^l%<$?bGh7^5O{wiRhzmBgv;G%X@n(2=XDb6Kw0Y<Thyj#<VPF6N+U#HvpLIN)
P00000NkvXXu0mjfjo4;(

literal 0
HcmV?d00001

diff --git a/kubejs/assets/kubejs/textures/item/memory_elite_filled.png b/kubejs/assets/kubejs/textures/item/memory_elite_filled.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c1640bc81c228688a5880f305aa1c293c01b817
GIT binary patch
literal 307
zcmV-30nGl1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#?MXyIR5(v#WS|f*QmCI{kQk7cm-nB|?=HiyP09@S93L?#?Uw`7n!LXmu774`
zuowBm@Z%o?0|yhThf8g@F@n9|z0U8y@&N^gdye-Rl=dsa4e|B$WqADfF^Vo(Sy?#W
z)zuYZ0LTT;obNM8?L}yYxdfjfC<Yi97!Zt*lp8z@jK*FJv%jul0J#Lk0FZ7%hNN<b
zG5AO^Gx*<L4z?^QDGA{PnDvAVL3SqG0H5{#{}~t<8SF)V!Q~IUW@fMu{>yOxD>K8Z
zpUiM^WHs<u*woJYUtGnT;pLsJ45ZNJp&KAxpacv90|1BiW)U1LzN!EK002ovPDHLk
FV1i25fg}I`

literal 0
HcmV?d00001

diff --git a/kubejs/assets/kubejs/textures/item/memory_ultimate_empty.png b/kubejs/assets/kubejs/textures/item/memory_ultimate_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..f45d22d214657bb6705f188b24585e7c2dbb8e59
GIT binary patch
literal 265
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|4tu&dhFJI~
zrz{XK2wE{eae~Bz>C?aO-?L}V!p)l}GtN|dVw;(n>9#?9o?Y!P`B>wQ_pe`{{_x{t
zvPf}CYU;z9@bK^s#vL&ZCj>;8d3bm@cFsr)y{^nwsaVYRdCGGhh3N|<7%usqm@v6m
zMe@s<qY@UT`c1mtUS3WWjA^!t&J*Txnjc8t`@f!z&5f;kVtm0*=Jhirbz1%#-T8m&
z%!gO%#xXLHzAN9Fb#R+)-TY5H{9{^0Wx6)A=9bDAY#oeK8WIy27@o-_2rfuWEdhFm
N!PC{xWt~$(697g3Wdi^J

literal 0
HcmV?d00001

diff --git a/kubejs/assets/kubejs/textures/item/memory_ultimate_filled.png b/kubejs/assets/kubejs/textures/item/memory_ultimate_filled.png
new file mode 100644
index 0000000000000000000000000000000000000000..657c285a1a5760274475dc16d851d097644daa22
GIT binary patch
literal 307
zcmV-30nGl1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#?MXyIR5(v#WS|f*QmCI{kQk7cm-nB|?=HiyP09@S93L?#?Uw`7n!LXmu774`
zuowBm@Z%o?0|yhThf8g@F@n9|z0U8y@&N^gdye-Rl=dsa4e|B$WqADfF^Vo(Sy?#W
z)zuYZ0LTT;obNM8?L}yYxdfjfC<Yi97!Zt*Rb7u5<b})`%u}8-fLwxN07y3>Lr%_-
zWYDt~W8l=h2(~OKDGA{PnDvAVL3SqG0H5{#{}~t<8SF)V!Q~IUW@fMu{>yOxD>K8Z
zpUiM^WHs<u*woJYUtGnT;pLsJ45ZNJp&KAxpacv90|1jIW)YXZ*!lnf002ovPDHLk
FV1kmcf@A;y

literal 0
HcmV?d00001

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/integrateddynamics/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/integrateddynamics/shaped.js
index 1a00216399..866881c2c4 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/integrateddynamics/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/integrateddynamics/shaped.js
@@ -22,7 +22,7 @@ onEvent('recipes', (event) => {
                 C: 'integrateddynamics:menril_wood',
                 D: 'pneumaticcraft:smart_chest',
                 E: 'pneumaticcraft:upgrade_matrix',
-                F: 'pneumaticcraft:memory_stick'
+                F: 'kubejs:memory_advanced_filled'
             },
             id: 'integrateddynamics:crafting/variablestore'
         },
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/kubejs/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/kubejs/shaped.js
index 65633b7a6b..05bc79071f 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/kubejs/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/kubejs/shaped.js
@@ -18,17 +18,12 @@ onEvent('recipes', (event) => {
     const recipes = [
         {
             output: 'kubejs:basic_circuit_package',
-            pattern: ['AAA', 'EDB', 'CCC'],
+            pattern: ['AA ', 'BB ', 'CCD'],
             key: {
                 A: 'refinedstorage:improved_processor',
-
-                B: Item.of(
-                    'pneumaticcraft:memory_stick',
-                    '{BlockEntityTag:{SavedTanks:{Tank:{FluidName:"pneumaticcraft:memory_essence",Amount:64000}}}}'
-                ).weakNBT(),
+                B: 'kubejs:memory_basic_filled',
                 C: 'pneumaticcraft:printed_circuit_board',
-                D: 'mekanism:cardboard_box',
-                E: 'immersiveengineering:wirecoil_redstone'
+                D: 'mekanism:cardboard_box'
             },
             id: `${id_prefix}basic_circuit_package`
         },
@@ -51,6 +46,16 @@ onEvent('recipes', (event) => {
             },
             id: `${id_prefix}red_nether_brick`
         },
+        {
+            output: 'kubejs:basic_memory_package',
+            pattern: ['AAA', 'AAA', 'BC '],
+            key: {
+                A: 'rftoolscontrol:ram_chip',
+                B: 'mekanism:cardboard_box',
+                C: 'pneumaticcraft:unassembled_pcb'
+            },
+            id: `${id_prefix}basic_memory_package`
+        },
 
         // Storage Parts
         {
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index 7e791eefb6..9f516caa59 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -41,16 +41,37 @@ onEvent('recipes', (event) => {
             id: 'mekanism:resistive_heater'
         },
         {
-            output: 'mekanism:metallurgic_infuser',
+            output: 'mekanism:thermal_evaporation_controller',
+            pattern: ['AAA', 'BCD', 'AAA'],
+            key: {
+                A: 'mekanism:thermal_evaporation_block',
+                B: '#forge:circuits/advanced',
+                C: '#industrialforegoing:machine_frame/advanced',
+                D: 'rftoolsbase:tablet'
+            },
+            id: 'mekanism:thermal_evaporation/controller'
+        },
+        {
+            output: Item.of('2x mekanism:thermal_evaporation_block'),
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: '#forge:plates/bronze',
+                B: 'pneumaticcraft:heat_pipe',
+                C: 'immersiveengineering:alloybrick'
+            },
+            id: 'mekanism:thermal_evaporation/block'
+        },
+        {
+            output: 'mekanism:thermal_evaporation_valve',
             pattern: ['ABA', 'CDC', 'AEA'],
             key: {
-                A: '#forge:gears/osmium',
-                B: 'rftoolspower:blazing_agitator',
-                C: '#forge:circuits/basic',
-                D: 'thermal:machine_bottler',
-                E: 'rftoolspower:cell1'
+                A: 'mekanism:thermal_evaporation_block',
+                B: 'create:copper_valve_handle',
+                C: 'create:fluid_pipe',
+                D: 'create:fluid_valve',
+                E: '#forge:circuits/advanced'
             },
-            id: 'mekanism:metallurgic_infuser'
+            id: 'mekanism:thermal_evaporation/valve'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/assembly.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/assembly.js
index 1e172d4bab..34623a4ada 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/assembly.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/assembly.js
@@ -36,7 +36,7 @@ onEvent('recipes', (event) => {
         },
         {
             input: { item: 'kubejs:basic_circuit_assembly', count: 1 },
-            output: { item: 'mekanism:basic_control_circuit', count: 3 },
+            output: { item: 'mekanism:basic_control_circuit', count: 2 },
             program: 'laser',
             id: 'mekanism:control_circuit/basic'
         },
@@ -45,6 +45,18 @@ onEvent('recipes', (event) => {
             output: { item: 'occultism:lenses', count: 3 },
             program: 'laser',
             id: 'occultism:crafting/lenses'
+        },
+        {
+            input: { item: 'kubejs:basic_memory_package', count: 1 },
+            output: { item: 'kubejs:basic_memory_assembly', count: 1 },
+            program: 'drill',
+            id: `${id_prefix}basic_memory_assembly`
+        },
+        {
+            input: { item: 'kubejs:basic_memory_assembly', count: 1 },
+            output: { item: 'kubejs:memory_basic_empty', count: 2 },
+            program: 'laser',
+            id: `${id_prefix}memory_basic_empty`
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/pressure_chamber.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/pressure_chamber.js
index da4343e7a2..a52447fde7 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/pressure_chamber.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/pressure_chamber.js
@@ -194,6 +194,33 @@ onEvent('recipes', (event) => {
             pressure: 2.0,
             results: [{ item: 'integrateddynamics:variable_transformer_input', count: 1 }],
             id: `${id_prefix}variable_transformer_input`
+        },
+        {
+            inputs: [
+                { item: 'kubejs:memory_basic_empty', count: 2 },
+                { item: 'fluxnetworks:flux_dust', count: 1 }
+            ],
+            pressure: 4.0,
+            results: [{ item: 'kubejs:memory_advanced_empty', count: 1 }],
+            id: `${id_prefix}memory_advanced_empty`
+        },
+        {
+            inputs: [
+                { item: 'kubejs:memory_advanced_empty', count: 2 },
+                { item: 'fluxnetworks:flux_dust', count: 1 }
+            ],
+            pressure: 4.0,
+            results: [{ item: 'kubejs:memory_elite_empty', count: 1 }],
+            id: `${id_prefix}memory_elite_empty`
+        },
+        {
+            inputs: [
+                { item: 'kubejs:memory_elite_empty', count: 2 },
+                { item: 'fluxnetworks:flux_dust', count: 1 }
+            ],
+            pressure: 4.0,
+            results: [{ item: 'kubejs:memory_ultimate_empty', count: 1 }],
+            id: `${id_prefix}memory_ultimate_empty`
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/bottler.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/bottler.js
index 3a95382e39..bd7e8261f8 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/bottler.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/bottler.js
@@ -33,6 +33,30 @@ onEvent('recipes', (event) => {
             fluid: Fluid.of('tconstruct:molten_netherite', 5184),
             output: 'extrastorage:netherite_crafter',
             id: 'extrastorage:netherite_crafter'
+        },
+        {
+            input: 'kubejs:memory_basic_empty',
+            fluid: Fluid.of('pneumaticcraft:memory_essence', 9000),
+            output: 'kubejs:memory_basic_filled',
+            id: `${id_prefix}memory_basic_filled`
+        },
+        {
+            input: 'kubejs:memory_advanced_empty',
+            fluid: Fluid.of('pneumaticcraft:memory_essence', 18000),
+            output: 'kubejs:memory_advanced_filled',
+            id: `${id_prefix}memory_advanced_filled`
+        },
+        {
+            input: 'kubejs:memory_elite_empty',
+            fluid: Fluid.of('pneumaticcraft:memory_essence', 36000),
+            output: 'kubejs:memory_elite_filled',
+            id: `${id_prefix}memory_elite_filled`
+        },
+        {
+            input: 'kubejs:memory_ultimate_empty',
+            fluid: Fluid.of('pneumaticcraft:memory_essence', 72000),
+            output: 'kubejs:memory_ultimate_filled',
+            id: `${id_prefix}memory_ultimate_filled`
         }
     ];
     recipes.forEach((recipe) => {
diff --git a/kubejs/startup_scripts/item_registry.js b/kubejs/startup_scripts/item_registry.js
index 1f4905ca36..7cd8d43edb 100644
--- a/kubejs/startup_scripts/item_registry.js
+++ b/kubejs/startup_scripts/item_registry.js
@@ -33,7 +33,15 @@ onEvent('item.registry', (event) => {
         'blast_brick_blend',
         'blast_brick',
         'red_nether_brick',
-        'ground_meat'
+        'ground_meat',
+        'memory_basic_empty',
+        'memory_basic_filled',
+        'memory_advanced_empty',
+        'memory_advanced_filled',
+        'memory_elite_empty',
+        'memory_elite_filled',
+        'memory_ultimate_empty',
+        'memory_ultimate_filled'
     ];
 
     const ritualDummies = [
@@ -65,6 +73,9 @@ onEvent('item.registry', (event) => {
         { name: 'dynamo_fuel_augment_mk3', texture: 'dynamo_fuel_augment' },
         { name: 'dynamo_fuel_augment_mk4', texture: 'dynamo_fuel_augment' },
 
+        { name: 'basic_memory_package', texture: 'assembly_package_filled' },
+        { name: 'basic_memory_assembly', texture: 'assembly_package_processing' },
+
         { name: 'basic_circuit_package', texture: 'assembly_package_filled' },
         { name: 'basic_circuit_assembly', texture: 'assembly_package_processing' },
         { name: 'basic_lenses_package', texture: 'assembly_package_filled' },

From 748a8dc502a35ace5d721ab47201f4e8a1dccf66 Mon Sep 17 00:00:00 2001
From: Harro van der Klauw <harro@zupr.nl>
Date: Fri, 22 Oct 2021 14:22:55 +0200
Subject: [PATCH 027/130] Added seaweed to kelp_like crops list.

---
 kubejs/server_scripts/enigmatica/kubejs/constants/crops.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js b/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js
index e93deb0ed4..b3688327b7 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js
@@ -2169,6 +2169,12 @@ const cropRegistry = [
                 render: 'upgrade_aquatic:tongue_kelp',
                 plant: 'upgrade_aquatic:tongue_kelp',
                 substrate: 'water'
+            },
+            {
+                seed: 'sushigocrafting:seaweed',
+                render: 'sushigocrafting:seaweed',
+                plant: 'sushigocrafting:seaweed',
+                substrate: 'water'
             }
         ]
     },

From db93d35342d9a47c51729a2264ab47889c9b7221 Mon Sep 17 00:00:00 2001
From: Harro van der Klauw <harro@zupr.nl>
Date: Fri, 22 Oct 2021 14:30:18 +0200
Subject: [PATCH 028/130] Also added missing wasabi.

---
 .../server_scripts/enigmatica/kubejs/constants/crops.js  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js b/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js
index b3688327b7..53e1488b75 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js
@@ -719,6 +719,12 @@ const cropRegistry = [
                 plant: 'sushigocrafting:soy_bean',
                 substrate: 'dirt'
             },
+            {
+                seed: 'sushigocrafting:wasabi_seeds',
+                render: 'sushigocrafting:wasabi_crop',
+                plant: 'sushigocrafting:wasabi_root',
+                substrate: 'dirt'
+            },
             {
                 seed: 'betterendforge:amber_root_seed',
                 render: 'betterendforge:amber_root_seed',
@@ -855,7 +861,8 @@ const cropRegistry = [
                 render: 'sushigocrafting:sesame_crop',
                 plant: 'sushigocrafting:sesame_seeds',
                 substrate: 'dirt'
-            }
+            },
+
         ]
     },
     {

From 69ef64aac39f932c507081afe6e3e59e680f2f3a Mon Sep 17 00:00:00 2001
From: Harro van der Klauw <harro@zupr.nl>
Date: Fri, 22 Oct 2021 14:36:09 +0200
Subject: [PATCH 029/130] Review feedback, extra comma and space.

---
 kubejs/server_scripts/enigmatica/kubejs/constants/crops.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js b/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js
index 53e1488b75..512badc7e7 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js
@@ -861,8 +861,7 @@ const cropRegistry = [
                 render: 'sushigocrafting:sesame_crop',
                 plant: 'sushigocrafting:sesame_seeds',
                 substrate: 'dirt'
-            },
-
+            }
         ]
     },
     {

From 047264b05591129461f2b240532bf7e9777d11ba Mon Sep 17 00:00:00 2001
From: Harro van der Klauw <harro@zupr.nl>
Date: Fri, 22 Oct 2021 14:50:48 +0200
Subject: [PATCH 030/130] Moved wasabi to crop_root.

---
 .../enigmatica/kubejs/constants/crops.js             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js b/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js
index 512badc7e7..d32dc58ad8 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/constants/crops.js
@@ -719,12 +719,6 @@ const cropRegistry = [
                 plant: 'sushigocrafting:soy_bean',
                 substrate: 'dirt'
             },
-            {
-                seed: 'sushigocrafting:wasabi_seeds',
-                render: 'sushigocrafting:wasabi_crop',
-                plant: 'sushigocrafting:wasabi_root',
-                substrate: 'dirt'
-            },
             {
                 seed: 'betterendforge:amber_root_seed',
                 render: 'betterendforge:amber_root_seed',
@@ -838,6 +832,12 @@ const cropRegistry = [
                 render: 'simplefarming:yam_crop',
                 plant: 'simplefarming:yam',
                 substrate: 'dirt'
+            },
+            {
+                seed: 'sushigocrafting:wasabi_seeds',
+                render: 'sushigocrafting:wasabi_crop',
+                plant: 'sushigocrafting:wasabi_root',
+                substrate: 'dirt'
             }
         ]
     },

From a5118d766cf0e38ce12f0425ff7f4e0f13131eb9 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Fri, 22 Oct 2021 08:52:57 -0400
Subject: [PATCH 031/130] Update tooltips.js

---
 kubejs/client_scripts/expert/item_modifiers/tooltips.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/kubejs/client_scripts/expert/item_modifiers/tooltips.js b/kubejs/client_scripts/expert/item_modifiers/tooltips.js
index baae214b67..4589a1db0f 100644
--- a/kubejs/client_scripts/expert/item_modifiers/tooltips.js
+++ b/kubejs/client_scripts/expert/item_modifiers/tooltips.js
@@ -33,10 +33,7 @@ onEvent('item.tooltip', (event) => {
             items: ['tconstruct:seared_melter'],
             text: [disabledInExpert, Text.of('Use the Smeltery Controller instead.').aqua()]
         },
-        {
-            items: ['kubejs:basic_circuit_package'],
-            text: [Text.of('Requires 64 Buckets of Memory Essence in the Memory Stick').aqua()]
-        },
+
         {
             items: ['resourcefulbees:t2_apiary', 'resourcefulbees:t3_apiary', 'resourcefulbees:t4_apiary'],
             text: [

From 70492f886fcdfbfe2724e8645e3846e217efc412 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Fri, 22 Oct 2021 09:07:15 -0400
Subject: [PATCH 032/130] Update dissolution_chamber.js

---
 .../dissolution_chamber.js                    | 50 ++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
index 41d6d19cc0..7acec7171e 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
@@ -2,7 +2,7 @@ onEvent('recipes', (event) => {
     if (global.isExpertMode == false) {
         return;
     }
-
+    const id_prefix = 'enigmatica:expert/industrialforegoing/dissolution_chamber/';
     const recipes = [
         /*
         {
@@ -104,6 +104,54 @@ onEvent('recipes', (event) => {
             outputFluid: '',
             outputFluidAmount: 0,
             id: 'rftoolsutility:matter_beamer'
+        },
+        {
+            inputs: [
+                'rftoolscontrol:cpu_core_500',
+                '#forge:alloys/advanced',
+                '#forge:alloys/advanced',
+                '#forge:circuits/basic',
+                'kubejs:memory_advanced_filled'
+            ],
+            inputFluid: 'mekanism:lithium',
+            inputFluidAmount: 100,
+            processingTime: 300,
+            outputItem: { item: 'mekanism:advanced_control_circuit', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:control_circuit/advanced'
+        },
+        {
+            inputs: [
+                'rftoolscontrol:cpu_core_1000',
+                '#forge:alloys/elite',
+                '#forge:alloys/elite',
+                '#forge:circuits/advanced',
+                'kubejs:memory_elite_filled'
+            ],
+            inputFluid: 'industrialforegoing:ether_gas',
+            inputFluidAmount: 100,
+            processingTime: 300,
+            outputItem: { item: 'mekanism:elite_control_circuit', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:control_circuit/elite'
+        },
+        {
+            inputs: [
+                'rftoolscontrol:cpu_core_2000',
+                '#forge:alloys/ultimate',
+                '#forge:alloys/ultimate',
+                '#forge:circuits/elite',
+                'kubejs:memory_ultimate_filled'
+            ],
+            inputFluid: 'kubejs:pink_ender_slime',
+            inputFluidAmount: 100,
+            processingTime: 300,
+            outputItem: { item: 'mekanism:ultimate_control_circuit', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:control_circuit/ultimate'
         }
     ];
 

From 9532e6d4af5f05246535f82f913e22829e4b20b6 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Fri, 22 Oct 2021 11:02:43 -0400
Subject: [PATCH 033/130] convert occultism rituals to use humans tag instead
 of wild hunt

wild_hunt_sacrifice has been deprecated by occultism
---
 .../enigmatica/kubejs/base/recipetypes/occultism/ritual.js   | 2 +-
 .../base/tags/entity/occultism/wild_hunt_sacrifices.js       | 5 +----
 .../enigmatica/kubejs/expert/recipetypes/occultism/ritual.js | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/occultism/ritual.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/occultism/ritual.js
index bab3da4094..6f7020e22a 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/occultism/ritual.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/occultism/ritual.js
@@ -296,7 +296,7 @@ onEvent('recipes', (event) => {
             pentacle_id: 'occultism:summon_wild_greater_spirit',
             duration: 3,
             entity_to_sacrifice: {
-                tag: 'occultism:wild_hunt_sacrifices',
+                tag: 'occultism:humans',
                 display_name: 'ritual.occultism.sacrifice.humans'
             },
             entity_to_summon: 'occultism:wild_hunt_wither_skeleton',
diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/entity/occultism/wild_hunt_sacrifices.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/entity/occultism/wild_hunt_sacrifices.js
index 5744334d39..54bde3644b 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/tags/entity/occultism/wild_hunt_sacrifices.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/tags/entity/occultism/wild_hunt_sacrifices.js
@@ -1,4 +1 @@
-onEvent('entity_type.tags', (event) => {
-    let entities = ['atum:villager_male', 'atum:villager_female', 'undergarden:stoneborn'];
-    event.get('occultism:wild_hunt_sacrifices').add(entities);
-});
+//TODO: Remove in 0.6.0. Tag Deprecated by Occultism. Now uses #occultism:humans
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js
index 971851c144..621824e4fc 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js
@@ -434,7 +434,7 @@ onEvent('recipes', (event) => {
             pentacle_id: 'occultism:possess_foliot',
             duration: 3,
             entity_to_sacrifice: {
-                tag: 'occultism:wild_hunt_sacrifices',
+                tag: 'occultism:humans',
                 display_name: 'ritual.occultism.sacrifice.humans'
             },
             entity_to_summon: 'occultism:greedy_familiar',
@@ -672,7 +672,7 @@ onEvent('recipes', (event) => {
             pentacle_id: 'occultism:summon_wild_afrit',
             duration: 6,
             entity_to_sacrifice: {
-                tag: 'occultism:wild_hunt_sacrifices',
+                tag: 'occultism:humans',
                 display_name: 'ritual.occultism.sacrifice.humans'
             },
             entity_to_summon: 'atum:pharaoh',

From 0d9887a33d8103dbf2ddb5a2013c3e805158443f Mon Sep 17 00:00:00 2001
From: theboo <virgin6609@gmail.com>
Date: Fri, 22 Oct 2021 09:54:27 -0700
Subject: [PATCH 034/130] Adds occultism goggles to goggles slot

---
 .../kubejs/base/tags/items/curios/goggles.js    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/curios/goggles.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/curios/goggles.js
index 48bf959b8f..891273f43f 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/curios/goggles.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/curios/goggles.js
@@ -1,8 +1,9 @@
-onEvent('item.tags', (event) => {
-    event.add('curios:createplus.goggle_slot', [
-        'artifacts:night_vision_goggles',
-        'botania:cosmetic_engineer_goggles',
-        'botania:monocle',
-        'advancedperipherals:ar_goggles'
-    ]);
-});
+onEvent('item.tags', (event) => {
+    event.add('curios:createplus.goggle_slot', [
+        'artifacts:night_vision_goggles',
+        'botania:cosmetic_engineer_goggles',
+        'botania:monocle',
+        'advancedperipherals:ar_goggles',
+        'occultism:otherworld_goggles'
+    ]);
+});

From e58e1b50049e10571cff24e5459cc9b94b081720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Fri, 22 Oct 2021 21:07:54 +0200
Subject: [PATCH 035/130] strings -> const

---
 .../enigmatica/kubejs/base/player/logged_in.js               | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/player/logged_in.js b/kubejs/server_scripts/enigmatica/kubejs/base/player/logged_in.js
index 29bd3a4648..ab4500366d 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/player/logged_in.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/player/logged_in.js
@@ -1,13 +1,14 @@
 onEvent('player.logged_in', (event) => {
+    const startingItemsGameStage = 'starting_items';
     randomWaystone = () => {
         const waystones = ['waystones:waystone', 'waystones:mossy_waystone', 'waystones:sandy_waystone'];
         return waystones[Math.floor(Math.random() * waystones.length + 1)];
     };
 
-    if (!event.hasGameStage('starting_items')) {
+    if (!event.hasGameStage(startingItemsGameStage)) {
         event.player.give(Item.of('ftbquests:book'));
         event.player.give(Item.of(randomWaystone()));
 
-        event.addGameStage('starting_items');
+        event.addGameStage(startingItemsGameStage);
     }
 });

From a724903c875f09829b4a6737ab609321dd59ecb7 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Fri, 22 Oct 2021 16:05:26 -0400
Subject: [PATCH 036/130] alloys

---
 .../kubejs/expert/recipes/remove.js           |  3 ++
 .../immersiveengineering/arc_furnace.js       | 15 +++++---
 .../expert/recipetypes/mekanism/reaction.js   | 34 +++++++++++++++++++
 .../thermal/machine/induction_smelter.js      | 33 ++++++++++++------
 4 files changed, 70 insertions(+), 15 deletions(-)
 create mode 100644 kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/reaction.js

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipes/remove.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipes/remove.js
index 975577efe9..26d6b44e17 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipes/remove.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipes/remove.js
@@ -57,6 +57,9 @@ onEvent('recipes', (event) => {
         'integrateddynamics:crafting/variable_transformer_output',
         'integrateddynamics:crafting/variable_transformer_input',
 
+        'mekanism:metallurgic_infusing/alloy/reinforced',
+        'mekanism:metallurgic_infusing/alloy/atomic',
+
         'minecraft:book',
         'minecraft:leather_to_stripes',
         'minecraft:stick',
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/arc_furnace.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/arc_furnace.js
index fd2ee9cfc8..ca05d98ed2 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/arc_furnace.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/arc_furnace.js
@@ -2,20 +2,25 @@ onEvent('recipes', (event) => {
     if (global.isExpertMode == false) {
         return;
     }
+    const id_prefix = 'enigmatica:expert/immersiveengineering/arc_furnace';
     var data = {
         recipes: [
             {
                 input1: Item.of('#forge:ingots/cobalt', 3),
                 secondaries: ['thermal:blizz_powder'],
-                outputs: [Item.of('undergarden:froststeel_ingot', 3)]
+                outputs: [Item.of('undergarden:froststeel_ingot', 3)],
+                id: `${id_prefix}froststeel_ingot`
+            },
+            {
+                input1: Ingredient.of('4x #forge:ingots/aluminum'),
+                secondaries: [Ingredient.of('4x #forge:dusts/lithium'), Ingredient.of('#forge:ingots/copper')],
+                outputs: [Item.of('4x mekanism:alloy_reinforced')],
+                id: `${id_prefix}alloy_reinforced`
             }
         ]
     };
 
     data.recipes.forEach((recipe) => {
-        const re = event.recipes.immersiveengineering.arc_furnace(recipe.outputs, recipe.input1, recipe.secondaries);
-        if (recipe.id) {
-            re.id(recipe.id);
-        }
+        event.recipes.immersiveengineering.arc_furnace(recipe.outputs, recipe.input1, recipe.secondaries).id(recipe.id);
     });
 });
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/reaction.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/reaction.js
new file mode 100644
index 0000000000..221fb753ab
--- /dev/null
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/reaction.js
@@ -0,0 +1,34 @@
+onEvent('recipes', (event) => {
+    if (global.isExpertMode == false) {
+        return;
+    }
+    const id_prefix = 'enigmatica:expert/thermal/reaction';
+    const recipes = [
+        {
+            itemInput: { ingredient: { tag: 'forge:ingots/manyullyn', count: 2 } },
+            fluidInput: { amount: 144, fluid: 'materialis:molten_shadow_steel' },
+            gasInput: { amount: 1000, gas: 'mekanism:polonium' },
+            energyRequired: 1000,
+            duration: 300,
+            itemOutput: { item: 'mekanism:alloy_atomic', count: 3 },
+            gasOutput: { gas: 'mekanism:spent_nuclear_waste', amount: 1000 },
+            id: `${id_prefix}alloy_atomic`
+        }
+    ];
+
+    recipes.forEach((recipe) => {
+        let constructed_recipe = {
+            type: 'mekanism:reaction',
+            itemInput: recipe.itemInput,
+            fluidInput: recipe.fluidInput,
+            gasInput: recipe.gasInput,
+            duration: recipe.duration,
+            itemOutput: recipe.itemOutput,
+            gasOutput: recipe.gasOutput
+        };
+        if (recipe.energyRequired) {
+            constructed_recipe.energyRequired = recipe.energyRequired;
+        }
+        event.custom(constructed_recipe).id(recipe.id);
+    });
+});
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/induction_smelter.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/induction_smelter.js
index 81a084ba26..4ca09b9f36 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/induction_smelter.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/induction_smelter.js
@@ -2,37 +2,50 @@ onEvent('recipes', (event) => {
     if (global.isExpertMode == false) {
         return;
     }
+    const id_prefix = 'enigmatica:expert/thermal/induction_smelter';
     const recipes = [
         {
             inputs: [Item.of('#forge:ingots/cobalt', 3), 'thermal:blizz_powder'],
-            outputs: [Item.of('undergarden:froststeel_ingot', 3)]
+            outputs: [Item.of('undergarden:froststeel_ingot', 3)],
+            id: `${id_prefix}froststeel_ingot`
         },
         {
             inputs: ['glassential:glass_ghostly', 'quark:white_crystal_cluster', 'atum:sand'],
-            outputs: [Item.of('atum:crystal_glass', 2)]
+            outputs: [Item.of('atum:crystal_glass', 2)],
+            id: `${id_prefix}crystal_glass`
         },
         {
             inputs: ['#forge:clay', '#forge:sand', '#forge:gravel'],
-            outputs: [Item.of('tconstruct:seared_brick', 2)]
+            outputs: [Item.of('tconstruct:seared_brick', 2)],
+            id: `${id_prefix}seared_brick`
         },
         {
             inputs: ['tconstruct:grout'],
-            outputs: ['tconstruct:seared_brick']
+            outputs: ['tconstruct:seared_brick'],
+            id: `${id_prefix}seared_brick_from_grout`
         },
         {
             inputs: ['minecraft:magma_cream', '#minecraft:soul_fire_base_blocks', '#forge:gravel'],
-            outputs: [Item.of('tconstruct:scorched_brick', 2)]
+            outputs: [Item.of('tconstruct:scorched_brick', 2)],
+            id: `${id_prefix}scorched_brick`
         },
         {
             inputs: ['tconstruct:nether_grout'],
-            outputs: ['tconstruct:scorched_brick']
+            outputs: ['tconstruct:scorched_brick'],
+            id: `${id_prefix}scorched_brick_from_nether_grout`
+        },
+        {
+            inputs: [
+                Ingredient.of('4x #forge:dusts/lithium'),
+                Ingredient.of('4x #forge:ingots/aluminum'),
+                Ingredient.of('#forge:ingots/copper')
+            ],
+            outputs: [Item.of('4x mekanism:alloy_reinforced')],
+            id: `${id_prefix}alloy_reinforced`
         }
     ];
 
     recipes.forEach((recipe) => {
-        const re = event.recipes.thermal.smelter(recipe.outputs, recipe.inputs);
-        if (recipe.id) {
-            re.id(recipe.id);
-        }
+        event.recipes.thermal.smelter(recipe.outputs, recipe.inputs).id(recipe.id);
     });
 });

From a92d074f930ae7ae1a23c79956e320db5adefad9 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Fri, 22 Oct 2021 17:29:44 -0400
Subject: [PATCH 037/130] Update shaped.js

---
 .../expert/recipetypes/mekanism/shaped.js     | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index 9f516caa59..1d8a2c0626 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -16,7 +16,7 @@ onEvent('recipes', (event) => {
         }
     */
 
-    const newRecipes = [
+    const recipes = [
         {
             output: 'mekanism:fuelwood_heater',
             pattern: ['BAB', 'CDC', 'BAB'],
@@ -45,7 +45,7 @@ onEvent('recipes', (event) => {
             pattern: ['AAA', 'BCD', 'AAA'],
             key: {
                 A: 'mekanism:thermal_evaporation_block',
-                B: '#forge:circuits/advanced',
+                B: '#forge:circuits/elite',
                 C: '#industrialforegoing:machine_frame/advanced',
                 D: 'rftoolsbase:tablet'
             },
@@ -53,11 +53,12 @@ onEvent('recipes', (event) => {
         },
         {
             output: Item.of('2x mekanism:thermal_evaporation_block'),
-            pattern: ['ABA', 'BCB', 'ABA'],
+            pattern: ['ADA', 'BCB', 'ADA'],
             key: {
                 A: '#forge:plates/bronze',
                 B: 'pneumaticcraft:heat_pipe',
-                C: 'immersiveengineering:alloybrick'
+                C: 'immersiveengineering:alloybrick',
+                D: '#mekanism:alloys/reinforced'
             },
             id: 'mekanism:thermal_evaporation/block'
         },
@@ -69,13 +70,23 @@ onEvent('recipes', (event) => {
                 B: 'create:copper_valve_handle',
                 C: 'create:fluid_pipe',
                 D: 'create:fluid_valve',
-                E: '#forge:circuits/advanced'
+                E: '#forge:circuits/elite'
             },
             id: 'mekanism:thermal_evaporation/valve'
+        },
+        {
+            output: Item.of('3x mekanism:structural_glass'),
+            pattern: ['ABC', 'BCB', 'CBA'],
+            key: {
+                A: '#mekanism:alloys/reinforced',
+                B: '#forge:plates/aluminum',
+                C: '#thermal:glass/hardened'
+            },
+            id: 'mekanism:structural_glass'
         }
     ];
 
-    newRecipes.forEach((recipe) => {
+    recipes.forEach((recipe) => {
         event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id);
     });
 });

From c3a73cc728923142ffbe1a8829993d047088e10a Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Fri, 22 Oct 2021 18:04:32 -0400
Subject: [PATCH 038/130] upgrades

---
 .../immersiveengineering/arc_furnace.js       |   2 +-
 .../dissolution_chamber.js                    | 114 ++++++++++++++++++
 .../thermal/machine/induction_smelter.js      |   2 +-
 3 files changed, 116 insertions(+), 2 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/arc_furnace.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/arc_furnace.js
index ca05d98ed2..58457bd6df 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/arc_furnace.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/arc_furnace.js
@@ -12,7 +12,7 @@ onEvent('recipes', (event) => {
                 id: `${id_prefix}froststeel_ingot`
             },
             {
-                input1: Ingredient.of('4x #forge:ingots/aluminum'),
+                input1: Ingredient.of('3x #forge:ingots/aluminum'),
                 secondaries: [Ingredient.of('4x #forge:dusts/lithium'), Ingredient.of('#forge:ingots/copper')],
                 outputs: [Item.of('4x mekanism:alloy_reinforced')],
                 id: `${id_prefix}alloy_reinforced`
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
index 7acec7171e..0ca3a2c3a8 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
@@ -152,6 +152,120 @@ onEvent('recipes', (event) => {
             outputFluid: '',
             outputFluidAmount: 0,
             id: 'mekanism:control_circuit/ultimate'
+        },
+        {
+            inputs: [
+                '#forge:gears/osmium',
+                'powah:blank_card',
+                '#forge:gears/osmium',
+                '#mekanism:alloys/infused',
+                '#mekanism:alloys/infused',
+                '#forge:nuggets/copper',
+                '#forge:nuggets/copper',
+                '#forge:nuggets/copper'
+            ],
+            inputFluid: 'pneumaticcraft:lubricant',
+            inputFluidAmount: 1000,
+            processingTime: 300,
+            outputItem: { item: 'mekanism:upgrade_speed', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:upgrade/speed'
+        },
+        {
+            inputs: [
+                '#forge:gears/cobalt',
+                'powah:blank_card',
+                '#forge:gears/cobalt',
+                '#mekanism:alloys/reinforced',
+                '#mekanism:alloys/reinforced',
+                '#forge:nuggets/copper',
+                '#forge:nuggets/copper',
+                '#forge:nuggets/copper'
+            ],
+            inputFluid: 'mekanism:lithium',
+            inputFluidAmount: 1000,
+            processingTime: 300,
+            outputItem: { item: 'mekanism:upgrade_energy', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:upgrade/energy'
+        },
+        {
+            inputs: [
+                '#forge:gears/bronze',
+                'powah:blank_card',
+                '#forge:gears/bronze',
+                '#mekanism:alloys/infused',
+                '#mekanism:alloys/infused',
+                '#forge:nuggets/copper',
+                '#forge:nuggets/copper',
+                '#forge:nuggets/copper'
+            ],
+            inputFluid: 'industrialforegoing:latex',
+            inputFluidAmount: 1000,
+            processingTime: 300,
+            outputItem: { item: 'mekanism:upgrade_filter', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:upgrade/filter'
+        },
+        {
+            inputs: [
+                '#forge:gears/silver',
+                'powah:blank_card',
+                '#forge:gears/silver',
+                '#mekanism:alloys/reinforced',
+                '#mekanism:alloys/reinforced',
+                '#forge:nuggets/copper',
+                '#forge:nuggets/copper',
+                '#forge:nuggets/copper'
+            ],
+            inputFluid: 'industrialforegoing:ether_gas',
+            inputFluidAmount: 1000,
+            processingTime: 300,
+            outputItem: { item: 'mekanism:upgrade_gas', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:upgrade/gas'
+        },
+        {
+            inputs: [
+                '#thermal:rockwool',
+                'powah:blank_card',
+                '#thermal:rockwool',
+                '#thermal:rockwool',
+                '#thermal:rockwool',
+                '#forge:nuggets/copper',
+                '#forge:nuggets/copper',
+                '#forge:nuggets/copper'
+            ],
+            inputFluid: 'integrateddynamics:liquid_chorus',
+            inputFluidAmount: 1000,
+            processingTime: 300,
+            outputItem: { item: 'mekanism:upgrade_muffling', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:upgrade/muffling'
+        },
+        {
+            inputs: [
+                'dustrial_decor:anchor',
+                'powah:blank_card',
+                'dustrial_decor:anchor',
+                '#mekanism:alloys/infused',
+                '#mekanism:alloys/infused',
+                '#forge:nuggets/copper',
+                '#forge:nuggets/copper',
+                '#forge:nuggets/copper'
+            ],
+            inputFluid: 'kubejs:pink_ender_slime',
+            inputFluidAmount: 1000,
+            processingTime: 300,
+            outputItem: { item: 'mekanism:upgrade_anchor', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:upgrade/anchor'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/induction_smelter.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/induction_smelter.js
index 4ca09b9f36..fab4d65ba0 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/induction_smelter.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/induction_smelter.js
@@ -37,7 +37,7 @@ onEvent('recipes', (event) => {
         {
             inputs: [
                 Ingredient.of('4x #forge:dusts/lithium'),
-                Ingredient.of('4x #forge:ingots/aluminum'),
+                Ingredient.of('3x #forge:ingots/aluminum'),
                 Ingredient.of('#forge:ingots/copper')
             ],
             outputs: [Item.of('4x mekanism:alloy_reinforced')],

From cdf684cb1bbc8b9642af2fa73493534cccf59c22 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Fri, 22 Oct 2021 21:40:55 -0400
Subject: [PATCH 039/130] boiler components

---
 .../textures/item/memory_advanced_empty.png   | Bin 263 -> 1892 bytes
 .../textures/item/memory_advanced_filled.png  | Bin 305 -> 1899 bytes
 .../textures/item/memory_basic_empty.png      | Bin 265 -> 1897 bytes
 .../textures/item/memory_basic_filled.png     | Bin 308 -> 1904 bytes
 .../textures/item/memory_elite_empty.png      | Bin 265 -> 1898 bytes
 .../textures/item/memory_elite_filled.png     | Bin 307 -> 1907 bytes
 .../textures/item/memory_ultimate_empty.png   | Bin 265 -> 1886 bytes
 .../textures/item/memory_ultimate_filled.png  | Bin 307 -> 1910 bytes
 .../expert/recipetypes/mekanism/reaction.js   |   2 +-
 .../expert/recipetypes/mekanism/shaped.js     |  53 ++++++++++++++++++
 10 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/kubejs/assets/kubejs/textures/item/memory_advanced_empty.png b/kubejs/assets/kubejs/textures/item/memory_advanced_empty.png
index c4232dba6e32126e29d6208c8b47d2375ef8320d..92eb67f61948a28f2578f8bd7a422cf0e1d24245 100644
GIT binary patch
literal 1892
zcmcIlYitx%6rNi9u%tp#5*j2j8HhsZ?7a3lcA=$P>=w3`vXLrQxO?xN-AQ+6#+m6p
z$`2|ASBw~9AR2?lA2tSwK>UGdqhJ)`BP5N`5CyeHkw}b18<kjNy|dk2i2>{%H<_I~
zGvEErcfNDx%<i7<`|Il#*HIKzAMOnGlJf%RsI4adOQ&W4Io)A&K4ekUyawl}pk6%C
zNKsWEtI<BYFS0>~dddZm9>cC|${=WpYFU#t035(J9m8=|3o?_VCm32qL1wcj!bgmD
zoKQQ5OuT8RI|_#eU;r^|R?{t6nGmF~4d`qtsabM1$P{>GvUYBB3|)ZO13{+E2}t)v
zdgylD#I(;Pu#o3@+81#7fDee0x0x1sQQ&w#Cx|T1%c4gXdAj&xNH`NIa&Kr|F&McD
zG6~x@WRA;ZGOmo|(#<$01Ofq$7dcU634*n9nhmn7W-Ti*gs=ro)v#4vqa8*N(+BM!
zL!{2;kTS}&npO0PIL2jx!3i$j$*Ba4L~adDrOIf_?nsj;MZGs9wxT%$bG_Ko2Th1O
z(pa;Xm4YEy-fIk+$wH<GayW@o1ZELoLOGO?&~4pH=r_ru{J5NrA-9_t*t!|j^<=41
zJtY=e6kQ&A#b#AQdd6DmC@OBiAz<Sm<5Z0mcvh66yd?7hSrS+AqRjKN&<JS+1Z*%j
zu#QwEHy3CmB8N501{%cSP>>;_T&jv>9(WNFyrhAo7|$wRx5Ne{4`u=I$2`#M@gN*4
z=py?=IvjNDbN0{nEz%+3C_5xW58?&I?PmoMAQnn)!~z9*Ssp;Y7sg_Mcf%6f1Exw|
z9gw`9)lr2AqaX>8R}_WCiqFp~yc@6qg^+nf5qYs6LD5ItLQqz8GX+SWs3{P~oT0@T
z`X4pzdQvwdIwGD+PB#;Fl0~O#k<#Ug@5d(mSaFq9=|a=V06M)MWS~=IjF{qW^#<<E
zP3J6aCV>g*Es8%2vvkGI028;xiPQhtT-?pXTOfUF>2oXm|0um^D@*__j>+WY7$+Id
z88Nd(;r?B(!n5nfQ3+0FoU<%XS8`FF&sZbWCYipcnTixeRkVdeZBhT8k+Z`34_X(V
z{COtq*_L0}tJgO+r;USS?;zuca~yrG>dNH>i)v1EZGOJV-k7gz@^|L1F!A}%t$b=C
z@WPVa>cKJJqhC#4`f~I>@C?}Bw<TP;f99U_Xn*D2<+~gAtV{PdUszi`|K0}b@Xl9y
z5U9x=AARrr!6P-p=N6CbtN8HZZBrB5|A-7k7IrKT$EH^805iYVzjpTfH$VSwOIJ_b
z@Ha;7@Z|Kar4Nb+^5U+h{GstH7vJ~-+H&fryXs%vw_;@M;S0y4M~<9dU)3djbo6rW
zSZDRO{_2y1{TrLE=C<cwAMf%%&CHvg-kQ`;A6R|-)SbU<I%C}Za$ZXRcI@i2+U>1N
zp7d^Qgta>sZ8$W(cHoRHv#p;=HQC&s6B9qa-BS7W@29dYUh0X4#~YSRxsM+;Ha5Te
f$)~YP=dV@P8!x@}7qfqt^BoL#bcYVF-L~^@FwlJ*

delta 235
zcmV<H02Ke^4u=AeB!2;OQb$4nuFf3k0002NNkl<ZI8S3_pb#)psGnhw7?78j_rJWn
zoT0O`lL46~<UMI=X-2RYo<4p0A6+wu@9XQ!@c8j#6mw){W#N2RS67GuxLiQU5EKIp
z3=9alnBi-4GlK&kAH(VVd<Kw9Pz(U+CS-`|#EA^N_Vx_>pk$UMB_$!e0JENuA;`{z
z8{o6v|33o*BZIxjFSz`H*UStS!had=e`RKP^^+Mcj;yBCb{oV6o7!3bi>r7uyu7oO
lffU+2bOXcyO29BM008C;U=iON*QEde002ovPDHLkV1h-lXv_cr

diff --git a/kubejs/assets/kubejs/textures/item/memory_advanced_filled.png b/kubejs/assets/kubejs/textures/item/memory_advanced_filled.png
index 9cc2a91a4cd01f14fdf6cc629048659664b783a5..e1057fe115e7c7d5d4d2072f20da36ace1e23269 100644
GIT binary patch
literal 1899
zcmcIlZEV$4814|rzK{hZ;G9}ZOhD-E>A9aRTwvRsyIbs7#*&Rm80WU9yJfc@wB7C<
z7-U0qpqTwwA_4)E2_|OjhY=GYIE{utLZV`#QHbLs=%1kyA|Hlio^JPEi2>Xno1FHX
zp65L8^M3U0?#71NImPA06h+Oci^rPCv&<WXv&sG0n-hpUimdp0hoVa6d!vBbe{c~+
z%{r?!x4Ny;OQLM*KBSll?91pDK~vPq)fo%Po!F%lxI;6d%<m^h8Cp}KOiNG#l2wh9
zT70XG*KKWRmbZ4wg2Jp`MX$_=gh0nGqBDBRaKucMndBA8+<VP2^d!XXj53v;LAq6H
zq^nIE(_tUa$^Za5Ecn7GjG#ZXoQ44M9Efl{WC0LiP=tWaUJNm3E2`KOdogQ_tfEZP
zbuE$O(&@A>?f02>2geJ7zyZiX$PxtW^cXJ6u!gfZ#}LDgY-^UQnFj4KqJ-JyMj0Y?
z$_L%b(;7}TP9$Pn23Z{M1D;Pgpd>vSs_S{Q<JNQ&D_Ok{BzBs6EX*}w$Lz9YT+@vW
zcX7^`BInOqU3O~HQ$^-*3hM;s5Mg}Yl$A7H(@B~S@gu*T_r?;dZH!#gZZ^$SE>n#;
z78*idkY3WF8H$;9mU@b^2XG9zILdfgV|l<re>3olJP`eG8Gs@HQ&5Q%f`VK$J+P^0
zYR`0_k|fp{j*AQ#*Ttd?5#`e~MT9&LkRQoxBm^<5$^py@{&0c~1O?>BYETYgeo_}X
zA2a1HFMQtlsk&86nQ-JIL~4UqLn@Zppc)RcvKk1o2}SX<0Y6j{D69eu6FIiEwnjc3
zl)9hQQ>75b2#-SmDm<$S0J2Ib5M~7+1X&EQtUw{43Xvc~E3&AXwvI@hXgcb^oMm({
z^gn8<&6H_Nrb1%w_o|t&6EEVLLsHk1{XW*=E!kO0qbG|_M6y@wQAYNXj1?yPT6;kB
zrl)g?Hl4(T^byIQf;pz@rjd;+J4mGev$(j2iFZ)<qoq$T@&BXrY*^(aGCDBnoE+mh
z!+9-cDk<E*^EJ75UpvadNssfU`R+;<`TmRzLT!`o8@T%GUldgkuZvYSNA@21?o|C_
zm1Upbn5YkY^~;PmF3et8dh{EnD&g#sKHOID#lrrc(wef88`Al<rSJbS)c;=Ju9>?-
zTe>cfh%t*j$ENSnRYxx#7`r$=J_1gIwad>P>Am>s{HON5UeJHF)fJyU=~MORdRLr!
zhFW;&ou%;j&cKHD4Od_xHPALR2zTsj-88SFbW}T5^yNV0ZGF4(M5ul2%nzLhTVA*q
zFRCxFUiswgik6T2#^*Xk4b{SHn`h3=6coQZ<JO{^f0n1O!KV7brsOgGLeZ+ik1|(E
z=Z&8jVb2%OUemi|4`o%<zO~@aiBD@5yeUUYt4j{NJT~mBt@wGxkB^^UCt2l(?i?Q0
zhcErMv1G@Y+xlnV^rZ=Q-{#|czTdxn^l)$K*A<uUUfy|q=z|+i4%R>a?e*?CYqqry
p+`g4b9d3)T>c(s9`P-fMW_A8_bpM`Zqu%e7s;g;;jZ|&w`x~Z|d-wnV

delta 278
zcmV+x0qOqh4zU7|B!2;OQb$4nuFf3k0002%Nkl<ZI8S3_pb#)psGnhw7?78j_n*!0
zF2k=)$_)1$A2BHHmjlz9yuTT)e`aQ|7x}~R;~xV92NSA?OKrC?g1z9q&hNkS0R@J8
zj`taq_A9~-@%8m(c>MS=iY{4MSvcR-)fHj@$OX@w?=wj4MSp09xdfjfC<Yi97!Zt*
zug%R24t#tJr}Og}KrTTs0Hm9cA*K^2GVt2lGwg#}mXwr)@B++wLWUqa6K;UddjJ0n
z42%r+BER7B2VOHXSP1`Rxc`-z;nh!OxHz&Jcr0vcXZ<g(;?3~#&Q=CeX!Fnw5HC;y
chJgV9lNM$XBM-F{=l}o!07*qoM6N<$f`yiSbN~PV

diff --git a/kubejs/assets/kubejs/textures/item/memory_basic_empty.png b/kubejs/assets/kubejs/textures/item/memory_basic_empty.png
index 145d65749da96ec086463bd4a2fa54b37de541ce..7a5716d48bd7e38776febed9456150953f5c59ae 100644
GIT binary patch
literal 1897
zcmcIlTWl0n7@pn`T4|~fTZN>PAu0{b&ShtJX9gB1-C|4JQcIziMBwb1Gu>f#F3wE5
zyA`BV8<7N}L5(0vB&~@CFNrobDl{e33noM~;Q<V#Mog<lA4rHAqn>GZS7HGB;v{G0
zoH^h5{_nrcKhHEbJ+!d&zEXl97B)6STJW>N8}sMkd-b)y0Ddg68af<;C|l%>0^-Qg
zDuO8aTx)H2+oKQ5(A0fEF=NP=)-8-Ch}CP;7Jv!lk}=e!8DZ*|k47m{Q^HhRAj(Fq
zIuzF$dTq41x2YBOCZMEHYuAvg(=sN|kqgMQo-`ae9j0b@Wjyy@GZZ-kaT8&x)-y=9
zN1Mqy(?(>-$I*~wSu!N~LLdZqe{dzqvpmPJBE#`C%gTH}=2<d(QP`ZVsB%kWL)I8x
zg{ipfS~A0=QYl}`?=$T#hLa?TVR?q<X^fzqjNyVbZ8*zv3=!l&TeDovG)RvT#LR9t
zOkt_BKIm4S)^M_M!VzQAz+yNb>-m%eMx(cf>UtjSxb;2QN>=YpiJjJrg_suPnB6u+
z^*zXNm*tEpFn`wSwv#iSDv&`*q+^(ag>iXPR@`(=CvM)tkNkGt8%wUU5pYer)ijg2
zOf~0NNS^lv$mMOCp_nPB##59%fFi&}Vam%I&9OA^Z)N>5E6IV-3YM2yb`~1Ng`fZz
z%nfWRnwpslG#Zr~4aWrrM2(R!g+=)^O_2o{<2gx%w5rAwTJZ}44T2#*9pu=UB5*<w
z3jB;Nd_H2rZZCY^`PsTvOo%!15t98uUPQbo(5ff~Xs8N+2BHw6IUXpY!g4WQ2<F%}
z*&6<IK=MXbPnCih{ZI%AC@9ga6i{e2C?Hy5@hlh+S<x>_Dkp^~Qh~B++B(2>qUoRu
zF_zIqk^iWvGn1wrH5D9lzgNwe9edHBIXHEh?Dw%5J(is%HFBotWB|Qd4^z-fGE%7Q
zYwae{o14yA+Eg52(%U3|7Ur0$n*uhf?ZT1%&*EZkCEfu&x0gP*#Q%@dvtfmCV00ne
zIT^}xhVfd=Y*Lti=WAx~hIW*L;~wWt^W7CM^8FbZnA*nOcgtN>34$ot&={$06%Py@
z8r@h_Tk-Vh3w?W921nA-{YB$nogO^@?UBWqJI+^rdHU0L8%oD2D<;TiTSgujxVUs*
z|G*Zq|3t@#{>}Q&I=}1TE)UE<Z1<d+_)}He+7li3U)Xwl@7X<Nt6n)+!hW)E(we#!
z>nJP#<3q7<$B(~1(WJcg<iwTl$I9O_O8ZLd2A{vDVyJNF%A@5g>R&`vaM$juOx$dW
zUz%5avS9M-s>8<~Y%E;2xZbJUy7Z^9pZhd%-nxy`lRJkyFTS}QUJAZ+dClGDdLuPg
z^;IL=-l;4u^;=d&@wPL2I}^mt;Umk%hBJ@X97XqbCf>hrbokWt_@U!P@XjTf(_`hu
zQ{#)SU;kji!Rq3^gODLl44--LDLwe|@}a5&8yxbta|M@QT`PUOi#|v0r=ENLjgqNj
sWfxMLGSk~L)*~x-pZy|sb>i2eC1;0Dvh6=~dOyR)`liU+>v#134T11^oB#j-

delta 237
zcmV<J022S{4v7MgB!2;OQb$4nuFf3k0002PNkl<ZI8S3_pb#)psGnhw7?78j_rJWn
zoT0O`lL46~<UMI=X-2RYo<4p0A6+wu@9XQ!@c8j#6mw){W#N2RS67GuxLiQU5EKIp
z3=9alm|^;zSq$Q)5)47_{TM(lK`{WNn~)*v1UE65NtiOoTxOR9Tb7iRgzy5)dP0UE
zI}>hz&wBs=3=E76_9DOF@&{fsGgt`!Ww`&9nc>w>X1F-Ano`?s5EpD}XZ<g(;?3~#
n&Q=CeX!Fnw5CbRy!@vLl=4@aQ`0F+Y00000NkvXXu0mjfJr`%-

diff --git a/kubejs/assets/kubejs/textures/item/memory_basic_filled.png b/kubejs/assets/kubejs/textures/item/memory_basic_filled.png
index bc6ce757f815e518fa1284aa9b1858fa70a9d068..b57ecec02f571a743e3a4925dbacf36ff1425d58 100644
GIT binary patch
literal 1904
zcmcIlZEVzJ9Pbej*dRc>7{w85F>${1`f}HGSLt?RH`#$V=5`4KeBo*P^sel#?b>d4
z+lS$njARPQ2xxHPWX#QIfXoErJ48qT6+;4X#F!}YizYw@G6QiKe0pyZ19M+&^0d#>
z=lA^nzyC}B?Qd*Yv$$k=35H>dBlY1X^jzwW1^1!*BiC;O^jK)tZ?rM2^nQ1Eu)%!~
zV%WT|wOEVO5`9jPjg${4h6H_?l!?$7wyHW~0=X4BxCG;xE)tWUA0u#05s3|4l#ZIU
zFrn3VS+KdQAtraV%0Y#wuEJMk1VoU64!|?1q;3ltk;w82XzsqI2s{gMT1BG9HHf!F
z8}VAhf;jJENSUT-oDceVzysD_@iflTEJM+i6vL7<EwG%x(s=$NkU2|Hg{JVcd1GiL
z5(&pK1&T_i)4sIdXIOEH2?m1{%~C8&A_Qr7>JG?|y1lZ%5QesFX{MtYI_@$8$!K>(
z0!hvJkTQ$3x}A>`iWrpvCdK$@*QWw78l4%MN)^$zQ`dp4<n`W_*p79YkZOXq(Qe7G
zt^?}M%7QUPE}k{ptz_0yMW$d9rVz|V!kD5dGhsM}oiOg<M{&F8jVaVx5IBYvGmK;*
zQ;h`{oMn9+UcN!o6(emw;VQ}>fMMW3k#Ms{GBnBhW3*pjXo2CLqFI5abI>R%1O+%?
zc3?x%)Xv#JqfsHE+YZoW7zv9666Mo0Mc|kUDD!?lDMN`S{cONb29=;pLddCV1rLEL
zRb+Lc^I=17cf;qN&(*DB$cUpDA%W+Z%1RbOQdJ~KR!RYM<5fQiX~?TAs|FPn7TDHX
z8v1lV@=jJ)m4X;$$k9*<21$kHB$AT?3JHP=M+PNX23$a8DkO%$6<JUXD+N%UXekhf
zl&QxF{2w*7M$)jNhJs@5cdHq(BQNST8>Ox@|9v#Ww)`xq;n|`Sfb7<~NXTxIp+e+e
zYj=s>>~!X6(+P-3XGneyW*e%L1{SP|qe%Z}aZ&dYZ-b7RrOz($|D*JLSmgxJ;}CUD
zig2Bw+!m8d3ia=NW%urAM+G?QaqhI(UD2Z0pP`PZE!2IlhP(|J=7~naHL=Q_qvt<d
zdm>bJ>e^(a=F+)G_m0-qw8h3>bWWceZhkp5HSfs9bqjj0;D65f<zcT-;#={-x{$Z5
z?A^xUA@MZ%6FyZoSaxzO_S?2wzg8W)HR)S6vFU;LNBaT;)04+H9a23zm;*mv`RwT4
zkNf6!zkS&=-u3;uzBBtS@@FOwHf!6l@}JkN)jYc%8dzw^2ffdG!H%{|_O{_KtM+ew
zZPDfxw@!K3?(XhSznd>E|6{7uUf41I1Gu~d8)zE4I>6)al$aM<KB_y(FS)r}Jg~=-
zAHR8I=;WL6fh}jRzfeC?HTU<#Ay2utMB3W>%(bEZk@D58J0}K5zTppT35Y$+_SZkz
zb#d;TBfZPs+T5C%zA+~>zo&HR#HQZJi8sE5dzz-E|MEU|)PCi{d+R&SzBG1rf9%PA
wdJ!3#ZW;fg?X*38{Hu-Jjpm^ZrMGuhcLfgb?|Jq7eD|LiscQ%yUcIIFZ}ho|2LJ#7

delta 281
zcmV+!0p|Yj4zvQ0B!2;OQb$4nuFf3k0002)Nkl<ZI8S3_pb#)psGnhw7?78j_n*!0
zF2k=)$_)1$A2BHHmjlz9yuTT)e`aQ|7x}~R;~xV92NSA?OKrC?g1z9q&hNkS0R@J8
zj`taq_A9~-@%8m(c>MS=iY{4MSvcR-)fHj@$OX@w?=wj4MSp09xdfjfC<Yi97!Zt*
z>33!^h?`0<1iklT0J#Lk0FZ7%hO86Z#9$_2${=%H5^PygQWC-oFzX2!g6vGV0Y2;f
z|1&T!GT4j!g3BLx&CFmS{FmYWS7wG+Kbhg;$ZFuRu&JH(zqpDw!^=Bc8AzecLpMOY
fKnWNI1^@t)b`oY0CxQli00000NkvXXu0mjf!IypF

diff --git a/kubejs/assets/kubejs/textures/item/memory_elite_empty.png b/kubejs/assets/kubejs/textures/item/memory_elite_empty.png
index ddf1b9d0769dad84d013cf33056501eb2507c5e2..5f0929ab9cff9ada44a09c1ba3d2edabdc8bc001 100644
GIT binary patch
literal 1898
zcmcIle`wrf7*2QV=DM~FR<M)R#dO8mEtfC3-?8Ufd)<1QSI_RSU6Ii*$#-}0?vgA?
zch@?m?S?vZPO&JA7VV%49do6_ZqP#Qkj<h)WI|CWn?pgj>ijK*!u-<SokO<Se>}+L
zOY(fr`@HY_<js+A^Ny0D2Z{)SC<!(NTJU+Db=<cK|8M&37R0ADTGJkbAl9z8jsoI%
ze>p)EPRo%tvn})lFRCd!lvDxPGbs(D38HpeMuTDknWTVXvf`(1j!#mgEcvNcR|tf(
z1{9Z@x^=X>yE!6uCq$n_ZF`KY&G48Yg-l3hQc1<&Gk$83m&a@CHbaq%5HsPY>aBoe
zTPRF6s5&A&c9s?a0Hnuf_dpNi9PX_o2RN1iUWVmp0C>*DbAZhLC>&0gqI^qWdo~!p
z@>6ls)OdzTr_=Vd!>;NvhV}V;4B!}!qcMUux)c*;XvL_^F$9ny>au3aszO?fP*6Kf
zKZT_(<&e_yw2G0f6RsGOff~cwft6DZ7z*7Rno8x-hS|6uN6G5FBe4<b(h$>v47F1i
zQR9B3n3cI;l9=DCb?V8*OeK*)NtD7c0}EsGp|rSaszzMBOCI^h`D`@4K}XP3^@yq_
zbDaw3SV)euyU6NRS&`JV@rb1;y8#8DiTsq+HJSx9=ZF9Y4}3i9-U2utfF)=M8$p65
zTpn1J<Y?D&prH^SR16a;A_@ll6c%NdWr-JDz~d9#h?YDqiS~+4Hw{@I7Uu;{00d6*
zdc{Rucz-|@JFW6r`<HwxsUqgcSBQ55AIrI2*p6Ng_ABRvv`-LSw9DaeM4g=AL>?i>
z_M|T3R|h6<XSGyGm{D{91l&;%?SL*P9d$YdT5z)hUU?)3>lH)~%Tc5x@=;Y!LF^Mb
z1!IWOlo&<+qozSks(MJ3aLpZ-n=w1iqDeMz>$<Y<$8NMQyGqLBqUm@jT3+{4qSa(1
zQQ6z_9jdoHolCUoIKrg&X#Nt+P@`rV>Zm@3EB&A5V(up1fcx()eR+-lAEjr@D#oD_
zLwIsBl$8u)jhLmTF#qn?;<MYvQ4Wr0oVCnPSA3D5&q%@4I-b74foq5$3U&ko^%3vU
zp*IJcZT0J3oUBU4+n?I^-CR*`UB_#$cQn88dqq>&o9U@p`Os8^>{=6O7>R@n>ic_E
z_6*l=oc(s}#Fm|-FW<2DjlZ|K!uRNv$y=Yz6(#7CAAh~m8J<_+`0N;Qp`0x*KCpLd
zVyfrzAqO%1*Zl^ywqjw`4gJ`U7fXqn;^5^kSDc8vTefg+8V-FjS}eYL`t(BK$%|(L
zQ-^<<^?fsA`(bY4%1s+N)IUCQ?dqnH2D*5IO+Maz?u&Te*!7w6!u8L7K6AM1SoP3E
zYW3OnQ@wR?RcUGON3VFpiITcAUzHWEJ~I6F`8{t9ez-kxY5J!=rM89#7s3No8|Ug?
zP-=xl?9kPpgT(jVKUbV@-_`$cvaGRssJ!$ggFG`}o0vQ>`uzOU{XKmxn}b3@_xrtn
rT&mprT<e3+l<j)w*U`3l&q3RfPY17`s@ibS`Wglsn*$#_-qHIv#GHAs

delta 237
zcmV<J022S|4v7MgB!2;OQb$4nuFf3k0002PNkl<ZI8S3_pb#)psGnhw7?78j_rJWn
zoT0O`lL46~<UMI=X-2RYo<4p0A6+wu@9XQ!@c8j#6mw){W#N2RS67GuxLiQU5EKIp
z3=9alm?7l`4+EpI7sKqYs~A8oK`{WNn~))?++hqpQp^ngw`P}vElWyDLU;jYJt0Go
zoe4L<XTAS_1_nk3dy!vo`2(++87zeVGTi^l%<$?bGh7^5O{wiRhzmBgv;G%X@n(2=
nXDb6Kw0Y<Thyj#<VPF6N+U#HvpLIN)00000NkvXXu0mjf9O7gZ

diff --git a/kubejs/assets/kubejs/textures/item/memory_elite_filled.png b/kubejs/assets/kubejs/textures/item/memory_elite_filled.png
index 6c1640bc81c228688a5880f305aa1c293c01b817..c7f55efb66078216aa699cab581ee0c6d49e011c 100644
GIT binary patch
literal 1907
zcmcIleQeZZ94;S|xxs>Ni4#ny#RP`-`gON!yB*`$O?H#pj%^9JIJ39ydv|qrZP)g=
z8w9f$K~XddAd9fXxDOKzAu(}rM8g>3zyuWh7>OT|Xfl>SGK`Tw+;G0#-A-Zv_m559
z_I>+4@AG?pAN_TIxPHruf>i|=hOG$J1{%?Gr8Dv$K=(Dj&jR##(5QXZ!mz?(XDq^w
z_LgE;-WO`~4tqyvt0?OU7f^Hwy3z>)p)stoDs2F{9oo1AqpId3ral=Va8>aU+dUyV
zWK_eLTD!}HO}pxw<z4Nvpb%9X@yfJ_2olf+csdc+EHUjP=6FRkcV1HjJ_oVeeT3gJ
zi0=r6@oL?KxYxyyGELLCS8#cO7qDFUQ#ebr3`O%4!;&;DvL2D8@$5w)bEXmz8v{>g
zjiHr~h}pIwQdBCHa-}$zZbm6a5Cn>5DV8M>g0wm{8>C6iT074WfR=2khOO!v?l1yL
zPue~LNzM3>Fmkk-m5mdM7?lPF#kgq4r+Hu~bbn|fkwaT{%}!(`tM{(NR&%ETsYYn&
zNmGV3JE3N;oj0b)xwA&njL&(h$P|pj1cF&e7?U$)#B^J?V){M&$ZhAmF~n*U0$Vqm
zbv-_xsqj1t&ay5KzJ9x^DSFB(a};F{zyPqJk8rX^GBn9@%`_)6wCMIeNwXqNXP_Ze
z2nw*l!oa$sMmiS)4TZ#@X4ycKVKCq$kSLd`DkA3v0xvTP30V(KmP0onC4u*l0#AF&
z8Nn+F?u;&UKA_7<Cw$KNOx-HFj5u-;5;-M8%Wj?_1&N0w$GcgQ=Xi-^BD@DiSf$(}
z!8tDxTZ5^hPY1;BWOY<2h>@1utXuGKB+K%E1i;Oc672<~M`C!M<ynCP0)Z>C7}3oH
zKy{)fKonAj7A5e1)Ku$n-3;jpiaF<0Gh#<}YgG%St~2|6G{KJSEUw~nMJEE;sdXPA
zJ4uELk$tV+C3*|fnW0U^AR@g_@-r|?kJu?-LVpxR`ag?{x|eth?7YA9g(d!fl%5T%
z90OVuqRvSXjx&_gVlqjg{++M6y*t{`JRJ2nXPWD-Xp!sBP(#!v>b`}KOzy_8Md4t;
z-^{-;_zm;SXPZjLewz)xp6DqWJ^tv~QU5EiUOgC`{FcJ`lWNtbb<4`~zxMaeJX}=s
zT<eW+$N9diSMk<?=XZBszqEQoZ}qWQyl(HQUyn`uI;UI@jkg?m|E)oH_w>}6x<P5t
z0jBRKZQY&^V};CPQ|~P99?=IjPt@OBedN>D@`@yO_&PE8QP=t9=U-mqEk0hdtppqh
zj$ixh%*<u-6ep!q`=<Zs>fJap{QbnCqM;Z5+<UTg_OzIH1?Jb5H4UGu2ye}M;>u*j
z+Jc5F!-sr*hwH}P?C3u__I7loe6HhQcgxVSlFKbi!mggrFD!j`1N>$EYnNL3hbGd|
ztz7Aa`nCg)S0&E!`>=~`r^m)ueL32XUGjG?&2J}12f&`6x0Ka<{6on9UaIKktskRP
zGs#=aE59lRr7d0K``ePYyL-mr;%ncXY3STW-uAw@WYY7&#nKxmHaow?U`>7C#OAh_
F{su$Eh3^0W

delta 280
zcmV+z0q6en4zmJ~B!2;OQb$4nuFf3k0002(Nkl<ZI8S3_pb#)psGnhw7?78j_n*!0
zF2k=)$_)1$A2BHHmjlz9yuTT)e`aQ|7x}~R;~xV92NSA?OKrC?g1z9q&hNkS0R@J8
zj`taq_A9~-@%8m(c>MS=iY{4MSvcR-)fHj@$OX@w?=wj4MSp09xdfjfC<Yi97!Zt*
zlp8z@jK*FJv%jul0J#Lk0FZ7%hNN<bG5AO^Gx*<L4z?^QDGA{PnDvAVL3SqG0H5{#
z{}~t<8SF)V!Q~IUW@fMu{>yOxD>K8ZpUiM^WHs<u*woJYUtGnT;pLsJ45ZNJp&KAx
epacv90|1BiW)Tq_EWWA$0000<MNUMnLSTYC^M4=!

diff --git a/kubejs/assets/kubejs/textures/item/memory_ultimate_empty.png b/kubejs/assets/kubejs/textures/item/memory_ultimate_empty.png
index f45d22d214657bb6705f188b24585e7c2dbb8e59..33a60f6920d752edf6820f68a3a3b7531515cb46 100644
GIT binary patch
literal 1886
zcmcIleQeZZ81FVV_Jsj4I5CS&QE?l+_S*Yuvy&aWjosnRWgKo(WA<MA-q!4{Ep4~E
z8^n(-Gb~{N8KUun81dr|$igC+h?235$zPZ#5R@$=gZMEunIbwM27J5Soy0KMKQ?Lm
zw(sxxJ-_FpPkZZXH!jOxosVJIGGC3i9^IFlXKoI<KJv#cfNpteO_Ppc1uM-n1AFV8
zA`HtuCIuUf#=uj&phPV|R6@`akE#fbVdd-NDiGSBfrns=B)f^3&xZ(H65T|DJwON4
zO4usZbZT&OXKhgEY!f(<SpOtm9_JB36dC}JM<cS%$KAvnFOSydYl^_<AV!;;@R$zq
z#y}ljsb~;)TCAi%(=_hnEKcAA4C`2jGc;qRXcuK=NSfvuJI~N~@*t2qO$_t(-s+??
z^yDU54MXKADi(`bVys2cS|}^WaTLu^3_~IWsV8Iu#7S9SlVb2fUC<=ekQ5m=89_*C
zH{1l0Iv+z+P1DMHGEXRDR2-<3)k2#wrGSCJ-J#KF8m${u9mq>k?;VNtU_ymdJ=B$U
zO@LJ$P&U@2oQXo(R&CcJbCHSy1tTzuU^)_JO}kQC6+_Wml?CERZ>OVC`AQ7}L(zhY
z5=m96F2#Z~jKz*W(ICm964OgeMM(qb1qO5zX4Ob5O)_kdW_g+`qZyv2=Wzkl1tKuO
zB9MwGg%kJ01p>TJ)(s#F(C2j%NQ*_1M4q-WwBP`MbOM1PMb;*gE)WWnjMXWIYz{jO
z7-mipviB-NyO}l9e!g8rML-<s#PBT3*_}=+Ania1kxpoHkO0^r84img<AN|8=GYY5
z)0%|77!bLg)l?-SMyHcyZB}G$<=8N~*urGU8bY*!0GJTuY!1#v;G)2X6)g%-dq`2x
z0x4B)A@G0IR4Nfg3n(H=HET98Vn<QbNII%mBKcWthFg=Xh=kAe8V>}s#odHp))tCH
z^0jn_>@7~`JZ-EMBGQFwK9A9run_|q^t7Nf-?O2pg_P@{<L<f_SM~o(cQT<uE09|t
z8kH1bMnai0WxgELe=9Y&cia3)!O>7Nm+5he9?}CD%7|J+<92UtM-0O<{64QI=<55h
zf6$-hS^nzK>q{yJYPSA<q3q<y$PeBlpE+jmYneAP^SXMLeDlHK2QGT(8(2wU*ExIs
zs%ND0>n3vckoAYECdT4<E12(p-G1vP`$^fMqmlccd-&^$>7ky!>e0+1;bb%YTVik^
zd+7^b4PZa*9WNltivP~pb#UX6zuv~Yr5pTG#$d4dp=&4Hn7`yo`KhAIzifJG_|%n^
z{i1){_S2iL7HTg}&dg@)xE!Av+0$M8?P_Ol>582m|MV1|yYJJV&%1mdO>B{S-_I?1
z%wM965C7SD9It!xmF`jcDskW0XS3=Kp7RcSc5iuOB(eX%(dxF-*Qa*Md?`<VS&`VU
z9?r@*HofC`ck#%XhK%>loGr+0Bd5zj|D&FgG1c`vcKti<#E;_-u6=jcrNT?DRZaVv
uUY_h}-Zr~)cCv42!`Ow7zpyxN_FY_?eW2p;*SJyh59q6^^$u)k?)nG*+J4di

delta 237
zcmV<J022S+4v7MgB!2;OQb$4nuFf3k0002PNkl<ZI8S3_pb#)psGnhw7?78j_rJWn
zoT0O`lL46~<UMI=X-2RYo<4p0A6+wu@9XQ!@c8j#6mw){W#N2RS67GuxLiQU5EKIp
z3=9alm|<1dBL;aPa|ZL2=L{g1pcnwsO~{awb0it`ti>2OHD)h@ElWyDLU;jYJt0Go
zoe4L<XTAS_1_nk3dy!vo`2(++87zeVGTi^l%<$?bGh7^5O{wiRhzmBgv;G%X@n(2=
nXDb6Kw0Y<Thyj#<VPF6N<{V%VpkZZn00000NkvXXu0mjf$*W?P

diff --git a/kubejs/assets/kubejs/textures/item/memory_ultimate_filled.png b/kubejs/assets/kubejs/textures/item/memory_ultimate_filled.png
index 657c285a1a5760274475dc16d851d097644daa22..1761a110cd7396367c9859bbe0c3f06d8480ea32 100644
GIT binary patch
literal 1910
zcmcIleQeZZ81E%>r_(K)h?2=d?LydKz4qGstQ>6aa36AGY>S&qG`!cocUO1Ux3=Bx
zHU-Jda0VSq#E?wTXky|rA|Wzy7_%_urqN^=2nuQhCCERB1EWC(^X+{}49xvwlfHf1
z{+{3Sdp`Q~mBxme{Ji2kf*|tiYW+?4T4<hk=i+t6)p>v~_o%f`=>&1_67#eWLwlDI
z#9d#=Ep0|yV51<Sm<>oM2yKa&iqQnIc6~wxVh1$HAPmcjkGlNHI7P~mk7{)W*nnCM
zBXVtz2Ag{tTEw0X(JN8w*O6-z0w#z-1CWVWRMCZmk4o|icyB&tC^88#I($@>>5yy-
zG?LXwgQVMLr$v@!Nw?SL25!Ldt_qT4IXlC87&}L^tiU-1jwRCvh23dVNNDmuo_2=s
zd{o3RRDogQ@whF{+mIG!>|U>zVL685XpErsZp8ozTG2~041TDKnyeZ!Qb>~#1W~8q
zqp;Le3^6rJtLW)G;fyf}pfYwFYsQoT1_BF1W3en+H#T%(FKNBECDvQIRme0!9d&9V
z+|UITqcr1860^2yrxr~{Dv1n?!Wf3>SeQNQN{t``=@E2?II^#^(WpYT27!UJ7KEai
zN;PI!NRG2P$+A{ikx*POHx;D~pdT2}N10Wl?JUjlEi5nC?E=fMVL5?iQ_uiz1PK^m
zabP6Lq3*>%0|B8<(G8%8u+HzJuqc}>OM=q{fGg+>(RS#NXkK)<X^*)C9h}H}f`AP|
zDX9zF`;pjbrq8rb^{s?N%#qEIV8>=G^zyXZ<?+xCyTeO+0gt=WEkaiax`L1mX4p1q
zGX8Wx^j20=m4q1`4i<(W=cK(H=JB{3cyW4Mv<P`O58Q4S=j13-5`_@bVgUDv90Os<
zs7jb3|4~zoqDTuM3Fn+QyBV|NC~9RLm##bgeKf=8(z~ckCYw$GqS@;{N;HdXMxS~t
z-zIyD)0wi5M<6C$p!g}6jzUHpXs{}bGyR{<#oS4}4!RbWzPQ5wkJ8g=6(c|iLp(Vd
z$_$1vM@*_H%)jfEe0R$@%E0lAGq>64if^*>87i1s!_(K=G<2OHEX{TPsus^{@0~bU
zf2?x(^z7xjogWpH^d9aiv|3B3cb_=bu+?((q2uc+cb+BtdX2(Wvn4qryS5bVJ5uKH
z)E@5ngKUkUi)w-M=(oG`ZtR->{+B)TKdhYaPE(_Y26MUjr`uM)v3&dJlZU>$^f7ZG
z_DJulpPPx|(>;`QA!q#DGu!r@2`wdtSJszX`%i9nB)-fi+B+uL$@Yg2%*^%0Pd~ro
zX8&JjU#+=DJbPtsPJ46HTkr3Fo%zb|=^d?FIz|DaemLjXS<CtREwj#o8%5u&X{{~a
zT>sAK!1RFn>E6lVa3Pqv`qN<jnDsn6MKqQ@FnKa(WZw&`3yu|v_f0Ju=$dl8bo2L|
zQ|+HO6c-JUmHfpI5037L|5ib4ES$7VcxzbM^W&dix1YGwwPf(^N3Dq$uLZ|vU0ZWM
z3vM=q66<l{!HNSbuADj2e{TQK_41jKzWFKChxV72kG;Ij{4>^VXz+jV*p}YE0il<K
A?f?J)

delta 280
zcmV+z0q6eq4zmJ~B!2;OQb$4nuFf3k0002(Nkl<ZI8S3_pb#)psGnhw7?78j_n*!0
zF2k=)$_)1$A2BHHmjlz9yuTT)e`aQ|7x}~R;~xV92NSA?OKrC?g1z9q&hNkS0R@J8
zj`taq_A9~-@%8m(c>MS=iY{4MSvcR-)fHj@$OX@w?=wj4MSp09xdfjfC<Yi97!Zt*
zRb7u5<b})`%u}8-fLwxN07y3>Lr%_-WYDt~W8l=h2(~OKDGA{PnDvAVL3SqG0H5{#
z{}~t<8SF)V!Q~IUW@fMu{>yOxD>K8ZpUiM^WHs<u*woJYUtGnT;pLsJ45ZNJp&KAx
epacv90|1jIW)TsWzS#Nz0000<MNUMnLSTZ2-GE~N

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/reaction.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/reaction.js
index 221fb753ab..deb6644b57 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/reaction.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/reaction.js
@@ -7,7 +7,7 @@ onEvent('recipes', (event) => {
         {
             itemInput: { ingredient: { tag: 'forge:ingots/manyullyn', count: 2 } },
             fluidInput: { amount: 144, fluid: 'materialis:molten_shadow_steel' },
-            gasInput: { amount: 1000, gas: 'mekanism:polonium' },
+            gasInput: { amount: 1000, gas: 'mekanism:plutonium' },
             energyRequired: 1000,
             duration: 300,
             itemOutput: { item: 'mekanism:alloy_atomic', count: 3 },
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index 1d8a2c0626..aa875dbae2 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -83,6 +83,59 @@ onEvent('recipes', (event) => {
                 C: '#thermal:glass/hardened'
             },
             id: 'mekanism:structural_glass'
+        },
+        {
+            output: 'mekanism:steel_casing',
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: '#forge:plates/steel',
+                B: '#mekanism:alloys/infused',
+                C: 'thermal:machine_frame'
+            },
+            id: 'mekanism:steel_casing'
+        },
+        {
+            output: 'mekanism:boiler_valve',
+            pattern: ['ABA', 'CDC', 'AEA'],
+            key: {
+                A: 'mekanism:boiler_casing',
+                B: 'create:copper_valve_handle',
+                C: 'create:fluid_pipe',
+                D: 'create:fluid_valve',
+                E: '#forge:circuits/elite'
+            },
+            id: 'mekanism:boiler_valve'
+        },
+        {
+            output: Item.of('2x mekanism:boiler_casing'),
+            pattern: ['ADA', 'BCB', 'ADA'],
+            key: {
+                A: '#forge:plates/constantan',
+                B: 'pneumaticcraft:heat_pipe',
+                C: 'mekanism:steel_casing',
+                D: '#mekanism:alloys/reinforced'
+            },
+            id: 'mekanism:boiler_casing'
+        },
+        {
+            output: 'mekanism:superheating_element',
+            pattern: ['AAA', 'DCD', 'BDB'],
+            key: {
+                A: 'pneumaticcraft:heat_sink',
+                B: 'pneumaticcraft:heat_pipe',
+                C: 'mekanism:steel_casing',
+                D: 'immersiveengineering:coil_mv'
+            },
+            id: 'mekanism:superheating_element'
+        },
+        {
+            output: 'mekanism:pressure_disperser',
+            pattern: ['AAA', 'ABA', 'AAA'],
+            key: {
+                A: 'pneumaticcraft:advanced_pressure_tube',
+                B: 'mekanism:steel_casing'
+            },
+            id: 'mekanism:pressure_disperser'
         }
     ];
 

From 57e4c5702760a739dc253bd3a823762b7a1a072e Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Fri, 22 Oct 2021 21:52:03 -0400
Subject: [PATCH 040/130] dynamic tanks

---
 .../expert/recipetypes/mekanism/shaped.js     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index aa875dbae2..0c400d6072 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -136,6 +136,27 @@ onEvent('recipes', (event) => {
                 B: 'mekanism:steel_casing'
             },
             id: 'mekanism:pressure_disperser'
+        },
+        {
+            output: 'mekanism:dynamic_valve',
+            pattern: ['ABA', 'CDC', 'AEA'],
+            key: {
+                A: 'mekanism:dynamic_tank',
+                B: 'create:copper_valve_handle',
+                C: 'create:fluid_pipe',
+                D: 'create:fluid_valve',
+                E: ['immersiveengineering:logic_circuit', 'pneumaticcraft:printed_circuit_board']
+            },
+            id: 'mekanism:dynamic_valve'
+        },
+        {
+            output: Item.of('8x mekanism:dynamic_tank'),
+            pattern: ['AAA', 'ABA', 'AAA'],
+            key: {
+                A: 'immersiveengineering:sheetmetal_colored_black',
+                B: '#immersiveengineering:scaffoldings/aluminum'
+            },
+            id: 'mekanism:dynamic_tank'
         }
     ];
 

From 8cf5192514f9dc05fb258eda45189db890d18531 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Fri, 22 Oct 2021 23:07:19 -0400
Subject: [PATCH 041/130] turbine

---
 .../recipetypes/create/mechanical_crafting.js | 16 ++++++++-
 .../expert/recipetypes/mekanism/shaped.js     | 35 +++++++++++++++++++
 .../pneumaticcraft/pressure_chamber.js        |  9 +++++
 3 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
index ff2a8d251e..c5be4ad873 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
@@ -271,7 +271,7 @@ onEvent('recipes', (event) => {
             id: 'portality:controller'
         },
         {
-            output: Item.of('rftoolsutility:environmental_controller'),
+            output: 'rftoolsutility:environmental_controller',
             pattern: ['ABBBA', 'BCDCB', 'BEFEB', 'BGHGB', 'ABBBA'],
             key: {
                 A: 'powah:dielectric_casing',
@@ -284,6 +284,20 @@ onEvent('recipes', (event) => {
                 H: 'kubejs:spirit_entropic_gateway'
             },
             id: 'rftoolsutility:environmental_controller'
+        },
+        {
+            output: 'mekanismgenerators:wind_generator',
+            pattern: ['ABC', 'DEF', 'DEF', 'DGF'],
+            key: {
+                A: 'pneumaticcraft:turbine_rotor',
+                B: 'immersiveengineering:dynamo',
+                C: '#forge:gears/compressed_iron',
+                D: 'pneumaticcraft:plastic',
+                E: 'engineersdecor:thick_steel_pole',
+                F: 'powah:capacitor_basic_large',
+                G: 'engineersdecor:thick_steel_pole_head'
+            },
+            id: 'mekanismgenerators:generator/wind'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index 0c400d6072..3eae6282d4 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -40,6 +40,18 @@ onEvent('recipes', (event) => {
             },
             id: 'mekanism:resistive_heater'
         },
+        {
+            output: 'mekanism:metallurgic_infuser',
+            pattern: ['ACA', 'BDB', 'AEA'],
+            key: {
+                A: '#forge:gears/osmium',
+                B: '#forge:circuits/basic',
+                C: 'rftoolspower:blazing_agitator',
+                D: 'thermal:machine_bottler',
+                E: 'rftoolspower:cell1'
+            },
+            id: 'mekanism:metallurgic_infuser'
+        },
         {
             output: 'mekanism:thermal_evaporation_controller',
             pattern: ['AAA', 'BCD', 'AAA'],
@@ -157,6 +169,29 @@ onEvent('recipes', (event) => {
                 B: '#immersiveengineering:scaffoldings/aluminum'
             },
             id: 'mekanism:dynamic_tank'
+        },
+        {
+            output: Item.of('2x mekanismgenerators:turbine_casing'),
+            pattern: ['ADA', 'BCB', 'ADA'],
+            key: {
+                A: '#forge:plates/aluminum',
+                B: 'mekanism:hdpe_sheet',
+                C: 'mekanism:steel_casing',
+                D: '#mekanism:alloys/reinforced'
+            },
+            id: 'mekanismgenerators:turbine/casing'
+        },
+        {
+            output: 'mekanismgenerators:turbine_valve',
+            pattern: ['ABA', 'CDC', 'AEA'],
+            key: {
+                A: 'mekanismgenerators:turbine_casing',
+                B: 'create:copper_valve_handle',
+                C: 'create:fluid_pipe',
+                D: 'create:fluid_valve',
+                E: '#forge:circuits/elite'
+            },
+            id: 'mekanismgenerators:turbine/valve'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/pressure_chamber.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/pressure_chamber.js
index a52447fde7..ae93e9ac90 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/pressure_chamber.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/pressure_chamber.js
@@ -221,6 +221,15 @@ onEvent('recipes', (event) => {
             pressure: 4.0,
             results: [{ item: 'kubejs:memory_ultimate_empty', count: 1 }],
             id: `${id_prefix}memory_ultimate_empty`
+        },
+        {
+            inputs: [
+                { tag: 'mekanism:alloys/reinforced', count: 3 },
+                { item: 'pneumaticcraft:turbine_rotor', count: 1 }
+            ],
+            pressure: 4.0,
+            results: [{ item: 'mekanismgenerators:turbine_blade', count: 1 }],
+            id: 'mekanismgenerators:turbine/blade'
         }
     ];
 

From 942a72b97bac4791cb8142df4db21c0fcca3ee72 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sat, 23 Oct 2021 12:36:33 -0400
Subject: [PATCH 042/130] Update shaped.js

---
 .../expert/recipetypes/mekanism/shaped.js     | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index 3eae6282d4..2e733c4c1a 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -192,6 +192,36 @@ onEvent('recipes', (event) => {
                 E: '#forge:circuits/elite'
             },
             id: 'mekanismgenerators:turbine/valve'
+        },
+        {
+            output: 'mekanismgenerators:turbine_vent',
+            pattern: ['AAA', 'BCB', 'AAA'],
+            key: {
+                A: 'mekanismgenerators:turbine_casing',
+                B: 'create:fluid_pipe',
+                C: 'engineersdecor:straight_pipe_valve'
+            },
+            id: 'mekanismgenerators:turbine/vent'
+        },
+        {
+            output: 'mekanismgenerators:saturating_condenser',
+            pattern: ['BAB', 'BCB', 'BBB'],
+            key: {
+                A: 'pneumaticcraft:heat_sink',
+                B: 'create:fluid_pipe',
+                C: 'mekanism:steel_casing'
+            },
+            id: 'mekanismgenerators:saturating_condenser'
+        },
+        {
+            output: 'mekanismgenerators:electromagnetic_coil',
+            pattern: ['CAC', 'ABA', 'CAC'],
+            key: {
+                A: 'immersiveengineering:coil_lv',
+                B: '#industrialforegoing:machine_frame/supreme',
+                C: 'mekanism:basic_induction_cell'
+            },
+            id: 'mekanismgenerators:electromagnetic_coil'
         }
     ];
 

From 1ea753bd65a9cb8f568bc51439fe021bfd3611f9 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sat, 23 Oct 2021 13:46:24 -0400
Subject: [PATCH 043/130] rotational complex

---
 .../recipetypes/create/mechanical_crafting.js      | 14 ++++++++++++++
 .../kubejs/expert/recipetypes/mekanism/shaped.js   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
index c5be4ad873..93ee34d451 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
@@ -298,6 +298,20 @@ onEvent('recipes', (event) => {
                 G: 'engineersdecor:thick_steel_pole_head'
             },
             id: 'mekanismgenerators:generator/wind'
+        },
+        {
+            output: 'mekanismgenerators:rotational_complex',
+            pattern: ['ABCCC', 'BDBFC', 'CBGBC', 'CEBDB', 'CCCBA'],
+            key: {
+                A: '#forge:circuits/elite',
+                B: '#forge:gears/compressed_iron',
+                C: '#xnet:cables',
+                D: '#mekanism:alloys/reinforced',
+                E: 'rftoolscontrol:node',
+                F: 'rftoolsbase:tablet',
+                G: '#industrialforegoing:machine_frame/advanced'
+            },
+            id: 'mekanismgenerators:rotational_complex'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index 2e733c4c1a..8fe96a2299 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -194,7 +194,7 @@ onEvent('recipes', (event) => {
             id: 'mekanismgenerators:turbine/valve'
         },
         {
-            output: 'mekanismgenerators:turbine_vent',
+            output: Item.of('2x mekanismgenerators:turbine_vent'),
             pattern: ['AAA', 'BCB', 'AAA'],
             key: {
                 A: 'mekanismgenerators:turbine_casing',

From 37130906ab27f3ee816db2e47a3cb9ce1b229c3e Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sat, 23 Oct 2021 21:03:21 -0400
Subject: [PATCH 044/130] fission and sps

---
 .../dissolution_chamber.js                    | 19 ++++++++
 .../mekanism/metallurgic_infusing.js          |  7 +++
 .../expert/recipetypes/mekanism/shaped.js     | 46 +++++++++++++++++++
 .../recipetypes/thermal/machine/bottler.js    |  6 +++
 4 files changed, 78 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
index 0ca3a2c3a8..0dd5e2c9df 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
@@ -266,6 +266,25 @@ onEvent('recipes', (event) => {
             outputFluid: '',
             outputFluidAmount: 0,
             id: 'mekanism:upgrade/anchor'
+        },
+        {
+            inputs: [
+                '#forge:pellets/polonium',
+                '#industrialforegoing:machine_frame/supreme',
+                '#forge:pellets/polonium',
+                '#forge:pellets/polonium',
+                '#forge:pellets/polonium',
+                'mekanism:hdpe_sheet',
+                '#forge:circuits/ultimate',
+                'mekanism:hdpe_sheet'
+            ],
+            inputFluid: 'immersiveengineering:concrete',
+            inputFluidAmount: 1000,
+            processingTime: 6000,
+            outputItem: { item: 'mekanism:sps_casing', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:sps_casing'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js
index 15956ec407..caa8937ef1 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js
@@ -17,6 +17,13 @@ onEvent('recipes', (event) => {
             infusionInput: 'mekanism:redstone',
             infusionAmount: 80,
             id: 'refinedstorage:stack_upgrade'
+        },
+        {
+            output: 'mekanismgenerators:reactor_glass',
+            input: 'mekanism:structural_glass',
+            infusionInput: 'mekanism:refined_obsidian',
+            infusionAmount: 320,
+            id: 'mekanismgenerators:reactor/glass'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index 8fe96a2299..f3d247837f 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -222,6 +222,52 @@ onEvent('recipes', (event) => {
                 C: 'mekanism:basic_induction_cell'
             },
             id: 'mekanismgenerators:electromagnetic_coil'
+        },
+        {
+            output: 'mekanismgenerators:fission_fuel_assembly',
+            pattern: ['ABA', 'ACA', 'ABA'],
+            key: {
+                A: '#forge:rods/cobalt',
+                B: 'mekanism:elite_pressurized_tube',
+                C: 'thermal:machine_frame'
+            },
+            id: 'mekanismgenerators:fission_reactor/fuel_assembly'
+        },
+        {
+            output: 'mekanismgenerators:control_rod_assembly',
+            pattern: ['DCD', 'EFE', 'ABA'],
+            key: {
+                A: '#forge:rods/cobalt',
+                B: 'mekanism:elite_pressurized_tube',
+                C: 'thermal:machine_frame',
+                D: 'thermal:redstone_servo',
+                E: '#forge:gears/cobalt',
+                F: '#forge:circuits/elite'
+            },
+            id: 'mekanismgenerators:fission_reactor/control_rod_assembly'
+        },
+        {
+            output: 'mekanism:sps_port',
+            pattern: ['ABA', 'CDC', 'ABA'],
+            key: {
+                A: 'mekanism:sps_casing',
+                B: 'mekanism:ultimate_universal_cable',
+                C: 'mekanism:ultimate_pressurized_tube',
+                D: '#forge:circuits/ultimate'
+            },
+            id: 'mekanism:sps_port'
+        },
+        {
+            output: 'mekanismgenerators:fission_reactor_port',
+            pattern: ['ABA', 'CDC', 'AEA'],
+            key: {
+                A: 'mekanismgenerators:fission_reactor_casing',
+                B: 'create:copper_valve_handle',
+                C: 'create:fluid_pipe',
+                D: 'create:fluid_valve',
+                E: '#forge:circuits/elite'
+            },
+            id: 'mekanismgenerators:fission_reactor/port'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/bottler.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/bottler.js
index bd7e8261f8..92d8a7181a 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/bottler.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/bottler.js
@@ -57,6 +57,12 @@ onEvent('recipes', (event) => {
             fluid: Fluid.of('pneumaticcraft:memory_essence', 72000),
             output: 'kubejs:memory_ultimate_filled',
             id: `${id_prefix}memory_ultimate_filled`
+        },
+        {
+            input: 'mekanism:steel_casing',
+            fluid: Fluid.of('immersiveengineering:concrete', 1000),
+            output: 'mekanismgenerators:fission_reactor_casing',
+            id: 'mekanismgenerators:fission_reactor/casing'
         }
     ];
     recipes.forEach((recipe) => {

From a99e3680fdc3d5272350691fd66cb65077b4bbb8 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sat, 23 Oct 2021 22:21:05 -0400
Subject: [PATCH 045/130] laser coil and botany pots

---
 .../enigmatica/kubejs/base/recipes/remove.js  |  2 +-
 .../base/recipetypes/enigmatica/shaped.js     | 12 -----
 .../dissolution_chamber.js                    | 53 +++++++++++++++++++
 .../expert/recipetypes/mekanism/shaped.js     | 12 +++++
 .../normal/recipetypes/botanypots/shaped.js   | 12 +++++
 5 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
index 61fffc2817..af50f33d3e 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
@@ -75,7 +75,7 @@ onEvent('recipes', (event) => {
 
         'botania:fertilizer_dye',
 
-        'botanypots:crafting/compact_hopper_botany_pot',
+        /botanypots:crafting\/compact_hopper/,
 
         'byg:vermilion_sculk',
         '/byg:\\w+_glass_from_sand/',
diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/enigmatica/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/enigmatica/shaped.js
index d26f9b1e22..0a38d215e7 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/enigmatica/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/enigmatica/shaped.js
@@ -781,18 +781,6 @@ onEvent('recipes', (event) => {
         });
     });
 
-    colors.forEach((color) => {
-        event
-            .shaped(`botanypots:${color}_botany_pot`, ['ADA', 'ABA', 'ACA'], {
-                A: `minecraft:${color}_terracotta`,
-                B: 'minecraft:flower_pot',
-                C: 'minecraft:bone_block',
-                D: 'minecraft:water_bucket'
-            })
-            .id(`botanypots:crafting/${color}_botany_pot`);
-        event.remove({ id: `botanypots:crafting/compact_hopper_${color}_botany_pot` });
-    });
-
     //Generate Forest Comb recipes for each tree type other than Oak (those are handled under newRecipes)
     treeRegistry.forEach((treeCategories) => {
         if (treeCategories.type == 'tree') {
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
index 0dd5e2c9df..f82226fd03 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
@@ -285,9 +285,62 @@ onEvent('recipes', (event) => {
             outputFluid: '',
             outputFluidAmount: 0,
             id: 'mekanism:sps_casing'
+        },
+        {
+            inputs: [
+                'mekanism:ultimate_induction_cell',
+                'immersiveengineering:coil_mv',
+                'mekanism:ultimate_induction_cell',
+                '#forge:circuits/ultimate',
+                '#forge:circuits/ultimate',
+                '#forge:pellets/polonium',
+                'mekanism:laser',
+                '#forge:pellets/polonium'
+            ],
+            inputFluid: 'industrialforegoing:ether_gas',
+            inputFluidAmount: 1000,
+            processingTime: 6000,
+            outputItem: { item: 'mekanism:supercharged_coil', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:supercharged_coil'
         }
     ];
 
+    colors.forEach((color) => {
+        recipes.push(
+            {
+                inputs: [
+                    'atum:fertile_soil',
+                    'mythicbotany:aquapanthus',
+                    'atum:fertile_soil',
+                    `minecraft:${color}_terracotta`,
+                    `minecraft:${color}_terracotta`,
+                    `minecraft:${color}_terracotta`,
+                    `minecraft:${color}_terracotta`,
+                    `minecraft:${color}_terracotta`
+                ],
+                inputFluid: 'industrialforegoing:sewage',
+                inputFluidAmount: 8000,
+                processingTime: 600,
+                outputItem: { item: `botanypots:${color}_botany_pot`, count: 1 },
+                outputFluid: '',
+                outputFluidAmount: 0,
+                id: `botanypots:crafting/${color}_botany_pot`
+            },
+            {
+                inputs: [`botanypots:${color}_botany_pot`, 'ars_nouveau:sylph_charm', 'naturesaura:grated_chute'],
+                inputFluid: 'materialis:molten_fairy',
+                inputFluidAmount: 1296,
+                processingTime: 600,
+                outputItem: { item: `botanypots:hopper_${color}_botany_pot`, count: 1 },
+                outputFluid: '',
+                outputFluidAmount: 0,
+                id: `botanypots:crafting/hopper_${color}_botany_pot`
+            }
+        );
+    });
+
     recipes.forEach((recipe) => {
         let ingredients = [];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index f3d247837f..5a0dcac74e 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -268,6 +268,18 @@ onEvent('recipes', (event) => {
                 E: '#forge:circuits/elite'
             },
             id: 'mekanismgenerators:fission_reactor/port'
+        },
+        {
+            output: 'mekanism:laser',
+            pattern: [' A ', 'BCB', 'DED'],
+            key: {
+                A: 'industrialforegoing:laser_lens14',
+                B: '#mekanism:alloys/infused',
+                C: '#forge:gems/nitro',
+                D: 'mekanism:advanced_induction_cell',
+                E: '#industrialforegoing:machine_frame/supreme'
+            },
+            id: 'mekanism:laser'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/botanypots/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/botanypots/shaped.js
index 849cef874c..9420e52233 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/botanypots/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/botanypots/shaped.js
@@ -16,6 +16,18 @@ onEvent('recipes', (event) => {
         }
     ];
 
+    colors.forEach((color) => {
+        event
+            .shaped(`botanypots:${color}_botany_pot`, ['ADA', 'ABA', 'ACA'], {
+                A: `minecraft:${color}_terracotta`,
+                B: 'minecraft:flower_pot',
+                C: 'minecraft:bone_block',
+                D: 'minecraft:water_bucket'
+            })
+            .id(`botanypots:crafting/${color}_botany_pot`);
+        event.remove({ id: `botanypots:crafting/compact_hopper_${color}_botany_pot` });
+    });
+
     recipes.forEach((recipe) => {
         event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id);
     });

From 82bde9481972a604658c27d1ffade94505d0e23d Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sat, 23 Oct 2021 23:21:35 -0400
Subject: [PATCH 046/130] induction

---
 .../dissolution_chamber.js                    |  16 +++
 .../expert/recipetypes/mekanism/mek_data.js   | 132 ++++++++++++++++++
 .../expert/recipetypes/mekanism/shaped.js     |  10 ++
 3 files changed, 158 insertions(+)
 create mode 100644 kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/mek_data.js

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
index f82226fd03..7cb2cb3677 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
@@ -304,6 +304,22 @@ onEvent('recipes', (event) => {
             outputFluid: '',
             outputFluidAmount: 0,
             id: 'mekanism:supercharged_coil'
+        },
+        {
+            inputs: [
+                'mekanism:hdpe_sheet',
+                '#industrialforegoing:machine_frame/simple',
+                'mekanism:hdpe_sheet',
+                'mekanism:hdpe_sheet',
+                'mekanism:hdpe_sheet'
+            ],
+            inputFluid: 'immersiveengineering:concrete',
+            inputFluidAmount: 4000,
+            processingTime: 100,
+            outputItem: { item: 'mekanism:induction_casing', count: 4 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:induction/casing'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/mek_data.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/mek_data.js
new file mode 100644
index 0000000000..05f03f4064
--- /dev/null
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/mek_data.js
@@ -0,0 +1,132 @@
+onEvent('recipes', (event) => {
+    if (global.isExpertMode == false) {
+        return;
+    }
+    const recipes = [
+        {
+            result: { item: 'mekanism:basic_energy_cube' },
+            pattern: ['ABA', 'CDC', 'EEE'],
+            key: {
+                A: { item: 'powah:capacitor_blazing' },
+                B: { tag: 'industrialforegoing:machine_frame/simple' },
+                C: {
+                    type: 'forge:nbt',
+                    item: 'immersiveengineering:graphite_electrode',
+                    nbt: '{graphDmg:0}'
+                },
+                D: {
+                    type: 'pneumaticcraft:fluid',
+                    fluid: 'mekanism:lithium',
+                    amount: 1000
+                },
+                E: { tag: 'forge:ingots/signalum' }
+            },
+            id: 'mekanism:energy_cube/basic'
+        },
+        {
+            result: { item: 'mekanism:advanced_energy_cube' },
+            pattern: ['ABA', 'CDC', 'EEE'],
+            key: {
+                A: { item: 'powah:capacitor_niotic' },
+                B: { item: 'mekanism:basic_energy_cube' },
+                C: {
+                    type: 'forge:nbt',
+                    item: 'immersiveengineering:graphite_electrode',
+                    nbt: '{graphDmg:0}'
+                },
+                D: {
+                    type: 'pneumaticcraft:fluid',
+                    fluid: 'mekanism:lithium',
+                    amount: 1000
+                },
+                E: { tag: 'mekanism:alloys/infused' }
+            },
+            id: 'mekanism:energy_cube/advanced'
+        },
+        {
+            result: { item: 'mekanism:elite_energy_cube' },
+            pattern: ['ABA', 'CDC', 'EEE'],
+            key: {
+                A: { item: 'powah:capacitor_spirited' },
+                B: { item: 'mekanism:advanced_energy_cube' },
+                C: {
+                    type: 'forge:nbt',
+                    item: 'immersiveengineering:graphite_electrode',
+                    nbt: '{graphDmg:0}'
+                },
+                D: {
+                    type: 'pneumaticcraft:fluid',
+                    fluid: 'mekanism:lithium',
+                    amount: 1000
+                },
+                E: { tag: 'mekanism:alloys/reinforced' }
+            },
+            id: 'mekanism:energy_cube/elite'
+        },
+        {
+            result: { item: 'mekanism:ultimate_energy_cube' },
+            pattern: ['ABA', 'CDC', 'EEE'],
+            key: {
+                A: { item: 'powah:capacitor_nitro' },
+                B: { item: 'mekanism:elite_energy_cube' },
+                C: {
+                    type: 'forge:nbt',
+                    item: 'immersiveengineering:graphite_electrode',
+                    nbt: '{graphDmg:0}'
+                },
+                D: {
+                    type: 'pneumaticcraft:fluid',
+                    fluid: 'mekanism:lithium',
+                    amount: 1000
+                },
+                E: { tag: 'mekanism:alloys/atomic' }
+            },
+            id: 'mekanism:energy_cube/ultimate'
+        },
+        {
+            result: { item: 'mekanism:basic_induction_cell' },
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: { item: 'powah:capacitor_blazing' },
+                B: { item: 'immersiveengineering:coil_hv' },
+                C: { item: 'mekanism:basic_energy_cube' }
+            },
+            id: 'mekanism:induction/cell/basic'
+        },
+        {
+            result: { item: 'mekanism:advanced_induction_cell' },
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: { item: 'powah:capacitor_niotic' },
+                B: { item: 'mekanism:basic_induction_cell' },
+                C: { item: 'mekanism:advanced_energy_cube' }
+            },
+            id: 'mekanism:induction/cell/advanced'
+        },
+        {
+            result: { item: 'mekanism:elite_induction_cell' },
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: { item: 'powah:capacitor_spirited' },
+                B: { item: 'mekanism:advanced_induction_cell' },
+                C: { item: 'mekanism:elite_energy_cube' }
+            },
+            id: 'mekanism:induction/cell/elite'
+        },
+        {
+            result: { item: 'mekanism:ultimate_induction_cell' },
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: { item: 'powah:capacitor_nitro' },
+                B: { item: 'mekanism:elite_induction_cell' },
+                C: { item: 'mekanism:ultimate_energy_cube' }
+            },
+            id: 'mekanism:induction/cell/ultimate'
+        }
+    ];
+
+    recipes.forEach((recipe) => {
+        recipe.type = 'mekanism:mek_data';
+        event.custom(recipe).id(recipe.id);
+    });
+});
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index 5a0dcac74e..eadf4f61d5 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -280,6 +280,16 @@ onEvent('recipes', (event) => {
                 E: '#industrialforegoing:machine_frame/supreme'
             },
             id: 'mekanism:laser'
+        },
+        {
+            output: Item.of('2x mekanism:induction_port'),
+            pattern: ['AAA', 'BCB', 'AAA'],
+            key: {
+                A: 'mekanism:induction_casing',
+                B: '#forge:circuits/elite',
+                C: 'rftoolsbase:tablet'
+            },
+            id: 'mekanism:induction/port'
         }
     ];
 

From 641a55573dc590985c143e22b95c38a75da2b9c2 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sat, 23 Oct 2021 23:44:11 -0400
Subject: [PATCH 047/130] Update shaped.js

---
 .../kubejs/expert/recipetypes/pneumaticcraft/shaped.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/shaped.js
index bc470dfb43..20f572f188 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/shaped.js
@@ -220,7 +220,7 @@ onEvent('recipes', (event) => {
             key: {
                 A: '#forge:ingots/compressed_iron',
                 B: 'pneumaticcraft:pressure_tube',
-                C: '#forge:plates/copper',
+                C: 'powah:thermoelectric_plate',
                 D: 'thermal:machine_frame'
             },
             id: 'pneumaticcraft:thermal_compressor'

From 3463f121f7ea5a46a46fe0a1537833bd20dd8056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Sun, 24 Oct 2021 18:30:01 +0200
Subject: [PATCH 048/130] specify IF loot nbt floating point numbers as floats,
 hopefully fixed #3546

---
 .../chests/quest_industrial_foregoing_loot_epic.json          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kubejs/data/enigmatica/loot_tables/chests/quest_industrial_foregoing_loot_epic.json b/kubejs/data/enigmatica/loot_tables/chests/quest_industrial_foregoing_loot_epic.json
index 3e808d3173..0aa5741b41 100644
--- a/kubejs/data/enigmatica/loot_tables/chests/quest_industrial_foregoing_loot_epic.json
+++ b/kubejs/data/enigmatica/loot_tables/chests/quest_industrial_foregoing_loot_epic.json
@@ -44,7 +44,7 @@
                     "functions": [
                         {
                             "function": "set_nbt",
-                            "tag": "{TitaniumAugment:{Efficiency:0.8}}"
+                            "tag": "{TitaniumAugment:{Efficiency:0.8f}}"
                         }
                     ]
                 },
@@ -55,7 +55,7 @@
                     "functions": [
                         {
                             "function": "set_nbt",
-                            "tag": "{TitaniumAugment:{Speed:3.0}}"
+                            "tag": "{TitaniumAugment:{Speed:3.0f}}"
                         }
                     ]
                 },

From c8a94f74ab0abc04fc25a282152e1af17770a91c Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sun, 24 Oct 2021 16:02:37 -0400
Subject: [PATCH 049/130] teleportation and solar

---
 .../expert/recipetypes/mekanism/shaped.js     | 76 +++++++++++++++++++
 .../expert/recipetypes/powah/energizing.js    | 15 ++++
 2 files changed, 91 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index eadf4f61d5..cd8e9ec6b8 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -290,6 +290,82 @@ onEvent('recipes', (event) => {
                 C: 'rftoolsbase:tablet'
             },
             id: 'mekanism:induction/port'
+        },
+        {
+            output: 'mekanism:electrolytic_separator',
+            pattern: ['ABA', 'CDC', 'ACA'],
+            key: {
+                A: '#forge:gears/osmium',
+                B: 'mekanism:electrolytic_core',
+                C: 'thermal:fluid_cell',
+                D: 'thermal:machine_frame'
+            },
+            id: 'mekanism:electrolytic_separator'
+        },
+        {
+            output: 'mekanism:electrolytic_core',
+            pattern: ['ABA', 'CBD', 'ABA'],
+            key: {
+                A: 'immersiveengineering:wirecoil_copper',
+                B: 'thermal:diving_fabric',
+                C: '#forge:plates/zinc',
+                D: '#forge:plates/aluminum'
+            },
+            id: 'mekanism:electrolytic_core'
+        },
+        {
+            output: 'mekanism:jetpack',
+            pattern: ['ABA', 'CDC', 'E E'],
+            key: {
+                A: '#forge:plates/bronze',
+                B: 'immersiveengineering:logic_circuit',
+                C: 'create:copper_backtank',
+                D: 'thermal:hazmat_chestplate',
+                E: 'immersiveengineering:toolupgrade_chemthrower_focus'
+            },
+            id: 'mekanism:jetpack'
+        },
+        {
+            output: 'mekanism:jetpack_armored',
+            pattern: ['A A', 'BCB', ' D '],
+            key: {
+                A: '#forge:gears/aluminum',
+                B: '#forge:plates/signalum',
+                C: ['mekanismtools:steel_chestplate', 'immersiveengineering:armor_steel_chest'],
+                D: 'mekanism:jetpack'
+            },
+            id: 'mekanism:jetpack_armored'
+        },
+        {
+            output: 'mekanismgenerators:solar_panel',
+            pattern: ['AAA', 'AAA', 'BBB'],
+            key: {
+                A: 'quark:blue_framed_glass_pane',
+                B: 'powah:thermoelectric_plate'
+            },
+            id: 'mekanismgenerators:solar_panel'
+        },
+        {
+            output: 'mekanismgenerators:solar_generator',
+            pattern: ['ABA', 'ACA', ' D '],
+            key: {
+                A: 'mekanismgenerators:solar_panel',
+                B: 'immersiveengineering:logic_circuit',
+                C: 'thermal:redstone_servo',
+                D: 'engineersdecor:thick_steel_pole_head'
+            },
+            id: 'mekanismgenerators:generator/solar'
+        },
+        {
+            output: 'mekanismgenerators:advanced_solar_generator',
+            pattern: ['ACA', 'ABA', ' D '],
+            key: {
+                A: 'mekanismgenerators:solar_generator',
+                B: 'engineersdecor:thick_steel_pole',
+                C: 'thermal:redstone_servo',
+                D: 'engineersdecor:thick_steel_pole_head'
+            },
+            id: 'mekanismgenerators:generator/advanced_solar'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
index a6618de700..fd5f017117 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/powah/energizing.js
@@ -215,6 +215,21 @@ onEvent('recipes', (event) => {
                 count: 1
             },
             id: 'rftoolspower:power_core3'
+        },
+        {
+            ingredients: [
+                { tag: 'mekanism:alloys/atomic' },
+                { item: 'rftoolsbase:infused_diamond' },
+                { item: 'fluxnetworks:flux_core' },
+                { item: 'rftoolsbase:infused_diamond' },
+                { tag: 'mekanism:alloys/atomic' }
+            ],
+            energy: '1000000000',
+            result: {
+                item: 'mekanism:teleportation_core',
+                count: 2
+            },
+            id: 'mekanism:teleportation_core'
         }
     ];
 

From b65b31b5be304ab8328060dae09e5c6d130683d0 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sun, 24 Oct 2021 17:33:18 -0400
Subject: [PATCH 050/130] fusion

---
 .../recipetypes/create/mechanical_crafting.js | 16 +++++++++
 .../dissolution_chamber.js                    | 19 +++++++++++
 .../expert/recipetypes/mekanism/shaped.js     | 33 ++++++++++++++++++-
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
index 93ee34d451..9056e0a221 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
@@ -312,6 +312,22 @@ onEvent('recipes', (event) => {
                 G: '#industrialforegoing:machine_frame/advanced'
             },
             id: 'mekanismgenerators:rotational_complex'
+        },
+        {
+            output: 'mekanismgenerators:fusion_reactor_controller',
+            pattern: ['  ABA  ', ' ACDCA ', 'ACEFECA', 'BDGHGDB', 'ACEIECA', ' ACDCA ', '  ABA  '],
+            key: {
+                A: 'mekanismgenerators:reactor_glass',
+                B: '#xnet:cables',
+                C: 'mekanismgenerators:fusion_reactor_frame',
+                D: '#xnet:advanced_connectors',
+                E: 'mekanism:ultimate_chemical_tank',
+                F: 'rftoolsutility:environmental_controller',
+                G: '#forge:circuits/ultimate',
+                H: 'mekanism:ultimate_fluid_tank',
+                I: 'rftoolsbase:tablet'
+            },
+            id: 'mekanismgenerators:reactor/controller'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
index 7cb2cb3677..e715e8ef19 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
@@ -320,6 +320,25 @@ onEvent('recipes', (event) => {
             outputFluid: '',
             outputFluidAmount: 0,
             id: 'mekanism:induction/casing'
+        },
+        {
+            inputs: [
+                'mekanismgenerators:electromagnetic_coil',
+                '#forge:pellets/polonium',
+                '#mekanism:alloys/atomic',
+                'powah:dielectric_casing',
+                'rftoolscontrol:node',
+                '#xnet:cables',
+                '#xnet:cables',
+                '#xnet:cables'
+            ],
+            inputFluid: 'industrialforegoing:ether_gas',
+            inputFluidAmount: 100,
+            processingTime: 600,
+            outputItem: { item: 'mekanismgenerators:fusion_reactor_frame', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanismgenerators:reactor/frame'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index cd8e9ec6b8..9a48f4034f 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -247,7 +247,7 @@ onEvent('recipes', (event) => {
             id: 'mekanismgenerators:fission_reactor/control_rod_assembly'
         },
         {
-            output: 'mekanism:sps_port',
+            output: Item.of('2x mekanism:sps_port'),
             pattern: ['ABA', 'CDC', 'ABA'],
             key: {
                 A: 'mekanism:sps_casing',
@@ -366,6 +366,37 @@ onEvent('recipes', (event) => {
                 D: 'engineersdecor:thick_steel_pole_head'
             },
             id: 'mekanismgenerators:generator/advanced_solar'
+        },
+        {
+            output: Item.of('2x mekanismgenerators:fusion_reactor_port'),
+            pattern: ['ABA', 'CDC', 'ABA'],
+            key: {
+                A: 'mekanismgenerators:fusion_reactor_frame',
+                B: 'mekanism:ultimate_universal_cable',
+                C: 'mekanism:ultimate_pressurized_tube',
+                D: '#forge:circuits/ultimate'
+            },
+            id: 'mekanismgenerators:reactor/port'
+        },
+        {
+            output: 'mekanism:laser_amplifier',
+            pattern: ['ABA', 'BCD', 'ABA'],
+            key: {
+                A: '#mekanism:alloys/infused',
+                B: 'mekanismgenerators:laser_focus_matrix',
+                C: 'mekanism:basic_induction_cell',
+                D: 'industrialforegoing:laser_lens14'
+            },
+            id: 'mekanism:laser_amplifier'
+        },
+        {
+            output: 'mekanismgenerators:laser_focus_matrix',
+            pattern: [' B ', 'BAB', ' B '],
+            key: {
+                A: 'mekanismgenerators:reactor_glass',
+                B: 'industrialforegoing:laser_lens14'
+            },
+            id: 'mekanismgenerators:laser_focus_matrix'
         }
     ];
 

From 0abb5d3036475cb1d64baa0e92d6b42a4bad62f3 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sun, 24 Oct 2021 18:09:27 -0400
Subject: [PATCH 051/130] jetpacks

---
 .../base/recipetypes/enigmatica/shaped.js     | 211 -----------------
 .../expert/recipetypes/enigmatica/shaped.js   | 217 +++++++++++++++++-
 .../normal/recipetypes/enigmatica/shaped.js   | 210 +++++++++++++++++
 3 files changed, 426 insertions(+), 212 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/enigmatica/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/enigmatica/shaped.js
index 0a38d215e7..0aeb0e3384 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/enigmatica/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/enigmatica/shaped.js
@@ -13,217 +13,6 @@ onEvent('recipes', (event) => {
             },
             id: `${id_prefix}minecraft/lava_bucket`
         },
-        {
-            output: 'ironjetpacks:hardened_jetpack',
-            pattern: ['ABA', 'ECE', 'D D'],
-            key: {
-                A: 'powah:steel_energized',
-                B: 'powah:battery_hardened',
-                C: 'thermal:hazmat_chestplate',
-                D: 'ironjetpacks:hardened_thruster',
-                E: 'powah:reactor_hardened'
-            },
-            id: `${id_prefix}ironjetpacks/hardened_jetpack`
-        },
-        {
-            output: 'ironjetpacks:hardened_thruster',
-            pattern: [' B ', 'BDB', 'ACA'],
-            key: {
-                A: 'powah:steel_energized',
-                B: 'powah:capacitor_hardened',
-                C: 'powah:furnator_hardened',
-                D: 'powah:reactor_hardened'
-            },
-            id: `${id_prefix}ironjetpacks/hardened_thruster`
-        },
-
-        {
-            output: 'ironjetpacks:invar_jetpack',
-            pattern: ['ABA', 'ECE', 'D D'],
-            key: {
-                A: '#forge:plates/invar',
-                B: 'thermal:upgrade_augment_1',
-                C: 'ironjetpacks:hardened_jetpack',
-                D: 'ironjetpacks:invar_thruster',
-                E: '#forge:gears/invar'
-            },
-            id: `${id_prefix}ironjetpacks/invar_jetpack`
-        },
-        {
-            output: 'ironjetpacks:invar_thruster',
-            pattern: [' B ', 'BDB', 'ACA'],
-            key: {
-                A: '#forge:plates/invar',
-                B: 'powah:capacitor_hardened',
-                C: 'powah:furnator_hardened',
-                D: '#forge:gears/invar'
-            },
-            id: `${id_prefix}ironjetpacks/invar_thruster`
-        },
-        {
-            output: 'ironjetpacks:blazing_jetpack',
-            pattern: ['ABA', 'ECE', 'D D'],
-            key: {
-                A: 'powah:crystal_blazing',
-                B: 'powah:battery_blazing',
-                C: 'ironjetpacks:invar_jetpack',
-                D: 'ironjetpacks:blazing_thruster',
-                E: 'powah:reactor_blazing'
-            },
-            id: `${id_prefix}ironjetpacks/blazing_jetpack`
-        },
-        {
-            output: 'ironjetpacks:blazing_thruster',
-            pattern: [' B ', 'BDB', 'ACA'],
-            key: {
-                A: 'powah:crystal_blazing',
-                B: 'powah:capacitor_blazing',
-                C: 'powah:furnator_blazing',
-                D: 'powah:reactor_blazing'
-            },
-            id: `${id_prefix}ironjetpacks/blazing_thruster`
-        },
-        {
-            output: 'ironjetpacks:signalum_jetpack',
-            pattern: ['ABA', 'ECE', 'D D'],
-            key: {
-                A: '#forge:plates/signalum',
-                B: 'thermal:upgrade_augment_2',
-                C: 'ironjetpacks:blazing_jetpack',
-                D: 'ironjetpacks:signalum_thruster',
-                E: '#forge:gears/signalum'
-            },
-            id: `${id_prefix}ironjetpacks/signalum_jetpack`
-        },
-        {
-            output: 'ironjetpacks:signalum_thruster',
-            pattern: [' B ', 'BDB', 'ACA'],
-            key: {
-                A: '#forge:plates/signalum',
-                B: 'powah:capacitor_blazing',
-                C: 'powah:furnator_blazing',
-                D: '#forge:gears/signalum'
-            },
-            id: `${id_prefix}ironjetpacks/signalum_thruster`
-        },
-        {
-            output: 'ironjetpacks:niotic_jetpack',
-            pattern: ['ABA', 'ECE', 'D D'],
-            key: {
-                A: 'powah:crystal_niotic',
-                B: 'powah:battery_niotic',
-                C: 'ironjetpacks:signalum_jetpack',
-                D: 'ironjetpacks:niotic_thruster',
-                E: 'powah:reactor_niotic'
-            },
-            id: `${id_prefix}ironjetpacks/niotic_jetpack`
-        },
-        {
-            output: 'ironjetpacks:niotic_thruster',
-            pattern: [' B ', 'BDB', 'ACA'],
-            key: {
-                A: 'powah:crystal_niotic',
-                B: 'powah:capacitor_niotic',
-                C: 'powah:furnator_niotic',
-                D: 'powah:reactor_niotic'
-            },
-            id: `${id_prefix}ironjetpacks/niotic_thruster`
-        },
-
-        {
-            output: 'ironjetpacks:lumium_jetpack',
-            pattern: ['ABA', 'ECE', 'D D'],
-            key: {
-                A: '#forge:plates/lumium',
-                B: 'thermal:dynamo_fuel_augment',
-                C: 'ironjetpacks:niotic_jetpack',
-                D: 'ironjetpacks:lumium_thruster',
-                E: '#forge:gears/lumium'
-            },
-            id: `${id_prefix}ironjetpacks/lumium_jetpack`
-        },
-        {
-            output: 'ironjetpacks:lumium_thruster',
-            pattern: [' B ', 'BDB', 'ACA'],
-            key: {
-                A: '#forge:plates/lumium',
-                B: 'powah:capacitor_niotic',
-                C: 'powah:furnator_niotic',
-                D: '#forge:gears/lumium'
-            },
-            id: `${id_prefix}ironjetpacks/lumium_thruster`
-        },
-
-        {
-            output: 'ironjetpacks:spirited_jetpack',
-            pattern: ['ABA', 'ECE', 'D D'],
-            key: {
-                A: 'powah:crystal_spirited',
-                B: 'powah:battery_spirited',
-                C: 'ironjetpacks:lumium_jetpack',
-                D: 'ironjetpacks:spirited_thruster',
-                E: 'powah:reactor_spirited'
-            },
-            id: `${id_prefix}ironjetpacks/spirited_jetpack`
-        },
-        {
-            output: 'ironjetpacks:spirited_thruster',
-            pattern: [' B ', 'BDB', 'ACA'],
-            key: {
-                A: 'powah:crystal_spirited',
-                B: 'powah:capacitor_spirited',
-                C: 'powah:furnator_spirited',
-                D: 'powah:reactor_spirited'
-            },
-            id: `${id_prefix}ironjetpacks/spirited_thruster`
-        },
-        {
-            output: 'ironjetpacks:enderium_jetpack',
-            pattern: ['ABA', 'ECE', 'D D'],
-            key: {
-                A: '#forge:plates/enderium',
-                B: 'thermal:upgrade_augment_3',
-                C: 'ironjetpacks:spirited_jetpack',
-                D: 'ironjetpacks:enderium_thruster',
-                E: '#forge:gears/enderium'
-            },
-            id: `${id_prefix}ironjetpacks/enderium_jetpack`
-        },
-        {
-            output: 'ironjetpacks:enderium_thruster',
-            pattern: [' B ', 'BDB', 'ACA'],
-            key: {
-                A: '#forge:plates/enderium',
-                B: 'powah:capacitor_spirited',
-                C: 'powah:furnator_spirited',
-                D: '#forge:gears/enderium'
-            },
-            id: `${id_prefix}ironjetpacks/enderium_thruster`
-        },
-
-        {
-            output: 'ironjetpacks:nitro_jetpack',
-            pattern: ['ABA', 'ECE', 'D D'],
-            key: {
-                A: 'powah:crystal_nitro',
-                B: 'powah:battery_nitro',
-                C: 'ironjetpacks:enderium_jetpack',
-                D: 'ironjetpacks:nitro_thruster',
-                E: 'powah:reactor_nitro'
-            },
-            id: `${id_prefix}ironjetpacks/nitro_jetpack`
-        },
-        {
-            output: 'ironjetpacks:nitro_thruster',
-            pattern: [' B ', 'BDB', 'ACA'],
-            key: {
-                A: 'powah:crystal_nitro',
-                B: 'powah:capacitor_nitro',
-                C: 'powah:furnator_nitro',
-                D: 'powah:reactor_nitro'
-            },
-            id: `${id_prefix}ironjetpacks/nitro_thruster`
-        },
         {
             output: 'betterendforge:dense_snow',
             pattern: ['AAA', 'AAA', 'AAA'],
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/enigmatica/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/enigmatica/shaped.js
index e83dcba804..38258b84f7 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/enigmatica/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/enigmatica/shaped.js
@@ -3,7 +3,222 @@ onEvent('recipes', (event) => {
         return;
     }
     const id_prefix = 'enigmatica:expert/enigmatica/';
-    const recipes = [];
+    const recipes = [
+        ,
+        {
+            output: 'ironjetpacks:hardened_jetpack',
+            pattern: ['ABA', 'ECE', 'DFD'],
+            key: {
+                A: 'mekanism:electrolytic_core',
+                B: 'powah:battery_hardened',
+                C: 'mekanism:jetpack',
+                D: 'ironjetpacks:hardened_thruster',
+                E: 'powah:energy_hopper_hardened',
+                F: Item.of('minecraft:water_bucket', '{display:{Name:\'{"text":"#MLG-YOLO"}\'}}').enchant(
+                    'minecraft:infinity',
+                    1
+                )
+            },
+            id: `${id_prefix}ironjetpacks/hardened_jetpack`
+        },
+        {
+            output: 'ironjetpacks:hardened_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: 'powah:steel_energized',
+                B: 'powah:capacitor_hardened',
+                C: 'powah:furnator_hardened',
+                D: 'powah:energy_hopper_hardened'
+            },
+            id: `${id_prefix}ironjetpacks/hardened_thruster`
+        },
+        {
+            output: 'ironjetpacks:invar_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: '#forge:plates/invar',
+                B: '#forge:gears/invar',
+                C: 'ironjetpacks:hardened_jetpack',
+                D: 'ironjetpacks:invar_thruster',
+                E: 'thermal:upgrade_augment_1'
+            },
+            id: `${id_prefix}ironjetpacks/invar_jetpack`
+        },
+        {
+            output: 'ironjetpacks:invar_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: '#forge:plates/invar',
+                B: 'powah:capacitor_hardened',
+                C: 'powah:furnator_hardened',
+                D: 'thermal:upgrade_augment_1'
+            },
+            id: `${id_prefix}ironjetpacks/invar_thruster`
+        },
+        {
+            output: 'ironjetpacks:blazing_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: 'powah:crystal_blazing',
+                B: 'powah:battery_blazing',
+                C: 'ironjetpacks:invar_jetpack',
+                D: 'ironjetpacks:blazing_thruster',
+                E: 'powah:energy_hopper_blazing'
+            },
+            id: `${id_prefix}ironjetpacks/blazing_jetpack`
+        },
+        {
+            output: 'ironjetpacks:blazing_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: 'powah:crystal_blazing',
+                B: 'powah:capacitor_blazing',
+                C: 'powah:furnator_blazing',
+                D: 'powah:energy_hopper_blazing'
+            },
+            id: `${id_prefix}ironjetpacks/blazing_thruster`
+        },
+        {
+            output: 'ironjetpacks:signalum_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: '#forge:plates/signalum',
+                B: '#forge:gears/signalum',
+                C: 'ironjetpacks:blazing_jetpack',
+                D: 'ironjetpacks:signalum_thruster',
+                E: 'thermal:upgrade_augment_2'
+            },
+            id: `${id_prefix}ironjetpacks/signalum_jetpack`
+        },
+        {
+            output: 'ironjetpacks:signalum_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: '#forge:plates/signalum',
+                B: 'powah:capacitor_blazing',
+                C: 'powah:furnator_blazing',
+                D: 'thermal:upgrade_augment_2'
+            },
+            id: `${id_prefix}ironjetpacks/signalum_thruster`
+        },
+        {
+            output: 'ironjetpacks:niotic_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: 'powah:crystal_niotic',
+                B: 'powah:battery_niotic',
+                C: 'ironjetpacks:signalum_jetpack',
+                D: 'ironjetpacks:niotic_thruster',
+                E: 'powah:energy_hopper_niotic'
+            },
+            id: `${id_prefix}ironjetpacks/niotic_jetpack`
+        },
+        {
+            output: 'ironjetpacks:niotic_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: 'powah:crystal_niotic',
+                B: 'powah:capacitor_niotic',
+                C: 'powah:furnator_niotic',
+                D: 'powah:energy_hopper_niotic'
+            },
+            id: `${id_prefix}ironjetpacks/niotic_thruster`
+        },
+
+        {
+            output: 'ironjetpacks:lumium_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: '#forge:plates/lumium',
+                B: '#forge:gears/lumium',
+                C: 'ironjetpacks:niotic_jetpack',
+                D: 'ironjetpacks:lumium_thruster',
+                E: 'thermal:dynamo_fuel_augment'
+            },
+            id: `${id_prefix}ironjetpacks/lumium_jetpack`
+        },
+        {
+            output: 'ironjetpacks:lumium_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: '#forge:plates/lumium',
+                B: 'powah:capacitor_niotic',
+                C: 'powah:furnator_niotic',
+                D: 'thermal:dynamo_fuel_augment'
+            },
+            id: `${id_prefix}ironjetpacks/lumium_thruster`
+        },
+
+        {
+            output: 'ironjetpacks:spirited_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: 'powah:crystal_spirited',
+                B: 'powah:battery_spirited',
+                C: 'ironjetpacks:lumium_jetpack',
+                D: 'ironjetpacks:spirited_thruster',
+                E: 'powah:energy_hopper_spirited'
+            },
+            id: `${id_prefix}ironjetpacks/spirited_jetpack`
+        },
+        {
+            output: 'ironjetpacks:spirited_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: 'powah:crystal_spirited',
+                B: 'powah:capacitor_spirited',
+                C: 'powah:furnator_spirited',
+                D: 'powah:energy_hopper_spirited'
+            },
+            id: `${id_prefix}ironjetpacks/spirited_thruster`
+        },
+        {
+            output: 'ironjetpacks:enderium_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: '#forge:plates/enderium',
+                B: '#forge:gears/enderium',
+                C: 'ironjetpacks:spirited_jetpack',
+                D: 'ironjetpacks:enderium_thruster',
+                E: 'thermal:upgrade_augment_3'
+            },
+            id: `${id_prefix}ironjetpacks/enderium_jetpack`
+        },
+        {
+            output: 'ironjetpacks:enderium_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: '#forge:plates/enderium',
+                B: 'powah:capacitor_spirited',
+                C: 'powah:furnator_spirited',
+                D: 'thermal:upgrade_augment_3'
+            },
+            id: `${id_prefix}ironjetpacks/enderium_thruster`
+        },
+        {
+            output: 'ironjetpacks:nitro_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: 'powah:crystal_nitro',
+                B: 'powah:battery_nitro',
+                C: 'ironjetpacks:enderium_jetpack',
+                D: 'ironjetpacks:nitro_thruster',
+                E: 'powah:energy_hopper_nitro'
+            },
+            id: `${id_prefix}ironjetpacks/nitro_jetpack`
+        },
+        {
+            output: 'ironjetpacks:nitro_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: 'powah:crystal_nitro',
+                B: 'powah:capacitor_nitro',
+                C: 'powah:furnator_nitro',
+                D: 'powah:energy_hopper_nitro'
+            },
+            id: `${id_prefix}ironjetpacks/nitro_thruster`
+        }
+    ];
 
     powahTiers.forEach(function (tier, index) {
         if (tier == 'starter') {
diff --git a/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/enigmatica/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/enigmatica/shaped.js
index 7527b948d2..82a4a0b634 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/enigmatica/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/enigmatica/shaped.js
@@ -42,6 +42,216 @@ onEvent('recipes', (event) => {
                 F: 'minecraft:ender_eye'
             },
             id: `${id_prefix}magical_feathers`
+        },
+        {
+            output: 'ironjetpacks:hardened_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: 'powah:steel_energized',
+                B: 'powah:battery_hardened',
+                C: 'thermal:hazmat_chestplate',
+                D: 'ironjetpacks:hardened_thruster',
+                E: 'powah:reactor_hardened'
+            },
+            id: `${id_prefix}ironjetpacks/hardened_jetpack`
+        },
+        {
+            output: 'ironjetpacks:hardened_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: 'powah:steel_energized',
+                B: 'powah:capacitor_hardened',
+                C: 'powah:furnator_hardened',
+                D: 'powah:reactor_hardened'
+            },
+            id: `${id_prefix}ironjetpacks/hardened_thruster`
+        },
+
+        {
+            output: 'ironjetpacks:invar_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: '#forge:plates/invar',
+                B: 'thermal:upgrade_augment_1',
+                C: 'ironjetpacks:hardened_jetpack',
+                D: 'ironjetpacks:invar_thruster',
+                E: '#forge:gears/invar'
+            },
+            id: `${id_prefix}ironjetpacks/invar_jetpack`
+        },
+        {
+            output: 'ironjetpacks:invar_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: '#forge:plates/invar',
+                B: 'powah:capacitor_hardened',
+                C: 'powah:furnator_hardened',
+                D: '#forge:gears/invar'
+            },
+            id: `${id_prefix}ironjetpacks/invar_thruster`
+        },
+        {
+            output: 'ironjetpacks:blazing_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: 'powah:crystal_blazing',
+                B: 'powah:battery_blazing',
+                C: 'ironjetpacks:invar_jetpack',
+                D: 'ironjetpacks:blazing_thruster',
+                E: 'powah:reactor_blazing'
+            },
+            id: `${id_prefix}ironjetpacks/blazing_jetpack`
+        },
+        {
+            output: 'ironjetpacks:blazing_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: 'powah:crystal_blazing',
+                B: 'powah:capacitor_blazing',
+                C: 'powah:furnator_blazing',
+                D: 'powah:reactor_blazing'
+            },
+            id: `${id_prefix}ironjetpacks/blazing_thruster`
+        },
+        {
+            output: 'ironjetpacks:signalum_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: '#forge:plates/signalum',
+                B: 'thermal:upgrade_augment_2',
+                C: 'ironjetpacks:blazing_jetpack',
+                D: 'ironjetpacks:signalum_thruster',
+                E: '#forge:gears/signalum'
+            },
+            id: `${id_prefix}ironjetpacks/signalum_jetpack`
+        },
+        {
+            output: 'ironjetpacks:signalum_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: '#forge:plates/signalum',
+                B: 'powah:capacitor_blazing',
+                C: 'powah:furnator_blazing',
+                D: '#forge:gears/signalum'
+            },
+            id: `${id_prefix}ironjetpacks/signalum_thruster`
+        },
+        {
+            output: 'ironjetpacks:niotic_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: 'powah:crystal_niotic',
+                B: 'powah:battery_niotic',
+                C: 'ironjetpacks:signalum_jetpack',
+                D: 'ironjetpacks:niotic_thruster',
+                E: 'powah:reactor_niotic'
+            },
+            id: `${id_prefix}ironjetpacks/niotic_jetpack`
+        },
+        {
+            output: 'ironjetpacks:niotic_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: 'powah:crystal_niotic',
+                B: 'powah:capacitor_niotic',
+                C: 'powah:furnator_niotic',
+                D: 'powah:reactor_niotic'
+            },
+            id: `${id_prefix}ironjetpacks/niotic_thruster`
+        },
+
+        {
+            output: 'ironjetpacks:lumium_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: '#forge:plates/lumium',
+                B: 'thermal:dynamo_fuel_augment',
+                C: 'ironjetpacks:niotic_jetpack',
+                D: 'ironjetpacks:lumium_thruster',
+                E: '#forge:gears/lumium'
+            },
+            id: `${id_prefix}ironjetpacks/lumium_jetpack`
+        },
+        {
+            output: 'ironjetpacks:lumium_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: '#forge:plates/lumium',
+                B: 'powah:capacitor_niotic',
+                C: 'powah:furnator_niotic',
+                D: '#forge:gears/lumium'
+            },
+            id: `${id_prefix}ironjetpacks/lumium_thruster`
+        },
+
+        {
+            output: 'ironjetpacks:spirited_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: 'powah:crystal_spirited',
+                B: 'powah:battery_spirited',
+                C: 'ironjetpacks:lumium_jetpack',
+                D: 'ironjetpacks:spirited_thruster',
+                E: 'powah:reactor_spirited'
+            },
+            id: `${id_prefix}ironjetpacks/spirited_jetpack`
+        },
+        {
+            output: 'ironjetpacks:spirited_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: 'powah:crystal_spirited',
+                B: 'powah:capacitor_spirited',
+                C: 'powah:furnator_spirited',
+                D: 'powah:reactor_spirited'
+            },
+            id: `${id_prefix}ironjetpacks/spirited_thruster`
+        },
+        {
+            output: 'ironjetpacks:enderium_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: '#forge:plates/enderium',
+                B: 'thermal:upgrade_augment_3',
+                C: 'ironjetpacks:spirited_jetpack',
+                D: 'ironjetpacks:enderium_thruster',
+                E: '#forge:gears/enderium'
+            },
+            id: `${id_prefix}ironjetpacks/enderium_jetpack`
+        },
+        {
+            output: 'ironjetpacks:enderium_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: '#forge:plates/enderium',
+                B: 'powah:capacitor_spirited',
+                C: 'powah:furnator_spirited',
+                D: '#forge:gears/enderium'
+            },
+            id: `${id_prefix}ironjetpacks/enderium_thruster`
+        },
+        {
+            output: 'ironjetpacks:nitro_jetpack',
+            pattern: ['ABA', 'ECE', 'D D'],
+            key: {
+                A: 'powah:crystal_nitro',
+                B: 'powah:battery_nitro',
+                C: 'ironjetpacks:enderium_jetpack',
+                D: 'ironjetpacks:nitro_thruster',
+                E: 'powah:reactor_nitro'
+            },
+            id: `${id_prefix}ironjetpacks/nitro_jetpack`
+        },
+        {
+            output: 'ironjetpacks:nitro_thruster',
+            pattern: [' B ', 'BDB', 'ACA'],
+            key: {
+                A: 'powah:crystal_nitro',
+                B: 'powah:capacitor_nitro',
+                C: 'powah:furnator_nitro',
+                D: 'powah:reactor_nitro'
+            },
+            id: `${id_prefix}ironjetpacks/nitro_thruster`
         }
     ];
 

From 87af99ee95b5fbb2377b4822512b7f41d0de8b52 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sun, 24 Oct 2021 19:16:23 -0400
Subject: [PATCH 052/130] Adjust Mining Gadget Quest to accept any version of
 the tool

Resolves: #3544
---
 config/ftbquests/quests/chapters/tools.snbt | 29 +++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/config/ftbquests/quests/chapters/tools.snbt b/config/ftbquests/quests/chapters/tools.snbt
index 3d7c589fb1..eee27dbe5e 100644
--- a/config/ftbquests/quests/chapters/tools.snbt
+++ b/config/ftbquests/quests/chapters/tools.snbt
@@ -1128,10 +1128,35 @@
 				{
 					id: "0000000000000460"
 					type: "item"
+					title: "Mining Gadget"
 					item: {
-						id: "mininggadgets:mininggadget"
+						id: "itemfilters:or"
 						Count: 1b
-						tag: { }
+						tag: {
+							items: [
+								{
+									id: "mininggadgets:mininggadget_simple"
+									Count: 1b
+									tag: {
+										energy: 1000000
+									}
+								}
+								{
+									id: "mininggadgets:mininggadget_fancy"
+									Count: 1b
+									tag: {
+										energy: 1000000
+									}
+								}
+								{
+									id: "mininggadgets:mininggadget"
+									Count: 1b
+									tag: {
+										energy: 1000000
+									}
+								}
+							]
+						}
 					}
 				}
 				{

From 8affffb789283ab7ebede1bc6a22998cff3d912d Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sun, 24 Oct 2021 20:45:52 -0400
Subject: [PATCH 053/130] Disable Architect's Palette charcoal smoking recipe
 to re-enable Create's charcoal recipe

Disable Architect's Palette charcoal smoking recipe to re-enable Create's charcoal recipe
Resolves #3534

also cleaned up blasting/smelting recipes since I was in em anyway.
---
 .../enigmatica/kubejs/base/recipes/remove.js  |  2 +
 .../base/recipetypes/minecraft/blasting.js    | 82 ++++++++++------
 .../base/recipetypes/minecraft/smelting.js    | 93 ++++++++++++-------
 3 files changed, 115 insertions(+), 62 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
index 61fffc2817..76bcf15be8 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
@@ -65,6 +65,8 @@ onEvent('recipes', (event) => {
         'aquaculture:planks_from_driftwood',
         'aquaculture:red_mushroom_from_red_shrooma',
 
+        'architects_palette:smelting/charcoal_block_from_logs_that_burn_smoking',
+
         'astralsorcery:infuser/gold_ore',
         'astralsorcery:shaped/marble/marble_slab',
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/blasting.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/blasting.js
index d19c0ffdab..1611d2adc7 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/blasting.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/blasting.js
@@ -1,56 +1,71 @@
 onEvent('recipes', (event) => {
+    const id_prefix = 'enigmatica:base/minecraft/blasting/';
     const recipes = [
         {
             input: 'minecraft:rotten_flesh',
             output: 'occultism:tallow',
-            xp: 0.5
+            xp: 0.5,
+            id: `${id_prefix}tallow_from_flesh`
         },
         {
             input: '#forge:ores/ender',
             output: Item.of('#forge:shards/ender'),
-            xp: 0.5
+            xp: 0.5,
+            id: `${id_prefix}ender_shard`
         },
         {
             input: '#forge:ores/amber',
             output: Item.of('#forge:shards/amber'),
-            xp: 0.5
+            xp: 0.5,
+            id: `${id_prefix}amber_shard`
         },
         {
             input: '#forge:ores/netherite',
             output: Item.of('minecraft:netherite_scrap'),
-            xp: 2.0
+            xp: 2.0,
+            id: `${id_prefix}netherite_scrap`
         },
         {
             input: '#forge:ores/thallasium',
             output: Item.of('#forge:ingots/thallasium'),
-            xp: 0.7
+            xp: 0.7,
+            id: `${id_prefix}thallasium`
         },
         {
             input: '#forge:ores/elementium',
             output: Item.of('#forge:ingots/elementium'),
-            xp: 1.0
+            xp: 1.0,
+            id: `${id_prefix}elementium`
         },
         {
             input: 'farmersdelight:iron_knife',
             output: Item.of('#forge:nuggets/iron'),
-            xp: 0.1
+            xp: 0.1,
+            id: `${id_prefix}iron_nugget_from_iron_knife`
         },
         {
             input: 'farmersdelight:golden_knife',
             output: Item.of('#forge:nuggets/gold'),
-            xp: 0.1
+            xp: 0.1,
+            id: `${id_prefix}gold_nugget_from_gold_knife`
         },
         {
             input: Item.of('dustrial_decor:rusty_iron_ingot'),
-            output: Item.of('#forge:ingots/iron')
+            output: Item.of('#forge:ingots/iron'),
+            xp: 0.5,
+            id: `${id_prefix}iron_ingot_from_rusty_iron_ingot`
         },
         {
             input: Item.of('dustrial_decor:rusty_iron_nugget'),
-            output: Item.of('#forge:nuggets/iron')
+            output: Item.of('#forge:nuggets/iron'),
+            xp: 0.5,
+            id: `${id_prefix}iron_nugget_from_rusty_iron_nugget`
         },
         {
             input: '#forge:dusts/netherite',
-            output: Item.of('#forge:ingots/netherite')
+            output: Item.of('#forge:ingots/netherite'),
+            xp: 0.5,
+            id: `${id_prefix}netherite`
         },
         {
             input: 'aquaculture:tin_can',
@@ -61,7 +76,8 @@ onEvent('recipes', (event) => {
         {
             input: '#forge:ores/aquamarine',
             output: Item.of('#forge:gems/aquamarine'),
-            xp: 1.0
+            xp: 1.0,
+            id: `${id_prefix}aquamarine`
         },
         {
             input: '#forge:dusts/hop_graphite',
@@ -72,62 +88,74 @@ onEvent('recipes', (event) => {
         {
             input: 'aquaculture:neptunium_helmet',
             output: Item.of('aquaculture:neptunium_nugget', 5),
-            xp: 5
+            xp: 5,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_helmet`
         },
         {
             input: 'aquaculture:neptunium_chestplate',
             output: Item.of('aquaculture:neptunium_nugget', 8),
-            xp: 8
+            xp: 8,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_chestplate`
         },
         {
             input: 'aquaculture:neptunium_leggings',
             output: Item.of('aquaculture:neptunium_nugget', 7),
-            xp: 7
+            xp: 7,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_leggings`
         },
         {
             input: 'aquaculture:neptunium_boots',
             output: Item.of('aquaculture:neptunium_nugget', 4),
-            xp: 4
+            xp: 4,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_boots`
         },
         {
             input: 'aquaculture:neptunium_pickaxe',
             output: Item.of('aquaculture:neptunium_nugget', 3),
-            xp: 3
+            xp: 3,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_pickaxe`
         },
         {
             input: 'aquaculture:neptunium_axe',
             output: Item.of('aquaculture:neptunium_nugget', 3),
-            xp: 3
+            xp: 3,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_axe`
         },
         {
             input: 'aquaculture:neptunium_shovel',
             output: Item.of('aquaculture:neptunium_nugget', 1),
-            xp: 1
+            xp: 1,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_shovel`
         },
         {
             input: 'aquaculture:neptunium_sword',
             output: Item.of('aquaculture:neptunium_nugget', 2),
-            xp: 2
+            xp: 2,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_sword`
         },
         {
             input: 'aquaculture:neptunium_hoe',
             output: Item.of('aquaculture:neptunium_nugget', 2),
-            xp: 2
+            xp: 2,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_hoe`
         },
         {
             input: 'aquaculture:neptunium_fillet_knife',
             output: Item.of('aquaculture:neptunium_nugget', 2),
-            xp: 2
+            xp: 2,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_knife`
         },
         {
             input: 'aquaculture:neptunium_fishing_rod',
             output: Item.of('aquaculture:neptunium_nugget', 2),
-            xp: 2
+            xp: 2,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_fishing_rod`
         },
         {
             input: 'aquaculture:neptunium_bow',
             output: Item.of('aquaculture:neptunium_nugget', 3),
-            xp: 3
+            xp: 3,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_bow`
         },
         {
             input: ['#forge:slag', 'thermal:rich_slag'],
@@ -137,14 +165,10 @@ onEvent('recipes', (event) => {
         }
     ];
     recipes.forEach((recipe) => {
-        const re = event.blasting(recipe.output, recipe.input);
+        const re = event.smelting(recipe.output, recipe.input).id(recipe.id);
 
         if (recipe.xp) {
             re.xp(recipe.xp);
         }
-
-        if (recipe.id) {
-            re.id(recipe.id);
-        }
     });
 });
diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/smelting.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/smelting.js
index e19d5bfd64..bda8178520 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/smelting.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/smelting.js
@@ -1,51 +1,65 @@
 onEvent('recipes', (event) => {
+    const id_prefix = 'enigmatica:base/minecraft/smelting/';
     const recipes = [
         {
             input: '#forge:ores/ender',
             output: Item.of('#forge:shards/ender'),
-            xp: 0.5
+            xp: 0.5,
+            id: `${id_prefix}ender_shard`
         },
         {
             input: '#forge:ores/amber',
             output: Item.of('#forge:shards/amber'),
-            xp: 0.5
+            xp: 0.5,
+            id: `${id_prefix}amber_shard`
         },
         {
             input: '#forge:ores/netherite',
             output: Item.of('minecraft:netherite_scrap'),
-            xp: 2.0
+            xp: 2.0,
+            id: `${id_prefix}netherite_scrap`
         },
         {
             input: '#forge:ores/thallasium',
             output: Item.of('#forge:ingots/thallasium'),
-            xp: 0.7
+            xp: 0.7,
+            id: `${id_prefix}thallasium`
         },
         {
             input: '#forge:ores/elementium',
             output: Item.of('#forge:ingots/elementium'),
-            xp: 1.0
+            xp: 1.0,
+            id: `${id_prefix}elementium`
         },
         {
             input: 'farmersdelight:iron_knife',
             output: Item.of('#forge:nuggets/iron'),
-            xp: 0.1
+            xp: 0.1,
+            id: `${id_prefix}iron_nugget_from_iron_knife`
         },
         {
             input: 'farmersdelight:golden_knife',
             output: Item.of('#forge:nuggets/gold'),
-            xp: 0.1
+            xp: 0.1,
+            id: `${id_prefix}gold_nugget_from_gold_knife`
         },
         {
             input: Item.of('dustrial_decor:rusty_iron_ingot'),
-            output: Item.of('#forge:ingots/iron')
+            output: Item.of('#forge:ingots/iron'),
+            xp: 0.1,
+            id: `${id_prefix}iron_nugget_from_iron_knife`
         },
         {
             input: Item.of('dustrial_decor:rusty_iron_nugget'),
-            output: Item.of('#forge:nuggets/iron')
+            output: Item.of('#forge:nuggets/iron'),
+            xp: 0.1,
+            id: `${id_prefix}iron_nugget_from_rusty_iron_nugget`
         },
         {
             input: '#forge:dusts/netherite',
-            output: Item.of('#forge:ingots/netherite')
+            output: Item.of('#forge:ingots/netherite'),
+            xp: 0.1,
+            id: `${id_prefix}iron_ingot_from_rusty_iron_ingot`
         },
         {
             input: 'aquaculture:tin_can',
@@ -56,7 +70,8 @@ onEvent('recipes', (event) => {
         {
             input: '#forge:ores/aquamarine',
             output: Item.of('#forge:gems/aquamarine'),
-            xp: 1.0
+            xp: 1.0,
+            id: `${id_prefix}aquamarine`
         },
         {
             input: '#forge:dusts/hop_graphite',
@@ -67,67 +82,80 @@ onEvent('recipes', (event) => {
         {
             input: 'aquaculture:neptunium_helmet',
             output: Item.of('aquaculture:neptunium_nugget', 5),
-            xp: 5
+            xp: 5,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_helmet`
         },
         {
             input: 'aquaculture:neptunium_chestplate',
             output: Item.of('aquaculture:neptunium_nugget', 8),
-            xp: 8
+            xp: 8,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_chestplate`
         },
         {
             input: 'aquaculture:neptunium_leggings',
             output: Item.of('aquaculture:neptunium_nugget', 7),
-            xp: 7
+            xp: 7,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_leggings`
         },
         {
             input: 'aquaculture:neptunium_boots',
             output: Item.of('aquaculture:neptunium_nugget', 4),
-            xp: 4
+            xp: 4,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_boots`
         },
         {
             input: 'aquaculture:neptunium_pickaxe',
             output: Item.of('aquaculture:neptunium_nugget', 3),
-            xp: 3
+            xp: 3,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_pickaxe`
         },
         {
             input: 'aquaculture:neptunium_axe',
             output: Item.of('aquaculture:neptunium_nugget', 3),
-            xp: 3
+            xp: 3,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_axe`
         },
         {
             input: 'aquaculture:neptunium_shovel',
             output: Item.of('aquaculture:neptunium_nugget', 1),
-            xp: 1
+            xp: 1,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_shovel`
         },
         {
             input: 'aquaculture:neptunium_sword',
             output: Item.of('aquaculture:neptunium_nugget', 2),
-            xp: 2
+            xp: 2,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_sword`
         },
         {
             input: 'aquaculture:neptunium_hoe',
             output: Item.of('aquaculture:neptunium_nugget', 2),
-            xp: 2
+            xp: 2,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_hoe`
         },
         {
             input: 'aquaculture:neptunium_fillet_knife',
             output: Item.of('aquaculture:neptunium_nugget', 2),
-            xp: 2
+            xp: 2,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_knife`
         },
         {
             input: 'aquaculture:neptunium_fishing_rod',
             output: Item.of('aquaculture:neptunium_nugget', 2),
-            xp: 2
+            xp: 2,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_fishing_rod`
         },
         {
             input: 'aquaculture:neptunium_bow',
             output: Item.of('aquaculture:neptunium_nugget', 3),
-            xp: 3
+            xp: 3,
+            id: `${id_prefix}neptunium_nugget_from_neptunium_bow`
         },
         {
             input: 'atum:marl',
             output: 'atum:ceramic_white',
-            xp: 0.3
+            xp: 0.3,
+            id: `${id_prefix}ceramic_white`
         }
     ];
 
@@ -144,22 +172,21 @@ onEvent('recipes', (event) => {
     ];
 
     stones.forEach((cobblestone) => {
-        var stone = 'create:' + cobblestone;
+        var stone = `create:${cobblestone}`;
         if (!Item.exists(stone)) {
-            stone = 'minecraft:' + cobblestone;
+            stone = `minecraft:${cobblestone}`;
         }
-        recipes.push({ input: 'create:' + cobblestone + '_cobblestone', output: stone });
+        recipes.push({
+            input: `create:${cobblestone}_cobblestone`,
+            output: stone,
+            id: `${id_prefix}${cobblestone}_from_${cobblestone}_cobblestone`
+        });
     });
 
     recipes.forEach((recipe) => {
-        const re = event.smelting(recipe.output, recipe.input);
-
+        const re = event.smelting(recipe.output, recipe.input).id(recipe.id);
         if (recipe.xp) {
             re.xp(recipe.xp);
         }
-
-        if (recipe.id) {
-            re.id(recipe.id);
-        }
     });
 });

From 89cbab197ed12fdcbb85af9c0c7873f067d842dd Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sun, 24 Oct 2021 21:20:02 -0400
Subject: [PATCH 054/130] fission casings

---
 .../industrialforegoing/dissolution_chamber.js   | 16 ++++++++++++++++
 .../recipetypes/thermal/machine/bottler.js       |  6 ------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
index e715e8ef19..b6c66b3251 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
@@ -339,6 +339,22 @@ onEvent('recipes', (event) => {
             outputFluid: '',
             outputFluidAmount: 0,
             id: 'mekanismgenerators:reactor/frame'
+        },
+        {
+            inputs: [
+                'mekanism:steel_casing',
+                'immersiveengineering:wire_steel',
+                'immersiveengineering:wire_steel',
+                'immersiveengineering:wire_steel',
+                'immersiveengineering:wire_steel'
+            ],
+            inputFluid: 'immersiveengineering:concrete',
+            inputFluidAmount: 1000,
+            processingTime: 600,
+            outputItem: { item: 'mekanismgenerators:fission_reactor_casing', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanismgenerators:fission_reactor/casing'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/bottler.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/bottler.js
index 92d8a7181a..bd7e8261f8 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/bottler.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/machine/bottler.js
@@ -57,12 +57,6 @@ onEvent('recipes', (event) => {
             fluid: Fluid.of('pneumaticcraft:memory_essence', 72000),
             output: 'kubejs:memory_ultimate_filled',
             id: `${id_prefix}memory_ultimate_filled`
-        },
-        {
-            input: 'mekanism:steel_casing',
-            fluid: Fluid.of('immersiveengineering:concrete', 1000),
-            output: 'mekanismgenerators:fission_reactor_casing',
-            id: 'mekanismgenerators:fission_reactor/casing'
         }
     ];
     recipes.forEach((recipe) => {

From 443c680cd58de0b53f539d2d7e257759cb07913f Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sun, 24 Oct 2021 21:30:26 -0400
Subject: [PATCH 055/130] Update cardboard box blacklist, excluding PNC

Prevents people picking up the compressors in the villages to use.
---
 config/Mekanism/general.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/Mekanism/general.toml b/config/Mekanism/general.toml
index 6801af2bcc..5bfb6488c0 100644
--- a/config/Mekanism/general.toml
+++ b/config/Mekanism/general.toml
@@ -7,7 +7,7 @@
 	#Peak processing rate for the Solar Neutron Activator. Note: It can go higher than this value in some extreme environments.
 	maxSolarNeutronActivatorRate = 64
 	#Any mod ids added to this list will not be able to have any of their blocks, picked up by the cardboard box. For example: ["mekanism"]
-	cardboardModBlacklist = ["refinedstorage", "tetra", "storagedrawers", "lootr", "extrastorage", "astralsorcery", "waystones", "powah"]
+	cardboardModBlacklist = ["refinedstorage", "tetra", "storagedrawers", "lootr", "extrastorage", "astralsorcery", "waystones", "powah", "pneumaticcraft"]
 	#Disable to make the anchor upgrade not do anything.
 	allowChunkloading = true
 	#How much heat energy is created from one Joule of regular energy in the Resistive Heater.

From 511176a9c653f8b34376bfd447cce3a57d6f5c63 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sun, 24 Oct 2021 21:42:45 -0400
Subject: [PATCH 056/130] update to proposed energizing rates

update to proposed energizing rates
---
 config/powah/energy/energizing.toml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/powah/energy/energizing.toml b/config/powah/energy/energizing.toml
index 991e1eb3be..f85bbb3ea8 100644
--- a/config/powah/energy/energizing.toml
+++ b/config/powah/energy/energizing.toml
@@ -4,23 +4,21 @@ range = 4
 
 [Energy_Capacity]
 	#Range: 0 ~ 9000000000000000000
-	spiritedCap = 4000000
-	#Range: 0 ~ 9000000000000000000
-	blazingCap = 800000
+	starterCap = 10000
 	#Range: 0 ~ 9000000000000000000
 	basicCap = 100000
 	#Range: 0 ~ 9000000000000000000
-	nioticCap = 1500000
+	hardenedCap = 250000
 	#Range: 0 ~ 9000000000000000000
-	nitroCap = 10000000
+	blazingCap = 800000
 	#Range: 0 ~ 9000000000000000000
-	hardenedCap = 250000
+	nioticCap = 1500000
 	#Range: 0 ~ 9000000000000000000
-	starterCap = 10000
+	spiritedCap = 4000000
+	#Range: 0 ~ 9000000000000000000
+	nitroCap = 10000000
 
 [Energy_Transfer]
-	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 1200
 	#Range: 0 ~ 9000000000000000000
 	starterTransfer = 10
 	#Range: 0 ~ 9000000000000000000
@@ -28,9 +26,11 @@ range = 4
 	#Range: 0 ~ 9000000000000000000
 	hardenedTransfer = 120
 	#Range: 0 ~ 9000000000000000000
+	blazingTransfer = 300
+	#Range: 0 ~ 9000000000000000000
 	nioticTransfer = 700
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 300
+	spiritedTransfer = 1200
 	#Range: 0 ~ 9000000000000000000
 	nitroTransfer = 3000
 

From 048cdad3051694026e3f5227c37e00fbdec5fc4b Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Mon, 25 Oct 2021 10:39:00 +0200
Subject: [PATCH 057/130] Update immersivepetroleum-server.toml

Generated in enigmatica6 @ 0.5.17
---
 defaultconfigs/immersivepetroleum-server.toml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/defaultconfigs/immersivepetroleum-server.toml b/defaultconfigs/immersivepetroleum-server.toml
index 327bdc82a0..e547abc350 100644
--- a/defaultconfigs/immersivepetroleum-server.toml
+++ b/defaultconfigs/immersivepetroleum-server.toml
@@ -16,6 +16,14 @@
 	distillationTower_energyModifier = 1.0
 	#A modifier to apply to the time of every Distillation recipe. Can't be lower than 1, default=1
 	distillationTower_timeModifier = 1.0
+	#A modifier to apply to the energy costs of every Coker Tower recipe, default=1
+	cokerUnit_energyModifier = 1.0
+	#A modifier to apply to the time of every Coker recipe. Can't be lower than 1, default=1
+	cokerUnit_timeModifier = 1.0
+	#A modifier to apply to the energy costs of every Sulfur Recovery Unit recipe, default=1
+	hydrotreater_energyModifier = 1.0
+	#A modifier to apply to the time of every Sulfur Recovery Unit recipe. Can't be lower than 1, default=1
+	hydrotreater_timeModifier = 1.0
 
 [Generation]
 	#List of Portable Generator fuels. Format: fluid_name, mb_used_per_tick, flux_produced_per_tick

From 71204c15d369b90eabab4fc56624de859f10dbc5 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Mon, 25 Oct 2021 10:43:22 +0200
Subject: [PATCH 058/130] Allow pneumaticcraft gasoline in motor boats and
 portable generators

---
 defaultconfigs/immersivepetroleum-server.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/defaultconfigs/immersivepetroleum-server.toml b/defaultconfigs/immersivepetroleum-server.toml
index e547abc350..44458efb3c 100644
--- a/defaultconfigs/immersivepetroleum-server.toml
+++ b/defaultconfigs/immersivepetroleum-server.toml
@@ -27,11 +27,11 @@
 
 [Generation]
 	#List of Portable Generator fuels. Format: fluid_name, mb_used_per_tick, flux_produced_per_tick
-	fuels = ["immersivepetroleum:gasoline, 5, 256"]
+	fuels = ["immersivepetroleum:gasoline, 5, 256", "pneumaticcraft:gasoline, 5, 256"]
 
 [Miscellaneous]
 	#List of Motorboat fuels. Format: fluid_name, mb_used_per_tick
-	boat_fuels = ["immersivepetroleum:gasoline, 1"]
+	boat_fuels = ["immersivepetroleum:gasoline, 1", "pneumaticcraft:gasoline, 1"]
 	#Automatically unlock IP recipes for new players, default=true
 	autounlock_recipes = true
 	#Set to false to disable the asphalt block boosting player speed, default=true

From 137ff2318a35ecd724afe06a590cc1eadb72c199 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Mon, 25 Oct 2021 10:07:33 -0400
Subject: [PATCH 059/130] Update energizing.toml

---
 config/powah/energy/energizing.toml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/powah/energy/energizing.toml b/config/powah/energy/energizing.toml
index f85bbb3ea8..d0f0883f7c 100644
--- a/config/powah/energy/energizing.toml
+++ b/config/powah/energy/energizing.toml
@@ -26,11 +26,11 @@ range = 4
 	#Range: 0 ~ 9000000000000000000
 	hardenedTransfer = 120
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 300
+	blazingTransfer = 340
 	#Range: 0 ~ 9000000000000000000
-	nioticTransfer = 700
+	nioticTransfer = 1220
 	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 1200
+	spiritedTransfer = 5800
 	#Range: 0 ~ 9000000000000000000
-	nitroTransfer = 3000
+	nitroTransfer = 40000
 

From 138bb48eaa781d3e520f958f7d946acf19a10b03 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Mon, 25 Oct 2021 11:01:44 -0400
Subject: [PATCH 060/130] augments and entangled blocks

---
 .../expert/recipetypes/entangled/shaped.js    | 47 +++++++++++++++++++
 .../expert/recipetypes/thermal/shaped.js      | 36 ++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/entangled/shaped.js

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/entangled/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/entangled/shaped.js
new file mode 100644
index 0000000000..ec5c8d0e0f
--- /dev/null
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/entangled/shaped.js
@@ -0,0 +1,47 @@
+onEvent('recipes', (event) => {
+    if (global.isExpertMode == false) {
+        return;
+    }
+
+    /*
+        ,
+        {
+            output: '',
+            pattern: ['', '', ''],
+            key: {
+                A: ''
+            },
+            id: ''
+        }
+    */
+
+    const recipes = [
+        {
+            output: 'entangled:block',
+            pattern: ['ABC', 'BDB', 'CBA'],
+            key: {
+                A: 'botania:corporea_spark',
+                B: 'botania:red_string',
+                C: 'botania:red_string_container',
+                D: 'botania:corporea_spark_master'
+            },
+            id: 'entangled:block'
+        },
+        {
+            output: 'entangled:item',
+            pattern: [' AB', ' CA', 'DE '],
+            key: {
+                A: '#forge:rods/lead',
+                B: 'eidolon:warped_sprouts',
+                C: 'botania:twig_wand',
+                D: 'botania:livingwood_twig',
+                E: 'betterendforge:leather_stripe'
+            },
+            id: 'entangled:item'
+        }
+    ];
+
+    recipes.forEach((recipe) => {
+        event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id);
+    });
+});
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/shaped.js
index 45fbb68e18..86644335cc 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/thermal/shaped.js
@@ -84,6 +84,42 @@ onEvent('recipes', (event) => {
                 D: '#forge:ingots/lead'
             },
             id: 'thermal:charge_bench'
+        },
+        {
+            output: 'thermal:upgrade_augment_1',
+            pattern: ['ABA', 'CDC', 'AEA'],
+            key: {
+                A: '#forge:gears/invar',
+                B: 'thermal:energy_cell',
+                C: '#xnet:connectors',
+                D: 'pneumaticcraft:advanced_pcb',
+                E: 'thermal:fluid_cell'
+            },
+            id: 'thermal:augments/upgrade_augment_1'
+        },
+        {
+            output: 'thermal:upgrade_augment_2',
+            pattern: ['ABA', 'CDC', 'AEA'],
+            key: {
+                A: '#forge:gears/lumium',
+                B: 'rftoolscontrol:cpu_core_1000',
+                C: 'kubejs:memory_advanced_filled',
+                D: 'thermal:upgrade_augment_1',
+                E: 'powah:capacitor_hardened'
+            },
+            id: 'thermal:augments/upgrade_augment_2'
+        },
+        {
+            output: 'thermal:upgrade_augment_3',
+            pattern: ['ABA', 'CDC', 'AEA'],
+            key: {
+                A: '#forge:gears/enderium',
+                B: 'rftoolscontrol:cpu_core_2000',
+                C: 'kubejs:memory_elite_filled',
+                D: 'thermal:upgrade_augment_2',
+                E: 'powah:capacitor_niotic'
+            },
+            id: 'thermal:augments/upgrade_augment_3'
         }
     ];
 

From 3aed42ba56e975bec4cdd8fb870283ee564e581f Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Mon, 25 Oct 2021 20:54:44 +0200
Subject: [PATCH 061/130] Allow thermal expansion's refined fuel as well

---
 defaultconfigs/immersivepetroleum-server.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/defaultconfigs/immersivepetroleum-server.toml b/defaultconfigs/immersivepetroleum-server.toml
index 44458efb3c..8815752714 100644
--- a/defaultconfigs/immersivepetroleum-server.toml
+++ b/defaultconfigs/immersivepetroleum-server.toml
@@ -27,11 +27,11 @@
 
 [Generation]
 	#List of Portable Generator fuels. Format: fluid_name, mb_used_per_tick, flux_produced_per_tick
-	fuels = ["immersivepetroleum:gasoline, 5, 256", "pneumaticcraft:gasoline, 5, 256"]
+	fuels = ["immersivepetroleum:gasoline, 5, 256", "pneumaticcraft:gasoline, 5, 256", "thermal:refined_fuel, 5, 256"]
 
 [Miscellaneous]
 	#List of Motorboat fuels. Format: fluid_name, mb_used_per_tick
-	boat_fuels = ["immersivepetroleum:gasoline, 1", "pneumaticcraft:gasoline, 1"]
+	boat_fuels = ["immersivepetroleum:gasoline, 1", "pneumaticcraft:gasoline, 1", "thermal:refined_fuel, 1"]
 	#Automatically unlock IP recipes for new players, default=true
 	autounlock_recipes = true
 	#Set to false to disable the asphalt block boosting player speed, default=true

From d8904ea67836b6a55c3d5fc2c3d98b508fd89c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Mon, 25 Oct 2021 21:09:28 +0200
Subject: [PATCH 062/130] mod updates

---
 config/chiselsandbits-client.toml             |    4 +-
 config/dungeons_plus-common.toml              |   66 +-
 config/emendatusenigmatica-common.toml        |  130 ++
 config/logprot-common.toml                    |    4 +-
 .../repurposed_structures-forge/dungeons.toml |    4 +
 minecraftinstance.json                        | 2007 ++++++++++-------
 6 files changed, 1363 insertions(+), 852 deletions(-)

diff --git a/config/chiselsandbits-client.toml b/config/chiselsandbits-client.toml
index 47d5a79ebd..afe46c95af 100644
--- a/config/chiselsandbits-client.toml
+++ b/config/chiselsandbits-client.toml
@@ -83,8 +83,8 @@
 
 				[client.client.performance.models.builder]
 					#mod.chiselsandbits.config.client.performance.models.builder.threadcount.comment
-					#Range: 10 ~ 12
-					threadcount = 10
+					#Range: 2 ~ 4
+					threadcount = 4
 
 			[client.client.performance.faces]
 
diff --git a/config/dungeons_plus-common.toml b/config/dungeons_plus-common.toml
index ec76ceff2c..9a986568b5 100644
--- a/config/dungeons_plus-common.toml
+++ b/config/dungeons_plus-common.toml
@@ -1,113 +1,113 @@
 
 [tower]
-	#Spacing between structures
+	#The average distance between structures of this type, measured in chunks.
 	#Range: > 1
 	spacing = 25
-	#Offsets the spacing of the structures randomly
+	#A random offset applied to spacing. Values closer to 0 produce a grid effect while values closer to spacing are more random.
 	#Range: > 0
 	offset = 6
-	#How should the code treate biomes? true = whitelist, false = blacklist. Biomes defined with ! do the opposite.
+	#How the biomes list should be used. true = whitelist, false = blacklist.
 	is_whitelist = true
-	#A biome filter to determine where the structure should generate. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest.
+	#A filter for which biomes this structure should generate in. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest.
 	biomes = "#structure_gel:plains, #structure_gel:oak_forest, #structure_gel:dark_forest, #structure_gel:birch_forest, #structure_gel:mountain"
-	#Chance of generating in an allowed chunk
+	#Percent chance of generating in an allowed chunk.
 	#Range: 0.0 ~ 1.0
 	probability = 0.75
 	#What dimensions should this structure be placed in. Type "all" to allow all dimensions
 	valid_dimensions = "minecraft:overworld"
 
 [leviathan]
-	#Spacing between structures
+	#The average distance between structures of this type, measured in chunks.
 	#Range: > 1
 	spacing = 36
-	#Offsets the spacing of the structures randomly
+	#A random offset applied to spacing. Values closer to 0 produce a grid effect while values closer to spacing are more random.
 	#Range: > 0
 	offset = 8
-	#How should the code treate biomes? true = whitelist, false = blacklist. Biomes defined with ! do the opposite.
+	#How the biomes list should be used. true = whitelist, false = blacklist.
 	is_whitelist = true
-	#A biome filter to determine where the structure should generate. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest.
+	#A filter for which biomes this structure should generate in. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest.
 	biomes = "#structure_gel:desert"
-	#Chance of generating in an allowed chunk
+	#Percent chance of generating in an allowed chunk.
 	#Range: 0.0 ~ 1.0
 	probability = 1.0
 	#What dimensions should this structure be placed in. Type "all" to allow all dimensions
 	valid_dimensions = "minecraft:overworld"
 
 [snowy_temple]
-	#Spacing between structures
+	#The average distance between structures of this type, measured in chunks.
 	#Range: > 1
 	spacing = 36
-	#Offsets the spacing of the structures randomly
+	#A random offset applied to spacing. Values closer to 0 produce a grid effect while values closer to spacing are more random.
 	#Range: > 0
 	offset = 8
-	#How should the code treate biomes? true = whitelist, false = blacklist. Biomes defined with ! do the opposite.
+	#How the biomes list should be used. true = whitelist, false = blacklist.
 	is_whitelist = true
-	#A biome filter to determine where the structure should generate. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest.
+	#A filter for which biomes this structure should generate in. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest.
 	biomes = "#structure_gel:snowy_plains, #structure_gel:snowy_spruce_forest"
-	#Chance of generating in an allowed chunk
+	#Percent chance of generating in an allowed chunk.
 	#Range: 0.0 ~ 1.0
 	probability = 1.0
 	#What dimensions should this structure be placed in. Type "all" to allow all dimensions
 	valid_dimensions = "minecraft:overworld"
 
 [bigger_dungeon]
-	#Spacing between structures
+	#The average distance between structures of this type, measured in chunks.
 	#Range: > 1
 	spacing = 12
-	#Offsets the spacing of the structures randomly
+	#A random offset applied to spacing. Values closer to 0 produce a grid effect while values closer to spacing are more random.
 	#Range: > 0
 	offset = 5
-	#How should the code treate biomes? true = whitelist, false = blacklist. Biomes defined with ! do the opposite.
+	#How the biomes list should be used. true = whitelist, false = blacklist.
 	is_whitelist = true
-	#A biome filter to determine where the structure should generate. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest.
+	#A filter for which biomes this structure should generate in. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest.
 	biomes = "#structure_gel:overworld, !mushroom_fields, !mushroom_field_shore"
-	#Chance of generating in an allowed chunk
+	#Percent chance of generating in an allowed chunk.
 	#Range: 0.0 ~ 1.0
 	probability = 0.4
 	#What dimensions should this structure be placed in. Type "all" to allow all dimensions
 	valid_dimensions = "minecraft:overworld"
 
 [end_ruins]
-	#Spacing between structures
+	#The average distance between structures of this type, measured in chunks.
 	#Range: > 1
 	spacing = 24
-	#Offsets the spacing of the structures randomly
+	#A random offset applied to spacing. Values closer to 0 produce a grid effect while values closer to spacing are more random.
 	#Range: > 0
 	offset = 8
-	#How should the code treate biomes? true = whitelist, false = blacklist. Biomes defined with ! do the opposite.
+	#How the biomes list should be used. true = whitelist, false = blacklist.
 	is_whitelist = true
-	#A biome filter to determine where the structure should generate. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest.
+	#A filter for which biomes this structure should generate in. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest.
 	biomes = "#structure_gel:outer_end_island"
-	#Chance of generating in an allowed chunk
+	#Percent chance of generating in an allowed chunk.
 	#Range: 0.0 ~ 1.0
 	probability = 0.8
 	#What dimensions should this structure be placed in. Type "all" to allow all dimensions
 	valid_dimensions = "minecraft:the_end"
 
 [warped_garden]
-	#Spacing between structures
+	#The average distance between structures of this type, measured in chunks.
 	#Range: > 1
 	spacing = 36
-	#Offsets the spacing of the structures randomly
+	#A random offset applied to spacing. Values closer to 0 produce a grid effect while values closer to spacing are more random.
 	#Range: > 0
 	offset = 8
-	#How should the code treate biomes? true = whitelist, false = blacklist. Biomes defined with ! do the opposite.
+	#How the biomes list should be used. true = whitelist, false = blacklist.
 	is_whitelist = true
-	#A biome filter to determine where the structure should generate. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest.
+	#A filter for which biomes this structure should generate in. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest.
 	biomes = "#structure_gel:ocean, !#structure_gel:frozen"
 	#What dimensions should this structure be placed in. Type "all" to allow all dimensions
 	valid_dimensions = "minecraft:overworld"
 
 [soul_prison]
-	#Spacing between structures
+	#The average distance between structures of this type, measured in chunks.
 	#Range: > 1
 	spacing = 25
-	#Offsets the spacing of the structures randomly
+	#A random offset applied to spacing. Values closer to 0 produce a grid effect while values closer to spacing are more random.
 	#Range: > 0
 	offset = 6
-	#How should the code treate biomes? true = whitelist, false = blacklist. Biomes defined with ! do the opposite.
+	#How the biomes list should be used. true = whitelist, false = blacklist.
 	is_whitelist = true
-	#A biome filter to determine where the structure should generate. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest.
+	#A filter for which biomes this structure should generate in. Works with the biome dictionary (#overworld) and "not" statements (!plains). These can be combined (!#nether). Operates in the order presented. So "#forest, !flower_forest" will add all forests and then remove the flower forest.
 	biomes = "minecraft:soul_sand_valley"
 	#What dimensions should this structure be placed in. Type "all" to allow all dimensions
 	valid_dimensions = "minecraft:the_nether"
diff --git a/config/emendatusenigmatica-common.toml b/config/emendatusenigmatica-common.toml
index de2bbfc649..e9af9caf4e 100644
--- a/config/emendatusenigmatica-common.toml
+++ b/config/emendatusenigmatica-common.toml
@@ -1911,3 +1911,133 @@
 ["Stratum Config: quark_deepslate"]
 	active = true
 
+["Ruby Config"]
+
+	["Ruby Config".Overworld]
+		#Activate/Deactivate the Ore Gen in The Overworld [Default: true]
+		generate_in_the_overworld = false
+		#Baseline Y-Level [Default: 20]
+		#Range: 0 ~ 256
+		overworld_base = 20
+		#Spread Amount (# of Y-Levels above and below the Baseline) [Default: 1]
+		#Range: 0 ~ 256
+		overworld_spread = 1
+		#Average Ores per Chunk [Default: 8]
+		#Range: 0 ~ 64
+		overworld_count = 8
+		#Configure the ore Vein Size [Default: 12]
+		#Range: 0 ~ 64
+		overworld_size = 12
+		#List of biome IDs in which the ore is not allowed to generate.
+		#To blacklist all biomes from a single mod, use 'modid:*'
+		overworld_biome_blacklist = []
+		#Invert Blacklist to Whitelist [Default: false]
+		overworld_biome_list_invert = false
+
+	["Ruby Config"."The Nether"]
+		#Activate/Deactivate the Ore Gen in The Nether [Default: false]
+		generate_in_the_nether = false
+		#Baseline Y-Level [Default: 50]
+		#Range: 0 ~ 128
+		nether_base = 50
+		#Spread Amount (# of Y-Levels above and below the Baseline) [Default: 1]
+		#Range: 0 ~ 128
+		nether_spread = 1
+		#Average Ores per Chunk [Default: 8]
+		#Range: 0 ~ 64
+		nether_count = 8
+		#Ore Vein Size [Default: 12]
+		#Range: 0 ~ 64
+		nether_size = 12
+		#List of biome IDs in which the ore is not allowed to generate.
+		#To blacklist all biomes from a single mod, use 'modid:*'
+		nether_biome_blacklist = []
+		#Invert Blacklist to Whitelist [Default: false]
+		nether_biome_list_invert = false
+
+	["Ruby Config"."The End"]
+		#Activate/Deactivate the Ore Gen in The End [Default: false]
+		generate_in_the_end = false
+		#Baseline Y-Level [Default: 40]
+		#Range: 0 ~ 256
+		end_base = 40
+		#Spread Amount (# of Y-Levels above and below the Baseline) [Default: 1]
+		#Range: 0 ~ 256
+		end_spread = 1
+		#Average Ores per Chunk [Default: 8]
+		#Range: 0 ~ 64
+		end_count = 8
+		#Ore Vein Size [Default: 12]
+		#Range: 0 ~ 64
+		end_size = 12
+		#List of biome IDs in which the ore is not allowed to generate.
+		#To blacklist all biomes from a single mod, use 'modid:*'
+		end_biome_blacklist = []
+		#Invert Blacklist to Whitelist [Default: false]
+		end_biome_list_invert = false
+
+["Sapphire Config"]
+
+	["Sapphire Config".Overworld]
+		#Activate/Deactivate the Ore Gen in The Overworld [Default: true]
+		generate_in_the_overworld = false
+		#Baseline Y-Level [Default: 20]
+		#Range: 0 ~ 256
+		overworld_base = 20
+		#Spread Amount (# of Y-Levels above and below the Baseline) [Default: 1]
+		#Range: 0 ~ 256
+		overworld_spread = 1
+		#Average Ores per Chunk [Default: 8]
+		#Range: 0 ~ 64
+		overworld_count = 8
+		#Configure the ore Vein Size [Default: 12]
+		#Range: 0 ~ 64
+		overworld_size = 12
+		#List of biome IDs in which the ore is not allowed to generate.
+		#To blacklist all biomes from a single mod, use 'modid:*'
+		overworld_biome_blacklist = []
+		#Invert Blacklist to Whitelist [Default: false]
+		overworld_biome_list_invert = false
+
+	["Sapphire Config"."The Nether"]
+		#Activate/Deactivate the Ore Gen in The Nether [Default: false]
+		generate_in_the_nether = false
+		#Baseline Y-Level [Default: 50]
+		#Range: 0 ~ 128
+		nether_base = 50
+		#Spread Amount (# of Y-Levels above and below the Baseline) [Default: 1]
+		#Range: 0 ~ 128
+		nether_spread = 1
+		#Average Ores per Chunk [Default: 8]
+		#Range: 0 ~ 64
+		nether_count = 8
+		#Ore Vein Size [Default: 12]
+		#Range: 0 ~ 64
+		nether_size = 12
+		#List of biome IDs in which the ore is not allowed to generate.
+		#To blacklist all biomes from a single mod, use 'modid:*'
+		nether_biome_blacklist = []
+		#Invert Blacklist to Whitelist [Default: false]
+		nether_biome_list_invert = false
+
+	["Sapphire Config"."The End"]
+		#Activate/Deactivate the Ore Gen in The End [Default: false]
+		generate_in_the_end = false
+		#Baseline Y-Level [Default: 40]
+		#Range: 0 ~ 256
+		end_base = 40
+		#Spread Amount (# of Y-Levels above and below the Baseline) [Default: 1]
+		#Range: 0 ~ 256
+		end_spread = 1
+		#Average Ores per Chunk [Default: 8]
+		#Range: 0 ~ 64
+		end_count = 8
+		#Ore Vein Size [Default: 12]
+		#Range: 0 ~ 64
+		end_size = 12
+		#List of biome IDs in which the ore is not allowed to generate.
+		#To blacklist all biomes from a single mod, use 'modid:*'
+		end_biome_blacklist = []
+		#Invert Blacklist to Whitelist [Default: false]
+		end_biome_list_invert = false
+
diff --git a/config/logprot-common.toml b/config/logprot-common.toml
index 8698ca8266..6acfcb326b 100644
--- a/config/logprot-common.toml
+++ b/config/logprot-common.toml
@@ -1,9 +1,9 @@
 
 [Login-settings]
-	#Time in ticks the logging player is invulnerable, 20 ticks = 1sec. Default is 5secs = 100 ticks
+	#Time in ticks the logging player is invulnerable, 20 ticks = 1sec. Default is 50secs = 1000 ticks
 	#Range: 0 ~ 50000
 	invulnerabilityTime = 2400
-	#Max distance in blocks(2d) the invulnerability lasts, default: 4
+	#Max distance in blocks(2d) the invulnerability lasts, default: 10
 	#Range: 1 ~ 200
 	maxDistance = 2
 
diff --git a/config/repurposed_structures-forge/dungeons.toml b/config/repurposed_structures-forge/dungeons.toml
index 26ace924d2..770a77d327 100644
--- a/config/repurposed_structures-forge/dungeons.toml
+++ b/config/repurposed_structures-forge/dungeons.toml
@@ -1,3 +1,7 @@
+#
+# Whether End Dungeons spawns Shulker Boxes. if false, spawns regular Chests instead.
+#(Configuredfeatures are unable to be overridden by datapack due to bad Forge hook placement. Hence this config option)
+shulkerBoxInEndDungeons = true
 
 [AttemptsPerChunk]
 	#
diff --git a/minecraftinstance.json b/minecraftinstance.json
index 897ead27f2..9180de9889 100644
--- a/minecraftinstance.json
+++ b/minecraftinstance.json
@@ -30,8 +30,8 @@
   "isUnlocked": true,
   "javaArgsOverride": null,
   "javaDirOverride": null,
-  "lastPlayed": "2021-10-20T17:51:29.8826371Z",
-  "playedCount": 423,
+  "lastPlayed": "2021-10-25T18:02:15.7802618Z",
+  "playedCount": 426,
   "manifest": null,
   "fileDate": "0001-01-01T00:00:00",
   "installedModpack": null,
@@ -47,8 +47,8 @@
   "name": "Enigmatica6",
   "cachedScans": [],
   "isValid": true,
-  "lastPreviousMatchUpdate": "2021-10-12T19:06:46.2317377Z",
-  "lastRefreshAttempt": "2021-10-12T21:07:46.652408+02:00",
+  "lastPreviousMatchUpdate": "2021-10-20T19:33:07.4093241Z",
+  "lastRefreshAttempt": "2021-10-20T21:41:12.1634271+02:00",
   "isEnabled": true,
   "isPinned": false,
   "gameVersion": "1.16.5",
@@ -1197,71 +1197,91 @@
       "addonID": 306549,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3445360,
-        "displayName": "Tips-1.16.5-4.0.10.jar",
-        "fileName": "Tips-1.16.5-4.0.10.jar",
-        "fileDate": "2021-08-31T23:16:31.333Z",
-        "fileLength": 63459,
+        "id": 3498966,
+        "displayName": "Tips-1.16.5-4.0.12.jar",
+        "fileName": "Tips-1.16.5-4.0.12.jar",
+        "fileDate": "2021-10-22T12:23:46.027Z",
+        "fileLength": 64093,
         "releaseType": 3,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3445/360/Tips-1.16.5-4.0.10.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3498/966/Tips-1.16.5-4.0.12.jar",
         "isAlternate": false,
-        "alternateFileId": 3445361,
+        "alternateFileId": 3498967,
         "dependencies": [
           {
-            "id": 0,
+            "id": 76428305,
             "addonId": 228525,
             "type": 3,
-            "fileId": 0
+            "fileId": 3498966
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 2382889519,
-            "type": 0,
+            "fingerprint": 983257518,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
-            "fingerprint": 871510552,
-            "type": 0,
+            "fingerprint": 3646464279,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "net",
             "fingerprint": 3590871681,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 867245095,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 4225229060,
+        "packageFingerprint": 1605750088,
         "gameVersion": [
           "1.16.5",
           "Forge"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2550460,
+        "projectId": 306549,
+        "packageFingerprintId": 767813119,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3403025,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "Tips-1.16.5-4.0.10.jar"
+        "FileNameOnDisk": "Tips-1.16.5-4.0.12.jar"
       },
       "dateInstalled": "2021-07-05T20:20:47.9641636Z",
-      "dateUpdated": "2021-09-02T12:00:16.9144647Z",
-      "dateLastUpdateAttempted": "2021-09-02T12:00:16.9144647Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:01:52.6051228Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:01:52.6051228Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -1486,82 +1506,102 @@
       "addonID": 232758,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3474910,
-        "displayName": "CyclopsCore-1.16.5-1.11.10.jar",
-        "fileName": "CyclopsCore-1.16.5-1.11.10.jar",
-        "fileDate": "2021-09-27T17:37:47.15Z",
-        "fileLength": 844480,
+        "id": 3498270,
+        "displayName": "CyclopsCore-1.16.5-1.12.0.jar",
+        "fileName": "CyclopsCore-1.16.5-1.12.0.jar",
+        "fileDate": "2021-10-21T18:02:02.133Z",
+        "fileLength": 845674,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3474/910/CyclopsCore-1.16.5-1.11.10.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3498/270/CyclopsCore-1.16.5-1.12.0.jar",
         "isAlternate": false,
-        "alternateFileId": 3474911,
+        "alternateFileId": 3498271,
         "dependencies": [],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 3548156480,
-            "type": 0,
+            "fingerprint": 485471699,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "org",
-            "fingerprint": 780530223,
-            "type": 0,
+            "fingerprint": 1076845015,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "assets",
-            "fingerprint": 3876077990,
-            "type": 0,
+            "foldername": "logo.png",
+            "fingerprint": 2866114932,
+            "type": 3,
+            "invalidFingerprint": false
+          },
+          {
+            "foldername": "logo_small.png",
+            "fingerprint": 3202528997,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 3536622113,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "logo_small.png",
-            "fingerprint": 3202528997,
-            "type": 0,
+            "foldername": "assets",
+            "fingerprint": 3876077990,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
             "fingerprint": 2620577581,
-            "type": 0,
-            "invalidFingerprint": false
-          },
-          {
-            "foldername": "logo.png",
-            "fingerprint": 2866114932,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 297894024,
+        "packageFingerprint": 1911181542,
         "gameVersion": [
           "1.16.5",
           "Forge"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2549572,
+        "projectId": 232758,
+        "packageFingerprintId": 767326376,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3401097,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "CyclopsCore-1.16.5-1.11.10.jar"
+        "FileNameOnDisk": "CyclopsCore-1.16.5-1.12.0.jar"
       },
       "dateInstalled": "2021-07-05T20:20:47.9741847Z",
-      "dateUpdated": "2021-09-27T17:47:39.8746612Z",
-      "dateLastUpdateAttempted": "2021-09-27T17:47:39.8746612Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:00:02.5426063Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:02.5426063Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -1714,7 +1754,7 @@
       "dateInstalled": "2021-07-05T20:20:52.5203908Z",
       "dateUpdated": "2021-10-20T17:46:28.3497147Z",
       "dateLastUpdateAttempted": "2021-10-20T17:46:28.3497147Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -2155,7 +2195,7 @@
       "dateInstalled": "2021-07-05T20:20:47.9641636Z",
       "dateUpdated": "2021-10-20T17:46:17.4528224Z",
       "dateLastUpdateAttempted": "2021-10-20T17:46:17.4528224Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -2266,7 +2306,7 @@
       "dateInstalled": "2021-07-05T20:20:47.9641636Z",
       "dateUpdated": "2021-10-20T17:46:15.3101126Z",
       "dateLastUpdateAttempted": "2021-10-20T17:46:15.3101126Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -3438,7 +3478,7 @@
       "dateInstalled": "2021-09-16T06:15:58.9533579Z",
       "dateUpdated": "2021-10-20T17:46:07.6218196Z",
       "dateLastUpdateAttempted": "2021-10-20T17:46:07.6218196Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -5690,14 +5730,14 @@
       "addonID": 398521,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3491509,
-        "displayName": "Farmer's Delight 0.5 - 1.16.5",
-        "fileName": "FarmersDelight-1.16.5-0.5.0.jar",
-        "fileDate": "2021-10-15T02:35:30.287Z",
-        "fileLength": 2525752,
+        "id": 3503844,
+        "displayName": "Farmer's Delight 0.5.1 - 1.16.5",
+        "fileName": "FarmersDelight-1.16.5-0.5.1.jar",
+        "fileDate": "2021-10-25T00:04:34.27Z",
+        "fileLength": 2528891,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3491/509/FarmersDelight-1.16.5-0.5.0.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3503/844/FarmersDelight-1.16.5-0.5.1.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -5705,31 +5745,31 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 409344962,
+            "fingerprint": 3309110213,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "vectorwing",
-            "fingerprint": 871107604,
+            "fingerprint": 855020805,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": ".cache",
-            "fingerprint": 609314625,
+            "fingerprint": 4131449225,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
-            "fingerprint": 3811828388,
+            "fingerprint": 1901154067,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
-            "fingerprint": 1902147059,
+            "fingerprint": 874056749,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -5758,7 +5798,7 @@
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 1640513900,
+        "packageFingerprint": 2479909544,
         "gameVersion": [
           "1.16.5",
           "Forge"
@@ -5769,14 +5809,14 @@
             "gameVersion": "1.16.5",
             "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
             "gameVersionName": "1.16.5",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 70886
           },
           {
             "gameVersionPadded": "0",
             "gameVersion": "",
             "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
             "gameVersionName": "Forge",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 68441
           }
         ],
         "hasInstallScript": false,
@@ -5784,20 +5824,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2540746,
+        "renderCacheId": 2556194,
         "projectId": 398521,
-        "packageFingerprintId": 762669671,
+        "packageFingerprintId": 769663731,
         "gameVersionDateReleased": "2019-08-01T00:00:00Z",
-        "gameVersionMappingId": 3383078,
+        "gameVersionMappingId": 3411288,
         "gameVersionId": 7498,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "FarmersDelight-1.16.5-0.5.0.jar"
+        "FileNameOnDisk": "FarmersDelight-1.16.5-0.5.1.jar"
       },
       "dateInstalled": "2021-07-05T20:20:52.4999027Z",
-      "dateUpdated": "2021-10-15T18:29:56.3490051Z",
-      "dateLastUpdateAttempted": "2021-10-15T18:29:56.3490051Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:00:01.7786067Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:01.7786067Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -6147,14 +6187,14 @@
       "addonID": 358304,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3466137,
-        "displayName": "logprot-1.16-1.4.jar",
-        "fileName": "logprot-1.16-1.4.jar",
-        "fileDate": "2021-09-19T18:52:57.91Z",
-        "fileLength": 13106,
+        "id": 3497459,
+        "displayName": "logprot-1.16-1.5.jar",
+        "fileName": "logprot-1.16-1.5.jar",
+        "fileDate": "2021-10-20T21:41:24.78Z",
+        "fileLength": 12244,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3466/137/logprot-1.16-1.4.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3497/459/logprot-1.16-1.5.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -6162,43 +6202,55 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 3534896497,
-            "type": 0,
+            "fingerprint": 3521857394,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 3002930837,
-            "type": 0,
+            "fingerprint": 2765705229,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 3543142243,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 82815321,
+        "packageFingerprint": 1526460411,
         "gameVersion": [
-          "1.16.5",
-          "Forge"
+          "1.16.5"
+        ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          }
         ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
-        "gameVersionDateReleased": "2019-08-01T00:00:00Z",
-        "gameId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2548535,
+        "projectId": 358304,
+        "packageFingerprintId": 766749685,
+        "gameVersionDateReleased": "2021-01-15T14:14:48.91Z",
+        "gameVersionMappingId": 3398871,
+        "gameVersionId": 8203,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "logprot-1.16-1.4.jar"
+        "FileNameOnDisk": "logprot-1.16-1.5.jar"
       },
       "dateInstalled": "2021-07-05T20:20:52.541392Z",
-      "dateUpdated": "2021-09-21T13:07:09.7668739Z",
-      "dateLastUpdateAttempted": "2021-09-21T13:07:09.7668739Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:00:50.528941Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:50.528941Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -7314,7 +7366,7 @@
       "dateInstalled": "2021-08-11T21:22:43.3270429Z",
       "dateUpdated": "2021-10-20T17:46:10.7380489Z",
       "dateLastUpdateAttempted": "2021-10-20T17:46:10.7380489Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -7577,7 +7629,7 @@
       "dateInstalled": "2021-07-05T20:20:54.9228218Z",
       "dateUpdated": "2021-10-20T17:46:42.4570492Z",
       "dateLastUpdateAttempted": "2021-10-20T17:46:42.4570492Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -7592,41 +7644,41 @@
       "addonID": 521714,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3494772,
-        "displayName": "ponderjs-1.16.5-1.0.3a.jar",
-        "fileName": "ponderjs-1.16.5-1.0.3a.jar",
-        "fileDate": "2021-10-18T00:37:34.55Z",
-        "fileLength": 60120,
+        "id": 3501641,
+        "displayName": "ponderjs-1.16.5-1.0.3b.jar",
+        "fileName": "ponderjs-1.16.5-1.0.3b.jar",
+        "fileDate": "2021-10-23T23:00:46.397Z",
+        "fileLength": 60225,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3494/772/ponderjs-1.16.5-1.0.3a.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3501/641/ponderjs-1.16.5-1.0.3b.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 76094772,
+            "id": 76563679,
             "addonId": 238086,
             "type": 3,
-            "fileId": 3494772
+            "fileId": 3501641
           },
           {
-            "id": 76094771,
+            "id": 76563678,
             "addonId": 328085,
             "type": 3,
-            "fileId": 3494772
+            "fileId": 3501641
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 1132574012,
+            "fingerprint": 4285449572,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 3885943689,
+            "fingerprint": 3604384668,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -7649,9 +7701,10 @@
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 3064542389,
+        "packageFingerprint": 2841263884,
         "gameVersion": [
-          "1.16.5"
+          "1.16.5",
+          "Forge"
         ],
         "sortableGameVersion": [
           {
@@ -7660,6 +7713,13 @@
             "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
             "gameVersionName": "1.16.5",
             "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
           }
         ],
         "hasInstallScript": false,
@@ -7667,19 +7727,19 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2545028,
+        "renderCacheId": 2553603,
         "projectId": 521714,
-        "packageFingerprintId": 764798096,
+        "packageFingerprintId": 768865774,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 3391805,
+        "gameVersionMappingId": 3407486,
         "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "ponderjs-1.16.5-1.0.3a.jar"
+        "FileNameOnDisk": "ponderjs-1.16.5-1.0.3b.jar"
       },
       "dateInstalled": "2021-09-01T20:23:23.4515179Z",
-      "dateUpdated": "2021-10-20T17:46:08.6745301Z",
-      "dateLastUpdateAttempted": "2021-10-20T17:46:08.6745301Z",
+      "dateUpdated": "2021-10-25T18:01:47.5473886Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:01:47.5473886Z",
       "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
@@ -9418,113 +9478,133 @@
       "addonID": 295910,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3484112,
-        "displayName": "IntegratedTerminals-1.16.5-1.2.7.jar",
-        "fileName": "IntegratedTerminals-1.16.5-1.2.7.jar",
-        "fileDate": "2021-10-07T16:46:32.49Z",
-        "fileLength": 473939,
+        "id": 3498281,
+        "displayName": "IntegratedTerminals-1.16.5-1.2.8.jar",
+        "fileName": "IntegratedTerminals-1.16.5-1.2.8.jar",
+        "fileDate": "2021-10-21T18:04:59.73Z",
+        "fileLength": 474128,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3484/112/IntegratedTerminals-1.16.5-1.2.7.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3498/281/IntegratedTerminals-1.16.5-1.2.8.jar",
         "isAlternate": false,
-        "alternateFileId": 3484113,
+        "alternateFileId": 3498282,
         "dependencies": [
           {
-            "id": 0,
-            "addonId": 287357,
-            "type": 2,
-            "fileId": 0
-          },
-          {
-            "id": 0,
+            "id": 76367010,
             "addonId": 232758,
             "type": 3,
-            "fileId": 0
+            "fileId": 3498281
           },
           {
-            "id": 0,
+            "id": 76367008,
+            "addonId": 287357,
+            "type": 2,
+            "fileId": 3498281
+          },
+          {
+            "id": 76367009,
             "addonId": 251389,
             "type": 3,
-            "fileId": 0
+            "fileId": 3498281
           },
           {
-            "id": 0,
+            "id": 76367007,
             "addonId": 236307,
             "type": 3,
-            "fileId": 0
+            "fileId": 3498281
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 1244823680,
-            "type": 0,
+            "fingerprint": 1248197000,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "org",
-            "fingerprint": 1118703486,
-            "type": 0,
+            "fingerprint": 17549791,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "logo.png",
             "fingerprint": 2877892280,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "logo_small.png",
             "fingerprint": 18908756,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 1782312737,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
             "fingerprint": 191223691,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
             "fingerprint": 2441444065,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "mcmod.info",
             "fingerprint": 36295578,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 2735166207,
+        "packageFingerprint": 1059176918,
         "gameVersion": [
           "1.16.5",
           "Forge"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2549585,
+        "projectId": 295910,
+        "packageFingerprintId": 767331122,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3401128,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "IntegratedTerminals-1.16.5-1.2.7.jar"
+        "FileNameOnDisk": "IntegratedTerminals-1.16.5-1.2.8.jar"
       },
       "dateInstalled": "2021-07-05T20:20:54.9328256Z",
-      "dateUpdated": "2021-10-09T17:57:41.3355848Z",
-      "dateLastUpdateAttempted": "2021-10-09T17:57:41.3355848Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:00:45.0357314Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:45.0357314Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -9949,7 +10029,7 @@
       "dateInstalled": "2021-07-05T20:19:25.2949358Z",
       "dateUpdated": "2021-10-20T17:46:31.8664811Z",
       "dateLastUpdateAttempted": "2021-10-20T17:46:31.8664811Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -10318,41 +10398,41 @@
       "addonID": 298187,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3205295,
-        "displayName": "buildinggadgets-1.16.5-3.8.0.jar",
-        "fileName": "buildinggadgets-1.16.5-3.8.0.jar",
-        "fileDate": "2021-02-15T19:42:19.863Z",
-        "fileLength": 909445,
+        "id": 3498508,
+        "displayName": "buildinggadgets-1.16.5-3.8.2.jar",
+        "fileName": "buildinggadgets-1.16.5-3.8.2.jar",
+        "fileDate": "2021-10-21T21:58:01.393Z",
+        "fileLength": 912083,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3205/295/buildinggadgets-1.16.5-3.8.0.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3498/508/buildinggadgets-1.16.5-3.8.2.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 56916937,
+            "id": 76387612,
             "addonId": 399757,
             "type": 2,
-            "fileId": 3205295
+            "fileId": 3498508
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 267054609,
+            "fingerprint": 216102098,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 962286206,
+            "fingerprint": 2043791850,
             "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "data",
-            "fingerprint": 597267807,
+            "foldername": "assets",
+            "fingerprint": 3840510572,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -10363,8 +10443,8 @@
             "invalidFingerprint": false
           },
           {
-            "foldername": "assets",
-            "fingerprint": 3840510572,
+            "foldername": "data",
+            "fingerprint": 597267807,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -10375,9 +10455,10 @@
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 3456565023,
+        "packageFingerprint": 3980463159,
         "gameVersion": [
-          "1.16.5"
+          "1.16.5",
+          "Forge"
         ],
         "sortableGameVersion": [
           {
@@ -10385,7 +10466,14 @@
             "gameVersion": "1.16.5",
             "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
             "gameVersionName": "1.16.5",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
           }
         ],
         "hasInstallScript": false,
@@ -10393,20 +10481,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2173986,
+        "renderCacheId": 2549865,
         "projectId": 298187,
-        "packageFingerprintId": 606375272,
+        "packageFingerprintId": 767511696,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 2725255,
+        "gameVersionMappingId": 3401733,
         "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "buildinggadgets-1.16.5-3.8.0.jar"
+        "FileNameOnDisk": "buildinggadgets-1.16.5-3.8.2.jar"
       },
       "dateInstalled": "2021-07-05T20:20:57.5145815Z",
-      "dateUpdated": "2021-07-05T20:20:57.5145815Z",
-      "dateLastUpdateAttempted": "0001-01-01T00:00:00",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:02:01.284463Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:02:01.284463Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -10756,7 +10844,7 @@
       "dateInstalled": "2021-09-24T18:21:26.2309502Z",
       "dateUpdated": "2021-10-20T17:46:41.9483719Z",
       "dateLastUpdateAttempted": "2021-10-20T17:46:41.9483719Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -11260,14 +11348,14 @@
       "addonID": 378802,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3268432,
-        "displayName": "Structure Gel 1.16.5-v1.7.7",
-        "fileName": "structure_gel-1.16.5-1.7.7.jar",
-        "fileDate": "2021-04-07T17:23:38.58Z",
-        "fileLength": 260027,
+        "id": 3498310,
+        "displayName": "Structure Gel 1.16.5-v1.7.8",
+        "fileName": "structure_gel-1.16.5-1.7.8.jar",
+        "fileDate": "2021-10-21T18:17:37.803Z",
+        "fileLength": 261390,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3268/432/structure_gel-1.16.5-1.7.7.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3498/310/structure_gel-1.16.5-1.7.8.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -11275,13 +11363,13 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 3699027761,
+            "fingerprint": 2443688123,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 544735032,
+            "fingerprint": 1185170382,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -11293,7 +11381,7 @@
           },
           {
             "foldername": "assets",
-            "fingerprint": 2942120461,
+            "fingerprint": 1807711076,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -11328,9 +11416,10 @@
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 1576729289,
+        "packageFingerprint": 1658340665,
         "gameVersion": [
-          "1.16.5"
+          "1.16.5",
+          "Forge"
         ],
         "sortableGameVersion": [
           {
@@ -11338,7 +11427,14 @@
             "gameVersion": "1.16.5",
             "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
             "gameVersionName": "1.16.5",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
           }
         ],
         "hasInstallScript": false,
@@ -11346,20 +11442,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2255538,
+        "renderCacheId": 2549615,
         "projectId": 378802,
-        "packageFingerprintId": 639962308,
-        "gameVersionDateReleased": "2021-01-15T14:14:48.91Z",
-        "gameVersionMappingId": 2849789,
-        "gameVersionId": 8203,
+        "packageFingerprintId": 767341787,
+        "gameVersionDateReleased": "2019-08-01T00:00:00Z",
+        "gameVersionMappingId": 3401214,
+        "gameVersionId": 7498,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "structure_gel-1.16.5-1.7.7.jar"
+        "FileNameOnDisk": "structure_gel-1.16.5-1.7.8.jar"
       },
       "dateInstalled": "2021-07-05T20:20:57.5275809Z",
-      "dateUpdated": "2021-07-05T20:20:57.5275809Z",
-      "dateLastUpdateAttempted": "0001-01-01T00:00:00",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:01:53.795125Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:01:53.795125Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -12592,52 +12688,52 @@
       "addonID": 289412,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3492764,
-        "displayName": "ftb-quests-forge-1605.3.5-build.69.jar",
-        "fileName": "ftb-quests-forge-1605.3.5-build.69.jar",
-        "fileDate": "2021-10-16T12:34:13.243Z",
-        "fileLength": 937093,
+        "id": 3498398,
+        "displayName": "ftb-quests-forge-1605.3.5-build.72.jar",
+        "fileName": "ftb-quests-forge-1605.3.5-build.72.jar",
+        "fileDate": "2021-10-21T19:43:41.687Z",
+        "fileLength": 937588,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3492/764/ftb-quests-forge-1605.3.5-build.69.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3498/398/ftb-quests-forge-1605.3.5-build.72.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 75946846,
+            "id": 76376609,
+            "addonId": 309674,
+            "type": 3,
+            "fileId": 3498398
+          },
+          {
+            "id": 76376605,
             "addonId": 404465,
             "type": 3,
-            "fileId": 3492764
+            "fileId": 3498398
           },
           {
-            "id": 75946850,
-            "addonId": 309674,
+            "id": 76376606,
+            "addonId": 419699,
             "type": 3,
-            "fileId": 3492764
+            "fileId": 3498398
           },
           {
-            "id": 75946851,
+            "id": 76376610,
             "addonId": 238222,
             "type": 2,
-            "fileId": 3492764
-          },
-          {
-            "id": 75946847,
-            "addonId": 419699,
-            "type": 3,
-            "fileId": 3492764
+            "fileId": 3498398
           },
           {
-            "id": 75946848,
+            "id": 76376607,
             "addonId": 238086,
             "type": 2,
-            "fileId": 3492764
+            "fileId": 3498398
           },
           {
-            "id": 75946849,
+            "id": 76376608,
             "addonId": 404468,
             "type": 3,
-            "fileId": 3492764
+            "fileId": 3498398
           }
         ],
         "isAvailable": true,
@@ -12668,24 +12764,24 @@
           },
           {
             "foldername": "META-INF",
-            "fingerprint": 2441441963,
+            "fingerprint": 1867212963,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "dev",
-            "fingerprint": 3769466285,
+            "fingerprint": 2939400894,
             "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "architectury_inject_FTBQuests1165_common_e3444670e5e84dcb9940c1f526c24cbf",
-            "fingerprint": 881217292,
+            "foldername": "architectury_inject_FTBQuests1165_common_cba8e5b833a34d0ca17987e095886b92",
+            "fingerprint": 813913393,
             "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 1564502373,
+        "packageFingerprint": 4179220620,
         "gameVersion": [
           "1.16.5",
           "Forge"
@@ -12711,19 +12807,19 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2542354,
+        "renderCacheId": 2549728,
         "projectId": 289412,
-        "packageFingerprintId": 763453335,
+        "packageFingerprintId": 767403616,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 3386443,
+        "gameVersionMappingId": 3401457,
         "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "ftb-quests-forge-1605.3.5-build.69.jar"
+        "FileNameOnDisk": "ftb-quests-forge-1605.3.5-build.72.jar"
       },
       "dateInstalled": "2021-07-05T20:20:57.5375822Z",
-      "dateUpdated": "2021-10-20T17:46:29.1197176Z",
-      "dateLastUpdateAttempted": "2021-10-20T17:46:29.1197176Z",
+      "dateUpdated": "2021-10-25T18:00:17.4311452Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:17.4311452Z",
       "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
@@ -12739,95 +12835,115 @@
       "addonID": 251389,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3443979,
-        "displayName": "IntegratedTunnels-1.16.5-1.8.6.jar",
-        "fileName": "IntegratedTunnels-1.16.5-1.8.6.jar",
-        "fileDate": "2021-08-30T17:31:12.17Z",
-        "fileLength": 591666,
+        "id": 3498295,
+        "displayName": "IntegratedTunnels-1.16.5-1.8.7.jar",
+        "fileName": "IntegratedTunnels-1.16.5-1.8.7.jar",
+        "fileDate": "2021-10-21T18:05:21.243Z",
+        "fileLength": 591631,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3443/979/IntegratedTunnels-1.16.5-1.8.6.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3498/295/IntegratedTunnels-1.16.5-1.8.7.jar",
         "isAlternate": false,
-        "alternateFileId": 3443980,
+        "alternateFileId": 3498296,
         "dependencies": [
           {
-            "id": 0,
+            "id": 76367019,
             "addonId": 232758,
             "type": 3,
-            "fileId": 0
+            "fileId": 3498295
           },
           {
-            "id": 0,
+            "id": 76367018,
             "addonId": 236307,
             "type": 3,
-            "fileId": 0
+            "fileId": 3498295
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 2091418331,
-            "type": 0,
+            "fingerprint": 236862701,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "org",
-            "fingerprint": 170040213,
-            "type": 0,
+            "fingerprint": 477097904,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "pack.mcmeta",
-            "fingerprint": 4044870590,
-            "type": 0,
+            "foldername": "logo.png",
+            "fingerprint": 152818033,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "assets",
-            "fingerprint": 3961494986,
-            "type": 0,
+            "foldername": "logo_small.png",
+            "fingerprint": 3667489292,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "logo_small.png",
-            "fingerprint": 3667489292,
-            "type": 0,
+            "foldername": "pack.mcmeta",
+            "fingerprint": 4044870590,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "logo.png",
-            "fingerprint": 152818033,
-            "type": 0,
+            "foldername": "assets",
+            "fingerprint": 3961494986,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
             "fingerprint": 2522231078,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 1525529218,
+        "packageFingerprint": 3859486610,
         "gameVersion": [
           "1.16.5",
           "Forge"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2549599,
+        "projectId": 251389,
+        "packageFingerprintId": 767337662,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3401170,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "IntegratedTunnels-1.16.5-1.8.6.jar"
+        "FileNameOnDisk": "IntegratedTunnels-1.16.5-1.8.7.jar"
       },
       "dateInstalled": "2021-07-05T20:19:25.2909342Z",
-      "dateUpdated": "2021-08-31T18:22:25.6272784Z",
-      "dateLastUpdateAttempted": "2021-08-31T18:22:25.6272784Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:00:43.0407268Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:43.0407268Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -13316,41 +13432,41 @@
       "addonID": 361026,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3496016,
-        "displayName": "occultism-1.17.2.jar",
-        "fileName": "occultism-1.16.5-1.17.2.jar",
-        "fileDate": "2021-10-19T08:54:52.71Z",
-        "fileLength": 4367756,
+        "id": 3498928,
+        "displayName": "occultism-1.17.4.jar",
+        "fileName": "occultism-1.16.5-1.17.4.jar",
+        "fileDate": "2021-10-22T11:34:49.597Z",
+        "fileLength": 4368757,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3496/16/occultism-1.16.5-1.17.2.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3498/928/occultism-1.16.5-1.17.4.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 76195737,
-            "addonId": 306770,
+            "id": 76425520,
+            "addonId": 309927,
             "type": 3,
-            "fileId": 3496016
+            "fileId": 3498928
           },
           {
-            "id": 76195738,
-            "addonId": 309927,
+            "id": 76425519,
+            "addonId": 306770,
             "type": 3,
-            "fileId": 3496016
+            "fileId": 3498928
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 4008397877,
+            "fingerprint": 2549410036,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 2473552748,
+            "fingerprint": 1024516203,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -13374,12 +13490,12 @@
           },
           {
             "foldername": "data",
-            "fingerprint": 1694261068,
+            "fingerprint": 1443426523,
             "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 1712495412,
+        "packageFingerprint": 137070308,
         "gameVersion": [
           "1.16.3",
           "1.16.5",
@@ -13429,19 +13545,19 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2546639,
+        "renderCacheId": 2550415,
         "projectId": 361026,
-        "packageFingerprintId": 765587144,
+        "packageFingerprintId": 767779863,
         "gameVersionDateReleased": "2019-08-01T00:00:00Z",
-        "gameVersionMappingId": 3395052,
+        "gameVersionMappingId": 3402893,
         "gameVersionId": 7498,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "occultism-1.16.5-1.17.2.jar"
+        "FileNameOnDisk": "occultism-1.16.5-1.17.4.jar"
       },
       "dateInstalled": "2021-09-25T14:41:32.7416314Z",
-      "dateUpdated": "2021-10-20T17:46:22.5223981Z",
-      "dateLastUpdateAttempted": "2021-10-20T17:46:22.5223981Z",
+      "dateUpdated": "2021-10-25T18:01:48.0503882Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:01:48.0503882Z",
       "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
@@ -14655,14 +14771,14 @@
       "addonID": 441647,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3480743,
-        "displayName": "FramedBlocks-2.11.0.jar",
-        "fileName": "FramedBlocks-2.11.0.jar",
-        "fileDate": "2021-10-03T23:56:39.877Z",
-        "fileLength": 569942,
+        "id": 3499681,
+        "displayName": "FramedBlocks-2.11.1-hotfix.jar",
+        "fileName": "FramedBlocks-2.11.1.jar",
+        "fileDate": "2021-10-23T00:39:35.993Z",
+        "fileLength": 570251,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3480/743/FramedBlocks-2.11.0.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3499/681/FramedBlocks-2.11.1.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -14670,85 +14786,105 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 3258375913,
-            "type": 0,
+            "fingerprint": 3896331040,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "team",
             "fingerprint": 1322605695,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "xfacthd",
-            "fingerprint": 3416463902,
-            "type": 0,
+            "fingerprint": 480968839,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": ".cache",
             "fingerprint": 1637966753,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
             "fingerprint": 1004783936,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
             "fingerprint": 204396418,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "framedblocks.mixin.json",
             "fingerprint": 4089559895,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "logo.png",
             "fingerprint": 789975261,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 3799552759,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "framedblocks.refmap.json",
             "fingerprint": 2490754047,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 871125421,
+        "packageFingerprint": 3171565000,
         "gameVersion": [
           "1.16.5",
           "Forge"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2551341,
+        "projectId": 441647,
+        "packageFingerprintId": 768239058,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3405038,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "FramedBlocks-2.11.0.jar"
+        "FileNameOnDisk": "FramedBlocks-2.11.1.jar"
       },
       "dateInstalled": "2021-07-10T17:55:07.2563413Z",
-      "dateUpdated": "2021-10-04T17:58:56.9261501Z",
-      "dateLastUpdateAttempted": "2021-10-04T17:58:56.9261501Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:00:54.8379355Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:54.8379355Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -14853,40 +14989,40 @@
       "addonID": 238086,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3481251,
-        "displayName": "kubejs-forge-1605.3.18-build.144.jar",
-        "fileName": "kubejs-forge-1605.3.18-build.144.jar",
-        "fileDate": "2021-10-04T15:29:11.15Z",
-        "fileLength": 851611,
+        "id": 3498936,
+        "displayName": "kubejs-forge-1605.3.18-build.152.jar",
+        "fileName": "kubejs-forge-1605.3.18-build.152.jar",
+        "fileDate": "2021-10-22T11:38:44.66Z",
+        "fileLength": 857398,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3481/251/kubejs-forge-1605.3.18-build.144.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3498/936/kubejs-forge-1605.3.18-build.152.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 0,
+            "id": 76426193,
             "addonId": 268655,
             "type": 2,
-            "fileId": 0
+            "fileId": 3498936
           },
           {
-            "id": 0,
+            "id": 76426191,
             "addonId": 416294,
             "type": 3,
-            "fileId": 0
+            "fileId": 3498936
           },
           {
-            "id": 0,
+            "id": 76426194,
             "addonId": 238222,
             "type": 2,
-            "fileId": 0
+            "fileId": 3498936
           },
           {
-            "id": 0,
+            "id": 76426192,
             "addonId": 419699,
             "type": 3,
-            "fileId": 0
+            "fileId": 3498936
           }
         ],
         "isAvailable": true,
@@ -14894,97 +15030,124 @@
           {
             "foldername": "data",
             "fingerprint": 3279136865,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "kubejs-common.mixins.json",
-            "fingerprint": 2796111738,
-            "type": 0,
+            "foldername": "assets",
+            "fingerprint": 2083650698,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "assets",
-            "fingerprint": 2083650698,
-            "type": 0,
+            "foldername": "kubejs-common.mixins.json",
+            "fingerprint": 2796111738,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "kubejs_logo.png",
             "fingerprint": 658118443,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "kubejs-common-refmap.json",
             "fingerprint": 2607262402,
-            "type": 0,
+            "type": 3,
+            "invalidFingerprint": false
+          },
+          {
+            "foldername": "kubejs.mixins.json",
+            "fingerprint": 3372627309,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "kubejs.plugins.txt",
             "fingerprint": 2117761820,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 1290654324,
-            "type": 0,
-            "invalidFingerprint": false
-          },
-          {
-            "foldername": "kubejs.mixins.json",
-            "fingerprint": 3372627309,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "META-INF",
-            "fingerprint": 1661160531,
-            "type": 0,
+            "fingerprint": 3608767236,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "dev",
-            "fingerprint": 3826522156,
-            "type": 0,
+            "fingerprint": 2296009990,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "architectury_inject_KubeJS1165_common_df75c6b7310947679014773671c5ed9a",
-            "fingerprint": 538915640,
-            "type": 0,
+            "foldername": "architectury_inject_KubeJS1165_common_5b01cc714d41426b88a61515a9ec9bcf",
+            "fingerprint": 933559580,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "kubejs-forge-refmap.json",
             "fingerprint": 1493072104,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 2628864267,
+        "packageFingerprint": 975060467,
         "gameVersion": [
           "1.16.5",
           "Forge",
           "1.16.4"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000004",
+            "gameVersion": "1.16.4",
+            "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z",
+            "gameVersionName": "1.16.4",
+            "gameVersionTypeId": 70886
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2550425,
+        "projectId": 238086,
+        "packageFingerprintId": 767787239,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3402911,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "kubejs-forge-1605.3.18-build.144.jar"
+        "FileNameOnDisk": "kubejs-forge-1605.3.18-build.152.jar"
       },
       "dateInstalled": "2021-09-28T18:08:09.9226898Z",
-      "dateUpdated": "2021-10-04T17:58:52.0071512Z",
-      "dateLastUpdateAttempted": "2021-10-04T17:58:52.0071512Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:00:51.7959353Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:51.7959353Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -15625,101 +15788,121 @@
       "addonID": 287357,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3482425,
-        "displayName": "IntegratedCrafting-1.16.5-1.0.18.jar",
-        "fileName": "IntegratedCrafting-1.16.5-1.0.18.jar",
-        "fileDate": "2021-10-05T18:15:00.473Z",
-        "fileLength": 265644,
+        "id": 3498285,
+        "displayName": "IntegratedCrafting-1.16.5-1.0.19.jar",
+        "fileName": "IntegratedCrafting-1.16.5-1.0.19.jar",
+        "fileDate": "2021-10-21T18:05:09.183Z",
+        "fileLength": 265741,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3482/425/IntegratedCrafting-1.16.5-1.0.18.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3498/285/IntegratedCrafting-1.16.5-1.0.19.jar",
         "isAlternate": false,
-        "alternateFileId": 3482426,
+        "alternateFileId": 3498286,
         "dependencies": [
           {
-            "id": 0,
+            "id": 76367012,
             "addonId": 251389,
             "type": 3,
-            "fileId": 0
+            "fileId": 3498285
           },
           {
-            "id": 0,
+            "id": 76367013,
             "addonId": 232758,
             "type": 3,
-            "fileId": 0
+            "fileId": 3498285
           },
           {
-            "id": 0,
+            "id": 76367011,
             "addonId": 236307,
             "type": 3,
-            "fileId": 0
+            "fileId": 3498285
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 2231806482,
-            "type": 0,
+            "fingerprint": 2634983720,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "org",
-            "fingerprint": 793353792,
-            "type": 0,
+            "fingerprint": 1313612392,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "assets",
-            "fingerprint": 2126579824,
-            "type": 0,
+            "foldername": "logo.png",
+            "fingerprint": 3950789569,
+            "type": 3,
+            "invalidFingerprint": false
+          },
+          {
+            "foldername": "logo_small.png",
+            "fingerprint": 1376710925,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 1296569065,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "logo_small.png",
-            "fingerprint": 1376710925,
-            "type": 0,
+            "foldername": "assets",
+            "fingerprint": 2126579824,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
             "fingerprint": 3192681218,
-            "type": 0,
-            "invalidFingerprint": false
-          },
-          {
-            "foldername": "logo.png",
-            "fingerprint": 3950789569,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 1057330700,
+        "packageFingerprint": 1016729108,
         "gameVersion": [
           "1.16.5",
           "Forge"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2549589,
+        "projectId": 287357,
+        "packageFingerprintId": 767332002,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3401140,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "IntegratedCrafting-1.16.5-1.0.18.jar"
+        "FileNameOnDisk": "IntegratedCrafting-1.16.5-1.0.19.jar"
       },
       "dateInstalled": "2021-07-05T20:19:25.3039342Z",
-      "dateUpdated": "2021-10-06T16:58:22.0913521Z",
-      "dateLastUpdateAttempted": "2021-10-06T16:58:22.0913521Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:00:31.0721469Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:31.0721469Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -16640,14 +16823,14 @@
       "addonID": 238222,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3488178,
-        "displayName": "jei-1.16.5-7.7.1.126.jar",
-        "fileName": "jei-1.16.5-7.7.1.126.jar",
-        "fileDate": "2021-10-11T19:18:39.6Z",
-        "fileLength": 817187,
+        "id": 3502687,
+        "displayName": "jei-1.16.5-7.7.1.129.jar",
+        "fileName": "jei-1.16.5-7.7.1.129.jar",
+        "fileDate": "2021-10-24T21:18:33.717Z",
+        "fileLength": 814398,
         "releaseType": 2,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3488/178/jei-1.16.5-7.7.1.126.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3502/687/jei-1.16.5-7.7.1.129.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -16655,49 +16838,69 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 436666546,
-            "type": 0,
+            "fingerprint": 1895158786,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "mezz",
-            "fingerprint": 1090284749,
-            "type": 0,
+            "fingerprint": 1852755441,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 1645019714,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
-            "fingerprint": 450215618,
-            "type": 0,
+            "fingerprint": 3320998644,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 3537995693,
+        "packageFingerprint": 1720764774,
         "gameVersion": [
           "1.16.5",
           "Forge"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2554986,
+        "projectId": 238222,
+        "packageFingerprintId": 769585941,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3409968,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "jei-1.16.5-7.7.1.126.jar"
+        "FileNameOnDisk": "jei-1.16.5-7.7.1.129.jar"
       },
       "dateInstalled": "2021-10-04T19:00:56.2227538Z",
-      "dateUpdated": "2021-10-12T17:46:51.0921145Z",
-      "dateLastUpdateAttempted": "2021-10-12T17:46:51.0921145Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:00:53.0069341Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:53.0069341Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -17530,14 +17733,14 @@
       "addonID": 388172,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3495875,
-        "displayName": "geckolib-forge-1.16.5-3.0.48.jar",
-        "fileName": "geckolib-forge-1.16.5-3.0.48.jar",
-        "fileDate": "2021-10-19T02:19:56.003Z",
-        "fileLength": 3378308,
+        "id": 3502622,
+        "displayName": "geckolib-forge-1.16.5-3.0.49.jar",
+        "fileName": "geckolib-forge-1.16.5-3.0.49.jar",
+        "fileDate": "2021-10-24T20:05:14.72Z",
+        "fileLength": 3378331,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3495/875/geckolib-forge-1.16.5-3.0.48.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3502/622/geckolib-forge-1.16.5-3.0.49.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -17545,13 +17748,13 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 619113089,
+            "fingerprint": 3501023110,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "software",
-            "fingerprint": 1491112003,
+            "fingerprint": 345559989,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -17580,7 +17783,7 @@
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 3800138421,
+        "packageFingerprint": 2708726135,
         "gameVersion": [
           "1.16.5",
           "Forge"
@@ -17606,19 +17809,19 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2546448,
+        "renderCacheId": 2554899,
         "projectId": 388172,
-        "packageFingerprintId": 765486861,
+        "packageFingerprintId": 769518512,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 3394679,
+        "gameVersionMappingId": 3409817,
         "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "geckolib-forge-1.16.5-3.0.48.jar"
+        "FileNameOnDisk": "geckolib-forge-1.16.5-3.0.49.jar"
       },
       "dateInstalled": "2021-07-05T20:21:03.3581211Z",
-      "dateUpdated": "2021-10-20T17:46:28.1557188Z",
-      "dateLastUpdateAttempted": "2021-10-20T17:46:28.1557188Z",
+      "dateUpdated": "2021-10-25T18:00:24.6009353Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:24.6009353Z",
       "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
@@ -19172,7 +19375,7 @@
       "dateInstalled": "2021-07-05T20:21:03.3511181Z",
       "dateUpdated": "2021-10-20T17:45:57.5291708Z",
       "dateLastUpdateAttempted": "2021-10-20T17:45:57.5291708Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -19400,84 +19603,103 @@
       "addonID": 307788,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3425634,
-        "displayName": "rsrequestify-1.16.5-2.1.3.jar",
-        "fileName": "rsrequestify-1.16.5-2.1.3.jar",
-        "fileDate": "2021-08-14T23:35:26.71Z",
-        "fileLength": 61784,
-        "releaseType": 2,
+        "id": 3501351,
+        "displayName": "rsrequestify-1.16.5-2.1.4.jar",
+        "fileName": "rsrequestify-1.16.5-2.1.4.jar",
+        "fileDate": "2021-10-23T17:46:06.583Z",
+        "fileLength": 62128,
+        "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3425/634/rsrequestify-1.16.5-2.1.3.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3501/351/rsrequestify-1.16.5-2.1.4.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 0,
+            "id": 76537780,
             "addonId": 243076,
             "type": 3,
-            "fileId": 0
+            "fileId": 3501351
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 2909008428,
-            "type": 0,
+            "fingerprint": 1201549991,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 417099370,
-            "type": 0,
+            "fingerprint": 1386641972,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
             "fingerprint": 943343185,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
-            "fingerprint": 3052571584,
-            "type": 0,
+            "fingerprint": 829189082,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "mcmod.info",
             "fingerprint": 2072392136,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 2707499699,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 1460254527,
+        "packageFingerprint": 1153904508,
         "gameVersion": [
-          "1.16.3",
           "1.16.5",
-          "1.16.4"
+          "Forge"
+        ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
         ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
-        "gameVersionDateReleased": "2020-09-10T14:44:20.443Z",
-        "gameId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2553215,
+        "projectId": 307788,
+        "packageFingerprintId": 768664442,
+        "gameVersionDateReleased": "2019-08-01T00:00:00Z",
+        "gameVersionMappingId": 3406735,
+        "gameVersionId": 7498,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "rsrequestify-1.16.5-2.1.3.jar"
+        "FileNameOnDisk": "rsrequestify-1.16.5-2.1.4.jar"
       },
       "dateInstalled": "2021-07-05T20:21:03.3331219Z",
-      "dateUpdated": "2021-08-15T17:21:42.4826887Z",
-      "dateLastUpdateAttempted": "2021-08-15T17:21:42.4826887Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:01:08.7073629Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:01:08.7073629Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -20259,14 +20481,14 @@
       "addonID": 399558,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3285196,
-        "displayName": "constructionwand-1.16.5-2.2.jar",
-        "fileName": "constructionwand-1.16.5-2.2.jar",
-        "fileDate": "2021-04-22T06:23:58.49Z",
-        "fileLength": 193910,
+        "id": 3499311,
+        "displayName": "constructionwand-1.16.5-2.4.jar",
+        "fileName": "constructionwand-1.16.5-2.4.jar",
+        "fileDate": "2021-10-22T17:10:18.007Z",
+        "fileLength": 195224,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3285/196/constructionwand-1.16.5-2.2.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3499/311/constructionwand-1.16.5-2.4.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -20274,13 +20496,13 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 4036072437,
+            "fingerprint": 3906816712,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "thetadev",
-            "fingerprint": 3081620486,
+            "fingerprint": 1788080518,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -20290,12 +20512,6 @@
             "type": 3,
             "invalidFingerprint": false
           },
-          {
-            "foldername": "data",
-            "fingerprint": 1373703541,
-            "type": 3,
-            "invalidFingerprint": false
-          },
           {
             "foldername": "logo.png",
             "fingerprint": 1765697479,
@@ -20307,9 +20523,21 @@
             "fingerprint": 4148778574,
             "type": 3,
             "invalidFingerprint": false
+          },
+          {
+            "foldername": ".cache",
+            "fingerprint": 1361047111,
+            "type": 3,
+            "invalidFingerprint": false
+          },
+          {
+            "foldername": "data",
+            "fingerprint": 1373703541,
+            "type": 3,
+            "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 476710429,
+        "packageFingerprint": 3223950522,
         "gameVersion": [
           "1.16.3",
           "1.16.5",
@@ -20323,35 +20551,35 @@
             "gameVersion": "1.16.3",
             "gameVersionReleaseDate": "2020-09-10T14:44:20.443Z",
             "gameVersionName": "1.16.3",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 70886
           },
           {
             "gameVersionPadded": "0000000001.0000000016.0000000005",
             "gameVersion": "1.16.5",
             "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
             "gameVersionName": "1.16.5",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 70886
           },
           {
             "gameVersionPadded": "0",
             "gameVersion": "",
             "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
             "gameVersionName": "Forge",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 68441
           },
           {
             "gameVersionPadded": "0000000001.0000000016.0000000004",
             "gameVersion": "1.16.4",
             "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z",
             "gameVersionName": "1.16.4",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 70886
           },
           {
             "gameVersionPadded": "0000000001.0000000016.0000000002",
             "gameVersion": "1.16.2",
             "gameVersionReleaseDate": "2020-08-11T16:42:21.863Z",
             "gameVersionName": "1.16.2",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 70886
           }
         ],
         "hasInstallScript": false,
@@ -20359,20 +20587,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2277204,
+        "renderCacheId": 2550863,
         "projectId": 399558,
-        "packageFingerprintId": 648233959,
+        "packageFingerprintId": 768029309,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 2882846,
+        "gameVersionMappingId": 3404120,
         "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "constructionwand-1.16.5-2.2.jar"
+        "FileNameOnDisk": "constructionwand-1.16.5-2.4.jar"
       },
       "dateInstalled": "2021-07-05T20:21:08.4404715Z",
-      "dateUpdated": "2021-07-05T20:21:08.4404715Z",
-      "dateLastUpdateAttempted": "0001-01-01T00:00:00",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:00:58.3219376Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:58.3219376Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -20593,14 +20821,14 @@
       "addonID": 419699,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3462013,
-        "displayName": "[Forge 1.16.4/5] v1.23.33",
-        "fileName": "architectury-1.23.33-forge.jar",
-        "fileDate": "2021-09-17T14:44:40.27Z",
-        "fileLength": 513560,
+        "id": 3500014,
+        "displayName": "[Forge 1.16.4/5] v1.24.35",
+        "fileName": "architectury-1.24.35-forge.jar",
+        "fileDate": "2021-10-23T11:20:22.647Z",
+        "fileLength": 531886,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3462/13/architectury-1.23.33-forge.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3500/14/architectury-1.24.35-forge.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -20609,85 +20837,112 @@
           {
             "foldername": "architectury-common.mixins.json",
             "fingerprint": 1305967297,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "architectury.accessWidener",
             "fingerprint": 257494810,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "architectury-common-refmap.json",
             "fingerprint": 1953518274,
-            "type": 0,
-            "invalidFingerprint": false
-          },
-          {
-            "foldername": "icon.png",
-            "fingerprint": 337711864,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 1096803035,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "architectury.mixins.json",
             "fingerprint": 1554387086,
-            "type": 0,
+            "type": 3,
+            "invalidFingerprint": false
+          },
+          {
+            "foldername": "icon.png",
+            "fingerprint": 337711864,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "META-INF",
-            "fingerprint": 1184458518,
-            "type": 0,
+            "fingerprint": 1635991817,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "me",
-            "fingerprint": 187094204,
-            "type": 0,
+            "fingerprint": 2903555025,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "architectury_inject_architectury_common_53d158909e4141f29a002e4e846289d1_65633a536525e78795f5d2e868e91d166738c055fb3ad8e01516b6119e872ad6architectury12333devjar",
-            "fingerprint": 2315980521,
-            "type": 0,
+            "foldername": "architectury_inject_architectury_common_e7f3abf769e145fb9f87599a6d3a4577_902afc0b7fd7cd97f0d4e93ad10210350b8a984132bf635cc7600391892171e1architectury12435devjar",
+            "fingerprint": 2199580345,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "architectury-forge-refmap.json",
             "fingerprint": 3556241074,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 1955599694,
+        "packageFingerprint": 1050498642,
         "gameVersion": [
           "1.16.5",
           "Forge",
           "1.16.4"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000004",
+            "gameVersion": "1.16.4",
+            "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z",
+            "gameVersionName": "1.16.4",
+            "gameVersionTypeId": 70886
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2551780,
+        "projectId": 419699,
+        "packageFingerprintId": 768456242,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3405872,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "architectury-1.23.33-forge.jar"
+        "FileNameOnDisk": "architectury-1.24.35-forge.jar"
       },
       "dateInstalled": "2021-07-05T20:19:25.2879367Z",
-      "dateUpdated": "2021-09-18T21:18:53.0353687Z",
-      "dateLastUpdateAttempted": "2021-09-18T21:18:53.0353687Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:02:01.7698699Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:02:01.7698699Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -21671,107 +21926,127 @@
       "addonID": 236307,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3482429,
-        "displayName": "IntegratedDynamics-1.16.5-1.10.2.jar",
-        "fileName": "IntegratedDynamics-1.16.5-1.10.2.jar",
-        "fileDate": "2021-10-05T18:16:04.087Z",
-        "fileLength": 3162330,
+        "id": 3498290,
+        "displayName": "IntegratedDynamics-1.16.5-1.10.3.jar",
+        "fileName": "IntegratedDynamics-1.16.5-1.10.3.jar",
+        "fileDate": "2021-10-21T18:05:19.93Z",
+        "fileLength": 3163798,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3482/429/IntegratedDynamics-1.16.5-1.10.2.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3498/290/IntegratedDynamics-1.16.5-1.10.3.jar",
         "isAlternate": false,
-        "alternateFileId": 3482430,
+        "alternateFileId": 3498294,
         "dependencies": [
           {
-            "id": 0,
+            "id": 76367016,
             "addonId": 247007,
             "type": 3,
-            "fileId": 0
+            "fileId": 3498290
           },
           {
-            "id": 0,
+            "id": 76367017,
             "addonId": 232758,
             "type": 3,
-            "fileId": 0
+            "fileId": 3498290
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 2686072377,
-            "type": 0,
+            "fingerprint": 2449958965,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "org",
-            "fingerprint": 2182935820,
-            "type": 0,
+            "fingerprint": 3883081620,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "assets",
-            "fingerprint": 2360440062,
-            "type": 0,
+            "foldername": "logo.png",
+            "fingerprint": 711418639,
+            "type": 3,
+            "invalidFingerprint": false
+          },
+          {
+            "foldername": "logo_small.png",
+            "fingerprint": 2118832145,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 898374091,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "logo_small.png",
-            "fingerprint": 2118832145,
-            "type": 0,
+            "foldername": "assets",
+            "fingerprint": 2534161911,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
             "fingerprint": 3939935539,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "LICENSE-re2j.txt",
             "fingerprint": 66756537,
-            "type": 0,
-            "invalidFingerprint": false
-          },
-          {
-            "foldername": "logo.png",
-            "fingerprint": 711418639,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "vendors",
             "fingerprint": 1036984855,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 669592767,
+        "packageFingerprint": 1705749122,
         "gameVersion": [
           "1.16.5",
           "Forge"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2549594,
+        "projectId": 236307,
+        "packageFingerprintId": 767332552,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3401155,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "IntegratedDynamics-1.16.5-1.10.2.jar"
+        "FileNameOnDisk": "IntegratedDynamics-1.16.5-1.10.3.jar"
       },
       "dateInstalled": "2021-07-05T20:19:25.3009353Z",
-      "dateUpdated": "2021-10-06T16:58:23.1824413Z",
-      "dateLastUpdateAttempted": "2021-10-06T16:58:23.1824413Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:00:30.9581467Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:30.9581467Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -21898,14 +22173,14 @@
       "addonID": 368293,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3496193,
-        "displayName": "Repurposed Structures v3.3.1 (1.16.5 MC)",
-        "fileName": "repurposed_structures_forge-3.3.1+1.16.5.jar",
-        "fileDate": "2021-10-19T14:11:06.913Z",
-        "fileLength": 5405977,
+        "id": 3499509,
+        "displayName": "Repurposed Structures v3.3.4 (1.16.5 MC)",
+        "fileName": "repurposed_structures_forge-3.3.4+1.16.5.jar",
+        "fileDate": "2021-10-22T20:43:44.883Z",
+        "fileLength": 5407396,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3496/193/repurposed_structures_forge-3.3.1+1.16.5.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3499/509/repurposed_structures_forge-3.3.4+1.16.5.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -21913,13 +22188,13 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 767866821,
+            "fingerprint": 2429862093,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 2052469599,
+            "fingerprint": 239272627,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -21931,7 +22206,7 @@
           },
           {
             "foldername": "data",
-            "fingerprint": 1449098701,
+            "fingerprint": 3052396804,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -21960,7 +22235,7 @@
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 1789096268,
+        "packageFingerprint": 1774745774,
         "gameVersion": [
           "1.16.5",
           "Forge"
@@ -21986,19 +22261,19 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2546859,
+        "renderCacheId": 2551109,
         "projectId": 368293,
-        "packageFingerprintId": 765744726,
+        "packageFingerprintId": 768151110,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 3395524,
+        "gameVersionMappingId": 3404595,
         "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "repurposed_structures_forge-3.3.1+1.16.5.jar"
+        "FileNameOnDisk": "repurposed_structures_forge-3.3.4+1.16.5.jar"
       },
       "dateInstalled": "2021-08-05T21:06:59.9349112Z",
-      "dateUpdated": "2021-10-20T17:46:15.307112Z",
-      "dateLastUpdateAttempted": "2021-10-20T17:46:15.307112Z",
+      "dateUpdated": "2021-10-25T18:01:58.3845638Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:01:58.3845638Z",
       "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
@@ -22454,7 +22729,7 @@
       "dateInstalled": "2021-07-05T20:21:08.4264731Z",
       "dateUpdated": "2021-10-20T17:46:28.4587164Z",
       "dateLastUpdateAttempted": "2021-10-20T17:46:28.4587164Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -22586,14 +22861,14 @@
       "addonID": 399630,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3457017,
-        "displayName": "EmendatusEnigmatica-1.16.5-1.2.10",
-        "fileName": "EmendatusEnigmatica-1.16.5-1.2.10.jar",
-        "fileDate": "2021-09-11T23:48:15.223Z",
-        "fileLength": 3977740,
+        "id": 3502599,
+        "displayName": "EmendatusEnigmatica-1.16.5-1.2.11",
+        "fileName": "EmendatusEnigmatica-1.16.5-1.2.11.jar",
+        "fileDate": "2021-10-24T19:45:57.643Z",
+        "fileLength": 4220102,
         "releaseType": 3,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3457/17/EmendatusEnigmatica-1.16.5-1.2.10.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3502/599/EmendatusEnigmatica-1.16.5-1.2.11.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -22601,75 +22876,109 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 3780514876,
-            "type": 0,
+            "fingerprint": 2054801975,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 2749551635,
-            "type": 0,
+            "fingerprint": 685964142,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
-            "fingerprint": 1589911189,
-            "type": 0,
+            "fingerprint": 2650960421,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
-            "fingerprint": 3975310760,
-            "type": 0,
+            "fingerprint": 3101168311,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "emendatusenigmatica.mixins.json",
             "fingerprint": 332023941,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "logo.png",
             "fingerprint": 1118063826,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 2276242867,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "emendatusenigmatica.refmap.json",
             "fingerprint": 1265371035,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 2712966922,
+        "packageFingerprint": 6371187,
         "gameVersion": [
           "1.16.3",
           "1.16.5",
           "Forge",
           "1.16.4"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000003",
+            "gameVersion": "1.16.3",
+            "gameVersionReleaseDate": "2020-09-10T14:44:20.443Z",
+            "gameVersionName": "1.16.3",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000004",
+            "gameVersion": "1.16.4",
+            "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z",
+            "gameVersionName": "1.16.4",
+            "gameVersionTypeId": 70886
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2554873,
+        "projectId": 399630,
+        "packageFingerprintId": 769477411,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3409761,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "EmendatusEnigmatica-1.16.5-1.2.10.jar"
+        "FileNameOnDisk": "EmendatusEnigmatica-1.16.5-1.2.11.jar"
       },
       "dateInstalled": "2021-09-13T17:30:41.8608324Z",
-      "dateUpdated": "2021-09-13T17:30:41.8728329Z",
-      "dateLastUpdateAttempted": "2021-09-13T17:30:41.8728329Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:00:03.1306103Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:03.1306103Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -23550,7 +23859,7 @@
       "dateInstalled": "2021-09-17T18:18:50.6213974Z",
       "dateUpdated": "2021-10-20T17:46:29.7614814Z",
       "dateLastUpdateAttempted": "2021-10-20T17:46:29.7614814Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -23818,107 +24127,127 @@
       "addonID": 328085,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3419412,
-        "displayName": " Create 1.16.5 v0.3.2d",
-        "fileName": "create-mc1.16.5_v0.3.2d.jar",
-        "fileDate": "2021-08-08T18:50:11.737Z",
-        "fileLength": 11337001,
+        "id": 3499718,
+        "displayName": "Create 1.16.5 v0.3.2f",
+        "fileName": "create-mc1.16.5_v0.3.2f.jar",
+        "fileDate": "2021-10-23T01:57:53.057Z",
+        "fileLength": 11495277,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3419/412/create-mc1.16.5_v0.3.2d.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3499/718/create-mc1.16.5_v0.3.2f.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 0,
-            "addonId": 486392,
-            "type": 3,
-            "fileId": 0
-          },
-          {
-            "id": 0,
+            "id": 76483683,
             "addonId": 238222,
             "type": 2,
-            "fileId": 0
+            "fileId": 3499718
+          },
+          {
+            "id": 76483682,
+            "addonId": 486392,
+            "type": 3,
+            "fileId": 3499718
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 188467572,
-            "type": 0,
+            "fingerprint": 2525191301,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 680092021,
-            "type": 0,
+            "fingerprint": 413189307,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": ".cache",
-            "fingerprint": 2786113706,
-            "type": 0,
+            "fingerprint": 1204948565,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
-            "fingerprint": 907648433,
-            "type": 0,
+            "fingerprint": 3915099975,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "create.mixins.json",
-            "fingerprint": 3505967421,
-            "type": 0,
+            "fingerprint": 941123429,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
-            "fingerprint": 3604133244,
-            "type": 0,
+            "fingerprint": 2155804724,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "logo.png",
             "fingerprint": 2004783834,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 1782673937,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "create.refmap.json",
-            "fingerprint": 1151107717,
-            "type": 0,
+            "fingerprint": 1798590828,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 262284899,
+        "packageFingerprint": 2050102413,
         "gameVersion": [
           "1.16.5",
           "Forge"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2551391,
+        "projectId": 328085,
+        "packageFingerprintId": 768256186,
         "gameVersionDateReleased": "2019-08-01T00:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3405136,
+        "gameVersionId": 7498,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "create-mc1.16.5_v0.3.2d.jar"
+        "FileNameOnDisk": "create-mc1.16.5_v0.3.2f.jar"
       },
       "dateInstalled": "2021-07-12T18:56:07.2846942Z",
-      "dateUpdated": "2021-08-11T14:43:31.2909174Z",
-      "dateLastUpdateAttempted": "2021-08-11T14:43:31.2909174Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:00:09.8009598Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:09.8009598Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -25324,14 +25653,14 @@
       "addonID": 231951,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3483884,
-        "displayName": "ImmersiveEngineering-1.16.5-5.0.4-139",
-        "fileName": "ImmersiveEngineering-1.16.5-5.0.4-139.jar",
-        "fileDate": "2021-10-07T11:19:12.973Z",
-        "fileLength": 10722921,
+        "id": 3497359,
+        "displayName": "ImmersiveEngineering-1.16.5-5.0.5-140",
+        "fileName": "ImmersiveEngineering-1.16.5-5.0.5-140.jar",
+        "fileDate": "2021-10-20T19:44:38.24Z",
+        "fileLength": 10131626,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3483/884/ImmersiveEngineering-1.16.5-5.0.4-139.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3497/359/ImmersiveEngineering-1.16.5-5.0.5-140.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -25339,13 +25668,7 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 2107520994,
-            "type": 3,
-            "invalidFingerprint": false
-          },
-          {
-            "foldername": "mappings",
-            "fingerprint": 439494986,
+            "fingerprint": 2918498985,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -25369,19 +25692,19 @@
           },
           {
             "foldername": "data",
-            "fingerprint": 4174693823,
+            "fingerprint": 4192982709,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
-            "fingerprint": 1089542876,
+            "fingerprint": 2236092823,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": ".cache",
-            "fingerprint": 218790205,
+            "fingerprint": 3371881690,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -25393,24 +25716,24 @@
           },
           {
             "foldername": "blusunrize",
-            "fingerprint": 2306302506,
+            "fingerprint": 3806323918,
             "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "malte0811",
-            "fingerprint": 6391778,
+            "foldername": "invtweaks",
+            "fingerprint": 1311683996,
             "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "invtweaks",
-            "fingerprint": 1311683996,
+            "foldername": "malte0811",
+            "fingerprint": 6391778,
             "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 597708875,
+        "packageFingerprint": 2811759999,
         "gameVersion": [
           "1.16.5",
           "Forge"
@@ -25421,14 +25744,14 @@
             "gameVersion": "1.16.5",
             "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
             "gameVersionName": "1.16.5",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 70886
           },
           {
             "gameVersionPadded": "0",
             "gameVersion": "",
             "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
             "gameVersionName": "Forge",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 68441
           }
         ],
         "hasInstallScript": false,
@@ -25436,20 +25759,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2530821,
+        "renderCacheId": 2548408,
         "projectId": 231951,
-        "packageFingerprintId": 757943079,
+        "packageFingerprintId": 766692584,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 3363130,
+        "gameVersionMappingId": 3398664,
         "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "ImmersiveEngineering-1.16.5-5.0.4-139.jar"
+        "FileNameOnDisk": "ImmersiveEngineering-1.16.5-5.0.5-140.jar"
       },
       "dateInstalled": "2021-10-08T18:14:50.7214402Z",
-      "dateUpdated": "2021-10-15T19:25:46.9142457Z",
-      "dateLastUpdateAttempted": "2021-10-15T19:25:46.9142457Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:00:36.1754708Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:36.1754708Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -26837,14 +27160,14 @@
       "addonID": 511733,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3481565,
-        "displayName": "clickadv-1.9.jar",
-        "fileName": "clickadv-1.9.jar",
-        "fileDate": "2021-10-04T20:41:04.657Z",
+        "id": 3504082,
+        "displayName": "clickadv-2.0.jar",
+        "fileName": "clickadv-2.0.jar",
+        "fileDate": "2021-10-25T08:21:13.413Z",
         "fileLength": 15198,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3481/565/clickadv-1.9.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3504/82/clickadv-2.0.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -26852,57 +27175,91 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 1008933787,
-            "type": 0,
+            "fingerprint": 2444410503,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
             "fingerprint": 1472023426,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "clickadv.mixins.json",
             "fingerprint": 69916680,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 1438559181,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "clickadv.refmap.json",
             "fingerprint": 2626024748,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 1677456705,
+        "packageFingerprint": 3963888341,
         "gameVersion": [
           "1.14.4",
           "1.16.5",
           "Forge",
           "1.15.2"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000014.0000000004",
+            "gameVersion": "1.14.4",
+            "gameVersionReleaseDate": "2019-07-19T00:00:00Z",
+            "gameVersionName": "1.14.4",
+            "gameVersionTypeId": 64806
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000015.0000000002",
+            "gameVersion": "1.15.2",
+            "gameVersionReleaseDate": "2020-01-22T00:00:00Z",
+            "gameVersionName": "1.15.2",
+            "gameVersionTypeId": 68722
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2556513,
+        "projectId": 511733,
+        "packageFingerprintId": 769801810,
         "gameVersionDateReleased": "2019-07-19T00:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3411888,
+        "gameVersionId": 7469,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "clickadv-1.9.jar"
+        "FileNameOnDisk": "clickadv-2.0.jar"
       },
       "dateInstalled": "2021-08-13T18:01:17.0810367Z",
-      "dateUpdated": "2021-10-06T16:58:23.1824413Z",
-      "dateLastUpdateAttempted": "2021-10-06T16:58:23.1824413Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:00:59.8919355Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:59.8919355Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -27093,7 +27450,7 @@
       "dateInstalled": "2021-07-05T20:21:15.1220335Z",
       "dateUpdated": "2021-07-05T20:21:15.1220335Z",
       "dateLastUpdateAttempted": "0001-01-01T00:00:00",
-      "status": 3,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -27487,40 +27844,40 @@
       "addonID": 314906,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3495215,
-        "displayName": "ftb-chunks-forge-1605.3.2-build.69.jar",
-        "fileName": "ftb-chunks-forge-1605.3.2-build.69.jar",
-        "fileDate": "2021-10-18T13:47:54.753Z",
-        "fileLength": 720046,
+        "id": 3501302,
+        "displayName": "ftb-chunks-forge-1605.3.2-build.71.jar",
+        "fileName": "ftb-chunks-forge-1605.3.2-build.71.jar",
+        "fileDate": "2021-10-23T17:05:17.113Z",
+        "fileLength": 720047,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3495/215/ftb-chunks-forge-1605.3.2-build.69.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3501/302/ftb-chunks-forge-1605.3.2-build.71.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 76132855,
-            "addonId": 404468,
+            "id": 76535803,
+            "addonId": 404465,
             "type": 3,
-            "fileId": 3495215
+            "fileId": 3501302
           },
           {
-            "id": 76132853,
-            "addonId": 404465,
-            "type": 3,
-            "fileId": 3495215
+            "id": 76535806,
+            "addonId": 314905,
+            "type": 2,
+            "fileId": 3501302
           },
           {
-            "id": 76132854,
+            "id": 76535804,
             "addonId": 419699,
             "type": 3,
-            "fileId": 3495215
+            "fileId": 3501302
           },
           {
-            "id": 76132856,
-            "addonId": 314905,
-            "type": 2,
-            "fileId": 3495215
+            "id": 76535805,
+            "addonId": 404468,
+            "type": 3,
+            "fileId": 3501302
           }
         ],
         "isAvailable": true,
@@ -27569,24 +27926,24 @@
           },
           {
             "foldername": "META-INF",
-            "fingerprint": 2878223894,
+            "fingerprint": 1805200783,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "dev",
-            "fingerprint": 481391167,
+            "fingerprint": 1059997905,
             "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "architectury_inject_FTBChunks1165_common_852293788af048419da53ca6edb7cbfe",
-            "fingerprint": 882899311,
+            "foldername": "architectury_inject_FTBChunks1165_common_78bfcfc381024fb8ba315729c275e3ab",
+            "fingerprint": 423872169,
             "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 4022791098,
+        "packageFingerprint": 2592246910,
         "gameVersion": [
           "1.16.5",
           "Forge"
@@ -27612,19 +27969,19 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2545595,
+        "renderCacheId": 2553151,
         "projectId": 314906,
-        "packageFingerprintId": 765032255,
+        "packageFingerprintId": 768647025,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 3392908,
+        "gameVersionMappingId": 3406645,
         "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "ftb-chunks-forge-1605.3.2-build.69.jar"
+        "FileNameOnDisk": "ftb-chunks-forge-1605.3.2-build.71.jar"
       },
       "dateInstalled": "2021-09-10T17:14:11.272099Z",
-      "dateUpdated": "2021-10-20T17:46:29.6294838Z",
-      "dateLastUpdateAttempted": "2021-10-20T17:46:29.6294838Z",
+      "dateUpdated": "2021-10-25T18:00:19.1800708Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:19.1800708Z",
       "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
@@ -29185,7 +29542,7 @@
       "dateInstalled": "2021-07-05T20:21:15.1320328Z",
       "dateUpdated": "2021-10-20T17:46:28.3477145Z",
       "dateLastUpdateAttempted": "2021-10-20T17:46:28.3477145Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -31839,7 +32196,7 @@
       "dateInstalled": "2021-10-20T17:51:18.801426Z",
       "dateUpdated": "2021-10-20T17:51:18.8124197Z",
       "dateLastUpdateAttempted": "2021-10-20T17:51:18.8124197Z",
-      "status": 3,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -31848,7 +32205,7 @@
       "isFuzzyMatch": false,
       "preferenceReleaseType": null,
       "manifestName": null,
-      "installedTargets": []
+      "installedTargets": null
     },
     {
       "addonID": 299540,
@@ -32875,64 +33232,84 @@
       "addonID": 250398,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3480210,
-        "displayName": "Controlling-7.0.0.26.jar",
-        "fileName": "Controlling-7.0.0.26.jar",
-        "fileDate": "2021-10-03T15:46:45.793Z",
-        "fileLength": 54388,
+        "id": 3501319,
+        "displayName": "Controlling-7.0.0.27.jar",
+        "fileName": "Controlling-7.0.0.27.jar",
+        "fileDate": "2021-10-23T17:14:45.203Z",
+        "fileLength": 54868,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3480/210/Controlling-7.0.0.26.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3501/319/Controlling-7.0.0.27.jar",
         "isAlternate": false,
-        "alternateFileId": 3480211,
+        "alternateFileId": 3501320,
         "dependencies": [],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 1619437895,
-            "type": 0,
+            "fingerprint": 3728449714,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
             "fingerprint": 2902717494,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 98047162,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
-            "fingerprint": 1317702248,
-            "type": 0,
+            "fingerprint": 3664116496,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 2840124715,
+        "packageFingerprint": 1142186317,
         "gameVersion": [
           "1.16.5",
           "Forge"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2553172,
+        "projectId": 250398,
+        "packageFingerprintId": 768656302,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3406672,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "Controlling-7.0.0.26.jar"
+        "FileNameOnDisk": "Controlling-7.0.0.27.jar"
       },
       "dateInstalled": "2021-07-05T20:21:18.9860639Z",
-      "dateUpdated": "2021-10-04T17:58:41.6575877Z",
-      "dateLastUpdateAttempted": "2021-10-04T17:58:41.6575877Z",
-      "status": 5,
+      "dateUpdated": "2021-10-25T18:00:57.6849346Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:57.6849346Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -33144,14 +33521,14 @@
       "addonID": 532286,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3496673,
-        "displayName": "jeed-1.16.5-1.2.jar",
-        "fileName": "jeed-1.16.5-1.2.jar",
-        "fileDate": "2021-10-20T00:14:10.843Z",
-        "fileLength": 69201,
+        "id": 3498507,
+        "displayName": "jeed-1.16.5-1.3.jar",
+        "fileName": "jeed-1.16.5-1.3.jar",
+        "fileDate": "2021-10-21T21:57:13.517Z",
+        "fileLength": 67686,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3496/673/jeed-1.16.5-1.2.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3498/507/jeed-1.16.5-1.3.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -33165,7 +33542,7 @@
           },
           {
             "foldername": "net",
-            "fingerprint": 2884587330,
+            "fingerprint": 405967944,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -33206,7 +33583,7 @@
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 2018940120,
+        "packageFingerprint": 3101735999,
         "gameVersion": [
           "1.16.3",
           "1.16.5",
@@ -33240,19 +33617,19 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2547496,
+        "renderCacheId": 2549864,
         "projectId": 532286,
-        "packageFingerprintId": 766001755,
+        "packageFingerprintId": 767511639,
         "gameVersionDateReleased": "2020-09-10T14:44:20.443Z",
-        "gameVersionMappingId": 3396797,
+        "gameVersionMappingId": 3401731,
         "gameVersionId": 8056,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "jeed-1.16.5-1.2.jar"
+        "FileNameOnDisk": "jeed-1.16.5-1.3.jar"
       },
       "dateInstalled": "2021-10-01T04:22:30.4801221Z",
-      "dateUpdated": "2021-10-20T17:46:28.3847135Z",
-      "dateLastUpdateAttempted": "2021-10-20T17:46:28.3847135Z",
+      "dateUpdated": "2021-10-25T18:00:41.470726Z",
+      "dateLastUpdateAttempted": "2021-10-25T18:00:41.470726Z",
       "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,

From b6c612aefcec81b5d3a66d9f74bdef38d819441d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Mon, 25 Oct 2021 21:09:47 +0200
Subject: [PATCH 063/130] ftb chunks: enabled experimental performance
 improvement

---
 local/ftbchunks/client-config.snbt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/local/ftbchunks/client-config.snbt b/local/ftbchunks/client-config.snbt
index f81ea399be..080e85b53e 100644
--- a/local/ftbchunks/client-config.snbt
+++ b/local/ftbchunks/client-config.snbt
@@ -21,8 +21,8 @@
 	debug_info: false
 	
 	# Moves map update tasks to a different thread. May cause CME errors and some weird chunks but could improve performance.
-	# Default: false
-	experimental_performance_improvement: false
+	# Default: true
+	experimental_performance_improvement: true
 	
 	# Advanced option. Foliage darkness
 	# Default: 50

From 4c0eaba398ae04f69f061ace4c601babdf01de23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Mon, 25 Oct 2021 22:01:00 +0200
Subject: [PATCH 064/130] thermal now takes precendence over IE ingredients,
 fixes #3558

---
 config/immersiveengineering-common.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/immersiveengineering-common.toml b/config/immersiveengineering-common.toml
index 9665329a10..099b6c4593 100644
--- a/config/immersiveengineering-common.toml
+++ b/config/immersiveengineering-common.toml
@@ -1,6 +1,6 @@
 #A list of preferred Mod IDs that results of IE processes should stem from, aka which mod you want the copper to come from.
 #This affects the ores dug by the excavator, as well as those crushing recipes that don't have associated IE items. This list is in oreder of priority.
-preferredOres = ["emendatusenigmatica", "minecraft", "immersiveengineering", "thermal", "create", "mekanism", "jaopca", "kubejs", "appliedenergistics2", "pneumaticcraft", "occultism", "tmechworks", "industrialforegoing", "botania", "quark", "pedestals"]
+preferredOres = ["emendatusenigmatica", "minecraft", "thermal", "immersiveengineering", "create", "mekanism", "jaopca", "kubejs", "appliedenergistics2", "pneumaticcraft", "occultism", "tmechworks", "industrialforegoing", "botania", "quark", "pedestals"]
 #IMPORTANT NOTICE:
 #THIS IS ONLY THE COMMON CONFIG. It does not contain all the values adjustable for IE.
 #All modifiers for machines, all ore gen, the retrogen features and most other adjustable values have been moved to immersiveengineering-server.toml.

From 70414294f13bc7fcd17c61929f1f6a568334fa87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Mon, 25 Oct 2021 22:08:17 +0200
Subject: [PATCH 065/130] add delay before modifying nbt of newly spawned
 block, fixes #3545

---
 kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js b/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js
index 059ea7e952..ebdac68e5a 100644
--- a/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js
+++ b/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js
@@ -303,6 +303,9 @@ onEvent('ponder.registry', (event) => {
                         Block.id('industrialforegoing:supreme_black_hole_unit').with('subfacing', 'west').blockState,
                         false
                     );
+
+                scene.idle(1);
+
                 scene.world().modifyTileNBT(
                     util.select().position(4, 1, 2),
                     {

From cc6ac0d345bbe98f4eef7abe5211b2ec58bf4593 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Mon, 25 Oct 2021 16:20:41 -0400
Subject: [PATCH 066/130] quest update and energizing numbers adjusted

---
 config/ftbquests/quests/chapters/tech_t3.snbt | 49 ++++++++++++++++---
 config/powah/energy/energizing.toml           | 10 ++--
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/config/ftbquests/quests/chapters/tech_t3.snbt b/config/ftbquests/quests/chapters/tech_t3.snbt
index 3b527ba926..a52d72eb0c 100644
--- a/config/ftbquests/quests/chapters/tech_t3.snbt
+++ b/config/ftbquests/quests/chapters/tech_t3.snbt
@@ -119,8 +119,11 @@
 		}
 		{
 			x: 5.0d
-			y: 3.0d
-			dependencies: ["72945D9390F479E7"]
+			y: 4.0d
+			dependencies: [
+				"72945D9390F479E7"
+				"52FEE141AD87B819"
+			]
 			id: "3B9B0EB73BF19CBD"
 			tasks: [{
 				id: "65AF9984F551512B"
@@ -129,8 +132,8 @@
 			}]
 		}
 		{
-			x: 5.0d
-			y: 1.0d
+			x: 4.5d
+			y: 1.5d
 			dependencies: ["1E4DC3A7546EC894"]
 			id: "20C024EA7A79FBB4"
 			tasks: [{
@@ -140,8 +143,8 @@
 			}]
 		}
 		{
-			x: 5.0d
-			y: 2.0d
+			x: 4.5d
+			y: 2.5d
 			dependencies: ["20C024EA7A79FBB4"]
 			id: "72945D9390F479E7"
 			tasks: [{
@@ -150,5 +153,39 @@
 				item: "rftoolspower:blazing_agitator"
 			}]
 		}
+		{
+			x: 5.5d
+			y: 1.0d
+			dependencies: ["1E4DC3A7546EC894"]
+			id: "2182BC78D342D1AA"
+			tasks: [{
+				id: "6B231E1F097FC1DC"
+				type: "item"
+				item: "rftoolscontrol:ram_chip"
+			}]
+		}
+		{
+			x: 5.5d
+			y: 2.0d
+			dependencies: ["2182BC78D342D1AA"]
+			id: "51AFB0E11AB83CFC"
+			tasks: [{
+				id: "5DD654B9BD38AC93"
+				type: "item"
+				item: "kubejs:memory_basic_empty"
+			}]
+		}
+		{
+			x: 5.5d
+			y: 3.0d
+			description: ["High Technology requires smarter machines, and what better to make them more intelligent than one’s own distilled experience? "]
+			dependencies: ["51AFB0E11AB83CFC"]
+			id: "52FEE141AD87B819"
+			tasks: [{
+				id: "7FDBBDEA3D78E027"
+				type: "item"
+				item: "kubejs:memory_basic_filled"
+			}]
+		}
 	]
 }
diff --git a/config/powah/energy/energizing.toml b/config/powah/energy/energizing.toml
index d0f0883f7c..0b5cc857d8 100644
--- a/config/powah/energy/energizing.toml
+++ b/config/powah/energy/energizing.toml
@@ -24,13 +24,13 @@ range = 4
 	#Range: 0 ~ 9000000000000000000
 	basicTransfer = 50
 	#Range: 0 ~ 9000000000000000000
-	hardenedTransfer = 120
+	hardenedTransfer = 135
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 340
+	blazingTransfer = 450
 	#Range: 0 ~ 9000000000000000000
-	nioticTransfer = 1220
+	nioticTransfer = 2100
 	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 5800
+	spiritedTransfer = 14000
 	#Range: 0 ~ 9000000000000000000
-	nitroTransfer = 40000
+	nitroTransfer = 154000
 

From ed11313b7abeac87e59e95693d79dc639c328336 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Mon, 25 Oct 2021 16:24:30 -0400
Subject: [PATCH 067/130] Mekanism Machine Shuffle

---
 .../mekanism/metallurgic_infusing.js          |   7 ++
 .../expert/recipetypes/mekanism/shaped.js     | 116 ++++++++++++++++++
 2 files changed, 123 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js
index caa8937ef1..f51cfd1bf3 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js
@@ -24,6 +24,13 @@ onEvent('recipes', (event) => {
             infusionInput: 'mekanism:refined_obsidian',
             infusionAmount: 320,
             id: 'mekanismgenerators:reactor/glass'
+        },
+        {
+            output: 'immersiveengineering:rockcutter',
+            input: 'immersiveengineering:sawblade',
+            infusionInput: 'mekanism:diamond',
+            infusionAmount: 80,
+            id: 'immersiveengineering:crafting/rockcutter'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index 9a48f4034f..2bef9307e0 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -397,6 +397,122 @@ onEvent('recipes', (event) => {
                 B: 'industrialforegoing:laser_lens14'
             },
             id: 'mekanismgenerators:laser_focus_matrix'
+        },
+        {
+            output: 'mekanism:rotary_condensentrator',
+            pattern: ['ABA', 'CDE', 'FGF'],
+            key: {
+                A: 'immersiveengineering:steel_wallmount',
+                B: 'immersiveengineering:turntable',
+                C: 'mekanism:advanced_chemical_tank',
+                D: '#industrialforegoing:machine_frame/simple',
+                E: 'mekanism:advanced_fluid_tank',
+                F: '#forge:circuits/basic',
+                G: 'rftoolspower:cell1'
+            },
+            id: 'mekanism:rotary_condensentrator'
+        },
+        {
+            output: 'mekanism:enrichment_chamber',
+            pattern: ['ABA', 'CDC', 'EFE'],
+            key: {
+                A: Item.of('immersiveengineering:graphite_electrode', '{graphDmg:0}'),
+                B: 'minecraft:cauldron',
+                C: 'mekanism:basic_induction_cell',
+                D: '#industrialforegoing:machine_frame/simple',
+                E: '#forge:circuits/basic',
+                F: 'rftoolspower:cell1'
+            },
+            id: 'mekanism:enrichment_chamber'
+        },
+        {
+            output: 'mekanism:crusher',
+            pattern: ['ABA', 'CDC', 'EFE'],
+            key: {
+                A: '#forge:gears/compressed_iron',
+                B: 'engineersdecor:factory_hopper',
+                C: 'create:filter',
+                D: '#industrialforegoing:machine_frame/simple',
+                E: '#forge:circuits/basic',
+                F: 'rftoolspower:cell1'
+            },
+            id: 'mekanism:crusher'
+        },
+        {
+            output: 'mekanism:energized_smelter',
+            pattern: ['ABA', 'CDC', 'EFE'],
+            key: {
+                A: 'immersiveengineering:blastbrick_reinforced',
+                B: 'minecraft:cauldron',
+                C: 'immersiveengineering:coil_hv',
+                D: '#industrialforegoing:machine_frame/simple',
+                E: '#forge:circuits/basic',
+                F: 'rftoolspower:cell1'
+            },
+            id: 'mekanism:energized_smelter'
+        },
+        {
+            output: 'mekanism:precision_sawmill',
+            pattern: ['ABA', 'CDC', 'EFE'],
+            key: {
+                A: 'create:rotation_speed_controller',
+                B: 'immersiveengineering:rockcutter',
+                C: 'immersiveengineering:heavy_engineering',
+                D: '#industrialforegoing:machine_frame/simple',
+                E: '#forge:circuits/basic',
+                F: 'rftoolspower:cell1'
+            },
+            id: 'mekanism:precision_sawmill'
+        },
+        {
+            output: 'mekanism:nutritional_liquifier',
+            pattern: ['ABA', 'CDC', 'EFE'],
+            key: {
+                A: 'immersiveengineering:steel_wallmount',
+                B: 'immersiveengineering:turntable',
+                C: 'mekanism:advanced_chemical_tank',
+                D: '#industrialforegoing:machine_frame/simple',
+                E: '#forge:circuits/basic',
+                F: 'rftoolspower:cell1'
+            },
+            id: 'mekanism:nutritional_liquifier'
+        },
+        {
+            output: 'mekanism:electric_pump',
+            pattern: ['ABC', 'ADC', 'AEC'],
+            key: {
+                A: 'mekanism:dynamic_tank',
+                B: 'create:mechanical_pump',
+                C: 'create:fluid_pipe',
+                D: 'supplementaries:cog_block',
+                E: 'immersiveengineering:turntable'
+            },
+            id: 'mekanism:electric_pump'
+        },
+        {
+            output: 'mekanism:fluidic_plenisher',
+            pattern: ['AEC', 'ADC', 'ABC'],
+            key: {
+                A: 'mekanism:dynamic_tank',
+                B: 'create:mechanical_pump',
+                C: 'create:fluid_pipe',
+                D: 'supplementaries:cog_block',
+                E: 'immersiveengineering:turntable'
+            },
+            id: 'mekanism:fluidic_plenisher'
+        },
+        {
+            output: 'mekanism:purification_chamber',
+            pattern: ['AAA', 'BDC', 'EFE'],
+            key: {
+                A: 'architects_palette:abyssaline_lamp',
+                B: 'glassential:glass_dark',
+                C: 'mekanism:advanced_chemical_tank',
+                D: '#industrialforegoing:machine_frame/advanced',
+                E: '#forge:circuits/advanced',
+                F: 'rftoolspower:cell2'
+            },
+            id: 'mekanism:purification_chamber'
         }
     ];
 

From 1ed5332e5bd3c2678abbd135c3c943409df01e50 Mon Sep 17 00:00:00 2001
From: Iris <48930896+Iris-xii@users.noreply.github.com>
Date: Mon, 25 Oct 2021 23:56:28 +0200
Subject: [PATCH 068/130] Tries (tries) to fix #3457

My attempt at fixing #3457. I don't know if it's dumb, but it seems to work.
---
 .../kubejs/constants/stonecuttables.js        | 884 +++++++++++++++++-
 1 file changed, 870 insertions(+), 14 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js b/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
index ff5e1ed6d3..36aa588d2d 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
@@ -42,7 +42,43 @@ const stonecuttables = [
             'chipped:stone_10',
             'chipped:stone_11',
             'chipped:stone_2',
-            'chipped:stone_1'
+            'chipped:stone_1',
+			'chisel:stone_bricks/extra/largeornate',
+			'chisel:stone_bricks/extra/poison',
+			'chisel:stone_bricks/extra/sunken',
+			"chisel:stone_bricks/cracked",
+			"chisel:stone_bricks/solid_bricks",
+			"chisel:stone_bricks/small_bricks",
+			"chisel:stone_bricks/soft_bricks",
+			"chisel:stone_bricks/cracked_bricks",
+			"chisel:stone_bricks/triple_bricks",
+			"chisel:stone_bricks/encased_bricks",
+			"chisel:stone_bricks/chaotic_bricks",
+			"chisel:stone_bricks/array",
+			"chisel:stone_bricks/tiles_medium",
+			"chisel:stone_bricks/tiles_large",
+			"chisel:stone_bricks/tiles_small",
+			"chisel:stone_bricks/chaotic_medium",
+			"chisel:stone_bricks/chaotic_small",
+			"chisel:stone_bricks/braid",
+			"chisel:stone_bricks/dent",
+			"chisel:stone_bricks/french_1",
+			"chisel:stone_bricks/french_2",
+			"chisel:stone_bricks/jellybean",
+			"chisel:stone_bricks/layers",
+			"chisel:stone_bricks/mosaic",
+			"chisel:stone_bricks/ornate",
+			"chisel:stone_bricks/panel",
+			"chisel:stone_bricks/road",
+			"chisel:stone_bricks/slanted",
+			"chisel:stone_bricks/zag",
+			"chisel:stone_bricks/circular",
+			"chisel:stone_bricks/circularct",
+			"chisel:stone_bricks/weaver",
+			"chisel:stone_bricks/pillar",
+			"chisel:stone_bricks/twisted",
+			"chisel:stone_bricks/prism",
+			"chisel:stone_bricks/cuts"
         ],
         // items added here can be cut from other blocks of this stone type,
         // but cannot be cut into other blocks from this type
@@ -104,7 +140,40 @@ const stonecuttables = [
             'chipped:andesite_4',
             'chipped:andesite_3',
             'chipped:andesite_2',
-            'chipped:andesite_1'
+            'chipped:andesite_1',
+			'chisel:andesite/cracked',
+			'chisel:andesite/solid_bricks',
+			'chisel:andesite/small_bricks',
+			'chisel:andesite/soft_bricks',
+			'chisel:andesite/cracked_bricks',
+			'chisel:andesite/triple_bricks',
+			'chisel:andesite/encased_bricks',
+			'chisel:andesite/chaotic_bricks',
+			'chisel:andesite/array',
+			'chisel:andesite/tiles_medium',
+			'chisel:andesite/tiles_large',
+			'chisel:andesite/tiles_small',
+			'chisel:andesite/chaotic_medium',
+			'chisel:andesite/chaotic_small',
+			'chisel:andesite/braid',
+			'chisel:andesite/dent',
+			'chisel:andesite/french_1',
+			'chisel:andesite/french_2',
+			'chisel:andesite/jellybean',
+			'chisel:andesite/layers',
+			'chisel:andesite/mosaic',
+			'chisel:andesite/ornate',
+			'chisel:andesite/panel',
+			'chisel:andesite/road',
+			'chisel:andesite/slanted',
+			'chisel:andesite/zag',
+			'chisel:andesite/circular',
+			'chisel:andesite/circularct',
+			'chisel:andesite/weaver',
+			'chisel:andesite/pillar',
+			'chisel:andesite/twisted',
+			'chisel:andesite/prism',
+			'chisel:andesite/cuts'
         ],
         onlyAsOutput: ['create:andesite_cobblestone'],
         onlyAsInput: ['minecraft:andesite']
@@ -310,7 +379,43 @@ const stonecuttables = [
             'chipped:cobblestone_4',
             'chipped:cobblestone_3',
             'chipped:cobblestone_2',
-            'chipped:cobblestone_1'
+            'chipped:cobblestone_1',
+			'chisel:cobblestone/cracked',
+			'chisel:cobblestone/solid_bricks',
+			'chisel:cobblestone/small_bricks',
+			'chisel:cobblestone/soft_bricks',
+			'chisel:cobblestone/cracked_bricks',
+			'chisel:cobblestone/triple_bricks',
+			'chisel:cobblestone/encased_bricks',
+			'chisel:cobblestone/chaotic_bricks',
+			'chisel:cobblestone/array',
+			'chisel:cobblestone/tiles_medium',
+			'chisel:cobblestone/tiles_large',
+			'chisel:cobblestone/tiles_small',
+			'chisel:cobblestone/chaotic_medium',
+			'chisel:cobblestone/chaotic_small',
+			'chisel:cobblestone/braid',
+			'chisel:cobblestone/dent',
+			'chisel:cobblestone/french_1',
+			'chisel:cobblestone/french_2',
+			'chisel:cobblestone/jellybean',
+			'chisel:cobblestone/layers',
+			'chisel:cobblestone/mosaic',
+			'chisel:cobblestone/ornate',
+			'chisel:cobblestone/panel',
+			'chisel:cobblestone/road',
+			'chisel:cobblestone/slanted',
+			'chisel:cobblestone/zag',
+			'chisel:cobblestone/circular',
+			'chisel:cobblestone/circularct',
+			'chisel:cobblestone/weaver',
+			'chisel:cobblestone/pillar',
+			'chisel:cobblestone/twisted',
+			'chisel:cobblestone/prism',
+			'chisel:cobblestone/cuts',
+			'chisel:cobblestone/extra/emboss',
+			'chisel:cobblestone/extra/indent',
+			'chisel:cobblestone/extra/marker'
         ],
         onlyAsOutput: [],
         onlyAsInput: []
@@ -466,7 +571,40 @@ const stonecuttables = [
             'chipped:diorite_4',
             'chipped:diorite_3',
             'chipped:diorite_2',
-            'chipped:diorite_1'
+            'chipped:diorite_1',
+			'chisel:diorite/cracked',
+			'chisel:diorite/solid_bricks',
+			'chisel:diorite/small_bricks',
+			'chisel:diorite/soft_bricks',
+			'chisel:diorite/cracked_bricks',
+			'chisel:diorite/triple_bricks',
+			'chisel:diorite/encased_bricks',
+			'chisel:diorite/chaotic_bricks',
+			'chisel:diorite/array',
+			'chisel:diorite/tiles_medium',
+			'chisel:diorite/tiles_large',
+			'chisel:diorite/tiles_small',
+			'chisel:diorite/chaotic_medium',
+			'chisel:diorite/chaotic_small',
+			'chisel:diorite/braid',
+			'chisel:diorite/dent',
+			'chisel:diorite/french_1',
+			'chisel:diorite/french_2',
+			'chisel:diorite/jellybean',
+			'chisel:diorite/layers',
+			'chisel:diorite/mosaic',
+			'chisel:diorite/ornate',
+			'chisel:diorite/panel',
+			'chisel:diorite/road',
+			'chisel:diorite/slanted',
+			'chisel:diorite/zag',
+			'chisel:diorite/circular',
+			'chisel:diorite/circularct',
+			'chisel:diorite/weaver',
+			'chisel:diorite/pillar',
+			'chisel:diorite/twisted',
+			'chisel:diorite/prism',
+			'chisel:diorite/cuts'
         ],
         onlyAsOutput: ['create:diorite_cobblestone'],
         onlyAsInput: ['minecraft:diorite']
@@ -509,7 +647,40 @@ const stonecuttables = [
             'chipped:end_stone_4',
             'chipped:end_stone_3',
             'chipped:end_stone_2',
-            'chipped:end_stone_1'
+            'chipped:end_stone_1',
+			'chisel:end_stone/cracked',
+			'chisel:end_stone/solid_bricks',
+			'chisel:end_stone/small_bricks',
+			'chisel:end_stone/soft_bricks',
+			'chisel:end_stone/cracked_bricks',
+			'chisel:end_stone/triple_bricks',
+			'chisel:end_stone/encased_bricks',
+			'chisel:end_stone/chaotic_bricks',
+			'chisel:end_stone/array',
+			'chisel:end_stone/tiles_medium',
+			'chisel:end_stone/tiles_large',
+			'chisel:end_stone/tiles_small',
+			'chisel:end_stone/chaotic_medium',
+			'chisel:end_stone/chaotic_small',
+			'chisel:end_stone/braid',
+			'chisel:end_stone/dent',
+			'chisel:end_stone/french_1',
+			'chisel:end_stone/french_2',
+			'chisel:end_stone/jellybean',
+			'chisel:end_stone/layers',
+			'chisel:end_stone/mosaic',
+			'chisel:end_stone/ornate',
+			'chisel:end_stone/panel',
+			'chisel:end_stone/road',
+			'chisel:end_stone/slanted',
+			'chisel:end_stone/zag',
+			'chisel:end_stone/circular',
+			'chisel:end_stone/circularct',
+			'chisel:end_stone/weaver',
+			'chisel:end_stone/pillar',
+			'chisel:end_stone/twisted',
+			'chisel:end_stone/prism',
+			'chisel:end_stone/cuts'
         ],
         onlyAsOutput: [],
         onlyAsInput: []
@@ -740,7 +911,40 @@ const stonecuttables = [
             'chipped:glowstone_4',
             'chipped:glowstone_3',
             'chipped:glowstone_2',
-            'chipped:glowstone_1'
+            'chipped:glowstone_1',
+			'chisel:glowstone/cracked',
+			'chisel:glowstone/solid_bricks',
+			'chisel:glowstone/small_bricks',
+			'chisel:glowstone/soft_bricks',
+			'chisel:glowstone/cracked_bricks',
+			'chisel:glowstone/triple_bricks',
+			'chisel:glowstone/encased_bricks',
+			'chisel:glowstone/array',
+			'chisel:glowstone/tiles_medium',
+			'chisel:glowstone/tiles_large',
+			'chisel:glowstone/tiles_small',
+			'chisel:glowstone/chaotic_medium',
+			'chisel:glowstone/chaotic_small',
+			'chisel:glowstone/braid',
+			'chisel:glowstone/dent',
+			'chisel:glowstone/french_1',
+			'chisel:glowstone/french_2',
+			'chisel:glowstone/jellybean',
+			'chisel:glowstone/layers',
+			'chisel:glowstone/mosaic',
+			'chisel:glowstone/ornate',
+			'chisel:glowstone/panel',
+			'chisel:glowstone/road',
+			'chisel:glowstone/slanted',
+			'chisel:glowstone/circular',
+			'chisel:glowstone/pillar',
+			'chisel:glowstone/twisted',
+			'chisel:glowstone/prism',
+			'chisel:glowstone/extra/bismuth',
+			'chisel:glowstone/extra/tiles_large_bismuth',
+			'chisel:glowstone/extra/tiles_medium_bismuth',
+			'chisel:glowstone/extra/neon',
+			'chisel:glowstone/extra/neon_panel'
         ],
         onlyAsOutput: [],
         onlyAsInput: []
@@ -798,7 +1002,40 @@ const stonecuttables = [
             'chipped:granite_4',
             'chipped:granite_3',
             'chipped:granite_2',
-            'chipped:granite_1'
+            'chipped:granite_1',
+			'chisel:granite/cracked',
+			'chisel:granite/solid_bricks',
+			'chisel:granite/small_bricks',
+			'chisel:granite/soft_bricks',
+			'chisel:granite/cracked_bricks',
+			'chisel:granite/triple_bricks',
+			'chisel:granite/encased_bricks',
+			'chisel:granite/chaotic_bricks',
+			'chisel:granite/array',
+			'chisel:granite/tiles_medium',
+			'chisel:granite/tiles_large',
+			'chisel:granite/tiles_small',
+			'chisel:granite/chaotic_medium',
+			'chisel:granite/chaotic_small',
+			'chisel:granite/braid',
+			'chisel:granite/dent',
+			'chisel:granite/french_1',
+			'chisel:granite/french_2',
+			'chisel:granite/jellybean',
+			'chisel:granite/layers',
+			'chisel:granite/mosaic',
+			'chisel:granite/ornate',
+			'chisel:granite/panel',
+			'chisel:granite/road',
+			'chisel:granite/slanted',
+			'chisel:granite/zag',
+			'chisel:granite/circular',
+			'chisel:granite/circularct',
+			'chisel:granite/weaver',
+			'chisel:granite/pillar',
+			'chisel:granite/twisted',
+			'chisel:granite/prism',
+			'chisel:granite/cuts'
         ],
         onlyAsOutput: ['create:granite_cobblestone'],
         onlyAsInput: ['minecraft:granite']
@@ -1226,7 +1463,40 @@ const stonecuttables = [
             'chipped:prismarine_4',
             'chipped:prismarine_3',
             'chipped:prismarine_2',
-            'chipped:prismarine_1'
+            'chipped:prismarine_1',
+			'chisel:prismarine/cracked',
+			'chisel:prismarine/solid_bricks',
+			'chisel:prismarine/small_bricks',
+			'chisel:prismarine/soft_bricks',
+			'chisel:prismarine/cracked_bricks',
+			'chisel:prismarine/triple_bricks',
+			'chisel:prismarine/encased_bricks',
+			'chisel:prismarine/chaotic_bricks',
+			'chisel:prismarine/array',
+			'chisel:prismarine/tiles_medium',
+			'chisel:prismarine/tiles_large',
+			'chisel:prismarine/tiles_small',
+			'chisel:prismarine/chaotic_medium',
+			'chisel:prismarine/chaotic_small',
+			'chisel:prismarine/braid',
+			'chisel:prismarine/dent',
+			'chisel:prismarine/french_1',
+			'chisel:prismarine/french_2',
+			'chisel:prismarine/jellybean',
+			'chisel:prismarine/layers',
+			'chisel:prismarine/mosaic',
+			'chisel:prismarine/ornate',
+			'chisel:prismarine/panel',
+			'chisel:prismarine/road',
+			'chisel:prismarine/slanted',
+			'chisel:prismarine/zag',
+			'chisel:prismarine/circular',
+			'chisel:prismarine/circularct',
+			'chisel:prismarine/weaver',
+			'chisel:prismarine/pillar',
+			'chisel:prismarine/twisted',
+			'chisel:prismarine/prism',
+			'chisel:prismarine/cuts'
         ],
         onlyAsOutput: [],
         onlyAsInput: []
@@ -1258,7 +1528,40 @@ const stonecuttables = [
             'chipped:purpur_block_4',
             'chipped:purpur_block_3',
             'chipped:purpur_block_2',
-            'chipped:purpur_block_1'
+            'chipped:purpur_block_1',
+			'chisel:purpur/cracked',
+			'chisel:purpur/solid_bricks',
+			'chisel:purpur/small_bricks',
+			'chisel:purpur/soft_bricks',
+			'chisel:purpur/cracked_bricks',
+			'chisel:purpur/triple_bricks',
+			'chisel:purpur/encased_bricks',
+			'chisel:purpur/chaotic_bricks',
+			'chisel:purpur/array',
+			'chisel:purpur/tiles_medium',
+			'chisel:purpur/tiles_large',
+			'chisel:purpur/tiles_small',
+			'chisel:purpur/chaotic_medium',
+			'chisel:purpur/chaotic_small',
+			'chisel:purpur/braid',
+			'chisel:purpur/dent',
+			'chisel:purpur/french_1',
+			'chisel:purpur/french_2',
+			'chisel:purpur/jellybean',
+			'chisel:purpur/layers',
+			'chisel:purpur/mosaic',
+			'chisel:purpur/ornate',
+			'chisel:purpur/panel',
+			'chisel:purpur/road',
+			'chisel:purpur/slanted',
+			'chisel:purpur/zag',
+			'chisel:purpur/circular',
+			'chisel:purpur/circularct',
+			'chisel:purpur/weaver',
+			'chisel:purpur/pillar',
+			'chisel:purpur/twisted',
+			'chisel:purpur/prism',
+			'chisel:purpur/cuts'
         ],
         onlyAsOutput: [],
         onlyAsInput: []
@@ -1287,7 +1590,40 @@ const stonecuttables = [
             'chipped:quartz_block_4',
             'chipped:quartz_block_3',
             'chipped:quartz_block_2',
-            'chipped:quartz_block_1'
+            'chipped:quartz_block_1',
+			'chisel:quartz/cracked',
+			'chisel:quartz/solid_bricks',
+			'chisel:quartz/small_bricks',
+			'chisel:quartz/soft_bricks',
+			'chisel:quartz/cracked_bricks',
+			'chisel:quartz/triple_bricks',
+			'chisel:quartz/encased_bricks',
+			'chisel:quartz/chaotic_bricks',
+			'chisel:quartz/array',
+			'chisel:quartz/tiles_medium',
+			'chisel:quartz/tiles_large',
+			'chisel:quartz/tiles_small',
+			'chisel:quartz/chaotic_medium',
+			'chisel:quartz/chaotic_small',
+			'chisel:quartz/braid',
+			'chisel:quartz/dent',
+			'chisel:quartz/french_1',
+			'chisel:quartz/french_2',
+			'chisel:quartz/jellybean',
+			'chisel:quartz/layers',
+			'chisel:quartz/mosaic',
+			'chisel:quartz/ornate',
+			'chisel:quartz/panel',
+			'chisel:quartz/road',
+			'chisel:quartz/slanted',
+			'chisel:quartz/zag',
+			'chisel:quartz/circular',
+			'chisel:quartz/circularct',
+			'chisel:quartz/weaver',
+			'chisel:quartz/pillar',
+			'chisel:quartz/twisted',
+			'chisel:quartz/prism',
+			'chisel:quartz/cuts'
         ],
         onlyAsOutput: [],
         onlyAsInput: []
@@ -1360,7 +1696,43 @@ const stonecuttables = [
             'chipped:red_sandstone_4',
             'chipped:red_sandstone_3',
             'chipped:red_sandstone_2',
-            'chipped:red_sandstone_1'
+            'chipped:red_sandstone_1',
+			'chisel:red_sandstone/extra/bevel_skeleton',
+			'chisel:red_sandstone/extra/glyphs',
+			'chisel:red_sandstone/extra/small',
+			'chisel:red_sandstone/cracked',
+			'chisel:red_sandstone/solid_bricks',
+			'chisel:red_sandstone/small_bricks',
+			'chisel:red_sandstone/soft_bricks',
+			'chisel:red_sandstone/cracked_bricks',
+			'chisel:red_sandstone/triple_bricks',
+			'chisel:red_sandstone/encased_bricks',
+			'chisel:red_sandstone/chaotic_bricks',
+			'chisel:red_sandstone/array',
+			'chisel:red_sandstone/tiles_medium',
+			'chisel:red_sandstone/tiles_large',
+			'chisel:red_sandstone/tiles_small',
+			'chisel:red_sandstone/chaotic_medium',
+			'chisel:red_sandstone/chaotic_small',
+			'chisel:red_sandstone/braid',
+			'chisel:red_sandstone/dent',
+			'chisel:red_sandstone/french_1',
+			'chisel:red_sandstone/french_2',
+			'chisel:red_sandstone/jellybean',
+			'chisel:red_sandstone/layers',
+			'chisel:red_sandstone/mosaic',
+			'chisel:red_sandstone/ornate',
+			'chisel:red_sandstone/panel',
+			'chisel:red_sandstone/road',
+			'chisel:red_sandstone/slanted',
+			'chisel:red_sandstone/zag',
+			'chisel:red_sandstone/circular',
+			'chisel:red_sandstone/circularct',
+			'chisel:red_sandstone/weaver',
+			'chisel:red_sandstone/pillar',
+			'chisel:red_sandstone/twisted',
+			'chisel:red_sandstone/prism',
+			'chisel:red_sandstone/cuts'
         ],
         onlyAsOutput: [],
         onlyAsInput: []
@@ -1426,7 +1798,43 @@ const stonecuttables = [
             'chipped:sandstone_4',
             'chipped:sandstone_3',
             'chipped:sandstone_2',
-            'chipped:sandstone_1'
+            'chipped:sandstone_1',
+			'chisel:sandstone/extra/bevel_creeper',
+			'chisel:sandstone/extra/glyphs',
+			'chisel:sandstone/extra/small',
+			'chisel:sandstone/cracked',
+			'chisel:sandstone/solid_bricks',
+			'chisel:sandstone/small_bricks',
+			'chisel:sandstone/soft_bricks',
+			'chisel:sandstone/cracked_bricks',
+			'chisel:sandstone/triple_bricks',
+			'chisel:sandstone/encased_bricks',
+			'chisel:sandstone/chaotic_bricks',
+			'chisel:sandstone/array',
+			'chisel:sandstone/tiles_medium',
+			'chisel:sandstone/tiles_large',
+			'chisel:sandstone/tiles_small',
+			'chisel:sandstone/chaotic_medium',
+			'chisel:sandstone/chaotic_small',
+			'chisel:sandstone/braid',
+			'chisel:sandstone/dent',
+			'chisel:sandstone/french_1',
+			'chisel:sandstone/french_2',
+			'chisel:sandstone/jellybean',
+			'chisel:sandstone/layers',
+			'chisel:sandstone/mosaic',
+			'chisel:sandstone/ornate',
+			'chisel:sandstone/panel',
+			'chisel:sandstone/road',
+			'chisel:sandstone/slanted',
+			'chisel:sandstone/zag',
+			'chisel:sandstone/circular',
+			'chisel:sandstone/circularct',
+			'chisel:sandstone/weaver',
+			'chisel:sandstone/pillar',
+			'chisel:sandstone/twisted',
+			'chisel:sandstone/prism',
+			'chisel:sandstone/cuts'
         ],
         onlyAsOutput: [],
         onlyAsInput: []
@@ -1735,7 +2143,419 @@ const stonecuttables = [
         ],
         onlyAsOutput: [],
         onlyAsInput: []
-    }
+    },
+	{
+		name: 'tyrian',
+		stones: [
+			'chisel:tyrian/shining',
+			'chisel:tyrian/tyrian',
+			'chisel:tyrian/chaotic',
+			'chisel:tyrian/softplate',
+			'chisel:tyrian/rust',
+			'chisel:tyrian/elaborate',
+			'chisel:tyrian/routes',
+			'chisel:tyrian/platform',
+			'chisel:tyrian/platetiles',
+			'chisel:tyrian/diagonal',
+			'chisel:tyrian/dent',
+			'chisel:tyrian/blueplating',
+			'chisel:tyrian/black',
+			'chisel:tyrian/black2',
+			'chisel:tyrian/opening',
+			'chisel:tyrian/plate'
+		],
+		onlyAsOutput: [],
+		onlyAsInput: []
+	},
+	{
+		name: 'terracotta',
+		stones: [
+			"minecraft:terracotta",
+			"chisel:terracotta/cracked",
+			"chisel:terracotta/solid_bricks",
+			"chisel:terracotta/small_bricks",
+			"chisel:terracotta/soft_bricks",
+			"chisel:terracotta/cracked_bricks",
+			"chisel:terracotta/triple_bricks",
+			"chisel:terracotta/encased_bricks",
+			"chisel:terracotta/chaotic_bricks",
+			"chisel:terracotta/array",
+			"chisel:terracotta/tiles_medium",
+			"chisel:terracotta/tiles_large",
+			"chisel:terracotta/tiles_small",
+			"chisel:terracotta/chaotic_medium",
+			"chisel:terracotta/chaotic_small",
+			"chisel:terracotta/braid",
+			"chisel:terracotta/dent",
+			"chisel:terracotta/french_1",
+			"chisel:terracotta/french_2",
+			"chisel:terracotta/jellybean",
+			"chisel:terracotta/layers",
+			"chisel:terracotta/mosaic",
+			"chisel:terracotta/ornate",
+			"chisel:terracotta/panel",
+			"chisel:terracotta/road",
+			"chisel:terracotta/slanted",
+			"chisel:terracotta/zag",
+			"chisel:terracotta/circular",
+			"chisel:terracotta/circularct",
+			"chisel:terracotta/weaver",
+			"chisel:terracotta/pillar",
+			"chisel:terracotta/twisted",
+			"chisel:terracotta/prism",
+			"chisel:terracotta/cuts"
+		],
+		onlyAsOutput: [],
+		onlyAsInput: []
+	},
+	{
+		name:'laboratory',
+		stones:[
+			'chisel:laboratory/wallpanel',
+			'chisel:laboratory/dottedpanel',
+			'chisel:laboratory/roundel',
+			'chisel:laboratory/wallvents',
+			'chisel:laboratory/largetile',
+			'chisel:laboratory/smalltile',
+			'chisel:laboratory/floortile',
+			'chisel:laboratory/checkertile',
+			'chisel:laboratory/fuzzscreen',
+			'chisel:laboratory/largesteel',
+			'chisel:laboratory/smallsteel',
+			'chisel:laboratory/directionleft',
+			'chisel:laboratory/directionright',
+			'chisel:laboratory/infocon'
+		],
+		onlyAsOutput: [],
+		onlyAsInput: []
+	},
+	{
+		name:'futura',
+		stones: [
+			'chisel:futura/screen_metallic',
+			'chisel:futura/screen_cyan',
+			'chisel:futura/controller',
+			'chisel:futura/wavy',
+			'chisel:futura/controller_purple',
+			'chisel:futura/uber_wavy'
+		],
+		onlyAsOutput: [],
+		onlyAsInput: []
+	},
+	{
+		name:'factory',
+		stones: [
+			'chisel:factory/dots',
+			'chisel:factory/rust2',
+			'chisel:factory/rust',
+			'chisel:factory/platex',
+			'chisel:factory/wireframewhite',
+			'chisel:factory/wireframe',
+			'chisel:factory/hazard',
+			'chisel:factory/hazardorange',
+			'chisel:factory/circuit',
+			'chisel:factory/metalbox',
+			'chisel:factory/goldplate',
+			'chisel:factory/goldplating',
+			'chisel:factory/grinder',
+			'chisel:factory/plating',
+			'chisel:factory/rustplates',
+			'chisel:factory/column',
+			'chisel:factory/frameblue',
+			'chisel:factory/iceiceice',
+			'chisel:factory/tilemosaic',
+			'chisel:factory/vent',
+			'chisel:factory/wireframeblue'
+		],
+		onlyAsOutput: [],
+		onlyAsInput: []
+	},
+	{
+		name:'emerald',
+		stones: [
+			'minecraft:emerald_block',
+			'chisel:emerald/panel',
+			'chisel:emerald/panelclassic',
+			'chisel:emerald/smooth',
+			'chisel:emerald/chunk',
+			'chisel:emerald/goldborder',
+			'chisel:emerald/zelda',
+			'chisel:emerald/cell',
+			'chisel:emerald/cellbismuth',
+			'chisel:emerald/four',
+			'chisel:emerald/fourornate',
+			'chisel:emerald/ornate',
+			'chisel:emerald/masonryemerald',
+			'chisel:emerald/emeraldcircle',
+			'chisel:emerald/emeraldprismatic'
+		],
+		onlyAsOutput: [],
+		onlyAsInput: []
+	},
+	{
+		name:'mossy_cobblestone',
+		stones: [
+			'minecraft:mossy_cobblestone',
+			'chisel:mossy_cobblestone/cracked',
+			'chisel:mossy_cobblestone/solid_bricks',
+			'chisel:mossy_cobblestone/small_bricks',
+			'chisel:mossy_cobblestone/soft_bricks',
+			'chisel:mossy_cobblestone/cracked_bricks',
+			'chisel:mossy_cobblestone/triple_bricks',
+			'chisel:mossy_cobblestone/encased_bricks',
+			'chisel:mossy_cobblestone/chaotic_bricks',
+			'chisel:mossy_cobblestone/array',
+			'chisel:mossy_cobblestone/tiles_medium',
+			'chisel:mossy_cobblestone/tiles_large',
+			'chisel:mossy_cobblestone/tiles_small',
+			'chisel:mossy_cobblestone/chaotic_medium',
+			'chisel:mossy_cobblestone/chaotic_small',
+			'chisel:mossy_cobblestone/braid',
+			'chisel:mossy_cobblestone/dent',
+			'chisel:mossy_cobblestone/french_1',
+			'chisel:mossy_cobblestone/french_2',
+			'chisel:mossy_cobblestone/jellybean',
+			'chisel:mossy_cobblestone/layers',
+			'chisel:mossy_cobblestone/mosaic',
+			'chisel:mossy_cobblestone/ornate',
+			'chisel:mossy_cobblestone/panel',
+			'chisel:mossy_cobblestone/road',
+			'chisel:mossy_cobblestone/slanted',
+			'chisel:mossy_cobblestone/zag',
+			'chisel:mossy_cobblestone/circular',
+			'chisel:mossy_cobblestone/circularct',
+			'chisel:mossy_cobblestone/weaver',
+			'chisel:mossy_cobblestone/pillar',
+			'chisel:mossy_cobblestone/twisted',
+			'chisel:mossy_cobblestone/prism',
+			'chisel:mossy_cobblestone/cuts',
+			'chisel:mossy_cobblestone/extra/emboss',
+			'chisel:mossy_cobblestone/extra/indent',
+			'chisel:mossy_cobblestone/extra/marker'
+		],
+		onlyAsOutput: [],
+		onlyAsInput: []
+	},
+	{
+		name:'coal',
+		stones: [
+			'minecraft:coal_block',
+			'chisel:coal/cracked',
+			'chisel:coal/solid_bricks',
+			'chisel:coal/small_bricks',
+			'chisel:coal/soft_bricks',
+			'chisel:coal/cracked_bricks',
+			'chisel:coal/triple_bricks',
+			'chisel:coal/encased_bricks',
+			'chisel:coal/chaotic_bricks',
+			'chisel:coal/array',
+			'chisel:coal/tiles_medium',
+			'chisel:coal/tiles_large',
+			'chisel:coal/tiles_small',
+			'chisel:coal/chaotic_medium',
+			'chisel:coal/chaotic_small',
+			'chisel:coal/braid',
+			'chisel:coal/dent',
+			'chisel:coal/french_1',
+			'chisel:coal/french_2',
+			'chisel:coal/jellybean',
+			'chisel:coal/layers',
+			'chisel:coal/mosaic',
+			'chisel:coal/ornate',
+			'chisel:coal/panel',
+			'chisel:coal/road',
+			'chisel:coal/slanted',
+			'chisel:coal/zag',
+			'chisel:coal/circular',
+			'chisel:coal/circularct',
+			'chisel:coal/weaver',
+			'chisel:coal/pillar',
+			'chisel:coal/twisted',
+			'chisel:coal/prism',
+			'chisel:coal/cuts'
+		],
+		onlyAsOutput: [],
+		onlyAsInput: []
+	},
+	{
+		name:'chisel_charcoal', //Recipe only costs 1 charcoal so can't also add storage blocks to this
+		stones: [
+			'chisel:charcoal/raw',
+			'chisel:charcoal/cracked',
+			'chisel:charcoal/solid_bricks',
+			'chisel:charcoal/small_bricks',
+			'chisel:charcoal/soft_bricks',
+			'chisel:charcoal/cracked_bricks',
+			'chisel:charcoal/triple_bricks',
+			'chisel:charcoal/encased_bricks',
+			'chisel:charcoal/chaotic_bricks',
+			'chisel:charcoal/array',
+			'chisel:charcoal/tiles_medium',
+			'chisel:charcoal/tiles_large',
+			'chisel:charcoal/tiles_small',
+			'chisel:charcoal/chaotic_medium',
+			'chisel:charcoal/chaotic_small',
+			'chisel:charcoal/braid',
+			'chisel:charcoal/dent',
+			'chisel:charcoal/french_1',
+			'chisel:charcoal/french_2',
+			'chisel:charcoal/jellybean',
+			'chisel:charcoal/layers',
+			'chisel:charcoal/mosaic',
+			'chisel:charcoal/ornate',
+			'chisel:charcoal/panel',
+			'chisel:charcoal/road',
+			'chisel:charcoal/slanted',
+			'chisel:charcoal/zag',
+			'chisel:charcoal/circular',
+			'chisel:charcoal/circularct',
+			'chisel:charcoal/weaver',
+			'chisel:charcoal/pillar',
+			'chisel:charcoal/twisted',
+			'chisel:charcoal/prism',
+			'chisel:charcoal/cuts'
+		],
+		onlyAsOutput: [],
+		onlyAsInput: []
+	},
+	{
+		name:'bronze',
+		stones:[
+			'emendatusenigmatica:bronze_block',
+			'thermal:bronze_block',
+			'mekanism:block_bronze',
+			'chisel:metals/bronze/caution',
+			'chisel:metals/bronze/crate',
+			'chisel:metals/bronze/thermal',
+			'chisel:metals/bronze/machine',
+			'chisel:metals/bronze/badgreggy',
+			'chisel:metals/bronze/bolted',
+			'chisel:metals/bronze/scaffold',
+		],
+		onlyAsOutput: [],
+		onlyAsInput: []
+	},
+	{
+		name:'bricks',
+		stones:[
+			'minecraft:bricks',
+			'chisel:bricks/cracked',
+			'chisel:bricks/solid_bricks',
+			'chisel:bricks/small_bricks',
+			'chisel:bricks/soft_bricks',
+			'chisel:bricks/cracked_bricks',
+			'chisel:bricks/triple_bricks',
+			'chisel:bricks/encased_bricks',
+			'chisel:bricks/chaotic_bricks',
+			'chisel:bricks/array',
+			'chisel:bricks/tiles_medium',
+			'chisel:bricks/tiles_large',
+			'chisel:bricks/tiles_small',
+			'chisel:bricks/chaotic_medium',
+			'chisel:bricks/chaotic_small',
+			'chisel:bricks/braid',
+			'chisel:bricks/dent',
+			'chisel:bricks/french_1',
+			'chisel:bricks/french_2',
+			'chisel:bricks/jellybean',
+			'chisel:bricks/layers',
+			'chisel:bricks/mosaic',
+			'chisel:bricks/ornate',
+			'chisel:bricks/panel',
+			'chisel:bricks/road',
+			'chisel:bricks/slanted',
+			'chisel:bricks/zag',
+			'chisel:bricks/circular',
+			'chisel:bricks/circularct',
+			'chisel:bricks/weaver',
+			'chisel:bricks/pillar',
+			'chisel:bricks/twisted',
+			'chisel:bricks/prism',
+			'chisel:bricks/cuts'
+		],
+		onlyAsOutput: [],
+		onlyAsInput: []
+	},
+	{
+		name:'antiblock',
+		stones: [
+			'chisel:antiblock/white',
+			'chisel:antiblock/orange',
+			'chisel:antiblock/magenta',
+			'chisel:antiblock/light_blue',
+			'chisel:antiblock/yellow',
+			'chisel:antiblock/lime',
+			'chisel:antiblock/pink',
+			'chisel:antiblock/gray',
+			'chisel:antiblock/light_gray',
+			'chisel:antiblock/cyan',
+			'chisel:antiblock/purple',
+			'chisel:antiblock/blue',
+			'chisel:antiblock/brown',
+			'chisel:antiblock/green',
+			'chisel:antiblock/red',
+			'chisel:antiblock/black',
+		],
+		onlyAsOutput: [],
+		onlyAsInput: []
+	},
+	{
+		name: "aluminum_block",
+		stones: [
+			'emendatusenigmatica:aluminum_block',
+			'immersiveengineering:storage_aluminum',
+			'chisel:metals/aluminum/caution',
+			'chisel:metals/aluminum/crate',
+			'chisel:metals/aluminum/thermal',
+			'chisel:metals/aluminum/machine',
+			'chisel:metals/aluminum/badgreggy',
+			'chisel:metals/aluminum/bolted',
+			'chisel:metals/aluminum/scaffold'
+		],
+		onlyAsOutput: [],
+		onlyAsInput: []
+	},
+	{
+		name: 'redstone_block',
+		stones [
+			'minecraft:redstone_block',
+			'chisel:redstone/cracked',
+			'chisel:redstone/solid_bricks',
+			'chisel:redstone/small_bricks',
+			'chisel:redstone/soft_bricks',
+			'chisel:redstone/cracked_bricks',
+			'chisel:redstone/triple_bricks',
+			'chisel:redstone/encased_bricks',
+			'chisel:redstone/chaotic_bricks',
+			'chisel:redstone/array',
+			'chisel:redstone/tiles_medium',
+			'chisel:redstone/tiles_large',
+			'chisel:redstone/tiles_small',
+			'chisel:redstone/chaotic_medium',
+			'chisel:redstone/chaotic_small',
+			'chisel:redstone/braid',
+			'chisel:redstone/dent',
+			'chisel:redstone/french_1',
+			'chisel:redstone/french_2',
+			'chisel:redstone/jellybean',
+			'chisel:redstone/layers',
+			'chisel:redstone/mosaic',
+			'chisel:redstone/ornate',
+			'chisel:redstone/panel',
+			'chisel:redstone/road',
+			'chisel:redstone/slanted',
+			'chisel:redstone/zag',
+			'chisel:redstone/circular',
+			'chisel:redstone/circularct',
+			'chisel:redstone/weaver',
+			'chisel:redstone/pillar',
+			'chisel:redstone/twisted',
+			'chisel:redstone/prism',
+			'chisel:redstone/cuts'
+		],
+		onlyAsOutput: [],
+		onlyAsInput: []
+	}
 ];
 
 let chippedTypes = ['wool', 'carpet', 'stained_glass', 'stained_glass_pane', 'terracotta', 'concrete'];
@@ -1751,7 +2571,12 @@ chippedTypes.forEach((chippedType) => {
         for (i = 1; i <= indexLength; i++) {
             stones.push(`chipped:${color}_${chippedType}_${i}`);
         }
-
+		//@Chisel
+		if(['wool','carpet'].includes(chippedType)) {
+			stones.push(`chisel:${chippedType}/${color}/llama`);
+			stones.push(`chisel:${chippedType}/${color}/legacy`);
+		}
+		//
         stonecuttables.push({
             name: `${color}_${chippedType}`,
             stones: stones,
@@ -1760,3 +2585,34 @@ chippedTypes.forEach((chippedType) => {
         });
     });
 });
+
+
+let chiselStoneTypes = ["cracked","solid_bricks","small_bricks","soft_bricks","cracked_bricks","triple_bricks","encased_bricks","chaotic_bricks","array","tiles_medium","tiles_large","tiles_small","chaotic_medium","chaotic_small","braid","dent","french_1","french_2","jellybean","layers","mosaic","ornate","panel","road","slanted","zag","circular","circularct","weaver","pillar","twisted","prism","cuts"];
+colors.forEach((color) => { // @Chisel concrete
+	let stonecuttablesIndex = stonecuttables.findIndex((obj) => {return obj.name == `${color}_concrete`;});
+	if(stonecuttablesIndex > -1) {
+		let stones = stonecuttables[stonecuttablesIndex].stones;
+		chiselStoneTypes.forEach( (chiselStoneType) => {
+			stones.push(`chisel:concrete/${color}/${chiselStoneType}`);
+		});
+	}
+});
+
+// @Chisel Planks
+chiselPlankTypes = ['oak','spruce','birch','acacia','jungle','dark_oak'];
+chiselPlankVariants = ['large_planks','crude_horizontal_planks','vertical_planks','crude_vertical_planks','encased_planks','encased_large_planks','braced_planks','shipping_crate','paneling','crude_paneling','stacked','smooth','encased_smooth','braid','log_cabin']
+chiselPlankTypes.forEach( (chiselPlankType) => {
+	let stones = [`minecraft:${chiselPlankType}_planks`];
+	chiselPlankVariants.forEach( (chiselPlankVariant) => {
+		stones.push(`chisel:planks/${chiselPlankType}/${chiselPlankVariant}`);
+	});
+	stonecuttables.push({
+		name: `${chiselPlankType}`,
+		stones: stones,
+		onlyAsOutput: [],
+		onlyAsInput: []
+	});
+});
+
+
+

From cdb75700ac20f9e6d037a280971fafad5f4c7e12 Mon Sep 17 00:00:00 2001
From: Iris <48930896+Iris-xii@users.noreply.github.com>
Date: Tue, 26 Oct 2021 02:53:00 +0200
Subject: [PATCH 069/130] Update stonecuttables.js

Uhh yeah.
---
 .../enigmatica/kubejs/constants/stonecuttables.js             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js b/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
index 36aa588d2d..bf0b2f1c7f 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
@@ -2517,7 +2517,7 @@ const stonecuttables = [
 	},
 	{
 		name: 'redstone_block',
-		stones [
+		stones: [
 			'minecraft:redstone_block',
 			'chisel:redstone/cracked',
 			'chisel:redstone/solid_bricks',
@@ -2600,7 +2600,7 @@ colors.forEach((color) => { // @Chisel concrete
 
 // @Chisel Planks
 chiselPlankTypes = ['oak','spruce','birch','acacia','jungle','dark_oak'];
-chiselPlankVariants = ['large_planks','crude_horizontal_planks','vertical_planks','crude_vertical_planks','encased_planks','encased_large_planks','braced_planks','shipping_crate','paneling','crude_paneling','stacked','smooth','encased_smooth','braid','log_cabin']
+chiselPlankVariants = ['large_planks','crude_horizontal_planks','vertical_planks','crude_vertical_planks','encased_planks','encased_large_planks','braced_planks','shipping_crate','paneling','crude_paneling','stacked','smooth','encased_smooth','braid','log_cabin'];
 chiselPlankTypes.forEach( (chiselPlankType) => {
 	let stones = [`minecraft:${chiselPlankType}_planks`];
 	chiselPlankVariants.forEach( (chiselPlankVariant) => {

From 3ffa31e3859747e7a0d3655989a8c33306fc6a1a Mon Sep 17 00:00:00 2001
From: Iris <48930896+Iris-xii@users.noreply.github.com>
Date: Tue, 26 Oct 2021 02:58:49 +0200
Subject: [PATCH 070/130] Update stonecuttables.js

Removing the ones that don't actually exist
---
 .../enigmatica/kubejs/constants/stonecuttables.js          | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js b/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
index bf0b2f1c7f..562838e4db 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
@@ -2526,7 +2526,6 @@ const stonecuttables = [
 			'chisel:redstone/cracked_bricks',
 			'chisel:redstone/triple_bricks',
 			'chisel:redstone/encased_bricks',
-			'chisel:redstone/chaotic_bricks',
 			'chisel:redstone/array',
 			'chisel:redstone/tiles_medium',
 			'chisel:redstone/tiles_large',
@@ -2544,14 +2543,10 @@ const stonecuttables = [
 			'chisel:redstone/panel',
 			'chisel:redstone/road',
 			'chisel:redstone/slanted',
-			'chisel:redstone/zag',
 			'chisel:redstone/circular',
-			'chisel:redstone/circularct',
-			'chisel:redstone/weaver',
 			'chisel:redstone/pillar',
 			'chisel:redstone/twisted',
-			'chisel:redstone/prism',
-			'chisel:redstone/cuts'
+			'chisel:redstone/prism'
 		],
 		onlyAsOutput: [],
 		onlyAsInput: []

From c2111003a03c70cb852818c00802d3d508f252fd Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Mon, 25 Oct 2021 21:58:13 -0400
Subject: [PATCH 071/130] machine updates

---
 .../enigmatica/kubejs/base/recipes/remove.js  |   3 +
 .../thermal/machine/induction_smelter.js      |   8 --
 .../astralsorcery/altar/altar_3_iridescent.js |  37 ++++++
 .../dissolution_chamber.js                    |  10 ++
 .../mekanism/metallurgic_infusing.js          |   7 ++
 .../expert/recipetypes/mekanism/shaped.js     | 107 ++++++++++++++++++
 .../thermal/machine/induction_smelter.js      |   8 ++
 7 files changed, 172 insertions(+), 8 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
index af50f33d3e..9b0195e753 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
@@ -147,6 +147,9 @@ onEvent('recipes', (event) => {
         'mekanism:processing/bronze/dust/from_infusing',
         'mekanism:processing/bronze/ingot/from_infusing',
         'mekanism:processing/lapis_lazuli/from_ore',
+        'mekanism:processing/refined_glowstone/ingot_to_dust',
+        'mekanism:processing/refined_obsidian/dust/from_ingot',
+        'mekanism:osmium_compressor',
 
         'minecraft:crystal_glass',
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/induction_smelter.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/induction_smelter.js
index 2320a8a5f2..6d68b824e4 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/induction_smelter.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/induction_smelter.js
@@ -65,14 +65,6 @@ onEvent('recipes', (event) => {
                 inputs: ['#forge:ingots/netherite', 'betterendforge:terminite_ingot'],
                 outputs: [Item.of('betterendforge:aeternium_ingot')]
             },
-            {
-                inputs: ['#forge:dusts/refined_obsidian', '#forge:ingots/osmium'],
-                outputs: [Item.of('mekanism:ingot_refined_obsidian')]
-            },
-            {
-                inputs: ['#forge:dusts/glowstone', '#forge:ingots/osmium'],
-                outputs: [Item.of('mekanism:ingot_refined_glowstone')]
-            },
             {
                 inputs: ['byg:quartzite_sand'],
                 outputs: [Item.of('minecraft:quartz'), Item.of('thermal:slag')]
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/astralsorcery/altar/altar_3_iridescent.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/astralsorcery/altar/altar_3_iridescent.js
index 2951bdea31..fb89058f74 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/astralsorcery/altar/altar_3_iridescent.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/astralsorcery/altar/altar_3_iridescent.js
@@ -385,6 +385,43 @@ onEvent('recipes', (event) => {
                 'astralsorcery:built_in_effect_attunement_sparkle'
             ],
             id: `${id_prefix}gaia_spreader`
+        },
+        {
+            output: Item.of('2x mekanism:solar_neutron_activator'),
+            altar_type: 3,
+            duration: 720,
+            starlight: 7500,
+            pattern: ['A___A', 'BAAAB', 'CBBBC', '_CCC_', 'DEFED'],
+            key: {
+                A: { item: 'kubejs:observatory_lens' },
+                B: { item: 'powah:solar_panel_niotic' },
+                C: { item: 'mekanism:hdpe_sheet' },
+                D: { tag: 'forge:plates/enderium' },
+                E: { tag: 'forge:circuits/elite' },
+                F: { tag: 'industrialforegoing:machine_frame/advanced' }
+            },
+            focus_constellation: 'astralsorcery:horologium',
+            relay_inputs: [
+                { item: 'astralsorcery:stardust' },
+                { tag: 'forge:dusts/end_stone' },
+                { tag: 'forge:dusts/iesnium' },
+                { item: 'astralsorcery:stardust' },
+                { tag: 'forge:dusts/end_stone' },
+                { tag: 'forge:dusts/iesnium' }
+            ],
+            effects: [
+                'astralsorcery:built_in_effect_constellation_finish',
+                'astralsorcery:built_in_effect_trait_relay_highlight',
+                'astralsorcery:built_in_effect_discovery_central_beam',
+                'astralsorcery:built_in_effect_trait_focus_circle',
+                'astralsorcery:focus_dust_swirl',
+                'astralsorcery:focus_edge',
+                'astralsorcery:altar_focus_sparkle',
+                'astralsorcery:altar_default_sparkle',
+                'astralsorcery:built_in_effect_constellation_lines',
+                'astralsorcery:built_in_effect_attunement_sparkle'
+            ],
+            id: 'mekanism:solar_neutron_activator'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
index b6c66b3251..9f42358b53 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
@@ -355,6 +355,16 @@ onEvent('recipes', (event) => {
             outputFluid: '',
             outputFluidAmount: 0,
             id: 'mekanismgenerators:fission_reactor/casing'
+        },
+        {
+            inputs: ['#forge:ingots/lumium'],
+            inputFluid: 'thermal:glowstone',
+            inputFluidAmount: 250,
+            processingTime: 100,
+            outputItem: { item: 'mekanism:ingot_refined_glowstone', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:processing/refined_glowstone/ingot/from_dust'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js
index f51cfd1bf3..fd7f242243 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/metallurgic_infusing.js
@@ -31,6 +31,13 @@ onEvent('recipes', (event) => {
             infusionInput: 'mekanism:diamond',
             infusionAmount: 80,
             id: 'immersiveengineering:crafting/rockcutter'
+        },
+        {
+            output: 'mekanism:ingot_refined_obsidian',
+            input: '#forge:ingots/osmium',
+            infusionInput: 'mekanism:refined_obsidian',
+            infusionAmount: 160,
+            id: 'mekanism:processing/refined_obsidian/ingot/from_dust'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index 2bef9307e0..74d2c4dda7 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -513,6 +513,113 @@ onEvent('recipes', (event) => {
                 F: 'rftoolspower:cell2'
             },
             id: 'mekanism:purification_chamber'
+        },
+        {
+            output: 'mekanism:pressurized_reaction_chamber',
+            pattern: ['ABA', 'CDC', 'EFE'],
+            key: {
+                A: 'pneumaticcraft:pressure_chamber_glass',
+                B: 'mekanism:advanced_fluid_tank',
+                C: 'mekanism:advanced_chemical_tank',
+                D: '#industrialforegoing:machine_frame/advanced',
+                E: '#forge:circuits/advanced',
+                F: 'rftoolspower:cell2'
+            },
+            id: 'mekanism:pressurized_reaction_chamber'
+        },
+        {
+            output: 'mekanism:chemical_injection_chamber',
+            pattern: ['ABB', 'CDG', 'EFE'],
+            key: {
+                A: 'immersiveengineering:toolupgrade_chemthrower_focus',
+                B: 'mekanism:advanced_pressurized_tube',
+                C: 'create:basin',
+                D: '#industrialforegoing:machine_frame/advanced',
+                E: '#forge:circuits/advanced',
+                F: 'rftoolspower:cell2',
+                G: 'mekanism:advanced_chemical_tank'
+            },
+            id: 'mekanism:chemical_injection_chamber'
+        },
+        {
+            output: 'mekanism:chemical_crystallizer',
+            pattern: ['ABC', 'DEF', 'GHG'],
+            key: {
+                A: 'mekanism:advanced_pressurized_tube',
+                B: 'mekanismgenerators:saturating_condenser',
+                C: 'create:basin',
+                D: 'mekanism:advanced_chemical_tank',
+                E: '#industrialforegoing:machine_frame/advanced',
+                F: 'thermal:machine_chiller',
+                G: '#forge:circuits/advanced',
+                H: 'rftoolspower:cell2'
+            },
+            id: 'mekanism:chemical_crystallizer'
+        },
+        {
+            output: 'mekanism:isotopic_centrifuge',
+            pattern: ['ABA', 'CDC', 'EFE'],
+            key: {
+                A: 'resourcefulbees:elite_centrifuge_casing',
+                B: 'mekanism:elite_chemical_tank',
+                C: 'mekanismgenerators:reactor_glass',
+                D: 'resourcefulbees:elite_centrifuge_controller',
+                E: '#forge:circuits/elite',
+                F: 'rftoolspower:cell3'
+            },
+            id: 'mekanism:isotopic_centrifuge'
+        },
+        {
+            output: 'mekanism:chemical_oxidizer',
+            pattern: ['ABC', 'DEC', 'FGF'],
+            key: {
+                A: 'mekanism:elite_mechanical_pipe',
+                B: 'mekanism:electrolytic_separator',
+                C: 'mekanism:elite_pressurized_tube',
+                D: 'cookingforblockheads:sink',
+                E: 'mekanism:chemical_injection_chamber',
+                F: '#forge:circuits/elite',
+                G: 'rftoolspower:cell3'
+            },
+            id: 'mekanism:chemical_oxidizer'
+        },
+        {
+            output: 'mekanism:chemical_infuser',
+            pattern: ['ABA', 'BCB', 'DED'],
+            key: {
+                A: 'rftoolspower:blazing_agitator',
+                B: 'mekanism:elite_chemical_tank',
+                C: '#industrialforegoing:machine_frame/advanced',
+                D: '#forge:circuits/elite',
+                E: 'rftoolspower:cell3'
+            },
+            id: 'mekanism:chemical_infuser'
+        },
+        {
+            output: 'mekanism:chemical_dissolution_chamber',
+            pattern: ['ABB', 'CDB', 'EFE'],
+            key: {
+                A: 'mekanism:elite_chemical_tank',
+                B: 'mekanism:elite_pressurized_tube',
+                C: 'industrialforegoing:dissolution_chamber',
+                D: '#industrialforegoing:machine_frame/advanced',
+                E: '#forge:circuits/elite',
+                F: 'rftoolspower:cell3'
+            },
+            id: 'mekanism:chemical_dissolution_chamber'
+        },
+        {
+            output: 'mekanism:chemical_washer',
+            pattern: ['ABB', 'CDA', 'EFE'],
+            key: {
+                A: 'mekanism:ultimate_chemical_tank',
+                B: 'mekanism:ultimate_pressurized_tube',
+                C: 'mekanism:ultimate_fluid_tank',
+                D: '#industrialforegoing:machine_frame/supreme',
+                E: '#forge:circuits/ultimate',
+                F: 'mekanism:ultimate_induction_provider'
+            },
+            id: 'mekanism:chemical_washer'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/thermal/machine/induction_smelter.js b/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/thermal/machine/induction_smelter.js
index 16275e0e9f..6fb045e76d 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/thermal/machine/induction_smelter.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/thermal/machine/induction_smelter.js
@@ -8,6 +8,14 @@ onEvent('recipes', (event) => {
             {
                 inputs: ['#forge:ingots/enderium', Item.of('fluxnetworks:flux_dust', 8)],
                 outputs: [Item.of('compactmachines:wall', 32)]
+            },
+            {
+                inputs: ['#forge:dusts/refined_obsidian', '#forge:ingots/osmium'],
+                outputs: [Item.of('mekanism:ingot_refined_obsidian')]
+            },
+            {
+                inputs: ['#forge:dusts/glowstone', '#forge:ingots/osmium'],
+                outputs: [Item.of('mekanism:ingot_refined_glowstone')]
             }
         ]
     };

From edfb2ff262684377b3e14888a1f16f386ef40edd Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Mon, 25 Oct 2021 23:30:28 -0400
Subject: [PATCH 072/130] factory installers

---
 .../enigmatica/kubejs/base/recipes/remove.js  |   1 +
 .../recipetypes/mekanism/crafting_mek_data.js |  99 ---------------
 .../dissolution_chamber.js                    |  72 +++++++++++
 .../expert/recipetypes/mekanism/shaped.js     |  12 ++
 .../recipetypes/mekanism/crafting_mek_data.js | 117 ++++++++++++++++++
 5 files changed, 202 insertions(+), 99 deletions(-)
 create mode 100644 kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/mekanism/crafting_mek_data.js

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
index 9b0195e753..67f0635f24 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
@@ -150,6 +150,7 @@ onEvent('recipes', (event) => {
         'mekanism:processing/refined_glowstone/ingot_to_dust',
         'mekanism:processing/refined_obsidian/dust/from_ingot',
         'mekanism:osmium_compressor',
+        /mekanism:factory/,
 
         'minecraft:crystal_glass',
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/crafting_mek_data.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/crafting_mek_data.js
index 277d55e2ce..9d39853557 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/crafting_mek_data.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/crafting_mek_data.js
@@ -11,105 +11,6 @@ onEvent('recipes', (event) => {
             },
             id: 'mekanism:energy_cube/elite'
         },
-        {
-            output: 'mekanism:elite_combining_factory',
-            pattern: ['ACA', 'IPI', 'ACA'],
-            key: {
-                P: { item: 'mekanism:advanced_combining_factory' },
-                C: { tag: 'forge:circuits/elite' },
-                I: { tag: 'forge:ingots/gold_bronze' },
-                A: { tag: 'mekanism:alloys/reinforced' }
-            },
-            id: 'mekanism:factory/elite/combining'
-        },
-        {
-            output: 'mekanism:elite_enriching_factory',
-            pattern: ['ACA', 'IPI', 'ACA'],
-            key: {
-                P: { item: 'mekanism:advanced_enriching_factory' },
-                C: { tag: 'forge:circuits/elite' },
-                I: { tag: 'forge:ingots/gold_bronze' },
-                A: { tag: 'mekanism:alloys/reinforced' }
-            },
-            id: 'mekanism:factory/elite/enriching'
-        },
-        {
-            output: 'mekanism:elite_crushing_factory',
-            pattern: ['ACA', 'IPI', 'ACA'],
-            key: {
-                P: { item: 'mekanism:advanced_crushing_factory' },
-                C: { tag: 'forge:circuits/elite' },
-                I: { tag: 'forge:ingots/gold_bronze' },
-                A: { tag: 'mekanism:alloys/reinforced' }
-            },
-            id: 'mekanism:factory/elite/crushing'
-        },
-        {
-            output: 'mekanism:elite_compressing_factory',
-            pattern: ['ACA', 'IPI', 'ACA'],
-            key: {
-                P: { item: 'mekanism:advanced_compressing_factory' },
-                C: { tag: 'forge:circuits/elite' },
-                I: { tag: 'forge:ingots/gold_bronze' },
-                A: { tag: 'mekanism:alloys/reinforced' }
-            },
-            id: 'mekanism:factory/elite/compressing'
-        },
-        {
-            output: 'mekanism:elite_smelting_factory',
-            pattern: ['ACA', 'IPI', 'ACA'],
-            key: {
-                P: { item: 'mekanism:advanced_smelting_factory' },
-                C: { tag: 'forge:circuits/elite' },
-                I: { tag: 'forge:ingots/gold_bronze' },
-                A: { tag: 'mekanism:alloys/reinforced' }
-            },
-            id: 'mekanism:factory/elite/smelting'
-        },
-        {
-            output: 'mekanism:elite_sawing_factory',
-            pattern: ['ACA', 'IPI', 'ACA'],
-            key: {
-                P: { item: 'mekanism:advanced_sawing_factory' },
-                C: { tag: 'forge:circuits/elite' },
-                I: { tag: 'forge:ingots/gold_bronze' },
-                A: { tag: 'mekanism:alloys/reinforced' }
-            },
-            id: 'mekanism:factory/elite/sawing'
-        },
-        {
-            output: 'mekanism:elite_purifying_factory',
-            pattern: ['ACA', 'IPI', 'ACA'],
-            key: {
-                P: { item: 'mekanism:advanced_purifying_factory' },
-                C: { tag: 'forge:circuits/elite' },
-                I: { tag: 'forge:ingots/gold_bronze' },
-                A: { tag: 'mekanism:alloys/reinforced' }
-            },
-            id: 'mekanism:factory/elite/purifying'
-        },
-        {
-            output: 'mekanism:elite_injecting_factory',
-            pattern: ['ACA', 'IPI', 'ACA'],
-            key: {
-                P: { item: 'mekanism:advanced_injecting_factory' },
-                C: { tag: 'forge:circuits/elite' },
-                I: { tag: 'forge:ingots/gold_bronze' },
-                A: { tag: 'mekanism:alloys/reinforced' }
-            },
-            id: 'mekanism:factory/elite/injecting'
-        },
-        {
-            output: 'mekanism:elite_infusing_factory',
-            pattern: ['ACA', 'IPI', 'ACA'],
-            key: {
-                P: { item: 'mekanism:advanced_infusing_factory' },
-                C: { tag: 'forge:circuits/elite' },
-                I: { tag: 'forge:ingots/gold_bronze' },
-                A: { tag: 'mekanism:alloys/reinforced' }
-            },
-            id: 'mekanism:factory/elite/infusing'
-        },
         {
             output: 'mekanism:basic_fluid_tank',
             pattern: ['AIA', 'I I', 'AIA'],
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
index 9f42358b53..e51d6fa743 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/dissolution_chamber.js
@@ -365,6 +365,78 @@ onEvent('recipes', (event) => {
             outputFluid: '',
             outputFluidAmount: 0,
             id: 'mekanism:processing/refined_glowstone/ingot/from_dust'
+        },
+        {
+            inputs: [
+                '#forge:circuits/basic',
+                'mekanism:module_base',
+                '#forge:circuits/basic',
+                '#forge:ingots/refined_obsidian',
+                '#forge:ingots/refined_obsidian',
+                '#forge:ingots/refined_glowstone',
+                '#forge:ingots/refined_glowstone'
+            ],
+            inputFluid: 'industrialforegoing:latex',
+            inputFluidAmount: 250,
+            processingTime: 100,
+            outputItem: { item: 'mekanism:basic_tier_installer', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:tier_installer/basic'
+        },
+        {
+            inputs: [
+                '#forge:circuits/advanced',
+                'mekanism:module_base',
+                '#forge:circuits/advanced',
+                '#forge:ingots/refined_obsidian',
+                '#forge:ingots/refined_obsidian',
+                '#forge:ingots/refined_glowstone',
+                '#forge:ingots/refined_glowstone'
+            ],
+            inputFluid: 'mekanism:lithium',
+            inputFluidAmount: 250,
+            processingTime: 100,
+            outputItem: { item: 'mekanism:advanced_tier_installer', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:tier_installer/advanced'
+        },
+        {
+            inputs: [
+                '#forge:circuits/elite',
+                'mekanism:module_base',
+                '#forge:circuits/elite',
+                '#forge:ingots/refined_obsidian',
+                '#forge:ingots/refined_obsidian',
+                '#forge:ingots/refined_glowstone',
+                '#forge:ingots/refined_glowstone'
+            ],
+            inputFluid: 'industrialforegoing:ether_gas',
+            inputFluidAmount: 250,
+            processingTime: 100,
+            outputItem: { item: 'mekanism:elite_tier_installer', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:tier_installer/elite'
+        },
+        {
+            inputs: [
+                '#forge:circuits/ultimate',
+                'mekanism:module_base',
+                '#forge:circuits/ultimate',
+                '#forge:ingots/refined_obsidian',
+                '#forge:ingots/refined_obsidian',
+                '#forge:ingots/refined_glowstone',
+                '#forge:ingots/refined_glowstone'
+            ],
+            inputFluid: 'kubejs:pink_ender_slime',
+            inputFluidAmount: 250,
+            processingTime: 100,
+            outputItem: { item: 'mekanism:ultimate_tier_installer', count: 1 },
+            outputFluid: '',
+            outputFluidAmount: 0,
+            id: 'mekanism:tier_installer/ultimate'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index 74d2c4dda7..7526f98ae0 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -620,6 +620,18 @@ onEvent('recipes', (event) => {
                 F: 'mekanism:ultimate_induction_provider'
             },
             id: 'mekanism:chemical_washer'
+        },
+        {
+            output: 'mekanism:antiprotonic_nucleosynthesizer',
+            pattern: ['ABA', 'CDC', 'EBE'],
+            key: {
+                A: '#forge:pellets/antimatter',
+                B: '#forge:circuits/ultimate',
+                C: 'mekanism:supercharged_coil',
+                D: 'mekanism:sps_casing',
+                E: 'mekanism:ultimate_induction_provider'
+            },
+            id: 'mekanism:antiprotonic_nucleosynthesizer'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/mekanism/crafting_mek_data.js b/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/mekanism/crafting_mek_data.js
new file mode 100644
index 0000000000..080a87b8ea
--- /dev/null
+++ b/kubejs/server_scripts/enigmatica/kubejs/normal/recipetypes/mekanism/crafting_mek_data.js
@@ -0,0 +1,117 @@
+onEvent('recipes', (event) => {
+    if (global.isNormalMode == false) {
+        return;
+    }
+
+    const recipes = [
+        {
+            output: 'mekanism:elite_combining_factory',
+            pattern: ['ACA', 'IPI', 'ACA'],
+            key: {
+                P: { item: 'mekanism:advanced_combining_factory' },
+                C: { tag: 'forge:circuits/elite' },
+                I: { tag: 'forge:ingots/gold_bronze' },
+                A: { tag: 'mekanism:alloys/reinforced' }
+            },
+            id: 'mekanism:factory/elite/combining'
+        },
+        {
+            output: 'mekanism:elite_enriching_factory',
+            pattern: ['ACA', 'IPI', 'ACA'],
+            key: {
+                P: { item: 'mekanism:advanced_enriching_factory' },
+                C: { tag: 'forge:circuits/elite' },
+                I: { tag: 'forge:ingots/gold_bronze' },
+                A: { tag: 'mekanism:alloys/reinforced' }
+            },
+            id: 'mekanism:factory/elite/enriching'
+        },
+        {
+            output: 'mekanism:elite_crushing_factory',
+            pattern: ['ACA', 'IPI', 'ACA'],
+            key: {
+                P: { item: 'mekanism:advanced_crushing_factory' },
+                C: { tag: 'forge:circuits/elite' },
+                I: { tag: 'forge:ingots/gold_bronze' },
+                A: { tag: 'mekanism:alloys/reinforced' }
+            },
+            id: 'mekanism:factory/elite/crushing'
+        },
+        {
+            output: 'mekanism:elite_compressing_factory',
+            pattern: ['ACA', 'IPI', 'ACA'],
+            key: {
+                P: { item: 'mekanism:advanced_compressing_factory' },
+                C: { tag: 'forge:circuits/elite' },
+                I: { tag: 'forge:ingots/gold_bronze' },
+                A: { tag: 'mekanism:alloys/reinforced' }
+            },
+            id: 'mekanism:factory/elite/compressing'
+        },
+        {
+            output: 'mekanism:elite_smelting_factory',
+            pattern: ['ACA', 'IPI', 'ACA'],
+            key: {
+                P: { item: 'mekanism:advanced_smelting_factory' },
+                C: { tag: 'forge:circuits/elite' },
+                I: { tag: 'forge:ingots/gold_bronze' },
+                A: { tag: 'mekanism:alloys/reinforced' }
+            },
+            id: 'mekanism:factory/elite/smelting'
+        },
+        {
+            output: 'mekanism:elite_sawing_factory',
+            pattern: ['ACA', 'IPI', 'ACA'],
+            key: {
+                P: { item: 'mekanism:advanced_sawing_factory' },
+                C: { tag: 'forge:circuits/elite' },
+                I: { tag: 'forge:ingots/gold_bronze' },
+                A: { tag: 'mekanism:alloys/reinforced' }
+            },
+            id: 'mekanism:factory/elite/sawing'
+        },
+        {
+            output: 'mekanism:elite_purifying_factory',
+            pattern: ['ACA', 'IPI', 'ACA'],
+            key: {
+                P: { item: 'mekanism:advanced_purifying_factory' },
+                C: { tag: 'forge:circuits/elite' },
+                I: { tag: 'forge:ingots/gold_bronze' },
+                A: { tag: 'mekanism:alloys/reinforced' }
+            },
+            id: 'mekanism:factory/elite/purifying'
+        },
+        {
+            output: 'mekanism:elite_injecting_factory',
+            pattern: ['ACA', 'IPI', 'ACA'],
+            key: {
+                P: { item: 'mekanism:advanced_injecting_factory' },
+                C: { tag: 'forge:circuits/elite' },
+                I: { tag: 'forge:ingots/gold_bronze' },
+                A: { tag: 'mekanism:alloys/reinforced' }
+            },
+            id: 'mekanism:factory/elite/injecting'
+        },
+        {
+            output: 'mekanism:elite_infusing_factory',
+            pattern: ['ACA', 'IPI', 'ACA'],
+            key: {
+                P: { item: 'mekanism:advanced_infusing_factory' },
+                C: { tag: 'forge:circuits/elite' },
+                I: { tag: 'forge:ingots/gold_bronze' },
+                A: { tag: 'mekanism:alloys/reinforced' }
+            },
+            id: 'mekanism:factory/elite/infusing'
+        }
+    ];
+    recipes.forEach((recipe) => {
+        event
+            .custom({
+                type: 'mekanism:mek_data',
+                result: Item.of(recipe.output).toJson(),
+                pattern: recipe.pattern,
+                key: recipe.key
+            })
+            .id(recipe.id);
+    });
+});

From e81457f21a1bba439e885d95f29b19b4000841c4 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Mon, 25 Oct 2021 23:39:56 -0400
Subject: [PATCH 073/130] Update shaped.js

---
 .../kubejs/expert/recipetypes/mekanism/shaped.js       | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index 7526f98ae0..708df2e52d 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -632,6 +632,16 @@ onEvent('recipes', (event) => {
                 E: 'mekanism:ultimate_induction_provider'
             },
             id: 'mekanism:antiprotonic_nucleosynthesizer'
+        },
+        {
+            output: 'mekanismgenerators:heat_generator',
+            pattern: ['ABA', 'BCB', 'ABA'],
+            key: {
+                A: 'immersiveengineering:blastbrick_reinforced',
+                B: 'powah:thermoelectric_plate',
+                C: 'minecraft:blast_furnace'
+            },
+            id: 'mekanismgenerators:generator/heat'
         }
     ];
 

From 2e72fa08f4a040cc7100480994c909b6d263dd76 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Tue, 26 Oct 2021 11:07:08 +0200
Subject: [PATCH 074/130] Allow for thermal latex processing inside IF
 questline

---
 .../quests/chapters/industrial_foregoing.snbt | 51 ++++++++++++++++---
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git a/config/ftbquests/quests/chapters/industrial_foregoing.snbt b/config/ftbquests/quests/chapters/industrial_foregoing.snbt
index b9a5cbeb05..9d236a7a2e 100644
--- a/config/ftbquests/quests/chapters/industrial_foregoing.snbt
+++ b/config/ftbquests/quests/chapters/industrial_foregoing.snbt
@@ -32,11 +32,34 @@
 			description: ["The Fluid Extractor, shockingly, extracts fluid. Place one facing a log block, and it will slowly break down the log while producing Latex. Power is optional, but speeds up the process by a factor of 2.5. Acacia logs give the best yield."]
 			dependencies: ["000000000000004D"]
 			id: "000000000000004B"
-			tasks: [{
-				id: "000000000000004C"
-				type: "item"
-				item: "industrialforegoing:fluid_extractor"
-			}]
+			tasks: [
+				{
+					id: "000000000000004C"
+					type: "item"
+					title: "Fluid Extractor"
+					item: {
+						id: "itemfilters:or"
+						Count: 1b
+						tag: {
+							items: [
+								{
+									id: "industrialforegoing:fluid_extractor"
+									Count: 1b
+								}
+								{
+									id: "thermal:device_tree_extractor"
+									Count: 1b
+								}
+							]
+						}
+					}
+				}
+				{
+					id: "0B47FFE60566FFBB"
+					type: "item"
+					item: "thermal:device_tree_extractor"
+				}
+			]
 			rewards: [
 				{
 					id: "0000000000000628"
@@ -83,7 +106,23 @@
 			tasks: [{
 				id: "0000000000000050"
 				type: "item"
-				item: "industrialforegoing:latex_processing_unit"
+				title: "Latex Processing Unit"
+				item: {
+					id: "itemfilters:or"
+					Count: 1b
+					tag: {
+						items: [
+							{
+								id: "industrialforegoing:latex_processing_unit"
+								Count: 1b
+							}
+							{
+								id: "thermal:machine_refinery"
+								Count: 1b
+							}
+						]
+					}
+				}
 			}]
 			rewards: [{
 				id: "0000000000000629"

From b156f6e5e913296ab8e65ce09d598b2cf878ac98 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Tue, 26 Oct 2021 11:14:41 +0200
Subject: [PATCH 075/130] Remove remnant of trying to understand
 `itemfilters:or`

---
 config/ftbquests/quests/chapters/industrial_foregoing.snbt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/config/ftbquests/quests/chapters/industrial_foregoing.snbt b/config/ftbquests/quests/chapters/industrial_foregoing.snbt
index 9d236a7a2e..41aad450e4 100644
--- a/config/ftbquests/quests/chapters/industrial_foregoing.snbt
+++ b/config/ftbquests/quests/chapters/industrial_foregoing.snbt
@@ -54,11 +54,6 @@
 						}
 					}
 				}
-				{
-					id: "0B47FFE60566FFBB"
-					type: "item"
-					item: "thermal:device_tree_extractor"
-				}
 			]
 			rewards: [
 				{

From 85445363ea993d78d2c8513aa7eaba2e7bd91694 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Tue, 26 Oct 2021 11:15:44 -0400
Subject: [PATCH 076/130] pass the butter

---
 config/naturesstarlight-common-1.toml.bak     | 39 +++++++++++++++++++
 kubejs/assets/kubejs/lang/en_us.json          | 10 ++++-
 .../recipetypes/create/mechanical_crafting.js | 16 ++++++++
 .../expert/recipetypes/mekanism/shaped.js     |  4 +-
 .../expert/recipetypes/occultism/ritual.js    | 25 ++++++++++++
 kubejs/startup_scripts/item_registry.js       |  3 +-
 6 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 config/naturesstarlight-common-1.toml.bak

diff --git a/config/naturesstarlight-common-1.toml.bak b/config/naturesstarlight-common-1.toml.bak
new file mode 100644
index 0000000000..ef6ae1419f
--- /dev/null
+++ b/config/naturesstarlight-common-1.toml.bak
@@ -0,0 +1,39 @@
+#The amount of aura that the crystal generator generates per crystal growth
+crystalGeneratorAura = 30000
+#The maximum amount of starlight that is added around the powder of starry skies
+starlightEffectAddedStarlight = 0.6
+#The amount of aura that the powder of starry skies drains per second
+starlightEffectAuraDrain = 400
+
+[constellation]
+
+	[constellation.effect]
+
+		[constellation.effect.naritis]
+			#Set this to false to disable this ritual effect
+			enabled = true
+			#Defines the radius (in blocks) in which the ritual will do its effects.
+			#Range: 1.0 ~ 512.0
+			range = 5.0
+			#Defines the increase in radius the ritual will get per active lens enhancing the ritual.
+			#Range: 0.0 ~ 128.0
+			rangePerLens = 2.5
+			#Defines the amount of aura that this ritual generates per tick by default
+			auraPerTick = 350
+			#Defines the amount of aura the corrupted version of this ritual drains per tick by default
+			auraDrainPerTick = 75
+			#Defines the factor that the corrupted version of this ritual increases aura generation in the area by
+			auraGenIncreaseFactor = 2.5
+			#The enchantments that can be applied using stellar refraction, along with the minimum and maximum applied levels
+			engravingEnchantments = ["naturesaura:aura_mending, 1, 1", "minecraft:silk_touch, 1, 1", "minecraft:efficiency, 5, 6", "minecraft:thorns, 4, 6"]
+
+	[constellation.mantle]
+
+		[constellation.mantle.naritis]
+			#Set this to false to disable this mantle effect
+			enabled = true
+			#The amount of aura that one unit of charge creates
+			chargeToAuraRatio = 0.01
+			#The amount of charge that is converted into aura per second
+			chargeConvertedPerSecond = 6000.0
+
diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json
index e95b14e4b7..e04571283e 100644
--- a/kubejs/assets/kubejs/lang/en_us.json
+++ b/kubejs/assets/kubejs/lang/en_us.json
@@ -25,6 +25,7 @@
     "item.kubejs.red_nether_brick": "Red Nether Brick",
     "item.kubejs.ground_meat": "Ground Meat",
     "item.kubejs.amadron_survey_tools": "Amadron Survey Tools",
+    "block.kubejs.firmament": "Firmament",
 
     "item.kubejs.memory_basic_empty": "Prepared Basic Memory Chip",
     "item.kubejs.memory_basic_filled": "Basic Memory Chip",
@@ -54,7 +55,7 @@
     "item.bloodmagic.soulshovel.occultism_spirit_tooltip": "%s is bound to this shovel.",
     "item.bloodmagic.soulscythe.occultism_spirit_tooltip": "%s is bound to this scythe.",
     "item.integrateddynamics.logic_director.occultism_spirit_tooltip": "%s is bound to this logic director.",
-    "block.kubejs.firmament": "Firmament",
+    "item.mekanism.robit.occultism_spirit_tooltip": "%s is bound to this robit.",
 
     "item.kubejs.quintuple_alfsteel_ingot": "Quintuple Alfsteel Ingot",
 
@@ -160,6 +161,13 @@
     "ritual.enigmatica.occultism/ritual/logic_director.interrupted": "Binding of djinni interrupted.",
     "ritual.enigmatica.occultism/ritual/logic_director.conditions": "Not all requirements for this ritual are met.",
 
+    "item.kubejs.craft_robit": "Ritual: Craft Sentient Robit.",
+    "item.kubejs.craft_robit.tooltip": "Binds a Foliot to perform to pilot the Robit.",
+    "ritual.enigmatica.occultism/ritual/robit.started": "What is my purpose?",
+    "ritual.enigmatica.occultism/ritual/robit.finished": "You pass the salt.",
+    "ritual.enigmatica.occultism/ritual/robit.interrupted": "Binding of foliot interrupted.",
+    "ritual.enigmatica.occultism/ritual/robit.conditions": "Not all requirements for this ritual are met.",
+
     "item.kubejs.suffused_aluminum": "Mana Suffused Aluminum Chunk",
     "item.kubejs.suffused_cloggrum": "Mana Suffused Cloggrum Chunk",
     "item.kubejs.suffused_cobalt": "Mana Suffused Cobalt Chunk",
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
index 9056e0a221..96f3af06c5 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
@@ -328,6 +328,22 @@ onEvent('recipes', (event) => {
                 I: 'rftoolsbase:tablet'
             },
             id: 'mekanismgenerators:reactor/controller'
+        },
+        {
+            output: 'mekanism:digital_miner',
+            pattern: ['AAAAA', 'BCDCB', 'EFGHE', 'AAAAA', 'II II'],
+            key: {
+                A: '#forge:sheetmetals/steel',
+                B: 'pneumaticcraft:smart_chest',
+                C: 'integrateddynamics:part_display_panel',
+                D: 'rftoolsbase:tablet',
+                E: 'integratedtunnels:part_importer_energy',
+                F: 'rftoolsutility:matter_transmitter',
+                G: 'mekanism:robit',
+                H: 'rftoolsutility:matter_receiver',
+                I: 'engineersdecor:thick_steel_pole_head'
+            },
+            id: 'mekanism:digital_miner'
         }
     ];
 
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index 708df2e52d..fa1b73b3d9 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -22,7 +22,7 @@ onEvent('recipes', (event) => {
             pattern: ['BAB', 'CDC', 'BAB'],
             key: {
                 A: '#forge:plates/copper',
-                B: 'engineersdecor:clinker_brick_block',
+                B: 'immersiveengineering:alloybrick',
                 C: 'environmental:kiln',
                 D: 'thermal:machine_frame'
             },
@@ -33,7 +33,7 @@ onEvent('recipes', (event) => {
             pattern: ['BEB', 'CDC', 'BAB'],
             key: {
                 A: '#forge:circuits/advanced',
-                B: 'engineersdecor:clinker_brick_block',
+                B: 'immersiveengineering:blastbrick_reinforced',
                 C: 'immersiveengineering:coil_hv',
                 D: '#industrialforegoing:machine_frame/simple',
                 E: 'pneumaticcraft:heat_sink'
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js
index 621824e4fc..135160d157 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/occultism/ritual.js
@@ -903,6 +903,31 @@ onEvent('recipes', (event) => {
             ],
             result: { item: 'occultism:jei_dummy/none' },
             id: `${id_prefix}pink_wither`
+        },
+        {
+            ritual_type: 'occultism:craft_with_spirit_name',
+            activation_item: { item: 'occultism:book_of_binding_bound_foliot' },
+            pentacle_id: 'occultism:craft_foliot',
+            duration: 12,
+            ritual_dummy: { item: 'kubejs:craft_robit' },
+            ingredients: [
+                { tag: 'industrialforegoing:machine_frame/pity' },
+                { item: 'create:belt_connector' },
+                { tag: 'forge:dusts/salt' },
+                { item: 'create:belt_connector' },
+
+                { tag: 'forge:circuits/basic' },
+                { tag: 'forge:gears/osmium' },
+                { item: 'create:encased_chain_drive' },
+                { tag: 'forge:gears/osmium' },
+
+                { tag: 'forge:circuits/basic' },
+                { tag: 'forge:gears/osmium' },
+                { item: 'create:encased_chain_drive' },
+                { tag: 'forge:gears/osmium' }
+            ],
+            result: { item: 'mekanism:robit' },
+            id: 'mekanism:robit'
         }
     ];
 
diff --git a/kubejs/startup_scripts/item_registry.js b/kubejs/startup_scripts/item_registry.js
index 7cd8d43edb..a9920f1298 100644
--- a/kubejs/startup_scripts/item_registry.js
+++ b/kubejs/startup_scripts/item_registry.js
@@ -57,7 +57,8 @@ onEvent('item.registry', (event) => {
         'craft_soulscythe',
         'craft_attunement_altar',
         'craft_mana_collector',
-        'craft_logic_director'
+        'craft_logic_director',
+        'craft_robit'
     ];
 
     const reusableItemTextures = [

From c2c62ad5bb5a6aec73970341900bd50f98f117d8 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Tue, 26 Oct 2021 11:32:27 -0400
Subject: [PATCH 077/130] Update shaped.js

---
 .../kubejs/expert/recipetypes/rftools/shaped.js      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
index 616519f212..535e9bce49 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/rftools/shaped.js
@@ -431,6 +431,18 @@ onEvent('recipes', (event) => {
                 D: '#forge:gears/osmium'
             },
             id: 'rftoolsstorage:storage_module0'
+        },
+        {
+            output: 'rftoolsbuilder:shape_card_quarry',
+            pattern: [' A ', 'BCB', 'DED'],
+            key: {
+                A: 'mekanism:robit',
+                B: 'mekanism:teleportation_core',
+                C: 'rftoolsbuilder:shape_card_def',
+                D: '#forge:circuits/ultimate',
+                E: 'mekanismtools:refined_obsidian_paxel'
+            },
+            id: 'rftoolsbuilder:shape_card_quarry'
         }
     ];
 

From d19007a22ef3e08de04701bfd757fb7d9045e71f Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Tue, 26 Oct 2021 11:46:31 -0400
Subject: [PATCH 078/130] generators

---
 .../expert/recipetypes/mekanism/shaped.js     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index fa1b73b3d9..b59f8ff9eb 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -642,6 +642,32 @@ onEvent('recipes', (event) => {
                 C: 'minecraft:blast_furnace'
             },
             id: 'mekanismgenerators:generator/heat'
+        },
+        {
+            output: 'mekanismgenerators:gas_burning_generator',
+            pattern: ['ABA', 'CDC', 'EFE'],
+            key: {
+                A: '#forge:gears/compressed_iron',
+                B: 'mekanism:basic_chemical_tank',
+                C: 'pneumaticcraft:turbine_rotor',
+                D: '#industrialforegoing:machine_frame/simple',
+                E: '#forge:circuits/basic',
+                F: 'immersiveengineering:coil_hv'
+            },
+            id: 'mekanismgenerators:generator/gas_burning'
+        },
+        {
+            output: 'mekanismgenerators:bio_generator',
+            pattern: ['ABA', 'CDC', 'EFE'],
+            key: {
+                A: '#forge:gears/compressed_iron',
+                B: 'mekanism:basic_fluid_tank',
+                C: 'pneumaticcraft:turbine_rotor',
+                D: '#industrialforegoing:machine_frame/simple',
+                E: '#forge:circuits/basic',
+                F: 'immersiveengineering:coil_hv'
+            },
+            id: 'mekanismgenerators:generator/bio'
         }
     ];
 

From 5cd3f7a06e2cb8acd50b571cb96e81b118b0efbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Tue, 26 Oct 2021 20:26:53 +0200
Subject: [PATCH 079/130] removed extra loop

---
 .../kubejs/base/recipetypes/minecraft/stonecutter.js        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/stonecutter.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/stonecutter.js
index 7d5d825cd2..758d58d2db 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/stonecutter.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/stonecutter.js
@@ -97,10 +97,8 @@ onEvent('recipes', (event) => {
 
     var masonryTiledStoneTypes = masonryStoneTypes.concat(['endstone', 'netherrack', 'obsidian']);
     masonryTiledStoneTypes.forEach((stoneType) => {
-        masonryCuttingTypes.forEach((cuttingType) => {
-            event.stonecutting(`masonry:${stoneType}tiledslab`, `masonry:${stoneType}tiled`);
-            event.stonecutting(`masonry:${stoneType}tiledwall`, `masonry:${stoneType}tiled`);
-        });
+        event.stonecutting(`masonry:${stoneType}tiledslab`, `masonry:${stoneType}tiled`);
+        event.stonecutting(`masonry:${stoneType}tiledwall`, `masonry:${stoneType}tiled`);
     });
 
     ['#forge:dirt', '#forge:workbenches', '#forge:grass'].forEach((tag) => {

From 0939a05b7bf1c9b7f30f2fb11b7b787bb6d91f90 Mon Sep 17 00:00:00 2001
From: Iris <48930896+Iris-xii@users.noreply.github.com>
Date: Tue, 26 Oct 2021 20:30:02 +0200
Subject: [PATCH 080/130] Removed storage blocks from stonecuttables.js

Removed storage blocks (but not charcoal as it costs only 1 charcoal per block? That's odd)
---
 .../kubejs/constants/stonecuttables.js        | 132 ------------------
 1 file changed, 132 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js b/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
index 562838e4db..0d4dbbf10e 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
@@ -2270,28 +2270,6 @@ const stonecuttables = [
 		onlyAsOutput: [],
 		onlyAsInput: []
 	},
-	{
-		name:'emerald',
-		stones: [
-			'minecraft:emerald_block',
-			'chisel:emerald/panel',
-			'chisel:emerald/panelclassic',
-			'chisel:emerald/smooth',
-			'chisel:emerald/chunk',
-			'chisel:emerald/goldborder',
-			'chisel:emerald/zelda',
-			'chisel:emerald/cell',
-			'chisel:emerald/cellbismuth',
-			'chisel:emerald/four',
-			'chisel:emerald/fourornate',
-			'chisel:emerald/ornate',
-			'chisel:emerald/masonryemerald',
-			'chisel:emerald/emeraldcircle',
-			'chisel:emerald/emeraldprismatic'
-		],
-		onlyAsOutput: [],
-		onlyAsInput: []
-	},
 	{
 		name:'mossy_cobblestone',
 		stones: [
@@ -2336,47 +2314,6 @@ const stonecuttables = [
 		onlyAsOutput: [],
 		onlyAsInput: []
 	},
-	{
-		name:'coal',
-		stones: [
-			'minecraft:coal_block',
-			'chisel:coal/cracked',
-			'chisel:coal/solid_bricks',
-			'chisel:coal/small_bricks',
-			'chisel:coal/soft_bricks',
-			'chisel:coal/cracked_bricks',
-			'chisel:coal/triple_bricks',
-			'chisel:coal/encased_bricks',
-			'chisel:coal/chaotic_bricks',
-			'chisel:coal/array',
-			'chisel:coal/tiles_medium',
-			'chisel:coal/tiles_large',
-			'chisel:coal/tiles_small',
-			'chisel:coal/chaotic_medium',
-			'chisel:coal/chaotic_small',
-			'chisel:coal/braid',
-			'chisel:coal/dent',
-			'chisel:coal/french_1',
-			'chisel:coal/french_2',
-			'chisel:coal/jellybean',
-			'chisel:coal/layers',
-			'chisel:coal/mosaic',
-			'chisel:coal/ornate',
-			'chisel:coal/panel',
-			'chisel:coal/road',
-			'chisel:coal/slanted',
-			'chisel:coal/zag',
-			'chisel:coal/circular',
-			'chisel:coal/circularct',
-			'chisel:coal/weaver',
-			'chisel:coal/pillar',
-			'chisel:coal/twisted',
-			'chisel:coal/prism',
-			'chisel:coal/cuts'
-		],
-		onlyAsOutput: [],
-		onlyAsInput: []
-	},
 	{
 		name:'chisel_charcoal', //Recipe only costs 1 charcoal so can't also add storage blocks to this
 		stones: [
@@ -2418,23 +2355,6 @@ const stonecuttables = [
 		onlyAsOutput: [],
 		onlyAsInput: []
 	},
-	{
-		name:'bronze',
-		stones:[
-			'emendatusenigmatica:bronze_block',
-			'thermal:bronze_block',
-			'mekanism:block_bronze',
-			'chisel:metals/bronze/caution',
-			'chisel:metals/bronze/crate',
-			'chisel:metals/bronze/thermal',
-			'chisel:metals/bronze/machine',
-			'chisel:metals/bronze/badgreggy',
-			'chisel:metals/bronze/bolted',
-			'chisel:metals/bronze/scaffold',
-		],
-		onlyAsOutput: [],
-		onlyAsInput: []
-	},
 	{
 		name:'bricks',
 		stones:[
@@ -2498,58 +2418,6 @@ const stonecuttables = [
 		],
 		onlyAsOutput: [],
 		onlyAsInput: []
-	},
-	{
-		name: "aluminum_block",
-		stones: [
-			'emendatusenigmatica:aluminum_block',
-			'immersiveengineering:storage_aluminum',
-			'chisel:metals/aluminum/caution',
-			'chisel:metals/aluminum/crate',
-			'chisel:metals/aluminum/thermal',
-			'chisel:metals/aluminum/machine',
-			'chisel:metals/aluminum/badgreggy',
-			'chisel:metals/aluminum/bolted',
-			'chisel:metals/aluminum/scaffold'
-		],
-		onlyAsOutput: [],
-		onlyAsInput: []
-	},
-	{
-		name: 'redstone_block',
-		stones: [
-			'minecraft:redstone_block',
-			'chisel:redstone/cracked',
-			'chisel:redstone/solid_bricks',
-			'chisel:redstone/small_bricks',
-			'chisel:redstone/soft_bricks',
-			'chisel:redstone/cracked_bricks',
-			'chisel:redstone/triple_bricks',
-			'chisel:redstone/encased_bricks',
-			'chisel:redstone/array',
-			'chisel:redstone/tiles_medium',
-			'chisel:redstone/tiles_large',
-			'chisel:redstone/tiles_small',
-			'chisel:redstone/chaotic_medium',
-			'chisel:redstone/chaotic_small',
-			'chisel:redstone/braid',
-			'chisel:redstone/dent',
-			'chisel:redstone/french_1',
-			'chisel:redstone/french_2',
-			'chisel:redstone/jellybean',
-			'chisel:redstone/layers',
-			'chisel:redstone/mosaic',
-			'chisel:redstone/ornate',
-			'chisel:redstone/panel',
-			'chisel:redstone/road',
-			'chisel:redstone/slanted',
-			'chisel:redstone/circular',
-			'chisel:redstone/pillar',
-			'chisel:redstone/twisted',
-			'chisel:redstone/prism'
-		],
-		onlyAsOutput: [],
-		onlyAsInput: []
 	}
 ];
 

From d9d54adccab6ec4791807b9f2a021dcc43e43932 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Tue, 26 Oct 2021 15:34:04 -0400
Subject: [PATCH 081/130] update IE quests to display the actual multiblocks

Looks a bit nicer than the pile of buckets we had :D
---
 .../chapters/immersive_engineering.snbt       | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/config/ftbquests/quests/chapters/immersive_engineering.snbt b/config/ftbquests/quests/chapters/immersive_engineering.snbt
index 691a77883f..7ce0b5da2e 100644
--- a/config/ftbquests/quests/chapters/immersive_engineering.snbt
+++ b/config/ftbquests/quests/chapters/immersive_engineering.snbt
@@ -76,7 +76,7 @@
 		}
 		{
 			title: "Coke Oven"
-			icon: "immersiveengineering:cokebrick"
+			icon: "immersiveengineering:coke_oven"
 			x: -3.5d
 			y: -3.0d
 			description: ["The Coke Oven is the first important multiblock in IE, made with a 3x3x3 cube of Coke Bricks. This structure can turn coal into coke and wood into charcoal; either operation produces creosote, an important byproduct used for Treated Wood."]
@@ -168,6 +168,7 @@
 		}
 		{
 			title: "Blast Furnace"
+			icon: "immersiveengineering:blast_furnace"
 			x: -3.5d
 			y: -1.5d
 			description: ["The Blast Furnace is used to process iron into steel, using coke or charcoal. This is a critically important structure... unless you get steel another way, anyway."]
@@ -313,7 +314,7 @@
 		}
 		{
 			title: "Crusher"
-			icon: "immersiveengineering:light_engineering"
+			icon: "immersiveengineering:crusher"
 			x: -5.5d
 			y: -0.5d
 			description: [
@@ -365,7 +366,7 @@
 		}
 		{
 			title: "Metal Press"
-			icon: "immersiveengineering:mold_plate"
+			icon: "immersiveengineering:metal_press"
 			x: -1.5d
 			y: -0.5d
 			description: [
@@ -423,7 +424,7 @@
 		}
 		{
 			title: "Improved Blast Furnace"
-			icon: "immersiveengineering:blastbrick_reinforced"
+			icon: "immersiveengineering:advanced_blast_furnace"
 			x: -5.5d
 			y: -1.5d
 			description: [
@@ -457,6 +458,7 @@
 		}
 		{
 			title: "Alloy Kiln"
+			icon: "immersiveengineering:alloy_smelter"
 			x: 0.0d
 			y: -3.0d
 			description: ["The Alloy Kiln is a simple 2x2x2 structure that can smelt different types of metal together to form alloys."]
@@ -478,7 +480,7 @@
 		}
 		{
 			title: "Arc Furnace"
-			icon: "immersiveengineering:storage_steel"
+			icon: "immersiveengineering:arc_furnace"
 			x: -6.5d
 			y: 0.0d
 			description: [
@@ -621,13 +623,7 @@
 		}
 		{
 			title: "Sawmill"
-			icon: {
-				id: "immersiveengineering:sawblade"
-				Count: 1b
-				tag: {
-					Damage: 0
-				}
-			}
+			icon: "immersiveengineering:sawmill"
 			x: -1.5d
 			y: 0.5d
 			description: [
@@ -696,7 +692,7 @@
 		}
 		{
 			title: "Industrial Squeezer and Fermenter"
-			icon: "immersiveengineering:plantoil_bucket"
+			icon: "immersiveengineering:fermenter"
 			x: -2.5d
 			y: 0.5d
 			description: [
@@ -791,7 +787,7 @@
 		}
 		{
 			title: "Diesel Generator"
-			icon: "immersiveengineering:biodiesel_bucket"
+			icon: "immersiveengineering:diesel_generator"
 			x: -3.5d
 			y: 2.5d
 			description: [
@@ -853,7 +849,7 @@
 		}
 		{
 			title: "Excavator"
-			icon: "minecraft:gold_ore"
+			icon: "immersiveengineering:bucket_wheel"
 			x: -6.5d
 			y: 1.0d
 			description: [
@@ -1017,7 +1013,7 @@
 		}
 		{
 			title: "Workbench Automation"
-			icon: "immersiveengineering:electron_tube"
+			icon: "immersiveengineering:auto_workbench"
 			x: -8.5d
 			y: -1.5d
 			description: [
@@ -1075,7 +1071,7 @@
 		}
 		{
 			title: "Pumpjack"
-			icon: "immersivepetroleum:oil_bucket"
+			icon: "immersivepetroleum:pumpjack"
 			x: -4.5d
 			y: 0.5d
 			description: [
@@ -1155,7 +1151,7 @@
 		}
 		{
 			title: "Distillation Tower"
-			icon: "immersivepetroleum:diesel_bucket"
+			icon: { id: "immersivepetroleum:distillationtower", Count: 2b }
 			x: -4.5d
 			y: 1.5d
 			description: [
@@ -1220,7 +1216,7 @@
 		}
 		{
 			title: "Refinery"
-			icon: "immersiveengineering:biodiesel_bucket"
+			icon: "immersiveengineering:refinery"
 			x: -2.5d
 			y: 1.5d
 			description: [
@@ -1307,7 +1303,7 @@
 		}
 		{
 			title: "Sulfur Recovery Unit"
-			icon: "immersivepetroleum:diesel_bucket"
+			icon: "immersivepetroleum:hydrotreater"
 			x: -3.5d
 			y: 1.0d
 			description: [

From 4aab150089417f06e4b1405afc0518db714b59fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Tue, 26 Oct 2021 21:42:29 +0200
Subject: [PATCH 082/130] formatting

---
 .../kubejs/constants/stonecuttables.js        | 1479 +++++++++--------
 1 file changed, 764 insertions(+), 715 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js b/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
index 0d4dbbf10e..96a3182a7f 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
@@ -43,42 +43,42 @@ const stonecuttables = [
             'chipped:stone_11',
             'chipped:stone_2',
             'chipped:stone_1',
-			'chisel:stone_bricks/extra/largeornate',
-			'chisel:stone_bricks/extra/poison',
-			'chisel:stone_bricks/extra/sunken',
-			"chisel:stone_bricks/cracked",
-			"chisel:stone_bricks/solid_bricks",
-			"chisel:stone_bricks/small_bricks",
-			"chisel:stone_bricks/soft_bricks",
-			"chisel:stone_bricks/cracked_bricks",
-			"chisel:stone_bricks/triple_bricks",
-			"chisel:stone_bricks/encased_bricks",
-			"chisel:stone_bricks/chaotic_bricks",
-			"chisel:stone_bricks/array",
-			"chisel:stone_bricks/tiles_medium",
-			"chisel:stone_bricks/tiles_large",
-			"chisel:stone_bricks/tiles_small",
-			"chisel:stone_bricks/chaotic_medium",
-			"chisel:stone_bricks/chaotic_small",
-			"chisel:stone_bricks/braid",
-			"chisel:stone_bricks/dent",
-			"chisel:stone_bricks/french_1",
-			"chisel:stone_bricks/french_2",
-			"chisel:stone_bricks/jellybean",
-			"chisel:stone_bricks/layers",
-			"chisel:stone_bricks/mosaic",
-			"chisel:stone_bricks/ornate",
-			"chisel:stone_bricks/panel",
-			"chisel:stone_bricks/road",
-			"chisel:stone_bricks/slanted",
-			"chisel:stone_bricks/zag",
-			"chisel:stone_bricks/circular",
-			"chisel:stone_bricks/circularct",
-			"chisel:stone_bricks/weaver",
-			"chisel:stone_bricks/pillar",
-			"chisel:stone_bricks/twisted",
-			"chisel:stone_bricks/prism",
-			"chisel:stone_bricks/cuts"
+            'chisel:stone_bricks/extra/largeornate',
+            'chisel:stone_bricks/extra/poison',
+            'chisel:stone_bricks/extra/sunken',
+            'chisel:stone_bricks/cracked',
+            'chisel:stone_bricks/solid_bricks',
+            'chisel:stone_bricks/small_bricks',
+            'chisel:stone_bricks/soft_bricks',
+            'chisel:stone_bricks/cracked_bricks',
+            'chisel:stone_bricks/triple_bricks',
+            'chisel:stone_bricks/encased_bricks',
+            'chisel:stone_bricks/chaotic_bricks',
+            'chisel:stone_bricks/array',
+            'chisel:stone_bricks/tiles_medium',
+            'chisel:stone_bricks/tiles_large',
+            'chisel:stone_bricks/tiles_small',
+            'chisel:stone_bricks/chaotic_medium',
+            'chisel:stone_bricks/chaotic_small',
+            'chisel:stone_bricks/braid',
+            'chisel:stone_bricks/dent',
+            'chisel:stone_bricks/french_1',
+            'chisel:stone_bricks/french_2',
+            'chisel:stone_bricks/jellybean',
+            'chisel:stone_bricks/layers',
+            'chisel:stone_bricks/mosaic',
+            'chisel:stone_bricks/ornate',
+            'chisel:stone_bricks/panel',
+            'chisel:stone_bricks/road',
+            'chisel:stone_bricks/slanted',
+            'chisel:stone_bricks/zag',
+            'chisel:stone_bricks/circular',
+            'chisel:stone_bricks/circularct',
+            'chisel:stone_bricks/weaver',
+            'chisel:stone_bricks/pillar',
+            'chisel:stone_bricks/twisted',
+            'chisel:stone_bricks/prism',
+            'chisel:stone_bricks/cuts'
         ],
         // items added here can be cut from other blocks of this stone type,
         // but cannot be cut into other blocks from this type
@@ -141,39 +141,39 @@ const stonecuttables = [
             'chipped:andesite_3',
             'chipped:andesite_2',
             'chipped:andesite_1',
-			'chisel:andesite/cracked',
-			'chisel:andesite/solid_bricks',
-			'chisel:andesite/small_bricks',
-			'chisel:andesite/soft_bricks',
-			'chisel:andesite/cracked_bricks',
-			'chisel:andesite/triple_bricks',
-			'chisel:andesite/encased_bricks',
-			'chisel:andesite/chaotic_bricks',
-			'chisel:andesite/array',
-			'chisel:andesite/tiles_medium',
-			'chisel:andesite/tiles_large',
-			'chisel:andesite/tiles_small',
-			'chisel:andesite/chaotic_medium',
-			'chisel:andesite/chaotic_small',
-			'chisel:andesite/braid',
-			'chisel:andesite/dent',
-			'chisel:andesite/french_1',
-			'chisel:andesite/french_2',
-			'chisel:andesite/jellybean',
-			'chisel:andesite/layers',
-			'chisel:andesite/mosaic',
-			'chisel:andesite/ornate',
-			'chisel:andesite/panel',
-			'chisel:andesite/road',
-			'chisel:andesite/slanted',
-			'chisel:andesite/zag',
-			'chisel:andesite/circular',
-			'chisel:andesite/circularct',
-			'chisel:andesite/weaver',
-			'chisel:andesite/pillar',
-			'chisel:andesite/twisted',
-			'chisel:andesite/prism',
-			'chisel:andesite/cuts'
+            'chisel:andesite/cracked',
+            'chisel:andesite/solid_bricks',
+            'chisel:andesite/small_bricks',
+            'chisel:andesite/soft_bricks',
+            'chisel:andesite/cracked_bricks',
+            'chisel:andesite/triple_bricks',
+            'chisel:andesite/encased_bricks',
+            'chisel:andesite/chaotic_bricks',
+            'chisel:andesite/array',
+            'chisel:andesite/tiles_medium',
+            'chisel:andesite/tiles_large',
+            'chisel:andesite/tiles_small',
+            'chisel:andesite/chaotic_medium',
+            'chisel:andesite/chaotic_small',
+            'chisel:andesite/braid',
+            'chisel:andesite/dent',
+            'chisel:andesite/french_1',
+            'chisel:andesite/french_2',
+            'chisel:andesite/jellybean',
+            'chisel:andesite/layers',
+            'chisel:andesite/mosaic',
+            'chisel:andesite/ornate',
+            'chisel:andesite/panel',
+            'chisel:andesite/road',
+            'chisel:andesite/slanted',
+            'chisel:andesite/zag',
+            'chisel:andesite/circular',
+            'chisel:andesite/circularct',
+            'chisel:andesite/weaver',
+            'chisel:andesite/pillar',
+            'chisel:andesite/twisted',
+            'chisel:andesite/prism',
+            'chisel:andesite/cuts'
         ],
         onlyAsOutput: ['create:andesite_cobblestone'],
         onlyAsInput: ['minecraft:andesite']
@@ -380,42 +380,42 @@ const stonecuttables = [
             'chipped:cobblestone_3',
             'chipped:cobblestone_2',
             'chipped:cobblestone_1',
-			'chisel:cobblestone/cracked',
-			'chisel:cobblestone/solid_bricks',
-			'chisel:cobblestone/small_bricks',
-			'chisel:cobblestone/soft_bricks',
-			'chisel:cobblestone/cracked_bricks',
-			'chisel:cobblestone/triple_bricks',
-			'chisel:cobblestone/encased_bricks',
-			'chisel:cobblestone/chaotic_bricks',
-			'chisel:cobblestone/array',
-			'chisel:cobblestone/tiles_medium',
-			'chisel:cobblestone/tiles_large',
-			'chisel:cobblestone/tiles_small',
-			'chisel:cobblestone/chaotic_medium',
-			'chisel:cobblestone/chaotic_small',
-			'chisel:cobblestone/braid',
-			'chisel:cobblestone/dent',
-			'chisel:cobblestone/french_1',
-			'chisel:cobblestone/french_2',
-			'chisel:cobblestone/jellybean',
-			'chisel:cobblestone/layers',
-			'chisel:cobblestone/mosaic',
-			'chisel:cobblestone/ornate',
-			'chisel:cobblestone/panel',
-			'chisel:cobblestone/road',
-			'chisel:cobblestone/slanted',
-			'chisel:cobblestone/zag',
-			'chisel:cobblestone/circular',
-			'chisel:cobblestone/circularct',
-			'chisel:cobblestone/weaver',
-			'chisel:cobblestone/pillar',
-			'chisel:cobblestone/twisted',
-			'chisel:cobblestone/prism',
-			'chisel:cobblestone/cuts',
-			'chisel:cobblestone/extra/emboss',
-			'chisel:cobblestone/extra/indent',
-			'chisel:cobblestone/extra/marker'
+            'chisel:cobblestone/cracked',
+            'chisel:cobblestone/solid_bricks',
+            'chisel:cobblestone/small_bricks',
+            'chisel:cobblestone/soft_bricks',
+            'chisel:cobblestone/cracked_bricks',
+            'chisel:cobblestone/triple_bricks',
+            'chisel:cobblestone/encased_bricks',
+            'chisel:cobblestone/chaotic_bricks',
+            'chisel:cobblestone/array',
+            'chisel:cobblestone/tiles_medium',
+            'chisel:cobblestone/tiles_large',
+            'chisel:cobblestone/tiles_small',
+            'chisel:cobblestone/chaotic_medium',
+            'chisel:cobblestone/chaotic_small',
+            'chisel:cobblestone/braid',
+            'chisel:cobblestone/dent',
+            'chisel:cobblestone/french_1',
+            'chisel:cobblestone/french_2',
+            'chisel:cobblestone/jellybean',
+            'chisel:cobblestone/layers',
+            'chisel:cobblestone/mosaic',
+            'chisel:cobblestone/ornate',
+            'chisel:cobblestone/panel',
+            'chisel:cobblestone/road',
+            'chisel:cobblestone/slanted',
+            'chisel:cobblestone/zag',
+            'chisel:cobblestone/circular',
+            'chisel:cobblestone/circularct',
+            'chisel:cobblestone/weaver',
+            'chisel:cobblestone/pillar',
+            'chisel:cobblestone/twisted',
+            'chisel:cobblestone/prism',
+            'chisel:cobblestone/cuts',
+            'chisel:cobblestone/extra/emboss',
+            'chisel:cobblestone/extra/indent',
+            'chisel:cobblestone/extra/marker'
         ],
         onlyAsOutput: [],
         onlyAsInput: []
@@ -572,39 +572,39 @@ const stonecuttables = [
             'chipped:diorite_3',
             'chipped:diorite_2',
             'chipped:diorite_1',
-			'chisel:diorite/cracked',
-			'chisel:diorite/solid_bricks',
-			'chisel:diorite/small_bricks',
-			'chisel:diorite/soft_bricks',
-			'chisel:diorite/cracked_bricks',
-			'chisel:diorite/triple_bricks',
-			'chisel:diorite/encased_bricks',
-			'chisel:diorite/chaotic_bricks',
-			'chisel:diorite/array',
-			'chisel:diorite/tiles_medium',
-			'chisel:diorite/tiles_large',
-			'chisel:diorite/tiles_small',
-			'chisel:diorite/chaotic_medium',
-			'chisel:diorite/chaotic_small',
-			'chisel:diorite/braid',
-			'chisel:diorite/dent',
-			'chisel:diorite/french_1',
-			'chisel:diorite/french_2',
-			'chisel:diorite/jellybean',
-			'chisel:diorite/layers',
-			'chisel:diorite/mosaic',
-			'chisel:diorite/ornate',
-			'chisel:diorite/panel',
-			'chisel:diorite/road',
-			'chisel:diorite/slanted',
-			'chisel:diorite/zag',
-			'chisel:diorite/circular',
-			'chisel:diorite/circularct',
-			'chisel:diorite/weaver',
-			'chisel:diorite/pillar',
-			'chisel:diorite/twisted',
-			'chisel:diorite/prism',
-			'chisel:diorite/cuts'
+            'chisel:diorite/cracked',
+            'chisel:diorite/solid_bricks',
+            'chisel:diorite/small_bricks',
+            'chisel:diorite/soft_bricks',
+            'chisel:diorite/cracked_bricks',
+            'chisel:diorite/triple_bricks',
+            'chisel:diorite/encased_bricks',
+            'chisel:diorite/chaotic_bricks',
+            'chisel:diorite/array',
+            'chisel:diorite/tiles_medium',
+            'chisel:diorite/tiles_large',
+            'chisel:diorite/tiles_small',
+            'chisel:diorite/chaotic_medium',
+            'chisel:diorite/chaotic_small',
+            'chisel:diorite/braid',
+            'chisel:diorite/dent',
+            'chisel:diorite/french_1',
+            'chisel:diorite/french_2',
+            'chisel:diorite/jellybean',
+            'chisel:diorite/layers',
+            'chisel:diorite/mosaic',
+            'chisel:diorite/ornate',
+            'chisel:diorite/panel',
+            'chisel:diorite/road',
+            'chisel:diorite/slanted',
+            'chisel:diorite/zag',
+            'chisel:diorite/circular',
+            'chisel:diorite/circularct',
+            'chisel:diorite/weaver',
+            'chisel:diorite/pillar',
+            'chisel:diorite/twisted',
+            'chisel:diorite/prism',
+            'chisel:diorite/cuts'
         ],
         onlyAsOutput: ['create:diorite_cobblestone'],
         onlyAsInput: ['minecraft:diorite']
@@ -648,39 +648,39 @@ const stonecuttables = [
             'chipped:end_stone_3',
             'chipped:end_stone_2',
             'chipped:end_stone_1',
-			'chisel:end_stone/cracked',
-			'chisel:end_stone/solid_bricks',
-			'chisel:end_stone/small_bricks',
-			'chisel:end_stone/soft_bricks',
-			'chisel:end_stone/cracked_bricks',
-			'chisel:end_stone/triple_bricks',
-			'chisel:end_stone/encased_bricks',
-			'chisel:end_stone/chaotic_bricks',
-			'chisel:end_stone/array',
-			'chisel:end_stone/tiles_medium',
-			'chisel:end_stone/tiles_large',
-			'chisel:end_stone/tiles_small',
-			'chisel:end_stone/chaotic_medium',
-			'chisel:end_stone/chaotic_small',
-			'chisel:end_stone/braid',
-			'chisel:end_stone/dent',
-			'chisel:end_stone/french_1',
-			'chisel:end_stone/french_2',
-			'chisel:end_stone/jellybean',
-			'chisel:end_stone/layers',
-			'chisel:end_stone/mosaic',
-			'chisel:end_stone/ornate',
-			'chisel:end_stone/panel',
-			'chisel:end_stone/road',
-			'chisel:end_stone/slanted',
-			'chisel:end_stone/zag',
-			'chisel:end_stone/circular',
-			'chisel:end_stone/circularct',
-			'chisel:end_stone/weaver',
-			'chisel:end_stone/pillar',
-			'chisel:end_stone/twisted',
-			'chisel:end_stone/prism',
-			'chisel:end_stone/cuts'
+            'chisel:end_stone/cracked',
+            'chisel:end_stone/solid_bricks',
+            'chisel:end_stone/small_bricks',
+            'chisel:end_stone/soft_bricks',
+            'chisel:end_stone/cracked_bricks',
+            'chisel:end_stone/triple_bricks',
+            'chisel:end_stone/encased_bricks',
+            'chisel:end_stone/chaotic_bricks',
+            'chisel:end_stone/array',
+            'chisel:end_stone/tiles_medium',
+            'chisel:end_stone/tiles_large',
+            'chisel:end_stone/tiles_small',
+            'chisel:end_stone/chaotic_medium',
+            'chisel:end_stone/chaotic_small',
+            'chisel:end_stone/braid',
+            'chisel:end_stone/dent',
+            'chisel:end_stone/french_1',
+            'chisel:end_stone/french_2',
+            'chisel:end_stone/jellybean',
+            'chisel:end_stone/layers',
+            'chisel:end_stone/mosaic',
+            'chisel:end_stone/ornate',
+            'chisel:end_stone/panel',
+            'chisel:end_stone/road',
+            'chisel:end_stone/slanted',
+            'chisel:end_stone/zag',
+            'chisel:end_stone/circular',
+            'chisel:end_stone/circularct',
+            'chisel:end_stone/weaver',
+            'chisel:end_stone/pillar',
+            'chisel:end_stone/twisted',
+            'chisel:end_stone/prism',
+            'chisel:end_stone/cuts'
         ],
         onlyAsOutput: [],
         onlyAsInput: []
@@ -912,39 +912,39 @@ const stonecuttables = [
             'chipped:glowstone_3',
             'chipped:glowstone_2',
             'chipped:glowstone_1',
-			'chisel:glowstone/cracked',
-			'chisel:glowstone/solid_bricks',
-			'chisel:glowstone/small_bricks',
-			'chisel:glowstone/soft_bricks',
-			'chisel:glowstone/cracked_bricks',
-			'chisel:glowstone/triple_bricks',
-			'chisel:glowstone/encased_bricks',
-			'chisel:glowstone/array',
-			'chisel:glowstone/tiles_medium',
-			'chisel:glowstone/tiles_large',
-			'chisel:glowstone/tiles_small',
-			'chisel:glowstone/chaotic_medium',
-			'chisel:glowstone/chaotic_small',
-			'chisel:glowstone/braid',
-			'chisel:glowstone/dent',
-			'chisel:glowstone/french_1',
-			'chisel:glowstone/french_2',
-			'chisel:glowstone/jellybean',
-			'chisel:glowstone/layers',
-			'chisel:glowstone/mosaic',
-			'chisel:glowstone/ornate',
-			'chisel:glowstone/panel',
-			'chisel:glowstone/road',
-			'chisel:glowstone/slanted',
-			'chisel:glowstone/circular',
-			'chisel:glowstone/pillar',
-			'chisel:glowstone/twisted',
-			'chisel:glowstone/prism',
-			'chisel:glowstone/extra/bismuth',
-			'chisel:glowstone/extra/tiles_large_bismuth',
-			'chisel:glowstone/extra/tiles_medium_bismuth',
-			'chisel:glowstone/extra/neon',
-			'chisel:glowstone/extra/neon_panel'
+            'chisel:glowstone/cracked',
+            'chisel:glowstone/solid_bricks',
+            'chisel:glowstone/small_bricks',
+            'chisel:glowstone/soft_bricks',
+            'chisel:glowstone/cracked_bricks',
+            'chisel:glowstone/triple_bricks',
+            'chisel:glowstone/encased_bricks',
+            'chisel:glowstone/array',
+            'chisel:glowstone/tiles_medium',
+            'chisel:glowstone/tiles_large',
+            'chisel:glowstone/tiles_small',
+            'chisel:glowstone/chaotic_medium',
+            'chisel:glowstone/chaotic_small',
+            'chisel:glowstone/braid',
+            'chisel:glowstone/dent',
+            'chisel:glowstone/french_1',
+            'chisel:glowstone/french_2',
+            'chisel:glowstone/jellybean',
+            'chisel:glowstone/layers',
+            'chisel:glowstone/mosaic',
+            'chisel:glowstone/ornate',
+            'chisel:glowstone/panel',
+            'chisel:glowstone/road',
+            'chisel:glowstone/slanted',
+            'chisel:glowstone/circular',
+            'chisel:glowstone/pillar',
+            'chisel:glowstone/twisted',
+            'chisel:glowstone/prism',
+            'chisel:glowstone/extra/bismuth',
+            'chisel:glowstone/extra/tiles_large_bismuth',
+            'chisel:glowstone/extra/tiles_medium_bismuth',
+            'chisel:glowstone/extra/neon',
+            'chisel:glowstone/extra/neon_panel'
         ],
         onlyAsOutput: [],
         onlyAsInput: []
@@ -1003,39 +1003,39 @@ const stonecuttables = [
             'chipped:granite_3',
             'chipped:granite_2',
             'chipped:granite_1',
-			'chisel:granite/cracked',
-			'chisel:granite/solid_bricks',
-			'chisel:granite/small_bricks',
-			'chisel:granite/soft_bricks',
-			'chisel:granite/cracked_bricks',
-			'chisel:granite/triple_bricks',
-			'chisel:granite/encased_bricks',
-			'chisel:granite/chaotic_bricks',
-			'chisel:granite/array',
-			'chisel:granite/tiles_medium',
-			'chisel:granite/tiles_large',
-			'chisel:granite/tiles_small',
-			'chisel:granite/chaotic_medium',
-			'chisel:granite/chaotic_small',
-			'chisel:granite/braid',
-			'chisel:granite/dent',
-			'chisel:granite/french_1',
-			'chisel:granite/french_2',
-			'chisel:granite/jellybean',
-			'chisel:granite/layers',
-			'chisel:granite/mosaic',
-			'chisel:granite/ornate',
-			'chisel:granite/panel',
-			'chisel:granite/road',
-			'chisel:granite/slanted',
-			'chisel:granite/zag',
-			'chisel:granite/circular',
-			'chisel:granite/circularct',
-			'chisel:granite/weaver',
-			'chisel:granite/pillar',
-			'chisel:granite/twisted',
-			'chisel:granite/prism',
-			'chisel:granite/cuts'
+            'chisel:granite/cracked',
+            'chisel:granite/solid_bricks',
+            'chisel:granite/small_bricks',
+            'chisel:granite/soft_bricks',
+            'chisel:granite/cracked_bricks',
+            'chisel:granite/triple_bricks',
+            'chisel:granite/encased_bricks',
+            'chisel:granite/chaotic_bricks',
+            'chisel:granite/array',
+            'chisel:granite/tiles_medium',
+            'chisel:granite/tiles_large',
+            'chisel:granite/tiles_small',
+            'chisel:granite/chaotic_medium',
+            'chisel:granite/chaotic_small',
+            'chisel:granite/braid',
+            'chisel:granite/dent',
+            'chisel:granite/french_1',
+            'chisel:granite/french_2',
+            'chisel:granite/jellybean',
+            'chisel:granite/layers',
+            'chisel:granite/mosaic',
+            'chisel:granite/ornate',
+            'chisel:granite/panel',
+            'chisel:granite/road',
+            'chisel:granite/slanted',
+            'chisel:granite/zag',
+            'chisel:granite/circular',
+            'chisel:granite/circularct',
+            'chisel:granite/weaver',
+            'chisel:granite/pillar',
+            'chisel:granite/twisted',
+            'chisel:granite/prism',
+            'chisel:granite/cuts'
         ],
         onlyAsOutput: ['create:granite_cobblestone'],
         onlyAsInput: ['minecraft:granite']
@@ -1464,39 +1464,39 @@ const stonecuttables = [
             'chipped:prismarine_3',
             'chipped:prismarine_2',
             'chipped:prismarine_1',
-			'chisel:prismarine/cracked',
-			'chisel:prismarine/solid_bricks',
-			'chisel:prismarine/small_bricks',
-			'chisel:prismarine/soft_bricks',
-			'chisel:prismarine/cracked_bricks',
-			'chisel:prismarine/triple_bricks',
-			'chisel:prismarine/encased_bricks',
-			'chisel:prismarine/chaotic_bricks',
-			'chisel:prismarine/array',
-			'chisel:prismarine/tiles_medium',
-			'chisel:prismarine/tiles_large',
-			'chisel:prismarine/tiles_small',
-			'chisel:prismarine/chaotic_medium',
-			'chisel:prismarine/chaotic_small',
-			'chisel:prismarine/braid',
-			'chisel:prismarine/dent',
-			'chisel:prismarine/french_1',
-			'chisel:prismarine/french_2',
-			'chisel:prismarine/jellybean',
-			'chisel:prismarine/layers',
-			'chisel:prismarine/mosaic',
-			'chisel:prismarine/ornate',
-			'chisel:prismarine/panel',
-			'chisel:prismarine/road',
-			'chisel:prismarine/slanted',
-			'chisel:prismarine/zag',
-			'chisel:prismarine/circular',
-			'chisel:prismarine/circularct',
-			'chisel:prismarine/weaver',
-			'chisel:prismarine/pillar',
-			'chisel:prismarine/twisted',
-			'chisel:prismarine/prism',
-			'chisel:prismarine/cuts'
+            'chisel:prismarine/cracked',
+            'chisel:prismarine/solid_bricks',
+            'chisel:prismarine/small_bricks',
+            'chisel:prismarine/soft_bricks',
+            'chisel:prismarine/cracked_bricks',
+            'chisel:prismarine/triple_bricks',
+            'chisel:prismarine/encased_bricks',
+            'chisel:prismarine/chaotic_bricks',
+            'chisel:prismarine/array',
+            'chisel:prismarine/tiles_medium',
+            'chisel:prismarine/tiles_large',
+            'chisel:prismarine/tiles_small',
+            'chisel:prismarine/chaotic_medium',
+            'chisel:prismarine/chaotic_small',
+            'chisel:prismarine/braid',
+            'chisel:prismarine/dent',
+            'chisel:prismarine/french_1',
+            'chisel:prismarine/french_2',
+            'chisel:prismarine/jellybean',
+            'chisel:prismarine/layers',
+            'chisel:prismarine/mosaic',
+            'chisel:prismarine/ornate',
+            'chisel:prismarine/panel',
+            'chisel:prismarine/road',
+            'chisel:prismarine/slanted',
+            'chisel:prismarine/zag',
+            'chisel:prismarine/circular',
+            'chisel:prismarine/circularct',
+            'chisel:prismarine/weaver',
+            'chisel:prismarine/pillar',
+            'chisel:prismarine/twisted',
+            'chisel:prismarine/prism',
+            'chisel:prismarine/cuts'
         ],
         onlyAsOutput: [],
         onlyAsInput: []
@@ -1529,39 +1529,39 @@ const stonecuttables = [
             'chipped:purpur_block_3',
             'chipped:purpur_block_2',
             'chipped:purpur_block_1',
-			'chisel:purpur/cracked',
-			'chisel:purpur/solid_bricks',
-			'chisel:purpur/small_bricks',
-			'chisel:purpur/soft_bricks',
-			'chisel:purpur/cracked_bricks',
-			'chisel:purpur/triple_bricks',
-			'chisel:purpur/encased_bricks',
-			'chisel:purpur/chaotic_bricks',
-			'chisel:purpur/array',
-			'chisel:purpur/tiles_medium',
-			'chisel:purpur/tiles_large',
-			'chisel:purpur/tiles_small',
-			'chisel:purpur/chaotic_medium',
-			'chisel:purpur/chaotic_small',
-			'chisel:purpur/braid',
-			'chisel:purpur/dent',
-			'chisel:purpur/french_1',
-			'chisel:purpur/french_2',
-			'chisel:purpur/jellybean',
-			'chisel:purpur/layers',
-			'chisel:purpur/mosaic',
-			'chisel:purpur/ornate',
-			'chisel:purpur/panel',
-			'chisel:purpur/road',
-			'chisel:purpur/slanted',
-			'chisel:purpur/zag',
-			'chisel:purpur/circular',
-			'chisel:purpur/circularct',
-			'chisel:purpur/weaver',
-			'chisel:purpur/pillar',
-			'chisel:purpur/twisted',
-			'chisel:purpur/prism',
-			'chisel:purpur/cuts'
+            'chisel:purpur/cracked',
+            'chisel:purpur/solid_bricks',
+            'chisel:purpur/small_bricks',
+            'chisel:purpur/soft_bricks',
+            'chisel:purpur/cracked_bricks',
+            'chisel:purpur/triple_bricks',
+            'chisel:purpur/encased_bricks',
+            'chisel:purpur/chaotic_bricks',
+            'chisel:purpur/array',
+            'chisel:purpur/tiles_medium',
+            'chisel:purpur/tiles_large',
+            'chisel:purpur/tiles_small',
+            'chisel:purpur/chaotic_medium',
+            'chisel:purpur/chaotic_small',
+            'chisel:purpur/braid',
+            'chisel:purpur/dent',
+            'chisel:purpur/french_1',
+            'chisel:purpur/french_2',
+            'chisel:purpur/jellybean',
+            'chisel:purpur/layers',
+            'chisel:purpur/mosaic',
+            'chisel:purpur/ornate',
+            'chisel:purpur/panel',
+            'chisel:purpur/road',
+            'chisel:purpur/slanted',
+            'chisel:purpur/zag',
+            'chisel:purpur/circular',
+            'chisel:purpur/circularct',
+            'chisel:purpur/weaver',
+            'chisel:purpur/pillar',
+            'chisel:purpur/twisted',
+            'chisel:purpur/prism',
+            'chisel:purpur/cuts'
         ],
         onlyAsOutput: [],
         onlyAsInput: []
@@ -1591,39 +1591,39 @@ const stonecuttables = [
             'chipped:quartz_block_3',
             'chipped:quartz_block_2',
             'chipped:quartz_block_1',
-			'chisel:quartz/cracked',
-			'chisel:quartz/solid_bricks',
-			'chisel:quartz/small_bricks',
-			'chisel:quartz/soft_bricks',
-			'chisel:quartz/cracked_bricks',
-			'chisel:quartz/triple_bricks',
-			'chisel:quartz/encased_bricks',
-			'chisel:quartz/chaotic_bricks',
-			'chisel:quartz/array',
-			'chisel:quartz/tiles_medium',
-			'chisel:quartz/tiles_large',
-			'chisel:quartz/tiles_small',
-			'chisel:quartz/chaotic_medium',
-			'chisel:quartz/chaotic_small',
-			'chisel:quartz/braid',
-			'chisel:quartz/dent',
-			'chisel:quartz/french_1',
-			'chisel:quartz/french_2',
-			'chisel:quartz/jellybean',
-			'chisel:quartz/layers',
-			'chisel:quartz/mosaic',
-			'chisel:quartz/ornate',
-			'chisel:quartz/panel',
-			'chisel:quartz/road',
-			'chisel:quartz/slanted',
-			'chisel:quartz/zag',
-			'chisel:quartz/circular',
-			'chisel:quartz/circularct',
-			'chisel:quartz/weaver',
-			'chisel:quartz/pillar',
-			'chisel:quartz/twisted',
-			'chisel:quartz/prism',
-			'chisel:quartz/cuts'
+            'chisel:quartz/cracked',
+            'chisel:quartz/solid_bricks',
+            'chisel:quartz/small_bricks',
+            'chisel:quartz/soft_bricks',
+            'chisel:quartz/cracked_bricks',
+            'chisel:quartz/triple_bricks',
+            'chisel:quartz/encased_bricks',
+            'chisel:quartz/chaotic_bricks',
+            'chisel:quartz/array',
+            'chisel:quartz/tiles_medium',
+            'chisel:quartz/tiles_large',
+            'chisel:quartz/tiles_small',
+            'chisel:quartz/chaotic_medium',
+            'chisel:quartz/chaotic_small',
+            'chisel:quartz/braid',
+            'chisel:quartz/dent',
+            'chisel:quartz/french_1',
+            'chisel:quartz/french_2',
+            'chisel:quartz/jellybean',
+            'chisel:quartz/layers',
+            'chisel:quartz/mosaic',
+            'chisel:quartz/ornate',
+            'chisel:quartz/panel',
+            'chisel:quartz/road',
+            'chisel:quartz/slanted',
+            'chisel:quartz/zag',
+            'chisel:quartz/circular',
+            'chisel:quartz/circularct',
+            'chisel:quartz/weaver',
+            'chisel:quartz/pillar',
+            'chisel:quartz/twisted',
+            'chisel:quartz/prism',
+            'chisel:quartz/cuts'
         ],
         onlyAsOutput: [],
         onlyAsInput: []
@@ -1697,42 +1697,42 @@ const stonecuttables = [
             'chipped:red_sandstone_3',
             'chipped:red_sandstone_2',
             'chipped:red_sandstone_1',
-			'chisel:red_sandstone/extra/bevel_skeleton',
-			'chisel:red_sandstone/extra/glyphs',
-			'chisel:red_sandstone/extra/small',
-			'chisel:red_sandstone/cracked',
-			'chisel:red_sandstone/solid_bricks',
-			'chisel:red_sandstone/small_bricks',
-			'chisel:red_sandstone/soft_bricks',
-			'chisel:red_sandstone/cracked_bricks',
-			'chisel:red_sandstone/triple_bricks',
-			'chisel:red_sandstone/encased_bricks',
-			'chisel:red_sandstone/chaotic_bricks',
-			'chisel:red_sandstone/array',
-			'chisel:red_sandstone/tiles_medium',
-			'chisel:red_sandstone/tiles_large',
-			'chisel:red_sandstone/tiles_small',
-			'chisel:red_sandstone/chaotic_medium',
-			'chisel:red_sandstone/chaotic_small',
-			'chisel:red_sandstone/braid',
-			'chisel:red_sandstone/dent',
-			'chisel:red_sandstone/french_1',
-			'chisel:red_sandstone/french_2',
-			'chisel:red_sandstone/jellybean',
-			'chisel:red_sandstone/layers',
-			'chisel:red_sandstone/mosaic',
-			'chisel:red_sandstone/ornate',
-			'chisel:red_sandstone/panel',
-			'chisel:red_sandstone/road',
-			'chisel:red_sandstone/slanted',
-			'chisel:red_sandstone/zag',
-			'chisel:red_sandstone/circular',
-			'chisel:red_sandstone/circularct',
-			'chisel:red_sandstone/weaver',
-			'chisel:red_sandstone/pillar',
-			'chisel:red_sandstone/twisted',
-			'chisel:red_sandstone/prism',
-			'chisel:red_sandstone/cuts'
+            'chisel:red_sandstone/extra/bevel_skeleton',
+            'chisel:red_sandstone/extra/glyphs',
+            'chisel:red_sandstone/extra/small',
+            'chisel:red_sandstone/cracked',
+            'chisel:red_sandstone/solid_bricks',
+            'chisel:red_sandstone/small_bricks',
+            'chisel:red_sandstone/soft_bricks',
+            'chisel:red_sandstone/cracked_bricks',
+            'chisel:red_sandstone/triple_bricks',
+            'chisel:red_sandstone/encased_bricks',
+            'chisel:red_sandstone/chaotic_bricks',
+            'chisel:red_sandstone/array',
+            'chisel:red_sandstone/tiles_medium',
+            'chisel:red_sandstone/tiles_large',
+            'chisel:red_sandstone/tiles_small',
+            'chisel:red_sandstone/chaotic_medium',
+            'chisel:red_sandstone/chaotic_small',
+            'chisel:red_sandstone/braid',
+            'chisel:red_sandstone/dent',
+            'chisel:red_sandstone/french_1',
+            'chisel:red_sandstone/french_2',
+            'chisel:red_sandstone/jellybean',
+            'chisel:red_sandstone/layers',
+            'chisel:red_sandstone/mosaic',
+            'chisel:red_sandstone/ornate',
+            'chisel:red_sandstone/panel',
+            'chisel:red_sandstone/road',
+            'chisel:red_sandstone/slanted',
+            'chisel:red_sandstone/zag',
+            'chisel:red_sandstone/circular',
+            'chisel:red_sandstone/circularct',
+            'chisel:red_sandstone/weaver',
+            'chisel:red_sandstone/pillar',
+            'chisel:red_sandstone/twisted',
+            'chisel:red_sandstone/prism',
+            'chisel:red_sandstone/cuts'
         ],
         onlyAsOutput: [],
         onlyAsInput: []
@@ -1799,42 +1799,42 @@ const stonecuttables = [
             'chipped:sandstone_3',
             'chipped:sandstone_2',
             'chipped:sandstone_1',
-			'chisel:sandstone/extra/bevel_creeper',
-			'chisel:sandstone/extra/glyphs',
-			'chisel:sandstone/extra/small',
-			'chisel:sandstone/cracked',
-			'chisel:sandstone/solid_bricks',
-			'chisel:sandstone/small_bricks',
-			'chisel:sandstone/soft_bricks',
-			'chisel:sandstone/cracked_bricks',
-			'chisel:sandstone/triple_bricks',
-			'chisel:sandstone/encased_bricks',
-			'chisel:sandstone/chaotic_bricks',
-			'chisel:sandstone/array',
-			'chisel:sandstone/tiles_medium',
-			'chisel:sandstone/tiles_large',
-			'chisel:sandstone/tiles_small',
-			'chisel:sandstone/chaotic_medium',
-			'chisel:sandstone/chaotic_small',
-			'chisel:sandstone/braid',
-			'chisel:sandstone/dent',
-			'chisel:sandstone/french_1',
-			'chisel:sandstone/french_2',
-			'chisel:sandstone/jellybean',
-			'chisel:sandstone/layers',
-			'chisel:sandstone/mosaic',
-			'chisel:sandstone/ornate',
-			'chisel:sandstone/panel',
-			'chisel:sandstone/road',
-			'chisel:sandstone/slanted',
-			'chisel:sandstone/zag',
-			'chisel:sandstone/circular',
-			'chisel:sandstone/circularct',
-			'chisel:sandstone/weaver',
-			'chisel:sandstone/pillar',
-			'chisel:sandstone/twisted',
-			'chisel:sandstone/prism',
-			'chisel:sandstone/cuts'
+            'chisel:sandstone/extra/bevel_creeper',
+            'chisel:sandstone/extra/glyphs',
+            'chisel:sandstone/extra/small',
+            'chisel:sandstone/cracked',
+            'chisel:sandstone/solid_bricks',
+            'chisel:sandstone/small_bricks',
+            'chisel:sandstone/soft_bricks',
+            'chisel:sandstone/cracked_bricks',
+            'chisel:sandstone/triple_bricks',
+            'chisel:sandstone/encased_bricks',
+            'chisel:sandstone/chaotic_bricks',
+            'chisel:sandstone/array',
+            'chisel:sandstone/tiles_medium',
+            'chisel:sandstone/tiles_large',
+            'chisel:sandstone/tiles_small',
+            'chisel:sandstone/chaotic_medium',
+            'chisel:sandstone/chaotic_small',
+            'chisel:sandstone/braid',
+            'chisel:sandstone/dent',
+            'chisel:sandstone/french_1',
+            'chisel:sandstone/french_2',
+            'chisel:sandstone/jellybean',
+            'chisel:sandstone/layers',
+            'chisel:sandstone/mosaic',
+            'chisel:sandstone/ornate',
+            'chisel:sandstone/panel',
+            'chisel:sandstone/road',
+            'chisel:sandstone/slanted',
+            'chisel:sandstone/zag',
+            'chisel:sandstone/circular',
+            'chisel:sandstone/circularct',
+            'chisel:sandstone/weaver',
+            'chisel:sandstone/pillar',
+            'chisel:sandstone/twisted',
+            'chisel:sandstone/prism',
+            'chisel:sandstone/cuts'
         ],
         onlyAsOutput: [],
         onlyAsInput: []
@@ -2144,281 +2144,281 @@ const stonecuttables = [
         onlyAsOutput: [],
         onlyAsInput: []
     },
-	{
-		name: 'tyrian',
-		stones: [
-			'chisel:tyrian/shining',
-			'chisel:tyrian/tyrian',
-			'chisel:tyrian/chaotic',
-			'chisel:tyrian/softplate',
-			'chisel:tyrian/rust',
-			'chisel:tyrian/elaborate',
-			'chisel:tyrian/routes',
-			'chisel:tyrian/platform',
-			'chisel:tyrian/platetiles',
-			'chisel:tyrian/diagonal',
-			'chisel:tyrian/dent',
-			'chisel:tyrian/blueplating',
-			'chisel:tyrian/black',
-			'chisel:tyrian/black2',
-			'chisel:tyrian/opening',
-			'chisel:tyrian/plate'
-		],
-		onlyAsOutput: [],
-		onlyAsInput: []
-	},
-	{
-		name: 'terracotta',
-		stones: [
-			"minecraft:terracotta",
-			"chisel:terracotta/cracked",
-			"chisel:terracotta/solid_bricks",
-			"chisel:terracotta/small_bricks",
-			"chisel:terracotta/soft_bricks",
-			"chisel:terracotta/cracked_bricks",
-			"chisel:terracotta/triple_bricks",
-			"chisel:terracotta/encased_bricks",
-			"chisel:terracotta/chaotic_bricks",
-			"chisel:terracotta/array",
-			"chisel:terracotta/tiles_medium",
-			"chisel:terracotta/tiles_large",
-			"chisel:terracotta/tiles_small",
-			"chisel:terracotta/chaotic_medium",
-			"chisel:terracotta/chaotic_small",
-			"chisel:terracotta/braid",
-			"chisel:terracotta/dent",
-			"chisel:terracotta/french_1",
-			"chisel:terracotta/french_2",
-			"chisel:terracotta/jellybean",
-			"chisel:terracotta/layers",
-			"chisel:terracotta/mosaic",
-			"chisel:terracotta/ornate",
-			"chisel:terracotta/panel",
-			"chisel:terracotta/road",
-			"chisel:terracotta/slanted",
-			"chisel:terracotta/zag",
-			"chisel:terracotta/circular",
-			"chisel:terracotta/circularct",
-			"chisel:terracotta/weaver",
-			"chisel:terracotta/pillar",
-			"chisel:terracotta/twisted",
-			"chisel:terracotta/prism",
-			"chisel:terracotta/cuts"
-		],
-		onlyAsOutput: [],
-		onlyAsInput: []
-	},
-	{
-		name:'laboratory',
-		stones:[
-			'chisel:laboratory/wallpanel',
-			'chisel:laboratory/dottedpanel',
-			'chisel:laboratory/roundel',
-			'chisel:laboratory/wallvents',
-			'chisel:laboratory/largetile',
-			'chisel:laboratory/smalltile',
-			'chisel:laboratory/floortile',
-			'chisel:laboratory/checkertile',
-			'chisel:laboratory/fuzzscreen',
-			'chisel:laboratory/largesteel',
-			'chisel:laboratory/smallsteel',
-			'chisel:laboratory/directionleft',
-			'chisel:laboratory/directionright',
-			'chisel:laboratory/infocon'
-		],
-		onlyAsOutput: [],
-		onlyAsInput: []
-	},
-	{
-		name:'futura',
-		stones: [
-			'chisel:futura/screen_metallic',
-			'chisel:futura/screen_cyan',
-			'chisel:futura/controller',
-			'chisel:futura/wavy',
-			'chisel:futura/controller_purple',
-			'chisel:futura/uber_wavy'
-		],
-		onlyAsOutput: [],
-		onlyAsInput: []
-	},
-	{
-		name:'factory',
-		stones: [
-			'chisel:factory/dots',
-			'chisel:factory/rust2',
-			'chisel:factory/rust',
-			'chisel:factory/platex',
-			'chisel:factory/wireframewhite',
-			'chisel:factory/wireframe',
-			'chisel:factory/hazard',
-			'chisel:factory/hazardorange',
-			'chisel:factory/circuit',
-			'chisel:factory/metalbox',
-			'chisel:factory/goldplate',
-			'chisel:factory/goldplating',
-			'chisel:factory/grinder',
-			'chisel:factory/plating',
-			'chisel:factory/rustplates',
-			'chisel:factory/column',
-			'chisel:factory/frameblue',
-			'chisel:factory/iceiceice',
-			'chisel:factory/tilemosaic',
-			'chisel:factory/vent',
-			'chisel:factory/wireframeblue'
-		],
-		onlyAsOutput: [],
-		onlyAsInput: []
-	},
-	{
-		name:'mossy_cobblestone',
-		stones: [
-			'minecraft:mossy_cobblestone',
-			'chisel:mossy_cobblestone/cracked',
-			'chisel:mossy_cobblestone/solid_bricks',
-			'chisel:mossy_cobblestone/small_bricks',
-			'chisel:mossy_cobblestone/soft_bricks',
-			'chisel:mossy_cobblestone/cracked_bricks',
-			'chisel:mossy_cobblestone/triple_bricks',
-			'chisel:mossy_cobblestone/encased_bricks',
-			'chisel:mossy_cobblestone/chaotic_bricks',
-			'chisel:mossy_cobblestone/array',
-			'chisel:mossy_cobblestone/tiles_medium',
-			'chisel:mossy_cobblestone/tiles_large',
-			'chisel:mossy_cobblestone/tiles_small',
-			'chisel:mossy_cobblestone/chaotic_medium',
-			'chisel:mossy_cobblestone/chaotic_small',
-			'chisel:mossy_cobblestone/braid',
-			'chisel:mossy_cobblestone/dent',
-			'chisel:mossy_cobblestone/french_1',
-			'chisel:mossy_cobblestone/french_2',
-			'chisel:mossy_cobblestone/jellybean',
-			'chisel:mossy_cobblestone/layers',
-			'chisel:mossy_cobblestone/mosaic',
-			'chisel:mossy_cobblestone/ornate',
-			'chisel:mossy_cobblestone/panel',
-			'chisel:mossy_cobblestone/road',
-			'chisel:mossy_cobblestone/slanted',
-			'chisel:mossy_cobblestone/zag',
-			'chisel:mossy_cobblestone/circular',
-			'chisel:mossy_cobblestone/circularct',
-			'chisel:mossy_cobblestone/weaver',
-			'chisel:mossy_cobblestone/pillar',
-			'chisel:mossy_cobblestone/twisted',
-			'chisel:mossy_cobblestone/prism',
-			'chisel:mossy_cobblestone/cuts',
-			'chisel:mossy_cobblestone/extra/emboss',
-			'chisel:mossy_cobblestone/extra/indent',
-			'chisel:mossy_cobblestone/extra/marker'
-		],
-		onlyAsOutput: [],
-		onlyAsInput: []
-	},
-	{
-		name:'chisel_charcoal', //Recipe only costs 1 charcoal so can't also add storage blocks to this
-		stones: [
-			'chisel:charcoal/raw',
-			'chisel:charcoal/cracked',
-			'chisel:charcoal/solid_bricks',
-			'chisel:charcoal/small_bricks',
-			'chisel:charcoal/soft_bricks',
-			'chisel:charcoal/cracked_bricks',
-			'chisel:charcoal/triple_bricks',
-			'chisel:charcoal/encased_bricks',
-			'chisel:charcoal/chaotic_bricks',
-			'chisel:charcoal/array',
-			'chisel:charcoal/tiles_medium',
-			'chisel:charcoal/tiles_large',
-			'chisel:charcoal/tiles_small',
-			'chisel:charcoal/chaotic_medium',
-			'chisel:charcoal/chaotic_small',
-			'chisel:charcoal/braid',
-			'chisel:charcoal/dent',
-			'chisel:charcoal/french_1',
-			'chisel:charcoal/french_2',
-			'chisel:charcoal/jellybean',
-			'chisel:charcoal/layers',
-			'chisel:charcoal/mosaic',
-			'chisel:charcoal/ornate',
-			'chisel:charcoal/panel',
-			'chisel:charcoal/road',
-			'chisel:charcoal/slanted',
-			'chisel:charcoal/zag',
-			'chisel:charcoal/circular',
-			'chisel:charcoal/circularct',
-			'chisel:charcoal/weaver',
-			'chisel:charcoal/pillar',
-			'chisel:charcoal/twisted',
-			'chisel:charcoal/prism',
-			'chisel:charcoal/cuts'
-		],
-		onlyAsOutput: [],
-		onlyAsInput: []
-	},
-	{
-		name:'bricks',
-		stones:[
-			'minecraft:bricks',
-			'chisel:bricks/cracked',
-			'chisel:bricks/solid_bricks',
-			'chisel:bricks/small_bricks',
-			'chisel:bricks/soft_bricks',
-			'chisel:bricks/cracked_bricks',
-			'chisel:bricks/triple_bricks',
-			'chisel:bricks/encased_bricks',
-			'chisel:bricks/chaotic_bricks',
-			'chisel:bricks/array',
-			'chisel:bricks/tiles_medium',
-			'chisel:bricks/tiles_large',
-			'chisel:bricks/tiles_small',
-			'chisel:bricks/chaotic_medium',
-			'chisel:bricks/chaotic_small',
-			'chisel:bricks/braid',
-			'chisel:bricks/dent',
-			'chisel:bricks/french_1',
-			'chisel:bricks/french_2',
-			'chisel:bricks/jellybean',
-			'chisel:bricks/layers',
-			'chisel:bricks/mosaic',
-			'chisel:bricks/ornate',
-			'chisel:bricks/panel',
-			'chisel:bricks/road',
-			'chisel:bricks/slanted',
-			'chisel:bricks/zag',
-			'chisel:bricks/circular',
-			'chisel:bricks/circularct',
-			'chisel:bricks/weaver',
-			'chisel:bricks/pillar',
-			'chisel:bricks/twisted',
-			'chisel:bricks/prism',
-			'chisel:bricks/cuts'
-		],
-		onlyAsOutput: [],
-		onlyAsInput: []
-	},
-	{
-		name:'antiblock',
-		stones: [
-			'chisel:antiblock/white',
-			'chisel:antiblock/orange',
-			'chisel:antiblock/magenta',
-			'chisel:antiblock/light_blue',
-			'chisel:antiblock/yellow',
-			'chisel:antiblock/lime',
-			'chisel:antiblock/pink',
-			'chisel:antiblock/gray',
-			'chisel:antiblock/light_gray',
-			'chisel:antiblock/cyan',
-			'chisel:antiblock/purple',
-			'chisel:antiblock/blue',
-			'chisel:antiblock/brown',
-			'chisel:antiblock/green',
-			'chisel:antiblock/red',
-			'chisel:antiblock/black',
-		],
-		onlyAsOutput: [],
-		onlyAsInput: []
-	}
+    {
+        name: 'tyrian',
+        stones: [
+            'chisel:tyrian/shining',
+            'chisel:tyrian/tyrian',
+            'chisel:tyrian/chaotic',
+            'chisel:tyrian/softplate',
+            'chisel:tyrian/rust',
+            'chisel:tyrian/elaborate',
+            'chisel:tyrian/routes',
+            'chisel:tyrian/platform',
+            'chisel:tyrian/platetiles',
+            'chisel:tyrian/diagonal',
+            'chisel:tyrian/dent',
+            'chisel:tyrian/blueplating',
+            'chisel:tyrian/black',
+            'chisel:tyrian/black2',
+            'chisel:tyrian/opening',
+            'chisel:tyrian/plate'
+        ],
+        onlyAsOutput: [],
+        onlyAsInput: []
+    },
+    {
+        name: 'terracotta',
+        stones: [
+            'minecraft:terracotta',
+            'chisel:terracotta/cracked',
+            'chisel:terracotta/solid_bricks',
+            'chisel:terracotta/small_bricks',
+            'chisel:terracotta/soft_bricks',
+            'chisel:terracotta/cracked_bricks',
+            'chisel:terracotta/triple_bricks',
+            'chisel:terracotta/encased_bricks',
+            'chisel:terracotta/chaotic_bricks',
+            'chisel:terracotta/array',
+            'chisel:terracotta/tiles_medium',
+            'chisel:terracotta/tiles_large',
+            'chisel:terracotta/tiles_small',
+            'chisel:terracotta/chaotic_medium',
+            'chisel:terracotta/chaotic_small',
+            'chisel:terracotta/braid',
+            'chisel:terracotta/dent',
+            'chisel:terracotta/french_1',
+            'chisel:terracotta/french_2',
+            'chisel:terracotta/jellybean',
+            'chisel:terracotta/layers',
+            'chisel:terracotta/mosaic',
+            'chisel:terracotta/ornate',
+            'chisel:terracotta/panel',
+            'chisel:terracotta/road',
+            'chisel:terracotta/slanted',
+            'chisel:terracotta/zag',
+            'chisel:terracotta/circular',
+            'chisel:terracotta/circularct',
+            'chisel:terracotta/weaver',
+            'chisel:terracotta/pillar',
+            'chisel:terracotta/twisted',
+            'chisel:terracotta/prism',
+            'chisel:terracotta/cuts'
+        ],
+        onlyAsOutput: [],
+        onlyAsInput: []
+    },
+    {
+        name: 'laboratory',
+        stones: [
+            'chisel:laboratory/wallpanel',
+            'chisel:laboratory/dottedpanel',
+            'chisel:laboratory/roundel',
+            'chisel:laboratory/wallvents',
+            'chisel:laboratory/largetile',
+            'chisel:laboratory/smalltile',
+            'chisel:laboratory/floortile',
+            'chisel:laboratory/checkertile',
+            'chisel:laboratory/fuzzscreen',
+            'chisel:laboratory/largesteel',
+            'chisel:laboratory/smallsteel',
+            'chisel:laboratory/directionleft',
+            'chisel:laboratory/directionright',
+            'chisel:laboratory/infocon'
+        ],
+        onlyAsOutput: [],
+        onlyAsInput: []
+    },
+    {
+        name: 'futura',
+        stones: [
+            'chisel:futura/screen_metallic',
+            'chisel:futura/screen_cyan',
+            'chisel:futura/controller',
+            'chisel:futura/wavy',
+            'chisel:futura/controller_purple',
+            'chisel:futura/uber_wavy'
+        ],
+        onlyAsOutput: [],
+        onlyAsInput: []
+    },
+    {
+        name: 'factory',
+        stones: [
+            'chisel:factory/dots',
+            'chisel:factory/rust2',
+            'chisel:factory/rust',
+            'chisel:factory/platex',
+            'chisel:factory/wireframewhite',
+            'chisel:factory/wireframe',
+            'chisel:factory/hazard',
+            'chisel:factory/hazardorange',
+            'chisel:factory/circuit',
+            'chisel:factory/metalbox',
+            'chisel:factory/goldplate',
+            'chisel:factory/goldplating',
+            'chisel:factory/grinder',
+            'chisel:factory/plating',
+            'chisel:factory/rustplates',
+            'chisel:factory/column',
+            'chisel:factory/frameblue',
+            'chisel:factory/iceiceice',
+            'chisel:factory/tilemosaic',
+            'chisel:factory/vent',
+            'chisel:factory/wireframeblue'
+        ],
+        onlyAsOutput: [],
+        onlyAsInput: []
+    },
+    {
+        name: 'mossy_cobblestone',
+        stones: [
+            'minecraft:mossy_cobblestone',
+            'chisel:mossy_cobblestone/cracked',
+            'chisel:mossy_cobblestone/solid_bricks',
+            'chisel:mossy_cobblestone/small_bricks',
+            'chisel:mossy_cobblestone/soft_bricks',
+            'chisel:mossy_cobblestone/cracked_bricks',
+            'chisel:mossy_cobblestone/triple_bricks',
+            'chisel:mossy_cobblestone/encased_bricks',
+            'chisel:mossy_cobblestone/chaotic_bricks',
+            'chisel:mossy_cobblestone/array',
+            'chisel:mossy_cobblestone/tiles_medium',
+            'chisel:mossy_cobblestone/tiles_large',
+            'chisel:mossy_cobblestone/tiles_small',
+            'chisel:mossy_cobblestone/chaotic_medium',
+            'chisel:mossy_cobblestone/chaotic_small',
+            'chisel:mossy_cobblestone/braid',
+            'chisel:mossy_cobblestone/dent',
+            'chisel:mossy_cobblestone/french_1',
+            'chisel:mossy_cobblestone/french_2',
+            'chisel:mossy_cobblestone/jellybean',
+            'chisel:mossy_cobblestone/layers',
+            'chisel:mossy_cobblestone/mosaic',
+            'chisel:mossy_cobblestone/ornate',
+            'chisel:mossy_cobblestone/panel',
+            'chisel:mossy_cobblestone/road',
+            'chisel:mossy_cobblestone/slanted',
+            'chisel:mossy_cobblestone/zag',
+            'chisel:mossy_cobblestone/circular',
+            'chisel:mossy_cobblestone/circularct',
+            'chisel:mossy_cobblestone/weaver',
+            'chisel:mossy_cobblestone/pillar',
+            'chisel:mossy_cobblestone/twisted',
+            'chisel:mossy_cobblestone/prism',
+            'chisel:mossy_cobblestone/cuts',
+            'chisel:mossy_cobblestone/extra/emboss',
+            'chisel:mossy_cobblestone/extra/indent',
+            'chisel:mossy_cobblestone/extra/marker'
+        ],
+        onlyAsOutput: [],
+        onlyAsInput: []
+    },
+    {
+        name: 'chisel_charcoal', //Recipe only costs 1 charcoal so can't also add storage blocks to this
+        stones: [
+            'chisel:charcoal/raw',
+            'chisel:charcoal/cracked',
+            'chisel:charcoal/solid_bricks',
+            'chisel:charcoal/small_bricks',
+            'chisel:charcoal/soft_bricks',
+            'chisel:charcoal/cracked_bricks',
+            'chisel:charcoal/triple_bricks',
+            'chisel:charcoal/encased_bricks',
+            'chisel:charcoal/chaotic_bricks',
+            'chisel:charcoal/array',
+            'chisel:charcoal/tiles_medium',
+            'chisel:charcoal/tiles_large',
+            'chisel:charcoal/tiles_small',
+            'chisel:charcoal/chaotic_medium',
+            'chisel:charcoal/chaotic_small',
+            'chisel:charcoal/braid',
+            'chisel:charcoal/dent',
+            'chisel:charcoal/french_1',
+            'chisel:charcoal/french_2',
+            'chisel:charcoal/jellybean',
+            'chisel:charcoal/layers',
+            'chisel:charcoal/mosaic',
+            'chisel:charcoal/ornate',
+            'chisel:charcoal/panel',
+            'chisel:charcoal/road',
+            'chisel:charcoal/slanted',
+            'chisel:charcoal/zag',
+            'chisel:charcoal/circular',
+            'chisel:charcoal/circularct',
+            'chisel:charcoal/weaver',
+            'chisel:charcoal/pillar',
+            'chisel:charcoal/twisted',
+            'chisel:charcoal/prism',
+            'chisel:charcoal/cuts'
+        ],
+        onlyAsOutput: [],
+        onlyAsInput: []
+    },
+    {
+        name: 'bricks',
+        stones: [
+            'minecraft:bricks',
+            'chisel:bricks/cracked',
+            'chisel:bricks/solid_bricks',
+            'chisel:bricks/small_bricks',
+            'chisel:bricks/soft_bricks',
+            'chisel:bricks/cracked_bricks',
+            'chisel:bricks/triple_bricks',
+            'chisel:bricks/encased_bricks',
+            'chisel:bricks/chaotic_bricks',
+            'chisel:bricks/array',
+            'chisel:bricks/tiles_medium',
+            'chisel:bricks/tiles_large',
+            'chisel:bricks/tiles_small',
+            'chisel:bricks/chaotic_medium',
+            'chisel:bricks/chaotic_small',
+            'chisel:bricks/braid',
+            'chisel:bricks/dent',
+            'chisel:bricks/french_1',
+            'chisel:bricks/french_2',
+            'chisel:bricks/jellybean',
+            'chisel:bricks/layers',
+            'chisel:bricks/mosaic',
+            'chisel:bricks/ornate',
+            'chisel:bricks/panel',
+            'chisel:bricks/road',
+            'chisel:bricks/slanted',
+            'chisel:bricks/zag',
+            'chisel:bricks/circular',
+            'chisel:bricks/circularct',
+            'chisel:bricks/weaver',
+            'chisel:bricks/pillar',
+            'chisel:bricks/twisted',
+            'chisel:bricks/prism',
+            'chisel:bricks/cuts'
+        ],
+        onlyAsOutput: [],
+        onlyAsInput: []
+    },
+    {
+        name: 'antiblock',
+        stones: [
+            'chisel:antiblock/white',
+            'chisel:antiblock/orange',
+            'chisel:antiblock/magenta',
+            'chisel:antiblock/light_blue',
+            'chisel:antiblock/yellow',
+            'chisel:antiblock/lime',
+            'chisel:antiblock/pink',
+            'chisel:antiblock/gray',
+            'chisel:antiblock/light_gray',
+            'chisel:antiblock/cyan',
+            'chisel:antiblock/purple',
+            'chisel:antiblock/blue',
+            'chisel:antiblock/brown',
+            'chisel:antiblock/green',
+            'chisel:antiblock/red',
+            'chisel:antiblock/black'
+        ],
+        onlyAsOutput: [],
+        onlyAsInput: []
+    }
 ];
 
 let chippedTypes = ['wool', 'carpet', 'stained_glass', 'stained_glass_pane', 'terracotta', 'concrete'];
@@ -2434,12 +2434,12 @@ chippedTypes.forEach((chippedType) => {
         for (i = 1; i <= indexLength; i++) {
             stones.push(`chipped:${color}_${chippedType}_${i}`);
         }
-		//@Chisel
-		if(['wool','carpet'].includes(chippedType)) {
-			stones.push(`chisel:${chippedType}/${color}/llama`);
-			stones.push(`chisel:${chippedType}/${color}/legacy`);
-		}
-		//
+        //@Chisel
+        if (['wool', 'carpet'].includes(chippedType)) {
+            stones.push(`chisel:${chippedType}/${color}/llama`);
+            stones.push(`chisel:${chippedType}/${color}/legacy`);
+        }
+        //
         stonecuttables.push({
             name: `${color}_${chippedType}`,
             stones: stones,
@@ -2449,33 +2449,82 @@ chippedTypes.forEach((chippedType) => {
     });
 });
 
-
-let chiselStoneTypes = ["cracked","solid_bricks","small_bricks","soft_bricks","cracked_bricks","triple_bricks","encased_bricks","chaotic_bricks","array","tiles_medium","tiles_large","tiles_small","chaotic_medium","chaotic_small","braid","dent","french_1","french_2","jellybean","layers","mosaic","ornate","panel","road","slanted","zag","circular","circularct","weaver","pillar","twisted","prism","cuts"];
-colors.forEach((color) => { // @Chisel concrete
-	let stonecuttablesIndex = stonecuttables.findIndex((obj) => {return obj.name == `${color}_concrete`;});
-	if(stonecuttablesIndex > -1) {
-		let stones = stonecuttables[stonecuttablesIndex].stones;
-		chiselStoneTypes.forEach( (chiselStoneType) => {
-			stones.push(`chisel:concrete/${color}/${chiselStoneType}`);
-		});
-	}
+let chiselStoneTypes = [
+    'cracked',
+    'solid_bricks',
+    'small_bricks',
+    'soft_bricks',
+    'cracked_bricks',
+    'triple_bricks',
+    'encased_bricks',
+    'chaotic_bricks',
+    'array',
+    'tiles_medium',
+    'tiles_large',
+    'tiles_small',
+    'chaotic_medium',
+    'chaotic_small',
+    'braid',
+    'dent',
+    'french_1',
+    'french_2',
+    'jellybean',
+    'layers',
+    'mosaic',
+    'ornate',
+    'panel',
+    'road',
+    'slanted',
+    'zag',
+    'circular',
+    'circularct',
+    'weaver',
+    'pillar',
+    'twisted',
+    'prism',
+    'cuts'
+];
+colors.forEach((color) => {
+    // @Chisel concrete
+    let stonecuttablesIndex = stonecuttables.findIndex((obj) => {
+        return obj.name == `${color}_concrete`;
+    });
+    if (stonecuttablesIndex > -1) {
+        let stones = stonecuttables[stonecuttablesIndex].stones;
+        chiselStoneTypes.forEach((chiselStoneType) => {
+            stones.push(`chisel:concrete/${color}/${chiselStoneType}`);
+        });
+    }
 });
 
 // @Chisel Planks
-chiselPlankTypes = ['oak','spruce','birch','acacia','jungle','dark_oak'];
-chiselPlankVariants = ['large_planks','crude_horizontal_planks','vertical_planks','crude_vertical_planks','encased_planks','encased_large_planks','braced_planks','shipping_crate','paneling','crude_paneling','stacked','smooth','encased_smooth','braid','log_cabin'];
-chiselPlankTypes.forEach( (chiselPlankType) => {
-	let stones = [`minecraft:${chiselPlankType}_planks`];
-	chiselPlankVariants.forEach( (chiselPlankVariant) => {
-		stones.push(`chisel:planks/${chiselPlankType}/${chiselPlankVariant}`);
-	});
-	stonecuttables.push({
-		name: `${chiselPlankType}`,
-		stones: stones,
-		onlyAsOutput: [],
-		onlyAsInput: []
-	});
+chiselPlankTypes = ['oak', 'spruce', 'birch', 'acacia', 'jungle', 'dark_oak'];
+chiselPlankVariants = [
+    'large_planks',
+    'crude_horizontal_planks',
+    'vertical_planks',
+    'crude_vertical_planks',
+    'encased_planks',
+    'encased_large_planks',
+    'braced_planks',
+    'shipping_crate',
+    'paneling',
+    'crude_paneling',
+    'stacked',
+    'smooth',
+    'encased_smooth',
+    'braid',
+    'log_cabin'
+];
+chiselPlankTypes.forEach((chiselPlankType) => {
+    let stones = [`minecraft:${chiselPlankType}_planks`];
+    chiselPlankVariants.forEach((chiselPlankVariant) => {
+        stones.push(`chisel:planks/${chiselPlankType}/${chiselPlankVariant}`);
+    });
+    stonecuttables.push({
+        name: `${chiselPlankType}`,
+        stones: stones,
+        onlyAsOutput: [],
+        onlyAsInput: []
+    });
 });
-
-
-

From a3b40750dbe746b1e731edc95d46795168df69b5 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Tue, 26 Oct 2021 15:49:59 -0400
Subject: [PATCH 083/130] Update immersive_engineering.snbt

---
 config/ftbquests/quests/chapters/immersive_engineering.snbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/ftbquests/quests/chapters/immersive_engineering.snbt b/config/ftbquests/quests/chapters/immersive_engineering.snbt
index 7ce0b5da2e..33753f1e82 100644
--- a/config/ftbquests/quests/chapters/immersive_engineering.snbt
+++ b/config/ftbquests/quests/chapters/immersive_engineering.snbt
@@ -1151,7 +1151,7 @@
 		}
 		{
 			title: "Distillation Tower"
-			icon: { id: "immersivepetroleum:distillationtower", Count: 2b }
+			icon: "immersivepetroleum:distillationtower"
 			x: -4.5d
 			y: 1.5d
 			description: [

From 6a72410e36549cedb37d39005ef4a443a57dfcd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Tue, 26 Oct 2021 21:50:05 +0200
Subject: [PATCH 084/130] added forge tags to some chisel blocks

---
 .../kubejs/base/tags/items/forge/storage_blocks.js           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/storage_blocks.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/storage_blocks.js
index 45bbd20409..2d396a03c7 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/storage_blocks.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/storage_blocks.js
@@ -53,4 +53,9 @@ onEvent('item.tags', (event) => {
     event.add(storageBlocks + '/niotic', ['powah:niotic_crystal_block']);
     event.add(storageBlocks + '/spirited', ['powah:spirited_crystal_block']);
     event.add(storageBlocks + '/nitro', ['powah:nitro_crystal_block']);
+
+    event.add(storageBlocks + '/bronze', ['#chisel:metals/bronze']);
+    event.add(storageBlocks + '/emerald', ['#chisel:emerald']);
+    event.add(storageBlocks + '/glowstone', ['#chisel:glowstone']);
+    event.add(storageBlocks + '/redstone', ['#chisel:redstone']);
 });

From d7cdbf9fd9c7fecd0524632254feec718a09d1f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Tue, 26 Oct 2021 22:00:39 +0200
Subject: [PATCH 085/130] removed glowstone from explicit stonecuttables, it
 was causing a duplicate recipe

---
 .../kubejs/constants/stonecuttables.js        | 61 -------------------
 1 file changed, 61 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js b/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
index 96a3182a7f..82e4a86004 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/constants/stonecuttables.js
@@ -888,67 +888,6 @@ const stonecuttables = [
         onlyAsOutput: [],
         onlyAsInput: []
     },
-    {
-        name: 'glowstone',
-        stones: [
-            'minecraft:glowstone',
-            'chipped:glowstone_20',
-            'chipped:glowstone_19',
-            'chipped:glowstone_18',
-            'chipped:glowstone_17',
-            'chipped:glowstone_16',
-            'chipped:glowstone_15',
-            'chipped:glowstone_14',
-            'chipped:glowstone_13',
-            'chipped:glowstone_12',
-            'chipped:glowstone_11',
-            'chipped:glowstone_10',
-            'chipped:glowstone_9',
-            'chipped:glowstone_8',
-            'chipped:glowstone_7',
-            'chipped:glowstone_6',
-            'chipped:glowstone_5',
-            'chipped:glowstone_4',
-            'chipped:glowstone_3',
-            'chipped:glowstone_2',
-            'chipped:glowstone_1',
-            'chisel:glowstone/cracked',
-            'chisel:glowstone/solid_bricks',
-            'chisel:glowstone/small_bricks',
-            'chisel:glowstone/soft_bricks',
-            'chisel:glowstone/cracked_bricks',
-            'chisel:glowstone/triple_bricks',
-            'chisel:glowstone/encased_bricks',
-            'chisel:glowstone/array',
-            'chisel:glowstone/tiles_medium',
-            'chisel:glowstone/tiles_large',
-            'chisel:glowstone/tiles_small',
-            'chisel:glowstone/chaotic_medium',
-            'chisel:glowstone/chaotic_small',
-            'chisel:glowstone/braid',
-            'chisel:glowstone/dent',
-            'chisel:glowstone/french_1',
-            'chisel:glowstone/french_2',
-            'chisel:glowstone/jellybean',
-            'chisel:glowstone/layers',
-            'chisel:glowstone/mosaic',
-            'chisel:glowstone/ornate',
-            'chisel:glowstone/panel',
-            'chisel:glowstone/road',
-            'chisel:glowstone/slanted',
-            'chisel:glowstone/circular',
-            'chisel:glowstone/pillar',
-            'chisel:glowstone/twisted',
-            'chisel:glowstone/prism',
-            'chisel:glowstone/extra/bismuth',
-            'chisel:glowstone/extra/tiles_large_bismuth',
-            'chisel:glowstone/extra/tiles_medium_bismuth',
-            'chisel:glowstone/extra/neon',
-            'chisel:glowstone/extra/neon_panel'
-        ],
-        onlyAsOutput: [],
-        onlyAsInput: []
-    },
     {
         name: 'granite',
         stones: [

From e1d164e10157a85483c03fcef4814a545bb74cc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Tue, 26 Oct 2021 22:00:42 +0200
Subject: [PATCH 086/130] Update general.js

---
 kubejs/server_scripts/enigmatica/kubejs/constants/general.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/general.js b/kubejs/server_scripts/enigmatica/kubejs/constants/general.js
index 5ec8c00290..814dd5e2a8 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/constants/general.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/constants/general.js
@@ -28,7 +28,9 @@ const modPriorities = [
     'byg',
     'atum',
     'betterendforge',
-    'miniutilities'
+    'miniutilities',
+    'chipped',
+    'chisel'
 ];
 
 const lootChests = ['lootr:lootr_chest', 'lootr:lootr_barrel', 'lootr:lootr_trapped_chest'];

From b42fc650a07252b77a88eb0b887ce3561fd4082f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Tue, 26 Oct 2021 22:00:52 +0200
Subject: [PATCH 087/130] added chisel coal to storage_blocks tag

---
 .../enigmatica/kubejs/base/tags/items/forge/storage_blocks.js    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/storage_blocks.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/storage_blocks.js
index 2d396a03c7..59ae35a9ae 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/storage_blocks.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/storage_blocks.js
@@ -58,4 +58,5 @@ onEvent('item.tags', (event) => {
     event.add(storageBlocks + '/emerald', ['#chisel:emerald']);
     event.add(storageBlocks + '/glowstone', ['#chisel:glowstone']);
     event.add(storageBlocks + '/redstone', ['#chisel:redstone']);
+    event.add(storageBlocks + '/coal', ['#chisel:coal']);
 });

From 8796da74b03224b3550f527bd5477d64627f9558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Tue, 26 Oct 2021 22:23:42 +0200
Subject: [PATCH 088/130] Delete naturesstarlight-common-1.toml.bak

---
 config/naturesstarlight-common-1.toml.bak | 39 -----------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 config/naturesstarlight-common-1.toml.bak

diff --git a/config/naturesstarlight-common-1.toml.bak b/config/naturesstarlight-common-1.toml.bak
deleted file mode 100644
index ef6ae1419f..0000000000
--- a/config/naturesstarlight-common-1.toml.bak
+++ /dev/null
@@ -1,39 +0,0 @@
-#The amount of aura that the crystal generator generates per crystal growth
-crystalGeneratorAura = 30000
-#The maximum amount of starlight that is added around the powder of starry skies
-starlightEffectAddedStarlight = 0.6
-#The amount of aura that the powder of starry skies drains per second
-starlightEffectAuraDrain = 400
-
-[constellation]
-
-	[constellation.effect]
-
-		[constellation.effect.naritis]
-			#Set this to false to disable this ritual effect
-			enabled = true
-			#Defines the radius (in blocks) in which the ritual will do its effects.
-			#Range: 1.0 ~ 512.0
-			range = 5.0
-			#Defines the increase in radius the ritual will get per active lens enhancing the ritual.
-			#Range: 0.0 ~ 128.0
-			rangePerLens = 2.5
-			#Defines the amount of aura that this ritual generates per tick by default
-			auraPerTick = 350
-			#Defines the amount of aura the corrupted version of this ritual drains per tick by default
-			auraDrainPerTick = 75
-			#Defines the factor that the corrupted version of this ritual increases aura generation in the area by
-			auraGenIncreaseFactor = 2.5
-			#The enchantments that can be applied using stellar refraction, along with the minimum and maximum applied levels
-			engravingEnchantments = ["naturesaura:aura_mending, 1, 1", "minecraft:silk_touch, 1, 1", "minecraft:efficiency, 5, 6", "minecraft:thorns, 4, 6"]
-
-	[constellation.mantle]
-
-		[constellation.mantle.naritis]
-			#Set this to false to disable this mantle effect
-			enabled = true
-			#The amount of aura that one unit of charge creates
-			chargeToAuraRatio = 0.01
-			#The amount of charge that is converted into aura per second
-			chargeConvertedPerSecond = 6000.0
-

From 8fa3256ad4a620bc93804c7520442e78b79c8526 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Tue, 26 Oct 2021 16:32:47 -0400
Subject: [PATCH 089/130] Update en_us.json

---
 kubejs/assets/kubejs/lang/en_us.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json
index e04571283e..006b14dada 100644
--- a/kubejs/assets/kubejs/lang/en_us.json
+++ b/kubejs/assets/kubejs/lang/en_us.json
@@ -162,7 +162,7 @@
     "ritual.enigmatica.occultism/ritual/logic_director.conditions": "Not all requirements for this ritual are met.",
 
     "item.kubejs.craft_robit": "Ritual: Craft Sentient Robit.",
-    "item.kubejs.craft_robit.tooltip": "Binds a Foliot to perform to pilot the Robit.",
+    "item.kubejs.craft_robit.tooltip": "Binds a Foliot to pilot the Robit.",
     "ritual.enigmatica.occultism/ritual/robit.started": "What is my purpose?",
     "ritual.enigmatica.occultism/ritual/robit.finished": "You pass the salt.",
     "ritual.enigmatica.occultism/ritual/robit.interrupted": "Binding of foliot interrupted.",

From 2d66202672da878f3c08aa60f220cc6c19ea5fee Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <patrick@queztech.net>
Date: Wed, 27 Oct 2021 10:47:50 +0200
Subject: [PATCH 090/130] Use `pnc:compressed_iron_gear` texture from ERP

---
 .../textures/item/compressed_iron_gear.png       | Bin 0 -> 4903 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 kubejs/assets/pneumaticcraft/textures/item/compressed_iron_gear.png

diff --git a/kubejs/assets/pneumaticcraft/textures/item/compressed_iron_gear.png b/kubejs/assets/pneumaticcraft/textures/item/compressed_iron_gear.png
new file mode 100755
index 0000000000000000000000000000000000000000..25320600f43a543b77fd75d43e8640c31c583ecb
GIT binary patch
literal 4903
zcmcgwdyG`o86R3AsHIq`KqaL&V~ePqnRCuP_cgN6eZnRz!m_Xn)s}P5WB0nVb7$`i
zy9+I1B{6`Nwvj$)YYR<5Otw-IEhLnHP5MZ%N<uUmn^^dR76W257;0+mcV~8H7rP77
z=OjCO=bZ2S&iDA8@B7Z(zGC^3X*b<|QzDU=*1EK*9sb`E|4qFCzCZWwhaCRhm|wcK
zkVxD-BmSF|_`#26Cla5U7j$$LyV{mzMA(<&GW1nys4oxFiNwOiLwPQGRnhQOcaW<~
zUOIX_X#}z^*=e=mwtS=N36^e()T&L(JH)15;mPFUMaIIR3;^`0A~%NmvbjQLs4iK;
z&A@X!oK6}gkz#LMvOeC>=xSSGG=`Bf>=Z@<W7}}N6tS6OnF|bxDM@3RCKe(jW6=yT
zjge0hc8jFWv^TYk>;=E-l0C&@K9f!l4i2UU%~Tk5r-|ozF$SdwBv4^vuE>W_u5d>M
zp-B})6y%FRm@{HT?uQ$SbxF{)Y(ihY3Y#m8xCtDV9^&~lN#WR}l3>0kEQW=ia02n_
z^i_+bsDkG=MA?$YQlwQ@^{HI30J5aI0l2oUttvjQE`5Df=|Zu20L&P1$hgvlj*WSh
zZdZkHLnKu50PJ{2#hOB~U5)y)hUFk$U0e+G1Z(4&s~n()f(b<9nW|_$(-<jU45N-P
z%vQLwqT+Fb(iAr4cLq5b4i@f;Z5Uagns`ywC4op7D1?aBft?JtGuXWclMKdX(Keu_
z<V9W;CJ39cFku;rGZwx|IFy0jcwNzIyfckqHjLUr33`}GV|2W=v2jHd>L3dfh4v*4
zMr(7UO+4F1G)0nz6d4^xeH?-q^zm+$&gZ&I>bA9IT62XW&k5DqRF?!>Q$ZjzQYed<
zlptGhi5$%w#I+-lNlaT{({*j-SJpR$Vna-@czyYR%1{8tsB+Y@JuFO(sBaVGaAqRk
zv?$V?2**^O%^kafc3%`gj^Np`sIgWO5N$zhsll6?I1X|JBgn%pK^AtIAj-5kWl1BZ
zMFwC%B_1Edx+FNDG}sl>GrOTY=uixwG>N}Q=GR_lesp?uE&x~3q!AOV9F$d%<G}f_
zS7~fTFr>0wO#yhOP*ws=9GzKv^$aASQFm2LuZN%%fTo3!^whw+N1n35qVYYAP0QCd
zV@OMfBhQ2<Zut;F#avt1jF`e+n2s|OK$Mf-gjgmvxpb*QSlSX%kJ-p|T?@ICNXZ;Q
zxn{LuG0rg)%tH>50#U*g;<jc;x|j<tG*N=rjHP|;a^FFkVU4(80{Pf-5R+KBf-_}d
zt5z(FyV$n4jeO+;Gkws|^(+ffZF8HO%u~KwE0)bHOM4g)H0Y&Vu+de*LrPhKaX|!k
zaIIKyz^D{ZVtnc<1c7sr=eyuO%q`+sp75Bg8O!I`_ZddoBpxy~aKdH8MW$myNGxi*
z{{ohl*tA`ZEC)^?b7Ou{6OxQ)Qws|U=h>-MFVAwZD?u-x(o!7Z$#pzr6YX>0F;%!`
zPI%JsOm5l8WT1`offKIe3OP(@k6X;*tY%L5%5_ZvoX{Fe<TEDW3_<cDJ}`qTqLixn
z3<*LV;VS~<1ZokYY>1<#NCHQtG?nCzU#q_)u@n<vBUYA1lEiUzfcMIV#3u-|1yi+R
zDNO_wo`S$(8`&PSAda2|Omnpjhf-^*YsJzIBpk@h$Z@2JY;ZX^jY5iN!o@z8)bneO
zqxPu}2aka7f$flBfEdIA>Qc-+Ni}!J%Q=<$fF(G=bTFc(upm9e9)gpEw4)VxNCMBs
zIn9;T#Id{<v%aCxGd)6@>+9VXD0H;hX=-e2Xz|90d1a+5UDG6v37L{n<a6dD7g8tG
zeGE>83QC3f&)%%82795j#s|`LF;Wt2_LZ~{)Jjmvl*+cqwN`7BS`I}vbu1tk(9Cxz
zL%xP_pZJhK#-7Mh?k^XT^tCGvs0Yo#(jcxt8%JuzD%D@D8b+xp%y3aIry_2tluV8c
z2jesqwUzHO>|l?A!hMZat1MOsb#ahKs=gbl{dHTp^hC-R_`tPQ_l56Tz6~Mum4}!O
z9gOR16EYyy($`SLs8un&s(QKcV;z)am;*PCO5<0n>gL!kw7f|4@Lacon^QXZ?;C?X
zM_9m26xVUE2q?ojjkBEc97PDBaU1oKI84;V{*R3jVQxT0V~CaK5r^BKiVAf}9ff@c
z&*!s&D0O=2ft(z<R8_fc6hmXQ<(<%JQboZS4vgKUs)F%f-0!-KtE~h7zXz$5Kgww!
z{m~3j{@qmeWJ?^I(#0<`UM{GWgK!hfz;)s}7mQlUf6V9@E&NX}7%_)RZWwdfuMEK(
zg!r-g>H>aLUw)_@oZARqZEW}Z8xo00PqjAHces!5dtz^xtpD_Hx18?Sc{iFp`TQ4V
zMNc2-S@redKOOwy@bHP`nvRa)1KAmGh4n^iT97*WvHmktJMDYsy_VoxXFn4yKehY9
zsdLMg9Q)PoOJBXT`HeaJ8)wWvzrE#q-GA7xW*y&udiopNqA4n|e(w95ceVd<$+u5l
zoH2LT^V2_AbPP|%>w3?+^Ij@E`$}T}tVf?+*O@ps{My$RKhnNq;Y;TyPdcA%c;|1E
zPqZDr`NUs-_bva}doAw#-<%!je6nco?K-&q3DQsJZG7mR=;yC|=gPJd7q-5BvA2I?
zf9kBfuzK#}58eLF6EAK#eR0$JIbXW<;ggRQ9(-AJo(lHtif;SauATE&?Pxi+bJwj8
z|Mb;8m*0ExhO_o3{`&VTzhAkp;m)a7>Nb;^pWnyAxA1-D%#*i0_vWFu*^$SRlk)Fh
zo&!4FId%8}Q1{*`JEkSRvV6|32hPlVdgZ|%9-SYp`RwYufBZmt%eh3)F?HzvN!ym)
zwPpH(BMZ7#X21W`XA;l7dE@KH56(Swc*@r2PkFyccOBh~0DoQYgD=lGJmt$%K6&Kb
v`(HTy!mGQdY~B0u?;gG7Cm+1{VIutH<pX=}HP^(ivRa#$H$Bs^{*iwG7&%Go

literal 0
HcmV?d00001


From f4085061f3f15fd384a315d55462110c7236e89c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Wed, 27 Oct 2021 20:00:39 +0200
Subject: [PATCH 091/130] updated mods, added new tardis mod to test it out
 #3570

---
 config/sophisticatedbackpacks-common.toml |  14 +-
 config/supplementaries-common.toml        |   3 -
 minecraftinstance.json                    | 546 +++++++++++++++-------
 3 files changed, 381 insertions(+), 182 deletions(-)

diff --git a/config/sophisticatedbackpacks-common.toml b/config/sophisticatedbackpacks-common.toml
index 6e5f06c9e4..00a7cbaf3a 100644
--- a/config/sophisticatedbackpacks-common.toml
+++ b/config/sophisticatedbackpacks-common.toml
@@ -2,7 +2,7 @@
 #Common Settings
 [common]
 	#Disable / enable any items here (disables their recipes)
-	enabledItems = ["void_upgrade:true", "compacting_upgrade:true", "advanced_restock_upgrade:true", "diamond_backpack:true", "smelting_upgrade:true", "filter_upgrade:true", "magnet_upgrade:true", "advanced_magnet_upgrade:true", "deposit_upgrade:true", "iron_backpack:true", "stonecutter_upgrade:true", "backpack:true", "feeding_upgrade:true", "advanced_pickup_upgrade:true", "jukebox_upgrade:true", "everlasting_upgrade:true", "advanced_filter_upgrade:true", "inception_upgrade:true", "crafting_upgrade:true", "auto_smelting_upgrade:true", "pickup_upgrade:true", "stack_upgrade_tier_4:true", "stack_upgrade_tier_2:true", "stack_upgrade_tier_3:true", "stack_upgrade_tier_1:true", "upgrade_base:true", "refill_upgrade:true", "advanced_compacting_upgrade:true", "gold_backpack:true", "advanced_deposit_upgrade:true", "advanced_void_upgrade:true", "restock_upgrade:true", "advanced_tool_swapper_upgrade:true", "tool_swapper_upgrade:true", "netherite_backpack:true", "tank_upgrade:true", "advanced_feeding_upgrade:true", "battery_upgrade:true"]
+	enabledItems = ["void_upgrade:true", "compacting_upgrade:true", "advanced_restock_upgrade:true", "diamond_backpack:true", "smelting_upgrade:true", "filter_upgrade:true", "magnet_upgrade:true", "advanced_magnet_upgrade:true", "deposit_upgrade:true", "iron_backpack:true", "stonecutter_upgrade:true", "backpack:true", "feeding_upgrade:true", "advanced_pickup_upgrade:true", "jukebox_upgrade:true", "everlasting_upgrade:true", "advanced_filter_upgrade:true", "inception_upgrade:true", "crafting_upgrade:true", "auto_smelting_upgrade:true", "pickup_upgrade:true", "stack_upgrade_tier_4:true", "stack_upgrade_tier_2:true", "stack_upgrade_tier_3:true", "stack_upgrade_tier_1:true", "upgrade_base:true", "refill_upgrade:true", "advanced_compacting_upgrade:true", "gold_backpack:true", "advanced_deposit_upgrade:true", "advanced_void_upgrade:true", "restock_upgrade:true", "advanced_tool_swapper_upgrade:true", "tool_swapper_upgrade:true", "netherite_backpack:true", "tank_upgrade:true", "advanced_feeding_upgrade:true", "battery_upgrade:true", "advanced_pump_upgrade:true", "pump_upgrade:true"]
 	#Turns on/off loot added to various vanilla chest loot tables
 	chestLootEnabled = true
 
@@ -296,3 +296,15 @@
 		#List of items that are not supposed to stack in backpack even when stack upgrade is inserted. Item registry names are expected here.
 		nonStackableItems = []
 
+	#Pump Upgrade Settings
+	[common.pumpUpgrade]
+		#Number of fluid filter slots
+		#Range: 1 ~ 20
+		filterSlots = 4
+		#How much mB can be transfered in / out per operation. This is a base transfer rate that gets multiplied by number of rows in backpack and stack multiplier.
+		#Range: 1 ~ 1000
+		maxInputOutput = 20
+		#Ratio that gets applied (multiplies) to inventory stack multiplier before this is applied to max input/output value. Value lower than 1 makes stack multiplier affect the capacity less, higher makes it affect the capacity more. 0 turns off stack multiplier affecting input/output
+		#Range: 0.0 ~ 5.0
+		stackMultiplierRatio = 1.0
+
diff --git a/config/supplementaries-common.toml b/config/supplementaries-common.toml
index 24b9f9f346..52c5382993 100644
--- a/config/supplementaries-common.toml
+++ b/config/supplementaries-common.toml
@@ -3,9 +3,6 @@
 [blocks]
 
 	[blocks.globe]
-		#chanche of finding a globe in a shipwreck treasure chest.
-		#Range: 0.0 ~ 1.0
-		shipwreck_treasure_chance = 0.25
 		#how many globe trades to give to the wandering trader. This will effectively increase the chance of him having a globe trader. Increase this if you have other mods that add stuff to that trader
 		#Range: 0 ~ 50
 		chance = 2
diff --git a/minecraftinstance.json b/minecraftinstance.json
index 9180de9889..3fb61be003 100644
--- a/minecraftinstance.json
+++ b/minecraftinstance.json
@@ -30,8 +30,8 @@
   "isUnlocked": true,
   "javaArgsOverride": null,
   "javaDirOverride": null,
-  "lastPlayed": "2021-10-25T18:02:15.7802618Z",
-  "playedCount": 426,
+  "lastPlayed": "2021-10-27T17:22:23.0807556Z",
+  "playedCount": 429,
   "manifest": null,
   "fileDate": "0001-01-01T00:00:00",
   "installedModpack": null,
@@ -47,8 +47,8 @@
   "name": "Enigmatica6",
   "cachedScans": [],
   "isValid": true,
-  "lastPreviousMatchUpdate": "2021-10-20T19:33:07.4093241Z",
-  "lastRefreshAttempt": "2021-10-20T21:41:12.1634271+02:00",
+  "lastPreviousMatchUpdate": "2021-10-25T19:47:41.9859606Z",
+  "lastRefreshAttempt": "2021-10-25T21:47:43.3772211+02:00",
   "isEnabled": true,
   "isPinned": false,
   "gameVersion": "1.16.5",
@@ -1281,7 +1281,7 @@
       "dateInstalled": "2021-07-05T20:20:47.9641636Z",
       "dateUpdated": "2021-10-25T18:01:52.6051228Z",
       "dateLastUpdateAttempted": "2021-10-25T18:01:52.6051228Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -1601,7 +1601,7 @@
       "dateInstalled": "2021-07-05T20:20:47.9741847Z",
       "dateUpdated": "2021-10-25T18:00:02.5426063Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:02.5426063Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -5837,7 +5837,7 @@
       "dateInstalled": "2021-07-05T20:20:52.4999027Z",
       "dateUpdated": "2021-10-25T18:00:01.7786067Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:01.7786067Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -6250,7 +6250,7 @@
       "dateInstalled": "2021-07-05T20:20:52.541392Z",
       "dateUpdated": "2021-10-25T18:00:50.528941Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:50.528941Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -7212,59 +7212,59 @@
       "addonID": 412082,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3493463,
-        "displayName": "supplementaries-1.16.5-0.17.6.jar",
-        "fileName": "supplementaries-1.16.5-0.17.6.jar",
-        "fileDate": "2021-10-17T00:22:14.05Z",
-        "fileLength": 12099519,
+        "id": 3505596,
+        "displayName": "supplementaries-1.16.5-0.17.7.jar",
+        "fileName": "supplementaries-1.16.5-0.17.7.jar",
+        "fileDate": "2021-10-26T17:16:18.397Z",
+        "fileLength": 12233829,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3493/463/supplementaries-1.16.5-0.17.6.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3505/596/supplementaries-1.16.5-0.17.7.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 75995547,
-            "addonId": 486392,
-            "type": 2,
-            "fileId": 3493463
+            "id": 76809357,
+            "addonId": 499980,
+            "type": 3,
+            "fileId": 3505596
           },
           {
-            "id": 75995544,
+            "id": 76809353,
             "addonId": 243121,
             "type": 2,
-            "fileId": 3493463
+            "fileId": 3505596
           },
           {
-            "id": 75995546,
+            "id": 76809355,
             "addonId": 457570,
             "type": 2,
-            "fileId": 3493463
+            "fileId": 3505596
           },
           {
-            "id": 75995548,
-            "addonId": 499980,
-            "type": 3,
-            "fileId": 3493463
+            "id": 76809354,
+            "addonId": 284007,
+            "type": 2,
+            "fileId": 3505596
           },
           {
-            "id": 75995545,
-            "addonId": 284007,
+            "id": 76809356,
+            "addonId": 486392,
             "type": 2,
-            "fileId": 3493463
+            "fileId": 3505596
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 3927160595,
+            "fingerprint": 1791225413,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "net",
-            "fingerprint": 1016092475,
+            "fingerprint": 2201390511,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -7276,13 +7276,13 @@
           },
           {
             "foldername": "assets",
-            "fingerprint": 3766852348,
+            "fingerprint": 855348893,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
-            "fingerprint": 1843143962,
+            "fingerprint": 4074148857,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -7300,18 +7300,18 @@
           },
           {
             "foldername": "supplementaries.mixins.json",
-            "fingerprint": 2628916953,
+            "fingerprint": 970020684,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "supplementaries.refmap.json",
-            "fingerprint": 4281158774,
+            "fingerprint": 3695146361,
             "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 4122961779,
+        "packageFingerprint": 2673931494,
         "gameVersion": [
           "1.16.3",
           "1.16.5",
@@ -7353,20 +7353,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2543311,
+        "renderCacheId": 2558458,
         "projectId": 412082,
-        "packageFingerprintId": 763821660,
+        "packageFingerprintId": 770882513,
         "gameVersionDateReleased": "2019-08-01T00:00:00Z",
-        "gameVersionMappingId": 3388295,
+        "gameVersionMappingId": 3415612,
         "gameVersionId": 7498,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "supplementaries-1.16.5-0.17.6.jar"
+        "FileNameOnDisk": "supplementaries-1.16.5-0.17.7.jar"
       },
       "dateInstalled": "2021-08-11T21:22:43.3270429Z",
-      "dateUpdated": "2021-10-20T17:46:10.7380489Z",
-      "dateLastUpdateAttempted": "2021-10-20T17:46:10.7380489Z",
-      "status": 5,
+      "dateUpdated": "2021-10-27T17:18:47.0671406Z",
+      "dateLastUpdateAttempted": "2021-10-27T17:18:47.0671406Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -7740,7 +7740,7 @@
       "dateInstalled": "2021-09-01T20:23:23.4515179Z",
       "dateUpdated": "2021-10-25T18:01:47.5473886Z",
       "dateLastUpdateAttempted": "2021-10-25T18:01:47.5473886Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -9604,7 +9604,7 @@
       "dateInstalled": "2021-07-05T20:20:54.9328256Z",
       "dateUpdated": "2021-10-25T18:00:45.0357314Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:45.0357314Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -10494,7 +10494,7 @@
       "dateInstalled": "2021-07-05T20:20:57.5145815Z",
       "dateUpdated": "2021-10-25T18:02:01.284463Z",
       "dateLastUpdateAttempted": "2021-10-25T18:02:01.284463Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -11455,7 +11455,7 @@
       "dateInstalled": "2021-07-05T20:20:57.5275809Z",
       "dateUpdated": "2021-10-25T18:01:53.795125Z",
       "dateLastUpdateAttempted": "2021-10-25T18:01:53.795125Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -12820,7 +12820,7 @@
       "dateInstalled": "2021-07-05T20:20:57.5375822Z",
       "dateUpdated": "2021-10-25T18:00:17.4311452Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:17.4311452Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -12943,7 +12943,7 @@
       "dateInstalled": "2021-07-05T20:19:25.2909342Z",
       "dateUpdated": "2021-10-25T18:00:43.0407268Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:43.0407268Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -13432,35 +13432,35 @@
       "addonID": 361026,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3498928,
-        "displayName": "occultism-1.17.4.jar",
-        "fileName": "occultism-1.16.5-1.17.4.jar",
-        "fileDate": "2021-10-22T11:34:49.597Z",
-        "fileLength": 4368757,
+        "id": 3506426,
+        "displayName": "occultism-1.17.5.jar",
+        "fileName": "occultism-1.16.5-1.17.5.jar",
+        "fileDate": "2021-10-27T14:36:50.633Z",
+        "fileLength": 4371953,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3498/928/occultism-1.16.5-1.17.4.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3506/426/occultism-1.16.5-1.17.5.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 76425520,
+            "id": 76878862,
             "addonId": 309927,
             "type": 3,
-            "fileId": 3498928
+            "fileId": 3506426
           },
           {
-            "id": 76425519,
+            "id": 76878861,
             "addonId": 306770,
             "type": 3,
-            "fileId": 3498928
+            "fileId": 3506426
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 2549410036,
+            "fingerprint": 3112152308,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -13484,18 +13484,18 @@
           },
           {
             "foldername": "assets",
-            "fingerprint": 1994858859,
+            "fingerprint": 1565899823,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
-            "fingerprint": 1443426523,
+            "fingerprint": 3449879746,
             "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 137070308,
+        "packageFingerprint": 3021385479,
         "gameVersion": [
           "1.16.3",
           "1.16.5",
@@ -13545,19 +13545,19 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2550415,
+        "renderCacheId": 2559532,
         "projectId": 361026,
-        "packageFingerprintId": 767779863,
+        "packageFingerprintId": 771446377,
         "gameVersionDateReleased": "2019-08-01T00:00:00Z",
-        "gameVersionMappingId": 3402893,
+        "gameVersionMappingId": 3417787,
         "gameVersionId": 7498,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "occultism-1.16.5-1.17.4.jar"
+        "FileNameOnDisk": "occultism-1.16.5-1.17.5.jar"
       },
       "dateInstalled": "2021-09-25T14:41:32.7416314Z",
-      "dateUpdated": "2021-10-25T18:01:48.0503882Z",
-      "dateLastUpdateAttempted": "2021-10-25T18:01:48.0503882Z",
+      "dateUpdated": "2021-10-27T17:18:48.6558026Z",
+      "dateLastUpdateAttempted": "2021-10-27T17:18:48.6558026Z",
       "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
@@ -14884,7 +14884,7 @@
       "dateInstalled": "2021-07-10T17:55:07.2563413Z",
       "dateUpdated": "2021-10-25T18:00:54.8379355Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:54.8379355Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -15147,7 +15147,7 @@
       "dateInstalled": "2021-09-28T18:08:09.9226898Z",
       "dateUpdated": "2021-10-25T18:00:51.7959353Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:51.7959353Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -15266,14 +15266,14 @@
       "addonID": 363363,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3483059,
-        "displayName": "Extreme Sound Muffler 3.16 - Forge 1.16.5",
-        "fileName": "extremeSoundMuffler-3.16_1.16.5.jar",
-        "fileDate": "2021-10-06T10:54:28.19Z",
-        "fileLength": 283454,
+        "id": 3506112,
+        "displayName": "Extreme Sound Muffler 3.17 - Forge 1.16.5",
+        "fileName": "extremeSoundMuffler-3.17_1.16.5.jar",
+        "fileDate": "2021-10-27T06:00:14.093Z",
+        "fileLength": 284548,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3483/59/extremeSoundMuffler-3.16_1.16.5.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3506/112/extremeSoundMuffler-3.17_1.16.5.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -15281,61 +15281,81 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 3601481315,
-            "type": 0,
+            "fingerprint": 2339713275,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 248376923,
-            "type": 0,
+            "fingerprint": 3113472407,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
-            "fingerprint": 2159168,
-            "type": 0,
+            "fingerprint": 2963132567,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "esm_logo.png",
             "fingerprint": 1632690954,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 2066463772,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "extremesoundmuffler.refmap.json",
             "fingerprint": 823211581,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 331046537,
+        "packageFingerprint": 586800759,
         "gameVersion": [
           "1.16.5",
           "Forge"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2559142,
+        "projectId": 363363,
+        "packageFingerprintId": 771230755,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3416874,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "extremeSoundMuffler-3.16_1.16.5.jar"
+        "FileNameOnDisk": "extremeSoundMuffler-3.17_1.16.5.jar"
       },
       "dateInstalled": "2021-07-05T20:21:03.3831197Z",
-      "dateUpdated": "2021-10-07T18:09:14.2795249Z",
-      "dateLastUpdateAttempted": "2021-10-07T18:09:14.2795249Z",
-      "status": 5,
+      "dateUpdated": "2021-10-27T17:18:43.4434457Z",
+      "dateLastUpdateAttempted": "2021-10-27T17:18:43.4434457Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -15902,7 +15922,7 @@
       "dateInstalled": "2021-07-05T20:19:25.3039342Z",
       "dateUpdated": "2021-10-25T18:00:31.0721469Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:31.0721469Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -16900,7 +16920,7 @@
       "dateInstalled": "2021-10-04T19:00:56.2227538Z",
       "dateUpdated": "2021-10-25T18:00:53.0069341Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:53.0069341Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -17822,7 +17842,7 @@
       "dateInstalled": "2021-07-05T20:21:03.3581211Z",
       "dateUpdated": "2021-10-25T18:00:24.6009353Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:24.6009353Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -19699,7 +19719,7 @@
       "dateInstalled": "2021-07-05T20:21:03.3331219Z",
       "dateUpdated": "2021-10-25T18:01:08.7073629Z",
       "dateLastUpdateAttempted": "2021-10-25T18:01:08.7073629Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -20600,7 +20620,7 @@
       "dateInstalled": "2021-07-05T20:21:08.4404715Z",
       "dateUpdated": "2021-10-25T18:00:58.3219376Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:58.3219376Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -20942,7 +20962,7 @@
       "dateInstalled": "2021-07-05T20:19:25.2879367Z",
       "dateUpdated": "2021-10-25T18:02:01.7698699Z",
       "dateLastUpdateAttempted": "2021-10-25T18:02:01.7698699Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -22046,7 +22066,7 @@
       "dateInstalled": "2021-07-05T20:19:25.3009353Z",
       "dateUpdated": "2021-10-25T18:00:30.9581467Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:30.9581467Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -22274,7 +22294,7 @@
       "dateInstalled": "2021-08-05T21:06:59.9349112Z",
       "dateUpdated": "2021-10-25T18:01:58.3845638Z",
       "dateLastUpdateAttempted": "2021-10-25T18:01:58.3845638Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -22978,7 +22998,7 @@
       "dateInstalled": "2021-09-13T17:30:41.8608324Z",
       "dateUpdated": "2021-10-25T18:00:03.1306103Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:03.1306103Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -24247,7 +24267,7 @@
       "dateInstalled": "2021-07-12T18:56:07.2846942Z",
       "dateUpdated": "2021-10-25T18:00:09.8009598Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:09.8009598Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -25772,7 +25792,7 @@
       "dateInstalled": "2021-10-08T18:14:50.7214402Z",
       "dateUpdated": "2021-10-25T18:00:36.1754708Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:36.1754708Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -26947,6 +26967,122 @@
       "manifestName": null,
       "installedTargets": null
     },
+    {
+      "addonID": 290247,
+      "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
+      "installedFile": {
+        "id": 3482231,
+        "displayName": "Release 1.5.1 (1.16.5)",
+        "fileName": "Tardis-Mod-1.16.5-1.5.1.jar",
+        "fileDate": "2021-10-05T14:51:46.203Z",
+        "fileLength": 51327841,
+        "releaseType": 1,
+        "fileStatus": 4,
+        "downloadUrl": "https://edge.forgecdn.net/files/3482/231/Tardis-Mod-1.16.5-1.5.1.jar",
+        "isAlternate": false,
+        "alternateFileId": 0,
+        "dependencies": [],
+        "isAvailable": true,
+        "modules": [
+          {
+            "foldername": "META-INF",
+            "fingerprint": 3308992756,
+            "type": 3,
+            "invalidFingerprint": false
+          },
+          {
+            "foldername": "net",
+            "fingerprint": 514064872,
+            "type": 3,
+            "invalidFingerprint": false
+          },
+          {
+            "foldername": "tardis.mixins.json",
+            "fingerprint": 3516601457,
+            "type": 3,
+            "invalidFingerprint": false
+          },
+          {
+            "foldername": "assets",
+            "fingerprint": 16174324,
+            "type": 3,
+            "invalidFingerprint": false
+          },
+          {
+            "foldername": "logo.png",
+            "fingerprint": 488549304,
+            "type": 3,
+            "invalidFingerprint": false
+          },
+          {
+            "foldername": "data",
+            "fingerprint": 3421155963,
+            "type": 3,
+            "invalidFingerprint": false
+          },
+          {
+            "foldername": "pack.mcmeta",
+            "fingerprint": 957205136,
+            "type": 3,
+            "invalidFingerprint": false
+          },
+          {
+            "foldername": "tardis.refmap.json",
+            "fingerprint": 1491836333,
+            "type": 3,
+            "invalidFingerprint": false
+          }
+        ],
+        "packageFingerprint": 3519640290,
+        "gameVersion": [
+          "1.16.5",
+          "Forge"
+        ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
+        ],
+        "hasInstallScript": false,
+        "isCompatibleWithClient": false,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2528703,
+        "projectId": 290247,
+        "packageFingerprintId": 756805727,
+        "gameVersionDateReleased": "2008-03-01T06:00:00Z",
+        "gameVersionMappingId": 3358871,
+        "gameVersionId": 4458,
+        "gameId": 432,
+        "isServerPack": false,
+        "FileNameOnDisk": "Tardis-Mod-1.16.5-1.5.1.jar"
+      },
+      "dateInstalled": "2021-10-27T17:21:26.4878221Z",
+      "dateUpdated": "2021-10-27T17:21:26.5284161Z",
+      "dateLastUpdateAttempted": "2021-10-27T17:21:26.5284161Z",
+      "status": 4,
+      "preferenceAutoInstallUpdates": null,
+      "preferenceAlternateFile": false,
+      "preferenceIsIgnored": false,
+      "isModified": false,
+      "isWorkingCopy": false,
+      "isFuzzyMatch": false,
+      "preferenceReleaseType": null,
+      "manifestName": null,
+      "installedTargets": []
+    },
     {
       "addonID": 393149,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
@@ -27259,7 +27395,7 @@
       "dateInstalled": "2021-08-13T18:01:17.0810367Z",
       "dateUpdated": "2021-10-25T18:00:59.8919355Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:59.8919355Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -27982,7 +28118,7 @@
       "dateInstalled": "2021-09-10T17:14:11.272099Z",
       "dateUpdated": "2021-10-25T18:00:19.1800708Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:19.1800708Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -27997,112 +28133,125 @@
       "addonID": 422301,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3485233,
-        "displayName": "sophisticatedbackpacks-1.16.5-3.4.2.354.jar",
-        "fileName": "sophisticatedbackpacks-1.16.5-3.4.2.354.jar",
-        "fileDate": "2021-10-08T22:36:52.187Z",
-        "fileLength": 1252692,
+        "id": 3504750,
+        "displayName": "sophisticatedbackpacks-1.16.5-3.7.0.378.jar",
+        "fileName": "sophisticatedbackpacks-1.16.5-3.7.0.378.jar",
+        "fileDate": "2021-10-25T21:00:25.357Z",
+        "fileLength": 1335416,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3485/233/sophisticatedbackpacks-1.16.5-3.4.2.354.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3504/750/sophisticatedbackpacks-1.16.5-3.7.0.378.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 0,
+            "id": 76729033,
             "addonId": 309927,
             "type": 2,
-            "fileId": 0
+            "fileId": 3504750
           },
           {
-            "id": 0,
-            "addonId": 225643,
+            "id": 76729032,
+            "addonId": 301356,
             "type": 2,
-            "fileId": 0
+            "fileId": 3504750
           },
           {
-            "id": 0,
-            "addonId": 233071,
+            "id": 76729031,
+            "addonId": 243121,
             "type": 2,
-            "fileId": 0
+            "fileId": 3504750
           },
           {
-            "id": 0,
-            "addonId": 238222,
+            "id": 76729028,
+            "addonId": 225643,
             "type": 2,
-            "fileId": 0
+            "fileId": 3504750
           },
           {
-            "id": 0,
-            "addonId": 301356,
+            "id": 76729030,
+            "addonId": 238222,
             "type": 2,
-            "fileId": 0
+            "fileId": 3504750
           },
           {
-            "id": 0,
-            "addonId": 243121,
+            "id": 76729029,
+            "addonId": 233071,
             "type": 2,
-            "fileId": 0
+            "fileId": 3504750
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 3910823808,
-            "type": 0,
+            "fingerprint": 2843262292,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "net",
-            "fingerprint": 139536063,
-            "type": 0,
+            "fingerprint": 1291234390,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "logo.png",
             "fingerprint": 2552684475,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 1102936719,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
-            "fingerprint": 2597053471,
-            "type": 0,
+            "fingerprint": 2229682225,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
-            "fingerprint": 1415314844,
-            "type": 0,
+            "fingerprint": 629818330,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 313775566,
+        "packageFingerprint": 3585556718,
         "gameVersion": [
           "1.16.5"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2557388,
+        "projectId": 422301,
+        "packageFingerprintId": 770351994,
         "gameVersionDateReleased": "2021-01-15T14:14:48.91Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3413547,
+        "gameVersionId": 8203,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "sophisticatedbackpacks-1.16.5-3.4.2.354.jar"
+        "FileNameOnDisk": "sophisticatedbackpacks-1.16.5-3.7.0.378.jar"
       },
       "dateInstalled": "2021-07-05T20:21:15.1320328Z",
-      "dateUpdated": "2021-10-09T18:04:04.3029611Z",
-      "dateLastUpdateAttempted": "2021-10-09T18:04:04.3029611Z",
-      "status": 5,
+      "dateUpdated": "2021-10-27T17:18:43.2550968Z",
+      "dateLastUpdateAttempted": "2021-10-27T17:18:43.2550968Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -30042,14 +30191,14 @@
       "addonID": 357540,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3432418,
-        "displayName": "[Forge.1.16.2-1.16.5] InventoryHUD+ (v3.4.0)",
-        "fileName": "InventoryHud_[1.16.2-1.16.5].forge-3.4.0.jar",
-        "fileDate": "2021-08-20T14:17:37.54Z",
-        "fileLength": 196910,
+        "id": 3505181,
+        "displayName": "[Forge.1.16.2-1.16.5] InventoryHUD+ (v3.4.1)",
+        "fileName": "InventoryHud_[1.16.2-1.16.5].forge-3.4.1.jar",
+        "fileDate": "2021-10-26T08:32:02.063Z",
+        "fileLength": 197654,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3432/418/InventoryHud_[1.16.2-1.16.5].forge-3.4.0.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3505/181/InventoryHud_[1.16.2-1.16.5].forge-3.4.1.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -30057,36 +30206,36 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 4200453640,
-            "type": 0,
+            "fingerprint": 954236187,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "dlovin",
-            "fingerprint": 637678159,
-            "type": 0,
+            "fingerprint": 3837508223,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
-            "fingerprint": 1366209809,
-            "type": 0,
+            "fingerprint": 1600314190,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "logo.png",
             "fingerprint": 2496424231,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 1438559181,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 1510091854,
+        "packageFingerprint": 3040432000,
         "gameVersion": [
           "1.16.3",
           "1.16.5",
@@ -30094,21 +30243,62 @@
           "1.16.4",
           "1.16.2"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000003",
+            "gameVersion": "1.16.3",
+            "gameVersionReleaseDate": "2020-09-10T14:44:20.443Z",
+            "gameVersionName": "1.16.3",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000004",
+            "gameVersion": "1.16.4",
+            "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z",
+            "gameVersionName": "1.16.4",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000002",
+            "gameVersion": "1.16.2",
+            "gameVersionReleaseDate": "2020-08-11T16:42:21.863Z",
+            "gameVersionName": "1.16.2",
+            "gameVersionTypeId": 70886
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2557929,
+        "projectId": 357540,
+        "packageFingerprintId": 770618222,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3414614,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "InventoryHud_[1.16.2-1.16.5].forge-3.4.0.jar"
+        "FileNameOnDisk": "InventoryHud_[1.16.2-1.16.5].forge-3.4.1.jar"
       },
       "dateInstalled": "2021-07-05T20:21:15.1520307Z",
-      "dateUpdated": "2021-08-22T11:00:53.2590986Z",
-      "dateLastUpdateAttempted": "2021-08-22T11:00:53.2590986Z",
-      "status": 5,
+      "dateUpdated": "2021-10-27T17:18:43.3384684Z",
+      "dateLastUpdateAttempted": "2021-10-27T17:18:43.3384684Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -33309,7 +33499,7 @@
       "dateInstalled": "2021-07-05T20:21:18.9860639Z",
       "dateUpdated": "2021-10-25T18:00:57.6849346Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:57.6849346Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -33630,7 +33820,7 @@
       "dateInstalled": "2021-10-01T04:22:30.4801221Z",
       "dateUpdated": "2021-10-25T18:00:41.470726Z",
       "dateLastUpdateAttempted": "2021-10-25T18:00:41.470726Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,

From 6f68f1e0ffd99d61a85f524a8a8348252ffbf51e Mon Sep 17 00:00:00 2001
From: Iris <48930896+Iris-xii@users.noreply.github.com>
Date: Wed, 27 Oct 2021 20:55:14 +0200
Subject: [PATCH 092/130] Added ppfluids (Pretty Fluids Pipe) to Morphtool

The morphtool now brings out the PrettyPipes Pipe Wrench when looking at a fluid pipe.
---
 config/morphtool-common.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/morphtool-common.toml b/config/morphtool-common.toml
index 10d445c95e..bf7391c7ac 100644
--- a/config/morphtool-common.toml
+++ b/config/morphtool-common.toml
@@ -3,5 +3,5 @@
 "Whitelisted Items" = ["compactmachines:personal_shrinking_device", "botania:twig_wand", "immersiveengineering:tool", "bloodmagic:ritual_reader", "bloodmagic:ritualtinkerer", "astralsorcery:wand", "transport:rail_breaker", "storagedrawers:drawer_key", "resourcefulbees_scraper", "ars_nouveau:dominion_wand"]
 "Whitelisted Names" = ["wrench", "screwdriver", "hammer", "rotator", "configurator", "crowbar"]
 "Blacklisted Mods" = []
-"Mod Aliases" = ["mythicbotany=botania", "rsrequestify=refinedstorage", "framedcompactdrawers=storagedrawers", "extrastorage=refinedstorage", "thermalexpansion=thermalfoundation", "thermaldynamics=thermalfoundation", "thermalcultivation=thermalfoundation", "integrateddynamics=integratedtunnels", "mekanismgenerators=mekanism", "mekanismtools=mekanism", "xnet=rftoolsbase", "rftoolspower=rftoolsbase", "rftoolsutility=rftoolsbase", "rftoolsstorage=rftoolsbase", "rftoolscontrol=rftoolsbase", "rftoolsbuilder=rftoolsbase", "rftoolsdimensions=rftoolsbase"]
+"Mod Aliases" = ["mythicbotany=botania", "rsrequestify=refinedstorage", "framedcompactdrawers=storagedrawers", "extrastorage=refinedstorage", "thermalexpansion=thermalfoundation", "thermaldynamics=thermalfoundation", "thermalcultivation=thermalfoundation", "integrateddynamics=integratedtunnels", "mekanismgenerators=mekanism", "mekanismtools=mekanism", "xnet=rftoolsbase", "rftoolspower=rftoolsbase", "rftoolsutility=rftoolsbase", "rftoolsstorage=rftoolsbase", "rftoolscontrol=rftoolsbase", "rftoolsbuilder=rftoolsbase", "rftoolsdimensions=rftoolsbase", "ppfluids=prettypipes"]
 

From c0f9d495f0e1dff74e8d8c23d3b4841374f80c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Thu, 28 Oct 2021 19:16:20 +0200
Subject: [PATCH 093/130] fixed #3220

---
 .../enigmatica/kubejs/base/tags/items/forge/dusts.js             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/dusts.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/dusts.js
index 47812e9929..a4218a0e22 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/dusts.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/forge/dusts.js
@@ -17,6 +17,7 @@ onEvent('item.tags', (event) => {
 
     event.add('forge:dusts/starmetal', 'astralsorcery:stardust');
     event.get('forge:dusts/lapis').add('mekanism:dust_lapis_lazuli');
+    event.get('forge:dusts/netherite_scrap').add('mekanism:dust_netherite');
 
     event.get('forge:dusts').remove('minecraft:prismarine_shard');
     event.get('forge:dusts/prismarine').remove('minecraft:prismarine_shard');

From 7ca03b3aff0443f4837d646d1fb664c7b2705bc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Thu, 28 Oct 2021 20:04:32 +0200
Subject: [PATCH 094/130] hide EE ruby / sapphire from JEI

---
 kubejs/client_scripts/constants.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kubejs/client_scripts/constants.js b/kubejs/client_scripts/constants.js
index 74527d8ecd..93ad1d3d14 100644
--- a/kubejs/client_scripts/constants.js
+++ b/kubejs/client_scripts/constants.js
@@ -372,7 +372,9 @@ ee_types.forEach((type) => {
         `emendatusenigmatica:lapis_${type}`,
         `emendatusenigmatica:emerald_${type}`,
         `emendatusenigmatica:diamond_${type}`,
-        `emendatusenigmatica:coal_${type}`
+        `emendatusenigmatica:coal_${type}`,
+        `emendatusenigmatica:sapphire_${type}`,
+        `emendatusenigmatica:ruby_${type}`
     );
 });
 

From a9169120f8be583490ce5453ff8ba59c9a5e2c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Fri, 29 Oct 2021 22:01:46 +0200
Subject: [PATCH 095/130] increased liquid meat yield from laser drilling cows
 25x

---
 .../expert/recipetypes/industrialforegoing/laser_drill_fluid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/laser_drill_fluid.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/laser_drill_fluid.js
index 0a9740eb1e..c0ae441846 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/laser_drill_fluid.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/laser_drill_fluid.js
@@ -5,7 +5,7 @@ onEvent('recipes', (event) => {
     const id_prefix = 'enigmatica:expert/industrialforegoing/laser_drill_fluids/';
     const recipes = [
         {
-            output: '{FluidName:"industrialforegoing:meat",Amount:100}',
+            output: '{FluidName:"industrialforegoing:meat",Amount:2500}',
             rarity: [
                 {
                     whitelist: {},

From 5fce606eb5c830525ffdac16859db91b7d43dfa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Fri, 29 Oct 2021 22:11:49 +0200
Subject: [PATCH 096/130] increased pink slime yield from pink wither 10x

---
 .../base/recipetypes/industrialforegoing/laser_drill_fluid.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/industrialforegoing/laser_drill_fluid.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/industrialforegoing/laser_drill_fluid.js
index 7f9068a6be..3dd32fba66 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/industrialforegoing/laser_drill_fluid.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/industrialforegoing/laser_drill_fluid.js
@@ -116,10 +116,10 @@ onEvent('recipes', (event) => {
         entity: 'minecraft:empty',
         type: 'industrialforegoing:laser_drill_fluid'
     });
-    
+
     event.recipes.industrialforegoing.laser_drill_fluid({
         type: 'industrialforegoing.laser_drill_fluid',
-        output: '{FluidName:"industrialforegoing:pink_slime",Amount:10}',
+        output: '{FluidName:"industrialforegoing:pink_slime",Amount:100}',
         rarity: [
             {
                 whitelist: {},

From 7c3ae2960adbeef187c5613d1d5a41fec116d44b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Fri, 29 Oct 2021 23:00:47 +0200
Subject: [PATCH 097/130] peeled back laser amount buffs a bit

---
 .../base/recipetypes/industrialforegoing/laser_drill_fluid.js   | 2 +-
 .../expert/recipetypes/industrialforegoing/laser_drill_fluid.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/industrialforegoing/laser_drill_fluid.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/industrialforegoing/laser_drill_fluid.js
index 3dd32fba66..6e292e64af 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/industrialforegoing/laser_drill_fluid.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/industrialforegoing/laser_drill_fluid.js
@@ -119,7 +119,7 @@ onEvent('recipes', (event) => {
 
     event.recipes.industrialforegoing.laser_drill_fluid({
         type: 'industrialforegoing.laser_drill_fluid',
-        output: '{FluidName:"industrialforegoing:pink_slime",Amount:100}',
+        output: '{FluidName:"industrialforegoing:pink_slime",Amount:50}',
         rarity: [
             {
                 whitelist: {},
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/laser_drill_fluid.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/laser_drill_fluid.js
index c0ae441846..a217412a95 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/laser_drill_fluid.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/industrialforegoing/laser_drill_fluid.js
@@ -5,7 +5,7 @@ onEvent('recipes', (event) => {
     const id_prefix = 'enigmatica:expert/industrialforegoing/laser_drill_fluids/';
     const recipes = [
         {
-            output: '{FluidName:"industrialforegoing:meat",Amount:2500}',
+            output: '{FluidName:"industrialforegoing:meat",Amount:1000}',
             rarity: [
                 {
                     whitelist: {},

From 37d2c314fc930b3139e47b622dc0a471873c4f53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Fri, 29 Oct 2021 23:02:11 +0200
Subject: [PATCH 098/130] Update tech_t3.snbt

---
 config/ftbquests/quests/chapters/tech_t3.snbt | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/config/ftbquests/quests/chapters/tech_t3.snbt b/config/ftbquests/quests/chapters/tech_t3.snbt
index a52d72eb0c..5e29e15ca8 100644
--- a/config/ftbquests/quests/chapters/tech_t3.snbt
+++ b/config/ftbquests/quests/chapters/tech_t3.snbt
@@ -100,7 +100,7 @@
 				{
 					id: "5703696A09A152C1"
 					type: "item"
-					item: "industrialforegoing:ore_laser_base"
+					item: "industrialforegoing:fluid_laser_base"
 				}
 			]
 		}
@@ -109,7 +109,10 @@
 			x: -0.5d
 			y: 2.5d
 			subtitle: "Milk a Pink Wither."
-			dependencies: ["412F3A311A7CFCB3"]
+			dependencies: [
+				"412F3A311A7CFCB3"
+				"0F16543E9DE08714"
+			]
 			id: "35EE2BA3A988F416"
 			tasks: [{
 				id: "046A0A8AB86FF128"
@@ -187,5 +190,18 @@
 				item: "kubejs:memory_basic_filled"
 			}]
 		}
+		{
+			x: -1.0d
+			y: 2.0d
+			shape: "diamond"
+			dependencies: ["6079CBE9ECE6EB1D"]
+			optional: true
+			id: "0F16543E9DE08714"
+			tasks: [{
+				id: "6C1CEE8121C1BEA9"
+				type: "item"
+				item: "industrialforegoing:stasis_chamber"
+			}]
+		}
 	]
 }

From 92c4aaf92b601684e9169849178d48f011207806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Fri, 29 Oct 2021 23:04:28 +0200
Subject: [PATCH 099/130] fixed #3605

---
 .../base/recipetypes/storagedrawers/shaped.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/storagedrawers/shaped.js

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/storagedrawers/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/storagedrawers/shaped.js
new file mode 100644
index 0000000000..0713022ff0
--- /dev/null
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/storagedrawers/shaped.js
@@ -0,0 +1,19 @@
+onEvent('recipes', (event) => {
+    const id_prefix = 'enigmatica:base/storagedrawers/';
+    const recipes = [
+        {
+            output: 'storagedrawers:shroud_key',
+            pattern: ['AB ', ' B ', ' C '],
+            key: {
+                A: '#forge:nuggets/gold',
+                B: '#forge:ingots/gold',
+                C: '#minecraft:signs'
+            },
+            id: `${id_prefix}shroud_key`
+        }
+    ];
+
+    recipes.forEach((recipe) => {
+        event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id);
+    });
+});

From 42602d9bff8f53aef788f06fa20b93132ce4c506 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Fri, 29 Oct 2021 21:11:16 -0400
Subject: [PATCH 100/130] Add  Sushigo Crafting items to Compost Bin

Add  Sushigo Crafting items to Compost Bin
Resolves: #2981
---
 .../base/recipetypes/compote/composting.js    | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/compote/composting.js

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/compote/composting.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/compote/composting.js
new file mode 100644
index 0000000000..b6fb26561d
--- /dev/null
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/compote/composting.js
@@ -0,0 +1,38 @@
+onEvent('recipes', (event) => {
+    const recipes = [
+        /*
+        {
+            add: [{ item: 'minecraft:nether_star', chance: 1.0 }],
+            remove: [{ item: 'minecraft:wheat_seeds' }],
+            change: [{ item: 'minecraft:pumpkin', chance: 1.0 }]
+        }*/
+
+        {
+            add: [
+                { item: 'minecraft:bamboo', chance: 0.5 },
+                { item: 'sushigocrafting:rice_seeds', chance: 0.3 },
+                { item: 'sushigocrafting:cucumber_seeds', chance: 0.3 },
+                { item: 'sushigocrafting:soy_seeds', chance: 0.3 },
+                { item: 'sushigocrafting:wasabi_seeds', chance: 0.3 },
+                { item: 'sushigocrafting:sesame_seeds', chance: 0.3 },
+
+                { item: 'sushigocrafting:avocado_sapling', chance: 0.3 },
+                { item: 'sushigocrafting:avocado_leaves', chance: 0.3 },
+                { item: 'sushigocrafting:avocado', chance: 0.65 },
+                { item: 'sushigocrafting:seaweed', chance: 0.3 },
+
+                { item: 'sushigocrafting:wasabi_root', chance: 0.65 },
+                { item: 'sushigocrafting:soy_bean', chance: 0.65 },
+                { item: 'sushigocrafting:cucumber', chance: 0.65 },
+                { item: 'sushigocrafting:rice', chance: 0.65 }
+            ],
+            remove: [],
+            change: []
+        }
+    ];
+
+    recipes.forEach((recipe) => {
+        recipe.type = 'compote:composting';
+        event.custom(recipe);
+    });
+});

From 146c15ba6683d5331602aeaf93ccad0af03640dc Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sat, 30 Oct 2021 10:01:05 -0400
Subject: [PATCH 101/130] lasers!

---
 .../recipetypes/create/mechanical_crafting.js | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
index 96f3af06c5..db073bf959 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
@@ -344,6 +344,51 @@ onEvent('recipes', (event) => {
                 I: 'engineersdecor:thick_steel_pole_head'
             },
             id: 'mekanism:digital_miner'
+        },
+        {
+            output: 'mininggadgets:mininggadget_simple',
+            pattern: [' AAABBB', 'CDEFFF ', ' CGCBBB', 'H      '],
+            key: {
+                A: 'immersiveengineering:toolupgrade_revolver_electro',
+                B: 'powah:dielectric_rod_horizontal',
+                C: 'mekanism:hdpe_sheet',
+                D: 'thermal:charge_bench',
+                E: 'rftoolsbase:infused_diamond',
+                F: 'industrialforegoing:laser_lens2',
+                G: 'mekanism:elite_tier_installer',
+                H: 'immersiveengineering:wooden_grip'
+            },
+            id: 'mininggadgets:mininggadget_simple'
+        },
+        {
+            output: 'mininggadgets:mininggadget_fancy',
+            pattern: [' AAABBB', 'CDEFFF ', ' CGCBBB', 'H      '],
+            key: {
+                A: 'immersiveengineering:toolupgrade_revolver_electro',
+                B: 'powah:dielectric_rod_horizontal',
+                C: 'mekanism:hdpe_sheet',
+                D: 'thermal:charge_bench',
+                E: 'rftoolsbase:infused_diamond',
+                F: 'industrialforegoing:laser_lens6',
+                G: 'mekanism:elite_tier_installer',
+                H: 'immersiveengineering:wooden_grip'
+            },
+            id: 'mininggadgets:mininggadget_fancy'
+        },
+        {
+            output: 'mininggadgets:mininggadget',
+            pattern: [' AAABBB', 'CDEFFF ', ' CGCBBB', 'H      '],
+            key: {
+                A: 'immersiveengineering:toolupgrade_revolver_electro',
+                B: 'powah:dielectric_rod_horizontal',
+                C: 'mekanism:hdpe_sheet',
+                D: 'thermal:charge_bench',
+                E: 'rftoolsbase:infused_diamond',
+                F: 'industrialforegoing:laser_lens3',
+                G: 'mekanism:elite_tier_installer',
+                H: 'immersiveengineering:wooden_grip'
+            },
+            id: 'mininggadgets:mininggadget'
         }
     ];
 

From eb0ce4aaa0188a9bfddfa722a27fa24a62693619 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sat, 30 Oct 2021 11:56:27 -0400
Subject: [PATCH 102/130] recipes and adjusted defaults

---
 .../expert/common/mininggadgets-common.toml   |  62 ++++
 .../normal/common/mininggadgets-common.toml   |  62 ++++
 .../kubejs/expert/recipes/remove.js           |   2 +
 .../recipetypes/mininggadgets/shaped.js       | 276 ++++++++++++++++++
 4 files changed, 402 insertions(+)
 create mode 100644 config/configswapper/expert/common/mininggadgets-common.toml
 create mode 100644 config/configswapper/normal/common/mininggadgets-common.toml
 create mode 100644 kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mininggadgets/shaped.js

diff --git a/config/configswapper/expert/common/mininggadgets-common.toml b/config/configswapper/expert/common/mininggadgets-common.toml
new file mode 100644
index 0000000000..71532a8278
--- /dev/null
+++ b/config/configswapper/expert/common/mininggadgets-common.toml
@@ -0,0 +1,62 @@
+
+#Upgrade Cost Settings
+[power.upgrades]
+	#Cost per Light Block placed
+	#Range: > 0
+	upgradeLight = 500
+	#Cost per block for Silk Touch upgrade
+	#Range: > 0
+	upgradeSilkCost = 5000
+	#Cost per block Frozen
+	#Range: > 0
+	upgradeFreeze = 500
+	#Cost per block for Fortune 1 upgrade
+	#Range: > 0
+	upgradeFortune1 = 1000
+	#Cost per block for Fortune 2 upgrade
+	#Range: > 0
+	upgradeFortune2 = 4000
+	#Cost per block for Fortune 3 upgrade
+	#Range: > 0
+	upgradeFortune3 = 6000		
+	#Capacity Boost from Battery 1 Upgrade
+	#Range: > 0
+	battery1 = 4800000
+	#Capacity Boost from Battery 2 Upgrade
+	#Range: > 0
+	battery2 = 19200000
+	#Capacity Boost from Battery 3 Upgrade
+	#Range: > 0
+	battery3 = 76800000
+	#Cost per block for Efficiency 1 upgrade
+	#Range: > 0
+	upgradeEfficiency1 = 100
+	#Cost per block for Efficiency 2 upgrade
+	#Range: > 0
+	upgradeEfficiency2 = 200
+	#Cost per block for Efficiency 3 upgrade
+	#Range: > 0
+	upgradeEfficiency3 = 450
+	#Cost per block for Efficiency 4 upgrade
+	#Range: > 0
+	upgradeEfficiency4 = 1200
+	#Cost per block for Efficiency 5 upgrade
+	#Range: > 0
+	upgradeEfficiency5 = 3500
+	#Cost per block for Magnet upgrade
+	#Range: > 0
+	upgradeMagnet = 250
+	#Cost per block for Void Junk upgrade
+	#Range: > 0
+	upgradeVoid = 100
+	
+
+#Mining Gadget Settings
+[power.mining_gadget]
+	#Base cost per block broken
+	#Range: > 0
+	baseCost = 1000
+	#Maximum power for the Mining Gadget
+	#Range: > 0
+	maxPower = 7680000
+
diff --git a/config/configswapper/normal/common/mininggadgets-common.toml b/config/configswapper/normal/common/mininggadgets-common.toml
new file mode 100644
index 0000000000..3795135810
--- /dev/null
+++ b/config/configswapper/normal/common/mininggadgets-common.toml
@@ -0,0 +1,62 @@
+
+#Upgrade Cost Settings
+[power.upgrades]	
+	#Cost per Light Block placed
+	#Range: > 0
+	upgradeLight = 100
+	#Cost per block for Silk Touch upgrade
+	#Range: > 0
+	upgradeSilkCost = 100
+	#Cost per block Frozen
+	#Range: > 0
+	upgradeFreeze = 100
+	#Cost per block for Fortune 1 upgrade
+	#Range: > 0
+	upgradeFortune1 = 30
+	#Cost per block for Fortune 2 upgrade
+	#Range: > 0
+	upgradeFortune2 = 60
+	#Cost per block for Fortune 3 upgrade
+	#Range: > 0
+	upgradeFortune3 = 100		
+	#Capacity Boost from Battery 1 Upgrade
+	#Range: > 0
+	battery1 = 2000000
+	#Capacity Boost from Battery 2 Upgrade
+	#Range: > 0
+	battery2 = 5000000
+	#Capacity Boost from Battery 3 Upgrade
+	#Range: > 0
+	battery3 = 10000000
+	#Cost per block for Efficiency 1 upgrade
+	#Range: > 0
+	upgradeEfficiency1 = 10
+	#Cost per block for Efficiency 2 upgrade
+	#Range: > 0
+	upgradeEfficiency2 = 20	
+	#Cost per block for Efficiency 3 upgrade
+	#Range: > 0
+	upgradeEfficiency3 = 30
+	#Cost per block for Efficiency 4 upgrade
+	#Range: > 0
+	upgradeEfficiency4 = 40
+	#Cost per block for Efficiency 5 upgrade
+	#Range: > 0
+	upgradeEfficiency5 = 50
+	#Cost per block for Magnet upgrade
+	#Range: > 0	
+	upgradeMagnet = 25
+	#Cost per block for Void Junk upgrade
+	#Range: > 0
+	upgradeVoid = 10
+
+
+#Mining Gadget Settings
+[power.mining_gadget]
+	#Base cost per block broken
+	#Range: > 0
+	baseCost = 200
+	#Maximum power for the Mining Gadget
+	#Range: > 0
+	maxPower = 1000000
+
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipes/remove.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipes/remove.js
index 26d6b44e17..5e77a0a538 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipes/remove.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipes/remove.js
@@ -64,6 +64,8 @@ onEvent('recipes', (event) => {
         'minecraft:leather_to_stripes',
         'minecraft:stick',
 
+        'mininggadgets:upgrade_empty',
+
         'pedestals:ingot_gold_from_upgrades',
         'pedestals:upgrades/breaker2',
         'pedestals:upgrades/crafter1mk2',
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mininggadgets/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mininggadgets/shaped.js
new file mode 100644
index 0000000000..99c2e93fa7
--- /dev/null
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mininggadgets/shaped.js
@@ -0,0 +1,276 @@
+onEvent('recipes', (event) => {
+    if (global.isExpertMode == false) {
+        return;
+    }
+
+    /*
+        ,
+        {
+            output: '',
+            pattern: ['', '', ''],
+            key: {
+                A: ''
+            },
+            id: ''
+        }
+    */
+
+    const recipes = [
+        {
+            output: 'mininggadgets:upgrade_silk',
+            pattern: ['ABA', 'CDC', 'ACA'],
+            key: {
+                A: 'tconstruct:silky_cloth',
+                B: '#forge:circuits/basic',
+                C: '#forge:alloys/elite',
+                D: 'mekanism:module_base'
+            },
+            id: 'mininggadgets:upgrade_silk'
+        },
+        {
+            output: 'mininggadgets:upgrade_void_junk',
+            pattern: ['ABA', 'CDC', 'ACA'],
+            key: {
+                A: 'trashcans:item_trash_can',
+                B: '#forge:circuits/basic',
+                C: '#forge:ingots/andesite_alloy',
+                D: 'mekanism:module_base'
+            },
+            id: 'mininggadgets:upgrade_void_junk'
+        },
+        {
+            output: 'mininggadgets:upgrade_magnet',
+            pattern: ['ABA', 'ADA', 'ACA'],
+            key: {
+                A: 'immersiveengineering:coil_lv',
+                B: '#forge:circuits/basic',
+                C: 'thermal:flux_magnet',
+                D: 'mekanism:module_base'
+            },
+            id: 'mininggadgets:upgrade_magnet'
+        },
+        {
+            output: 'mininggadgets:upgrade_three_by_three',
+            pattern: ['ABA', 'CDC', 'ACA'],
+            key: {
+                A: 'immersiveengineering:insulating_glass',
+                B: '#forge:circuits/basic',
+                C: 'mekanismgenerators:laser_focus_matrix',
+                D: 'mekanism:module_base'
+            },
+            id: 'mininggadgets:upgrade_three_by_three'
+        },
+        {
+            output: 'mininggadgets:upgrade_light_placer',
+            pattern: ['ABA', 'CDC', 'ACA'],
+            key: {
+                A: '#forge:gears/lumium',
+                B: '#forge:circuits/basic',
+                C: 'thermal:lumium_glass',
+                D: 'mekanism:module_base'
+            },
+            id: 'mininggadgets:upgrade_light_placer'
+        },
+        {
+            output: 'mininggadgets:upgrade_light_placer',
+            pattern: ['ABA', 'CDC', 'ACA'],
+            key: {
+                A: '#forge:gears/lumium',
+                B: '#forge:circuits/basic',
+                C: 'thermal:lumium_glass',
+                D: 'mekanism:module_base'
+            },
+            id: 'mininggadgets:upgrade_light_placer'
+        },
+        {
+            output: 'mininggadgets:upgrade_freezing',
+            pattern: ['ABA', 'CDC', 'ACA'],
+            key: {
+                A: 'cookingforblockheads:preservation_chamber',
+                B: '#forge:circuits/basic',
+                C: 'powah:dry_ice',
+                D: 'mekanism:module_base'
+            },
+            id: 'mininggadgets:upgrade_freezing'
+        },
+        {
+            output: 'mininggadgets:upgrade_fortune_1',
+            pattern: ['ABA', 'CDC', 'AEA'],
+            key: {
+                A: '#forge:storage_blocks/emerald',
+                B: '#forge:circuits/basic',
+                C: 'create:polished_rose_quartz',
+                D: 'mekanism:module_base',
+                E: 'meetyourfight:fortunes_favor'
+            },
+            id: 'mininggadgets:upgrade_fortune_1'
+        },
+        {
+            output: 'mininggadgets:upgrade_fortune_2',
+            pattern: ['ABA', 'CDC', 'AEA'],
+            key: {
+                A: '#forge:storage_blocks/gold',
+                B: '#forge:circuits/advanced',
+                C: 'create:polished_rose_quartz',
+                D: 'mininggadgets:upgrade_fortune_1',
+                E: 'atum:ptah_godshard'
+            },
+            id: 'mininggadgets:upgrade_fortune_2'
+        },
+        {
+            output: 'mininggadgets:upgrade_fortune_3',
+            pattern: ['ABA', 'CDC', 'AEA'],
+            key: {
+                A: '#forge:storage_blocks/rose_gold',
+                B: '#forge:circuits/elite',
+                C: 'create:polished_rose_quartz',
+                D: 'mininggadgets:upgrade_fortune_2',
+                E: 'atum:fish_jeweled'
+            },
+            id: 'mininggadgets:upgrade_fortune_3'
+        },
+
+        {
+            output: 'mininggadgets:upgrade_range_1',
+            pattern: ['ABA', 'ADA', 'ACA'],
+            key: {
+                A: 'immersiveengineering:coil_lv',
+                B: '#forge:circuits/basic',
+                C: 'mekanism:laser_amplifier',
+                D: 'mekanism:module_base'
+            },
+            id: 'mininggadgets:upgrade_range_1'
+        },
+        {
+            output: 'mininggadgets:upgrade_range_2',
+            pattern: ['ABA', 'ADA', 'ACA'],
+            key: {
+                A: 'immersiveengineering:coil_mv',
+                B: '#forge:circuits/advanced',
+                C: 'mekanism:laser_amplifier',
+                D: 'mininggadgets:upgrade_range_1'
+            },
+            id: 'mininggadgets:upgrade_range_2'
+        },
+        {
+            output: 'mininggadgets:upgrade_range_3',
+            pattern: ['ABA', 'ADA', 'ACA'],
+            key: {
+                A: 'immersiveengineering:coil_hv',
+                B: '#forge:circuits/elite',
+                C: 'mekanism:laser_amplifier',
+                D: 'mininggadgets:upgrade_range_2'
+            },
+            id: 'mininggadgets:upgrade_range_3'
+        },
+
+        {
+            output: 'mininggadgets:upgrade_battery_1',
+            pattern: ['ABA', 'CDC', 'ACA'],
+            key: {
+                A: 'immersiveengineering:insulating_glass',
+                B: '#forge:circuits/basic',
+                C: 'mekanism:basic_energy_cube',
+                D: 'mekanism:module_base'
+            },
+            id: 'mininggadgets:upgrade_battery_1'
+        },
+        {
+            output: 'mininggadgets:upgrade_battery_2',
+            pattern: ['ABA', 'CDC', 'ACA'],
+            key: {
+                A: 'immersiveengineering:insulating_glass',
+                B: '#forge:circuits/advanced',
+                C: 'mekanism:advanced_energy_cube',
+                D: 'mininggadgets:upgrade_battery_1'
+            },
+            id: 'mininggadgets:upgrade_battery_2'
+        },
+        {
+            output: 'mininggadgets:upgrade_battery_3',
+            pattern: ['ABA', 'CDC', 'ACA'],
+            key: {
+                A: 'immersiveengineering:insulating_glass',
+                B: '#forge:circuits/elite',
+                C: 'mekanism:elite_energy_cube',
+                D: 'mininggadgets:upgrade_battery_2'
+            },
+            id: 'mininggadgets:upgrade_battery_3'
+        },
+
+        {
+            output: 'mininggadgets:upgrade_efficiency_1',
+            pattern: ['ABA', 'CDC', 'AEA'],
+            key: {
+                A: 'mekanism:basic_thermodynamic_conductor',
+                B: '#forge:circuits/basic',
+                C: 'immersiveengineering:toolupgrade_railgun_capacitors',
+                D: 'mekanism:module_base',
+                E: 'powah:energizing_rod_hardened'
+            },
+            id: 'mininggadgets:upgrade_efficiency_1'
+        },
+        {
+            output: 'mininggadgets:upgrade_efficiency_2',
+            pattern: ['ABA', 'CDC', 'AEA'],
+            key: {
+                A: 'mekanism:advanced_thermodynamic_conductor',
+                B: '#forge:circuits/advanced',
+                C: 'immersiveengineering:toolupgrade_railgun_capacitors',
+                D: 'mininggadgets:upgrade_efficiency_1',
+                E: 'powah:energizing_rod_blazing'
+            },
+            id: 'mininggadgets:upgrade_efficiency_2'
+        },
+        {
+            output: 'mininggadgets:upgrade_efficiency_3',
+            pattern: ['ABA', 'CDC', 'AEA'],
+            key: {
+                A: 'mekanism:advanced_thermodynamic_conductor',
+                B: '#forge:circuits/advanced',
+                C: 'immersiveengineering:toolupgrade_railgun_capacitors',
+                D: 'mininggadgets:upgrade_efficiency_2',
+                E: 'powah:energizing_rod_niotic'
+            },
+            id: 'mininggadgets:upgrade_efficiency_3'
+        },
+        {
+            output: 'mininggadgets:upgrade_efficiency_4',
+            pattern: ['ABA', 'CDC', 'AEA'],
+            key: {
+                A: 'mekanism:elite_thermodynamic_conductor',
+                B: '#forge:circuits/elite',
+                C: 'immersiveengineering:toolupgrade_railgun_capacitors',
+                D: 'mininggadgets:upgrade_efficiency_3',
+                E: 'powah:energizing_rod_spirited'
+            },
+            id: 'mininggadgets:upgrade_efficiency_4'
+        },
+        {
+            output: 'mininggadgets:upgrade_efficiency_5',
+            pattern: ['ABA', 'CDC', 'AEA'],
+            key: {
+                A: 'mekanism:elite_thermodynamic_conductor',
+                B: '#forge:circuits/elite',
+                C: 'immersiveengineering:toolupgrade_railgun_capacitors',
+                D: 'mininggadgets:upgrade_efficiency_4',
+                E: 'powah:energizing_rod_nitro'
+            },
+            id: 'mininggadgets:upgrade_efficiency_5'
+        },
+        {
+            output: 'mininggadgets:modificationtable',
+            pattern: [' A ', 'BCB', 'B B'],
+            key: {
+                A: 'rftoolsbase:tablet',
+                B: '#forge:alloys/advanced',
+                C: 'thermal:tinker_bench'
+            },
+            id: 'mininggadgets:modificationtable'
+        }
+    ];
+
+    recipes.forEach((recipe) => {
+        event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id);
+    });
+});

From 1b4d4c835689fe42c864b3c31159dad8adc3168c Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sat, 30 Oct 2021 12:00:04 -0400
Subject: [PATCH 103/130] move configswapper to proper location

---
 .../configswapper/expert/{common => }/mininggadgets-common.toml   | 0
 .../configswapper/normal/{common => }/mininggadgets-common.toml   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename config/configswapper/expert/{common => }/mininggadgets-common.toml (100%)
 rename config/configswapper/normal/{common => }/mininggadgets-common.toml (100%)

diff --git a/config/configswapper/expert/common/mininggadgets-common.toml b/config/configswapper/expert/mininggadgets-common.toml
similarity index 100%
rename from config/configswapper/expert/common/mininggadgets-common.toml
rename to config/configswapper/expert/mininggadgets-common.toml
diff --git a/config/configswapper/normal/common/mininggadgets-common.toml b/config/configswapper/normal/mininggadgets-common.toml
similarity index 100%
rename from config/configswapper/normal/common/mininggadgets-common.toml
rename to config/configswapper/normal/mininggadgets-common.toml

From e89c032f57d09cb43808d8a2ba19214c0a23024a Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sat, 30 Oct 2021 12:18:13 -0400
Subject: [PATCH 104/130] move config swapper to the really real right spot,
 for realsies

---
 .../configswapper/expert/{ => config}/mininggadgets-common.toml   | 0
 .../configswapper/normal/{ => config}/mininggadgets-common.toml   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename config/configswapper/expert/{ => config}/mininggadgets-common.toml (100%)
 rename config/configswapper/normal/{ => config}/mininggadgets-common.toml (100%)

diff --git a/config/configswapper/expert/mininggadgets-common.toml b/config/configswapper/expert/config/mininggadgets-common.toml
similarity index 100%
rename from config/configswapper/expert/mininggadgets-common.toml
rename to config/configswapper/expert/config/mininggadgets-common.toml
diff --git a/config/configswapper/normal/mininggadgets-common.toml b/config/configswapper/normal/config/mininggadgets-common.toml
similarity index 100%
rename from config/configswapper/normal/mininggadgets-common.toml
rename to config/configswapper/normal/config/mininggadgets-common.toml

From 86e576a3e4001f4f8744eb4bf6bb172829d26e76 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sat, 30 Oct 2021 12:22:05 -0400
Subject: [PATCH 105/130] less base power

---
 config/configswapper/expert/config/mininggadgets-common.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/configswapper/expert/config/mininggadgets-common.toml b/config/configswapper/expert/config/mininggadgets-common.toml
index 71532a8278..203e198582 100644
--- a/config/configswapper/expert/config/mininggadgets-common.toml
+++ b/config/configswapper/expert/config/mininggadgets-common.toml
@@ -58,5 +58,5 @@
 	baseCost = 1000
 	#Maximum power for the Mining Gadget
 	#Range: > 0
-	maxPower = 7680000
+	maxPower = 500000
 

From fa60b601d9f5a63d69827632b1d21376973f8d44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Sat, 30 Oct 2021 20:48:42 +0200
Subject: [PATCH 106/130] updated mods

---
 local/ftbchunks/client-config.snbt |   4 -
 minecraftinstance.json             | 797 +++++++++++++++--------------
 2 files changed, 414 insertions(+), 387 deletions(-)

diff --git a/local/ftbchunks/client-config.snbt b/local/ftbchunks/client-config.snbt
index 080e85b53e..badadc3a3a 100644
--- a/local/ftbchunks/client-config.snbt
+++ b/local/ftbchunks/client-config.snbt
@@ -20,10 +20,6 @@
 	# Default: false
 	debug_info: false
 	
-	# Moves map update tasks to a different thread. May cause CME errors and some weird chunks but could improve performance.
-	# Default: true
-	experimental_performance_improvement: true
-	
 	# Advanced option. Foliage darkness
 	# Default: 50
 	# Range: 0 ~ 255
diff --git a/minecraftinstance.json b/minecraftinstance.json
index 3fb61be003..3608a89176 100644
--- a/minecraftinstance.json
+++ b/minecraftinstance.json
@@ -30,8 +30,8 @@
   "isUnlocked": true,
   "javaArgsOverride": null,
   "javaDirOverride": null,
-  "lastPlayed": "2021-10-27T17:22:23.0807556Z",
-  "playedCount": 429,
+  "lastPlayed": "2021-10-30T18:21:10.391214Z",
+  "playedCount": 434,
   "manifest": null,
   "fileDate": "0001-01-01T00:00:00",
   "installedModpack": null,
@@ -47,8 +47,8 @@
   "name": "Enigmatica6",
   "cachedScans": [],
   "isValid": true,
-  "lastPreviousMatchUpdate": "2021-10-25T19:47:41.9859606Z",
-  "lastRefreshAttempt": "2021-10-25T21:47:43.3772211+02:00",
+  "lastPreviousMatchUpdate": "2021-10-28T17:45:54.6291256Z",
+  "lastRefreshAttempt": "2021-10-28T19:45:56.7651183+02:00",
   "isEnabled": true,
   "isPinned": false,
   "gameVersion": "1.16.5",
@@ -6456,35 +6456,35 @@
       "addonID": 284497,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3375360,
-        "displayName": "IronJetpacks-1.16.5-4.2.1.jar",
-        "fileName": "IronJetpacks-1.16.5-4.2.1.jar",
-        "fileDate": "2021-07-03T20:36:49.973Z",
-        "fileLength": 122608,
+        "id": 3507868,
+        "displayName": "IronJetpacks-1.16.5-4.2.2.jar",
+        "fileName": "IronJetpacks-1.16.5-4.2.2.jar",
+        "fileDate": "2021-10-29T00:09:50.823Z",
+        "fileLength": 122432,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3375/360/IronJetpacks-1.16.5-4.2.1.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3507/868/IronJetpacks-1.16.5-4.2.2.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 67947082,
+            "id": 76996236,
             "addonId": 272335,
             "type": 3,
-            "fileId": 3375360
+            "fileId": 3507868
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 41589344,
+            "fingerprint": 1442922138,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 3575232724,
+            "fingerprint": 1401039583,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -6507,7 +6507,7 @@
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 3428496331,
+        "packageFingerprint": 1036887502,
         "gameVersion": [
           "1.16.5",
           "Forge"
@@ -6518,14 +6518,14 @@
             "gameVersion": "1.16.5",
             "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
             "gameVersionName": "1.16.5",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 70886
           },
           {
             "gameVersionPadded": "0",
             "gameVersion": "",
             "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
             "gameVersionName": "Forge",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 68441
           }
         ],
         "hasInstallScript": false,
@@ -6533,20 +6533,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2392113,
+        "renderCacheId": 2561380,
         "projectId": 284497,
-        "packageFingerprintId": 697743597,
+        "packageFingerprintId": 772544539,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 3099650,
+        "gameVersionMappingId": 3421421,
         "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "IronJetpacks-1.16.5-4.2.1.jar"
+        "FileNameOnDisk": "IronJetpacks-1.16.5-4.2.2.jar"
       },
       "dateInstalled": "2021-07-05T20:19:25.2969373Z",
-      "dateUpdated": "2021-07-05T20:19:25.2969373Z",
-      "dateLastUpdateAttempted": "0001-01-01T00:00:00",
-      "status": 5,
+      "dateUpdated": "2021-10-30T18:18:08.6999722Z",
+      "dateLastUpdateAttempted": "2021-10-30T18:18:08.6999722Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -7366,7 +7366,7 @@
       "dateInstalled": "2021-08-11T21:22:43.3270429Z",
       "dateUpdated": "2021-10-27T17:18:47.0671406Z",
       "dateLastUpdateAttempted": "2021-10-27T17:18:47.0671406Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -13036,14 +13036,14 @@
       "addonID": 416935,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3490931,
-        "displayName": "Valhelsia Core - 16.0.12",
-        "fileName": "valhelsia_core-16.0.12.jar",
-        "fileDate": "2021-10-14T14:47:59.443Z",
-        "fileLength": 149437,
+        "id": 3508441,
+        "displayName": "Valhelsia Core - 16.0.13a",
+        "fileName": "valhelsia_core-16.0.13a.jar",
+        "fileDate": "2021-10-29T15:52:51.37Z",
+        "fileLength": 601128,
         "releaseType": 2,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3490/931/valhelsia_core-16.0.12.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3508/441/valhelsia_core-16.0.13a.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -13051,19 +13051,19 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 193452692,
+            "fingerprint": 4179973337,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "net",
-            "fingerprint": 151474470,
+            "fingerprint": 2135605802,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
-            "fingerprint": 1275515862,
+            "fingerprint": 3307001340,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -13075,20 +13075,21 @@
           },
           {
             "foldername": "valhelsia_core.mixins.json",
-            "fingerprint": 2846435592,
+            "fingerprint": 2704765058,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "valhelsia_core.refmap.json",
-            "fingerprint": 3069778118,
+            "fingerprint": 2773714771,
             "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 3381729081,
+        "packageFingerprint": 2324193014,
         "gameVersion": [
-          "1.16.5"
+          "1.16.5",
+          "Forge"
         ],
         "sortableGameVersion": [
           {
@@ -13096,7 +13097,14 @@
             "gameVersion": "1.16.5",
             "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
             "gameVersionName": "1.16.5",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
           }
         ],
         "hasInstallScript": false,
@@ -13104,20 +13112,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2540003,
+        "renderCacheId": 2562134,
         "projectId": 416935,
-        "packageFingerprintId": 762172181,
-        "gameVersionDateReleased": "2021-01-15T14:14:48.91Z",
-        "gameVersionMappingId": 3381669,
-        "gameVersionId": 8203,
+        "packageFingerprintId": 772911939,
+        "gameVersionDateReleased": "2008-03-01T06:00:00Z",
+        "gameVersionMappingId": 3423087,
+        "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "valhelsia_core-16.0.12.jar"
+        "FileNameOnDisk": "valhelsia_core-16.0.13a.jar"
       },
       "dateInstalled": "2021-07-05T20:20:57.5175818Z",
-      "dateUpdated": "2021-10-15T19:26:00.975094Z",
-      "dateLastUpdateAttempted": "2021-10-15T19:26:00.975094Z",
-      "status": 5,
+      "dateUpdated": "2021-10-30T18:18:04.076355Z",
+      "dateLastUpdateAttempted": "2021-10-30T18:18:04.076355Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -13432,41 +13440,41 @@
       "addonID": 361026,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3506426,
-        "displayName": "occultism-1.17.5.jar",
-        "fileName": "occultism-1.16.5-1.17.5.jar",
-        "fileDate": "2021-10-27T14:36:50.633Z",
-        "fileLength": 4371953,
+        "id": 3508379,
+        "displayName": "occultism-1.17.6.jar",
+        "fileName": "occultism-1.16.5-1.17.6.jar",
+        "fileDate": "2021-10-29T14:22:58.033Z",
+        "fileLength": 4373149,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3506/426/occultism-1.16.5-1.17.5.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3508/379/occultism-1.16.5-1.17.6.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 76878862,
-            "addonId": 309927,
+            "id": 77035789,
+            "addonId": 306770,
             "type": 3,
-            "fileId": 3506426
+            "fileId": 3508379
           },
           {
-            "id": 76878861,
-            "addonId": 306770,
+            "id": 77035790,
+            "addonId": 309927,
             "type": 3,
-            "fileId": 3506426
+            "fileId": 3508379
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 3112152308,
+            "fingerprint": 2776103581,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 1024516203,
+            "fingerprint": 3873230844,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -13495,7 +13503,7 @@
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 3021385479,
+        "packageFingerprint": 4268905633,
         "gameVersion": [
           "1.16.3",
           "1.16.5",
@@ -13545,19 +13553,19 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2559532,
+        "renderCacheId": 2562041,
         "projectId": 361026,
-        "packageFingerprintId": 771446377,
+        "packageFingerprintId": 772855452,
         "gameVersionDateReleased": "2019-08-01T00:00:00Z",
-        "gameVersionMappingId": 3417787,
+        "gameVersionMappingId": 3422939,
         "gameVersionId": 7498,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "occultism-1.16.5-1.17.5.jar"
+        "FileNameOnDisk": "occultism-1.16.5-1.17.6.jar"
       },
       "dateInstalled": "2021-09-25T14:41:32.7416314Z",
-      "dateUpdated": "2021-10-27T17:18:48.6558026Z",
-      "dateLastUpdateAttempted": "2021-10-27T17:18:48.6558026Z",
+      "dateUpdated": "2021-10-30T18:18:12.8743249Z",
+      "dateLastUpdateAttempted": "2021-10-30T18:18:12.8743249Z",
       "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
@@ -15355,7 +15363,7 @@
       "dateInstalled": "2021-07-05T20:21:03.3831197Z",
       "dateUpdated": "2021-10-27T17:18:43.4434457Z",
       "dateLastUpdateAttempted": "2021-10-27T17:18:43.4434457Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -15552,14 +15560,14 @@
       "addonID": 267193,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3436684,
-        "displayName": "Chunk Pregenerator-V1.16-3.1.1",
-        "fileName": "Chunk Pregenerator-V1.16-3.1.1.jar",
-        "fileDate": "2021-08-23T17:48:03.24Z",
-        "fileLength": 443474,
+        "id": 3507658,
+        "displayName": "Chunk Pregenerator-V1.16-3.2.0",
+        "fileName": "Chunk Pregenerator-V1.16-3.2.0.jar",
+        "fileDate": "2021-10-28T18:50:55.59Z",
+        "fileLength": 444565,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3436/684/Chunk Pregenerator-V1.16-3.1.1.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3507/658/Chunk Pregenerator-V1.16-3.2.0.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -15567,42 +15575,55 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 453566642,
-            "type": 0,
+            "fingerprint": 1970508558,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pregenerator",
-            "fingerprint": 2918504312,
-            "type": 0,
+            "fingerprint": 137555938,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 1438559181,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 4213455804,
+        "packageFingerprint": 1092338180,
         "gameVersion": [
           "1.16.5"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2561119,
+        "projectId": 267193,
+        "packageFingerprintId": 772396247,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3420817,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "Chunk Pregenerator-V1.16-3.1.1.jar"
+        "FileNameOnDisk": "Chunk Pregenerator-V1.16-3.2.0.jar"
       },
       "dateInstalled": "2021-07-05T20:21:03.3721197Z",
-      "dateUpdated": "2021-08-25T05:56:33.1205011Z",
-      "dateLastUpdateAttempted": "2021-08-25T05:56:33.1205011Z",
-      "status": 5,
+      "dateUpdated": "2021-10-30T18:18:11.3060176Z",
+      "dateLastUpdateAttempted": "2021-10-30T18:18:11.3060176Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -17654,90 +17675,124 @@
       "addonID": 289712,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3468014,
-        "displayName": "tetra-1.16.5-3.17.0.jar",
-        "fileName": "tetra-1.16.5-3.17.0.jar",
-        "fileDate": "2021-09-21T23:14:09.977Z",
-        "fileLength": 2990458,
+        "id": 3506628,
+        "displayName": "tetra-1.16.5-3.18.0.jar",
+        "fileName": "tetra-1.16.5-3.18.0.jar",
+        "fileDate": "2021-10-27T17:28:27.027Z",
+        "fileLength": 2990480,
         "releaseType": 2,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3468/14/tetra-1.16.5-3.17.0.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3506/628/tetra-1.16.5-3.18.0.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 0,
+            "id": 76894887,
             "addonId": 351914,
             "type": 3,
-            "fileId": 0
+            "fileId": 3506628
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 728194680,
-            "type": 0,
+            "fingerprint": 3267356128,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "se",
-            "fingerprint": 1050004352,
-            "type": 0,
+            "fingerprint": 3741227923,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
-            "fingerprint": 2681478273,
-            "type": 0,
+            "fingerprint": 180033385,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
-            "fingerprint": 2851979133,
-            "type": 0,
+            "fingerprint": 228056607,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 4064848781,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "tetra.mixins.json",
             "fingerprint": 2565242496,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "tetra.refmap.json",
             "fingerprint": 1482182319,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 54417051,
+        "packageFingerprint": 2637990296,
         "gameVersion": [
           "1.16.3",
           "1.16.5",
           "Forge",
           "1.16.4"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000003",
+            "gameVersion": "1.16.3",
+            "gameVersionReleaseDate": "2020-09-10T14:44:20.443Z",
+            "gameVersionName": "1.16.3",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000004",
+            "gameVersion": "1.16.4",
+            "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z",
+            "gameVersionName": "1.16.4",
+            "gameVersionTypeId": 70886
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2559778,
+        "projectId": 289712,
+        "packageFingerprintId": 771567483,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3418226,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "tetra-1.16.5-3.17.0.jar"
+        "FileNameOnDisk": "tetra-1.16.5-3.18.0.jar"
       },
       "dateInstalled": "2021-07-05T20:21:03.3441195Z",
-      "dateUpdated": "2021-09-22T17:51:12.9333836Z",
-      "dateLastUpdateAttempted": "2021-09-22T17:51:12.9333836Z",
+      "dateUpdated": "2021-10-28T17:17:56.5005756Z",
+      "dateLastUpdateAttempted": "2021-10-28T17:17:56.5005756Z",
       "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
@@ -25886,14 +25941,14 @@
       "addonID": 513857,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3447941,
-        "displayName": "oauth-1.06.1-1.16.jar",
-        "fileName": "oauth-1.06.1-1.16.jar",
-        "fileDate": "2021-09-03T10:15:10.273Z",
-        "fileLength": 51399,
+        "id": 3507476,
+        "displayName": "oauth-1.07-1.16.jar",
+        "fileName": "oauth-1.07-1.16.jar",
+        "fileDate": "2021-10-28T14:48:19.613Z",
+        "fileLength": 54976,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3447/941/oauth-1.06.1-1.16.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3507/476/oauth-1.07-1.16.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -25901,50 +25956,109 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 2368002889,
-            "type": 0,
+            "fingerprint": 340072665,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 2578193890,
-            "type": 0,
+            "fingerprint": 3098240706,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "oauth.png",
             "fingerprint": 1778038094,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 2021780760,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 2915755594,
+        "packageFingerprint": 2373345024,
         "gameVersion": [
+          "1.16.3",
+          "1.16.1",
           "1.16",
           "1.16.5",
-          "Forge"
+          "Forge",
+          "1.16.4",
+          "1.16.2"
+        ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000003",
+            "gameVersion": "1.16.3",
+            "gameVersionReleaseDate": "2020-09-10T14:44:20.443Z",
+            "gameVersionName": "1.16.3",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000001",
+            "gameVersion": "1.16.1",
+            "gameVersionReleaseDate": "2020-06-24T12:41:11.823Z",
+            "gameVersionName": "1.16.1",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016",
+            "gameVersion": "1.16",
+            "gameVersionReleaseDate": "2020-06-23T13:41:08.75Z",
+            "gameVersionName": "1.16",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000004",
+            "gameVersion": "1.16.4",
+            "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z",
+            "gameVersionName": "1.16.4",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000002",
+            "gameVersion": "1.16.2",
+            "gameVersionReleaseDate": "2020-08-11T16:42:21.863Z",
+            "gameVersionName": "1.16.2",
+            "gameVersionTypeId": 70886
+          }
         ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2560884,
+        "projectId": 513857,
+        "packageFingerprintId": 772277476,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3420237,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "oauth-1.06.1-1.16.jar"
+        "FileNameOnDisk": "oauth-1.07-1.16.jar"
       },
       "dateInstalled": "2021-09-22T19:31:09.1959499Z",
-      "dateUpdated": "2021-09-22T19:31:09.2199512Z",
-      "dateLastUpdateAttempted": "2021-09-22T19:31:09.2199512Z",
-      "status": 5,
+      "dateUpdated": "2021-10-30T18:14:28.7765215Z",
+      "dateLastUpdateAttempted": "2021-10-30T18:14:28.7765215Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -26620,14 +26734,14 @@
       "addonID": 496030,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3474994,
-        "displayName": "EnigmaticGraves-1.6.3.jar",
-        "fileName": "EnigmaticGraves-1.6.3.jar",
-        "fileDate": "2021-09-27T18:57:40.617Z",
-        "fileLength": 72445,
-        "releaseType": 1,
+        "id": 3507614,
+        "displayName": "EnigmaticGraves-1.6.5.jar",
+        "fileName": "EnigmaticGraves-1.6.5.jar",
+        "fileDate": "2021-10-28T17:35:11.233Z",
+        "fileLength": 78317,
+        "releaseType": 2,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3474/994/EnigmaticGraves-1.6.3.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3507/614/EnigmaticGraves-1.6.5.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -26635,60 +26749,81 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 2327841231,
-            "type": 0,
+            "fingerprint": 1343251591,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "dev",
-            "fingerprint": 2325831502,
-            "type": 0,
+            "fingerprint": 1370232033,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": ".cache",
-            "fingerprint": 3920192458,
-            "type": 0,
+            "fingerprint": 3398154213,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
-            "fingerprint": 1514560904,
-            "type": 0,
+            "fingerprint": 3529979887,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 1438559181,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "enigmaticgraves.refmap.json",
             "fingerprint": 1493072104,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 4035277360,
+        "packageFingerprint": 1172161471,
         "gameVersion": [
-          "1.16.5"
+          "1.16.5",
+          "Forge"
+        ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
         ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
-        "gameVersionDateReleased": "2021-01-15T14:14:48.91Z",
-        "gameId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2561060,
+        "projectId": 496030,
+        "packageFingerprintId": 772366989,
+        "gameVersionDateReleased": "2019-08-01T00:00:00Z",
+        "gameVersionMappingId": 3420636,
+        "gameVersionId": 7498,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "EnigmaticGraves-1.6.3.jar"
+        "FileNameOnDisk": "EnigmaticGraves-1.6.5.jar"
       },
-      "dateInstalled": "2021-07-13T20:16:02.8369272Z",
-      "dateUpdated": "2021-10-07T18:09:14.9035276Z",
-      "dateLastUpdateAttempted": "2021-10-07T18:09:14.9035276Z",
-      "status": 5,
+      "dateInstalled": "2021-10-28T17:27:32.914677Z",
+      "dateUpdated": "2021-10-30T18:14:30.6824015Z",
+      "dateLastUpdateAttempted": "2021-10-30T18:14:30.6824015Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -26703,14 +26838,14 @@
       "addonID": 272335,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3349690,
-        "displayName": "Cucumber-1.16.4-4.1.10.jar",
-        "fileName": "Cucumber-1.16.4-4.1.10.jar",
-        "fileDate": "2021-06-12T22:58:45.34Z",
-        "fileLength": 158783,
+        "id": 3507886,
+        "displayName": "Cucumber-1.16.5-4.1.12.jar",
+        "fileName": "Cucumber-1.16.5-4.1.12.jar",
+        "fileDate": "2021-10-29T00:47:14.6Z",
+        "fileLength": 158447,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3349/690/Cucumber-1.16.4-4.1.10.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3507/886/Cucumber-1.16.5-4.1.12.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -26718,19 +26853,19 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 3268531547,
+            "fingerprint": 905409379,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 3024470326,
+            "fingerprint": 3055036028,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
-            "fingerprint": 1785728476,
+            "fingerprint": 1451239742,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -26741,11 +26876,10 @@
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 3280041175,
+        "packageFingerprint": 2682762223,
         "gameVersion": [
           "1.16.5",
-          "Forge",
-          "1.16.4"
+          "Forge"
         ],
         "sortableGameVersion": [
           {
@@ -26753,21 +26887,14 @@
             "gameVersion": "1.16.5",
             "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
             "gameVersionName": "1.16.5",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 70886
           },
           {
             "gameVersionPadded": "0",
             "gameVersion": "",
             "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
             "gameVersionName": "Forge",
-            "gameVersionTypeId": 0
-          },
-          {
-            "gameVersionPadded": "0000000001.0000000016.0000000004",
-            "gameVersion": "1.16.4",
-            "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z",
-            "gameVersionName": "1.16.4",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 68441
           }
         ],
         "hasInstallScript": false,
@@ -26775,20 +26902,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2359608,
+        "renderCacheId": 2561408,
         "projectId": 272335,
-        "packageFingerprintId": 682567680,
+        "packageFingerprintId": 772563107,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 3037894,
+        "gameVersionMappingId": 3421460,
         "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "Cucumber-1.16.4-4.1.10.jar"
+        "FileNameOnDisk": "Cucumber-1.16.5-4.1.12.jar"
       },
       "dateInstalled": "2021-07-05T20:21:15.1320328Z",
-      "dateUpdated": "2021-07-05T20:21:15.1320328Z",
-      "dateLastUpdateAttempted": "0001-01-01T00:00:00",
-      "status": 5,
+      "dateUpdated": "2021-10-30T18:18:09.9380123Z",
+      "dateLastUpdateAttempted": "2021-10-30T18:18:09.9380123Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -26967,122 +27094,6 @@
       "manifestName": null,
       "installedTargets": null
     },
-    {
-      "addonID": 290247,
-      "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
-      "installedFile": {
-        "id": 3482231,
-        "displayName": "Release 1.5.1 (1.16.5)",
-        "fileName": "Tardis-Mod-1.16.5-1.5.1.jar",
-        "fileDate": "2021-10-05T14:51:46.203Z",
-        "fileLength": 51327841,
-        "releaseType": 1,
-        "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3482/231/Tardis-Mod-1.16.5-1.5.1.jar",
-        "isAlternate": false,
-        "alternateFileId": 0,
-        "dependencies": [],
-        "isAvailable": true,
-        "modules": [
-          {
-            "foldername": "META-INF",
-            "fingerprint": 3308992756,
-            "type": 3,
-            "invalidFingerprint": false
-          },
-          {
-            "foldername": "net",
-            "fingerprint": 514064872,
-            "type": 3,
-            "invalidFingerprint": false
-          },
-          {
-            "foldername": "tardis.mixins.json",
-            "fingerprint": 3516601457,
-            "type": 3,
-            "invalidFingerprint": false
-          },
-          {
-            "foldername": "assets",
-            "fingerprint": 16174324,
-            "type": 3,
-            "invalidFingerprint": false
-          },
-          {
-            "foldername": "logo.png",
-            "fingerprint": 488549304,
-            "type": 3,
-            "invalidFingerprint": false
-          },
-          {
-            "foldername": "data",
-            "fingerprint": 3421155963,
-            "type": 3,
-            "invalidFingerprint": false
-          },
-          {
-            "foldername": "pack.mcmeta",
-            "fingerprint": 957205136,
-            "type": 3,
-            "invalidFingerprint": false
-          },
-          {
-            "foldername": "tardis.refmap.json",
-            "fingerprint": 1491836333,
-            "type": 3,
-            "invalidFingerprint": false
-          }
-        ],
-        "packageFingerprint": 3519640290,
-        "gameVersion": [
-          "1.16.5",
-          "Forge"
-        ],
-        "sortableGameVersion": [
-          {
-            "gameVersionPadded": "0000000001.0000000016.0000000005",
-            "gameVersion": "1.16.5",
-            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
-            "gameVersionName": "1.16.5",
-            "gameVersionTypeId": 70886
-          },
-          {
-            "gameVersionPadded": "0",
-            "gameVersion": "",
-            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
-            "gameVersionName": "Forge",
-            "gameVersionTypeId": 68441
-          }
-        ],
-        "hasInstallScript": false,
-        "isCompatibleWithClient": false,
-        "categorySectionPackageType": 6,
-        "restrictProjectFileAccess": 1,
-        "projectStatus": 4,
-        "renderCacheId": 2528703,
-        "projectId": 290247,
-        "packageFingerprintId": 756805727,
-        "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 3358871,
-        "gameVersionId": 4458,
-        "gameId": 432,
-        "isServerPack": false,
-        "FileNameOnDisk": "Tardis-Mod-1.16.5-1.5.1.jar"
-      },
-      "dateInstalled": "2021-10-27T17:21:26.4878221Z",
-      "dateUpdated": "2021-10-27T17:21:26.5284161Z",
-      "dateLastUpdateAttempted": "2021-10-27T17:21:26.5284161Z",
-      "status": 4,
-      "preferenceAutoInstallUpdates": null,
-      "preferenceAlternateFile": false,
-      "preferenceIsIgnored": false,
-      "isModified": false,
-      "isWorkingCopy": false,
-      "isFuzzyMatch": false,
-      "preferenceReleaseType": null,
-      "manifestName": null,
-      "installedTargets": []
-    },
     {
       "addonID": 393149,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
@@ -27980,40 +27991,40 @@
       "addonID": 314906,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3501302,
-        "displayName": "ftb-chunks-forge-1605.3.2-build.71.jar",
-        "fileName": "ftb-chunks-forge-1605.3.2-build.71.jar",
-        "fileDate": "2021-10-23T17:05:17.113Z",
-        "fileLength": 720047,
+        "id": 3509329,
+        "displayName": "ftb-chunks-forge-1605.3.2-build.79.jar",
+        "fileName": "ftb-chunks-forge-1605.3.2-build.79.jar",
+        "fileDate": "2021-10-30T12:53:27.86Z",
+        "fileLength": 716542,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3501/302/ftb-chunks-forge-1605.3.2-build.71.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3509/329/ftb-chunks-forge-1605.3.2-build.79.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 76535803,
-            "addonId": 404465,
+            "id": 77114894,
+            "addonId": 419699,
             "type": 3,
-            "fileId": 3501302
+            "fileId": 3509329
           },
           {
-            "id": 76535806,
-            "addonId": 314905,
-            "type": 2,
-            "fileId": 3501302
+            "id": 77114895,
+            "addonId": 404468,
+            "type": 3,
+            "fileId": 3509329
           },
           {
-            "id": 76535804,
-            "addonId": 419699,
+            "id": 77114893,
+            "addonId": 404465,
             "type": 3,
-            "fileId": 3501302
+            "fileId": 3509329
           },
           {
-            "id": 76535805,
-            "addonId": 404468,
-            "type": 3,
-            "fileId": 3501302
+            "id": 77114896,
+            "addonId": 314905,
+            "type": 2,
+            "fileId": 3509329
           }
         ],
         "isAvailable": true,
@@ -28062,24 +28073,24 @@
           },
           {
             "foldername": "META-INF",
-            "fingerprint": 1805200783,
+            "fingerprint": 3798257616,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "dev",
-            "fingerprint": 1059997905,
+            "fingerprint": 3759549079,
             "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "architectury_inject_FTBChunks1165_common_78bfcfc381024fb8ba315729c275e3ab",
-            "fingerprint": 423872169,
+            "foldername": "architectury_inject_FTBChunks1165_common_01e0f3f1e7eb44cab1228374b29f76ff",
+            "fingerprint": 584626760,
             "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 2592246910,
+        "packageFingerprint": 1669419842,
         "gameVersion": [
           "1.16.5",
           "Forge"
@@ -28105,20 +28116,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2553151,
+        "renderCacheId": 2563318,
         "projectId": 314906,
-        "packageFingerprintId": 768647025,
+        "packageFingerprintId": 773646880,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 3406645,
+        "gameVersionMappingId": 3425510,
         "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "ftb-chunks-forge-1605.3.2-build.71.jar"
+        "FileNameOnDisk": "ftb-chunks-forge-1605.3.2-build.79.jar"
       },
       "dateInstalled": "2021-09-10T17:14:11.272099Z",
-      "dateUpdated": "2021-10-25T18:00:19.1800708Z",
-      "dateLastUpdateAttempted": "2021-10-25T18:00:19.1800708Z",
-      "status": 5,
+      "dateUpdated": "2021-10-30T18:18:13.2024477Z",
+      "dateLastUpdateAttempted": "2021-10-30T18:18:13.2024477Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -28251,7 +28262,7 @@
       "dateInstalled": "2021-07-05T20:21:15.1320328Z",
       "dateUpdated": "2021-10-27T17:18:43.2550968Z",
       "dateLastUpdateAttempted": "2021-10-27T17:18:43.2550968Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -28495,89 +28506,109 @@
       "addonID": 294815,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3431677,
-        "displayName": "aiotbotania-1.16.5-1.8.1.jar",
-        "fileName": "aiotbotania-1.16.5-1.8.1.jar",
-        "fileDate": "2021-08-19T19:11:22.037Z",
-        "fileLength": 220723,
+        "id": 3507609,
+        "displayName": "aiotbotania-1.16.5-1.8.4.jar",
+        "fileName": "aiotbotania-1.16.5-1.8.4.jar",
+        "fileDate": "2021-10-28T17:32:09.573Z",
+        "fileLength": 220776,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3431/677/aiotbotania-1.16.5-1.8.1.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3507/609/aiotbotania-1.16.5-1.8.4.jar",
         "isAlternate": false,
-        "alternateFileId": 3431678,
+        "alternateFileId": 3507610,
         "dependencies": [
           {
-            "id": 0,
+            "id": 76974212,
             "addonId": 400058,
             "type": 2,
-            "fileId": 0
+            "fileId": 3507609
           },
           {
-            "id": 0,
+            "id": 76974211,
             "addonId": 225643,
             "type": 3,
-            "fileId": 0
+            "fileId": 3507609
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 1194287551,
-            "type": 0,
+            "fingerprint": 3626764288,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "de",
-            "fingerprint": 724339096,
-            "type": 0,
+            "fingerprint": 1695800933,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "assets",
-            "fingerprint": 1955109219,
-            "type": 0,
+            "foldername": "data",
+            "fingerprint": 1692540400,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 222068915,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "data",
-            "fingerprint": 1692540400,
-            "type": 0,
+            "foldername": "assets",
+            "fingerprint": 1955109219,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "logo.png",
             "fingerprint": 2459156036,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 256948889,
+        "packageFingerprint": 680828473,
         "gameVersion": [
           "1.16.5",
           "Forge"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2561055,
+        "projectId": 294815,
+        "packageFingerprintId": 772366264,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3420623,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "aiotbotania-1.16.5-1.8.1.jar"
+        "FileNameOnDisk": "aiotbotania-1.16.5-1.8.4.jar"
       },
       "dateInstalled": "2021-07-05T20:31:05.1764869Z",
-      "dateUpdated": "2021-08-22T11:00:36.7650096Z",
-      "dateLastUpdateAttempted": "2021-08-22T11:00:36.7650096Z",
-      "status": 5,
+      "dateUpdated": "2021-10-30T18:14:34.202324Z",
+      "dateLastUpdateAttempted": "2021-10-30T18:14:34.202324Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -30298,7 +30329,7 @@
       "dateInstalled": "2021-07-05T20:21:15.1520307Z",
       "dateUpdated": "2021-10-27T17:18:43.3384684Z",
       "dateLastUpdateAttempted": "2021-10-27T17:18:43.3384684Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,

From 0eeeef5d3edd8c974fed2bc2a547ba31832ddfa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Sat, 30 Oct 2021 20:49:04 +0200
Subject: [PATCH 107/130] commented out nbt editing, possible temporary fix for
 #3579 #3545

---
 .../ponder/tech/industrialforegoing/laser_drill.js | 14 +++++++-------
 .../ponder/tech/industrialforegoing/latex.js       | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/kubejs/client_scripts/ponder/tech/industrialforegoing/laser_drill.js b/kubejs/client_scripts/ponder/tech/industrialforegoing/laser_drill.js
index 64480513a1..12c08387a5 100644
--- a/kubejs/client_scripts/ponder/tech/industrialforegoing/laser_drill.js
+++ b/kubejs/client_scripts/ponder/tech/industrialforegoing/laser_drill.js
@@ -417,13 +417,13 @@ onEvent('ponder.registry', (event) => {
                 scene.addKeyframe();
                 scene.idle(20);
 
-                scene.world().modifyTileNBT(
-                    tank1,
-                    {
-                        tank: { FluidName: 'minecraft:lava', Amount: 100 }
-                    },
-                    true
-                );
+                // scene.world().modifyTileNBT(
+                //     tank1,
+                //     {
+                //         tank: { FluidName: 'minecraft:lava', Amount: 100 }
+                //     },
+                //     true
+                // );
 
                 scene
                     .overlay()
diff --git a/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js b/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js
index ebdac68e5a..776cfe4c24 100644
--- a/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js
+++ b/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js
@@ -108,9 +108,9 @@ onEvent('ponder.registry', (event) => {
                         true
                     );
                 scene.idle(1);
-                scene.world().modifyTileNBT(tank1, {
-                    tank: { FluidName: 'thermal:resin', Amount: Utils.random.nextInt(64000) }
-                });
+                // scene.world().modifyTileNBT(tank1, {
+                //     tank: { FluidName: 'thermal:resin', Amount: Utils.random.nextInt(64000) }
+                // });
 
                 var tank2 = util.grid().at(3, 2, 3);
                 scene
@@ -121,9 +121,9 @@ onEvent('ponder.registry', (event) => {
                         true
                     );
                 scene.idle(1);
-                scene.world().modifyTileNBT(tank2, {
-                    tank: { FluidName: 'industrialforegoing:latex', Amount: Utils.random.nextInt(64000) }
-                });
+                // scene.world().modifyTileNBT(tank2, {
+                //     tank: { FluidName: 'industrialforegoing:latex', Amount: Utils.random.nextInt(64000) }
+                // });
 
                 scene.world().showSection(util.select().fromTo(3, 2, 3, 5, 2, 3), Facing.down);
 

From f2e63c351f71e75b1c71485823fd43daec8fa7f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Sat, 30 Oct 2021 21:06:50 +0200
Subject: [PATCH 108/130] fixes #3434 ...sorta

---
 config/ftbquests/quests/chapters/building.snbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/ftbquests/quests/chapters/building.snbt b/config/ftbquests/quests/chapters/building.snbt
index 3903c0cad1..24f0f476e8 100644
--- a/config/ftbquests/quests/chapters/building.snbt
+++ b/config/ftbquests/quests/chapters/building.snbt
@@ -702,7 +702,7 @@
 			y: 2.5d
 			shape: "gear"
 			subtitle: "The right tools for the job"
-			description: ["GENERAL_INTRO_DESC"]
+			description: [""]
 			id: "5411C8D2344CC2F1"
 			tasks: [{
 				id: "48834CDA218F71E0"

From ace21fc92cfbb551c07b56f122e1558ffe27ca13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Sat, 30 Oct 2021 21:34:29 +0200
Subject: [PATCH 109/130] atum desert rabbits now often give a rabbit's foot
 when killed with a severing sword

---
 .../recipetypes/tconstruct/tools/severing.js    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/tconstruct/tools/severing.js

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/tconstruct/tools/severing.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/tconstruct/tools/severing.js
new file mode 100644
index 0000000000..5a1fa61165
--- /dev/null
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/tconstruct/tools/severing.js
@@ -0,0 +1,17 @@
+onEvent('recipes', (event) => {
+    const id_prefix = 'enigmatica:base/tconstruct/tools/severing/';
+    const recipes = [
+        {
+            type: 'tconstruct:ageable_severing',
+            entity: {
+                types: ['minecraft:rabbit', 'atum:desert_rabbit']
+            },
+            adult_result: 'minecraft:rabbit_foot',
+            id: 'tconstruct:tools/severing/rabbit_foot'
+        }
+    ];
+
+    recipes.forEach((recipe) => {
+        event.custom(recipe).id(recipe.id);
+    });
+});

From 074401a027656009a07d1f1d8e781c870f12c433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Sat, 30 Oct 2021 21:36:14 +0200
Subject: [PATCH 110/130] temp fixed for realsies #3579  #3545

---
 .../ponder/tech/industrialforegoing/latex.js  | 124 +++++++++---------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js b/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js
index 776cfe4c24..3015ae6716 100644
--- a/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js
+++ b/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js
@@ -277,16 +277,16 @@ onEvent('ponder.registry', (event) => {
                     .placeNearTarget()
                     .pointAt(util.vector().topOf(chestPos));
 
-                scene.world().modifyTileNBT(
-                    util.select().position(chestPos),
-                    {
-                        hasNBT: false,
-                        blStack: { id: 'industrialforegoing:tinydryrubber', Count: 2 },
-                        stored: 2,
-                        voidItems: 1
-                    },
-                    true
-                );
+                // scene.world().modifyTileNBT(
+                //     util.select().position(chestPos),
+                //     {
+                //         hasNBT: false,
+                //         blStack: { id: 'industrialforegoing:tinydryrubber', Count: 2 },
+                //         stored: 2,
+                //         voidItems: 1
+                //     },
+                //     true
+                // );
 
                 scene.idle(80);
 
@@ -306,16 +306,16 @@ onEvent('ponder.registry', (event) => {
 
                 scene.idle(1);
 
-                scene.world().modifyTileNBT(
-                    util.select().position(4, 1, 2),
-                    {
-                        hasNBT: false,
-                        blStack: { id: 'industrialforegoing:tinydryrubber', Count: 9 },
-                        stored: 9,
-                        voidItems: 1
-                    },
-                    true
-                );
+                // scene.world().modifyTileNBT(
+                //     util.select().position(4, 1, 2),
+                //     {
+                //         hasNBT: false,
+                //         blStack: { id: 'industrialforegoing:tinydryrubber', Count: 9 },
+                //         stored: 9,
+                //         voidItems: 1
+                //     },
+                //     true
+                // );
 
                 scene
                     .world()
@@ -374,27 +374,27 @@ onEvent('ponder.registry', (event) => {
 
                 scene.idle(20);
 
-                scene.world().modifyTileNBT(
-                    util.select().position(4, 1, 2),
-                    {
-                        hasNBT: false,
-                        blStack: { id: 'industrialforegoing:tinydryrubber', Count: 9 },
-                        stored: 0,
-                        voidItems: 1
-                    },
-                    true
-                );
-
-                scene.world().modifyTileNBT(
-                    util.select().position(4, 1, 4),
-                    {
-                        hasNBT: false,
-                        blStack: { id: 'industrialforegoing:dryrubber', Count: 1 },
-                        stored: 1,
-                        voidItems: 1
-                    },
-                    true
-                );
+                // scene.world().modifyTileNBT(
+                //     util.select().position(4, 1, 2),
+                //     {
+                //         hasNBT: false,
+                //         blStack: { id: 'industrialforegoing:tinydryrubber', Count: 9 },
+                //         stored: 0,
+                //         voidItems: 1
+                //     },
+                //     true
+                // );
+
+                // scene.world().modifyTileNBT(
+                //     util.select().position(4, 1, 4),
+                //     {
+                //         hasNBT: false,
+                //         blStack: { id: 'industrialforegoing:dryrubber', Count: 1 },
+                //         stored: 1,
+                //         voidItems: 1
+                //     },
+                //     true
+                // );
 
                 scene.idle(20);
 
@@ -427,27 +427,27 @@ onEvent('ponder.registry', (event) => {
                         false
                     );
 
-                scene.world().modifyTileNBT(
-                    util.select().position(4, 1, 4),
-                    {
-                        hasNBT: false,
-                        blStack: { id: 'industrialforegoing:dryrubber', Count: 1 },
-                        stored: 0,
-                        voidItems: 1
-                    },
-                    true
-                );
-
-                scene.world().modifyTileNBT(
-                    util.select().position(4, 1, 6),
-                    {
-                        hasNBT: false,
-                        blStack: { id: 'industrialforegoing:plastic', Count: 1 },
-                        stored: 1,
-                        voidItems: 1
-                    },
-                    true
-                );
+                // scene.world().modifyTileNBT(
+                //     util.select().position(4, 1, 4),
+                //     {
+                //         hasNBT: false,
+                //         blStack: { id: 'industrialforegoing:dryrubber', Count: 1 },
+                //         stored: 0,
+                //         voidItems: 1
+                //     },
+                //     true
+                // );
+
+                // scene.world().modifyTileNBT(
+                //     util.select().position(4, 1, 6),
+                //     {
+                //         hasNBT: false,
+                //         blStack: { id: 'industrialforegoing:plastic', Count: 1 },
+                //         stored: 1,
+                //         voidItems: 1
+                //     },
+                //     true
+                // );
 
                 scene.effects().indicateSuccess(util.grid().at(4, 1, 6));
 

From b44b45aaa979198fac7fb73212e17f5ec9e5767c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Sat, 30 Oct 2021 21:40:36 +0200
Subject: [PATCH 111/130] blacklist byg ores from AS mineralis ritual, fixes
 #3575

---
 defaultconfigs/astralsorcery.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaultconfigs/astralsorcery.toml b/defaultconfigs/astralsorcery.toml
index 271098b377..d44ee59c87 100644
--- a/defaultconfigs/astralsorcery.toml
+++ b/defaultconfigs/astralsorcery.toml
@@ -8,7 +8,7 @@
 	#If set to 'true' anything that prevents mobspawning !by this mod!, will also prevent EVERY natural mobspawning of any mobtype. When set to 'false' it'll only stop monsters of type 'MONSTER' from spawning.
 	mobSpawningDenyAllTypes = false
 	#Features generating random ores in AstralSorcery will not spawn ores from mods listed here.
-	modidOreBlacklist = ["create", "eidolon", "occultism", "techreborn", "gregtech","mekanism","thermal","undergarden","immersiveengineering","tmechworks","mapperbase","minecraft","tconstruct"]
+	modidOreBlacklist = ["create", "eidolon", "occultism", "techreborn", "gregtech","mekanism","thermal","undergarden","immersiveengineering","tmechworks","mapperbase","minecraft","tconstruct","byg"]
 	#Set this to false to prevent players from being affected by entity-related colored lens effects.
 	doColoredLensesAffectPlayers = true
 

From 3add24902e8053f770117965061775009472dfb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Sat, 30 Oct 2021 21:50:39 +0200
Subject: [PATCH 112/130] added chisel charcoal -> charcoal recipe

---
 .../enigmatica/kubejs/base/recipes/shapeless.js             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js
index 21390acf1a..b3ac4bc81b 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js
@@ -1,4 +1,5 @@
 onEvent('recipes', (event) => {
+    const id_prefix = 'enigmatica:base/';
     const recipes = [
         { output: 'botania:enchanted_soil', inputs: ['minecraft:grass_block', 'botania:overgrowth_seed'] },
         { output: 'minecraft:sticky_piston', inputs: ['minecraft:piston', '#forge:slimeballs'] },
@@ -556,6 +557,11 @@ onEvent('recipes', (event) => {
         {
             output: Item.of('byg:brimstone', 2),
             inputs: ['minecraft:netherrack', 'byg:sythian_wart_block']
+        },
+        {
+            output: 'minecraft:charcoal',
+            inputs: ['#chisel:charcoal'],
+            id: `${id_prefix}charcoal`
         }
     ];
 

From 477e52397be61407bdf8daeccd6594e1f84f26b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Sat, 30 Oct 2021 21:54:30 +0200
Subject: [PATCH 113/130] added simple and fancy mining gadgets to ultimine
 blacklist, fixes #3428

---
 .../tags/items/ftbultimine/excluded_tools.js     | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/ftbultimine/excluded_tools.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/ftbultimine/excluded_tools.js
index cd7ae3e476..e51060ac03 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/ftbultimine/excluded_tools.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/ftbultimine/excluded_tools.js
@@ -1,13 +1,7 @@
 onEvent('item.tags', (event) => {
-    // Added by Ultimine natively
-    // event
-    //     .get('ftbultimine:excluded_tools')
-    //     .add([
-    //         'mininggadgets:mininggadget',
-    //         'ars_nouveau:wand',
-    //         'ars_nouveau:novice_spell_book',
-    //         'ars_nouveau:creative_spell_book',
-    //         'ars_nouveau:archmage_spell_book',
-    //         'ars_nouveau:apprentice_spell_book'
-    //     ]);
+    event.add('ftbultimine:excluded_tools', [
+        'mininggadgets:mininggadget',
+        'mininggadgets:mininggadget_simple',
+        'mininggadgets:mininggadget_fancy'
+    ]);
 });

From 8f940cae670fe475d760e201d3f6ae975d6ff271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Sat, 30 Oct 2021 22:21:55 +0200
Subject: [PATCH 114/130] #3428

---
 .../kubejs/base/tags/items/ftbultimine/excluded_tools.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/ftbultimine/excluded_tools.js b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/ftbultimine/excluded_tools.js
index e51060ac03..f4c395681b 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/ftbultimine/excluded_tools.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/tags/items/ftbultimine/excluded_tools.js
@@ -1,5 +1,5 @@
 onEvent('item.tags', (event) => {
-    event.add('ftbultimine:excluded_tools', [
+    event.add('ftbultimine:excluded_tools/strict', [
         'mininggadgets:mininggadget',
         'mininggadgets:mininggadget_simple',
         'mininggadgets:mininggadget_fancy'

From da6e0ebe1f3e2e8b4ada8af04412b018269098ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Sat, 30 Oct 2021 22:22:11 +0200
Subject: [PATCH 115/130] removed "cheaper" tcon anvil recipes, fixes #3578

---
 kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
index 516e08006b..b6a756ed11 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
@@ -178,6 +178,8 @@ onEvent('recipes', (event) => {
         'simplefarming:blueberry_pie',
 
         'tconstruct:tools/modifiers/wither_bone_conversion',
+        'tconstruct:tables/tinkers_anvil',
+        'tconstruct:tables/scorched_anvil',
 
         'thermal:compat/tconstruct/chiller_tconstruct_molten_debris_ingot',
         'thermal:machine/smelter/smelter_alloy_netherite',

From e7ab15680610914028625dd4e0206809274ef057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Sat, 30 Oct 2021 22:39:36 +0200
Subject: [PATCH 116/130] fixed #3581

---
 .../enigmatica/kubejs/base/recipes/remove.js  |  8 ++--
 .../base/recipetypes/environmental/sawing.js  | 38 +++++++++++++++++++
 .../base/recipetypes/minecraft/stonecutter.js |  4 --
 .../enigmatica/kubejs/constants/beams.js      | 19 +---------
 4 files changed, 42 insertions(+), 27 deletions(-)
 create mode 100644 kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/environmental/sawing.js

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
index b6a756ed11..8aecf4a668 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/remove.js
@@ -238,7 +238,9 @@ onEvent('recipes', (event) => {
         /masonry:\w+wall_from_\w+_stonecutting/,
         /masonry:\w+slab_from_\w+_stonecutting/,
         /atum:.*dye$/,
-        /thermal:compat\/\w+\/\w+_ore/
+        /thermal:compat\/\w+\/\w+_ore/,
+        /decorative_blocks:\w+_beam/,
+        /decorative_blocks_abnormals:\w+_beam/
     ];
 
     outputRemovals.forEach((removal) => {
@@ -301,10 +303,6 @@ onEvent('recipes', (event) => {
 
     event.remove({ type: 'valhelsia_structures:axe_crafting' });
 
-    beamRecipes.forEach((recipe) => {
-        event.remove({ output: recipe.output });
-    });
-
     stonecuttables.forEach((stoneType) => {
         stoneType.stones.forEach((stone) => {
             event.remove({ type: 'minecraft:stonecutting', output: stone });
diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/environmental/sawing.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/environmental/sawing.js
new file mode 100644
index 0000000000..8b40b123b8
--- /dev/null
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/environmental/sawing.js
@@ -0,0 +1,38 @@
+onEvent('recipes', (event) => {
+    const id_prefix = 'enigmatica:base/environmental/sawing/';
+    const recipes = [
+        // {
+        //     ingredient: {
+        //         tag: 'minecraft:planks'
+        //     },
+        //     result: 'minecraft:stick',
+        //     count: 2
+        // }
+    ];
+
+    const beamRecipes = [
+        { output: 'decorative_blocks:jungle_beam', input: '#minecraft:jungle_logs' },
+        { output: 'decorative_blocks:birch_beam', input: '#minecraft:birch_logs' },
+        { output: 'decorative_blocks:acacia_beam', input: '#minecraft:acacia_logs' },
+        { output: 'decorative_blocks:dark_oak_beam', input: '#minecraft:dark_oak_logs' },
+        { output: 'decorative_blocks:oak_beam', input: '#minecraft:oak_logs' },
+        { output: 'decorative_blocks:spruce_beam', input: '#minecraft:spruce_logs' },
+        { output: 'decorative_blocks:crimson_beam', input: '#minecraft:crimson_stems' },
+        { output: 'decorative_blocks:warped_beam', input: '#minecraft:warped_stems' },
+
+        { output: 'decorative_blocks_abnormals:morado_beam', input: 'atmospheric:stripped_morado_log' },
+        { output: 'decorative_blocks_abnormals:yucca_beam', input: 'atmospheric:stripped_yucca_log' },
+        { output: 'decorative_blocks_abnormals:rosewood_beam', input: 'atmospheric:stripped_rosewood_log' },
+        { output: 'decorative_blocks_abnormals:driftwood_beam', input: 'upgrade_aquatic:stripped_driftwood_log' },
+        { output: 'decorative_blocks_abnormals:river_beam', input: 'upgrade_aquatic:stripped_river_log' }
+    ];
+    beamRecipes.forEach((recipe) => {
+        let constructedRecipe = {
+            type: 'environmental:sawing',
+            ingredient: Ingredient.of(recipe.input),
+            result: recipe.output,
+            count: 1
+        };
+        event.custom(constructedRecipe).id(`${id_prefix}${recipe.output.replace(':', '_')}`);
+    });
+});
diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/stonecutter.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/stonecutter.js
index 758d58d2db..1c0f3ba6b7 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/stonecutter.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/stonecutter.js
@@ -14,10 +14,6 @@ onEvent('recipes', (event) => {
         });
     });
 
-    beamRecipes.forEach((recipe) => {
-        event.stonecutting(recipe.output, recipe.input);
-    });
-
     stonecuttables.forEach((stoneType) => {
         var tag = `#enigmatica:stonecuttables/${stoneType.name}`;
         stoneType.stones.forEach((stone) => {
diff --git a/kubejs/server_scripts/enigmatica/kubejs/constants/beams.js b/kubejs/server_scripts/enigmatica/kubejs/constants/beams.js
index 201df28786..b786a37479 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/constants/beams.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/constants/beams.js
@@ -1,18 +1 @@
-//priority: 1000
-
-const beamRecipes = [
-    { output: 'decorative_blocks:jungle_beam', input: '#minecraft:jungle_logs' },
-    { output: 'decorative_blocks:birch_beam', input: '#minecraft:birch_logs' },
-    { output: 'decorative_blocks:acacia_beam', input: '#minecraft:acacia_logs' },
-    { output: 'decorative_blocks:dark_oak_beam', input: '#minecraft:dark_oak_logs' },
-    { output: 'decorative_blocks:oak_beam', input: '#minecraft:oak_logs' },
-    { output: 'decorative_blocks:spruce_beam', input: '#minecraft:spruce_logs' },
-    { output: 'decorative_blocks:crimson_beam', input: '#minecraft:crimson_stems' },
-    { output: 'decorative_blocks:warped_beam', input: '#minecraft:warped_stems' },
-
-    { output: 'decorative_blocks_abnormals:morado_beam', input: 'atmospheric:stripped_morado_log' },
-    { output: 'decorative_blocks_abnormals:yucca_beam', input: 'atmospheric:stripped_yucca_log' },
-    { output: 'decorative_blocks_abnormals:rosewood_beam', input: 'atmospheric:stripped_rosewood_log' },
-    { output: 'decorative_blocks_abnormals:driftwood_beam', input: 'upgrade_aquatic:stripped_driftwood_log' },
-    { output: 'decorative_blocks_abnormals:river_beam', input: 'upgrade_aquatic:stripped_river_log' }
-];
+//TODO: Remove in 0.6.0

From 7eeaf27ec68c2d0ab5b9dc418a7d01b6fe403982 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sat, 30 Oct 2021 17:12:26 -0400
Subject: [PATCH 117/130] little mek tweaks

---
 .../expert/recipetypes/mekanism/shaped.js     | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index b59f8ff9eb..55b1c30ee4 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -668,6 +668,70 @@ onEvent('recipes', (event) => {
                 F: 'immersiveengineering:coil_hv'
             },
             id: 'mekanismgenerators:generator/bio'
+        },
+        {
+            output: 'mekanism:free_runners',
+            pattern: ['ABA', 'CDC', 'EFE'],
+            key: {
+                A: 'create:precision_mechanism',
+                B: 'immersiveengineering:capacitor_lv',
+                C: '#forge:gears/bronze',
+                D: 'immersiveengineering:toolupgrade_drill_lube',
+                E: 'immersiveengineering:component_steel',
+                F: 'immersiveengineering:armor_faraday_feet'
+            },
+            id: 'mekanism:free_runners'
+        },
+        {
+            output: 'mekanism:electric_bow',
+            pattern: [' BC', 'A C', ' BC'],
+            key: {
+                A: 'powah:dielectric_rod',
+                B: 'powah:capacitor_hardened',
+                C: '#forge:wires/aluminum'
+            },
+            id: 'mekanism:electric_bow'
+        },
+        {
+            output: 'mekanism:configurator',
+            pattern: ['  A', ' B ', 'C  '],
+            key: {
+                A: '#forge:rods/lapis',
+                B: 'thermal:rf_coil',
+                C: '#forge:rods/steel'
+            },
+            id: 'mekanism:configurator'
+        },
+        {
+            output: 'mekanism:chargepad',
+            pattern: ['AAA', 'BCB'],
+            key: {
+                A: 'minecraft:polished_blackstone_pressure_plate',
+                B: '#forge:ingots/steel',
+                C: 'thermal:rf_coil'
+            },
+            id: 'mekanism:chargepad'
+        },
+        {
+            output: 'mekanism:network_reader',
+            pattern: [' B ', 'ACA', ' B '],
+            key: {
+                A: '#forge:alloys/advanced',
+                B: '#forge:ingots/steel',
+                C: 'thermal:rf_coil'
+            },
+            id: 'mekanism:network_reader'
+        },
+        {
+            output: 'mekanism:portable_teleporter',
+            pattern: ['ABA', 'CDC'],
+            key: {
+                A: 'thermal:rf_coil',
+                B: 'mekanism:teleportation_core',
+                C: '#forge:plates/steel',
+                D: 'rftoolsbase:tablet'
+            },
+            id: 'mekanism:portable_teleporter'
         }
     ];
 

From eb75aab859421930d466238f96e46d6ca5a7f6b9 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sat, 30 Oct 2021 18:24:14 -0400
Subject: [PATCH 118/130] shuffle

---
 .../recipetypes/create/mechanical_crafting.js |  8 +--
 .../expert/recipetypes/mekanism/shaped.js     | 52 +++++++++----------
 .../recipetypes/mininggadgets/shaped.js       |  4 +-
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
index db073bf959..567c1fdfe1 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/create/mechanical_crafting.js
@@ -264,7 +264,7 @@ onEvent('recipes', (event) => {
                 B: 'immersiveengineering:coil_lv',
                 C: 'immersiveengineering:electron_tube',
                 D: 'immersiveengineering:wirecoil_redstone',
-                E: ['immersiveengineering:logic_circuit', 'pneumaticcraft:printed_circuit_board'],
+                E: 'pneumaticcraft:advanced_pcb',
                 F: 'immersiveengineering:current_transformer',
                 G: 'xnet:controller'
             },
@@ -355,7 +355,7 @@ onEvent('recipes', (event) => {
                 D: 'thermal:charge_bench',
                 E: 'rftoolsbase:infused_diamond',
                 F: 'industrialforegoing:laser_lens2',
-                G: 'mekanism:elite_tier_installer',
+                G: 'thermal:upgrade_augment_2',
                 H: 'immersiveengineering:wooden_grip'
             },
             id: 'mininggadgets:mininggadget_simple'
@@ -370,7 +370,7 @@ onEvent('recipes', (event) => {
                 D: 'thermal:charge_bench',
                 E: 'rftoolsbase:infused_diamond',
                 F: 'industrialforegoing:laser_lens6',
-                G: 'mekanism:elite_tier_installer',
+                G: 'thermal:upgrade_augment_2',
                 H: 'immersiveengineering:wooden_grip'
             },
             id: 'mininggadgets:mininggadget_fancy'
@@ -385,7 +385,7 @@ onEvent('recipes', (event) => {
                 D: 'thermal:charge_bench',
                 E: 'rftoolsbase:infused_diamond',
                 F: 'industrialforegoing:laser_lens3',
-                G: 'mekanism:elite_tier_installer',
+                G: 'thermal:upgrade_augment_2',
                 H: 'immersiveengineering:wooden_grip'
             },
             id: 'mininggadgets:mininggadget'
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
index 55b1c30ee4..ef32380cc4 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mekanism/shaped.js
@@ -157,7 +157,7 @@ onEvent('recipes', (event) => {
                 B: 'create:copper_valve_handle',
                 C: 'create:fluid_pipe',
                 D: 'create:fluid_valve',
-                E: ['immersiveengineering:logic_circuit', 'pneumaticcraft:printed_circuit_board']
+                E: 'pneumaticcraft:advanced_pcb'
             },
             id: 'mekanism:dynamic_valve'
         },
@@ -318,7 +318,7 @@ onEvent('recipes', (event) => {
             pattern: ['ABA', 'CDC', 'E E'],
             key: {
                 A: '#forge:plates/bronze',
-                B: 'immersiveengineering:logic_circuit',
+                B: 'pneumaticcraft:advanced_pcb',
                 C: 'create:copper_backtank',
                 D: 'thermal:hazmat_chestplate',
                 E: 'immersiveengineering:toolupgrade_chemthrower_focus'
@@ -350,7 +350,7 @@ onEvent('recipes', (event) => {
             pattern: ['ABA', 'ACA', ' D '],
             key: {
                 A: 'mekanismgenerators:solar_panel',
-                B: 'immersiveengineering:logic_circuit',
+                B: 'pneumaticcraft:advanced_pcb',
                 C: 'thermal:redstone_servo',
                 D: 'engineersdecor:thick_steel_pole_head'
             },
@@ -404,11 +404,11 @@ onEvent('recipes', (event) => {
             key: {
                 A: 'immersiveengineering:steel_wallmount',
                 B: 'immersiveengineering:turntable',
-                C: 'mekanism:advanced_chemical_tank',
-                D: '#industrialforegoing:machine_frame/simple',
-                E: 'mekanism:advanced_fluid_tank',
-                F: '#forge:circuits/basic',
-                G: 'rftoolspower:cell1'
+                C: 'mekanism:basic_chemical_tank',
+                D: '#industrialforegoing:machine_frame/pity',
+                E: 'mekanism:basic_fluid_tank',
+                F: 'pneumaticcraft:advanced_pcb',
+                G: 'thermal:rf_coil'
             },
             id: 'mekanism:rotary_condensentrator'
         },
@@ -429,12 +429,12 @@ onEvent('recipes', (event) => {
             output: 'mekanism:crusher',
             pattern: ['ABA', 'CDC', 'EFE'],
             key: {
-                A: '#forge:gears/compressed_iron',
+                A: '#forge:gears/osmium',
                 B: 'engineersdecor:factory_hopper',
                 C: 'create:filter',
-                D: '#industrialforegoing:machine_frame/simple',
-                E: '#forge:circuits/basic',
-                F: 'rftoolspower:cell1'
+                D: '#industrialforegoing:machine_frame/pity',
+                E: 'pneumaticcraft:advanced_pcb',
+                F: 'thermal:rf_coil'
             },
             id: 'mekanism:crusher'
         },
@@ -518,12 +518,12 @@ onEvent('recipes', (event) => {
             output: 'mekanism:pressurized_reaction_chamber',
             pattern: ['ABA', 'CDC', 'EFE'],
             key: {
-                A: 'pneumaticcraft:pressure_chamber_glass',
-                B: 'mekanism:advanced_fluid_tank',
-                C: 'mekanism:advanced_chemical_tank',
-                D: '#industrialforegoing:machine_frame/advanced',
-                E: '#forge:circuits/advanced',
-                F: 'rftoolspower:cell2'
+                A: '#thermal:glass/hardened',
+                B: 'mekanism:basic_fluid_tank',
+                C: 'mekanism:basic_chemical_tank',
+                D: '#industrialforegoing:machine_frame/pity',
+                E: 'pneumaticcraft:advanced_pcb',
+                F: 'thermal:rf_coil'
             },
             id: 'mekanism:pressurized_reaction_chamber'
         },
@@ -650,9 +650,9 @@ onEvent('recipes', (event) => {
                 A: '#forge:gears/compressed_iron',
                 B: 'mekanism:basic_chemical_tank',
                 C: 'pneumaticcraft:turbine_rotor',
-                D: '#industrialforegoing:machine_frame/simple',
-                E: '#forge:circuits/basic',
-                F: 'immersiveengineering:coil_hv'
+                D: '#industrialforegoing:machine_frame/pity',
+                E: 'immersiveengineering:coil_lv',
+                F: 'thermal:rf_coil'
             },
             id: 'mekanismgenerators:generator/gas_burning'
         },
@@ -660,12 +660,12 @@ onEvent('recipes', (event) => {
             output: 'mekanismgenerators:bio_generator',
             pattern: ['ABA', 'CDC', 'EFE'],
             key: {
-                A: '#forge:gears/compressed_iron',
+                A: '#forge:gears/invar',
                 B: 'mekanism:basic_fluid_tank',
-                C: 'pneumaticcraft:turbine_rotor',
-                D: '#industrialforegoing:machine_frame/simple',
-                E: '#forge:circuits/basic',
-                F: 'immersiveengineering:coil_hv'
+                C: 'create:propeller',
+                D: '#industrialforegoing:machine_frame/pity',
+                E: 'immersiveengineering:coil_lv',
+                F: 'thermal:rf_coil'
             },
             id: 'mekanismgenerators:generator/bio'
         },
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mininggadgets/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mininggadgets/shaped.js
index 99c2e93fa7..9e64b5adc5 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mininggadgets/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/mininggadgets/shaped.js
@@ -260,10 +260,10 @@ onEvent('recipes', (event) => {
         },
         {
             output: 'mininggadgets:modificationtable',
-            pattern: [' A ', 'BCB', 'B B'],
+            pattern: ['BAB', 'BCB'],
             key: {
                 A: 'rftoolsbase:tablet',
-                B: '#forge:alloys/advanced',
+                B: 'mekanism:hdpe_sheet',
                 C: 'thermal:tinker_bench'
             },
             id: 'mininggadgets:modificationtable'

From 2eafe5bb8e8dc55791c64bbffc93eb31585249a8 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sat, 30 Oct 2021 18:37:45 -0400
Subject: [PATCH 119/130] Add Missing Simple Farming seeds to Market

Resolves #3607
---
 .../simplefarming_seeds.json                  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 kubejs/data/farmingforblockheads/farmingforblockheads_compat/simplefarming_seeds.json

diff --git a/kubejs/data/farmingforblockheads/farmingforblockheads_compat/simplefarming_seeds.json b/kubejs/data/farmingforblockheads/farmingforblockheads_compat/simplefarming_seeds.json
new file mode 100644
index 0000000000..0ee86effff
--- /dev/null
+++ b/kubejs/data/farmingforblockheads/farmingforblockheads_compat/simplefarming_seeds.json
@@ -0,0 +1,23 @@
+{
+    "modId": "supplementaries",
+    "group": {
+        "name": "Simple Farming Seeds",
+        "enabledByDefault": true,
+        "defaultPayment": {
+            "item": "minecraft:emerald"
+        },
+        "defaultCategory": "farmingforblockheads:seeds"
+    },
+    "customEntries": [
+        {
+            "output": {
+                "item": "simplefarming:cumin_seeds"
+            }
+        },
+        {
+            "output": {
+                "item": "simplefarming:quinoa_seeds"
+            }
+        }
+    ]
+}

From 395bb8596113e2b282ba72ddf57795e21cc4819d Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sat, 30 Oct 2021 18:47:30 -0400
Subject: [PATCH 120/130] Add Warning to Tetra Quests concerning End Rod
 Handles

Resolves: #3523
---
 config/ftbquests/quests/chapters/tetra.snbt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/ftbquests/quests/chapters/tetra.snbt b/config/ftbquests/quests/chapters/tetra.snbt
index 35a3adb62f..ac4bb28244 100644
--- a/config/ftbquests/quests/chapters/tetra.snbt
+++ b/config/ftbquests/quests/chapters/tetra.snbt
@@ -714,6 +714,8 @@
 				"Obsidian will get you to Tier 5."
 				""
 				"If you need higher integrity, try out an End Rod as a handle."
+				""
+				"Be warned, an End Rod handle may have… unfortunate side effects when near Endermen. Use with caution."
 			]
 			dependencies: [
 				"0000000000000787"

From bb02d32f28d89d57d3d0a0f3b8253a264b62b279 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sat, 30 Oct 2021 20:37:27 -0400
Subject: [PATCH 121/130] Blacklist disabled food items

based strictly off what I see in the disabledItems constant... could be others.
Resolves: #3587
---
 defaultconfigs/solcarrot-server.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaultconfigs/solcarrot-server.toml b/defaultconfigs/solcarrot-server.toml
index d3737bbf45..bffb21d1d7 100644
--- a/defaultconfigs/solcarrot-server.toml
+++ b/defaultconfigs/solcarrot-server.toml
@@ -14,7 +14,7 @@
 	#Range: 0 ~ 1000
 	minimumFoodValue = 1
 	#Foods in this list won't affect the player's health nor show up in the food book.
-	blacklist = ["farmersdelight:fried_egg"]
+	blacklist = ["farmersdelight:fried_egg", "environmental:cherry_pie", "environmental:apple_pie", "simplefarming:apple_pie", "simplefarming:blueberry_pie", "abnormals_delight:adzuki_cake_slice", "abnormals_delight:banana_cake_slice", "abnormals_delight:cherry_pantry", "abnormals_delight:chocolate_cake_slice", "abnormals_delight:cooked_duck_fillet", "abnormals_delight:cooked_venison_shanks", "abnormals_delight:duck_fillet", "abnormals_delight:mint_cake_slice", "abnormals_delight:necromium_knife", "abnormals_delight:passionfruit_glazed_duck", "abnormals_delight:seared_venison", "abnormals_delight:strawberry_cake_slice", "abnormals_delight:vanilla_cake_slice", "abnormals_delight:venison_shanks", "abnormals_delight:willow_pantry", "abnormals_delight:wisteria_pantry"]
 	#When this list contains anything, the blacklist is ignored and instead only foods from here count.
 	whitelist = []
 

From 7f969c0a86f86361dcd54e4d9618d9509cb259d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Sun, 31 Oct 2021 15:02:18 +0100
Subject: [PATCH 122/130] prepped for new PonderJS release fixing Ponder
 crashes, reverts outcommenting #3579 #3545

---
 .../tech/industrialforegoing/laser_drill.js   |  14 +-
 .../ponder/tech/industrialforegoing/latex.js  | 140 +++++++++---------
 2 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/kubejs/client_scripts/ponder/tech/industrialforegoing/laser_drill.js b/kubejs/client_scripts/ponder/tech/industrialforegoing/laser_drill.js
index 12c08387a5..58696907fd 100644
--- a/kubejs/client_scripts/ponder/tech/industrialforegoing/laser_drill.js
+++ b/kubejs/client_scripts/ponder/tech/industrialforegoing/laser_drill.js
@@ -417,13 +417,13 @@ onEvent('ponder.registry', (event) => {
                 scene.addKeyframe();
                 scene.idle(20);
 
-                // scene.world().modifyTileNBT(
-                //     tank1,
-                //     {
-                //         tank: { FluidName: 'minecraft:lava', Amount: 100 }
-                //     },
-                //     true
-                // );
+                scene.world().modifyTileNBT(
+                    tank1,
+                    {
+                        tank: { FluidName: 'minecraft:lava', Amount: 1000 }
+                    },
+                    true
+                );
 
                 scene
                     .overlay()
diff --git a/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js b/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js
index 3015ae6716..8862f15147 100644
--- a/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js
+++ b/kubejs/client_scripts/ponder/tech/industrialforegoing/latex.js
@@ -107,10 +107,10 @@ onEvent('ponder.registry', (event) => {
                         Block.id('industrialforegoing:common_black_hole_tank').with('subfacing', 'north').blockState,
                         true
                     );
-                scene.idle(1);
-                // scene.world().modifyTileNBT(tank1, {
-                //     tank: { FluidName: 'thermal:resin', Amount: Utils.random.nextInt(64000) }
-                // });
+                scene.idle(20);
+                scene.world().modifyTileNBT(tank1, {
+                    tank: { FluidName: 'thermal:resin', Amount: 1000 }
+                });
 
                 var tank2 = util.grid().at(3, 2, 3);
                 scene
@@ -120,10 +120,10 @@ onEvent('ponder.registry', (event) => {
                         Block.id('industrialforegoing:common_black_hole_tank').with('subfacing', 'north').blockState,
                         true
                     );
-                scene.idle(1);
-                // scene.world().modifyTileNBT(tank2, {
-                //     tank: { FluidName: 'industrialforegoing:latex', Amount: Utils.random.nextInt(64000) }
-                // });
+                scene.idle(20);
+                scene.world().modifyTileNBT(tank2, {
+                    tank: { FluidName: 'industrialforegoing:latex', Amount: 1000 }
+                });
 
                 scene.world().showSection(util.select().fromTo(3, 2, 3, 5, 2, 3), Facing.down);
 
@@ -277,16 +277,16 @@ onEvent('ponder.registry', (event) => {
                     .placeNearTarget()
                     .pointAt(util.vector().topOf(chestPos));
 
-                // scene.world().modifyTileNBT(
-                //     util.select().position(chestPos),
-                //     {
-                //         hasNBT: false,
-                //         blStack: { id: 'industrialforegoing:tinydryrubber', Count: 2 },
-                //         stored: 2,
-                //         voidItems: 1
-                //     },
-                //     true
-                // );
+                scene.world().modifyTileNBT(
+                    util.select().position(chestPos),
+                    {
+                        hasNBT: false,
+                        blStack: { id: 'industrialforegoing:tinydryrubber', Count: 2 },
+                        stored: 2,
+                        voidItems: 1
+                    },
+                    true
+                );
 
                 scene.idle(80);
 
@@ -306,16 +306,16 @@ onEvent('ponder.registry', (event) => {
 
                 scene.idle(1);
 
-                // scene.world().modifyTileNBT(
-                //     util.select().position(4, 1, 2),
-                //     {
-                //         hasNBT: false,
-                //         blStack: { id: 'industrialforegoing:tinydryrubber', Count: 9 },
-                //         stored: 9,
-                //         voidItems: 1
-                //     },
-                //     true
-                // );
+                scene.world().modifyTileNBT(
+                    util.select().position(4, 1, 2),
+                    {
+                        hasNBT: false,
+                        blStack: { id: 'industrialforegoing:tinydryrubber', Count: 9 },
+                        stored: 9,
+                        voidItems: 1
+                    },
+                    true
+                );
 
                 scene
                     .world()
@@ -374,27 +374,27 @@ onEvent('ponder.registry', (event) => {
 
                 scene.idle(20);
 
-                // scene.world().modifyTileNBT(
-                //     util.select().position(4, 1, 2),
-                //     {
-                //         hasNBT: false,
-                //         blStack: { id: 'industrialforegoing:tinydryrubber', Count: 9 },
-                //         stored: 0,
-                //         voidItems: 1
-                //     },
-                //     true
-                // );
-
-                // scene.world().modifyTileNBT(
-                //     util.select().position(4, 1, 4),
-                //     {
-                //         hasNBT: false,
-                //         blStack: { id: 'industrialforegoing:dryrubber', Count: 1 },
-                //         stored: 1,
-                //         voidItems: 1
-                //     },
-                //     true
-                // );
+                scene.world().modifyTileNBT(
+                    util.select().position(4, 1, 2),
+                    {
+                        hasNBT: false,
+                        blStack: { id: 'industrialforegoing:tinydryrubber', Count: 9 },
+                        stored: 0,
+                        voidItems: 1
+                    },
+                    true
+                );
+
+                scene.world().modifyTileNBT(
+                    util.select().position(4, 1, 4),
+                    {
+                        hasNBT: false,
+                        blStack: { id: 'industrialforegoing:dryrubber', Count: 1 },
+                        stored: 1,
+                        voidItems: 1
+                    },
+                    true
+                );
 
                 scene.idle(20);
 
@@ -427,27 +427,27 @@ onEvent('ponder.registry', (event) => {
                         false
                     );
 
-                // scene.world().modifyTileNBT(
-                //     util.select().position(4, 1, 4),
-                //     {
-                //         hasNBT: false,
-                //         blStack: { id: 'industrialforegoing:dryrubber', Count: 1 },
-                //         stored: 0,
-                //         voidItems: 1
-                //     },
-                //     true
-                // );
-
-                // scene.world().modifyTileNBT(
-                //     util.select().position(4, 1, 6),
-                //     {
-                //         hasNBT: false,
-                //         blStack: { id: 'industrialforegoing:plastic', Count: 1 },
-                //         stored: 1,
-                //         voidItems: 1
-                //     },
-                //     true
-                // );
+                scene.world().modifyTileNBT(
+                    util.select().position(4, 1, 4),
+                    {
+                        hasNBT: false,
+                        blStack: { id: 'industrialforegoing:dryrubber', Count: 1 },
+                        stored: 0,
+                        voidItems: 1
+                    },
+                    true
+                );
+
+                scene.world().modifyTileNBT(
+                    util.select().position(4, 1, 6),
+                    {
+                        hasNBT: false,
+                        blStack: { id: 'industrialforegoing:plastic', Count: 1 },
+                        stored: 1,
+                        voidItems: 1
+                    },
+                    true
+                );
 
                 scene.effects().indicateSuccess(util.grid().at(4, 1, 6));
 

From b25287b626c2bd8c53cc7121fea88b5839cfa54d Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Sun, 31 Oct 2021 13:20:09 -0400
Subject: [PATCH 123/130] Correct Typo in Clay Bee, Correct invalid recipe
 override for Clay in Alchemy Table

Correct Typo in Clay Bee, Correct invalid recipe override for Clay in Alchemy Table
---
 config/resourcefulbees/bees/material/Clay.json   | 16 +++++++---------
 .../base/recipetypes/bloodmagic/alchemytable.js  |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/config/resourcefulbees/bees/material/Clay.json b/config/resourcefulbees/bees/material/Clay.json
index b33bef6d49..259c306c66 100644
--- a/config/resourcefulbees/bees/material/Clay.json
+++ b/config/resourcefulbees/bees/material/Clay.json
@@ -1,6 +1,6 @@
 {
     "flower": "ALL",
-    "lore": "Tier 2:\nThe temperment of the Rocky Bee can be\nsoftened by the Slimy Bee, yeilding Clay.",
+    "lore": "Tier 2:\nThe temperment of the Rocky Bee can be\nsoftened by the Slimy Bee, yielding Clay.",
     "loreColor": "#00AAAA",
     "maxTimeInHive": 2400,
     "sizeModifier": 0.75,
@@ -21,14 +21,12 @@
         "attackDamage": 1
     },
     "MutationData": {
-        "mutations" : [
-          {
-            "type": "BLOCK",
-            "inputID": "tag:minecraft:sand",
-            "outputs": [
-              {"outputID": "minecraft:clay", "weight": 10}
-            ]
-          }
+        "mutations": [
+            {
+                "type": "BLOCK",
+                "inputID": "tag:minecraft:sand",
+                "outputs": [{ "outputID": "minecraft:clay", "weight": 10 }]
+            }
         ]
     },
     "CentrifugeData": {
diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/bloodmagic/alchemytable.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/bloodmagic/alchemytable.js
index 7531744d84..d1890c4f46 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/bloodmagic/alchemytable.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/bloodmagic/alchemytable.js
@@ -63,7 +63,7 @@ onEvent('recipes', (event) => {
             syphon: 150,
             ticks: 100,
             orbLevel: 2,
-            id: `${id_prefix}clay_from_sand_sigil`
+            id: 'bloodmagic:alchemytable/clay_from_sand_sigil'
         },
         {
             inputs: ['#forge:rods/blaze'],

From 68a1410a4204d0c988b6570e36bd2f52f630a677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Sun, 31 Oct 2021 19:22:27 +0100
Subject: [PATCH 124/130] Delete ars_nouveau-common-1.toml.bak

---
 config/ars_nouveau-common-1.toml.bak | 83 ----------------------------
 1 file changed, 83 deletions(-)
 delete mode 100644 config/ars_nouveau-common-1.toml.bak

diff --git a/config/ars_nouveau-common-1.toml.bak b/config/ars_nouveau-common-1.toml.bak
deleted file mode 100644
index 1e6ec5ff6c..0000000000
--- a/config/ars_nouveau-common-1.toml.bak
+++ /dev/null
@@ -1,83 +0,0 @@
-
-#General settings
-[general]
-	#How often Sylphs spawn
-	#Range: 0 ~ 100
-	sylphWeight = 5
-	#Spawn Arcane Ore in the world
-	genOre = false
-	#Spawn a book in the players inventory on login
-	spawnBook = false
-	#Spawn Mana Berry Bushes in the world
-	genBerries = true
-	#How often Carbuncles spawn
-	#Range: 0 ~ 100
-	carbuncleWeight = 5
-	#Rate of tree spawn per chunk
-	#Range: 0.0 ~ 1.0
-	genTrees = 0.002
-	#How often Wilden Guardians spawn
-	#Range: 0 ~ 200
-	wguardianWeight = 8
-	#How often Wilden Stalkers spawn
-	#Range: 0 ~ 200
-	wstalkerWeight = 8
-	#How often Wilden Hunter spawn
-	#Range: 0 ~ 200
-	whunterWeight = 8
-	#Should the Wilden Hunter attack animals?
-	hunterHuntsAnimals = true
-	#Should the Wilden Stalker attack animals?
-	stalkerHuntsAnimals = false
-	#Should the Wilden Defender attack animals?
-	defenderHuntsAnimals = false
-	#Dimensions where hostile mobs will not spawn. Ex: ["minecraft:overworld", "undergarden:undergarden"]. . Run /forge dimensions for a list.
-	dimensionBlacklist = ["compactmachines:compact_world", "atum:atum", "mythicbotany:alfheim", "undergarden:undergarden"]
-	#Archwood forest spawn weight
-	#Range: > 0
-	archwoodForest = 3
-	#Crystallizer output item. Do not use a wrong ID!
-	crystallizer_output = "emendatusenigmatica:arcane_gem"
-	#How often Drygmys spawn
-	#Range: 0 ~ 100
-	drygmyWeight = 3
-	#How much mana drygmys consume per generation
-	#Range: 0 ~ 10000
-	drygmyManaCost = 8000
-	#How much mana sylphs consume per generation
-	#Range: 0 ~ 10000
-	sylphManaCost = 2000
-	#How many channels must occur before a drygmy produces loot
-	#Range: 0 ~ 300
-	drygmyMaxProgress = 15
-
-#Mana
-[mana]
-	#Base mana regen in seconds
-	#Range: > 0
-	baseRegen = 5
-	#Max mana bonus for tier of book
-	#Range: > 0
-	tierMax = 50
-	#How often max and regen will be calculated, in ticks. NOTE: Having the base mana regen AT LEAST this value is recommended.
-	#Range: 1 ~ 20
-	updateInterval = 5
-	#Mana Boost value per level
-	#Range: > 0
-	manaBoost = 25
-	#Regen bonus per potion level
-	#Range: > 0
-	potionRegen = 10
-	#Max mana bonus per glyph
-	#Range: > 0
-	glyphmax = 15
-	#(enchantment) Mana regen per second per level
-	#Range: > 0
-	manaRegenEnchantment = 2
-	#Base max mana
-	#Range: > 0
-	baseMax = 100
-	#Regen bonus per glyph
-	#Range: 0.0 ~ 2.147483647E9
-	glyphRegen = 0.33
-

From 4a148d63b89e8b6f0f9e484cc9940ee9e4e8fe93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Sun, 31 Oct 2021 19:28:45 +0100
Subject: [PATCH 125/130] sorta regenned the astral config, hopefully fixes
 #3619

---
 defaultconfigs/astralsorcery.toml | 212 ++++++++++++++----------------
 1 file changed, 101 insertions(+), 111 deletions(-)

diff --git a/defaultconfigs/astralsorcery.toml b/defaultconfigs/astralsorcery.toml
index d44ee59c87..9fc14872cd 100644
--- a/defaultconfigs/astralsorcery.toml
+++ b/defaultconfigs/astralsorcery.toml
@@ -16,14 +16,6 @@
 	#Sets the amount of damage reduction a player gets when being hit by a DE chaos-damage-related damagetype.
 	#Range: 0.0 ~ 1.0
 	capeChaosResistance = 0.8
-	#If this is set to true, charged crystals tools can revert back to their inert state.
-	chargedToolsRevert = true
-	#Defines the minimum uses a user at least gets before it's trying to revert to an inert crystal tool.
-	#Range: 0 ~ 2147483646
-	chargedToolsRevertStart = 40
-	#After 'chargedCrystalToolsRevertStart' uses, it will random.nextInt(chance) == 0 try and see if the tool gets reverted to its inert crystal tool.
-	#Range: 1 ~ 1073741823
-	chargedToolsRevertChance = 80
 
 	[tools.wands]
 		#Sets the quick-charge cost for one usage of the illumination wand
@@ -90,17 +82,17 @@
 
 	[perks.root]
 
-		[perks.root.armara]
+		[perks.root.vicio]
 			#Defines the general exp multiplier for this root perk. Can be used for balancing in a pack environment.
 			#Range: 0.10000000149011612 ~ 20.0
 			expMultiplier = 1.0
 
-		[perks.root.aevitas]
+		[perks.root.armara]
 			#Defines the general exp multiplier for this root perk. Can be used for balancing in a pack environment.
 			#Range: 0.10000000149011612 ~ 20.0
 			expMultiplier = 1.0
 
-		[perks.root.vicio]
+		[perks.root.evorsio]
 			#Defines the general exp multiplier for this root perk. Can be used for balancing in a pack environment.
 			#Range: 0.10000000149011612 ~ 20.0
 			expMultiplier = 1.0
@@ -110,49 +102,57 @@
 			#Range: 0.10000000149011612 ~ 20.0
 			expMultiplier = 1.0
 
-		[perks.root.evorsio]
+		[perks.root.aevitas]
 			#Defines the general exp multiplier for this root perk. Can be used for balancing in a pack environment.
 			#Range: 0.10000000149011612 ~ 20.0
 			expMultiplier = 1.0
 
 	[perks.key]
 
-		[perks.key.proj_proximity]
-			#Defines the distance at which no additional damage is awarded.
-			#Range: 4.0 ~ 65536.0
-			capDistance = 100.0
-			#Defines the maximum multiplier that can be reached if the distance when hitting something with projectiles is basically nothing.
+		[perks.key.no_armor]
+			#The multiplier that is applied to damage the player receives. The lower the more damage is negated.
+			#Range: 0.10000000149011612 ~ 1.0
+			damageTakenMultiplier = 0.699999988079071
+
+		[perks.key.culling]
+			#Defines the percentage at how low the entities' health as to be to then cull the entity.
+			#Range: 0.05000000074505806 ~ 0.5
+			cullHealth = 0.15000000596046448
+			#Defines the amount of starlight charge consumed per culling attempt.
+			#Range: 1 ~ 500
+			chargeCost = 250
+
+		[perks.key.proj_distance]
+			#Defines the distance that must be reached to achieve the maximum damage multiplier
+			#Range: 100.0 ~ 65536.0
+			capDistance = 6400.0
+			#Defines the maximum multiplier that can be reached if the 'capDistance' is reached or surpassed when hitting something
 			#Range: 0.05000000074505806 ~ 5.0
 			maxAdditionalMultiplier = 0.75
 
-		[perks.key.mending]
-			#Sets the chance (Random.nextInt(chance) == 0) to try to see if a piece of armor on the player that is damageable and damaged can be repaired; the lower the more likely.
-			#Range: > 5
-			chanceToRepair = 800
-			#Defines the amount of starlight charge consumed per restored durability point.
-			#Range: 1 ~ 500
-			chargeCost = 60
+		[perks.key.damage_effects]
+			#Defines the chance per hit to apply additional effects.
+			#Range: 0.009999999776482582 ~ 0.20000000298023224
+			applicationChance = 0.07999999821186066
 
-		[perks.key.lightning_arc]
-			#Sets the chance to spawn a damage-arc effect when an enemy is hit (value is in percent).
-			#Range: 0.1 ~ 1.0
-			arcChance = 0.6000000238418579
-			#Defines the damage-multiplier which gets added to the damage dealt initially.
-			#Range: 0.1 ~ 8.0
-			arcPercent = 0.6000000238418579
-			#Defines the distance for how far a single arc can jump/search for nearby entities.
-			#Range: 0.2 ~ 16.0
-			arcDistance = 7.0
-			#Range: 1 ~ 32
-			arcTicks = 3
-			#Defines the amount of starlight charge consumed per spawned lighning arc.
+		[perks.key.growable]
+			#Sets the chance to try to see if a random plant near the player gets bonemeal'd.
+			#Range: 0.0 ~ 1.0
+			chanceToBonemeal = 0.30000001192092896
+			#Defines the radius around which the perk effect should apply around the player.
+			#Range: 1 ~ 16
+			radius = 3
+			#Defines the amount of starlight charge consumed per growth-attempt.
 			#Range: 1 ~ 500
-			chargeCost = 60
+			chargeCost = 120
 
-		[perks.key.disarm]
-			#Defines the chance (in percent) per hit to make the attacked entity drop its armor.
-			#Range: 0.0 ~ 1.0
-			dropChance = 0.05000000074505806
+		[perks.key.rampage]
+			#Defines the chance to gain rampage buffs when killing a mob
+			#Range: 0.05000000074505806 ~ 1.0
+			rampageChance = 1.0
+			#Defines the duration of the rampage in ticks
+			#Range: 10 ~ 100000
+			rampageDuration = 100
 
 		[perks.key.cheat_death]
 			#Once the potion effect gets applied, it'll take at least this amount of ticks or a server restart until it can be re-applied by this perk.
@@ -168,6 +168,14 @@
 			#Range: 1 ~ 500
 			chargeCost = 350
 
+		[perks.key.mending]
+			#Sets the chance (Random.nextInt(chance) == 0) to try to see if a piece of armor on the player that is damageable and damaged can be repaired; the lower the more likely.
+			#Range: > 5
+			chanceToRepair = 800
+			#Defines the amount of starlight charge consumed per restored durability point.
+			#Range: 1 ~ 500
+			chargeCost = 60
+
 		[perks.key.stone_enrichment]
 			#Defines the radius where a random position to generate a ore at is checked for
 			#Range: 1 ~ 15
@@ -179,25 +187,6 @@
 			#Range: 1 ~ 500
 			chargeCost = 150
 
-		[perks.key.spawn_lights]
-			#Defines the rate in ticks a position to spawn a light in is attempted to be found near the player
-			#Range: 4 ~ 1000
-			lightSpawnRate = 15
-			#Defines the radius around the player the perk will search for a suitable position
-			#Range: 2 ~ 10
-			lightSpawnRadius = 5
-			#Defines the amount of starlight charge consumed per spawned light.
-			#Range: 1 ~ 500
-			chargeCost = 60
-
-		[perks.key.rampage]
-			#Defines the chance to gain rampage buffs when killing a mob
-			#Range: 0.05000000074505806 ~ 1.0
-			rampageChance = 1.0
-			#Defines the duration of the rampage in ticks
-			#Range: 10 ~ 100000
-			rampageDuration = 100
-
 		[perks.key.bleed]
 			#Defines the duration of the bleeding effect when applied. Refreshes this duration when a it is applied again
 			#Range: 5 ~ 400
@@ -206,44 +195,34 @@
 			#Range: 0.01 ~ 1.0
 			bleedChance = 0.25
 
-		[perks.key.culling]
-			#Defines the percentage at how low the entities' health as to be to then cull the entity.
-			#Range: 0.05000000074505806 ~ 0.5
-			cullHealth = 0.15000000596046448
-			#Defines the amount of starlight charge consumed per culling attempt.
-			#Range: 1 ~ 500
-			chargeCost = 250
-
-		[perks.key.growable]
-			#Sets the chance to try to see if a random plant near the player gets bonemeal'd.
-			#Range: 0.0 ~ 1.0
-			chanceToBonemeal = 0.30000001192092896
-			#Defines the radius around which the perk effect should apply around the player.
-			#Range: 1 ~ 16
-			radius = 3
-			#Defines the amount of starlight charge consumed per growth-attempt.
+		[perks.key.lightning_arc]
+			#Sets the chance to spawn a damage-arc effect when an enemy is hit (value is in percent).
+			#Range: 0.1 ~ 1.0
+			arcChance = 0.6000000238418579
+			#Defines the damage-multiplier which gets added to the damage dealt initially.
+			#Range: 0.1 ~ 8.0
+			arcPercent = 0.6000000238418579
+			#Defines the distance for how far a single arc can jump/search for nearby entities.
+			#Range: 0.2 ~ 16.0
+			arcDistance = 7.0
+			#Range: 1 ~ 32
+			arcTicks = 3
+			#Defines the amount of starlight charge consumed per spawned lighning arc.
 			#Range: 1 ~ 500
-			chargeCost = 120
-
-		[perks.key.void_trash]
-			#List items that should count as trash and should be voided.
-			trashItems = ["minecraft:dirt", "minecraft:cobblestone", "minecraft:andesite", "minecraft:diorite", "minecraft:granite", "minecraft:stone", "minecraft:gravel"]
-			#Chance that a voided drop will instead yield a random ore out of the configured ore table.
-			#Range: 0.0 ~ 1.0
-			oreChance = 0.019999999552965164
+			chargeCost = 60
 
-		[perks.key.proj_distance]
-			#Defines the distance that must be reached to achieve the maximum damage multiplier
-			#Range: 100.0 ~ 65536.0
-			capDistance = 6400.0
-			#Defines the maximum multiplier that can be reached if the 'capDistance' is reached or surpassed when hitting something
+		[perks.key.proj_proximity]
+			#Defines the distance at which no additional damage is awarded.
+			#Range: 4.0 ~ 65536.0
+			capDistance = 100.0
+			#Defines the maximum multiplier that can be reached if the distance when hitting something with projectiles is basically nothing.
 			#Range: 0.05000000074505806 ~ 5.0
 			maxAdditionalMultiplier = 0.75
 
-		[perks.key.damage_effects]
-			#Defines the chance per hit to apply additional effects.
-			#Range: 0.009999999776482582 ~ 0.20000000298023224
-			applicationChance = 0.07999999821186066
+		[perks.key.disarm]
+			#Defines the chance (in percent) per hit to make the attacked entity drop its armor.
+			#Range: 0.0 ~ 1.0
+			dropChance = 0.05000000074505806
 
 		[perks.key.last_breath]
 			#Defines the dig speed multiplier you get additionally to your normal dig speed when being low on health (25% health = 75% of this additional multiplier)
@@ -253,28 +232,41 @@
 			#Range: 0.1 ~ 10.0
 			damageMultiplier = 3.0
 
-		[perks.key.no_armor]
-			#The multiplier that is applied to damage the player receives. The lower the more damage is negated.
-			#Range: 0.10000000149011612 ~ 1.0
-			damageTakenMultiplier = 0.699999988079071
+		[perks.key.void_trash]
+			#List items that should count as trash and should be voided.
+			trashItems = ["minecraft:dirt", "minecraft:cobblestone", "minecraft:andesite", "minecraft:diorite", "minecraft:granite", "minecraft:stone", "minecraft:gravel"]
+			#Chance that a voided drop will instead yield a random ore out of the configured ore table.
+			#Range: 0.0 ~ 1.0
+			oreChance = 0.019999999552965164
 
 		[perks.key.damage_armor]
 			#Defines how much damage is dealt additionally to armor. This value gets multiplied by the amount of armorpieces the entity you're attacking wears.
 			#Range: 0.009999999776482582 ~ 0.20000000298023224
 			damagePerArmor = 0.05000000074505806
 
-	[perks.type]
-
-		[perks.type.miningsize]
-			#Defines the amount of starlight charge consumed per additional block break through this attribute.
+		[perks.key.spawn_lights]
+			#Defines the rate in ticks a position to spawn a light in is attempted to be found near the player
+			#Range: 4 ~ 1000
+			lightSpawnRate = 15
+			#Defines the radius around the player the perk will search for a suitable position
+			#Range: 2 ~ 10
+			lightSpawnRadius = 5
+			#Defines the amount of starlight charge consumed per spawned light.
 			#Range: 1 ~ 500
-			chargeCost = 4
+			chargeCost = 60
+
+	[perks.type]
 
 		[perks.type.dodge]
 			#Defines the amount of starlight charge consumed per dodged damage.
 			#Range: 1 ~ 500
 			chargeCost = 80
 
+		[perks.type.miningsize]
+			#Defines the amount of starlight charge consumed per additional block break through this attribute.
+			#Range: 1 ~ 500
+			chargeCostPerBreak = 2
+
 [enchantment_amulet]
 	#Defines the chance to roll a 2nd-enchantment-manipulating roll on the amulet. Value defines a percent chance from 0% to 100%. Setting this to 0 also prevents a 3rd roll
 	#Range: 0.0 ~ 1.0
@@ -450,12 +442,12 @@
 			#Range: 1 ~ 2048
 			maxAmount = 5
 			#Defines the maximum default tick-time until a fish may be fished by the ritual. Gets reduced internally the more starlight was provided at the ritual. Has to be bigger as the minimum time; if it isn't it'll be set to the minimum.
-			#Range: > 20
+			#Range: > 10
 			maxFishTickTime = 500
 			#Defines the minimum default tick-time until a fish may be fished by the ritual. Gets reduced internally the more starlight was provided at the ritual.
 			#Range: > 20
+			
 			minFishTickTime = 100
-
 		[constellation.effect.pelotrio]
 			#Set this to false to disable this ritual effect
 			enabled = true
@@ -502,9 +494,9 @@
 			#Set the amount of food recovered by food cycle.
 			#Range: 0.0 ~ 100.0
 			foodPerCycle = 1.0
-			#Set the amount alignment charge consumed per block placed
-			#Range: 0 ~ 1000
-			chargeCostPerBlock = 2
+			#Set the amount alignment charge consumed per tick when walking/standing in the air
+			#Range: 0.0 ~ 100.0
+			chargeCostPerTravelTick = 2
 			#Set the amount alignment charge consumed per feed-cycle
 			#Range: 0 ~ 1000
 			chargeCostPerFood = 100
@@ -683,7 +675,7 @@
 
 	[registries.tile_acceleration_blacklist]
 		#Accepts & matches against strings: 1) what a tileentity-type's registry name starts with, 2) what a tileentity's fully qualified class name starts with, 3) (special case) a fully qualified class name (Instances & sub-class instance of that class will be blacklisted)
-		tile_acceleration_blacklist = ["appeng", "raoulvdberge.refinedstorage", "hellfirepvp.astralsorcery.common.tile.base.network.TileTransmissionBase", "hellfirepvp.astralsorcery.common.tile.base.network.TileSourceBase", "hellfirepvp.astralsorcery.common.tile.altar.TileAltar", "hellfirepvp.astralsorcery.common.tile.TileAttunementAltar", "hellfirepvp.astralsorcery.common.tile.TileObservatory", "hellfirepvp.astralsorcery.common.tile.TileRitualLink", "hellfirepvp.astralsorcery.common.tile.TileRitualPedestal", "hellfirepvp.astralsorcery.common.tile.TileTranslucentBlock", "hellfirepvp.astralsorcery.common.tile.TileTreeBeaconComponent", "hellfirepvp.astralsorcery.common.tile.TileVanishing"]
+		tile_acceleration_blacklist = ["net.minecraft.tileentity.PistonTileEntity", "net.minecraft.tileentity.LockableLootTileEntity", "appeng", "raoulvdberge.refinedstorage", "hellfirepvp.astralsorcery.common.tile.base.network.TileTransmissionBase", "hellfirepvp.astralsorcery.common.tile.base.network.TileSourceBase", "hellfirepvp.astralsorcery.common.tile.altar.TileAltar", "hellfirepvp.astralsorcery.common.tile.TileAttunementAltar", "hellfirepvp.astralsorcery.common.tile.TileObservatory", "hellfirepvp.astralsorcery.common.tile.TileRitualLink", "hellfirepvp.astralsorcery.common.tile.TileRitualPedestal", "hellfirepvp.astralsorcery.common.tile.TileSpectralRelay", "hellfirepvp.astralsorcery.common.tile.TileTelescope", "hellfirepvp.astralsorcery.common.tile.TileTranslucentBlock", "hellfirepvp.astralsorcery.common.tile.TileTreeBeaconComponent", "hellfirepvp.astralsorcery.common.tile.TileVanishing"]
 
 	[registries.amulet_enchantments]
 		#Defines a whitelist of which enchantments can be rolled and buffed by the enchantment-amulet. The higher the weight, the more likely that roll is selected.Format: <enchantment-registry-name>;<weight>
@@ -696,7 +688,6 @@
 	[registries.perk_void_trash_ore]
 		#Format: '<tagName>;<integerWeight>' Defines random-weighted ore-selection data. Define item-tags to select from here with associated weight. Specific mods can be blacklisted in the general AstralSorcery config in 'modidOreBlacklist'.
 		perk_void_trash_ore = ["forge:ores/aluminum;1200","forge:ores/apatite;700","forge:ores/mana;200", "forge:ores/bitumen;1000","forge:ores/cinnabar;500","forge:ores/coal;5200","forge:ores/copper;2000","forge:ores/diamond;120","forge:ores/dimensional;20","forge:ores/emerald;100","forge:ores/fluorite;50","forge:ores/gold;550","forge:ores/iron;2500","forge:ores/lapis;360","forge:ores/lead;1500","forge:ores/nickel;100","forge:ores/osmium;1500","forge:ores/potassium_nitrate;250","forge:ores/redstone;700","forge:ores/silver;1000","forge:ores/sulfur;300","forge:ores/tin;1800","forge:ores/uranium;400","forge:ores/zinc;1000"]
-
 	[registries.perk_stone_enrichment_ore]
 		#Format: '<tagName>;<integerWeight>' Defines random-weighted ore-selection data. Define block-tags to select from here with associated weight. Specific mods can be blacklisted in the general AstralSorcery config in 'modidOreBlacklist'.
 		perk_stone_enrichment_ore = ["forge:ores/aluminum;1200","forge:ores/apatite;700","forge:ores/mana;200", "forge:ores/bitumen;1000","forge:ores/cinnabar;500","forge:ores/coal;5200","forge:ores/copper;2000","forge:ores/diamond;120","forge:ores/dimensional;20","forge:ores/emerald;100","forge:ores/fluorite;50","forge:ores/gold;550","forge:ores/iron;2500","forge:ores/lapis;360","forge:ores/lead;1500","forge:ores/nickel;100","forge:ores/osmium;1500","forge:ores/potassium_nitrate;250","forge:ores/redstone;700","forge:ores/silver;1000","forge:ores/sulfur;300","forge:ores/tin;1800","forge:ores/uranium;400","forge:ores/zinc;1000"]
@@ -704,7 +695,6 @@
 	[registries.mineralis_ritual_ore]
 		#Format: '<tagName>;<integerWeight>' Defines random-weighted ore-selection data. Define block-tags to select from here with associated weight. Specific mods can be blacklisted in the general AstralSorcery config in 'modidOreBlacklist'.
 		mineralis_ritual_ore = ["forge:ores/aluminum;1200","forge:ores/apatite;700","forge:ores/mana;200", "forge:ores/bitumen;1000","forge:ores/cinnabar;500","forge:ores/coal;2400","forge:ores/copper;2000","forge:ores/diamond;120","forge:ores/dimensional;20","forge:ores/emerald;100","forge:ores/fluorite;50","forge:ores/gold;550","forge:ores/iron;2500","forge:ores/lapis;360","forge:ores/lead;1500","forge:ores/nickel;100","forge:ores/osmium;1500","forge:ores/potassium_nitrate;250","forge:ores/redstone;700","forge:ores/silver;1000","forge:ores/sulfur;300","forge:ores/tin;1800","forge:ores/uranium;400","forge:ores/zinc;1000"]
-
 	[registries.entity_transmutation]
 		#Defines the entity types the corrupted pelotrio ritual can transmute from and to. Format: <EntityTypeFrom>;<EntityTypeTo>
 		entity_transmutation = ["minecraft:skeleton;minecraft:wither_skeleton", "minecraft:villager;minecraft:witch", "minecraft:pig;minecraft:zombified_piglin", "minecraft:cow;minecraft:zombie", "minecraft:parrot;minecraft:ghast", "minecraft:chicken;minecraft:blaze", "minecraft:sheep;minecraft:stray", "minecraft:horse;minecraft:skeleton_horse"]

From e53b8d1b4d9b81cae971cbc5965634671cff2b9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Mon, 1 Nov 2021 19:51:39 +0100
Subject: [PATCH 126/130] mod updates

---
 config/chiselsandbits-client.toml | 183 +++-----
 config/chiselsandbits-common.toml |  42 +-
 config/connectivity-common.toml   |   2 +-
 config/ftbultimine.snbt           |   4 +
 minecraftinstance.json            | 739 +++++++++++++++++-------------
 5 files changed, 521 insertions(+), 449 deletions(-)

diff --git a/config/chiselsandbits-client.toml b/config/chiselsandbits-client.toml
index afe46c95af..28a3880cad 100644
--- a/config/chiselsandbits-client.toml
+++ b/config/chiselsandbits-client.toml
@@ -1,111 +1,76 @@
 
-[client]
-
-	#Configuration entries related to the settings of gameplay aspects.
-	[client.settings]
-		#When enabled allows cycling through the tool modes of the chisel using (sneak) right clicks.
-		enable-right-click-mode-change = false
-		#When enabled changes the "damage"-bar indicator to be completely full when the bag is completely empty.
-		invert-bit-bag-fullness = false
-		#When enabled this gives each chisel its own chisel mode, instead of having a chisel mode globally.
-		per-chisel-mode = true
-		#When enabled notifies you of changes to for example tool modes in the chat.
-		chat-mode-notification = true
-		#When enabled shows the newly selected tool-mode in the item name.
-		item-name-mode-display = true
-
-		[client.settings.enable]
-
-			[client.settings.enable.toolbar]
-				#When enabled shows the tool mode of tools in the toolbar.
-				icons = true
-
-		[client.settings.clipboard]
-			#When enabled stores the data of broken chiseled blocks in your clipboard
-			add-broken-blocks = false
-
-		[client.settings.undo]
-			#The maximum amount of undo operations that are kept in memory. If more operations are added to the undo list, the oldest operations are removed from the list.
-			#Range: > -2147483648
-			max-count = 10
-
-		[client.settings.tape-measure]
-			#The maximum amount measurements stored before the oldest ones are removed.
-			#Range: > -2147483648
-			max-count = 10
-			#When enabled notifies you of measured sizes, measured with the tape measured, in the chat.
-			display-in-chat = true
-
-		[client.settings.radial]
-
-			[client.settings.radial.menu]
-				#The volume of the radial menu. Higher volume, makes the radial menu bigger.
-				#Range: 4.9E-324 ~ 1.7976931348623157E308
-				volume = 0.10000000149011612
-
-	[client.client]
-
-		#Performance related client configuration.
-		[client.client.performance]
-
-			[client.client.performance.bit-storage]
-
-				[client.client.performance.bit-storage.contents]
-
-					[client.client.performance.bit-storage.contents.cache]
-						#Determines the amount of models for the bit storage content, higher means more performance but also more memory usage.
-						#Range: 0 ~ 9223372036854775807
-						size = 100
-
-			[client.client.performance.max-drawn-region]
-				#The max hit box size of a chiselable region. Bigger requires more performance and more memory.
-				#Range: 4.9E-324 ~ 1.7976931348623157E308
-				size = 4.0
-
-			[client.client.performance.lighting]
-				#When enabled dynamic model generation extracts light map data from the models face data.
-				face-lightmap-extraction = true
-				#When enabled extracts the light emittance data from the block-state during dynamic model generation.
-				use-value = true
-
-			[client.client.performance.vertexformats]
-
-				[client.client.performance.vertexformats.custom]
-					#When enabled this prevents custom vertex formats from working.
-					disabled = true
-
-			[client.client.performance.models]
-
-				[client.client.performance.models.cache]
-					#The size of the model cache.
-					#Range: 3500 ~ 20000
-					size = 3500
-
-				[client.client.performance.models.builder]
-					#mod.chiselsandbits.config.client.performance.models.builder.threadcount.comment
-					#Range: 2 ~ 4
-					threadcount = 4
-
-			[client.client.performance.faces]
-
-				[client.client.performance.faces.cache]
-					#mod.chiselsandbits.config.client.performance.faces.cache.size.comment
-					#Range: 3500 ~ 20000
-					size = 10000
-
-		[client.client.client]
-
-			#client.gui
-			[client.client.client.gui]
-
-				[client.client.client.gui.radial-menu]
-					#radial-menu.mouse-indicator
-					mouse-indicator = false
-
-			[client.client.client.compat]
-
-				#mod.chiselsandbits.config.compat.jei.comment
-				[client.client.client.compat.jei]
-					#mod.chiselsandbits.config.compat.jei.inject-bits.comment
-					inject-bits = false
+#Gameplay settings
+[settings]
+
+	#Bit-Bag settings
+	[settings.bit-bag]
+		#Should the durability bar display the emptiness of the bag instead of the fullness?
+		invert-durability-bar-indication = false
+
+	#Configures the tool mode icons used to render the selected tool modes of tools in the hot bar.
+	[settings.selected-tool-mode-icons]
+		#Sets which tool mode icon renderer is in use. Currently C&B provides: `chiselsandbits:group` (Render the group icon in the top right corner) and `chiselsandbits:noop` (No icon) as options.
+		renderer = "chiselsandbits:group"
+
+	#Configures the chiseling and placement previews.
+	[settings.chiseling-previews]
+		#Sets which preview renderer is in use. Currently C&B provides: `chiselsandbits:default` (Simple outline rendering) and `chiselsandbits:noop` (No preview) as options.
+		renderer = "chiselsandbits:default"
+
+		#Configures the default chiseling and placement preview.
+		[settings.chiseling-previews.default]
+
+			#Configures the colors of the outlines that the chiseling and placement preview have.
+			[settings.chiseling-previews.default.colors]
+				#The color for the chiseling preview outline.
+				chiseling = [0.85, 0.0, 0.0, 0.65]
+				#The color for the placement preview outline.
+				placement = [0.0, 0.85, 0.0, 0.65]
+
+#Performance related options.
+[performance]
+
+	#Configures caches
+	[performance.caches]
+
+		#Cache size related options.
+		[performance.caches.sizes]
+			#Size of the bit storage inner models cache.
+			#Range: 0 ~ 9223372036854775807
+			bit-storage-content-models = 100
+			#Size of the block model cache.
+			#Range: 3500 ~ 20000
+			block-models = 10000
+			#Size of the model face cache.
+			#Range: 3500 ~ 20000
+			block-faces = 10000
+
+	#Options related to the building of the chiseled block models.
+	[performance.model-building]
+		#How many CPU threads should be used to build models?
+		#Range: 1 ~ 4
+		thead-count = 2
+
+	#Lighting related options.
+	[performance.lighting]
+		#Should C&B pull lighting values from model faces.
+		extract-lighting-values-from-faces = true
+		#Should C&B pull lighting values from blockstates.
+		extract-lighting-values-from-blockstates = true
+
+#Options for the GUI
+[gui]
+
+	#Options for the radial menu.
+	[gui.radial-menu]
+		#Should the mouse indicator be rendered?
+		display-mouse-indicator = false
+
+#Configures options related to different compatibility modules.
+[compat]
+
+	#Compatibility options for JEI.
+	[compat.jei]
+		#Should C&B inject its bits into JEI?
+		inject-bits = false
 
diff --git a/config/chiselsandbits-common.toml b/config/chiselsandbits-common.toml
index afba036604..12fd3ac4a9 100644
--- a/config/chiselsandbits-common.toml
+++ b/config/chiselsandbits-common.toml
@@ -1,28 +1,18 @@
 
-[common]
-
-	#Configuration entries related to the help system.
-	[common.help]
-
-		[common.help.common]
-
-			[common.help.common.help]
-				#Common configuration entries related to the help system and which features are enabled or not during displayment.
-				enabled = true
-
-	[common.common]
-
-		#Configuration entries related to performance.
-		[common.common.performance]
-
-			[common.common.performance.common]
-
-				[common.common.performance.common.performance]
-
-					[common.common.performance.common.performance.collisions]
-
-						[common.common.performance.common.performance.collisions.cache]
-							#common.performance.collisions.cache.size
-							#Range: -9223372036854775808 ~ 9223372036854775807
-							size = 10000
+#Options for getting help in game.
+[help]
+	#Should the help information be visible in tooltips?
+	enabled-in-tooltips = true
+
+#Performance related options.
+[performance]
+
+	#Configures caches
+	[performance.caches]
+
+		#Cache size related options.
+		[performance.caches.sizes]
+			#Size of the collision box cache.
+			#Range: -9223372036854775808 ~ 9223372036854775807
+			collision-boxes = 10000
 
diff --git a/config/connectivity-common.toml b/config/connectivity-common.toml
index 6e9b5c3372..3b9a0b0f76 100644
--- a/config/connectivity-common.toml
+++ b/config/connectivity-common.toml
@@ -4,7 +4,7 @@
 	disableLoginLimits = true
 	#Should play packet size limits be disabled? Error:(Badly compressed packet) default:true
 	disablePacketLimits = true
-	#If enabled all messages exceeding normal limits will be printed to log. default:false
+	#If enabled all packets exceeding normal limits will be printed to log. default:false
 	debugPrintMessages = false
 	#Set the max login timeout in ticks. 20 ticks = 1 sec, default = 120 seconds
 	#Range: 600 ~ 20000
diff --git a/config/ftbultimine.snbt b/config/ftbultimine.snbt
index 8c8ae262b4..2abc1dd78c 100644
--- a/config/ftbultimine.snbt
+++ b/config/ftbultimine.snbt
@@ -1,3 +1,7 @@
+# Configuration for FTB Ultimine that is common to both Clients and Servers
+# This file is used to control instance (e.g. modpack) specific things like mod integrations.
+# Changes to this file require you to restart the game!
+
 {
 	# This is an advanced option, that you better leave alone This will stop ultimining on first block that it can't mine, rather than skipping it.
 	# Default: false
diff --git a/minecraftinstance.json b/minecraftinstance.json
index 3608a89176..908a3f4229 100644
--- a/minecraftinstance.json
+++ b/minecraftinstance.json
@@ -30,8 +30,8 @@
   "isUnlocked": true,
   "javaArgsOverride": null,
   "javaDirOverride": null,
-  "lastPlayed": "2021-10-30T18:21:10.391214Z",
-  "playedCount": 434,
+  "lastPlayed": "2021-11-01T18:46:58.1398699Z",
+  "playedCount": 438,
   "manifest": null,
   "fileDate": "0001-01-01T00:00:00",
   "installedModpack": null,
@@ -47,8 +47,8 @@
   "name": "Enigmatica6",
   "cachedScans": [],
   "isValid": true,
-  "lastPreviousMatchUpdate": "2021-10-28T17:45:54.6291256Z",
-  "lastRefreshAttempt": "2021-10-28T19:45:56.7651183+02:00",
+  "lastPreviousMatchUpdate": "2021-11-01T05:00:01.0170699Z",
+  "lastRefreshAttempt": "2021-11-01T06:00:06.0780672+01:00",
   "isEnabled": true,
   "isPinned": false,
   "gameVersion": "1.16.5",
@@ -651,14 +651,14 @@
       "addonID": 409429,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3490147,
-        "displayName": "configswapper-2.1.jar",
-        "fileName": "configswapper-2.1.jar",
-        "fileDate": "2021-10-13T17:57:47.14Z",
-        "fileLength": 15952,
+        "id": 3510587,
+        "displayName": "configswapper-2.2.jar",
+        "fileName": "configswapper-2.2.jar",
+        "fileDate": "2021-10-31T15:27:59.05Z",
+        "fileLength": 16284,
         "releaseType": 2,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3490/147/configswapper-2.1.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3510/587/configswapper-2.2.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -666,13 +666,13 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 3368433581,
+            "fingerprint": 1756847174,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 3647950335,
+            "fingerprint": 1708134770,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -683,10 +683,9 @@
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 3310279220,
+        "packageFingerprint": 848396809,
         "gameVersion": [
-          "1.16.5",
-          "Forge"
+          "1.16.5"
         ],
         "sortableGameVersion": [
           {
@@ -694,14 +693,7 @@
             "gameVersion": "1.16.5",
             "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
             "gameVersionName": "1.16.5",
-            "gameVersionTypeId": 0
-          },
-          {
-            "gameVersionPadded": "0",
-            "gameVersion": "",
-            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
-            "gameVersionName": "Forge",
-            "gameVersionTypeId": 0
+            "gameVersionTypeId": 70886
           }
         ],
         "hasInstallScript": false,
@@ -709,20 +701,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2538989,
+        "renderCacheId": 2564965,
         "projectId": 409429,
-        "packageFingerprintId": 761769325,
-        "gameVersionDateReleased": "2019-08-01T00:00:00Z",
-        "gameVersionMappingId": 3379660,
-        "gameVersionId": 7498,
+        "packageFingerprintId": 774353770,
+        "gameVersionDateReleased": "2021-01-15T14:14:48.91Z",
+        "gameVersionMappingId": 3428713,
+        "gameVersionId": 8203,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "configswapper-2.1.jar"
+        "FileNameOnDisk": "configswapper-2.2.jar"
       },
       "dateInstalled": "2021-10-13T18:52:15.4084284Z",
-      "dateUpdated": "2021-10-13T18:52:15.4894313Z",
-      "dateLastUpdateAttempted": "2021-10-13T18:52:15.4894313Z",
-      "status": 5,
+      "dateUpdated": "2021-11-01T18:01:23.3330499Z",
+      "dateLastUpdateAttempted": "2021-11-01T18:01:23.3330499Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -6546,7 +6538,7 @@
       "dateInstalled": "2021-07-05T20:19:25.2969373Z",
       "dateUpdated": "2021-10-30T18:18:08.6999722Z",
       "dateLastUpdateAttempted": "2021-10-30T18:18:08.6999722Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -6561,14 +6553,14 @@
       "addonID": 470193,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3434629,
-        "displayName": "connectivity-2.3-1.16.5.jar",
-        "fileName": "connectivity-2.3-1.16.5.jar",
-        "fileDate": "2021-08-22T16:28:01.37Z",
-        "fileLength": 52995,
+        "id": 3510357,
+        "displayName": "connectivity-2.4-1.16.5.jar",
+        "fileName": "connectivity-2.4-1.16.5.jar",
+        "fileDate": "2021-10-31T11:56:15.68Z",
+        "fileLength": 53113,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3434/629/connectivity-2.3-1.16.5.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3510/357/connectivity-2.4-1.16.5.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -6576,58 +6568,91 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 2523172629,
-            "type": 0,
+            "fingerprint": 683154121,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 3844341493,
-            "type": 0,
+            "fingerprint": 470136606,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "connectivity.mixins.json",
             "fingerprint": 2519663344,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 2098059805,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "connectivity.refmap.json",
             "fingerprint": 2808845358,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 2769176009,
+        "packageFingerprint": 1363992142,
         "gameVersion": [
           "1.16.3",
           "1.16.5",
-          "Forge",
           "1.16.4",
           "1.16.2"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000003",
+            "gameVersion": "1.16.3",
+            "gameVersionReleaseDate": "2020-09-10T14:44:20.443Z",
+            "gameVersionName": "1.16.3",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000004",
+            "gameVersion": "1.16.4",
+            "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z",
+            "gameVersionName": "1.16.4",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000002",
+            "gameVersion": "1.16.2",
+            "gameVersionReleaseDate": "2020-08-11T16:42:21.863Z",
+            "gameVersionName": "1.16.2",
+            "gameVersionTypeId": 70886
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
-        "gameVersionDateReleased": "2019-08-01T00:00:00Z",
-        "gameId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2564678,
+        "projectId": 470193,
+        "packageFingerprintId": 774232169,
+        "gameVersionDateReleased": "2020-08-11T16:42:21.863Z",
+        "gameVersionMappingId": 3428090,
+        "gameVersionId": 8010,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "connectivity-2.3-1.16.5.jar"
+        "FileNameOnDisk": "connectivity-2.4-1.16.5.jar"
       },
       "dateInstalled": "2021-08-05T20:27:46.9347015Z",
-      "dateUpdated": "2021-08-25T05:56:37.7755052Z",
-      "dateLastUpdateAttempted": "2021-08-25T05:56:37.7755052Z",
-      "status": 5,
+      "dateUpdated": "2021-11-01T18:10:56.1021811Z",
+      "dateLastUpdateAttempted": "2021-11-01T18:10:56.1021811Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -7644,41 +7669,41 @@
       "addonID": 521714,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3501641,
-        "displayName": "ponderjs-1.16.5-1.0.3b.jar",
-        "fileName": "ponderjs-1.16.5-1.0.3b.jar",
-        "fileDate": "2021-10-23T23:00:46.397Z",
-        "fileLength": 60225,
+        "id": 3511292,
+        "displayName": "ponderjs-1.16.5-1.0.3c.jar",
+        "fileName": "ponderjs-1.16.5-1.0.3c.jar",
+        "fileDate": "2021-11-01T05:52:18.837Z",
+        "fileLength": 60163,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3501/641/ponderjs-1.16.5-1.0.3b.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3511/292/ponderjs-1.16.5-1.0.3c.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 76563679,
+            "id": 77265346,
             "addonId": 238086,
             "type": 3,
-            "fileId": 3501641
+            "fileId": 3511292
           },
           {
-            "id": 76563678,
+            "id": 77265345,
             "addonId": 328085,
             "type": 3,
-            "fileId": 3501641
+            "fileId": 3511292
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 4285449572,
+            "fingerprint": 528353438,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 3604384668,
+            "fingerprint": 1883754345,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -7701,7 +7726,7 @@
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 2841263884,
+        "packageFingerprint": 1199303587,
         "gameVersion": [
           "1.16.5",
           "Forge"
@@ -7727,20 +7752,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2553603,
+        "renderCacheId": 2565884,
         "projectId": 521714,
-        "packageFingerprintId": 768865774,
+        "packageFingerprintId": 774856656,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 3407486,
+        "gameVersionMappingId": 3430701,
         "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "ponderjs-1.16.5-1.0.3b.jar"
+        "FileNameOnDisk": "ponderjs-1.16.5-1.0.3c.jar"
       },
-      "dateInstalled": "2021-09-01T20:23:23.4515179Z",
-      "dateUpdated": "2021-10-25T18:01:47.5473886Z",
-      "dateLastUpdateAttempted": "2021-10-25T18:01:47.5473886Z",
-      "status": 5,
+      "dateInstalled": "2021-11-01T05:47:25.104157Z",
+      "dateUpdated": "2021-11-01T18:19:12.7862658Z",
+      "dateLastUpdateAttempted": "2021-11-01T18:19:12.7862658Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -9478,53 +9503,53 @@
       "addonID": 295910,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3498281,
-        "displayName": "IntegratedTerminals-1.16.5-1.2.8.jar",
-        "fileName": "IntegratedTerminals-1.16.5-1.2.8.jar",
-        "fileDate": "2021-10-21T18:04:59.73Z",
-        "fileLength": 474128,
+        "id": 3511617,
+        "displayName": "IntegratedTerminals-1.16.5-1.2.9.jar",
+        "fileName": "IntegratedTerminals-1.16.5-1.2.9.jar",
+        "fileDate": "2021-11-01T14:43:18.307Z",
+        "fileLength": 475025,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3498/281/IntegratedTerminals-1.16.5-1.2.8.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3511/617/IntegratedTerminals-1.16.5-1.2.9.jar",
         "isAlternate": false,
-        "alternateFileId": 3498282,
+        "alternateFileId": 3511618,
         "dependencies": [
           {
-            "id": 76367010,
-            "addonId": 232758,
+            "id": 77290032,
+            "addonId": 251389,
             "type": 3,
-            "fileId": 3498281
+            "fileId": 3511617
           },
           {
-            "id": 76367008,
-            "addonId": 287357,
-            "type": 2,
-            "fileId": 3498281
+            "id": 77290030,
+            "addonId": 236307,
+            "type": 3,
+            "fileId": 3511617
           },
           {
-            "id": 76367009,
-            "addonId": 251389,
+            "id": 77290033,
+            "addonId": 232758,
             "type": 3,
-            "fileId": 3498281
+            "fileId": 3511617
           },
           {
-            "id": 76367007,
-            "addonId": 236307,
-            "type": 3,
-            "fileId": 3498281
+            "id": 77290031,
+            "addonId": 287357,
+            "type": 2,
+            "fileId": 3511617
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 1248197000,
+            "fingerprint": 503445326,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "org",
-            "fingerprint": 17549791,
+            "fingerprint": 268877904,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -9565,7 +9590,7 @@
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 1059176918,
+        "packageFingerprint": 1442739040,
         "gameVersion": [
           "1.16.5",
           "Forge"
@@ -9591,20 +9616,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2549585,
+        "renderCacheId": 2566303,
         "projectId": 295910,
-        "packageFingerprintId": 767331122,
+        "packageFingerprintId": 775053086,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 3401128,
+        "gameVersionMappingId": 3431541,
         "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "IntegratedTerminals-1.16.5-1.2.8.jar"
+        "FileNameOnDisk": "IntegratedTerminals-1.16.5-1.2.9.jar"
       },
       "dateInstalled": "2021-07-05T20:20:54.9328256Z",
-      "dateUpdated": "2021-10-25T18:00:45.0357314Z",
-      "dateLastUpdateAttempted": "2021-10-25T18:00:45.0357314Z",
-      "status": 5,
+      "dateUpdated": "2021-11-01T18:19:26.5061512Z",
+      "dateLastUpdateAttempted": "2021-11-01T18:19:26.5061512Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -10509,14 +10534,14 @@
       "addonID": 280294,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3419933,
-        "displayName": "FpsReducer-forge-1.23-mc1.16.5.jar",
-        "fileName": "FpsReducer-forge-1.23-mc1.16.5.jar",
-        "fileDate": "2021-08-09T07:30:22.947Z",
-        "fileLength": 94947,
+        "id": 3510435,
+        "displayName": "FpsReducer-forge-1.24-mc1.16.5.jar",
+        "fileName": "FpsReducer-forge-1.24-mc1.16.5.jar",
+        "fileDate": "2021-10-31T13:24:31.633Z",
+        "fileLength": 95076,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3419/933/FpsReducer-forge-1.23-mc1.16.5.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3510/435/FpsReducer-forge-1.24-mc1.16.5.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -10524,67 +10549,87 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 3083225176,
-            "type": 0,
+            "fingerprint": 2238369096,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "bre2el",
-            "fingerprint": 305118122,
-            "type": 0,
+            "fingerprint": 993665307,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
             "fingerprint": 2163027845,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "fpsreducer.mixins.json",
             "fingerprint": 1828560234,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "fpsreducer_logo.png",
             "fingerprint": 2600135182,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 419585142,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "fpsreducer.refmap.json",
             "fingerprint": 4067606497,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 2329459138,
+        "packageFingerprint": 1219284137,
         "gameVersion": [
           "1.16.5",
           "Forge"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2564779,
+        "projectId": 280294,
+        "packageFingerprintId": 774271386,
         "gameVersionDateReleased": "2019-08-01T00:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3428362,
+        "gameVersionId": 7498,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "FpsReducer-forge-1.23-mc1.16.5.jar"
+        "FileNameOnDisk": "FpsReducer-forge-1.24-mc1.16.5.jar"
       },
       "dateInstalled": "2021-07-05T20:20:57.5105817Z",
-      "dateUpdated": "2021-08-10T16:56:56.9930877Z",
-      "dateLastUpdateAttempted": "2021-08-10T16:56:56.9930877Z",
-      "status": 5,
+      "dateUpdated": "2021-11-01T18:10:53.9315046Z",
+      "dateLastUpdateAttempted": "2021-11-01T18:10:53.9315046Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -10724,47 +10769,47 @@
       "addonID": 231095,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3493219,
-        "displayName": "chiselsandbits-1.0.42-ALPHA.jar",
-        "fileName": "chiselsandbits-1.0.42-ALPHA.jar",
-        "fileDate": "2021-10-16T20:04:49.603Z",
-        "fileLength": 1330531,
-        "releaseType": 3,
+        "id": 3510598,
+        "displayName": "chiselsandbits-1.0.43.jar",
+        "fileName": "chiselsandbits-1.0.43.jar",
+        "fileDate": "2021-10-31T15:39:00.287Z",
+        "fileLength": 1287291,
+        "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3493/219/chiselsandbits-1.0.42-ALPHA.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3510/598/chiselsandbits-1.0.43.jar",
         "isAlternate": false,
-        "alternateFileId": 3493220,
+        "alternateFileId": 3510599,
         "dependencies": [
           {
-            "id": 75979212,
+            "id": 77204671,
             "addonId": 238222,
             "type": 2,
-            "fileId": 3493219
+            "fileId": 3510598
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 924961052,
+            "fingerprint": 3287507274,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "mod",
-            "fingerprint": 437364770,
+            "fingerprint": 3595498291,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
-            "fingerprint": 2774545476,
+            "fingerprint": 32808345,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
-            "fingerprint": 2330824587,
+            "fingerprint": 2804025003,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -10781,7 +10826,7 @@
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 3190745712,
+        "packageFingerprint": 1779439035,
         "gameVersion": [
           "1.16.3",
           "1.16.5",
@@ -10831,20 +10876,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2542978,
+        "renderCacheId": 2564981,
         "projectId": 231095,
-        "packageFingerprintId": 763709515,
+        "packageFingerprintId": 774359896,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 3387755,
+        "gameVersionMappingId": 3428745,
         "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "chiselsandbits-1.0.42-ALPHA.jar"
+        "FileNameOnDisk": "chiselsandbits-1.0.43.jar"
       },
       "dateInstalled": "2021-09-24T18:21:26.2309502Z",
-      "dateUpdated": "2021-10-20T17:46:41.9483719Z",
-      "dateLastUpdateAttempted": "2021-10-20T17:46:41.9483719Z",
-      "status": 5,
+      "dateUpdated": "2021-11-01T18:01:31.1440443Z",
+      "dateLastUpdateAttempted": "2021-11-01T18:01:31.1440443Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -13125,7 +13170,7 @@
       "dateInstalled": "2021-07-05T20:20:57.5175818Z",
       "dateUpdated": "2021-10-30T18:18:04.076355Z",
       "dateLastUpdateAttempted": "2021-10-30T18:18:04.076355Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -13440,41 +13485,41 @@
       "addonID": 361026,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3508379,
-        "displayName": "occultism-1.17.6.jar",
-        "fileName": "occultism-1.16.5-1.17.6.jar",
-        "fileDate": "2021-10-29T14:22:58.033Z",
-        "fileLength": 4373149,
+        "id": 3511736,
+        "displayName": "occultism-1.18.0.jar",
+        "fileName": "occultism-1.16.5-1.18.0.jar",
+        "fileDate": "2021-11-01T16:38:51.043Z",
+        "fileLength": 4436583,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3508/379/occultism-1.16.5-1.17.6.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3511/736/occultism-1.16.5-1.18.0.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 77035789,
-            "addonId": 306770,
+            "id": 77298280,
+            "addonId": 309927,
             "type": 3,
-            "fileId": 3508379
+            "fileId": 3511736
           },
           {
-            "id": 77035790,
-            "addonId": 309927,
+            "id": 77298279,
+            "addonId": 306770,
             "type": 3,
-            "fileId": 3508379
+            "fileId": 3511736
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 2776103581,
+            "fingerprint": 1507892666,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 3873230844,
+            "fingerprint": 2168774345,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -13492,18 +13537,18 @@
           },
           {
             "foldername": "assets",
-            "fingerprint": 1565899823,
+            "fingerprint": 958961182,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
-            "fingerprint": 3449879746,
+            "fingerprint": 2778681191,
             "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 4268905633,
+        "packageFingerprint": 2481334143,
         "gameVersion": [
           "1.16.3",
           "1.16.5",
@@ -13553,19 +13598,19 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2562041,
+        "renderCacheId": 2566462,
         "projectId": 361026,
-        "packageFingerprintId": 772855452,
+        "packageFingerprintId": 775125313,
         "gameVersionDateReleased": "2019-08-01T00:00:00Z",
-        "gameVersionMappingId": 3422939,
+        "gameVersionMappingId": 3431900,
         "gameVersionId": 7498,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "occultism-1.16.5-1.17.6.jar"
+        "FileNameOnDisk": "occultism-1.16.5-1.18.0.jar"
       },
       "dateInstalled": "2021-09-25T14:41:32.7416314Z",
-      "dateUpdated": "2021-10-30T18:18:12.8743249Z",
-      "dateLastUpdateAttempted": "2021-10-30T18:18:12.8743249Z",
+      "dateUpdated": "2021-11-01T18:19:17.3655669Z",
+      "dateLastUpdateAttempted": "2021-11-01T18:19:17.3655669Z",
       "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
@@ -15623,7 +15668,7 @@
       "dateInstalled": "2021-07-05T20:21:03.3721197Z",
       "dateUpdated": "2021-10-30T18:18:11.3060176Z",
       "dateLastUpdateAttempted": "2021-10-30T18:18:11.3060176Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -22710,28 +22755,28 @@
       "addonID": 410811,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3494209,
-        "displayName": "ftb-essentials-1605.1.4-build.28.jar",
-        "fileName": "ftb-essentials-1605.1.4-build.28.jar",
-        "fileDate": "2021-10-17T16:19:45.433Z",
-        "fileLength": 76788,
+        "id": 3510643,
+        "displayName": "ftb-essentials-1605.1.5-build.32.jar",
+        "fileName": "ftb-essentials-1605.1.5-build.32.jar",
+        "fileDate": "2021-10-31T16:35:20.04Z",
+        "fileLength": 77378,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3494/209/ftb-essentials-1605.1.4-build.28.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3510/643/ftb-essentials-1605.1.5-build.32.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 76047968,
+            "id": 77208986,
             "addonId": 404465,
             "type": 3,
-            "fileId": 3494209
+            "fileId": 3510643
           },
           {
-            "id": 76047969,
+            "id": 77208987,
             "addonId": 314905,
             "type": 2,
-            "fileId": 3494209
+            "fileId": 3510643
           }
         ],
         "isAvailable": true,
@@ -22762,18 +22807,18 @@
           },
           {
             "foldername": "META-INF",
-            "fingerprint": 3465117976,
+            "fingerprint": 2338248854,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "dev",
-            "fingerprint": 845244551,
+            "fingerprint": 3372936023,
             "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 3410244875,
+        "packageFingerprint": 2287512223,
         "gameVersion": [
           "1.16.5"
         ],
@@ -22791,20 +22836,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2544277,
+        "renderCacheId": 2565038,
         "projectId": 410811,
-        "packageFingerprintId": 764516470,
+        "packageFingerprintId": 774372097,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 3390613,
+        "gameVersionMappingId": 3428900,
         "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "ftb-essentials-1605.1.4-build.28.jar"
+        "FileNameOnDisk": "ftb-essentials-1605.1.5-build.32.jar"
       },
       "dateInstalled": "2021-07-05T20:21:08.4264731Z",
-      "dateUpdated": "2021-10-20T17:46:28.4587164Z",
-      "dateLastUpdateAttempted": "2021-10-20T17:46:28.4587164Z",
-      "status": 5,
+      "dateUpdated": "2021-11-01T18:10:52.2145079Z",
+      "dateLastUpdateAttempted": "2021-11-01T18:10:52.2145079Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -22936,14 +22981,14 @@
       "addonID": 399630,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3502599,
-        "displayName": "EmendatusEnigmatica-1.16.5-1.2.11",
-        "fileName": "EmendatusEnigmatica-1.16.5-1.2.11.jar",
-        "fileDate": "2021-10-24T19:45:57.643Z",
-        "fileLength": 4220102,
+        "id": 3510459,
+        "displayName": "EmendatusEnigmatica-1.16.5-1.2.12",
+        "fileName": "EmendatusEnigmatica-1.16.5-1.2.12.jar",
+        "fileDate": "2021-10-31T13:39:51.417Z",
+        "fileLength": 4401831,
         "releaseType": 3,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3502/599/EmendatusEnigmatica-1.16.5-1.2.11.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3510/459/EmendatusEnigmatica-1.16.5-1.2.12.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [],
@@ -22951,25 +22996,25 @@
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 2054801975,
+            "fingerprint": 1878779160,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "com",
-            "fingerprint": 685964142,
+            "fingerprint": 3679245275,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "assets",
-            "fingerprint": 2650960421,
+            "fingerprint": 3953869642,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
-            "fingerprint": 3101168311,
+            "fingerprint": 737700132,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -22998,7 +23043,7 @@
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 6371187,
+        "packageFingerprint": 4015928080,
         "gameVersion": [
           "1.16.3",
           "1.16.5",
@@ -23040,20 +23085,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2554873,
+        "renderCacheId": 2564805,
         "projectId": 399630,
-        "packageFingerprintId": 769477411,
+        "packageFingerprintId": 774277231,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameVersionMappingId": 3409761,
+        "gameVersionMappingId": 3428408,
         "gameVersionId": 4458,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "EmendatusEnigmatica-1.16.5-1.2.11.jar"
+        "FileNameOnDisk": "EmendatusEnigmatica-1.16.5-1.2.12.jar"
       },
       "dateInstalled": "2021-09-13T17:30:41.8608324Z",
-      "dateUpdated": "2021-10-25T18:00:03.1306103Z",
-      "dateLastUpdateAttempted": "2021-10-25T18:00:03.1306103Z",
-      "status": 5,
+      "dateUpdated": "2021-11-01T18:10:56.0911834Z",
+      "dateLastUpdateAttempted": "2021-11-01T18:10:56.0911834Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -26058,7 +26103,7 @@
       "dateInstalled": "2021-09-22T19:31:09.1959499Z",
       "dateUpdated": "2021-10-30T18:14:28.7765215Z",
       "dateLastUpdateAttempted": "2021-10-30T18:14:28.7765215Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -26823,7 +26868,7 @@
       "dateInstalled": "2021-10-28T17:27:32.914677Z",
       "dateUpdated": "2021-10-30T18:14:30.6824015Z",
       "dateLastUpdateAttempted": "2021-10-30T18:14:30.6824015Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -26915,7 +26960,7 @@
       "dateInstalled": "2021-07-05T20:21:15.1320328Z",
       "dateUpdated": "2021-10-30T18:18:09.9380123Z",
       "dateLastUpdateAttempted": "2021-10-30T18:18:09.9380123Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -26946,19 +26991,19 @@
           {
             "foldername": "assets",
             "fingerprint": 874958223,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 2937881892,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.png",
             "fingerprint": 4104230281,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
@@ -26971,21 +27016,69 @@
           "1.16.4",
           "1.16.2"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000003",
+            "gameVersion": "1.16.3",
+            "gameVersionReleaseDate": "2020-09-10T14:44:20.443Z",
+            "gameVersionName": "1.16.3",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000001",
+            "gameVersion": "1.16.1",
+            "gameVersionReleaseDate": "2020-06-24T12:41:11.823Z",
+            "gameVersionName": "1.16.1",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016",
+            "gameVersion": "1.16",
+            "gameVersionReleaseDate": "2020-06-23T13:41:08.75Z",
+            "gameVersionName": "1.16",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000004",
+            "gameVersion": "1.16.4",
+            "gameVersionReleaseDate": "2020-11-02T18:40:51.49Z",
+            "gameVersionName": "1.16.4",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000002",
+            "gameVersion": "1.16.2",
+            "gameVersionReleaseDate": "2020-08-11T16:42:21.863Z",
+            "gameVersionName": "1.16.2",
+            "gameVersionTypeId": 70886
+          }
+        ],
         "hasInstallScript": false,
-        "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "isCompatibleWithClient": true,
+        "categorySectionPackageType": 3,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2231285,
+        "projectId": 390898,
+        "packageFingerprintId": 630678459,
         "gameVersionDateReleased": "2020-06-23T13:41:08.75Z",
-        "gameId": 0,
+        "gameVersionMappingId": 2813044,
+        "gameVersionId": 7890,
+        "gameId": 432,
         "isServerPack": false,
         "FileNameOnDisk": "ERP-V1.8.zip"
       },
-      "dateInstalled": "2021-07-15T04:42:23.8973319Z",
-      "dateUpdated": "2021-07-15T04:42:23.9253291Z",
-      "dateLastUpdateAttempted": "2021-07-15T04:42:23.9253291Z",
-      "status": 5,
+      "dateInstalled": "2021-11-01T05:00:03.7780705Z",
+      "dateUpdated": "2021-11-01T05:00:03.7780705Z",
+      "dateLastUpdateAttempted": "0001-01-01T00:00:00",
+      "status": 3,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -28129,7 +28222,7 @@
       "dateInstalled": "2021-09-10T17:14:11.272099Z",
       "dateUpdated": "2021-10-30T18:18:13.2024477Z",
       "dateLastUpdateAttempted": "2021-10-30T18:18:13.2024477Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -28144,65 +28237,65 @@
       "addonID": 422301,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3504750,
-        "displayName": "sophisticatedbackpacks-1.16.5-3.7.0.378.jar",
-        "fileName": "sophisticatedbackpacks-1.16.5-3.7.0.378.jar",
-        "fileDate": "2021-10-25T21:00:25.357Z",
-        "fileLength": 1335416,
+        "id": 3510890,
+        "displayName": "sophisticatedbackpacks-1.16.5-3.8.1.384.jar",
+        "fileName": "sophisticatedbackpacks-1.16.5-3.8.1.384.jar",
+        "fileDate": "2021-10-31T20:00:12.24Z",
+        "fileLength": 1357551,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3504/750/sophisticatedbackpacks-1.16.5-3.7.0.378.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3510/890/sophisticatedbackpacks-1.16.5-3.8.1.384.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 76729033,
-            "addonId": 309927,
+            "id": 77231677,
+            "addonId": 243121,
             "type": 2,
-            "fileId": 3504750
+            "fileId": 3510890
           },
           {
-            "id": 76729032,
-            "addonId": 301356,
+            "id": 77231674,
+            "addonId": 225643,
             "type": 2,
-            "fileId": 3504750
+            "fileId": 3510890
           },
           {
-            "id": 76729031,
-            "addonId": 243121,
+            "id": 77231678,
+            "addonId": 301356,
             "type": 2,
-            "fileId": 3504750
+            "fileId": 3510890
           },
           {
-            "id": 76729028,
-            "addonId": 225643,
+            "id": 77231675,
+            "addonId": 233071,
             "type": 2,
-            "fileId": 3504750
+            "fileId": 3510890
           },
           {
-            "id": 76729030,
+            "id": 77231676,
             "addonId": 238222,
             "type": 2,
-            "fileId": 3504750
+            "fileId": 3510890
           },
           {
-            "id": 76729029,
-            "addonId": 233071,
+            "id": 77231679,
+            "addonId": 309927,
             "type": 2,
-            "fileId": 3504750
+            "fileId": 3510890
           }
         ],
         "isAvailable": true,
         "modules": [
           {
             "foldername": "META-INF",
-            "fingerprint": 2843262292,
+            "fingerprint": 2505929605,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "net",
-            "fingerprint": 1291234390,
+            "fingerprint": 1815179169,
             "type": 3,
             "invalidFingerprint": false
           },
@@ -28220,18 +28313,18 @@
           },
           {
             "foldername": "assets",
-            "fingerprint": 2229682225,
+            "fingerprint": 3025198443,
             "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "data",
-            "fingerprint": 629818330,
+            "fingerprint": 2119485612,
             "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 3585556718,
+        "packageFingerprint": 3477256730,
         "gameVersion": [
           "1.16.5"
         ],
@@ -28249,20 +28342,20 @@
         "categorySectionPackageType": 6,
         "restrictProjectFileAccess": 1,
         "projectStatus": 4,
-        "renderCacheId": 2557388,
+        "renderCacheId": 2565363,
         "projectId": 422301,
-        "packageFingerprintId": 770351994,
+        "packageFingerprintId": 774541598,
         "gameVersionDateReleased": "2021-01-15T14:14:48.91Z",
-        "gameVersionMappingId": 3413547,
+        "gameVersionMappingId": 3429601,
         "gameVersionId": 8203,
         "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "sophisticatedbackpacks-1.16.5-3.7.0.378.jar"
+        "FileNameOnDisk": "sophisticatedbackpacks-1.16.5-3.8.1.384.jar"
       },
       "dateInstalled": "2021-07-05T20:21:15.1320328Z",
-      "dateUpdated": "2021-10-27T17:18:43.2550968Z",
-      "dateLastUpdateAttempted": "2021-10-27T17:18:43.2550968Z",
-      "status": 5,
+      "dateUpdated": "2021-11-01T18:10:52.0655368Z",
+      "dateLastUpdateAttempted": "2021-11-01T18:10:52.0655368Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -28608,7 +28701,7 @@
       "dateInstalled": "2021-07-05T20:31:05.1764869Z",
       "dateUpdated": "2021-10-30T18:14:34.202324Z",
       "dateLastUpdateAttempted": "2021-10-30T18:14:34.202324Z",
-      "status": 4,
+      "status": 5,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,
@@ -29517,28 +29610,28 @@
       "addonID": 404465,
       "gameInstanceID": "965be41e-0584-4b35-9c9a-4efa04c29c1f",
       "installedFile": {
-        "id": 3476854,
-        "displayName": "ftb-library-forge-1605.3.3-build.74.jar",
-        "fileName": "ftb-library-forge-1605.3.3-build.74.jar",
-        "fileDate": "2021-09-30T01:34:26.51Z",
-        "fileLength": 566958,
+        "id": 3510634,
+        "displayName": "ftb-library-forge-1605.3.4-build.79.jar",
+        "fileName": "ftb-library-forge-1605.3.4-build.79.jar",
+        "fileDate": "2021-10-31T16:26:59.83Z",
+        "fileLength": 568909,
         "releaseType": 1,
         "fileStatus": 4,
-        "downloadUrl": "https://edge.forgecdn.net/files/3476/854/ftb-library-forge-1605.3.3-build.74.jar",
+        "downloadUrl": "https://edge.forgecdn.net/files/3510/634/ftb-library-forge-1605.3.4-build.79.jar",
         "isAlternate": false,
         "alternateFileId": 0,
         "dependencies": [
           {
-            "id": 0,
-            "addonId": 419699,
-            "type": 3,
-            "fileId": 0
-          },
-          {
-            "id": 0,
+            "id": 77208679,
             "addonId": 238222,
             "type": 2,
-            "fileId": 0
+            "fileId": 3510634
+          },
+          {
+            "id": 77208678,
+            "addonId": 419699,
+            "type": 3,
+            "fileId": 3510634
           }
         ],
         "isAvailable": true,
@@ -29546,72 +29639,92 @@
           {
             "foldername": "ftblibrary-common.mixins.json",
             "fingerprint": 2229262088,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "kubejs.classfilter.txt",
-            "fingerprint": 1091646804,
-            "type": 0,
+            "foldername": "assets",
+            "fingerprint": 1835580189,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "assets",
-            "fingerprint": 3890636078,
-            "type": 0,
+            "foldername": "kubejs.classfilter.txt",
+            "fingerprint": 1091646804,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "ftb-library-common-refmap.json",
             "fingerprint": 2537558737,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "pack.mcmeta",
             "fingerprint": 239616976,
-            "type": 0,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "META-INF",
-            "fingerprint": 2855012279,
-            "type": 0,
+            "fingerprint": 426675041,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
             "foldername": "dev",
-            "fingerprint": 763052178,
-            "type": 0,
+            "fingerprint": 1356525441,
+            "type": 3,
             "invalidFingerprint": false
           },
           {
-            "foldername": "architectury_inject_FTBLibrary1165_common_3f58a24f26744500b868ea19b45ec4d6",
-            "fingerprint": 1367479450,
-            "type": 0,
+            "foldername": "architectury_inject_FTBLibrary1165_common_26f0f7a8da4544d68ada2e41388648dd",
+            "fingerprint": 939305847,
+            "type": 3,
             "invalidFingerprint": false
           }
         ],
-        "packageFingerprint": 15769651,
+        "packageFingerprint": 1281848676,
         "gameVersion": [
           "1.16.5",
           "Forge"
         ],
+        "sortableGameVersion": [
+          {
+            "gameVersionPadded": "0000000001.0000000016.0000000005",
+            "gameVersion": "1.16.5",
+            "gameVersionReleaseDate": "2021-01-15T14:14:48.91Z",
+            "gameVersionName": "1.16.5",
+            "gameVersionTypeId": 70886
+          },
+          {
+            "gameVersionPadded": "0",
+            "gameVersion": "",
+            "gameVersionReleaseDate": "2019-08-01T00:00:00Z",
+            "gameVersionName": "Forge",
+            "gameVersionTypeId": 68441
+          }
+        ],
         "hasInstallScript": false,
         "isCompatibleWithClient": false,
-        "categorySectionPackageType": 0,
-        "restrictProjectFileAccess": 0,
-        "projectStatus": 0,
-        "projectId": 0,
+        "categorySectionPackageType": 6,
+        "restrictProjectFileAccess": 1,
+        "projectStatus": 4,
+        "renderCacheId": 2565027,
+        "projectId": 404465,
+        "packageFingerprintId": 774370231,
         "gameVersionDateReleased": "2008-03-01T06:00:00Z",
-        "gameId": 0,
+        "gameVersionMappingId": 3428878,
+        "gameVersionId": 4458,
+        "gameId": 432,
         "isServerPack": false,
-        "FileNameOnDisk": "ftb-library-forge-1605.3.3-build.74.jar"
+        "FileNameOnDisk": "ftb-library-forge-1605.3.4-build.79.jar"
       },
       "dateInstalled": "2021-08-18T18:00:56.9919032Z",
-      "dateUpdated": "2021-10-02T18:13:53.065276Z",
-      "dateLastUpdateAttempted": "2021-10-02T18:13:53.065276Z",
-      "status": 5,
+      "dateUpdated": "2021-11-01T18:10:51.995871Z",
+      "dateLastUpdateAttempted": "2021-11-01T18:10:51.995871Z",
+      "status": 4,
       "preferenceAutoInstallUpdates": null,
       "preferenceAlternateFile": false,
       "preferenceIsIgnored": false,

From 8e7f7a0db4abe703ef3a83af5bbb09fe25fedb83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Mon, 1 Nov 2021 19:56:31 +0100
Subject: [PATCH 127/130] auto config update

---
 config/sophisticatedbackpacks-common.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/sophisticatedbackpacks-common.toml b/config/sophisticatedbackpacks-common.toml
index 00a7cbaf3a..b1e4c1dff1 100644
--- a/config/sophisticatedbackpacks-common.toml
+++ b/config/sophisticatedbackpacks-common.toml
@@ -2,7 +2,7 @@
 #Common Settings
 [common]
 	#Disable / enable any items here (disables their recipes)
-	enabledItems = ["void_upgrade:true", "compacting_upgrade:true", "advanced_restock_upgrade:true", "diamond_backpack:true", "smelting_upgrade:true", "filter_upgrade:true", "magnet_upgrade:true", "advanced_magnet_upgrade:true", "deposit_upgrade:true", "iron_backpack:true", "stonecutter_upgrade:true", "backpack:true", "feeding_upgrade:true", "advanced_pickup_upgrade:true", "jukebox_upgrade:true", "everlasting_upgrade:true", "advanced_filter_upgrade:true", "inception_upgrade:true", "crafting_upgrade:true", "auto_smelting_upgrade:true", "pickup_upgrade:true", "stack_upgrade_tier_4:true", "stack_upgrade_tier_2:true", "stack_upgrade_tier_3:true", "stack_upgrade_tier_1:true", "upgrade_base:true", "refill_upgrade:true", "advanced_compacting_upgrade:true", "gold_backpack:true", "advanced_deposit_upgrade:true", "advanced_void_upgrade:true", "restock_upgrade:true", "advanced_tool_swapper_upgrade:true", "tool_swapper_upgrade:true", "netherite_backpack:true", "tank_upgrade:true", "advanced_feeding_upgrade:true", "battery_upgrade:true", "advanced_pump_upgrade:true", "pump_upgrade:true"]
+	enabledItems = ["void_upgrade:true", "compacting_upgrade:true", "advanced_restock_upgrade:true", "diamond_backpack:true", "smelting_upgrade:true", "filter_upgrade:true", "magnet_upgrade:true", "advanced_magnet_upgrade:true", "deposit_upgrade:true", "iron_backpack:true", "stonecutter_upgrade:true", "backpack:true", "feeding_upgrade:true", "advanced_pickup_upgrade:true", "jukebox_upgrade:true", "everlasting_upgrade:true", "advanced_filter_upgrade:true", "inception_upgrade:true", "crafting_upgrade:true", "auto_smelting_upgrade:true", "pickup_upgrade:true", "stack_upgrade_tier_4:true", "stack_upgrade_tier_2:true", "stack_upgrade_tier_3:true", "stack_upgrade_tier_1:true", "upgrade_base:true", "refill_upgrade:true", "advanced_compacting_upgrade:true", "gold_backpack:true", "advanced_deposit_upgrade:true", "advanced_void_upgrade:true", "restock_upgrade:true", "advanced_tool_swapper_upgrade:true", "tool_swapper_upgrade:true", "netherite_backpack:true", "tank_upgrade:true", "advanced_feeding_upgrade:true", "battery_upgrade:true", "advanced_pump_upgrade:true", "pump_upgrade:true", "xp_pump_upgrade:true"]
 	#Turns on/off loot added to various vanilla chest loot tables
 	chestLootEnabled = true
 

From be7c99b41b1c84262d1976fedc7b2f59e3da8400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Mon, 1 Nov 2021 19:56:40 +0100
Subject: [PATCH 128/130] disabled new EE iridium

---
 config/emendatusenigmatica-common.toml | 65 ++++++++++++++++++++++++++
 kubejs/client_scripts/constants.js     |  3 +-
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/config/emendatusenigmatica-common.toml b/config/emendatusenigmatica-common.toml
index e9af9caf4e..43ab8db2fb 100644
--- a/config/emendatusenigmatica-common.toml
+++ b/config/emendatusenigmatica-common.toml
@@ -2041,3 +2041,68 @@
 		#Invert Blacklist to Whitelist [Default: false]
 		end_biome_list_invert = false
 
+["Iridium Config"]
+
+	["Iridium Config".Overworld]
+		#Activate/Deactivate the Ore Gen in The Overworld [Default: true]
+		generate_in_the_overworld = false
+		#Baseline Y-Level [Default: 12]
+		#Range: 0 ~ 256
+		overworld_base = 12
+		#Spread Amount (# of Y-Levels above and below the Baseline) [Default: 8]
+		#Range: 0 ~ 256
+		overworld_spread = 8
+		#Average Ores per Chunk [Default: 6]
+		#Range: 0 ~ 64
+		overworld_count = 6
+		#Configure the ore Vein Size [Default: 6]
+		#Range: 0 ~ 64
+		overworld_size = 6
+		#List of biome IDs in which the ore is not allowed to generate.
+		#To blacklist all biomes from a single mod, use 'modid:*'
+		overworld_biome_blacklist = []
+		#Invert Blacklist to Whitelist [Default: false]
+		overworld_biome_list_invert = false
+
+	["Iridium Config"."The Nether"]
+		#Activate/Deactivate the Ore Gen in The Nether [Default: false]
+		generate_in_the_nether = false
+		#Baseline Y-Level [Default: 42]
+		#Range: 0 ~ 128
+		nether_base = 42
+		#Spread Amount (# of Y-Levels above and below the Baseline) [Default: 8]
+		#Range: 0 ~ 128
+		nether_spread = 8
+		#Average Ores per Chunk [Default: 6]
+		#Range: 0 ~ 64
+		nether_count = 6
+		#Ore Vein Size [Default: 6]
+		#Range: 0 ~ 64
+		nether_size = 6
+		#List of biome IDs in which the ore is not allowed to generate.
+		#To blacklist all biomes from a single mod, use 'modid:*'
+		nether_biome_blacklist = []
+		#Invert Blacklist to Whitelist [Default: false]
+		nether_biome_list_invert = false
+
+	["Iridium Config"."The End"]
+		#Activate/Deactivate the Ore Gen in The End [Default: false]
+		generate_in_the_end = false
+		#Baseline Y-Level [Default: 32]
+		#Range: 0 ~ 256
+		end_base = 32
+		#Spread Amount (# of Y-Levels above and below the Baseline) [Default: 8]
+		#Range: 0 ~ 256
+		end_spread = 8
+		#Average Ores per Chunk [Default: 6]
+		#Range: 0 ~ 64
+		end_count = 6
+		#Ore Vein Size [Default: 6]
+		#Range: 0 ~ 64
+		end_size = 6
+		#List of biome IDs in which the ore is not allowed to generate.
+		#To blacklist all biomes from a single mod, use 'modid:*'
+		end_biome_blacklist = []
+		#Invert Blacklist to Whitelist [Default: false]
+		end_biome_list_invert = false
+
diff --git a/kubejs/client_scripts/constants.js b/kubejs/client_scripts/constants.js
index 93ad1d3d14..64dad601b5 100644
--- a/kubejs/client_scripts/constants.js
+++ b/kubejs/client_scripts/constants.js
@@ -374,7 +374,8 @@ ee_types.forEach((type) => {
         `emendatusenigmatica:diamond_${type}`,
         `emendatusenigmatica:coal_${type}`,
         `emendatusenigmatica:sapphire_${type}`,
-        `emendatusenigmatica:ruby_${type}`
+        `emendatusenigmatica:ruby_${type}`,
+        `emendatusenigmatica:iridium_${type}`
     );
 });
 

From 4a74a90149274371e1cad93d3c17752bc0a2a074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Mon, 1 Nov 2021 20:01:36 +0100
Subject: [PATCH 129/130] Create ftbessentials-server.snbt

---
 defaultconfigs/ftbessentials-server.snbt | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 defaultconfigs/ftbessentials-server.snbt

diff --git a/defaultconfigs/ftbessentials-server.snbt b/defaultconfigs/ftbessentials-server.snbt
new file mode 100644
index 0000000000..179776f94c
--- /dev/null
+++ b/defaultconfigs/ftbessentials-server.snbt
@@ -0,0 +1,13 @@
+# Default config file that will be copied to world's serverconfig/ftbessentials.snbt location
+# Copy values you wish to override in here
+# Example:
+# 
+# {
+# 	misc: {
+# 		enderchest: {
+# 			enabled: false
+# 		}
+# 	}
+# }
+
+{ }

From 055cf33f39a91d7336d280716172269e11d93211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Mon, 1 Nov 2021 20:15:40 +0100
Subject: [PATCH 130/130] Update settings.ps1

---
 automation/settings.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/automation/settings.ps1 b/automation/settings.ps1
index f348281383..a932617fdd 100644
--- a/automation/settings.ps1
+++ b/automation/settings.ps1
@@ -29,11 +29,11 @@ $MODPACK_NAME = "Enigmatica6"
 $CLIENT_NAME = "Enigmatica6"
 
 # Version Of The Modpack
-$MODPACK_VERSION = "0.5.17"
+$MODPACK_VERSION = "0.5.18"
 
 # Last Version Of The Modpack
 # Needed For Changelog Parsing
-$LAST_MODPACK_VERSION = "0.5.16"
+$LAST_MODPACK_VERSION = "0.5.17"
 
 # =====================================================================//
 #  CHANGELOG SETTINGS