mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-21 04:32:26 +00:00
fix merge derps
This commit is contained in:
1 parent
6ad0723020
commit
07062a59d1
5 files changed
+33
-45
No files matched your search
@@ -337,7 +337,7 @@ public class TProxyClient extends TProxyCommon
|
||||
TConstructClientRegistry.registerManualIcon("arditeingot", new ItemStack(TContent.materials, 1, 4));
|
||||
TConstructClientRegistry.registerManualIcon("copperingot", new ItemStack(TContent.materials, 1, 9));
|
||||
TConstructClientRegistry.registerManualIcon("steelingot", new ItemStack(TContent.materials, 1, 16));
|
||||
TConstructClientRegistry.registerManualIcon("pigironingot", new ItemStack(TContent.materials, 1, 34));
|
||||
TConstructClientRegistry.registerManualIcon("pigironingot", new ItemStack(TContent.materials, 1, 34));
|
||||
|
||||
|
||||
// Tool parts
|
||||
@@ -370,7 +370,7 @@ public class TProxyClient extends TProxyCommon
|
||||
TConstructClientRegistry.registerManualIcon("bowstring", new ItemStack(TContent.bowstring, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("arrowhead", new ItemStack(TContent.arrowhead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("fletching", new ItemStack(TContent.fletching, 1, 0));
|
||||
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TContent.buckets, 1, 16));
|
||||
TConstructClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TContent.buckets, 1, 15));
|
||||
TConstructClientRegistry.registerManualIcon("gluebucket", new ItemStack(TContent.buckets, 1, 25));
|
||||
@@ -420,7 +420,7 @@ public class TProxyClient extends TProxyCommon
|
||||
|
||||
ItemStack stick = new ItemStack(Item.stick, 1, 0);
|
||||
ItemStack plank = new ItemStack(Block.planks, 1, 0);
|
||||
ItemStack plankSlab = new ItemStack(Block.woodSingleSlab, 1, 0);
|
||||
ItemStack plankSlab = new ItemStack(Block.woodSingleSlab, 1, 0);
|
||||
ItemStack workbench = new ItemStack(Block.workbench, 1, 0);
|
||||
ItemStack chest = new ItemStack(Block.chest, 1, 0);
|
||||
ItemStack log = new ItemStack(Block.wood, 1, 0);
|
||||
@@ -452,7 +452,7 @@ public class TProxyClient extends TProxyCommon
|
||||
ItemStack consecratedsoil = new ItemStack(TContent.craftedSoil, 1, 4);
|
||||
|
||||
// TConstruct recipes
|
||||
TConstructClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Item.book), paper, paper, paper, string, pattern, pattern, null, null, null);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Item.book), paper, paper, paper, string, pattern, pattern, null, null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TContent.manualBook, 1, 0), new ItemStack(Item.paper), pattern, null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("patternbook2", new ItemStack(TContent.manualBook, 1, 1), new ItemStack(TContent.manualBook, 1, 0), null, null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("patternbook3", new ItemStack(TContent.manualBook, 1, 2), new ItemStack(TContent.manualBook, 1, 1), null, null, null);
|
||||
|
||||
@@ -1347,7 +1347,7 @@ public class TContent implements IFuelHandler
|
||||
// Gold Pressure Plate - Vanilla alternativ
|
||||
GameRegistry.addRecipe(new ItemStack(Block.pressurePlateGold), "ii", 'i', aluBrass);
|
||||
//Accessories
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotAluminum"));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotAluminum"));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotAluminium"));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotNaturalAluminum"));
|
||||
GameRegistry.addRecipe(new ItemStack(diamondApple), " d ", "d#d", " d ", 'd', new ItemStack(Item.diamond), '#', new ItemStack(Item.appleRed));
|
||||
@@ -1405,8 +1405,7 @@ public class TContent implements IFuelHandler
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingStationWood, 1, 0), "b", 'b', "craftingTableWood"));
|
||||
//Slab crafters
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingSlabWood, 6, 0), "bbb", 'b', "crafterWood"));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingSlabWood, 6, 0), "bbb", 'b', "craftingTableWood"));
|
||||
GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 0), "b", 'b', new ItemStack(craftingStationWood, 1, 0));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingSlabWood, 6, 0), "bbb", 'b', "craftingTableWood")); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 0), "b", 'b', new ItemStack(craftingStationWood, 1, 0));
|
||||
GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 1), "b", 'b', new ItemStack(toolStationWood, 1, 0));
|
||||
GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 1));
|
||||
GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 2));
|
||||
|
||||
@@ -25,7 +25,7 @@ import java.util.logging.Logger;
|
||||
public class TConstructLoaderContainer extends DummyModContainer implements IFMLLoadingPlugin
|
||||
{
|
||||
|
||||
private final String[] asmTransformers = new String[] { "tconstruct.preloader.AccessTransformers", "tconstruct.preloader.ASMInterfaceRepair" };
|
||||
private final String[] asmTransformers = new String[] { "tconstruct.preloader.ASMInterfaceRepair" };
|
||||
private final ModMetadata md = new ModMetadata();
|
||||
|
||||
public static Logger logger = Logger.getLogger("TCon-Preloader");
|
||||
|
||||
Reference in new issue
Block a user