From 8e0d0b37e2aa986f5f47ad08a6462d5e06fce74f Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Thu, 7 Mar 2024 13:57:50 +1100
Subject: [PATCH] AUTHORS: add 15 new developers

Also correct incorrect user de-duplication in canonical author data.
---
 AUTHORS                                   | 23 +++++++++++++++----
 tools/utils/git_data_canonical_authors.py | 27 ++++++++++++++++++++---
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 3dd16c0bc91..86b4fae9188 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,6 +26,7 @@ Aaron Franke <arnfranke@yahoo.com>
 Adam Nydahl <Loginer>
 Adi Sage <adisage.connect@gmail.com>
 Aditya Y Jeppu <quantimoney>
+Adrian Bibby Walther <adrianbibbywalther@gmail.com>
 Adrian Newton <TFS>
 AgAmemnno <kaz380@hotmail.co.jp>
 Aidan Davey <ShadowDragon>
@@ -69,7 +70,7 @@ Andrej730 <azhilenkov@gmail.com>
 Andres Stephens <ondraise15@hotmail.com>
 Andrew Buttery <axb2035@gmail.com>
 Andrew Hale <TrumanBlending@gmail.com>
-Andrew Oates <aoates>
+Andrew Oates <andrew@andrewoates.com>
 Andrew Wiggin <ender79bl@gmail.com>
 Andrew Williams <sobakasu>
 Andrii Symkin <pembem22>
@@ -96,6 +97,7 @@ Arystanbek Dyussenov <arystan.d@gmail.com>
 Asad-ullah Khan <kh4n>
 Asher <ThatAsherGuy>
 Ashley Ruglys <ashley.ruglys@gmail.com>
+Attila Afra <attila.t.afra@intel.com>
 Aurel Wildfellner <aurel.w@gmail.com>
 Aurelien Jarno <aurel32>
 Azeem Bande-Ali <azeemba>
@@ -197,6 +199,7 @@ Dorian <BD3D>
 Doug Hammond <doughammond@hamsterfight.co.uk>
 Douglas Paul <douglas.w.paul@gmail.com>
 Dyvine57 <dulana57@gmail.com>
+ESASHIKA Kaoru <git@pluser.dev>
 Ed Halley <ed@halley.cc>
 Edgar Roman Cervantes <redvant>
 Edmund Kapusniak <edmundmk>
@@ -207,6 +210,7 @@ Ejner Fergo <ejnersan@gmail.com>
 Elia Sarti <vekoon@gmail.com>
 Emanuel Claesson <emanuel.claesson@gmail.com>
 Enrico Fracasso <enrico.fracasso@email.it>
+Enrique-de-la-Calle <encalle@ucm.es>
 Eric Bickle <ShadowChaser>
 Eric Cosky <eric_cosky>
 Erik Abrahamsson <ecke101@gmail.com>
@@ -323,6 +327,7 @@ John Quillan <jquillan>
 Johnny Matthews <johnny.matthews@gmail.com>
 Joilnen Leite <joilnen.leite@gmail.com>
 Jonas Holzman <jonas@holzman.fr>
+JonasDichelle <jonasdichelle@gmail.com>
 Jonathan Williamson <jonathan@cgcookie.com>
 Jorge Bernal <jbernalmartinez@gmail.com>
 Jorijn de Graaf <bonj@noreply.localhost>
@@ -345,7 +350,7 @@ Julian Eisel <julian@blender.org>
 Julian Plak <julian.plak@live.nl>
 Julian Squires <julian@cipht.net>
 Julien Kaspar <julien@blender.org>
-Jun Mizutani <jmztn@noreply.localhost>
+Jun Mizutani <mizutani.jun@nifty.ne.jp>
 Jung Jaeyun <cube-c>
 Jure Triglav <juretriglav@gmail.com>
 Justin Dailey <dail8859@yahoo.com>
@@ -356,7 +361,7 @@ Kai Jægersen <kaio>
 Karsten Schwenk <macnihilist@gmx.net>
 Karthik Rangasai Sivaraman <rangasai>
 Kaspian Jakobsson <kaspian.jakobsson@gmail.com>
-Kazashi Yoshioka <vnapdv@noreply.localhost>
+Kazashi Yoshioka <kaz380@hotmail.co.jp>
 Kdaf <Kdaf>
 Keir Mierle <mierle@gmail.com>
 Keith Boshoff <wahooney>
@@ -373,6 +378,7 @@ Kevin Mackay <mackay.ka@gmail.com>
 Khanh Ha <khanhhh89@gmail.com>
 Konrad Kleine <konrad.wilhelm.kleine@gmail.com>
 Konrad Puklicki <puklicki>
+Koranir <101683475+Koranir@users.noreply.github.com>
 Kris <Metricity>
 Krzysztof Recko <yetioszek@gmail.com>
 Kévin Dietrich <kevin.dietrich@mailoo.org>
@@ -484,6 +490,7 @@ Nick Milios <semaphore>
 Nick Samarin <nicks1987@bigmir.net>
 Nicola De Mitri <nicolasap>
 Nicolas Fauvet <droune2001>
+Nika Kutsniashvili <nickberckley@gmail.com>
 Nikhil Shringarpurey <Nikhil.Net>
 Nikita Sirgienko <nikita.sirgienko@intel.com>
 Nikolaus Leopold <nikolaus.leopold@gmail.com>
@@ -512,6 +519,7 @@ Paul Golter <paulgolter>
 Paul Melis <paulmelis>
 PaulKristoffersson <57681017+PaulKristoffersson@users.noreply.github.com>
 Pawel Franitza <Rongix>
+Pedro A <povmaniac@noreply.localhost>
 Pedro Reis <veryprofessionaldodo>
 Peng Yan <1105012124@qq.com>
 Petar Dosev <pdosev@gmail.com>
@@ -532,6 +540,7 @@ Phoenix Katsch <phoenixkatsch>
 Pi Lanningham <Quantumplation>
 Pierluigi Grassi <pierluigi@tukano.it>
 Pierre Risch <prisch>
+Pierrick Bouvier <pierrick.bouvier@linaro.org>
 Piotr Makal <pmakal>
 Piotr Ostrowski <postrowski>
 Pratik Borhade <pratikborhade302@gmail.com>
@@ -545,6 +554,7 @@ Rajesh Malviya <rajveer0malviya@gmail.com>
 Ralf Hölzemer <r.hoelzemer@googlemail.com>
 Ramil Roosileht <Limarest>
 Rateeb Riyasat <bmollusc>
+Raul Fernandez <farsthary84@gmail.com>
 Rawalanche <rawalanche@gmail.com>
 Ray Molenkamp <github@lazydodo.com>
 Rebecca Dengate <beckyd>
@@ -579,9 +589,11 @@ Scott Petrovic <scottpetrovic@gmail.com>
 Scott Spadea <scottspadea>
 Scott Wilson <propersquid>
 Scurest <scurest>
+Sean Kim <SeanCTKim@protonmail.com>
 Sebastian Herholz <sebastian.herholz@intel.com>
 Sebastian Koenig <sebastiankoenig@posteo.de>
-Sebastian Parborg <darkdefende@gmail.com>
+Sebastian Parborg <sebastian@blender.org>
+SebastianWitt <w.basti@gmx.de>
 Sebastiano Barrera <bars>
 Sebastián Barschkis <sebbas@sebbas.org>
 Sergej Reich <sergej.reich@googlemail.com>
@@ -629,6 +641,7 @@ Thomas Beck <software@plasmasolutions.de>
 Thomas Dinges <thomas@blender.org>
 Thomas Lachmann <TL>
 Thomas Szepe <HG1_public@gmx.net>
+Thomas Wilshaw <thomaswilshaw@gmail.com>
 Tiago Chaves <laurelkeys>
 Tianwei Shen <shentianweipku@gmail.com>
 Tim Stullich <tstullich>
@@ -697,12 +710,14 @@ Zijun Zhou <eary@noreply.localhost>
 andreas atteneder <atti>
 ariva00 <ariva00.it@gmail.com>
 b-init <b-init>
+bartus <bartus@noreply.localhost>
 bird_d <bird_d>
 brunoT <drehuwann@gmail.com>
 cgtinker <Denys.Hsu@gmail.com>
 coyo_t <constachugga@gmail.com>
 dupoxy <dupoxy@noreply.localhost>
 fiord <hyoga_quasar@yahoo.co.jp>
+grady <mgradysaunders@gmail.com>
 himisa <himisa@noreply.localhost>
 jim man <jimman2003>
 jon denning <gfxcoder@gmail.com>
diff --git a/tools/utils/git_data_canonical_authors.py b/tools/utils/git_data_canonical_authors.py
index cf2d35abd28..c964de012c2 100644
--- a/tools/utils/git_data_canonical_authors.py
+++ b/tools/utils/git_data_canonical_authors.py
@@ -69,6 +69,10 @@ def canonical_author_map() -> Dict[str, str]:
             "Amelie Fondevilla <amelief@noreply.localhost>",
             "Amélie Fondevilla <afonde>",
         ),
+        "Andrew Oates <andrew@andrewoates.com>": (
+            "Andrew Oates <andrewoates@noreply.localhost>",
+            "Andrew Oates <aoates>",
+        ),
         "Andrii Symkin <pembem22>": (
             "Andrii <pembem22>",
             "pembem22 <pembem22>",
@@ -103,6 +107,7 @@ def canonical_author_map() -> Dict[str, str]:
             "Bastien Montagne (@mont29) <>",
             "Bastien Montagne <b.mont29@gmail.com>",
             "Bastien Montagne <mont29>",
+            "Bastien Montagne <mont29@noreply.localhost>",
             "Bastien Montagne <montagne29@wanadoo.fr>",
             "bastien <bastien@blender.org>",
             "mont29 <montagne29@wanadoo.fr>",
@@ -215,6 +220,9 @@ def canonical_author_map() -> Dict[str, str]:
         "Ejner Fergo <ejnersan@gmail.com>": (
             "Ejner Fergo <ejnersan>",
         ),
+        "Eric Cosky <eric_cosky>": (
+            "Eric Cosky <ecosky@noreply.localhost>",
+        ),
         "Erik Abrahamsson <ecke101@gmail.com>": (
             "Eric Abrahamsson <ecke101@gmail.com>",
             "Erick Abrahammson <ecke101@gmail.com>",
@@ -303,6 +311,7 @@ def canonical_author_map() -> Dict[str, str]:
             "Iliay Katueshenock <Moder>",
             "Iliya Katueshenock <Moder>",
             "Iliya Katueshenock <mod_moder@noreply.localhost>",
+            "Iliya Katushenock <mod_moder@noreply.localhost>",
             "MOD <Moder>",
             "illua1 <modormoder@gmail.com>",
         ),
@@ -343,6 +352,7 @@ def canonical_author_map() -> Dict[str, str]:
         "Jesse Yurkovich <jesse.y@gmail.com>": (
             "Jesse Y <deadpin>",
             "Jesse Yurkovich <deadpin>",
+            "Jesse Yurkovich <deadpin@noreply.localhost>",
         ),
         "Johannes J <johannesj@noreply.localhost>": (
             "Johannes J <johannesj>",
@@ -379,8 +389,9 @@ def canonical_author_map() -> Dict[str, str]:
         "Julien Kaspar <julien@blender.org>": (
             "Julien Kaspar <JulienKaspar>",
         ),
-        "Jun Mizutani <jmztn@noreply.localhost>": (
+        "Jun Mizutani <mizutani.jun@nifty.ne.jp>": (
             "Jun Mizutani <jmztn>",
+            "Jun Mizutani <jmztn@noreply.localhost>",
         ),
         "Jörg Müller <nexyon@gmail.com>": (
             "Joerg Mueller <nexyon@gmail.com>",
@@ -391,6 +402,10 @@ def canonical_author_map() -> Dict[str, str]:
         "Kaspian Jakobsson <kaspian.jakobsson@gmail.com>": (
             "\x96kaspian.jakobssongmail.com <kaspian.jakobsson@gmail.com>",
         ),
+        "Kazashi Yoshioka <kaz380@hotmail.co.jp>": (
+            "Kazashi Yoshioka <vnapdv@noreply.localhost>",
+            "vnapdv <kaz380@hotmail.co.jp>",
+        ),
         "Kevin C. Burke <kevincburke@noreply.localhost>": (
             "Kevin C. Burke <blastframe>",
         ),
@@ -579,6 +594,12 @@ def canonical_author_map() -> Dict[str, str]:
             "Sahar A. Kashi <salipour@noreply.localhost>",
             "salipourto <sahar.alipourkashi@amd.com>",
         ),
+        "Scurest <scurest>": (
+            "Scurest <scurest@noreply.localhost>",
+        ),
+        "Sean Kim <SeanCTKim@protonmail.com>": (
+            "Sean Kim <sean-kim@noreply.localhost>",
+        ),
         "Sebastian Herholz <sebastian.herholz@intel.com>": (
             "Sebastian Herholz <Sebastian.Herholz@gmail.com>",
             "Sebastian Herholz <sherholz>",
@@ -589,10 +610,10 @@ def canonical_author_map() -> Dict[str, str]:
             "Sebastian Koenig <sebastian_k>",
             "Sebastian Koenig <sebastian_k@gmail.com>",
         ),
-        "Sebastian Parborg <darkdefende@gmail.com>": (
+        "Sebastian Parborg <sebastian@blender.org>": (
+            "Sebastian Parborg <darkdefende@gmail.com>",
             "Sebastian Parborg <zeddb>",
             "Sebastian Parborg <zeddb@noreply.localhost>",
-            "Sebastian Ramacher <sramacher@debian.org>",
         ),
         "Sergey Sharybin <sergey@blender.org>": (
             "Sergey Sharybin <sergey.vfx@gmail.com>",