From 0a698d92c3dc94057af9c4b83712593cf66c10eb Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Thu, 16 Mar 2023 13:49:49 +0100
Subject: [PATCH] Update credits tab and mailmap

---
 .mailmap                       |  9 ++++++--
 builtin/mainmenu/tab_about.lua | 40 +++++++++++++++++++++-------------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/.mailmap b/.mailmap
index 76190d078..164c285c0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -37,7 +37,7 @@ numzero <numzer0@yandex.ru> <silverunicorn2011@yandex.ru>
 Jean-Patrick Guerrero <kilbith@users.noreply.github.com>
 Jean-Patrick Guerrero <kilbith@users.noreply.github.com> <jeanpatrick.guerrero@gmail.com>
 HybridDog <3192173+HybridDog@users.noreply.github.com> <ovvv@web.de>
-srfqi <muhammadrifqipriyosusanto@gmail.com>
+srifqi <muhammadrifqipriyosusanto@gmail.com>
 Dániel Juhász <juhdanad@gmail.com>
 rubenwardy <rw@rubenwardy.com>
 rubenwardy <rw@rubenwardy.com> <rubenwardy@gmail.com>
@@ -48,7 +48,8 @@ ClobberXD <ClobberXD@gmail.com> <ClobberXD@protonmail.com>
 ClobberXD <ClobberXD@gmail.com> <36130650+ClobberXD@users.noreply.github.com>
 Auke Kok <sofar+github@foo-projects.org>
 Auke Kok <sofar+github@foo-projects.org> <sofar@foo-projects.org>
-Desour <vorunbekannt75@web.de>
+DS <ds.desour@proton.me>
+DS <ds.desour@proton.me> <vorunbekannt75@web.de>
 Nathanaëlle Courant <Ekdohibs@users.noreply.github.com> <nathanael.courant@laposte.net>
 Ezhh <owlecho@live.com>
 paramat <paramat@users.noreply.github.com>
@@ -67,3 +68,7 @@ gregorycu <gregory.currie@gmail.com>
 Rogier <rogier777@gmail.com>
 Rogier <rogier777@gmail.com> <Rogier-5@users.noreply.github.com>
 x2048 <codeforsmile@gmail.com>
+Lars Müller <appgurulars@gmx.de>
+Lars Müller <appgurulars@gmx.de> <34514239+appgurueu@users.noreply.github.com>
+ROllerozxa <rollerozxa@voxelmanip.se>
+ROllerozxa <rollerozxa@voxelmanip.se> <temporaryemail4meh+github@gmail.com>
diff --git a/builtin/mainmenu/tab_about.lua b/builtin/mainmenu/tab_about.lua
index 609b0cb71..dc74ae728 100644
--- a/builtin/mainmenu/tab_about.lua
+++ b/builtin/mainmenu/tab_about.lua
@@ -27,34 +27,34 @@ local core_developers = {
 	"Krock/SmallJoker <mk939@ymail.com>",
 	"Lars Hofhansl <larsh@apache.org>",
 	"v-rob <robinsonvincent89@gmail.com>",
-	"hecks",
 	"Hugues Ross <hugues.ross@gmail.com>",
 	"Dmitry Kostenko (x2048) <codeforsmile@gmail.com>",
+	"Desour",
 }
 
+-- currently only https://github.com/orgs/minetest/teams/triagers/members
+
 local core_team = {
 	"Zughy [Issue triager]",
+	"wsor [Issue triager]",
+	"Hugo Locurcio (Calinou) [Issue triager]",
 }
 
 -- For updating active/previous contributors, see the script in ./util/gather_git_credits.py
 
 local active_contributors = {
 	"Wuzzy [Features, translations, devtest]",
-	"Lars Müller [Lua optimizations and fixes]",
-	"Jude Melton-Houghton [Optimizations, bugfixes]",
-	"paradust7 [Performance, fixes, Irrlicht refactoring]",
-	"Desour [Fixes]",
-	"ROllerozxa [Main menu]",
-	"savilli [Bugfixes]",
+	"Lars Müller [Bugfixes and entity features]",
+	"paradust7 [Bugfixes]",
+	"ROllerozxa [Bugfixes, Android]",
+	"srifqi [Android, translations]",
 	"Lexi Hale [Particlespawner animation]",
-	"Liso [Shadow Mapping]",
-	"JosiahWI [Fixes, build system]",
-	"numzero [Graphics and rendering]",
-	"HybridDog [Fixes]",
-	"NeroBurner [Joystick]",
-	"pecksin [Clickable web links]",
+	"savilli [Bugfixes]",
+	"fluxionary [Bugfixes]",
+	"Gregor Parzefall [Bugfixes]",
+	"Abdou-31 [Documentation]",
+	"pecksin [Bouncy physics]",
 	"Daroc Alden [Fixes]",
-	"Jean-Patrick Guerrero (kilbith) [Fixes]",
 }
 
 local previous_core_developers = {
@@ -73,21 +73,25 @@ local previous_core_developers = {
 	"Aaron Suen <warr1024@gmail.com>",
 	"paramat",
 	"Pierre-Yves Rollo <dev@pyrollo.com>",
+	"hecks",
+	"Jude Melton-Houghton (TurkeyMcMac) [RIP]",
 }
 
 local previous_contributors = {
 	"Nils Dagsson Moskopp (erlehmann) <nils@dieweltistgarnichtso.net> [Minetest logo]",
 	"red-001 <red-001@outlook.ie>",
 	"Giuseppe Bilotta",
+	"numzero",
+	"HybridDog",
 	"ClobberXD",
 	"Dániel Juhász (juhdanad) <juhdanad@gmail.com>",
 	"MirceaKitsune <mirceakitsune@gmail.com>",
+	"Jean-Patrick Guerrero (kilbith)",
 	"MoNTE48",
 	"Constantin Wenger (SpeedProg)",
 	"Ciaran Gultnieks (CiaranG)",
 	"Paul Ouellette (pauloue)",
 	"stujones11",
-	"srifqi",
 	"Rogier <rogier777@gmail.com>",
 	"Gregory Currie (gregorycu)",
 	"JacobF",
@@ -124,6 +128,12 @@ return {
 
 		local credit_list = {}
 		table.insert_all(credit_list, {
+			core.colorize("#000", "Dedication of the current release"),
+			"The 5.7.0 release is dedicated to the memory of",
+			"Minetest developer Jude Melton-Houghton (TurkeyMcMac)",
+			"who died on February 1, 2023.",
+			"Our thoughts are with his family and friends.",
+			"",
 			core.colorize("#ff0", fgettext("Core Developers"))
 		})
 		prepare_credits(credit_list, core_developers)