From 0f31cd43d25a23c0488db1f28200f153325d5bb4 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Mon, 6 Apr 2015 19:42:20 +0200 Subject: [PATCH] Deobfuscated version for Developers contains no dupes anymore --- build.gradle | 4 +--- gradle/scripts/integration.gradle | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 gradle/scripts/integration.gradle diff --git a/build.gradle b/build.gradle index 233010be..a7683c6a 100644 --- a/build.gradle +++ b/build.gradle @@ -22,6 +22,7 @@ apply from: 'gradle/scripts/propertyloader.gradle' apply from: 'gradle/scripts/dependencies.gradle' apply from: 'gradle/scripts/artifacts.gradle' apply from: 'gradle/scripts/autoinstallruntime.gradle' +apply from: 'gradle/scripts/integration.gradle' buildscript { repositories { @@ -103,9 +104,6 @@ sourceSets { "assets/appliedenergistics2/textures/models/*", "assets/appliedenergistics2/textures/items/*" } - - // IntelliJ and Gradle interaction bug - output.resourcesDir = output.classesDir } } diff --git a/gradle/scripts/integration.gradle b/gradle/scripts/integration.gradle new file mode 100644 index 00000000..c96f5316 --- /dev/null +++ b/gradle/scripts/integration.gradle @@ -0,0 +1,7 @@ +apply plugin: 'idea' + +idea { + module { + inheritOutputDirs = true + } +} \ No newline at end of file