From 4f8d82ae387c2414810b03c34bcffecd873e70d1 Mon Sep 17 00:00:00 2001 From: Dragon2488 Date: Thu, 15 Jun 2017 22:19:02 +0700 Subject: [PATCH] removed old dependencies, added railcraft, ic2 nuclear control (worldcontrol now) and cofhcore back. --- build.gradle | 48 ++++++------------------ build.properties | 24 ++++-------- gradle/wrapper/gradle-wrapper.properties | 4 +- 3 files changed, 21 insertions(+), 55 deletions(-) diff --git a/build.gradle b/build.gradle index 42c3cd3b..7498cdfe 100644 --- a/build.gradle +++ b/build.gradle @@ -47,61 +47,35 @@ repositories { name = "ic2, forestry" url = "http://maven.ic2.player.to/" } - maven { // EnderIO & EnderCore - name 'tterrag Repo' - url "http://maven.tterrag.com" - } - maven { // AppleCore - url "http://www.ryanliptak.com/maven/" - } maven { //JEI url "http://dvs1.progwml6.com/files/maven/" } - ivy { - name "BuildCraft" - artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]" - } - ivy { - name 'CoFHLib' - artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhlib.cf}/[module]-[revision].[ext]" - } - ivy { - name 'CoFHCore' - artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhcore.cf}/[module]-[revision].[ext]" - } ivy { name 'Railcraft' artifactPattern "http://addons-origin.cursecdn.com/files/${config.railcraft.cf}/[module]_[revision].[ext]" } ivy { - name 'IC2NuclearControl' - artifactPattern "http://addons-origin.cursecdn.com/files/${config.nc.cf}/[module]-[revision].[ext]" + name 'WorldControl' + artifactPattern "http://addons-origin.cursecdn.com/files/${config.worldcontrol.cf}/[module]-[revision].[ext]" + } + ivy { + name 'CoFHCore' + artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofh.cf}/[module]-[revision].[ext]" } } dependencies { - //provided ("appeng:appliedenergistics2:${config.ae2.version}:dev") { - // exclude module: '*' - //} - provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:deobf" - //provided "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev" - //provided "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev" + compile "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:deobf" deobfCompile "net.industrial-craft:industrialcraft-2:${config.ic2.version}" deobfCompile "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}" deobfCompile "mezz.jei:jei_${config.minecraft.version}:+" - //provided "applecore:AppleCore:${config.applecore.version}:api" - //provided "com.enderio.core:EnderCore:${config.enderiocore.version}:dev" - //provided ("com.enderio:EnderIO:${config.enderio.version}:dev") { - // transitive = false - //} - //provided name: 'buildcraft', version: config.buildcraft.version, classifier: "dev", ext: 'jar' - //provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' - //provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' - //provided name: 'Railcraft', version: config.railcraft.version, ext: 'jar' - //provided name: 'IC2NuclearControl', version: config.nc.version, ext: 'jar' + deobfCompile name: 'Railcraft', version: config.railcraft.version, ext: 'jar' + deobfCompile name: 'worldcontrol', version: config.worldcontrol.version, ext: 'jar' + deobfCompile name: 'CoFHCore', version: config.cofh.version, ext: 'jar' } jar.exclude("**.bat") +jar.exclude("**.sh") sourceCompatibility = "1.8" targetCompatibility = "1.8" diff --git a/build.properties b/build.properties index 5e82884d..f54598a7 100644 --- a/build.properties +++ b/build.properties @@ -8,19 +8,11 @@ ic2.version=2.6.167-ex110 jei.version=3.7.10.237 codechickenlib.version=2.4.3.162 -enderio.cf=2219/296 -enderio.version=1.7.10-2.3.0.417_beta -enderiocore.version=1.7.10-0.1.0.25_beta -ae2.version=rv2-beta-33 -applecore.version=1.7.10-1.2.1+107.59407 -buildcraft.version=7.1.11 -codechickencore.version=1.0.7.47 -cofhcore.cf=2246/920 -cofhcore.version=[1.7.10]3.0.3-303-dev -cofhlib.cf=2246/918 -cofhlib.version=[1.7.10]1.0.3-175-dev -nei.version=1.0.3.57 -railcraft.cf=2219/321 -railcraft.version=1.7.10-9.4.0.0 -nc.cf=2275/987 -nc.version=2.3.4a +railcraft.cf=2419/257 +railcraft.version=1.10.2-10.1.2 + +worldcontrol.cf=2407/481 +worldcontrol.version=1.0.1a + +cofh.cf=2434/463 +cofh.version=1.10.2-4.1.3.5-universal \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9397848f..36d97f6e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 14 12:28:28 PDT 2015 +#Sun Jun 11 18:36:34 KRAT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip