From a2a82d3d361ad34b4651d569ff4949ceb329df35 Mon Sep 17 00:00:00 2001 From: Pahimar Date: Fri, 16 May 2014 11:48:51 -0400 Subject: [PATCH] Tweaking some build script and mcmod stuff --- build.gradle | 7 +++++-- src/main/resources/mcmod.info | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index dc20131b..93841f08 100644 --- a/build.gradle +++ b/build.gradle @@ -17,13 +17,13 @@ buildscript { apply plugin: 'forge' -version = "1.7.2-0.2." + System.getenv("BUILD_NUMBER") ?: 0; +version = "1.7.2-0.2.${System.getenv("BUILD_NUMBER") ?: 0}"; group = "com.pahimar.ee3" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "EquivalentExchange3" minecraft { version = "1.7.2-10.12.1.1082" - assetDir = "eclipse/assets" + assetDir = "run/assets" } dependencies { @@ -48,6 +48,9 @@ processResources inputs.property "version", project.version inputs.property "mcversion", project.minecraft.version + // exclude xcf files, as they are for development only + exclude '**/*.xcf' + // replace stuff in mcmod.info, nothing else from(sourceSets.main.resources.srcDirs) { include 'mcmod.info' diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 05e18f5e..defa2186 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -4,14 +4,15 @@ "name": "Equivalent Exchange 3", "description": "Transmute stuff into other stuff! Become a Minecraft God!", "version": "${version}", + "mcversion": ${mcversion}", "url": "http://www.minecraftforum.net/topic/1106178-", "updateUrl": "", "authorList": [ "pahimar", "x3n0ph0b3" ], - "credits": "By pahimar, based on Equivalent Exchange 1 & 2 by x3n0ph0b3", - "logoFile": "/assets/ee3/textures/logo/logo.png", + "credits": "By pahimar, based (loosely) on Equivalent Exchange 1 & 2 by x3n0ph0b3", + "logoFile": "assets/ee3/textures/logo/logo.png", "screenshots": [ ], "parent":"",