diff --git a/Makefile b/Makefile index 0393610..4594403 100644 --- a/Makefile +++ b/Makefile @@ -102,8 +102,4 @@ dist: sanatize dist-check clean-all mod # repository that you cloned. sync-main-repo: sanatize @echo "Synchronising to github repository working tree ..." - @cd ../engineersdecor-github; rm -rf build documentation gradle meta scripts src - @cd ../engineersdecor-github; rm -f .gitignore build.gradle gradle.properties gradlew gradlew.bat license Makefile readme.md - @cp -r documentation gradle meta scripts src ../engineersdecor-github/ - @cp .gitignore build.gradle gradle.properties gradlew gradlew.bat license Makefile readme.md ../engineersdecor-github/ - @cd ../engineersdecor-github; git status -s + @djs scripts/sync-main-repo.js diff --git a/gradle.properties b/gradle.properties index e36c4ee..af0c148 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.daemon=false org.gradle.jvmargs=-Xmx8G version_minecraft=1.12.2 version_forge=14.23.5.2768 -version_engineersdecor=1.0.0-b4 +version_engineersdecor=1.0.0 # # jar signing data loaded from signing.properties in the project root. # diff --git a/meta/update.json b/meta/update.json index d057ae1..3e4df43 100644 --- a/meta/update.json +++ b/meta/update.json @@ -1,13 +1,14 @@ { - "homepage": "https://www.curseforge.com/minecraft/mc-mods/redstone-gauges-and-switches/", + "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": { + "1.0.0": "[R] Release based on v1.0.0-b4", "1.0.0-b4": "[F] Fixed vanished recipe for the rebar concrete wall.\n[A] Concrete wall, material: IE concrete.", "1.0.0-b3": "[A] Textures of rebar concrete and treated wood table improved.\n[A] Added rebar concrete wall.", "1.0.0-b2": "[A] Added rebar concrete (steel reinforced, expensive, creeper-proof).", "1.0.0-b1": "[A] Initial structure.\n[A] Added clinker bricks and clinker brick stairs.\n[A] Added slag bricks and slag brick stairs.\n[A] Added metal rung ladder.\n[A] Added staggered metal steps ladder.\n[A] Added treated wood ladder.\n[A] Added treated wood pole.\n[A] Added treated wood table." }, "promos": { - "1.12.2-recommended": "", - "1.12.2-latest": "1.0.0-b4" + "1.12.2-recommended": "1.0.0", + "1.12.2-latest": "1.0.0" } } \ No newline at end of file diff --git a/readme.md b/readme.md index b743e8f..2c045f4 100644 --- a/readme.md +++ b/readme.md @@ -73,6 +73,10 @@ More to come slowly but steadily. ---- ## Revision history + ------------------------------------------------------------------- + - v1.0.0 [R] Release based on v1.0.0-b4 + ------------------------------------------------------------------- + - v1.0.0-b4 [F] Fixed vanished recipe for the rebar concrete wall. [A] Concrete wall, material: IE concrete. diff --git a/scripts/sync-main-repo.js b/scripts/sync-main-repo.js new file mode 100644 index 0000000..5144f5d --- /dev/null +++ b/scripts/sync-main-repo.js @@ -0,0 +1,16 @@ +#!/usr/bin/djs +"use strict"; +const main_repo_local = fs.realpath("../engineersdecor-github"); +if((!fs.chdir(fs.dirname(fs.realpath(sys.script))+"/..")) || (!fs.isdir(".git"))) throw new Error("Failed to switch to mod source directory."); +const test_repo_local = fs.cwd(); +if(main_repo_local == "") throw new Error("Main repository (real) path not found."); +if(fs.realpath(main_repo_local) == fs.realpath(test_repo_local)) throw new Error("This is already the main repository"); +if((!fs.chdir(main_repo_local)) || (!fs.isdir(".git"))) throw new Error("Failed to switch to main repository directory."); +if(fs.cwd().search("-github") < 0) throw new Error("Main repository is missing the '*-github' tag in the path name."); +sys.shell("rm -rf build documentation gradle meta scripts src") +sys.shell("rm -f .gitignore build.gradle gradle.properties gradlew gradlew.bat license Makefile readme.md") +if((!fs.chdir(test_repo_local)) || (!fs.isdir(".git"))) throw new Error("Failed to switch to local dev directory."); +sys.shell("cp -r documentation gradle meta scripts src " + main_repo_local + "/") +sys.shell("cp .gitignore build.gradle gradle.properties gradlew gradlew.bat license Makefile readme.md " + main_repo_local + "/") +if((!fs.chdir(main_repo_local)) || (!fs.isdir(".git"))) throw new Error("Failed to switch to main repository directory."); +print(sys.shell("git status -s")) diff --git a/scripts/task-update-json.js b/scripts/task-update-json.js index b3624cd..9923852 100644 --- a/scripts/task-update-json.js +++ b/scripts/task-update-json.js @@ -54,7 +54,7 @@ for(var ver in history) { latest_beta=ver; break; } for(var ver in history) if(ver.search(/(rc|b|a)/) < 0) { latest_release=ver; break; } var update_json = { - homepage: "https://www.curseforge.com/minecraft/mc-mods/redstone-gauges-and-switches/", + homepage: "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": history, promos: { "1.12.2-recommended": latest_release,