Also removed excludes of readded integration to fix build.

That, and merging be hard.
This commit is contained in:
Florian Nücke 2016-07-18 19:31:31 +02:00
parent 809d2a433f
commit 42f47fa228

View File

@ -99,7 +99,7 @@ repositories {
maven { maven {
name = "chickenbones" name = "chickenbones"
url = "http://chickenbones.net/maven/" url = "http://chickenbones.net/maven/"
}*/ }
maven { maven {
name = "IGW" name = "IGW"
url = "http://maven.k-4u.nl/" url = "http://maven.k-4u.nl/"
@ -263,11 +263,9 @@ sourceSets {
exclude 'li/cil/oc/integration/forestry/**' exclude 'li/cil/oc/integration/forestry/**'
exclude 'li/cil/oc/integration/gc/**' exclude 'li/cil/oc/integration/gc/**'
exclude 'li/cil/oc/integration/gregtech/**' exclude 'li/cil/oc/integration/gregtech/**'
exclude 'li/cil/oc/integration/igw/**'
exclude 'li/cil/oc/integration/mekanism/**' exclude 'li/cil/oc/integration/mekanism/**'
exclude 'li/cil/oc/integration/mfr/**' exclude 'li/cil/oc/integration/mfr/**'
exclude 'li/cil/oc/integration/mystcraft/**' exclude 'li/cil/oc/integration/mystcraft/**'
exclude 'li/cil/oc/integration/nei/**'
exclude 'li/cil/oc/integration/nek/**' exclude 'li/cil/oc/integration/nek/**'
exclude 'li/cil/oc/integration/poweradvantage/**' exclude 'li/cil/oc/integration/poweradvantage/**'
exclude 'li/cil/oc/integration/projectred/**' exclude 'li/cil/oc/integration/projectred/**'
@ -279,7 +277,6 @@ sourceSets {
exclude 'li/cil/oc/integration/thaumcraft/**' exclude 'li/cil/oc/integration/thaumcraft/**'
exclude 'li/cil/oc/integration/thermalexpansion/**' exclude 'li/cil/oc/integration/thermalexpansion/**'
exclude 'li/cil/oc/integration/thaumicenergistics/**' exclude 'li/cil/oc/integration/thaumicenergistics/**'
exclude 'li/cil/oc/integration/tis3d/**'
exclude 'li/cil/oc/integration/tmechworks/**' exclude 'li/cil/oc/integration/tmechworks/**'
exclude 'li/cil/oc/integration/waila/**' exclude 'li/cil/oc/integration/waila/**'
exclude 'li/cil/oc/integration/wrcbe/**' exclude 'li/cil/oc/integration/wrcbe/**'