Merge remote-tracking branch 'remotes/origin/feature/containers-builder' into 1.11.2
# Conflicts: # src/main/java/techreborn/client/container/ContainerAlloyFurnace.java # src/main/java/techreborn/tiles/TileAlloyFurnace.java
This commit is contained in:
commit
8b24fdf765
195 changed files with 4701 additions and 5523 deletions
|
@ -15,11 +15,11 @@ public class RollingMachineRecipes extends RecipeMethods {
|
|||
if (oresExist("ingotAluminum")) {
|
||||
register(getMaterial("kanthal_heating_coil", 3, Type.PART), "RRR", "CAA", "CCA", 'R', "ingotRefinedIron", 'C', "ingotChrome", 'A', "ingotAluminum");
|
||||
}
|
||||
if (oresExist("ingotAluminum")) {
|
||||
if (oresExist("ingotAluminium")) {
|
||||
register(getMaterial("kanthal_heating_coil", 3, Type.PART), "RRR", "CAA", "CCA", 'R', "ingotRefinedIron", 'C', "ingotChrome", 'A', "ingotAluminium");
|
||||
}
|
||||
register(getStack(Blocks.RAIL, 24), "I I", "ISI", "I I", 'I', "ingotIron", 'S', "stickWood");
|
||||
register(getStack(Blocks.GOLDEN_RAIL, 8), "I I", "ISI", "IRI", 'I', "ingotIron", 'S', "stickWood", 'R', "dustRedstone");
|
||||
register(getStack(Blocks.GOLDEN_RAIL, 8), "I I", "ISI", "IRI", 'I', "ingotGold", 'S', "stickWood", 'R', "dustRedstone");
|
||||
register(getStack(Blocks.DETECTOR_RAIL, 8), "I I", "IPI", "IRI", 'I', "ingotIron", 'P', getStack(Blocks.STONE_PRESSURE_PLATE), 'R', "dustRedstone");
|
||||
register(getStack(Blocks.ACTIVATOR_RAIL, 8), "ISI", "IRI", "ISI", 'I', "ingotIron", 'S', "stickWood", 'R', getStack(Blocks.REDSTONE_TORCH));
|
||||
register(getStack(Blocks.IRON_BARS, 24), "III", "III", 'I', "ingotIron");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue