.gitignore adapted. Build relay: removed develop branch dist dependency. Readme edited.

This commit is contained in:
stfwi 2020-08-02 17:13:45 +02:00
parent b9194062ab
commit e1e2221ae8
4 changed files with 17 additions and 14 deletions

1
.gitignore vendored
View file

@ -38,3 +38,4 @@ signing.*
_* _*
1.1* 1.1*
1.2* 1.2*
/assets-src

View file

@ -261,9 +261,7 @@
const expected_commit_version = modversion.replace(/[-]/g,"") + "-mc" + mcversion; const expected_commit_version = modversion.replace(/[-]/g,"") + "-mc" + mcversion;
if(!gittags.filter(function(s){return s.indexOf(expected_commit_version)>=0}).length) fails.push("No tag version on this commit matching the gradle properties version (should be v" + expected_commit_version + ")."); if(!gittags.filter(function(s){return s.indexOf(expected_commit_version)>=0}).length) fails.push("No tag version on this commit matching the gradle properties version (should be v" + expected_commit_version + ").");
if(((!constants.options.without_ref_repository_check)) && (git_remote.replace(/[\s]/g,"").indexOf(constants.reference_repository() + "(push)") < 0)) fails.push("Not the reference repository."); if(((!constants.options.without_ref_repository_check)) && (git_remote.replace(/[\s]/g,"").indexOf(constants.reference_repository() + "(push)") < 0)) fails.push("Not the reference repository.");
if(git_branch != "develop") { //if(git_branch != "develop") fails.push("Not a valid branch for dist. (branch:'"+git_branch+"', must be 'develop')");
fails.push("Not a valid branch for dist. (branch:'"+git_branch+"', must be 'develop')");
}
if(git_diff !== "") fails.push("Not everything committed to the GIT repository."); if(git_diff !== "") fails.push("Not everything committed to the GIT repository.");
return fails; return fails;
}; };

View file

@ -1,14 +1,15 @@
{ {
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"promos": { "promos": {
"1.12.2-recommended": "1.1.1", "1.12.2-recommended": "1.1.2",
"1.12.2-latest": "1.1.1", "1.12.2-latest": "1.1.2",
"1.14.4-recommended": "1.1.0", "1.14.4-recommended": "1.1.1",
"1.14.4-latest": "1.1.0", "1.14.4-latest": "1.1.1",
"1.15.2-recommended": "1.1.1", "1.15.2-recommended": "1.1.3",
"1.15.2-latest": "1.1.1" "1.15.2-latest": "1.1.3"
}, },
"1.12.2": { "1.12.2": {
"1.1.2": "[R] Maintenance release.\n[M] Lang file update zh_cn (PR#117, Moonisky).",
"1.1.1": "[R] Maintenance release.\n[F] Fixed Snow laying on Steel Mesh Fence (issue #107, thx TheTinyPebble).", "1.1.1": "[R] Maintenance release.\n[F] Fixed Snow laying on Steel Mesh Fence (issue #107, thx TheTinyPebble).",
"1.1.1-b1": "[F] Fixed java related startup problem (issue #103, thx madmax3004, erebus42, StormbringerGTX, teagan75).", "1.1.1-b1": "[F] Fixed java related startup problem (issue #103, thx madmax3004, erebus42, StormbringerGTX, teagan75).",
"1.1.0": "[R] Maintenance Release build v1.1.0. Changes: * Compatibility fixes. * E-Furnace speed selection bug fixed. * Block Placer improvements. ~ v1.1.0-b3 [/] Version skipped for 1.12.2.", "1.1.0": "[R] Maintenance Release build v1.1.0. Changes: * Compatibility fixes. * E-Furnace speed selection bug fixed. * Block Placer improvements. ~ v1.1.0-b3 [/] Version skipped for 1.12.2.",
@ -101,6 +102,7 @@
"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." "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."
}, },
"1.14.4": { "1.14.4": {
"1.1.1": "[R] Maintenance Release v1.1.1.\n[M] Lang file update zh_cn (PR#117, Moonisky).",
"1.1.0": "[R] Release build v1.1.0. Changes: * GUI button/slider tooltips added (1.5s delay). * IE Sheet Metal Slab Slices added. * Config options extended/updated. * Block Placer improvements. * Block Breaker drop trajectory improved. * Dense Grit Sand textures enhanced. * Pipe Valve redstone connector display fixes. * Compatibility bug fixes.\n[F] Block Placer also defers placements if falling item stacks are in front of it (thx Cid).", "1.1.0": "[R] Release build v1.1.0. Changes: * GUI button/slider tooltips added (1.5s delay). * IE Sheet Metal Slab Slices added. * Config options extended/updated. * Block Placer improvements. * Block Breaker drop trajectory improved. * Dense Grit Sand textures enhanced. * Pipe Valve redstone connector display fixes. * Compatibility bug fixes.\n[F] Block Placer also defers placements if falling item stacks are in front of it (thx Cid).",
"1.1.0-b3": "[F] Block Placer defers placements if collidable entities are in the way (issue #98, thx DrakoAlcarus).\n[M] Block Breaker item drop trajectories have lower speed (fall slightly straighter down).\n[M] Pipe Valves redstone connector also shown if the adjacent block can connect redstone in general.\n[F] Added Block verification during TE ticking in case devices are moved (issue #101, thx D0CTOR-ZED).", "1.1.0-b3": "[F] Block Placer defers placements if collidable entities are in the way (issue #98, thx DrakoAlcarus).\n[M] Block Breaker item drop trajectories have lower speed (fall slightly straighter down).\n[M] Pipe Valves redstone connector also shown if the adjacent block can connect redstone in general.\n[F] Added Block verification during TE ticking in case devices are moved (issue #101, thx D0CTOR-ZED).",
"1.1.0-b2": "[A] Added tooltips for buttons/settings in device GUIs (1.5s display delay).", "1.1.0-b2": "[A] Added tooltips for buttons/settings in device GUIs (1.5s display delay).",
@ -159,6 +161,8 @@
"1.0.7-b3": "[A] Initial 1.14.2 port of decorative blocks." "1.0.7-b3": "[A] Initial 1.14.2 port of decorative blocks."
}, },
"1.15.2": { "1.15.2": {
"1.1.3": "[M] Lang file update zh_cn (PR#117, Moonisky).\n[F] Fixed missing Dense Grit Dirt loot table (issue #124, thx vaelzan).",
"1.1.2": "[R] Maintenance release v1.1.2.\n[F] Fixed metal pole culling (issue #109).",
"1.1.1": "[R] Release build v1.1.1. Changes: * Dense Grit Dirt added. * Ceiling Edge Light added. * Iron Bulb Light added.", "1.1.1": "[R] Release build v1.1.1. Changes: * Dense Grit Dirt added. * Ceiling Edge Light added. * Iron Bulb Light added.",
"1.1.1-b1": "[A] Dense Grit Dirt added.\n[A] Ceiling Edge Light added.\n[A] Iron Bulb Light added.", "1.1.1-b1": "[A] Dense Grit Dirt added.\n[A] Ceiling Edge Light added.\n[A] Iron Bulb Light added.",
"1.1.0": "[R] Release build v1.1.0. Changes: * GUI button/slider tooltips added (1.5s delay). * IE Sheet Metal Slab Slices added. * Config options extended/updated. * Block Placer improvements. * Block Breaker drop trajectory improved. * Dense Grit Sand textures enhanced. * Pipe Valve redstone connector display fixes. * Compatibility bug fixes.\n[F] Block Placer also defers placements if falling item stacks are in front of it (thx Cid).", "1.1.0": "[R] Release build v1.1.0. Changes: * GUI button/slider tooltips added (1.5s delay). * IE Sheet Metal Slab Slices added. * Config options extended/updated. * Block Placer improvements. * Block Breaker drop trajectory improved. * Dense Grit Sand textures enhanced. * Pipe Valve redstone connector display fixes. * Compatibility bug fixes.\n[F] Block Placer also defers placements if falling item stacks are in front of it (thx Cid).",

View file

@ -205,12 +205,12 @@ More to come slowly but steadily.
- Bug reports: Yes, please let me know. Drop a mail or better open an issue - Bug reports: Yes, please let me know. Drop a mail or better open an issue
for the repository. for the repository.
- Translations: Please translate the 1.12 lang files if possible (because the - Translations: Please translate the 1.12 `lang` files in the branch `1.12`,
1.13+ JSON language files are automatically generated from these `.lang` and the 1.13+ JSON language files in the latest Mincraft version branch.
files - saves me a bit of work).
- Pull requests: Happily accepted. Please make sure that use the ***develop - Pull requests: Happily accepted. The branches on the github correspond to
branch*** for pull requests. The master branch is for release versions only. the Minecraft versions, normally the latest revision (e.g. branch `1.16`
is the latest 1.16.x version, branch `1.12` is 1.12.2).
I might merge the pull request locally if I'm ahead of the github repository, I might merge the pull request locally if I'm ahead of the github repository,
we will communicate this in the pull request thread then. we will communicate this in the pull request thread then.