Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

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

diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index 0e4cb86289e81aecac9046e00f6c15e27c3739b8..dc5b5c4c6c060fc6a53de5422940e240f6a393d7 100644 (file)
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -1,7 +1,7 @@
 **Core Team
 
 Rudolf "divVerent" Polzer
--z-
+Tyler "-z-" Mulligan
 Merlijn Hofstra
 morphed
 mand1nga
@@ -14,12 +14,16 @@ tZork
 Diabolik a.k.a Dib
 
 *2D Art / Web
--z- (web / game)
+Tyler "-z-" Mulligan (web / game)
 FruitieX (game / web)
 
 *3D Art
 morphed
 
+*Concept Art
+LJFHutch
+Pearce "theShadow" Michal
+
 *Level Design
 FruitieX
 MirceaKitsune
@@ -38,7 +42,7 @@ FruitieX
 tZork
 
 *Marketing / PR
--z-
+Tyler "-z-" Mulligan
 mand1nga
 
 *Legal
@@ -49,6 +53,27 @@ Merlijn Hofstra
 DarkPlaces
 by Forest "LordHavoc" Hale
 
+**Translators
+
+*German
+Rudolf "divVerent" Polzer
+
+*Finnish
+Henry "Exitium" Sanmark
+
+*French
+Calinou
+
+*Portuguese
+Ricardo "Hellgardia" Silva
+
+*Romanian
+MirceaKitsune
+
+*Russian
+Lord Canistra
+Nikoli
+
 **Active Contributors
 Antonio "terencehill" Piu
 Ben "MooKow" Banker
@@ -59,7 +84,9 @@ Kristian "morfar" Johansson
 kojn
 Maik "SavageX" Merten
 MrBougo
+Ruszkai "C.Brutail" Ákos
 Samual Lenks
+Severin "sev" Meyer
 Stephan "esteel" Stahl
 Wolfgang "Blub\0" Bumiller
 
@@ -120,7 +147,6 @@ Rick "Rat" Kelley
 Robert "ai" Kuroto
 Ronan
 Sajt
-Severin "sev" Meyer
 Shaggy
 Shank
 Simon O'Callaghan