diff --git a/build.gradle b/build.gradle index f6348ef..c72912c 100644 --- a/build.gradle +++ b/build.gradle @@ -22,9 +22,9 @@ buildscript { apply plugin: 'scala' apply plugin: 'forge' -version = "1.2.0" -ext.bdlibver = "1.3.0.10" -ext.versuffix = "mc172" +version = "1.3.0" +ext.bdlibver = "1.4.0.2" +ext.versuffix = "mc1710" ext.apiVer = version if (project.hasProperty('buildnum')) { @@ -39,7 +39,7 @@ group = "net.bdew" archivesBaseName = "gendustry" minecraft { - version = "1.7.2-10.12.2.1126" + version = "1.7.10-10.13.0.1180" replace("BDLIB_VER", project.bdlibver) replace("GENDUSTRY_VER", project.version) replace("GENDUSTRY_APIVER", project.apiVer) @@ -67,12 +67,15 @@ repositories { dependencies { compile "net.bdew:bdlib:" + bdlibver - compile "codechicken:NotEnoughItems:1.7.2-1.0.1:dev" - compile "codechicken:CodeChickenLib:1.7.2-1.1.0.76:dev" - compile "com.mod-buildcraft:buildcraft:6.0.8:dev" - compile "net.industrial-craft:industrialcraft-2:2.1.470-experimental:api" - compile "net.sengir.forestry:forestry_1.7.2:2.4.1.22:api" - compile "mcp.mobius.waila:Waila:1.5.2a" + compile "codechicken:NotEnoughItems:1.7.10-1.0.2.15:dev" + compile "codechicken:CodeChickenLib:1.7.10-1.1.1.88:dev" + compile "com.mod-buildcraft:buildcraft:6.0.17:dev" + compile "net.industrial-craft:industrialcraft-2:2.2.509-experimental:api" + compile "net.sengir.forestry:forestry_1.7.10:2.4.2.30:api" + compile("mcp.mobius.waila:Waila:1.5.2a") { + // transitive dependency on 1.7.2 stuff causes problems + exclude group: "codechicken" + } compile "net.bdew.thirdparty:CoFHLib:R1.0.1:api" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3c7abdf..b761216 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 244a668..678d9d8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Mar 26 13:33:58 CDT 2014 +#Wed Jul 02 15:54:47 CDT 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip