Merge pull request EnigmaticaModpacks#5447 from MuteTiefling/develop

Fix IE assembler being unable to craft capacitors
MuteTiefling · Mar 21, 2024 · 7e5fb7f · 7e5fb7f
2 parents 4e795e9 + 246463c
commit 7e5fb7f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git 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 [\#5447](https://github.com/EnigmaticaModpacks/Enigmatica6/pull/5447) ([MuteTiefling](https://github.com/MuteTiefling))
+
 ### 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
@@ -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
@@ -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
@@ -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
@@ -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
                 }