Merge remote-tracking branch 'origin/terencehill/keep_color_in_wrapped_lines'

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

diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index d93c2f32a451bf0dd7aa59ec3b1bbd09704021e2..8f2ddab6c9ad842b1d5578a6b1d4c9b48abadb1e 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
@@ -61,7 +62,7 @@ by Forest "LordHavoc" Hale
 **Translators
 
 *Dutch
-freefang
+Alexander "freefang" van Dam
 PinkRobot
 
 *German
@@ -109,11 +110,12 @@ chooksta
 cortez
 Cuinn "Cuinnton" Herrick
 Florian Paul "lda17h" Schmidt
-Florian Paul Schmidt
 kojn
 Kristian "morfar" Johansson
+kuniuthefrogg
 magorian
 Maik "SavageX" Merten
+Marvin "Mirio" Beck
 Mick Rippon
 MrBougo
 parasti
@@ -121,8 +123,7 @@ 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