From 137749c38a4c08a355136ad03c57b952059e9887 Mon Sep 17 00:00:00 2001
From: KryptonCaptain <cjalcorn.s446@gmail.com>
Date: Sat, 8 Apr 2017 21:20:17 +1000
Subject: [PATCH] fix1

# Conflicts:
# 	gradle/wrapper/gradle-wrapper.properties
---
 build.gradle                             | 2 +-
 build.properties                         | 8 ++++----
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 remake.sh                                | 4 ----
 4 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100755 remake.sh

diff --git a/build.gradle b/build.gradle
index 4d9d74fa..6bed347c 100644
--- a/build.gradle
+++ b/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")
diff --git a/build.properties b/build.properties
index 891076e8..1d1de169 100644
--- a/build.properties
+++ b/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
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 678d9d8d..6cfaa60e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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
diff --git a/remake.sh b/remake.sh
deleted file mode 100755
index 580c2654..00000000
--- a/remake.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-gradle clean cleanCache --refresh-dependencies
-gradle setupDecompWorkspace
-gradle idea --assetIndex
-gradle genIntellijRuns