From 34372df11bfbe3336adca408adaebcd921d9417e Mon Sep 17 00:00:00 2001 From: Detrav Date: Sun, 10 Jul 2016 12:14:31 +0300 Subject: Update dependencies --- .classpath | 82 ++++++++++++++++++++++++++++++++++++ .project | 22 ++++++++++ .settings/org.eclipse.jdt.core.prefs | 13 ++++++ build.gradle | 16 ++++--- build.properties | 4 +- gradlew-eclipse.bat | 1 + 6 files changed, 130 insertions(+), 8 deletions(-) create mode 100644 .classpath create mode 100644 .project create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 gradlew-eclipse.bat diff --git a/.classpath b/.classpath new file mode 100644 index 0000000000..15f7cbed06 --- /dev/null +++ b/.classpath @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000000..f3627680bb --- /dev/null +++ b/.project @@ -0,0 +1,22 @@ + + + DetravScannerMod + + + + org.eclipse.jdt.core.javanature + + + + org.eclipse.jdt.core.javabuilder + + + + + + .link1 + 2 + C:/Users/wital_000/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/start + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..3a9a8e8ca8 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,13 @@ +# +#Sun Jul 10 12:13:28 MSK 2016 +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error diff --git a/build.gradle b/build.gradle index 670e9b8f42..0cd0f45d8f 100644 --- a/build.gradle +++ b/build.gradle @@ -84,18 +84,22 @@ repositories { } dependencies { - //provided ("appeng:appliedenergistics2:${config.ae2.version}:dev") { exclude module: '*' } + provided ("appeng:appliedenergistics2:${config.ae2.version}:dev") { + exclude module: '*' + } provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:dev" - provided "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev" + provided "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev" provided "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev" provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev" provided "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:dev" provided "applecore:AppleCore:${config.applecore.version}:api" - //provided "com.enderio.core:EnderCore:${config.enderiocore.version}:dev" - //provided ("com.enderio:EnderIO:${config.enderio.version}:dev") {transitive = false } + provided "com.enderio.core:EnderCore:${config.enderiocore.version}:dev" + provided ("com.enderio:EnderIO:${config.enderio.version}:dev") { + transitive = false + } provided name: 'buildcraft', version: config.buildcraft.version, classifier: "dev", ext: 'jar' - //provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' - //provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' + provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' + provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' provided name: 'Railcraft', version: config.railcraft.version, ext: 'jar' provided name: 'IC2NuclearControl', version: config.nc.version, ext: 'jar' } diff --git a/build.properties b/build.properties index c5e4c40ca2..dbf97f35dd 100644 --- a/build.properties +++ b/build.properties @@ -16,8 +16,8 @@ enderio.cf=2219/296 enderio.version=1.7.10-2.3.0.417_beta enderiocore.version=1.7.10-0.1.0.25_beta forestry.version=4.2.10.58 -ic2.version=2.2.806-experimental -nei.version=1.0.5.120 +ic2.version=2.2.790-experimental +nei.version=1.0.3.57 railcraft.cf=2219/321 railcraft.version=1.7.10-9.4.0.0 nc.cf=2275/987 diff --git a/gradlew-eclipse.bat b/gradlew-eclipse.bat new file mode 100644 index 0000000000..a1a90a1d90 --- /dev/null +++ b/gradlew-eclipse.bat @@ -0,0 +1 @@ +gradlew eclipse \ No newline at end of file -- cgit