Merge master into builder

README.md

@@ -14,6 +14,7 @@ less time coding and more time doing stuff that makes them less grumpy.
 
 #### Frequently reported
 * java.lang.AbstractMethodError - Incompatibility between BC/Forge/Mod using BC API. Usually not a BC issue
+* java.lang.NoSuchMethodException - Same as above
 * Render issue (Quarry causes flickering) - Try without optifine, if it still flickers, report it
 
 ### Compiling and packaging Buildcraft

build.xml

@@ -18,8 +18,13 @@
 
 	<property name="mcpsrc.dir" value="${mcp.dir}/src"/>
 
+<<<<<<< HEAD
+	<property name="mc.version" value="1.5.2"/>
+	<property name="forge.version" value="7.8.1.738"/>
+=======
 	<property name="mc.version" value="1.6.2"/>
 	<property name="forge.version" value="9.10.0.800"/>
+>>>>>>> mc16
 	<!--	<property name="project.version" value="0.0.0"/>-->
 
 	<property name="buildcraft.name" value="buildcraft"/>