aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-07-29 10:36:46 +0200
committerGitHub <noreply@github.com>2021-07-29 10:36:46 +0200
commite58ad90b53da98a185c2202994fd982c67fdf4a7 (patch)
treefad33666d02241912d11bcff48932bab39457c9c
parentae487a6e626657a0f1065ee8d84e13d1543ee7c2 (diff)
parentf8e44655a7b680019b0f9213446fad478eb9b48e (diff)
downloadGT5-Unofficial-e58ad90b53da98a185c2202994fd982c67fdf4a7.tar.gz
GT5-Unofficial-e58ad90b53da98a185c2202994fd982c67fdf4a7.tar.bz2
GT5-Unofficial-e58ad90b53da98a185c2202994fd982c67fdf4a7.zip
Merge pull request #20 from D-Cysteine/fix-molten-cells
Fix wrong recipe in MoltenCellLoader Former-commit-id: cd0a935f44535770db03cb7c8e88866749be0d2d
-rw-r--r--.gitignore1
-rw-r--r--gradle.properties2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java2
3 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index f338842ce1..ac0fe978a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
*.ctxt
# IDEA files
+.idea/
*.iml
*.ipr
*.iws
diff --git a/gradle.properties b/gradle.properties
index ff2f1c8178..8f238432bb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,7 +23,7 @@ systemProp.org.gradle.internal.http.connectionTimeout=120000
systemProp.org.gradle.internal.http.socketTimeout=120000
majorUpdate=0
minorUpdate=5
-buildNumber=18
+buildNumber=19
apiVersion=11
ic2Version=2.2.828-experimental
applecoreVersion=1.7.10-3.1.1
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java
index 295bfd144c..119b04bb9e 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java
@@ -73,7 +73,7 @@ public class MoltenCellLoader implements IWerkstoffRunnable {
//Tank "Recipe"
final FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData(new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144), werkstoff.get(WerkstoffLoader.cellMolten), Materials.Empty.getCells(1));
- FluidContainerRegistry.registerFluidContainer(werkstoff.getMolten(144), werkstoff.get(cell), Materials.Empty.getCells(1));
+ FluidContainerRegistry.registerFluidContainer(werkstoff.getMolten(144), werkstoff.get(WerkstoffLoader.cellMolten), Materials.Empty.getCells(1));
GT_Utility.addFluidContainerData(data);
GT_Values.RA.addFluidCannerRecipe(Materials.Empty.getCells(1), werkstoff.get(WerkstoffLoader.cellMolten), new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144), GT_Values.NF);
GT_Values.RA.addFluidCannerRecipe(werkstoff.get(WerkstoffLoader.cellMolten), Materials.Empty.getCells(1), GT_Values.NF, new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144));