Skip to content

Commit 35b476c

Browse files
sfan5sfan5
committed
Update credits tab and mailmap
1 parent 74a9354 commit 35b476c

File tree

2 files changed

+82
-46
lines changed

2 files changed

+82
-46
lines changed

‎.mailmap

Lines changed: 54 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,67 @@
1+
# Documentation: https://git-scm.com/docs/git-check-mailmap#_mapping_authors
2+
13
0gb.us <[email protected]> <[email protected]>
2-
Calinou <[email protected]> <[email protected]>
3-
Perttu Ahola <[email protected]> celeron55 <[email protected]>
4+
Calinou <[email protected]> <[email protected]>
5+
Calinou <[email protected]> <[email protected]>
6+
Perttu Ahola <[email protected]>
47
Perttu Ahola <[email protected]> celeron55 <celeron55@armada.(none)>
5-
Craig Robbins <[email protected]> <[email protected]>
8+
Zeno- <[email protected]>
9+
Zeno- <[email protected]> <[email protected]>
10+
Diego Martínez <[email protected]>
611
Diego Martínez <[email protected]> <[email protected]>
12+
Ilya Zhuravlev <[email protected]>
713
Ilya Zhuravlev <[email protected]> <[email protected]>
814
kwolekr <[email protected]> <[email protected]>
9-
PilzAdam <[email protected]> PilzAdam <[email protected]>
10-
PilzAdam <[email protected]> Pilz Adam <[email protected]>
11-
PilzAdam <[email protected]> PilzAdam <[email protected]>
15+
PilzAdam <[email protected]> <[email protected]>
16+
PilzAdam <[email protected]> <[email protected]>
1217
proller <[email protected]> <[email protected]>
1318
proller <[email protected]> <[email protected]>
1419
RealBadAngel <[email protected]> <[email protected]>
1520
RealBadAngel <[email protected]> <[email protected]>
1621
Selat <[email protected]> <[email protected]>
1722
ShadowNinja <[email protected]> ShadowNinja <[email protected]>
18-
Shen Zheyu <[email protected]> arsdragonfly <[email protected]>
19-
Pavel Elagin <[email protected]> elagin <[email protected]>
20-
Esteban I. Ruiz Moreno <[email protected]> Esteban I. RM <[email protected]>
21-
manuel duarte <[email protected]> manuel joaquim <[email protected]>
22-
manuel duarte <[email protected]> sweetbomber <ffrogger _zero_ at yahoo dot com>
23-
Diego Martínez <[email protected]> kaeza <[email protected]>
24-
Diego Martínez <[email protected]> Diego Martinez <[email protected]>
25-
Lord James <[email protected]> Lord89James <[email protected]>
26-
BlockMen <[email protected]> Block Men <[email protected]>
27-
sfan5 <[email protected]> Sfan5 <[email protected]>
28-
DannyDark <[email protected]> dannydark <[email protected]>
29-
Ilya Pavlov <[email protected]> Ilya <[email protected]>
30-
Ilya Zhuravlev <[email protected]> xyzz <[email protected]>
23+
Esteban I. Ruiz Moreno <[email protected]>
24+
Esteban I. Ruiz Moreno <[email protected]> <[email protected]>
25+
Lord James <[email protected]>
26+
BlockMen <[email protected]>
27+
sfan5 <[email protected]>
28+
DannyDark <[email protected]>
29+
Ilya Pavlov <[email protected]>
3130
sapier <Sapier at GMX dot net> sapier <sapier AT gmx DOT net>
3231
sapier <Sapier at GMX dot net> sapier <sapier at gmx dot net>
33-
32+
SmallJoker <[email protected]> <[email protected]>
33+
Loïc Blot <[email protected]>
34+
Loïc Blot <[email protected]> <[email protected]>
35+
numzero <[email protected]> Vitaliy <[email protected]>
36+
numzero <[email protected]> <[email protected]>
37+
Jean-Patrick Guerrero <[email protected]>
38+
Jean-Patrick Guerrero <[email protected]> <[email protected]>
39+
HybridDog <[email protected]> <[email protected]>
40+
srfqi <[email protected]>
41+
Dániel Juhász <[email protected]>
42+
rubenwardy <[email protected]>
43+
rubenwardy <[email protected]> <[email protected]>
44+
Paul Ouellette <[email protected]>
45+
Vanessa Dannenberg <[email protected]> <[email protected]>
46+
ClobberXD <[email protected]>
47+
ClobberXD <[email protected]> <[email protected]>
48+
ClobberXD <[email protected]> <[email protected]>
49+
Auke Kok <[email protected]>
50+
Auke Kok <[email protected]> <[email protected]>
51+
Desour <[email protected]>
52+
Nathanaël Courant <[email protected]> <[email protected]>
53+
Ezhh <[email protected]>
54+
paramat <[email protected]>
55+
paramat <[email protected]> <[email protected]>
56+
lhofhansl <[email protected]> <[email protected]>
57+
red-001 <[email protected]> <[email protected]>
58+
Wuzzy <[email protected]> <[email protected]>
59+
Wuzzy <[email protected]> <[email protected]>
60+
Jordach <[email protected]>
61+
MoNTE48 <[email protected]>
62+
v-rob <[email protected]>
63+
v-rob <[email protected]> <[email protected]>
64+
EvidenceB <[email protected]>
65+
gregorycu <[email protected]>
66+
Rogier <[email protected]>
67+
Rogier <[email protected]> <[email protected]>

‎builtin/mainmenu/tab_credits.lua

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,37 @@ local core_developers = {
2323
"Nathanaël Courant (Nore/Ekdohibs) <[email protected]>",
2424
"Loic Blot (nerzhul/nrz) <[email protected]>",
2525
"paramat",
26-
"Auke Kok (sofar) <[email protected]>",
2726
"Andrew Ward (rubenwardy) <[email protected]>",
2827
"Krock/SmallJoker <[email protected]>",
2928
"Lars Hofhansl <[email protected]>",
29+
"Pierre-Yves Rollo <[email protected]>",
30+
"v-rob <[email protected]>",
3031
}
3132

33+
-- For updating active/previous contributors, see the script in ./util/gather_git_credits.py
34+
3235
local active_contributors = {
33-
"Hugues Ross [Formspecs]",
36+
"Wuzzy [devtest game, visual corrections]",
37+
"Zughy [Visual improvements, various fixes]",
3438
"Maksim (MoNTE48) [Android]",
35-
"DS [Formspecs]",
36-
"pyrollo [Formspecs: Hypertext]",
37-
"v-rob [Formspecs]",
38-
"Jordach [set_sky]",
39-
"random-geek [Formspecs]",
40-
"Wuzzy [Pathfinder, builtin, translations]",
41-
"ANAND (ClobberXD) [Fixes, per-player FOV]",
42-
"Warr1024 [Fixes]",
43-
"Paul Ouellette (pauloue) [Fixes, Script API]",
44-
"Jean-Patrick G (kilbith) <[email protected]> [Audiovisuals]",
45-
"HybridDog [Script API]",
39+
"numzero [Graphics and rendering]",
40+
"appgurueu [Various internal fixes]",
41+
"Desour [Formspec and vector API changes]",
42+
"HybridDog [Rendering fixes and documentation]",
43+
"Hugues Ross [Graphics-related improvements]",
44+
"ANAND (ClobberXD) [Mouse buttons rebinding]",
45+
"luk3yx [Fixes]",
46+
"hecks [Audiovisuals, Lua API]",
47+
"LoneWolfHT [Object crosshair, documentation fixes]",
48+
"Lejo [Server-related improvements]",
49+
"EvidenceB [Compass HUD element]",
50+
"Paul Ouellette (pauloue) [Lua API, documentation]",
51+
"TheTermos [Collision detection, physics]",
52+
"David CARLIER [Unix & Haiku build fixes]",
4653
"dcbrwn [Object shading]",
47-
"srifqi [Fixes]",
54+
"Elias Fleckenstein [API features/fixes]",
55+
"Jean-Patrick Guerrero (kilbith) [model element, visual fixes]",
56+
"k.h.lai [Memory leak fixes, documentation]",
4857
}
4958

5059
local previous_core_developers = {
@@ -60,30 +69,23 @@ local previous_core_developers = {
6069
"sapier",
6170
"Zeno",
6271
"ShadowNinja <[email protected]>",
72+
"Auke Kok (sofar) <[email protected]>",
6373
}
6474

6575
local previous_contributors = {
6676
"Nils Dagsson Moskopp (erlehmann) <[email protected]> [Minetest Logo]",
67-
"Dániel Juhász (juhdanad) <[email protected]>",
6877
"red-001 <[email protected]>",
69-
"numberZero [Audiovisuals: meshgen]",
7078
"Giuseppe Bilotta",
79+
"Dániel Juhász (juhdanad) <[email protected]>",
7180
"MirceaKitsune <[email protected]>",
7281
"Constantin Wenger (SpeedProg)",
7382
"Ciaran Gultnieks (CiaranG)",
7483
"stujones11 [Android UX improvements]",
75-
"Jeija <[email protected]> [HTTP, particles]",
76-
"Vincent Glize (Dumbeldor) [Cleanups, CSM APIs]",
77-
"Ben Deutsch [Rendering, Fixes, SQLite auth]",
78-
"TeTpaAka [Hand overriding, nametag colors]",
79-
"Rui [Sound Pitch]",
80-
"Duane Robertson <[email protected]> [MGValleys]",
81-
"Raymoo [Tool Capabilities]",
8284
"Rogier <[email protected]> [Fixes]",
8385
"Gregory Currie (gregorycu) [optimisation]",
84-
"TriBlade9 <[email protected]> [Audiovisuals]",
85-
"T4im [Profiler]",
86-
"Jurgen Doser (doserj) <[email protected]>",
86+
"srifqi [Fixes]",
87+
"JacobF",
88+
"Jeija <[email protected]> [HTTP, particles]",
8789
}
8890

8991
local function buildCreditList(source)

0 commit comments

Comments
 (0)