master #2

Merged
BRNSystems merged 9 commits from Mirrorlandia_minetest/minetest:master into master 2023-11-29 10:49:42 +01:00
2 changed files with 16 additions and 20 deletions
Showing only changes of commit 36f4953502 - Show all commits

@ -27,9 +27,9 @@ local core_developers = {
"Krock/SmallJoker <mk939@ymail.com>", "Krock/SmallJoker <mk939@ymail.com>",
"Lars Hofhansl <larsh@apache.org>", "Lars Hofhansl <larsh@apache.org>",
"v-rob <robinsonvincent89@gmail.com>", "v-rob <robinsonvincent89@gmail.com>",
"Hugues Ross <hugues.ross@gmail.com>", "Desour/DS",
"Dmitry Kostenko (x2048) <codeforsmile@gmail.com>", "srifqi",
"Desour", "Gregor Parzefall (grorp)",
} }
-- currently only https://github.com/orgs/minetest/teams/triagers/members -- currently only https://github.com/orgs/minetest/teams/triagers/members
@ -43,18 +43,19 @@ local core_team = {
-- For updating active/previous contributors, see the script in ./util/gather_git_credits.py -- For updating active/previous contributors, see the script in ./util/gather_git_credits.py
local active_contributors = { local active_contributors = {
"Wuzzy [Features, translations, devtest]", "Wuzzy [Features, translations, documentation]",
"Lars Müller [Bugfixes and entity features]", "numzero [Optimizations, work on OpenGL driver]",
"paradust7 [Bugfixes]", "ROllerozxa [Bugfixes, Mainmenu]",
"ROllerozxa [Bugfixes, Android]", "Lars Müller [Bugfixes]",
"srifqi [Android, translations]", "AFCMS [Documentation]",
"Lexi Hale [Particlespawner animation]",
"savilli [Bugfixes]", "savilli [Bugfixes]",
"fluxionary [Bugfixes]", "fluxionary [Bugfixes]",
"Gregor Parzefall [Bugfixes]", "Bradley Pierce (Thresher) [Documentation]",
"Stvk imension [Android]",
"JosiahWI [Code cleanups]",
"OgelGames [UI, Bugfixes]",
"ndren [Bugfixes]",
"Abdou-31 [Documentation]", "Abdou-31 [Documentation]",
"pecksin [Bouncy physics]",
"Daroc Alden [Fixes]",
} }
local previous_core_developers = { local previous_core_developers = {
@ -75,13 +76,14 @@ local previous_core_developers = {
"Pierre-Yves Rollo <dev@pyrollo.com>", "Pierre-Yves Rollo <dev@pyrollo.com>",
"hecks", "hecks",
"Jude Melton-Houghton (TurkeyMcMac) [RIP]", "Jude Melton-Houghton (TurkeyMcMac) [RIP]",
"Hugues Ross <hugues.ross@gmail.com>",
"Dmitry Kostenko (x2048) <codeforsmile@gmail.com>",
} }
local previous_contributors = { local previous_contributors = {
"Nils Dagsson Moskopp (erlehmann) <nils@dieweltistgarnichtso.net> [Minetest logo]", "Nils Dagsson Moskopp (erlehmann) <nils@dieweltistgarnichtso.net> [Minetest logo]",
"red-001 <red-001@outlook.ie>", "red-001 <red-001@outlook.ie>",
"Giuseppe Bilotta", "Giuseppe Bilotta",
"numzero",
"HybridDog", "HybridDog",
"ClobberXD", "ClobberXD",
"Dániel Juhász (juhdanad) <juhdanad@gmail.com>", "Dániel Juhász (juhdanad) <juhdanad@gmail.com>",
@ -126,12 +128,6 @@ return {
} }
table.insert_all(hypertext, { table.insert_all(hypertext, {
"<style color=#000>Dedication of the current release</style>\n",
"The 5.7.0 release is dedicated to the memory of\n",
"Minetest developer Jude Melton-Houghton (TurkeyMcMac)\n",
"who died on February 1, 2023.\n",
"Our thoughts are with his family and friends.\n",
"\n",
"<heading>", fgettext_ne("Core Developers"), "</heading>\n", "<heading>", fgettext_ne("Core Developers"), "</heading>\n",
}) })
prepare_credits(hypertext, core_developers) prepare_credits(hypertext, core_developers)

@ -6,7 +6,7 @@ from collections import defaultdict
codefiles = r"(\.[ch](pp)?|\.lua|\.md|\.cmake|\.java|\.gradle|Makefile|CMakeLists\.txt)$" codefiles = r"(\.[ch](pp)?|\.lua|\.md|\.cmake|\.java|\.gradle|Makefile|CMakeLists\.txt)$"
# two minor versions back, for "Active Contributors" # two minor versions back, for "Active Contributors"
REVS_ACTIVE = "5.2.0..HEAD" REVS_ACTIVE = "5.6.0..HEAD"
# all time, for "Previous Contributors" # all time, for "Previous Contributors"
REVS_PREVIOUS = "HEAD" REVS_PREVIOUS = "HEAD"