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 2b6e39f777ad1b7379653af47f0bd0f69240d967..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
@@ -61,7 +65,7 @@ by Forest "LordHavoc" Hale
 **Translators
 
 *Dutch
-freefang
+Alexander "freefang" van Dam
 PinkRobot
 
 *German
@@ -74,8 +78,12 @@ Henry "Exitium" Sanmark
 Calinou
 Maxime "Taximus" Paradis
 
+*Greek
+Γιάννης Α.
+
 *Hungarian
 xaN1C4n3
+Ruszkai "C.Brutail" Ákos
 
 *Italian
 Antonio "terencehill" Piu
@@ -97,6 +105,9 @@ Rodrigo Mouton Laudin
 *Swedish
 marcus256
 
+*Ukrainian
+Vasyl "Harmata" Melnyk
+
 **Other Active Contributors
 Akari
 Ant "Antibody" Zucaro
@@ -108,27 +119,24 @@ Calinou
 chooksta
 cortez
 Cuinn "Cuinnton" Herrick
-eihrul
 Florian Paul "lda17h" Schmidt
-Florian Paul Schmidt
 kojn
 Kristian "morfar" Johansson
+kuniuthefrogg
 magorian
 Maik "SavageX" Merten
+Marvin "Mirio" Beck
 Mick Rippon
 MrBougo
 parasti
 Paul Scott
 PlasmaSheep
 Przemysław "atheros" Grzywacz
-Ruszkai "C.Brutail" Ákos
-Samual Lenks
-Sc0rp
+{SC0RP} - Ian "ID" Dorrell
 Severin "sev" Meyer
 SoulKeeper_p
 Stephan "esteel" Stahl
 The player with the unnecessarily long name
-Vortex
 Wolfgang "Blub\0" Bumiller
 
 **Past Contributors
@@ -198,6 +206,7 @@ Supajoe
 Tei
 Tomaz
 Ulrich Galbraith
+Vortex
 William Libert
 William "Willis" Weilep
 Yves "EviLair" Allaire