X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.wiki.git;a=blobdiff_plain;f=Channels.md;h=100d001c9a33d854ae670625856edbd882e06df1;hp=6a793716aba14e92f736abc29c27a04464625168;hb=562df3bd6b579ac9abb21acc5f41abd32a50f2f8;hpb=94ecf90d9f3c4a458d4b511ced855dd31be7f390

diff --git a/Channels.md b/Channels.md
index 6a79371..100d001 100644
--- a/Channels.md
+++ b/Channels.md
@@ -6,32 +6,38 @@ IRC
 
 For a short introduction to IRC, [skip to the bottom of this page](Channels#general-irc-info-and-rules).
 
+### FreeNode (chat.freenode.net:6667) - https://webchat.freenode.net/
+
+    #xonotic - Game developer channel. Non-development subjects should be directed to the main Xonotic channel on QuakeNet
+
 ### QuakeNet (irc.quakenet.org:6667) - https://webchat.quakenet.org/
 
-    #xonotic           - General purpose channel
+    #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
+Country/Region specific IRC channels:
 
     #xonotic.au - Xonotic Australia
     #xonotic.de - Xonotic Germany
     #xonotic.fr - Xonotic France
     #xonotic.na - Xonotic North America
     #xonotic.ru - Xonotic Russia
+    #xonotic.sp - Xonotic Spanish
 
-#### Clan channels
+Clan channels:
 
     #bot.xonotic         - BOT
     #cf.etqw             - Combat Folk
     #clanexe             - .exe
     #dietunichtguten     - Die Tunichtguten
     #evil.ant.colony     - Evil Ant Colony
-    #lovers              - Lovers
+    #Lover               - Lovers
     #kwestion            - Kwestion
     #mon.xonotic         - Monks of Nexuiz
     #nsb.nexuiz          - NSB - The Dyslexic Loser Mob
@@ -46,12 +52,13 @@ For a short introduction to IRC, [skip to the bottom of this page](Channels#gene
     #xonotic.butt        - BUTT
     #xon.fsmp            - FSMP
 
-#### Server channels
+Server channels:
 
     #clanexe           - .exe servers
     #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
@@ -66,10 +73,6 @@ For a short introduction to IRC, [skip to the bottom of this page](Channels#gene
     #xonorun           - Gnom servers
     #xonotic.smb       - SMB servers
 
-### FreeNode (chat.freenode.net:6667) - https://webchat.freenode.net/
-
-    #xonotic - Game developer channel. Non-development subjects should be directed to the main Xonotic channel on QuakeNet
-
 ### ARCNet (irc.arcnet.vapor.com:6667)
 
     #dcc.admins - DCC Admins
@@ -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
 --------------------------