ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-26 16:15:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'blender-v4.1-release'

Browse source
This commit is contained in:
Campbell Barton 2024-03-07 14:05:18 +11:00
commit 1dc79f982d
2 changed files with 43 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
tools/utils/git_data_canonical_authors.py
View file

@ -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>",