Merge remote branch 'origin/master' into tzork/gm_nexball

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

diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index 38371eca775dc8933fd400c6c89dffcf131d5ddb..2e60c679fc341d4b3cf000f758b1e84ee8b9bad8 100644 (file)
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -4,7 +4,8 @@ Rudolf "divVerent" Polzer
 Tyler "-z-" Mulligan
 Merlijn Hofstra
 morphed
-mand1nga
+Samual "Ares" Lenks
+Saulo "mand1nga" Gil
 Jakob "tZork" Markström Gröhn
 
 **Coordinators
@@ -31,12 +32,14 @@ nifrek
 FruitieX
 MirceaKitsune
 Jakob "tZork" Markström Gröhn
+Ruszkai "C.Brutail" Ákos
 
 *Music / Sound FX
 mand1nga
 Merlijn Hofstra
 remaxim
 Stephan
+Independent.nu
 
 *Engine Code Additions & QA
 Rudolf "divVerent" Polzer
@@ -49,6 +52,7 @@ Jakob "tZork" Markström Gröhn
 *Marketing / PR
 Tyler "-z-" Mulligan
 mand1nga
+Ruszkai "C.Brutail" Ákos
 
 *Legal
 Rudolf "divVerent" Polzer
@@ -60,6 +64,10 @@ by Forest "LordHavoc" Hale
 
 **Translators
 
+*Dutch
+Alexander "freefang" van Dam
+PinkRobot
+
 *German
 Rudolf "divVerent" Polzer
 
@@ -68,6 +76,18 @@ Henry "Exitium" Sanmark
 
 *French
 Calinou
+Maxime "Taximus" Paradis
+
+*Greek
+Γιάννης Α.
+
+*Hungarian
+xaN1C4n3
+Ruszkai "C.Brutail" Ákos
+
+*Italian
+Antonio "terencehill" Piu
+Felice "MaidenBeast" Sallustio
 
 *Portuguese
 Ricardo "Hellgardia" Silva
@@ -79,22 +99,45 @@ MirceaKitsune
 Lord Canistra
 Nikoli
 
-**Active Contributors
+*Spanish
+Rodrigo Mouton Laudin
+
+*Swedish
+marcus256
+
+*Ukrainian
+Vasyl "Harmata" Melnyk
+
+**Other Active Contributors
+Akari
+Ant "Antibody" Zucaro
 Antonio "terencehill" Piu
+atheros
 Ben "MooKow" Banker
+blkrbt
 Calinou
 chooksta
+cortez
 Cuinn "Cuinnton" Herrick
-Kristian "morfar" Johansson
+Florian Paul "lda17h" Schmidt
 kojn
+Kristian "morfar" Johansson
+kuniuthefrogg
+magorian
 Maik "SavageX" Merten
+Marvin "Mirio" Beck
+Mick Rippon
 MrBougo
-Ruszkai "C.Brutail" Ákos
-Samual Lenks
+parasti
+Paul Scott
+PlasmaSheep
+Przemysław "atheros" Grzywacz
+{SC0RP} - Ian "ID" Dorrell
 Severin "sev" Meyer
+SoulKeeper_p
 Stephan "esteel" Stahl
+The player with the unnecessarily long name
 Wolfgang "Blub\0" Bumiller
-SoulKeeper_p
 
 **Past Contributors
 Alexander "motorsep" Zubov
@@ -102,7 +145,6 @@ Amos "torus" Dudley
 Andreas "Black" Kirsch
 Attila "WW3" Houtkooper
 BigMac
-blkrbt
 Braden "meoblast001" Walters
 Brain Younds
 Chris "amethyst7" Matz
@@ -162,7 +204,6 @@ Spirit
 Steve Vermeulen
 Supajoe
 Tei
-terencehill
 Tomaz
 Ulrich Galbraith
 Vortex