Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4
# Conflicts: # src/main/java/techreborn/init/ModRecipes.java
This commit is contained in:
commit
7d0943ea5b
5 changed files with 23 additions and 13 deletions
|
@ -443,8 +443,6 @@ public class ModRecipes
|
|||
new GrinderRecipe(BlockOre.getOreByName("Lead"), ItemDusts.getDustByName("lead", 2), ticktime, eutick));
|
||||
RecipeHandler.addRecipe(
|
||||
new GrinderRecipe(BlockOre.getOreByName("Silver"), ItemDusts.getDustByName("silver", 2), ticktime, eutick));
|
||||
RecipeHandler
|
||||
.addRecipe(new GrinderRecipe(ItemGems.getGemByName("ruby"), ItemDusts.getDustByName("ruby"), ticktime, eutick));
|
||||
|
||||
// Ingots to Dust
|
||||
RecipeHandler.addRecipe(
|
||||
|
@ -484,6 +482,18 @@ public class ModRecipes
|
|||
RecipeHandler.addRecipe(
|
||||
new GrinderRecipe(ItemIngots.getIngotByName("zinc"), ItemDusts.getDustByName("zinc", 1), ticktime, eutick));
|
||||
|
||||
// Others to Dust
|
||||
RecipeHandler.addRecipe(
|
||||
new GrinderRecipe(ItemGems.getGemByName("ruby"), ItemDusts.getDustByName("ruby"), ticktime, eutick));
|
||||
RecipeHandler.addRecipe(
|
||||
new GrinderRecipe(ItemGems.getGemByName("sapphire"), ItemDusts.getDustByName("sapphire"), ticktime, eutick));
|
||||
RecipeHandler.addRecipe(
|
||||
new GrinderRecipe(ItemGems.getGemByName("peridot"), ItemDusts.getDustByName("peridot"), ticktime, eutick));
|
||||
RecipeHandler.addRecipe(
|
||||
new GrinderRecipe(ItemGems.getGemByName("redGarnet"), ItemDusts.getDustByName("redGarnet"), ticktime, eutick));
|
||||
RecipeHandler.addRecipe(
|
||||
new GrinderRecipe(ItemGems.getGemByName("yellowGarnet"), ItemDusts.getDustByName("yellowGarnet"), ticktime, eutick));
|
||||
|
||||
}
|
||||
|
||||
// static void addHammerRecipes()
|
||||
|
@ -3489,8 +3499,8 @@ public class ModRecipes
|
|||
}
|
||||
|
||||
static void addGemToolRecipes(ItemStack gemsword, ItemStack gempick, ItemStack gemaxe, ItemStack gemHoe,
|
||||
ItemStack gemspade, ItemStack gemhelmet, ItemStack gemchestplate, ItemStack gemleggings, ItemStack gemboots,
|
||||
String gem)
|
||||
ItemStack gemspade, ItemStack gemhelmet, ItemStack gemchestplate, ItemStack gemleggings, ItemStack gemboots,
|
||||
String gem)
|
||||
{
|
||||
CraftingHelper.addShapedOreRecipe(gemsword, " G ", " G ", " S ", 'S', Items.STICK, 'G', gem);
|
||||
|
||||
|
@ -3515,4 +3525,4 @@ public class ModRecipes
|
|||
{
|
||||
return UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, fluid);
|
||||
}
|
||||
}
|
||||
}
|
Binary file not shown.
After Width: | Height: | Size: 9.7 KiB |
Loading…
Add table
Add a link
Reference in a new issue