diff --git a/.gitignore b/.gitignore index 761de62d..2cd05922 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,6 @@ *.dmg *.gz *.iso -*.jar *.rar *.tar *.zip diff --git a/build.gradle b/build.gradle index d816f512..de2407c4 100644 --- a/build.gradle +++ b/build.gradle @@ -72,11 +72,8 @@ allprojects { } dependencies { - compile group: 'universalelectricity', name: 'Universal-Electricity', version: "${rootProject.config.version.universalelectricity}", classifier: "dev" - if (System.getenv().JOB_NAME != null && System.getenv().JOB_NAME == "Resonant-Induction-Development") - compile group: 'resonant-engine-development', name: 'resonant-engine', version: "${config.version.resonantengine}", classifier: "dev" - else - compile "codechicken:CodeChickenLib:${config.version.minecraft}-${config.version.cclib}:dev" + compile fileTree(dir: 'lib', include: '*.jar') + compile "codechicken:CodeChickenLib:${config.version.minecraft}-${config.version.cclib}:dev" compile "codechicken:ForgeMultipart:${config.version.minecraft}-${config.version.fmp}:dev" compile "codechicken:CodeChickenCore:${config.version.minecraft}-${config.version.cccore}:dev" compile "codechicken:NotEnoughItems:${config.version.minecraft}-${config.version.nei}:dev" @@ -140,16 +137,4 @@ import net.minecraftforge.gradle.tasks.dev.ChangelogTask import net.minecraftforge.gradle.common.Constants import net.minecraftforge.gradle.delayed.* -task createChangelog(type: ChangelogTask) { - def jobName = "${System.getenv().JOB_NAME}" - def buildNumber = "${System.getenv().BUILD_NUMBER}" - - setServerRoot(new DelayedString(project, 'http://ci.calclavia.com/')) - setJobName(new DelayedString(project, jobName.toString())); - setAuthName(new DelayedString(project, 'console_script')); - setAuthPassword(new DelayedString(project, '625d2ac53190be3422faa0c474fb299b')); - setTargetBuild({buildNumber.toString()}); - setOutput(new DelayedFile(project, 'output/' + jobName + "-${project.version}" + '-changelog' + '.txt')); -} - -build.dependsOn "apiZip", "copyBuildXml", "createChangelog" +build.dependsOn "apiZip", "copyBuildXml" diff --git a/lib/Resonant-Engine-1.2.0-core.jar b/lib/Resonant-Engine-1.2.0-core.jar new file mode 100644 index 00000000..b8949bd8 Binary files /dev/null and b/lib/Resonant-Engine-1.2.0-core.jar differ diff --git a/lib/Universal-Electricity-3.1.0-core.jar b/lib/Universal-Electricity-3.1.0-core.jar new file mode 100644 index 00000000..7782c1c0 Binary files /dev/null and b/lib/Universal-Electricity-3.1.0-core.jar differ