Merge branch 'master' into Mario/vehicles

[xonotic/xonotic-data.pk3dir.git] / xonotic-credits.txt

diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index b9f5b8200d198626011ebf95aa8fdf021d75d675..57fcfc8d423e363f0d2055e1fbfc2db4fc714d8c 100644 (file)
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -1,22 +1,41 @@
 **Core Team
 Rudolf "divVerent" Polzer
 Ant "Antibody" Zucaro
+Marvin "Mirio" Beck
 Merlijn Hofstra
 Peter "Morphed" Pielak
+Ruszkai "CuBe0wL" Ákos
 Samual "Ares" Lenks
 Tyler "-z-" Mulligan
 Zac "Mario" Jardine
 
-
 **Extended Team
+Antonio "terencehill" Piu
+Archer
+BuddyFriendGuy
 Debugger
+GATTS
+Halogene
+IDWMaster
 Jan "zykure" Behrens
+JH0nny
+Luigi
 Łukasz "kuniu the frogg" Polek
-Marvin "Mirio" Beck
 Matthias "matthiaskrgr" Krüger
+Mattia "Melanosuchus" Basaglia
 MrBougo
 Nick "bitbomb" Lucca
+nilyt/nyov
+Nitroxis
+packer
+Pearce "theShadow" Michal
 Rasmus "FruitieX" Eskola
+s1lence
+Severin "sev" Meyer
+Soelen
+Sydes
+unfa
+TimePath
 
 
 *Website
@@ -40,6 +59,7 @@ Sahil "DiaboliK" Singhal
 nifrek
 
 *Level Design
+Amadeusz "amade/proraide" Sławiński
 Ben "MooKow" Banker
 Calinou
 Cortez
@@ -47,16 +67,21 @@ Cuinn "Cuinnton" Herrick
 Debugger
 Jakob "tZork" Markström Gröhn
 Konrad "Justin" Slawinski
+Maddin
+L0
 Łukasz "kuniu the frogg" Polek
 Maik "SavageX" Merten
 Marvin "Mirio" Beck
-Mircea "Taoki" Kitsune
+MintOX
+packer
 Pearce "theShadow" Michal
 Rasmus "FruitieX" Eskola
-Ruszkai "C.Brutail" Ákos
+Ruszkai "CuBe0wL" Ákos
 Severin "sev" Meyer
+ShadoW
 
 *Music / Sound FX
+AquaNova (Archer)
 blkrbt
 chooksta
 Independent.nu
@@ -79,7 +104,7 @@ Zac "Mario" Jardine
 
 *Marketing / PR
 Tyler "-z-" Mulligan
-Ruszkai "C.Brutail" Ákos
+Ruszkai "CuBe0wL" Ákos
 Samual "Ares" Lenks
 Saulo "mand1nga" Gil
 
@@ -104,31 +129,43 @@ Dale "graphitemaster" Weiler
 
 
 **Other Active Contributors
-Alexander "naryl" Suhoverhov
-Antonio "terencehill" Piu
 Erik "Ablu" Schilling
-Florian Paul "lda17h" Schmidt
-Halogene
-Jope "Sless" Withers
-Oleh "BlaXpirit" Prypin
-Przemysław "atheros" Grzywacz
-Robert "ai" Kuroto
-The player with the unnecessarily long name
-Mattia "Melanosuchus" Basaglia
-TimePath
+Mircea "Taoki" Kitsune
+Penguinum
 
 
 **Translators
 
+*Asturian
+Llumex03
+Tornes "Tornes.Llume" Ḷḷume
+Ximielga
+
+*Belarusian
+Mihail "meequz" Varantsou
+
+*Bulgarian
+lokster
+set_killer
+
+*Chinese (China)
+Antonidas
+kalawore
+sapphireliu
+
+*Czech
+shogun assassin/woky
+Superovoce
+Tomáš "CZHeron" Volavka
+
 *Dutch
 Alexander "freefang" van Dam
 PinkRobot
+vegiburger
 
-*German
-Rudolf "divVerent" Polzer
-Marvin "Mirio" Beck
-Erik "Ablu" Schilling
-Jope "Sless" Withers
+*English (Australia)
+Laurene "sunflowers" Albrand
+Zac "Mario" Jardine
 
 *Finnish
 Henry "Exitium" Sanmark
@@ -137,35 +174,72 @@ Rasmus "FruitieX" Eskola
 *French
 Calinou
 Maxime "Taximus" Paradis
+RedGuff
 Yannick "SpiKe" Le Guen
 
+*German
+cvcxc
+Erik "Ablu" Schilling
+Jope "Sless" Withers
+Marvin "Mirio" Beck
+Rudolf "divVerent" Polzer
+Yepoleb
+
 *Greek
-Γιάννης "Evropi" Α.
+Γιάννης "Evropi" Ανθυμίδης
+Konstantinos "LDinos" Mihalenas
+Savoritias
+Vindex
 
 *Hungarian
-Ruszkai "C.Brutail" Ákos
+Ruszkai "CuBe0wL" Ákos
 xaN1C4n3
 
 *Italian
 Antonio "terencehill" Piu
 Felice "MaidenBeast" Sallustio
 stdi
+XCostaX
+
+*Polish
+4m
+Alex "tiprogrammierer.alex" Progger
+Amadeusz "amade/proraide" Sławiński
 
 *Portuguese
-Ricardo "Hellgardia" Silva
+Ricardo Manuel "Hellgardia" da Cruz Coelho da Silva
+xXxCHAOTICxXx
 
 *Romanian
+Adrian-Ciprian "adrian.tinjala" Tînjală
+BusterDBK
 Mircea "Taoki" Kitsune
+Tudor "TropiKo" Ionel
 
 *Russian
+Alex "alextalker7" Talker
+Alexandr "zrg"
+Andrei "adem4ik" Stepanov
+gravicappa
 Hot Dog
 Lord Canistra
 Nikoli
 Sergej "Clearness High" Lutsyk
 
+*Serbian
+Саша "salepetronije" Петровић
+Pendulla
+Rafael "Ristovski"
+
 *Spanish
+0000simon
+Alan "aagp" Garcia
+Ari_tent
+brunodeleo
 Kammy
+roader_gentoo
 Rodrigo Mouton Laudin
+SouL
 
 *Swedish
 Karl-Oskar "machine" Rikås
@@ -174,10 +248,12 @@ marcus256
 *Ukrainian
 Oleh "BlaXpirit" Prypin
 Vasyl "Harmata" Melnyk
+Yuriy "herrniemand" Ackermann
 
 
 **Past Contributors
 Akari
+Alexander "naryl" Suhoverhov
 Alexander "motorsep" Zubov
 Amos "torus" Dudley
 Andreas "Black" Kirsch
@@ -198,6 +274,7 @@ Edgenetwork
 Edward "Ed" Holness
 Eric "Munyul Verminard" Sambach
 Fabien "H. Reaper" Tschirhart
+Florian Paul "lda17h" Schmidt
 FrikaC
 Garth "Zombie" Hendy
 Gerd "Elysis" Raudenbusch
@@ -206,6 +283,7 @@ Henning "Tymo" Janssen
 Innovati
 Jitspoe
 Jody Gallagher
+Jope "Sless" Withers
 Juergen "LowDragon" Timm
 KadaverJack
 Kevin "Tyrann" Shanahan
@@ -234,9 +312,12 @@ Paul "Strahlemann" Evers
 Paul Scott
 Petithomme
 PlasmaSheep
+Przemysław "atheros" Grzywacz
 Q1 Retexturing Project
 Qantourisc
+Oleh "BlaXpirit" Prypin
 Rick "Rat" Kelley
+Robert "ai" Kuroto
 Ronan
 Sajt
 Saulo "mand1nga" Gil
@@ -251,6 +332,7 @@ Stephan "esteel" Stahl
 Steve Vermeulen
 Supajoe
 Tei
+The player with the unnecessarily long name
 Tomaz
 Ulrich Galbraith
 Vortex