diff --git a/build.gradle b/build.gradle index 9da4415e7..b823113d2 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ sourceSets { main { java { srcDirs 'src/main/java', 'archaic/src/main/java', 'electrical/src/main/java', 'mechanical/src/main/java' - exclude 'resonantinduction/core/nei/**' + //exclude 'resonantinduction/core/nei/**' } } } @@ -82,21 +82,22 @@ repositories { } ivy { - name 'FMP' - artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[revision].[ext]" + name 'FMP' + artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[revision].[ext]" } - - ivy { - name 'CB FS' - artifactPattern "http://www.chickenbones.craftsaddle.org/Files/New_Versions/1.6.4/[module]-dev%20[revision].[ext]" + + ivy { + artifactPattern "http://www.chickenbones.craftsaddle.org/Files/New_Versions/1.6.4/[module]-dev%20[revision].[ext]" } } + dependencies { compile group: 'universalelectricity', name: 'Universal-Electricity', version: "${config.version.universalelectricity}", classifier: "dev" compile group: 'calclaviacore', name: 'calclavia-core', version: "${config.version.calclaviacore}", classifier: "dev" compile name: 'CodeChickenLib', version: "${config.version.minecraft}-${config.version.cclib}", ext: 'jar' compile name: 'ForgeMultipart', version: "${config.version.minecraft}-${config.version.fmp}", ext: 'jar' - //compile name: 'NotEnoughItems', version: "${config.version.nei}", ext: 'jar' + //compile name: 'NotEnoughItems', version: "1.6.1.8", ext: 'jar' + compile name: 'NotEnoughItems', version: "${config.version.nei}", ext: 'jar' } publishing { diff --git a/build.properties b/build.properties index ee9666881..670ea740d 100644 --- a/build.properties +++ b/build.properties @@ -6,7 +6,7 @@ version.universalelectricity=3.1.+ version.calclaviacore=1.1.+ version.cclib=1.0.0.61 version.fmp=1.0.0.244 -version.nei=1.6.1.8 +version.nei=1.6.1.9 version.mod.major=0 version.mod.minor=3 version.mod.revis=1 \ No newline at end of file diff --git a/src/main/resources/assets/resonantinduction/models/pump.png b/src/main/resources/assets/resonantinduction/models/pump.png index 98cb3553c..717e09948 100644 Binary files a/src/main/resources/assets/resonantinduction/models/pump.png and b/src/main/resources/assets/resonantinduction/models/pump.png differ diff --git a/src/main/resources/assets/resonantinduction/models/pump.tcn b/src/main/resources/assets/resonantinduction/models/pump.tcn index b84fc5a83..b89ed18ff 100644 Binary files a/src/main/resources/assets/resonantinduction/models/pump.tcn and b/src/main/resources/assets/resonantinduction/models/pump.tcn differ