From 3ed3f167021c18ee111f89dd6274c2275e173d46 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Sat, 15 Apr 2023 12:25:17 +0100 Subject: [PATCH 1/2] Pre-release update credits and set version 0.83.0 --- CONTRIBUTING.md | 2 +- CREDITS.md | 8 +++----- RELEASE.md | 10 +++++----- game.conf | 2 +- mods/HUD/mcl_credits/people.lua | 17 ++++++++++++----- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dc8c4a5ee..b5a11ee1e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -76,7 +76,7 @@ in singleplayer, post a screenshot of the message that Minetest showed when the crash happened (or copy the message into your issue). If you are a server admin, you can find error messages in the log file of the server. -* Tell us which MineClone2 and Minetest versions you are using. +* Tell us which MineClone2 and Minetest versions you are using (from Minetest 5.7 type /ver, for previous versions, check the game.conf or README.md file). * Tell us how to reproduce the problem: What you were doing to trigger the bug, e.g. before the crash happened or what causes the faulty behavior. diff --git a/CREDITS.md b/CREDITS.md index c1307a3bc..7296e52a7 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -36,7 +36,8 @@ * MrRar * talamh * Faerraven / Michieal -* FossFanatic +* FossFanatic +* SmokeyDope ## Contributors * Laurent Rocher @@ -81,15 +82,12 @@ * aldum * Dieter44 * Pepebotella -* MrRar * Lazerbeak12345 * mrminer * Thunder1035 * opfromthestart * snowyu * FaceDeer -* Faerraven / Michieal -* FossFanatic * Herbert West * GuyLiner * 3raven @@ -101,8 +99,8 @@ * b3nderman * CyberMango * gldrk -* SmokeyDope * atomdmac +* emptyshore ## MineClone5 * kay27 diff --git a/RELEASE.md b/RELEASE.md index 144e1729a..4d82ab9e3 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -13,15 +13,15 @@ git add game.conf #git add RELEASE.md -git commit -m "Pre-release update credits and set version 0.82.0" +git commit -m "Pre-release update credits and set version 0.83.0" -git tag 0.82.0 +git tag 0.83.0 -git push origin 0.82.0 +git push origin 0.83.0 -#Update version in game.conf to -SNAPSHOT +#Update version in game.conf to the next version with -SNAPSHOT suffix -git commit -m "Post-release set version 0.82.0-SNAPSHOT" +git commit -m "Post-release set version 0.84.0-SNAPSHOT" ### Hotfix Release diff --git a/game.conf b/game.conf index b364f026f..023ac5747 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-SNAPSHOT \ No newline at end of file +version=0.83.0 \ No newline at end of file diff --git a/mods/HUD/mcl_credits/people.lua b/mods/HUD/mcl_credits/people.lua index d9ee02742..26b80927d 100644 --- a/mods/HUD/mcl_credits/people.lua +++ b/mods/HUD/mcl_credits/people.lua @@ -37,7 +37,8 @@ return { "MrRar", "talamh", "Faerraven / Michieal", - "FossFanatic", + "FossFanatic ", + "SmokeyDope", }}, {S("Contributors"), 0x52FF00, { "Laurent Rocher", @@ -82,15 +83,12 @@ return { "aldum", "Dieter44", "Pepebotella", - "MrRar", "Lazerbeak12345", "mrminer", "Thunder1035", "opfromthestart", "snowyu", "FaceDeer", - "Faerraven / Michieal", - "FossFanatic", "Herbert West", "GuyLiner", "3raven", @@ -100,6 +98,10 @@ return { "Gregor Parzefall", "Wbjitscool", "b3nderman", + "CyberMango", + "gldrk", + "atomdmac", + "emptyshore", }}, {S("MineClone5"), 0xA60014, { "kay27", @@ -187,6 +189,8 @@ return { "snowyu", "3raven", "SakuraRiu", + "anarquimico", + "syl", }}, {S("Funders"), 0xF7FF00, { "40W", @@ -199,6 +203,9 @@ 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/", + "Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube) and Traitor (horizonchris96), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/", + "Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0)", + "Exhale & Tim Unwin for some wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom, Farmer (License CC BY-SA 4.0)", + "Diminixed for 3 fantastic tracks and remastering and leveling volumes. Songs: Afternoon Lullaby (pianowtune02), Spooled (ambientwip02), Never Grow Up (License CC BY-SA 4.0)", }}, } From 0de9685914677b611a7cf75380eaab04c8cc94b3 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Sat, 15 Apr 2023 12:28:27 +0100 Subject: [PATCH 2/2] Post-release set version 0.84.0-SNAPSHOT --- game.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game.conf b/game.conf index 023ac5747..a7716f284 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.83.0 \ No newline at end of file +version=0.84.0-SNAPSHOT \ No newline at end of file