From 13091b2b48bb27a1ce1a1d3b1eb1b1c1dd0b7099 Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Tue, 11 Nov 2025 15:49:21 +1100
Subject: [PATCH] AUTHORS: de-duplicate & update (1 new author)

---
 AUTHORS                                   | 11 ++++---
 tools/utils/git_data_canonical_authors.py | 37 +++++++++++++++++++++++
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index d6c1844e539..d0661675241 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -282,7 +282,7 @@ Fredrik Hansson <fredrikh>
 Fulk33 <spaceshipwars@gmx.de>
 Fynn Grotehans <fynngr@noreply.localhost>
 Félix <Miadim>
-Gabriel Lee <harpoonlobotomy@noreply.localhost>
+Gabriel Lee <harpoonlobotomy@gmail.com>
 Gaia Clary <gaia.clary@machinimatrix.org>
 Gangneron <clementgangneron@gmail.com>
 Garry R. Osgood <grosgood>
@@ -437,7 +437,6 @@ Justin Dailey <dail8859@yahoo.com>
 Justin Jones <jjones780>
 Jörg Müller <nexyon@gmail.com>
 Jürgen Herrmann <shadowrom@me.com>
-Kabinet0 <m3kabin@gmail.com>
 Kace <lakacey03@gmail.com>
 Kai Jægersen <kaio>
 Kamil Galik <kgalik@3dconnexion.com>
@@ -545,6 +544,7 @@ Matthew Hinson <matthewm.hinson@gmail.com>
 Matthew Krueger <contact@matthewkrueger.com>
 Matthew Smith <mjdietel@gmail.com>
 Matthew Woehlke <mwoehlke.floss@gmail.com>
+Matthew-Kabin <m3kabin@gmail.com>
 Matthias Ellerbeck <voyager25>
 Matthieu Carteron <rubisetcie@gmail.com>
 Matti-Ranta <matti-ranta@noreply.localhost>
@@ -569,7 +569,7 @@ Michal Srb <xixixao>
 Michel Anders <varkenvarken>
 Michel Selten <michel@mselten.demon.nl>
 Miguel G <ghaspias>
-Miguel Porces <cmporces>
+Miguel Porces <porces@gmail.com>
 Miguel Pozo <pragma37@gmail.com>
 Miika Hamalainen <blender@miikah.org>
 Mika Saari <mika.saari@wipsl.com>
@@ -781,6 +781,7 @@ T0MIS0N <t0mis0n@noreply.localhost>
 Takahiro Shizuki <sntulix>
 Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
 Tarek Yasser <tarekspeed7@gmail.com>
+Tariq-Sulley <tariqsulley3c@gmail.com>
 Tenkai Raiko <tenkairaiko@gmail.com>
 Thibault de Villèle <thibaulltt>
 Thomas Barlow <github@mysterymayhem.co.uk>
@@ -868,6 +869,7 @@ Z-Map <blendfan@gmail.com>
 ZHU Xinyu <xzhuah77@gmail.com>
 Zev Eisenberg <ZevEisenberg>
 Zheng-Ze <zheng-ze@noreply.localhost>
+Zhou Qiankang <wszqkzqk@qq.com>
 Zijun Zhou <zhouzijun200047@163.com>
 Zopolis4 <creatorsmithmdt@gmail.com>
 alxdsptr <helloworld6489mdp@gmail.com>
@@ -894,6 +896,7 @@ jamesf <jameslynnfulop@gmail.com>
 jim man <jimman2003>
 jlalleve <julien.lalleve@gmail.com>
 jon denning <gfxcoder@gmail.com>
+kavu <kavukamari@gmail.com>
 kiki <charles@skeletalstudios.com>
 kitt <blender@kittcat.dev>
 listout <listout@protonmail.com>
@@ -918,10 +921,8 @@ secext2022 <secext2022@outlook.com>
 sentharn <sentharn@noreply.localhost>
 softyoda <yo561@live.fr>
 swann <slumber>
-tariqsulley <tariqsulley3c@gmail.com>
 techmadentertainment <tech@madentertainment.it>
 unclezeiv <davide.vercelli@gmail.com>
-wszqkzqk <wszqkzqk@qq.com>
 yves <valfeur>
 zhanghe9702 <zhanghe9702@163.com>
 Élie Michel <elie>
diff --git a/tools/utils/git_data_canonical_authors.py b/tools/utils/git_data_canonical_authors.py
index 5cf8faefdac..e6cb7f56a7c 100644
--- a/tools/utils/git_data_canonical_authors.py
+++ b/tools/utils/git_data_canonical_authors.py
@@ -157,6 +157,9 @@ def canonical_author_map() -> dict[str, str]:
         "Bill Spitzak <bills@sidefx.com>": (
             "Bill-Spitzak <bill-spitzak@noreply.localhost>",
         ),
+        "Blastframe <kevin@blastframe.com>": (
+            "blastframe <kevin@blastframe.com>",
+        ),
         "Bogdan Nagirniak <bodyan@gmail.com>": (
             "Bogdan Nagirniak <bnagirniak>",
         ),
@@ -336,6 +339,9 @@ def canonical_author_map() -> dict[str, str]:
         "Félix <Miadim>": (
             "Flix <Miadim>",
         ),
+        "Gabriel Lee <harpoonlobotomy@gmail.com>": (
+            "Gabriel Lee <harpoonlobotomy@noreply.localhost>",
+        ),
         "Gaia Clary <gaia.clary@machinimatrix.org>": (
             "Gaia Clary <gaiaclary>",
             "gaiaclary <gaia.clary@machinimatrix.org>",
@@ -365,6 +371,9 @@ def canonical_author_map() -> dict[str, str]:
             "Gilberto Rodrigues <gilberto_rodrigues>",
             "Gilberto.R <gilbertorodrigues@outlook.com>",
         ),
+        "Gon Solo <gonsolo@gmail.com>": (
+            "Gon Solo <gonsolo>",
+        ),
         "Guillermo S. Romero <gsr.b3d@infernal-iceberg.com>": (
             "gsr b3d <gsr.b3d@infernal-iceberg.com>",
         ),
@@ -570,6 +579,9 @@ def canonical_author_map() -> dict[str, str]:
             "Lukas Tönne <lukas.toenne@gmail.com>",
             "Lukas Tönne <lukastonne@noreply.localhost>",
         ),
+        "Luya Tshimbalanga <luya>": (
+            "Luya Tshimbalanga <luya-tshimbalanga@noreply.localhost>",
+        ),
         "Léo Depoix <PiloeGAO>": (
             "PiloeGAO <leonumerique@gmail.com>",
         ),
@@ -622,6 +634,9 @@ def canonical_author_map() -> dict[str, str]:
         "Matteo F. Vescovi <mfvescovi@gmail.com>": (
             "Matteo F. Vescovi <mfv>",
         ),
+        "Matthew-Kabin <m3kabin@gmail.com>": (
+            "Kabinet0 <m3kabin@gmail.com>",
+        ),
         "Matthieu Carteron <rubisetcie@gmail.com>": (
             "Matthieu Carteron <matthieu-carteron@noreply.localhost>",
         ),
@@ -647,6 +662,9 @@ def canonical_author_map() -> dict[str, str]:
             "Michal Krupa <kroopson@noreply.localhost>",
             "michal.krupa <michal.krupa@cdprojektred.com>",
         ),
+        "Miguel Porces <porces@gmail.com>": (
+            "Miguel Porces <cmporces>",
+        ),
         "Miguel Pozo <pragma37@gmail.com>": (
             "Miguel Pozo <pragma37>",
             "Miguel Pozo <pragma37@noreply.localhost>",
@@ -757,6 +775,9 @@ def canonical_author_map() -> dict[str, str]:
         "Phoenix Katsch <phoenixkatsch@gmail.com>": (
             "Phoenix Katsch <phoenixkatsch>",
         ),
+        "Pierre Pontier <pierre.pontier@suryavarman.fr>": (
+            "Pierre Pontier <pierre.pontier@laposte.net>",
+        ),
         "Pratik Borhade <pratikborhade302@gmail.com>": (
             "Prakhar-Singh-Chouhan <prakhar-singh-chouhan@noreply.localhost>",
             "Pratik Borhade <PratikPB2123>",
@@ -770,6 +791,7 @@ def canonical_author_map() -> dict[str, str]:
             "rajveermalviya <rajveer0malviya@gmail.com>",
         ),
         "Ramon Klauck <ramonklauck3@gmail.com>": (
+            "Ram\xf3n Klauck <ernst-ellert@noreply.localhost>",
             "ernst-ellert <ramonklauck3@gmail.com>",
             "lucid3dr <ramonklauck3@gmail.com>",
         ),
@@ -884,6 +906,12 @@ def canonical_author_map() -> dict[str, str]:
         "T0MIS0N <t0mis0n@noreply.localhost>": (
             "T0MIS0N <50230774+T0MIS0N@users.noreply.github.com>",
         ),
+        "Tariq-Sulley <tariqsulley3c@gmail.com>": (
+            "tariqsulley <tariqsulley3c@gmail.com>",
+        ),
+        "Tenkai Raiko <tenkairaiko@gmail.com>": (
+            "Raiko <tenkairaiko@gmail.com>",
+        ),
         "Thomas Dinges <thomas@blender.org>": (
             "Thomas Dinges <blender@dingto.org>",
             "Thomas Dinges <dingto>",
@@ -912,6 +940,7 @@ def canonical_author_map() -> dict[str, str]:
         ),
         "Ulysse Martin <you.le@live.fr>": (
             "Ulysse Martin <youle>",
+            "youle31 <you.le@live.fr>",
         ),
         "Urko Mauduit <urko3d@gmail.com>": (
             "Urko <urko3d>",
@@ -959,6 +988,9 @@ def canonical_author_map() -> dict[str, str]:
         "Willian Padovani Germano <wpgermano@gmail.com>": (
             "ianwill <wpgermano@gmail.com>",
         ),
+        "XDzZyq <xiaodouzizyq@gmail.com>": (
+            "Zyq-XDz <xiaodouzizyq@gmail.com>",
+        ),
         "Xavier Hallade <xavier.hallade@intel.com>": (
             "Xavier Hallade <me@ph0b.com>",
             "Xavier Hallade <xavierh@noreply.localhost>",
@@ -973,6 +1005,9 @@ def canonical_author_map() -> dict[str, str]:
             "YimingWu <xp8110@outlook.com>",
             "YimingWu <xp8110t@outlook.com>",
         ),
+        "Zhou Qiankang <wszqkzqk@qq.com>": (
+            "wszqkzqk <wszqkzqk@qq.com>",
+        ),
         "Zijun Zhou <zhouzijun200047@163.com>": (
             "EaryChow <zhouzijun200047@163.com>",
             "Zijun Zhou <eary@noreply.localhost>",
@@ -981,6 +1016,7 @@ def canonical_author_map() -> dict[str, str]:
             "bartus <szczepaniak.bartek+github@gmail.com>",
         ),
         "dupoxy <dupoxy@gmail.com>": (
+            "dupoxy <dupoxy>",
             "dupoxy <dupoxy@noreply.localhost>",
         ),
         "howetuft <howetuft@gmail.com>": (
@@ -992,6 +1028,7 @@ def canonical_author_map() -> dict[str, str]:
         "luz paz <luzpaz@proton.me>": (
             "luz paz <luzpaz-2@noreply.localhost>",
             "luzpaz <luzpaz>",
+            "luzpaz-2 <luzpaz-2@noreply.localhost>",
         ),
         "nBurn <nbwashburn@gmail.com>": (
             "nBurn <nBurn>",