Merge branch 'blender-v4.0-release'

This commit is contained in:
Campbell Barton
2023-10-06 21:48:37 +11:00
2 changed files with 24 additions and 4 deletions
+13 -3
View File
@@ -62,6 +62,7 @@ Andre Susano Pinto <andresusanopinto@gmail.com>
Andrea Beconcini <beco> Andrea Beconcini <beco>
Andrea Weikert <elubie@gmx.net> Andrea Weikert <elubie@gmx.net>
Andreas Bergmeier <abergmeier> Andreas Bergmeier <abergmeier>
Andrej730 <azhilenkov@gmail.com>
Andrew Buttery <axb2035@gmail.com> Andrew Buttery <axb2035@gmail.com>
Andrew Hale <TrumanBlending@gmail.com> Andrew Hale <TrumanBlending@gmail.com>
Andrew Oates <aoates> Andrew Oates <aoates>
@@ -169,8 +170,10 @@ Dave Pagurek <davepagurek>
David Ballesteros <dballesg> David Ballesteros <dballesg>
David Friedli <hlorus> David Friedli <hlorus>
David Vogel <Dadido3> David Vogel <Dadido3>
Daybreak <daybreak-2@noreply.localhost>
Deep Majumder <dmcoder> Deep Majumder <dmcoder>
Demeter Dzadik <Mets> Demeter Dzadik <Mets>
Denis Kovacs <den.products@gmail.com>
Dennis Ranish <Codec> Dennis Ranish <Codec>
Diego Borghetti <bdiego@gmail.com> Diego Borghetti <bdiego@gmail.com>
Diego Gangl <dnicolas@gmail.com> Diego Gangl <dnicolas@gmail.com>
@@ -238,7 +241,7 @@ Hallam Roberts <MysteryPancake>
Hamdi Ozbayburtlu <hamdio> Hamdi Ozbayburtlu <hamdio>
Hamed Zaghaghi <hamed.zaghaghi@gmail.com> Hamed Zaghaghi <hamed.zaghaghi@gmail.com>
Hannes Loeschke <blender@hlae.de> Hannes Loeschke <blender@hlae.de>
Hans Goudey <h.goudey@me.com> Hans Goudey <hans@blender.org>
Hans Lambermont <hans@lambermont.dyndns.org> Hans Lambermont <hans@lambermont.dyndns.org>
Harley Acheson <harley.acheson@gmail.com> Harley Acheson <harley.acheson@gmail.com>
Harshit Mehta <harshitmehta2293@gmail.com> Harshit Mehta <harshitmehta2293@gmail.com>
@@ -329,7 +332,7 @@ Juha Mäki-Kanto <ih5235252@gmail.com>
Juho Vepsalainen <bebraw@gmail.com> Juho Vepsalainen <bebraw@gmail.com>
Julian Eisel <julian@blender.org> Julian Eisel <julian@blender.org>
Julian Squires <julian@cipht.net> Julian Squires <julian@cipht.net>
Julien Kaspar <JulienKaspar> Julien Kaspar <julien@blender.org>
Jun Mizutani <jmztn@noreply.localhost> Jun Mizutani <jmztn@noreply.localhost>
Jung Jaeyun <cube-c> Jung Jaeyun <cube-c>
Justin Dailey <dail8859@yahoo.com> Justin Dailey <dail8859@yahoo.com>
@@ -472,6 +475,7 @@ Nikolaus Leopold <nikolaus.leopold@gmail.com>
Nils Thuerey <nils@thuerey.de> Nils Thuerey <nils@thuerey.de>
Nischay-Raj <nischay-raj@noreply.localhost> Nischay-Raj <nischay-raj@noreply.localhost>
Norman Lin <nlin@nlin.net> Norman Lin <nlin@nlin.net>
NueSB <moocowperson@gmail.com>
Octave C <toctave> Octave C <toctave>
Olivier Jolly <zeograd> Olivier Jolly <zeograd>
Olivier Maury <omaury> Olivier Maury <omaury>
@@ -492,6 +496,8 @@ Paul Melis <paulmelis>
PaulKristoffersson <57681017+PaulKristoffersson@users.noreply.github.com> PaulKristoffersson <57681017+PaulKristoffersson@users.noreply.github.com>
Pawel Franitza <Rongix> Pawel Franitza <Rongix>
Pedro Reis <veryprofessionaldodo> Pedro Reis <veryprofessionaldodo>
Peng Yan <1105012124@qq.com>
Petar Dosev <pdosev@gmail.com>
Peter Fog <tintwotin> Peter Fog <tintwotin>
Peter Kim <pk15950@gmail.com> Peter Kim <pk15950@gmail.com>
Peter Larabell <xgl.asyliax@gmail.com> Peter Larabell <xgl.asyliax@gmail.com>
@@ -629,7 +635,8 @@ Urko <urko3d>
Vaishnav S <padthai> Vaishnav S <padthai>
Valdemar Lindberg <Voldie> Valdemar Lindberg <Voldie>
Valentin <Poulpator> Valentin <Poulpator>
Vasyl-Pidhirskyi <vpidhirskyi@gmail.com> Vasilis-Milios <vasilis-milios@noreply.localhost>
Vasyl Pidhirskyi <vpidhirskyi@gmail.com>
Victor Seiji Hariki <seijihariki> Victor Seiji Hariki <seijihariki>
Victor-Louis De Gusseme <victorlouis> Victor-Louis De Gusseme <victorlouis>
Viktoriia Safiullina <safiuvik> Viktoriia Safiullina <safiuvik>
@@ -671,6 +678,7 @@ b-init <b-init>
bird_d <bird_d> bird_d <bird_d>
brunoT <drehuwann@gmail.com> brunoT <drehuwann@gmail.com>
cgtinker <Denys.Hsu@gmail.com> cgtinker <Denys.Hsu@gmail.com>
coyo_t <constachugga@gmail.com>
fiord <hyoga_quasar@yahoo.co.jp> fiord <hyoga_quasar@yahoo.co.jp>
himisa <himisa@noreply.localhost> himisa <himisa@noreply.localhost>
jim man <jimman2003> jim man <jimman2003>
@@ -680,10 +688,12 @@ listout <listout@protonmail.com>
lolloz98 <lorenzocarpaneto@yahoo.it> lolloz98 <lorenzocarpaneto@yahoo.it>
luzpaz <luzpaz> luzpaz <luzpaz>
matc <matc> matc <matc>
menda <alguien@aqui.es>
n-kall <noa@tutamail.com> n-kall <noa@tutamail.com>
nBurn <nbwashburn@gmail.com> nBurn <nbwashburn@gmail.com>
nutti <nutti.metro@gmail.com> nutti <nutti.metro@gmail.com>
ok_what <ip1149a@gmail.com> ok_what <ip1149a@gmail.com>
persun <perplexing.sun@gmail.com>
swann <slumber> swann <slumber>
unclezeiv <davide.vercelli@gmail.com> unclezeiv <davide.vercelli@gmail.com>
yves <valfeur> yves <valfeur>
+11 -1
View File
@@ -267,8 +267,9 @@ def canonical_author_map() -> Dict[str, str]:
"Habib Gahbiche <habibgahbiche@gmail.com>": ( "Habib Gahbiche <habibgahbiche@gmail.com>": (
"Habib Gahbiche <zazizizou>", "Habib Gahbiche <zazizizou>",
), ),
"Hans Goudey <h.goudey@me.com>": ( "Hans Goudey <hans@blender.org>": (
"Hans Goudey <HooglyBoogly>", "Hans Goudey <HooglyBoogly>",
"Hans Goudey <h.goudey@me.com>",
"Hans Goudey <hooglyboogly@noreply.localhost>", "Hans Goudey <hooglyboogly@noreply.localhost>",
), ),
"Harley Acheson <harley.acheson@gmail.com>": ( "Harley Acheson <harley.acheson@gmail.com>": (
@@ -365,6 +366,9 @@ def canonical_author_map() -> Dict[str, str]:
"Severin <julian_eisel@web.de>", "Severin <julian_eisel@web.de>",
"julianeisel <julian_eisel@web.de>", "julianeisel <julian_eisel@web.de>",
), ),
"Julien Kaspar <julien@blender.org>": (
"Julien Kaspar <JulienKaspar>",
),
"Jun Mizutani <jmztn@noreply.localhost>": ( "Jun Mizutani <jmztn@noreply.localhost>": (
"Jun Mizutani <jmztn>", "Jun Mizutani <jmztn>",
), ),
@@ -422,6 +426,9 @@ def canonical_author_map() -> Dict[str, str]:
"Marc Chéhab <marcchehab@noreply.localhost>", "Marc Chéhab <marcchehab@noreply.localhost>",
"Marc Chéhab <marcluzmedia>", "Marc Chéhab <marcluzmedia>",
), ),
"Marcos Perez <pistolario>": (
"Marcos Perez <pistolario@noreply.localhost>",
),
"Martijn Berger <mberger@denc.com>": ( "Martijn Berger <mberger@denc.com>": (
"Martijn Berger <martijn.berger@gmail.com>", "Martijn Berger <martijn.berger@gmail.com>",
"Martijn Berger <mberger@denc.nl>", "Martijn Berger <mberger@denc.nl>",
@@ -635,6 +642,9 @@ def canonical_author_map() -> Dict[str, str]:
"Ulysse Martin <you.le@live.fr>": ( "Ulysse Martin <you.le@live.fr>": (
"Ulysse Martin <youle>", "Ulysse Martin <youle>",
), ),
"Vasyl Pidhirskyi <vpidhirskyi@gmail.com>": (
"Vasyl-Pidhirskyi <vpidhirskyi@gmail.com>",
),
"Vitor Boschi <vitorboschi@gmail.com>": ( "Vitor Boschi <vitorboschi@gmail.com>": (
"Vitor Boschi <vitorboschi>", "Vitor Boschi <vitorboschi>",
"Vitor Boschi da Silva <vitorboschi>" "Vitor Boschi da Silva <vitorboschi>"