aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-03-31 18:07:00 +0200
committerTechnus <daniel112092@gmail.com>2017-03-31 18:07:00 +0200
commit8769d0c29c75c64a4f196af4caf8b9db2a421775 (patch)
treea4a970a361b327ffff72db0db43f6aab96d053a4 /src/main/java/gregtech/loaders
parent7d34b02f7855c044832943be96ab2ab3785beb40 (diff)
downloadGT5-Unofficial-8769d0c29c75c64a4f196af4caf8b9db2a421775.tar.gz
GT5-Unofficial-8769d0c29c75c64a4f196af4caf8b9db2a421775.tar.bz2
GT5-Unofficial-8769d0c29c75c64a4f196af4caf8b9db2a421775.zip
Fixed NPE
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index 4141952094..0f5e62b754 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -1912,7 +1912,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Osmium, 4L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 8L)}, new FluidStack[]{
Materials.Water.getFluid(10000),
- Materials.Mercury.getMolten(576),
+ Materials.Mercury.getFluid(576),
Materials.SolderingAlloy.getMolten(1296),
Materials.Lubricant.getFluid(2000)}, ItemList.Electric_Piston_UV.get(1), 1800, 500000);