From a7632e767d196ce3fe5b4d3d222fd0d93aafda89 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Thu, 19 Jan 2023 21:09:42 +0000 Subject: [PATCH 1/5] Run credits update script for release 0.82 --- mods/HUD/mcl_credits/people.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mods/HUD/mcl_credits/people.lua b/mods/HUD/mcl_credits/people.lua index 5f4eda17d..d9ee02742 100644 --- a/mods/HUD/mcl_credits/people.lua +++ b/mods/HUD/mcl_credits/people.lua @@ -37,6 +37,7 @@ return { "MrRar", "talamh", "Faerraven / Michieal", + "FossFanatic", }}, {S("Contributors"), 0x52FF00, { "Laurent Rocher", @@ -96,6 +97,9 @@ return { "anarquimico", "TheOnlyJoeEnderman", "Ranko Saotome", + "Gregor Parzefall", + "Wbjitscool", + "b3nderman", }}, {S("MineClone5"), 0xA60014, { "kay27", @@ -168,6 +172,7 @@ return { "RandomLegoBrick", "cora", "Faerraven / Michieal", + "Nicu", }}, {S("Translations"), 0x00FF60, { "Wuzzy", @@ -181,9 +186,12 @@ return { "Emojigit", "snowyu", "3raven", + "SakuraRiu", }}, {S("Funders"), 0xF7FF00, { "40W", + "bauknecht", + "Cora", }}, {S("Special thanks"), 0x00E9FF, { "celeron55 for creating Minetest", @@ -191,5 +199,6 @@ return { "wsor for working tirelessly in the shadows for the good of all of us, particularly helping with solving contentDB and copyright issues.", "The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game", "Notch and Jeb for being the major forces behind Minecraft", + "Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/", }}, } From 383cbf96a673ca26ba5938a377deef1606d5a308 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Thu, 19 Jan 2023 21:51:16 +0000 Subject: [PATCH 2/5] Pre-release set version 0.82.0 --- README.md | 2 -- RELEASE.md | 13 +++++++------ game.conf | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index f69647efe..2ff2ef101 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ An unofficial Minecraft-like game for Minetest. Forked from MineClone by davedevils. Developed by many people. Not developed or endorsed by Mojang AB. -Version: 0.82 (in development) - ### Gameplay You start in a randomly-generated world made entirely of cubes. You can explore the world and dig and build almost every block in the world to create new diff --git a/RELEASE.md b/RELEASE.md index 01eb71e7f..140a8a1f4 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -8,12 +8,13 @@ lua tools/generate_ingame_credits.lua git add CREDITS.md git add mods/HUD/mcl_credits/people.lua -git add README.md -# To uncomment when applicable -#git add game.conf +#Should not be needed anymore as version is going to be kept in game.conf +#git add README.md +git add game.conf +git add RELEASE.md -git commit -m "Pre-release update credits and set version 0.81.1" +git commit -m "Pre-release update credits and set version 0.82.0" -git tag 0.81.1 +git tag 0.82.0 -git push origin 0.81.1 \ No newline at end of file +git push origin 0.82.0 \ No newline at end of file diff --git a/game.conf b/game.conf index 1fa1d6671..cd3cdffb1 100644 --- a/game.conf +++ b/game.conf @@ -1,4 +1,4 @@ title = MineClone 2 description = A survival sandbox game. Survive, gather, hunt, build, explore, and do much more. disallowed_mapgens = v6 -version=MCL2-0.82-indev \ No newline at end of file +version=0.82.0 \ No newline at end of file From 683799aea5391e0ee62652482e8943e24ff31176 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Thu, 19 Jan 2023 21:54:01 +0000 Subject: [PATCH 3/5] Update release steps --- RELEASE.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 140a8a1f4..79fbee69c 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,17 +1,15 @@ #File to document release steps with a view to evolving into a script #Update CREDITS.md -#Update version in README.md (soon to be game.conf from of 0.82.0) +#Update version in game.conf lua tools/generate_ingame_credits.lua git add CREDITS.md git add mods/HUD/mcl_credits/people.lua - -#Should not be needed anymore as version is going to be kept in game.conf -#git add README.md git add game.conf -git add RELEASE.md + +#git add RELEASE.md git commit -m "Pre-release update credits and set version 0.82.0" From 62be5a06f6b67a9ddd7171bb676e077a46306b27 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Thu, 19 Jan 2023 22:22:48 +0000 Subject: [PATCH 4/5] Update release notes --- RELEASE.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 79fbee69c..23ba00336 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -15,4 +15,8 @@ git commit -m "Pre-release update credits and set version 0.82.0" git tag 0.82.0 -git push origin 0.82.0 \ No newline at end of file +git push origin 0.82.0 + +#Update version in game.conf to -SNAPSHOT + +git commit -m "Post-release set version 0.82.0-SNAPSHOT" \ No newline at end of file From efd3420d52834a7150a0d0e156b7fe9ea137aff6 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Thu, 19 Jan 2023 23:34:04 +0000 Subject: [PATCH 5/5] Post-release set version 0.82.0-SNAPSHOT --- game.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game.conf b/game.conf index cd3cdffb1..b364f026f 100644 --- a/game.conf +++ b/game.conf @@ -1,4 +1,4 @@ title = MineClone 2 description = A survival sandbox game. Survive, gather, hunt, build, explore, and do much more. disallowed_mapgens = v6 -version=0.82.0 \ No newline at end of file +version=0.82.0-SNAPSHOT \ No newline at end of file