X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.wiki.git;a=blobdiff_plain;f=Channels.md;h=100d001c9a33d854ae670625856edbd882e06df1;hp=ea91fda0e063544942eeb9e27ffc8fd27d87cdc1;hb=3b611e79cedbcc996d79f4e13c34bcf627ce829d;hpb=0cb1098d6ae07764d4a584f72331a7d5c6fed559

diff --git a/Channels.md b/Channels.md
index ea91fda..100d001 100644
--- a/Channels.md
+++ b/Channels.md
@@ -6,72 +6,72 @@ IRC
 
 For a short introduction to IRC, [skip to the bottom of this page](Channels#general-irc-info-and-rules).
 
-### Quakenet (irc.quakenet.org:6667)
+### FreeNode (chat.freenode.net:6667) - https://webchat.freenode.net/
 
-    #xonotic           - General purpose channel
-    #xonotic.admins    - Channel for server admins
+    #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, bridged  to discord: https://discordapp.com/invite/0uxcsw1XMkaOB936
     #xonotic.cup       - Cup channel
-    #xonotic.duel      - Duel League channel
+    #xonotic.duel      - Duel servers (PsyX, PAC)
     #xonotic.editing   - Channel for mapmakers, modelers, texturers, etc.
-    #xonotic.insta     - Insta channel
-    #xonotic.ninjaz    - Xonotic Ninjaz (former Nexuiz Ninjaz)
+    #xonotic.maps      - Channel for xonotic.co
     #xonotic.pickup    - Pickup channel
     #xonotic.translate - Channel to discuss translation issues
-    #xdf               - Xonotic DeFrag
+    #xonotic.bar       - Off-topic conversations
 
-#### Country specific IRC channels
+Country/Region specific IRC channels:
 
     #xonotic.au - Xonotic Australia
     #xonotic.de - Xonotic Germany
-    #xonotic.fi - Xonotic Finland
-    #xonotic.it - Xonotic Italy
-    #xonotic.ro - Xonotic Romania
+    #xonotic.fr - Xonotic France
+    #xonotic.na - Xonotic North America
     #xonotic.ru - Xonotic Russia
-    #xonotic.se - Xonotic Sweden
-    #xonotic.uk - Xonotic United Kingdom
+    #xonotic.sp - Xonotic Spanish
 
-#### Clan channels
+Clan channels:
 
     #bot.xonotic         - BOT
     #cf.etqw             - Combat Folk
-    #conquerors          - Conquerors
-    #dbc                 - DodgingBullets
-    #dear                - dear
-    #deathmatchers       - Deathmatchers
+    #clanexe             - .exe
     #dietunichtguten     - Die Tunichtguten
-    #eatseakittens       - Eat Sea Kittens
     #evil.ant.colony     - Evil Ant Colony
-    #exile.xonotic       - eXiLe
-    #lovers              - Lovers
-    #menintux            - Men in Tux
+    #Lover               - Lovers
+    #kwestion            - Kwestion
     #mon.xonotic         - Monks of Nexuiz
     #nsb.nexuiz          - NSB - The Dyslexic Loser Mob
     #OHSNAP!             - OHSNAP!
     #pb.xonotic          - PeaceBrothers
-    #profoundvelocity    - Profound Velocity
-    #ps.xonotic          - Paradox Space
     #psyx                - Psychos of Xonotic
     #sh.nexuiz           - Shell
     #smb                 - Super Mario Brothers
     #smokebreak          - Smoke Break
-    #unconnected.xonotic - unconnected
-
-#### Server channels
-
-    #dtg.ctf           - Die Tunichtguten server (Minsta CTF)
-    #esk.xonotic       - Eat Sea Kittens server (Minsta CTF)
-    #exile.xonotic.1v1 - eXiLe servers (Minstagib + Duel)
-    #hoctf             - House of CTF
+    #theregulars         - The Regulars
+    #uc.xonotic          - unconnected
+    #xonotic.butt        - BUTT
+    #xon.fsmp            - FSMP
+
+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))
-    #wtwrp.ok          - WTWRP Overkill
-    #Prophets.Duel     - Prophets Minsta 1v1 server
+    #pac.xon           - WTWRP, FPS, pacman non-Duel servers
+    #Prophets.DM       - Prophets DM server
+    #Prophets.Duel     - Prophets Insta 1v1 server
     #Prophets.XDF      - Propehts DeFrag server
-    #uc.xon            - Unconnected servers
+    #regulars.servers  - More The Regulars servers
+    #smb.1v1           - HUB Duel servers
+    #theregulars       - The Regulars InstaGib server
+    #wtwrp.ok          - WTWRP Overkill
     #xdf               - Xonotic DeFrag server
-
-### FreeNode (chat.freenode.net:6667)
-
-    #xonotic - Game developer channel. Non-development subjects should be directed to the main Xonotic channel on QuakeNet
+    #xonorun           - Gnom servers
+    #xonotic.smb       - SMB servers
 
 ### ARCNet (irc.arcnet.vapor.com:6667)
 
@@ -89,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
 --------------------------