From 07446ca5199202796e1e9fcc506b13cf9c3eeb14 Mon Sep 17 00:00:00 2001
From: MuteTiefling <mutetiefling@gmail.com>
Date: Thu, 21 Mar 2024 14:48:49 -0400
Subject: [PATCH] Fix IE assembler being unable to craft capacitors

Fix IE assembler being unable to craft capacitors https://github.com/EnigmaticaModpacks/Enigmatica6/issues/5446
---
 changelogs/CHANGELOG.md                                    | 6 ++++++
 .../expert/recipetypes/immersiveengineering/shaped.js      | 7 ++++---
 .../kubejs/expert/recipetypes/modularrouters/shaped.js     | 2 +-
 .../kubejs/expert/recipetypes/pneumaticcraft/shaped.js     | 2 +-
 .../kubejs/expert/recipetypes/refinedstorage/shaped.js     | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md
index ea67e48f99..308b47016a 100644
--- a/changelogs/CHANGELOG.md
+++ b/changelogs/CHANGELOG.md
@@ -1,3 +1,9 @@
+### Enigmatica 6 & Enigmatica 6: Expert v1.10.0
+
+**Bug fixes**
+
+-   Fix IE assembler being unable to craft capacitors [\#5427](https://github.com/EnigmaticaModpacks/Enigmatica6/pull/5427) ([Kanzaji](https://github.com/Kanzaji))
+
 ### Enigmatica 6 & Enigmatica 6: Expert v1.9.0
 
 _Using Forge-1.16.5-36.2.39_ | _[Mod Updates](https://github.com/EnigmaticaModpacks/Enigmatica6/blob/master/changelogs/changelog_mods_1.9.0.md)_ | _[Modlist](https://github.com/EnigmaticaModpacks/Enigmatica6/blob/master/changelogs/modlist_1.9.0.md)_
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/shaped.js
index 0c1886922d..78bbaef014 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/immersiveengineering/shaped.js
@@ -136,13 +136,14 @@ onEvent('recipes', (event) => {
                 C: '#forge:plates/lead',
                 D: Item.of('thermal:fluid_cell').ignoreNBT(),
                 E: {
-                    type: 'pneumaticcraft:fluid',
+                    type: 'immersiveengineering:fluid',
                     tag: 'pneumaticcraft:etching_acid',
                     amount: 1000
                 }
             },
             id: 'immersiveengineering:crafting/capacitor_lv'
         },
+
         {
             output: 'immersiveengineering:capacitor_mv',
             pattern: ['ABA', 'CDC', 'AEA'],
@@ -221,8 +222,8 @@ onEvent('recipes', (event) => {
                 A: '#forge:sheetmetals/steel',
                 B: 'create:fluid_pipe',
                 C: {
-                    type: 'pneumaticcraft:fluid',
-                    fluid: 'minecraft:water',
+                    type: 'immersiveengineering:fluid',
+                    tag: 'minecraft:water',
                     amount: 1000
                 }
             },
diff --git a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/modularrouters/shaped.js b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/modularrouters/shaped.js
index 7e26437f45..6899e69b64 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/modularrouters/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/modularrouters/shaped.js
@@ -23,7 +23,7 @@ onEvent('recipes', (event) => {
                 A: 'modularrouters:blank_upgrade',
                 B: 'pneumaticcraft:glycerol',
                 C: {
-                    type: 'pneumaticcraft:fluid',
+                    type: 'immersiveengineering:fluid',
                     tag: 'forge:lubricant',
                     amount: 1000
                 }
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 bcb5d4dd2c..2459f0b95a 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/pneumaticcraft/shaped.js
@@ -400,7 +400,7 @@ onEvent('recipes', (event) => {
                 A: 'pneumaticcraft:upgrade_matrix',
                 B: 'pneumaticcraft:glycerol',
                 C: {
-                    type: 'pneumaticcraft:fluid',
+                    type: 'immersiveengineering:fluid',
                     tag: 'forge:lubricant',
                     amount: 1000
                 }
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 d206fe5f95..1b2ecffd87 100644
--- a/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js
+++ b/kubejs/server_scripts/enigmatica/kubejs/expert/recipetypes/refinedstorage/shaped.js
@@ -112,7 +112,7 @@ onEvent('recipes', (event) => {
                 A: 'refinedstorage:upgrade',
                 B: 'pneumaticcraft:glycerol',
                 C: {
-                    type: 'pneumaticcraft:fluid',
+                    type: 'immersiveengineering:fluid',
                     tag: 'forge:lubricant',
                     amount: 1000
                 }