aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/load
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2016-07-26 19:43:29 +0200
committerDream-Master <dream-master@gmx.net>2016-07-26 19:43:29 +0200
commita1bc16ae700db9a0445e707bc95ed9f21fcb13f9 (patch)
treebd64d8a4e8577606895c8fb4344d2de580a4b5d4 /src/main/java/gregtech/loaders/load
parenteeab702de4c84effbe22fd0a78b96deae1a31def (diff)
parent7a872dfad2b018869e2790573196a3dfc12cafe9 (diff)
downloadGT5-Unofficial-a1bc16ae700db9a0445e707bc95ed9f21fcb13f9.tar.gz
GT5-Unofficial-a1bc16ae700db9a0445e707bc95ed9f21fcb13f9.tar.bz2
GT5-Unofficial-a1bc16ae700db9a0445e707bc95ed9f21fcb13f9.zip
Merge branch 'new-features' into experimental
Diffstat (limited to 'src/main/java/gregtech/loaders/load')
-rw-r--r--src/main/java/gregtech/loaders/load/GT_FuelLoader.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
index 27ebd1389a..a6c1f4acd5 100644
--- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
+++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
@@ -24,7 +24,7 @@ public class GT_FuelLoader
GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 25000);
GT_Recipe.GT_Recipe_Map.sLargeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 200000);
- GT_Recipe.GT_Recipe_Map.sFluidNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L)}, null, null, null, 0, 0, 200000);
+ GT_Recipe.GT_Recipe_Map.sFluidNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 200000);
GT_Values.RA.addFuel(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 4), null, 4, 5);
GT_Values.RA.addFuel(new ItemStack(Items.experience_bottle, 1), null, 10, 5);