Merge pull request #1225 from thatsIch/b-dev-jar-duplicates

Deobfuscated version for Developers contains no dupes anymore
2015-04-06 20:31:48 +02:00
parent aac2b598ea 0f31cd43d2
commit 7382897e8e
2 changed files with 8 additions and 3 deletions
@@ -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
    }
 }

@@ -0,0 +1,7 @@
+apply plugin: 'idea'
+
+idea {
+    module {
+        inheritOutputDirs = true
+    }
+}