Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
This commit is contained in:
commit
cebef75338
2 changed files with 2 additions and 2 deletions
|
@ -270,6 +270,7 @@ public class ModRecipes {
|
||||||
CraftingHelper.addShapelessOreRecipe(ItemStandaloneCables.getCableByName("insulatedhv"), ItemParts.getPartByName("rubber"), ItemStandaloneCables.getCableByName("hv"));
|
CraftingHelper.addShapelessOreRecipe(ItemStandaloneCables.getCableByName("insulatedhv"), ItemParts.getPartByName("rubber"), ItemStandaloneCables.getCableByName("hv"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void addCompressorRecipes() {
|
private static void addCompressorRecipes() {
|
||||||
RecipeHandler.addRecipe(new CompressorRecipe(new ItemStack(Items.diamond), new ItemStack(Items.coal), 400, 20));
|
RecipeHandler.addRecipe(new CompressorRecipe(new ItemStack(Items.diamond), new ItemStack(Items.coal), 400, 20));
|
||||||
}
|
}
|
||||||
|
@ -278,7 +279,6 @@ public class ModRecipes {
|
||||||
RecipeHandler.addRecipe(new ExtractorRecipe(ItemParts.getPartByName("rubberSap"), ItemParts.getPartByName("rubber", 3), 400, 20));
|
RecipeHandler.addRecipe(new ExtractorRecipe(ItemParts.getPartByName("rubberSap"), ItemParts.getPartByName("rubber", 3), 400, 20));
|
||||||
RecipeHandler.addRecipe(new ExtractorRecipe(new ItemStack(ModBlocks.rubberLog), ItemParts.getPartByName("rubber"), 400, 20));
|
RecipeHandler.addRecipe(new ExtractorRecipe(new ItemStack(ModBlocks.rubberLog), ItemParts.getPartByName("rubber"), 400, 20));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void addIc2ReplacementReicpes(){
|
static void addIc2ReplacementReicpes(){
|
||||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Grinder),
|
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Grinder),
|
||||||
"FFF",
|
"FFF",
|
||||||
|
|
|
@ -165,7 +165,7 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
||||||
return new ItemStack(ModBlocks.Compressor, 1);
|
return new ItemStack(ModBlocks.recycler, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isComplete() {
|
public boolean isComplete() {
|
||||||
|
|
Loading…
Reference in a new issue