diff --git a/.mailmap b/.mailmap
index 880cdfc1002..73109a78a90 100644
--- a/.mailmap
+++ b/.mailmap
@@ -14,12 +14,14 @@ Ariel Manzur <ariel@godotengine.org> <punto@godotengine.org>
 Ariel Manzur <ariel@godotengine.org> <ariel@okamstudio.com>
 Ariel Manzur <ariel@godotengine.org> <punto@Ariels-Mac-mini.local>
 Ariel Manzur <ariel@godotengine.org> <punto@Ariels-Mac-mini-2.local>
+A Thousand Ships <96648715+AThousandShips@users.noreply.github.com> <over999ships@gmail.com>
 Bastiaan Olij <mux213@gmail.com>
 Benjamin <mafortion.benjamin@gmail.com>
 Bernhard Liebl <Bernhard.Liebl@gmx.org> <poke1024@gmx.de>
 Bernhard Liebl <Bernhard.Liebl@gmx.org> <poke1024@gmx.org>
 Bruno Lourenço <madequa@users.noreply.github.com> <bmlourenco@gmail.com>
 Chaosus <chaosus89@gmail.com>
+ChibiDenDen <pdaniq@gmail.com>
 Chris Bradfield <chris@kidscancode.org> <cb@scribe.net>
 Clay John <claynjohn@gmail.com>
 Clay John <claynjohn@gmail.com> <clayjohn@shaw.ca>
@@ -40,6 +42,7 @@ Fabian <supagu@gmail.com>
 Ferenc Arn <tagcup@yahoo.com>
 Ferenc Arn <tagcup@yahoo.com> <tagcup@users.noreply.github.com>
 FireForge <67974470+fire-forge@users.noreply.github.com> <isaacr.7.2005@gmail.com>
+Florian Kothmeier <floriankothmeier@web.de>
 foxydevloper <12120644+foxydevloper@users.noreply.github.com>
 Fredia Huya-Kouadio <fhuyakou@gmail.com>
 Fredia Huya-Kouadio <fhuyakou@gmail.com> <fhuya@google.com>
@@ -119,6 +122,7 @@ Nuno Donato <nunodonato@gmail.com> <n.donato@estrelasustentavel.pt>
 ocean (they/them) <anvilfolk@gmail.com>
 Pawel Kowal <pkowal1982@gmail.com>
 Pedro J. Estébanez <pedrojrulez@gmail.com> <RandomShaper@users.noreply.github.com>
+Patrick Exner <patrick.exner1@web.de>
 Patrick <firefly2442@gmail.com>
 Paul Batty <p_batty@hotmail.co.uk>
 Paul Batty <p_batty@hotmail.co.uk> <Paulb23@users.noreply.github.com>
diff --git a/AUTHORS.md b/AUTHORS.md
index bd6bb63ad8d..cf53f39cda6 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -62,6 +62,7 @@ name is available.
     Caner Demirer (cdemirer)
     Carl Olsson (not-surt)
     Carter Anderson (cart)
+    ChibiDenDen
     Chris Bradfield (cbscribe)
     Clay John (clayjohn)
     ConteZero
@@ -71,6 +72,7 @@ name is available.
     Daniel Zilberleyb (dzil123)
     Danil Alexeev (dalexeev)
     dankan1890
+    Darío Banini (DarioSamo)
     David Cambré (Gallilus)
     David Sichma (DavidSichma)
     David Snopek (dsnopek)
@@ -95,6 +97,7 @@ name is available.
     Fabrice Cipolla (fabriceci)
     Ferenc Arn (tagcup)
     FireForge (fire-forge)
+    Florian Kothmeier (Dragoncraft89)
     follower
     foxydevloper
     François Belair (Razoric480)
@@ -113,6 +116,7 @@ name is available.
     Hendrik Brucker (Geometror)
     hilfazer
     Hiroshi Ogawa (hi-ogawa)
+    HolonProduction
     homer666
     hoontee
     Hugo Locurcio (Calinou)
@@ -174,6 +178,7 @@ name is available.
     marynate
     Masoud BH (masoudbh3)
     Mateo Kuruk Miccino (kuruk-mm)
+    Matias N. Goldberg (darksylinc)
     Matthew (skyace65)
     Matthias Hölzl (hoelzl)
     Max Hilbrunner (mhilbrunner)
@@ -190,6 +195,7 @@ name is available.
     mrezai
     Muhammad Huri (CakHuri)
     muiroc
+    myaaaaaaaaa
     Nathan Franke (nathanfranke)
     Nathan Lovato (NathanLovato)
     Nathan Warden (NathanWarden)
@@ -203,6 +209,7 @@ name is available.
     Omar El Sheikh (The-O-King)
     Ovnuniarchos
     Pascal Richter (ShyRed)
+    Patrick Exner (FlameLizard)
     Patrick (firefly2442)
     Paul Batty (Paulb23)
     Paul Joannon (paulloz)
@@ -246,9 +253,11 @@ name is available.
     smix8
     snailrhymer
     Stijn Hinlopen (hinlopen)
+    stmSi
     Swarnim Arun (minraws)
     TC (floppyhammer)
     TechnoPorg
+    Thaddeus Crews (Repiteo)
     Thakee Nathees (ThakeeNathees)
     thebestnom
     Theo Hallenius (TheoXD)
@@ -275,4 +284,5 @@ name is available.
     Zak Stam (zaksnet)
     Zher Huei Lee (leezh)
     ZuBsPaCe
+    谢天 (jsjtxietian)
     风青山 (Rindbee)