diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2016-07-26 00:25:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-26 00:25:25 +0200 |
| commit | 5a15ee7e4ae224c485c1ed5f126a6eb35c7c2beb (patch) | |
| tree | 59b8929a3b5bd4829ac0f0fc8dd8e6b60bf8f25f /src/main/java/gregtech/loaders | |
| parent | be3a6292bb02d5aef5d8fd8052b53394743b0b00 (diff) | |
| parent | a5ba9e57fafe72bf1229499d75ed04db6ecfe9ce (diff) | |
| download | GT5-Unofficial-5a15ee7e4ae224c485c1ed5f126a6eb35c7c2beb.tar.gz GT5-Unofficial-5a15ee7e4ae224c485c1ed5f126a6eb35c7c2beb.tar.bz2 GT5-Unofficial-5a15ee7e4ae224c485c1ed5f126a6eb35c7c2beb.zip | |
Merge pull request #568 from DEMOOH/experimental
Fluid Filter, Reactoria, MK3 Naquadah reactor fixes
Diffstat (limited to 'src/main/java/gregtech/loaders')
| -rw-r--r-- | src/main/java/gregtech/loaders/load/GT_FuelLoader.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 2 |
2 files changed, 3 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 b51cbb3b04..04b2648f53 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);
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 46ebef8948..c60bf5c9cb 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1766,6 +1766,8 @@ if(Loader.isModLoaded("Railcraft")){ addProcess(tCrop,Materials.Osmium,20); // Radioactive Line + tCrop = ItemList.Crop_Drop_Pitchblende.get(1, new Object[0]); + addProcess(tCrop,Materials.Pitchblende,50); tCrop = ItemList.Crop_Drop_Uraninite.get(1, new Object[0]); addProcess(tCrop,Materials.Uraninite,50); addProcess(tCrop,Materials.Uranium,50); |