# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
This commit is contained in:
modmuss50 2017-06-14 23:30:35 +01:00
commit 426001251f
No known key found for this signature in database
GPG key ID: 203A5ED4D3E48BEA
123 changed files with 1469 additions and 1486 deletions

View file

@ -31,7 +31,7 @@ import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.util.OreUtil;
import reborncore.common.util.StringUtils;
import techreborn.blocks.BlockMachineCasing;
import techreborn.blocks.BlockMachineFrame;
import techreborn.blocks.BlockMachineFrames;
import techreborn.blocks.cable.BlockCable;
import techreborn.init.IC2Duplicates;
import techreborn.items.*;
@ -60,7 +60,7 @@ public abstract class RecipeMethods {
} else if (type == Type.CABLE) {
return BlockCable.getCableByName(name, count);
} else if (type == Type.MACHINE_FRAME) {
return BlockMachineFrame.getFrameByName(name, count);
return BlockMachineFrames.getFrameByName(name, count);
} else if (type == Type.MACHINE_CASING) {
return BlockMachineCasing.getStackByName(name, count);
} else if (type == Type.UPGRADE) {