Merge branch '1.7.10-krypt' into 1.7-final

Conflicts:
	build.gradle
	build.properties
	src/main/java/thaumic/tinkerer/common/core/handler/ConfigHandler.java
	src/main/java/thaumic/tinkerer/common/item/foci/ItemFocusDislocation.java
	src/main/resources/assets/ttinkerer/lang/en_US.lang

build.gradle

@@ -12,12 +12,20 @@ buildscript {
         maven {
             url 'https://oss.sonatype.org/content/groups/public'
         }
+        maven { url 'https://plugins.gradle.org/m2/' }
         mavenLocal()
     }
     dependencies {
         classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath 'com.gradle:build-scan-plugin:1.3'
     }
 }
+apply plugin: 'com.gradle.build-scan'
+
+buildScan {
+    licenseAgreementUrl = 'https://gradle.com/terms-of-service'
+    licenseAgree = 'yes'
+}
 repositories {
     ivy {
 
@@ -37,6 +45,20 @@ repositories {
         name 'DVS1 Maven FS'
         url 'http://dvs1.progwml6.com/files/maven'
     }
+    maven { // the repo from which to get NEI and stuff
+        name 'CB Repo'
+        url "http://chickenbones.net/maven/"
+    }
+    maven { // The repo from which to get waila
+        name "Mobius Repo"
+        url "http://mobiusstrip.eu/maven"
+    }
+    maven {
+
+        url  'http://maven.cil.li/'
+    }
+
+
 }
 String changelogLoc = 'https://raw.github.com/Thaumic-Tinkerer/ThaumicTinkerer/changelog/web/changelog'
 
@@ -52,7 +74,15 @@ if (project.hasProperty("releaseType"))
         version = "alpha-" + version
 
 group = "thaumic.tinkerer" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "ThaumicTinkerer"
+
+
+ext.configFile = file('build.properties')
+
+ext.config = parseConfig(configFile)
+
+version = "${config.version}-${config.build_number}"
+//version = "${config.version}"
+archivesBaseName = config.mod_name
 
 minecraft {
     version = "1.7.10-10.13.4.1614-1.7.10"
@@ -65,6 +95,12 @@ minecraft {
 
 
 }
+version = "2.5-${minecraft.version}"
+if (System.getenv("BUILD_NUMBER")!=null)
+    version = "$version-${System.getenv().BUILD_NUMBER}"
+if (project.hasProperty("releaseType"))
+    if (project.releaseType == "ALPHA")
+        version = "alpha-" + version
 //curse {
 //    projectId="75598"
 //    if(project.hasProperty("apiKey"))
@@ -75,18 +111,34 @@ minecraft {
 //}
 
 
-dependencies {
-    compile files(
-            'TCDEOBF.jar'
-    )
-	compile files("libs/Mantle-1.7.10-0.3.2.jar")
-    compile files("libs/TConstruct-1.7.10-1.8.9-GTNH.jar") {
-        //exclude module: 'CodeChickenCore'
-        //exclude module: 'Waila'
-        //exclude module: 'NotEnoughItems'
-    }
-}
+    dependencies {
+        compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev"
+        compile "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev"
+        //compile "mcp.mobius.waila:Waila:1.5.10_1.7.10"
+        compile "codechicken:ForgeMultipart:1.7.10-1.1.2.331:dev"
 
+        compile 'com.mod-buildcraft:buildcraft:6.4.8:dev'
+        compile "codechicken:NotEnoughItems:1.7.10-1.0.5.118:dev"
+        compile "codechicken:EnderStorage:1.7.10-1.4.7.37:dev"
+        compile "mantle:Mantle:1.7.10-0.3.2.jenkins187:deobf"
+        compile "li.cil.oc:OpenComputers:MC1.7.10-1.5.7.536-dev:api"
+        compile "li.cil.oc:OpenComputers:MC1.7.10-1.5.7.536-dev:dev"
+        compile("tconstruct:TConstruct:1.7.10-1.8.3.build927:deobf") {
+        }
+    }
+// some crazy stuff to make sure the chicken stuff is in the mods folder...
+// because it wont work otherwise...  because FML doesnt laod coremods from the classpath
+task copyChicken(type: Copy, dependsOn: "extractUserDev") {
+    from { configurations.compile }
+    include "**/*Chicken*.jar", "**/*NotEnoughItems*.jar"
+    exclude "**/CodeChickenLib*" // because CCC downloads it anyways.. -_-
+    into file(minecraft.runDir + "/mods")
+
+    mustRunAfter "deobfBinJar"
+    mustRunAfter "repackMinecraft"
+}
+//tasks.setupDevWorkspace.dependsOn copyChicken
+//tasks.setupDecompWorkspace.dependsOn copyChicken
 processResources
         {
             // replace stuff in mcmod.info, nothing else
@@ -106,8 +158,20 @@ jar {
         attributes 'FMLCorePlugin': 'thaumic.tinkerer.preloader.ThaumicTLoaderContainer'
         attributes 'FMLCorePluginContainsFMLMod': 'true'
     }
+	//rename the default output, for some better... sanity with scipts
+    archiveName = "${baseName} ${version}.${extension}"
 }
+
+def parseConfig(File config) {
+    config.withReader {
+        def prop = new Properties()
+        prop.load(it)
+        return (new ConfigSlurper().parse(prop))
+    }
+}
+
+
 task deobfJar(type: Jar) {
     from sourceSets.main.output
     classifier = 'dev'
-}
+}

build.properties

@@ -1,10 +1,10 @@
 #Thu, 30 Jan 2014 18:26:58 +0000
-version=2.5-1.7.10-543GTNH
-build_number=543
+version=2.5-553-GTNH
+build_number=553
 mc_version=1.7.10
-mod_name=ThaumicTinkerer
+mod_name=ThaumicTinkerer-1.7.10
 dir.repo=./
 dir.gradle=../MCP1710/forge
 dir.output=../ANT Output
 dir.temp=../temp
-file.version=./web/version.json
+file.version=./web/version.json

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Thu Mar 20 16:14:41 EDT 2014
+#Wed Jul 02 15:54:47 CDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME