diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-03-22 18:01:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-22 18:01:27 +0100 |
| commit | 67f104925ff07120804db83d8b23ae8161f8e44b (patch) | |
| tree | b24a05b261d194304d7fcd0a8647c127fcfecd49 /src/main/java/gregtech/loaders/preload | |
| parent | f4dae834dacbac9d765ad597681a53fc067da674 (diff) | |
| parent | 5e7d95284c4cd8c8be1f2c27b4b745cf81b44fc8 (diff) | |
| download | GT5-Unofficial-67f104925ff07120804db83d8b23ae8161f8e44b.tar.gz GT5-Unofficial-67f104925ff07120804db83d8b23ae8161f8e44b.tar.bz2 GT5-Unofficial-67f104925ff07120804db83d8b23ae8161f8e44b.zip | |
Merge pull request #967 from Dimach/unstable
Fixed incorrect merge, rebase missing commit, resolve conflicts, cleanup code.
Diffstat (limited to 'src/main/java/gregtech/loaders/preload')
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index c31a001526..54d0da5477 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -640,11 +640,11 @@ public class GT_Loader_Item_Block_And_Fluid }
}
}
- GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.cobblestone, 1, 32767), new ItemStack(Blocks.sand, 1), null, 0, false);
+ GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.cobblestone, 1, 32767), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), null, 0, false);
//GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.stone, 1, 32767), new ItemStack(Blocks.cobblestone, 1), null, 0, false);
- GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.gravel, 1, 32767), new ItemStack(Items.flint, 1), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Flint, 1L), 10, false);
- GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.furnace, 1, 32767), new ItemStack(Blocks.sand, 6), null, 0, false);
- GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.lit_furnace, 1, 32767), new ItemStack(Blocks.sand, 6), null, 0, false);
+ GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.gravel, 1, 32767), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), null, 0, false);
+ GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.furnace, 1, 32767), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L), null, 0, false);
+ GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.lit_furnace, 1, 32767), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L), null, 0, false);
GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.FierySteel, GT_ModHandler.getModItem("TwilightForest", "item.fieryIngot", 1L, 0));
GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Knightmetal, GT_ModHandler.getModItem("TwilightForest", "item.knightMetal", 1L, 0));
|