Merge branch 'master' into power

build.xml

@@ -208,7 +208,11 @@
 		<delete includeemptydirs="true">
 			<fileset dir="${jar.dir}" includes="**/*"/>
 		</delete>
-		<jar destfile="${jar.dir}/${buildcraft.name}-${mc.version}-${project.version.full}.jar" basedir="${classes.dir}"/>
+		<condition property="jar.file.name" value="${jar.dir}/${buildcraft.name}-${mc.version}-${project.version.full}.jar" else="${jar.dir}/${buildcraft.name}-universal-${mc.version}-${project.version.full}.jar">
+			<isset property="forge-long-name"/>
+		</condition>
+		
+		<jar destfile="${jar.file.name}" basedir="${classes.dir}"/>
 		<copy todir="${jar.dir}/changelog">
 			<fileset dir="${resources.dir}/changelog">
 				<include name="*" />

buildcraft_resources/build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Thu Jun 20 16:28:51 CEST 2013
-build.number=34
+#Sat Jun 22 09:37:58 CEST 2013
+build.number=35

buildcraft_resources/build.xml

@@ -17,7 +17,7 @@
           
 	<property name="mc.version"			 value="1.5.2"/>
     <property name="forge.version"		 value="7.8.0.710"/>
-    <property name="bc.version"          value="3.7.0"/>
+    <property name="bc.version"          value="3.7.1"/>
     <property name="bc.version.full"     value="${bc.version}"/>
     
     <echo message="Starting build for ${bc.version.full}"/>

common/buildcraft/factory/BlockQuarry.java

@@ -63,7 +63,7 @@ public class BlockQuarry extends BlockMachineRoot {
 		if (j == 0 && i == 3)
 			return textureFront;
 
-		if (i == j)
+		if (i == j && i>1) // Front can't be top or bottom.
 			return textureFront;
 
 		switch (i) {