Merge pull request 'release/0.83' (#3644) from release/0.83 into master

Reviewed-on: MineClone2/MineClone2#3644
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>

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.

CREDITS.md

@@ -37,6 +37,7 @@
 * talamh
 * Faerraven / Michieal
 * 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

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
 

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
+version=0.84.0-SNAPSHOT

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)",
 	}},
 }