Merge pull request #1225 from thatsIch/b-dev-jar-duplicates
Deobfuscated version for Developers contains no dupes anymore
This commit is contained in:
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/dependencies.gradle'
|
||||||
apply from: 'gradle/scripts/artifacts.gradle'
|
apply from: 'gradle/scripts/artifacts.gradle'
|
||||||
apply from: 'gradle/scripts/autoinstallruntime.gradle'
|
apply from: 'gradle/scripts/autoinstallruntime.gradle'
|
||||||
|
apply from: 'gradle/scripts/integration.gradle'
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
|
@ -103,9 +104,6 @@ sourceSets {
|
||||||
"assets/appliedenergistics2/textures/models/*",
|
"assets/appliedenergistics2/textures/models/*",
|
||||||
"assets/appliedenergistics2/textures/items/*"
|
"assets/appliedenergistics2/textures/items/*"
|
||||||
}
|
}
|
||||||
|
|
||||||
// IntelliJ and Gradle interaction bug
|
|
||||||
output.resourcesDir = output.classesDir
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
7
gradle/scripts/integration.gradle
Normal file
7
gradle/scripts/integration.gradle
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
apply plugin: 'idea'
|
||||||
|
|
||||||
|
idea {
|
||||||
|
module {
|
||||||
|
inheritOutputDirs = true
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue