From 41e25e36ba7cf74ab81ffc50378c7aabdca63eb2 Mon Sep 17 00:00:00 2001 From: samtrion Date: Thu, 7 Nov 2013 23:39:30 +0100 Subject: [PATCH 1/3] Added Recipes for 9 Ingots to Blocks Added Alumine Ingot to 9 Nuggets Changed 9 Alumine Nugget to 1 Ingot instead of 1 natural Alimne --- src/tconstruct/common/TContent.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 315bfd4c..347f4b77 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1231,6 +1231,18 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ShapedOreRecipe(leggingsWood, new Object[] { "www", "w w", "w w", 'w', "logWood" })); GameRegistry.addRecipe(new ShapedOreRecipe(bootsWood, new Object[] { "w w", "w w", 'w', "logWood" })); // Metal conversion Recipes + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 3), patBlock, '#', new ItemStack(materials, 1, 9)); // Copper + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 5), patBlock, '#', new ItemStack(materials, 1, 10)); // Tin + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 6), patBlock, '#', new ItemStack(materials, 1, 11)); // Aluminum + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 6), patBlock, '#', new ItemStack(materials, 1, 12)); // Aluminum + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 4), patBlock, '#', new ItemStack(materials, 1, 13)); // Bronze + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 7), patBlock, '#', new ItemStack(materials, 1, 14)); // AluBrass + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 0), patBlock, '#', new ItemStack(materials, 1, 3)); // Cobalt + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 1), patBlock, '#', new ItemStack(materials, 1, 4)); // Ardite + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 2), patBlock, '#', new ItemStack(materials, 1, 5)); // Manyullyn + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 8), patBlock, '#', new ItemStack(materials, 1, 15)); // Alumite + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 9), patBlock, '#', new ItemStack(materials, 1, 16)); // Steel + GameRegistry.addRecipe(new ItemStack(materials, 9, 9), "m", 'm', new ItemStack(metalBlock, 1, 3)); //Copper GameRegistry.addRecipe(new ItemStack(materials, 9, 10), "m", 'm', new ItemStack(metalBlock, 1, 5)); //Tin GameRegistry.addRecipe(new ItemStack(materials, 9, 12), "m", 'm', new ItemStack(metalBlock, 1, 6)); //Aluminum @@ -1245,7 +1257,7 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(Item.ingotIron), patBlock, '#', new ItemStack(materials, 1, 19)); //Iron GameRegistry.addRecipe(new ItemStack(materials, 1, 9), patBlock, '#', new ItemStack(materials, 1, 20)); //Copper GameRegistry.addRecipe(new ItemStack(materials, 1, 10), patBlock, '#', new ItemStack(materials, 1, 21)); //Tin - GameRegistry.addRecipe(new ItemStack(materials, 1, 12), patBlock, '#', new ItemStack(materials, 1, 22)); //Aluminum + GameRegistry.addRecipe(new ItemStack(materials, 1, 11), patBlock, '#', new ItemStack(materials, 1, 22)); //Aluminum GameRegistry.addRecipe(new ItemStack(materials, 1, 14), patBlock, '#', new ItemStack(materials, 1, 24)); //Aluminum Brass GameRegistry.addRecipe(new ItemStack(materials, 1, 18), patBlock, '#', new ItemStack(materials, 1, 27)); //Obsidian GameRegistry.addRecipe(new ItemStack(materials, 1, 3), patBlock, '#', new ItemStack(materials, 1, 28)); //Cobalt @@ -1258,6 +1270,7 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(materials, 9, 19), "m", 'm', new ItemStack(Item.ingotIron)); //Iron GameRegistry.addRecipe(new ItemStack(materials, 9, 20), "m", 'm', new ItemStack(materials, 1, 9)); //Copper GameRegistry.addRecipe(new ItemStack(materials, 9, 21), "m", 'm', new ItemStack(materials, 1, 10)); //Tin + GameRegistry.addRecipe(new ItemStack(materials, 9, 22), "m", 'm', new ItemStack(materials, 1, 11)); //Aluminum GameRegistry.addRecipe(new ItemStack(materials, 9, 22), "m", 'm', new ItemStack(materials, 1, 12)); //Aluminum GameRegistry.addRecipe(new ItemStack(materials, 9, 24), "m", 'm', new ItemStack(materials, 1, 14)); //Aluminum Brass GameRegistry.addRecipe(new ItemStack(materials, 9, 27), "m", 'm', new ItemStack(materials, 1, 18)); //Obsidian From 5954506f37eed932506e071b7aad914ccb3aa069 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Thu, 14 Nov 2013 20:06:36 +0100 Subject: [PATCH 2/3] Deleted fluid.platinum , i'm not sure that it's ment to be there --- resources/assets/tinker/lang/en_US.lang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 1d2e4dd6..3e69987b 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -557,9 +557,8 @@ fluid.blood=Blood fluid.nickel.molten=Molten Nickel fluid.lead.molten=Molten Lead fluid.silver.molten=Molten Silver -fluid.platinum.molten=Molten Platinum +fluid.shiny=Molten Shiny fluid.invar=Molten Invar fluid.electrum.molten=Molten Electrum -fluid.shiny=Molten Shiny fluid.ender=Liquid Ender fluid.slime.blue=Liquid Blueslime From e1137f177aec3167be52a855b8fede1d3e073ec8 Mon Sep 17 00:00:00 2001 From: progwml6 Date: Sat, 16 Nov 2013 23:58:05 -0500 Subject: [PATCH 3/3] remove plugins from mcmod.info, load after those mods. --- resources/mcmod.info | 57 ---------------------------------- src/tconstruct/TConstruct.java | 2 +- 2 files changed, 1 insertion(+), 58 deletions(-) diff --git a/resources/mcmod.info b/resources/mcmod.info index 04f12acd..7eeec94f 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -32,62 +32,5 @@ "screenshots": [], "parent":"", "dependencies": [] - }, - { - "modid": "TConstruct|CompatMineFactoryReloaded", - "name": "TConstruct Compat: MFR", - "description": "TConstruct support for Minefactory Reloaded", - "version": "@VERSION@", - "mcversion": "@MCVERSION@", - "url": "http://www.minecraftforum.net/topic/1659892-tinkers-construct", - "updateUrl": "", - "authors": [ - "mDiyo", "fuj1n", "ProgWML6", "Sunstrike", "Pillbox" - ], - "credits": "Slime Knights", - "logoFile": "", - "screenshots": [], - "parent":"TConstruct", - "dependencies": [ - "TConstruct" - ] - }, - { - "modid": "TConstruct|CompatForgeMuliPart", - "name": "TConstruct Compat: FMP", - "description": "TConstruct support for forgemultipart", - "version": "@VERSION@", - "mcversion": "@MCVERSION@", - "url": "http://www.minecraftforum.net/topic/1659892-tinkers-construct", - "updateUrl": "", - "authors": [ - "mDiyo", "fuj1n", "ProgWML6", "Sunstrike", "Pillbox" - ], - "credits": "Slime Knights", - "logoFile": "", - "screenshots": [], - "parent":"TConstruct", - "dependencies": [ - "TConstruct" - ] - }, - { - "modid": "TConstruct|CompatWaila", - "name": "TConstruct Compat: Waila", - "description": "TConstruct support for Waila", - "version": "@VERSION@", - "mcversion": "@MCVERSION@", - "url": "http://www.minecraftforum.net/topic/1659892-tinkers-construct", - "updateUrl": "", - "authors": [ - "mDiyo", "fuj1n", "ProgWML6", "Sunstrike", "Pillbox" - ], - "credits": "Slime Knights, Samtrion", - "logoFile": "", - "screenshots": [], - "parent":"TConstruct", - "dependencies": [ - "TConstruct" - ] } ] diff --git a/src/tconstruct/TConstruct.java b/src/tconstruct/TConstruct.java index 9a5d2190..9ce5ddf1 100644 --- a/src/tconstruct/TConstruct.java +++ b/src/tconstruct/TConstruct.java @@ -32,7 +32,7 @@ import tconstruct.worldgen.village.*; * @author mDiyo */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_1.5.1d", dependencies = "required-after:Forge@[8.9,);after:Mantle-Core;after:Mantle-Router;after:ThermalExpansion") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_1.5.1d", dependencies = "required-after:Forge@[8.9,);after:ForgeMultipart;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class) public class TConstruct {