Update Channels

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

diff --git a/Channels.md b/Channels.md
index 95b58427ddbf4fc965f51af3f5a0ef761b0ecbdd..95d3cfcb89d4b19101496ebd5165d0398323ce57 100644 (file)
--- a/Channels.md
+++ b/Channels.md
@@ -1,6 +1,12 @@
 Internet Relay Chat and Instant Messaging channels
 ==================================================
 
+Matrix
+---
+
+General chat and help is in [#main:xonotic.org](https://matrix.to/#/#main:xonotic.org)  
+Developer chat is in [#dev:xonotic.org](https://matrix.to/#/#dev:xonotic.org)
+
 IRC
 ---
 
@@ -8,30 +14,32 @@ 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
+    #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      - Former channel for 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
@@ -44,19 +52,22 @@ For a short introduction to IRC, [skip to the bottom of this page](Channels#gene
     #theregulars         - The Regulars
     #uc.xonotic          - unconnected
     #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
     #Prophets.DM       - Prophets DM server
     #Prophets.Duel     - Prophets Insta 1v1 server
-    #Prophets.XDF      - Propehts DeFrag server
+    #Prophets.XDF      - Prophets DeFrag server
+    #psyx.servers      - PsyX servers
     #regulars.servers  - More The Regulars servers
     #smb.1v1           - HUB Duel servers
     #theregulars       - The Regulars InstaGib server
@@ -65,10 +76,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
@@ -85,6 +92,25 @@ 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 QuakeNet IRC:
+
+| Discord | QuakeNet IRC |
+| ------ | ------ |
+| #general | #xonotic |
+| #mapping | #xonotic.editing |
+| #tournaments | #xonotic.cup |
+| #xonotic_pickup | #xonotic.pickup |
+| #stream_announcements | #xonotic.streams |
+| #french | #xonotic.fr |
+| #german | #xonotic.de |
+| #russian | #xonotic.ru |
+| #spanish | #xonotic.sp |
+
 General IRC info and rules
 --------------------------
 
@@ -134,5 +160,4 @@ It is also considered rude to highlight (typing other peoples names) someone rep
 This goes mostly for help channels, but repeating a question multiple times within minutes doesn’t get you an answer any faster.
 This is also considered rude and more likely will get you ignored.
 People who have been away tend to read their chat history or backlog and will get back to you on their own.
-But on a very busy channel, your text might get overlooked and you can repeat it after waiting an appropriate time.
-
+But on a very busy channel, your text might get overlooked and you can repeat it after waiting an appropriate time.
\ No newline at end of file