aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-10-11 21:11:15 +0200
committerGitHub <noreply@github.com>2019-10-11 21:11:15 +0200
commit8cb7b9c900e329dafb5ebc0e2cecf069208a470d (patch)
tree3829f18b183542df56b7ce9ed3f92a1671cc7b7a
parentd3f0b24afd94711786063bccaf7716c78402e8af (diff)
parent08ccc497fb99d0af2eaa999743a8024356f40be3 (diff)
downloadGT5-Unofficial-8cb7b9c900e329dafb5ebc0e2cecf069208a470d.tar.gz
GT5-Unofficial-8cb7b9c900e329dafb5ebc0e2cecf069208a470d.tar.bz2
GT5-Unofficial-8cb7b9c900e329dafb5ebc0e2cecf069208a470d.zip
Merge pull request #40 from bartimaeusnek/05PlatinumOverhaul
Gradle fix (#39) Former-commit-id: f054e0ec898bf390e76ea3ef6bfe5aca9b782728
-rw-r--r--build.gradle19
-rw-r--r--build.properties4
2 files changed, 17 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle
index af53e98bbf..2954d6f60d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -99,6 +99,17 @@ dependencies {
compileOnly "applecore:AppleCore:${config.applecore.version}:api"
compileOnly "com.enderio.core:EnderCore:${config.enderiocore.version}:dev"
compileOnly "com.enderio:EnderIO:${config.enderio.version}:dev"
+ compileOnly "com.enderio:EnderIO:${config.enderio.version}:dev"
+}
+
+task getRailCraft(type: Download) {
+ onlyIf {
+ !file("libs/Railcraft_1.7.10-9.12.2.0-dev.jar").exists()
+ }
+ src 'http://downloads.gtnewhorizons.com/Mods_for_Jenkins/Railcraft_1.7.10-9.12.2.0-dev.jar'
+ dest file("libs/Railcraft_1.7.10-9.12.2.0-dev.jar")
+ mustRunAfter "deobfBinJar"
+ mustRunAfter "repackMinecraft"
}
//task getGregTech(type: Download) {
@@ -111,10 +122,10 @@ dependencies {
// mustRunAfter "repackMinecraft"
//}
-//tasks.setupCIWorkspace.dependsOn getGregTech
-//tasks.setupDevWorkspace.dependsOn getGregTech
-//tasks.setupDecompWorkspace.dependsOn getGregTech
-//tasks.compileJava.dependsOn getGregTech
+tasks.setupCIWorkspace.dependsOn getRailCraft
+tasks.setupDevWorkspace.dependsOn getRailCraft
+tasks.setupDecompWorkspace.dependsOn getRailCraft
+tasks.compileJava.dependsOn getRailCraft
processResources
{
diff --git a/build.properties b/build.properties
index 91a4eb39d7..aa9a58c099 100644
--- a/build.properties
+++ b/build.properties
@@ -30,5 +30,5 @@ gregtech.version=5.09.32.36
gregtech.jenkinsbuild=143
applecore.version=1.7.10-3.1.1
galacticraft.version=1.7-3.0.12.504
-enderio.version=1.7.10-2.3.0.417_beta
-enderiocore.version=1.7.10-0.1.0.25_beta \ No newline at end of file
+enderio.version=1.7.10-2.3.0.429_beta
+enderiocore.version=1.7.10-0.2.0.39_beta \ No newline at end of file