From 5dc13cf03c92cab7635347ac7e887740ce067aef Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Tue, 10 Sep 2013 00:00:49 +0100 Subject: [PATCH 1/4] Change _Sunstrike cape to point at different file. --- capes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/capes.txt b/capes.txt index 5cc201aa..0963576e 100644 --- a/capes.txt +++ b/capes.txt @@ -1,7 +1,7 @@ mDiyo:https://dl.dropboxusercontent.com/u/42769935/mCape.png fuj1n:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png progwml6:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png -_Sunstrike:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png +_Sunstrike:http://talon.sunstrike.io/files/sun_cape.png Fudgy_Fetus:https://dl.dropboxusercontent.com/u/27415688/fudgecape.png Vexatos:https://dl.dropboxusercontent.com/u/57704711/Dokumente/Speziell/Minecraft/Public/TCape.png pillbox:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_orange.png From 9e3830a50b1cf62b93724e7546e5fd1cf544c2c9 Mon Sep 17 00:00:00 2001 From: GraxRabble Date: Tue, 10 Sep 2013 22:52:28 -0400 Subject: [PATCH 2/4] Fixed leaf fletching dup --- src/tconstruct/blocks/logic/PartBuilderLogic.java | 2 ++ src/tconstruct/common/TContent.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tconstruct/blocks/logic/PartBuilderLogic.java b/src/tconstruct/blocks/logic/PartBuilderLogic.java index ae643d32..07a7924e 100644 --- a/src/tconstruct/blocks/logic/PartBuilderLogic.java +++ b/src/tconstruct/blocks/logic/PartBuilderLogic.java @@ -61,6 +61,8 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory if (!craftedTop && inventory[0] != null) { int value = PatternBuilder.instance.getPartValue(inventory[2]); + if (value == 0) /* hack to plug up future dups */ + value = 2; IPattern item = (IPattern) inventory[0].getItem(); int cost = item != null ? item.getPatternCost(inventory[0]) : 0; if (value > 0 && cost > 0) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index c26e468c..927113de 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1143,7 +1143,8 @@ public class TContent implements IFuelHandler TConstructRegistry.addBowstringMaterial(0, 2, new ItemStack(Item.silk), new ItemStack(bowstring, 1, 0), 1F, 1F, 1f); //String TConstructRegistry.addFletchingMaterial(0, 2, new ItemStack(Item.feather), new ItemStack(fletching, 1, 0), 100F, 0F, 0.05F); //Feather - TConstructRegistry.addFletchingMaterial(1, 2, new ItemStack(Block.leaves), new ItemStack(fletching, 1, 1), 75F, 0F, 0.2F); //Leaves + for (int i = 0; i < 4; i++ ) + TConstructRegistry.addFletchingMaterial(1, 2, new ItemStack(Block.leaves, 1, i), new ItemStack(fletching, 1, 1), 75F, 0F, 0.2F); //All four vanialla Leaves TConstructRegistry.addFletchingMaterial(2, 2, new ItemStack(materials, 1, 1), new ItemStack(fletching, 1, 2), 100F, 0F, 0.12F); //Slime TConstructRegistry.addFletchingMaterial(3, 2, new ItemStack(materials, 1, 17), new ItemStack(fletching, 1, 3), 100F, 0F, 0.12F); //BlueSlime @@ -2320,4 +2321,4 @@ public class TContent implements IFuelHandler return 26400; return 0; } -} \ No newline at end of file +} From 7867bcd04959153fb2928a1fd6332c378b515ba2 Mon Sep 17 00:00:00 2001 From: GraxRabble Date: Wed, 11 Sep 2013 04:21:27 -0400 Subject: [PATCH 3/4] removed the hack and left only the vanilla leaf fix --- src/tconstruct/blocks/logic/PartBuilderLogic.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/tconstruct/blocks/logic/PartBuilderLogic.java b/src/tconstruct/blocks/logic/PartBuilderLogic.java index 07a7924e..ae643d32 100644 --- a/src/tconstruct/blocks/logic/PartBuilderLogic.java +++ b/src/tconstruct/blocks/logic/PartBuilderLogic.java @@ -61,8 +61,6 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory if (!craftedTop && inventory[0] != null) { int value = PatternBuilder.instance.getPartValue(inventory[2]); - if (value == 0) /* hack to plug up future dups */ - value = 2; IPattern item = (IPattern) inventory[0].getItem(); int cost = item != null ? item.getPatternCost(inventory[0]) : 0; if (value > 0 && cost > 0) From 30f4683fea9781969e3aa27e18670f4f4a8648c7 Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Wed, 11 Sep 2013 19:47:18 +0100 Subject: [PATCH 4/4] Don't mind me, being mildly OCD about formatting... --- README.md | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 4a4f8ad2..05e686a3 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,27 @@ -Tinkers' Construct -http://www.minecraftforum.net/topic/1659892-tinkers-construct/ +#[Tinkers' Construct](http://www.minecraftforum.net/topic/1659892-tinkers-construct/) Modify all the things, then do it again! Melt down any metals you find. Turn everything into golems! -To compile from source: use apache ant(http://ant.apache.org/bindownload.cgi) -run ant in the tinkers construct directory +##Compile from Source +Run [Apache Ant](http://ant.apache.org/bindownload.cgi) in the repository root: `ant package` -For all issue reporting; please include the following: - * Minecraft Version - * TinkersConstruct Version - * Forge Version - * Versions of any mods related to the issue - * If there is a crash involved, describe how you got it to crash and the forge crash log - * Any relevant screenshots are greatly appreciated. +##Issue reporting +Please include the following: +* Minecraft version +* TinkersConstruct version +* Forge version/build +* Versions of any mods potentially related to the issue +* Any relevant screenshots are greatly appreciated. +* For crashes: + * Steps to reproduce + * ForgeModLoader-client-0.log (the FML log) from the root folder of the client -Most code is public domain under Creative Commons 0: http://creativecommons.org/publicdomain/zero/1.0/ -Textures and binaries are licensed under Creative Commons 3: http://creativecommons.org/licenses/by/3.0/ -Any alternate licenses are noted where appropriate +##Licenses +Most code is public domain under [Creative Commons 0](http://creativecommons.org/publicdomain/zero/1.0/). + +Textures and binaries are licensed under [Creative Commons 3](http://creativecommons.org/licenses/by/3.0/). + +Any alternate licenses are noted where appropriate.