Merge branch 'master' of https://github.com/RenEvo/BurpTech

renevo · Aug 9, 2013 · 69d0fd1 · 69d0fd1
2 parents 2703e5b + d43adad
commit 69d0fd1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/build.xml b/build.xml
@@ -19,6 +19,7 @@
 	<target name="prep">
 		<copy todir="mcp\src\minecraft">
 			<fileset dir="src\common\" />
+			<fileset dir="src\resources" includes="mcmod.info" />
 		</copy>
 	</target>
 
@@ -56,9 +57,9 @@
 		<!-- Build the jar -->
 		<mkdir dir="bin\${build.release.minecraft.version}\" />
 		<jar destfile="bin\${build.release.minecraft.version}\burptech-${build.release.minecraft.version}.${build.release.number}.jar">
+			<fileset dir="src\resources" excludes="**/xcf/**,mcmod.info" />
 			<fileset dir="mcp\src\minecraft\" includes="mcmod.info" />
 			<fileset dir="mcp\reobf\minecraft" />
-			<fileset dir="src\resources" excludes="**/xcf/**" />
 		</jar>
 
 		<!-- Clean up the MCP source now that we are done -->

diff --git a/src/common/burptech/lib/Constants.java b/src/common/burptech/lib/Constants.java
@@ -19,7 +19,7 @@ public final class Constants
     /**
      * MOD VERSION
      */
-    public static final String MOD_VERSION = "1.5.2.0";
+    public static final String MOD_VERSION = "@VERSION@";
 
     /**
      * MOD NAME

diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info
@@ -6,7 +6,7 @@
   "modid": "BurpTechCore",
   "name": "BurpTech",
   "description": "BurpTech - it's what for dinner... Rather that noise after dinner",
-  "version": "1.5.2.0",
+  "version": "@VERSION@",
   "mcversion": "1.5.2",
   "url": "http://renevo.github.io/BurpTech",
    "logoFile": "/mods/BurpTechCore/textures/logo.png",