fix1

# Conflicts:
# 	gradle/wrapper/gradle-wrapper.properties

build.gradle

@@ -72,7 +72,7 @@ archivesBaseName = "ThaumicTinkerer"
 
 minecraft {
     version = "1.7.10-10.13.4.1614-1.7.10"
-    //minecraftVersion="1.7.2"
+    //minecraftVersion="1.7.10"
     runDir = "eclipse"
     replace '${version}', project.version
     //coreMod("tconstruct.preloader.TConstructLoaderContainer")

build.properties

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

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.10-all.zip

remake.sh

@@ -1,4 +0,0 @@
-gradle clean cleanCache --refresh-dependencies
-gradle setupDecompWorkspace
-gradle idea --assetIndex
-gradle genIntellijRuns