diff --git a/build.gradle b/build.gradle index 18e2e0553..ad00838f7 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() maven { name = "forge" - url = "https://files.minecraftforge.net/maven" + url = "https://maven.minecraftforge.net/" } } dependencies { @@ -13,15 +13,15 @@ buildscript { } plugins { - id "com.matthewprenger.cursegradle" version "1.0.9" + id "com.matthewprenger.cursegradle" version "1.4.0" } apply plugin: 'scala' apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'maven-publish' -sourceCompatibility = JavaVersion.VERSION_1_7 -targetCompatibility = JavaVersion.VERSION_1_7 +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 file "build.properties" withReader { def prop = new Properties() @@ -69,6 +69,10 @@ minecraft { repositories { maven { url "https://maven.cil.li/" } maven { url "https://minecraft.curseforge.com/api/maven/" } + ivy { + name 'asie dependency mirror' + artifactPattern "http://asie.pl/javadeps/[module]-[revision](-[classifier]).[ext]" + } } configurations { @@ -77,7 +81,7 @@ configurations { } dependencies { - deobfCompile ("li.cil.tis3d:TIS-3D:MC1.12-${config.tis3d.version}") { + deobfCompile ("li.cil.tis3d:TIS-3D:${config.tis3d.version}") { exclude module: "jei_1.12" } deobfCompile "com.mod-buildcraft:buildcraft-api:${config.buildcraft.version}" @@ -87,10 +91,11 @@ dependencies { } deobfCompile "net.industrial-craft:industrialcraft-2:${config.ic2.version}" deobfCompile "mcp.mobius.waila:Hwyla:${config.hwyla.version}:api" - deobfCompile "dan200.computercraft:ComputerCraft:${config.cc.version}" + /* deobfCompile "dan200.computercraft:ComputerCraft:${config.cc.version}" */ + deobfCompile name: "cc-tweaked", version: "${config.cctweaked.version}" deobfCompile "charset:Charset:${config.charset.version}:api" - provided ("appeng:appliedenergistics2:${config.ae2.version}:api") { + provided ("appeng:appliedenergistics2:${config.ae2.version}") { transitive = false } provided "extracells2:ExtraCells-api:${config.extracells.version}" @@ -225,5 +230,6 @@ curseforge { changelog = file("changelog.md") addGameVersion config.minecraft.version addGameVersion "Java 8" + addGameVersion "Forge" } } diff --git a/build.properties b/build.properties index 790da7a9f..ce6921390 100644 --- a/build.properties +++ b/build.properties @@ -6,19 +6,20 @@ mod.name=OpenComputers mod.group=li.cil.oc mod.version=1.7.5 -ae2.version=rv6-stable-5 -buildcraft.version=7.99.17 +ae2.version=rv6-stable-7 +buildcraft.version=7.99.24.8 cc.version=1.80pr1-build0 +cctweaked.version=1.12.2-1.89.2 charset.version=0.5.6.2 extracells.version=1.12.2:2.5.3a25 -forestry.version=5.8.0.311 +forestry.version=5.8.2.422 hwyla.version=1.8.26-B41_1.12.2 -ic2.version=2.8.91-ex112 -jei.version=4.15.0.268 +ic2.version=2.8.221-ex112 +jei.version=4.16.1.302 mcmp.version=2.5.1_66 -mekanism.version=1.12.2-9.4.3.330 -tis3d.version=1.3.1.18 -projred.version=1.12.2-4.9.3.118 +mekanism.version=1.12.2-9.8.3.390 +tis3d.version=MC1.12.2-1.5.1.39 +projred.version=1.12.2-4.9.4.120 mrtjpcore.version=1.12.2-2.1.4.43 ccl.version=3.2.3.358 forgemultipart.version=2.6.2.83 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2d80b69a7..a95009c3b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists