diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-09-05 18:41:37 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-09-05 18:41:37 +0200 |
| commit | 480848821f16989ed150bc98f749b6bf8db1faa6 (patch) | |
| tree | 2270ae650eed6fbc9ac137f1ce407f438e92f574 /src/main/java/gregtech/loaders/load | |
| parent | 1698e57f729efb52e2b98e865a9671f0b50a5b2e (diff) | |
| parent | cb158871441d64678d256b784c40278b0f730d5e (diff) | |
| download | GT5-Unofficial-480848821f16989ed150bc98f749b6bf8db1faa6.tar.gz GT5-Unofficial-480848821f16989ed150bc98f749b6bf8db1faa6.tar.bz2 GT5-Unofficial-480848821f16989ed150bc98f749b6bf8db1faa6.zip | |
Merge branch 'New_hightier_stuff_dev' into New_test_dev
# Conflicts:
# src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
Diffstat (limited to 'src/main/java/gregtech/loaders/load')
| -rw-r--r-- | src/main/java/gregtech/loaders/load/GT_FuelLoader.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java index d1779b267e..489fd680f9 100644 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java @@ -34,6 +34,7 @@ public class GT_FuelLoader GT_Recipe.GT_Recipe_Map.sFluidNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 250000);
GT_Recipe.GT_Recipe_Map.sHugeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 500000);
GT_Recipe.GT_Recipe_Map.sExtraHugeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadria, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 1000000);
+ GT_Recipe.GT_Recipe_Map.sUltraHugeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FluidNaquadahFuel, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 2000000);
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);
|