Fix merge conflicts

README.md

@@ -1,11 +1,21 @@
-Tinkers' Construct - 1.5 	 
+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: Set any visibility flags on fields or methods to public.
+To compile from source: use apache ant(http://ant.apache.org/bindownload.cgi)
+run ant in the tinkers construct directory
+
+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.
+
 
 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/ 	 

TConstruct_AT.cfg

@@ -1,6 +1,6 @@
 # Tinkers Construct -- Access Transformer
 # Required for Ant build system.
-# Last update: Minecraft 1.6.2 (TC git: e0b414ed74f29cbfb6a2732a70bcf5e7d8d82a08)
+# Last update: Minecraft 1.6.2 - 2013 Sept 7(TC git: 0a07dfabd007c6436a73dec7ec70e734116895ad)
 
 # EntityArrow - Grabbed 'em all, since so much is accessed
 public ug.a

build.xml

@@ -18,7 +18,7 @@
 	<property name="mcpsrc.dir" value="${mcp.dir}/src"/>
 
 	<property name="mc.version" value="1.6.2"/>
-	<property name="forge.version" value="9.10.0.845"/>
+	<property name="forge.version" value="9.10.1.858"/>
 
     <property name="version.major" value="0"/>
     <property name="version.minor" value="0"/>
@@ -63,9 +63,8 @@
 
 	<target name="git-revision" if="git.present">
 		<exec executable="git" dir="." outputproperty="git.revision" failifexecutionfails="false" errorproperty="">
-			<arg value="describe"/>
-			<arg value="--tags"/>
-			<arg value="--always"/>
+			<arg value="rev-parse"/>
+			<arg value="--short"/>
 			<arg value="HEAD"/>
 		</exec>
 		<echo message="Git revision: ${git.revision}"/>

capes.txt

@@ -1,5 +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
 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

mcmod.info

@@ -1,20 +0,0 @@
-[
-{
-  "modid": "TConstruct",
-  "name": "Tinkers' Construct",
-  "description": "A little of this, a little of that, a lot of tinkering, and a lot of tools",
-  "version": "1.4",
-  "mcversion": "1.6.2",
-  "url": "http://www.minecraftforum.net/topic/1659892-tinkers-construct",
-  "updateUrl": "",
-  "authors": [
-    "mDiyo", "fuj1n"
-  ],
-  "logoFile": "",
-  "screenshots": [
-  ],
-  "parent":"",
-  "dependencies": [
-  ]
-}
-]