diff --git a/build.gradle b/build.gradle index ad5c112cc..9ac51d962 100644 --- a/build.gradle +++ b/build.gradle @@ -89,7 +89,7 @@ if (ENV.BUILD_NUMBER) { } minecraft { - version = "1.12-14.21.0.2327" + version = "1.12-14.21.0.2335" mappings = "snapshot_20170615" replace "@MODVERSION@", project.version useDepAts = true @@ -111,7 +111,7 @@ dependencies { } deobfCompile "mezz.jei:jei_1.12:+" compile "mcp.mobius.waila:Hwyla:+" - compile "net.darkhax.tesla:Tesla:1.11-1.3.0.51:deobf" + compile "net.darkhax.tesla:Tesla-1.12:1.0.59:deobf" //1.11 updates //deobfCompile "slimeknights:TConstruct:1.10.2-2.5.3.jenkins384" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 115b642d9..681b6bb50 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c0e062b8d..79a59180c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jun 12 09:41:46 BST 2017 +#Mon Jun 19 11:12:24 BST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-rc-2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip diff --git a/gradlew b/gradlew index 4453ccea3..cccdd3d51 100755 --- a/gradlew +++ b/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " }