Merge branch 'mc1.5'

.classpath

@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="common"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/Forge-Client"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Forge"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

build.xml

@@ -17,13 +17,14 @@
 
 	<property name="mcpsrc.dir" value="${mcp.dir}/src"/>
 
-	<property name="mc.version" value="1.4.7"/>
-	<property name="forge.version" value="6.6.0.515"/>
-	<property name="project.version" value="3.4.2"/>
+	<property name="mc.version" value="1.5.1"/>
+	<property name="forge.version" value="7.7.1.624"/>
+<!--	<property name="project.version" value="0.0.0"/>-->
 
 	<property name="forge.name" value="minecraftforge-src-${mc.version}-${forge.version}.zip"/>
 
 	<available property="forge-exists" file="${download.dir}/${forge.name}"/>
+	<available file=".git" type="dir" property="git.present"/>
 
 	<condition property="out-of-date">
 		<not>
@@ -44,7 +45,7 @@
 	</target>
 
 	<!-- Set full version -->
-	<target name="initialize-version" depends="version-provided,version-not-provided">
+	<target name="initialize-version" depends="version-provided,version-not-provided,git.revision">
 		<property name="project.version.full" value="${project.version}.${build.number}"/>
 	</target>
 
@@ -57,6 +58,21 @@
 	<target name="version-provided" if="env.BUILD_NUMBER">
 		<property name="build.number" value="${env.BUILD_NUMBER}"/>
 	</target>
+	
+	<target name="git.revision" if="git.present">
+		<exec executable="git" outputproperty="git.revision" failifexecutionfails="false" errorproperty="">
+			<arg value="describe"/>
+			<arg value="--tags"/>
+			<arg value="--always"/>
+			<arg value="HEAD"/>
+		</exec>
+		<condition property="project.version" value="${git.revision}" else="0.0.0">
+			<and>
+				<isset property="git.revision"/>
+				<length string="${git.revision}" trim="yes" length="0" when="greater"/>
+			</and>
+		</condition>
+	</target>	
 
 	<!-- Download necessary files -->
 	<target name="download-files" depends="download-forge"/>
@@ -87,11 +103,7 @@
 
 	</target>
 
-	<target name="compile" depends="initialize-version,setup">
-
-		<delete dir="${classes.dir}"/>
-		<mkdir dir="${classes.dir}"/>
-
+	<target name="copy-src">
 		<!-- Copy sources -->
 		<copy todir="${mcpsrc.dir}/minecraft">
 			<fileset dir="${src.dir}/common"/>
@@ -100,6 +112,12 @@
 				<filter token="BUILD_NUMBER" value="${build.number}" />
 			</filterset>
 		</copy>
+	</target>
+
+	<target name="compile" depends="initialize-version,setup,copy-src">
+
+		<delete dir="${classes.dir}"/>
+		<mkdir dir="${classes.dir}"/>
 
 		<!-- Recompile -->
 		<exec dir="${mcp.dir}" executable="cmd" osfamily="windows">

buildcraft_resources/build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Sat Jan 26 10:14:15 CET 2013
-build.number=16
+#Fri Feb 22 17:54:19 CET 2013
+build.number=19

buildcraft_resources/build.xml

@@ -17,7 +17,7 @@
           
 	<property name="mc.version"			 value="1.4.7"/>
     <property name="forge.version"		 value="6.6.0.507"/>
-    <property name="bc.version"          value="3.4.2"/>
+    <property name="bc.version"          value="3.4.4fc"/>
     <property name="bc.version.full"     value="${bc.version}"/>
     
     <echo message="Starting build for ${bc.version.full}"/>

buildcraft_resources/changelog/3.4.3

@@ -0,0 +1,13 @@
+
+# 3.4.3
+
+- Added: Glass facades. (Krapht)
+- Changed: Autoarchic gates now always pulse at a single, fast rate. (cpw)
+- Bugfix: Vines now marked as soft blocks. (CovertJaguar)
+- Bugfix: Prevented crash if world gen is disabled. (CovertJaguar)
+- Bugfix: Fixed NPE when liquid in tank has ceased to exist. (Krapht)
+- Bugfix: Fixed /buildcraft not working in SSP. (viper283)
+- Bugfix: Fixed tank filling. (CovertJaguar)
+- Bugfix: Pipe items now registered with FML. (CovertJaguar)
+- Bugfix: Version check now threaded. (Pahimar)
+- Localization: Several updates to locations. (Contributors)

buildcraft_resources/changelog/3.4.4

@@ -0,0 +1,6 @@
+# 3.4.4
+
+- Changed: Improved pipe interaction, pipe selection. Gate GUI will only open if the actual gate has been clicked. (Player)
+- Bugfix: Fixed pipes not respecting an inventory's maximum stack limit. (powercrystals)
+- Bugfix: Fixed a possible endless look when interacting with inventories. (immibis)
+- Bugfix: Fixed possible crash with other mods interacting with the advanced assembly table. (Player)