diff --git a/build.gradle b/build.gradle index fcc99a357..1d653e168 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,10 @@ buildscript { } } +plugins { + id "com.matthewprenger.cursegradle" version "1.0.9" +} + apply plugin: 'scala' apply plugin: 'forge' apply plugin: 'idea' @@ -43,10 +47,11 @@ def getGitRef() { } } -if (System.getenv("BUILD_NUMBER") != null) +if (System.getenv("PROMOTED_NUMBER") != null) + version += ".${System.getenv("PROMOTED_NUMBER")}" +else if (System.getenv("BUILD_NUMBER") != null) version += ".${System.getenv("BUILD_NUMBER")}" - -if (System.getenv("BUILD_NUMBER") == null) +else version += "+" + getGitRef() ext.simpleVersion = version @@ -334,6 +339,18 @@ publishing { } } +curseforge { + apiKey = project.hasProperty("curseForgeApiKey") ? project.curseForgeApiKey : "" + project { + id = config.curse.project.id + releaseType = config.curse.project.releaseType + changelogType = "markdown" + changelog = file("changelog.md") + addGameVersion config.minecraft.version + addGameVersion "Java 8" + } +} + // this is needed for IntelliJ so we don't have to copy over the assets manually every time idea { module { diff --git a/build.properties b/build.properties index 336c6c93d..5f12a47a7 100644 --- a/build.properties +++ b/build.properties @@ -50,3 +50,6 @@ cofhcore.cf=2246/697 cofhcore.version=[1.7.10]3.0.3B4-302-dev maven.url=file:///home/www/maven.cil.li/web + +curse.project.id=223008 +curse.project.releaseType=release diff --git a/changelog.md b/changelog.md new file mode 100644 index 000000000..1957c0537 --- /dev/null +++ b/changelog.md @@ -0,0 +1,39 @@ +## New Features/Support +* **Changed: Diamond Chip recipe** + - You now require cutting wire to cut the diamond. +* Fixed: IC2-Classic mod incompatibility +* Added: Allow getting yaw of player through tablet component (ChristoCoder) +* Fixed: Microcontroller interactions with EnderIO item conduits +* Added: Maximum packet parts to device info of modems (Linked and Network Cards) +* Fixed: Drones now properly work with chunkloader upgrades (TheCodex6824) +* Fixed: Tablets not turning off their screen properly (AmandaCameron) +* Fixed: Motion Sensor line of sight +* Misc: Updated various translations + - Russian (S0ZDATEL, Fingercomp, makkarpov) + - Traditional Chinese (mymagadsl) + - German (Nex4rius) + +## OpenOS fixes/improvements +* Fixed: Issues with booting OpenOS on very slow servers +* Added: Allow custom error objects to print to stderr +* Added: Allow mount points to use existing directories +* Added: Bind mounts to mount a directory as another directory +* Fixed: Allow .shrc to use tty stdin +* **Added: Lua REPL input is now parsed with an implicit `return`** (SquidDev) + - Adding a `=` in front of the code to explicitly add it still works. +* Changed: Shell history no longer adds items if they are duplicates (SquidDev) +* Fixed: CTCP messages in IRC client (Michiyo, skyem123) +* Fixed: Reverse lookup of keys in Keyboard API +* Fixed: event.cancel and event.ignore +* Fixed: Protect lua shell from serialization OOM failure +* Fixed: Too long without yielding error in /bin/tree (LeshaInc) +* Misc: Improvements to the vt100 library +* Misc: Various minor improvements to reduce memory usage + +## List of contributors +payonel, Vexatos, +S0ZDATEL, Fingercomp, makkarpov, +mymagadsl, Nex4rius, ChristoCoder, +LeshaInc, SquidDev, Michiyo, +skyem123, TheCodex6824, +AmandaCameron, Pwootage