Upload attachment SpectatorHUD.jpg

[xonotic/xonotic.wiki.git] / Channels.md

diff --git a/Channels.md b/Channels.md
index 1bb3d8c16248d23ac81dc6c5c925fbfde8ad7919..100d001c9a33d854ae670625856edbd882e06df1 100644 (file)
--- a/Channels.md
+++ b/Channels.md
@@ -12,13 +12,14 @@ For a short introduction to IRC, [skip to the bottom of this page](Channels#gene
 
 ### QuakeNet (irc.quakenet.org:6667) - https://webchat.quakenet.org/
 
-    #xonotic           - General purpose channel, bridged  to [discord](https://discordapp.com/invite/0uxcsw1XMkaOB936)
+    #xonotic           - General purpose channel, bridged  to discord: https://discordapp.com/invite/0uxcsw1XMkaOB936
     #xonotic.cup       - Cup channel
-    #xonotic.duel      - Duel servers (psyx, FPS, WTWRP, pacman)
+    #xonotic.duel      - Duel servers (PsyX, PAC)
     #xonotic.editing   - Channel for mapmakers, modelers, texturers, etc.
     #xonotic.maps      - Channel for xonotic.co
     #xonotic.pickup    - Pickup channel
     #xonotic.translate - Channel to discuss translation issues
+    #xonotic.bar       - Off-topic conversations
 
 Country/Region specific IRC channels:
 
@@ -27,6 +28,7 @@ Country/Region specific IRC channels:
     #xonotic.fr - Xonotic France
     #xonotic.na - Xonotic North America
     #xonotic.ru - Xonotic Russia
+    #xonotic.sp - Xonotic Spanish
 
 Clan channels:
 
@@ -56,6 +58,7 @@ Server channels:
     #dtg.ctf           - Die Tunichtguten server (Insta CTF)
     #eac.xonotic       - Evil Ant Colony servers
     #element.ctf       - LMNT servers
+    #eris.xonotic      - Eris votable - the best motherfucking xon server
     #jeff-xonotic      - Jeff servers
     #mon.sa            - LX' Overkill (formerly MoN servers (Overkill + Vehicle))
     #pac.xon           - WTWRP, FPS, pacman non-Duel servers
@@ -86,6 +89,13 @@ Jabber XMPP MUCs
     xonotic at conference.jabber.ru - Russian channel
     xonotic at conference.jabber.org - English channel
 
+Discord
+-------
+
+[invite link](https://discordapp.com/invite/0uxcsw1XMkaOB936)
+
+Some channels are bridged to IRC.
+
 General IRC info and rules
 --------------------------