diff --git a/.travis.yml b/.travis.yml index 7265e34a..40541d51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,7 +85,7 @@ script: notifications: irc: channels: - - "irc.freenode.org#megaglest" + - "irc.libera.chat#megaglest" skip_join: true use_notice: true on_success: change diff --git a/docs/README.txt b/docs/README.txt index 73cba973..2d81b290 100644 --- a/docs/README.txt +++ b/docs/README.txt @@ -215,7 +215,7 @@ network slots and the other players have to join. The best ways to find people to play a multi-player game are: a) using the Internet Game menu b) scheduling a game on the MegaGlest forums -c) finding other players on the #megaglest-lobby IRC channel on irc.freenode.net. +c) finding other players on the #megaglest-lobby IRC channel on irc.libera.chat. For LAN play, clients may click the 'Find LAN games' menu item to find servers with an open network slot on the local network (this uses UDP broadcasting). @@ -281,6 +281,6 @@ their own by reading up on available documentation before getting in touch. http://forum.megaglest.org - Contact us on IRC: - Network: chat.freenode.net + Network: irc.libera.chat Channel: #megaglest Or use the webchat at http://chat.megaglest.org/ diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp index 3c8b9063..0751271d 100644 --- a/source/glest_game/facilities/game_util.cpp +++ b/source/glest_game/facilities/game_util.cpp @@ -212,16 +212,16 @@ string getAboutString1(int i) { case 0: return "MegaGlest " + glestVersionString + " (" + "Shared Library " + sharedLibVersionString + ")"; case 1: return GIT_Rev; case 2: return "Copyright 2001-2010 The Glest Team"; - case 3: return "Copyright 2010-2017 The MegaGlest Team"; + case 3: return "Copyright 2010-2021 The MegaGlest Team"; } return ""; } string getAboutString2(int i) { switch(i) { - case 0: return "Web: http://megaglest.org"; + case 0: return "Web: https://megaglest.org"; case 1: return "Bug reports: " + string(mailString); - case 2: return "IRC: irc://irc.freenode.net/megaglest"; + case 2: return "IRC: irc://irc.libera.chat/megaglest"; } return ""; } diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/glest_game/menu/menu_state_masterserver.cpp index 39f371b1..720b84c4 100644 --- a/source/glest_game/menu/menu_state_masterserver.cpp +++ b/source/glest_game/menu/menu_state_masterserver.cpp @@ -33,7 +33,7 @@ namespace Glest{ namespace Game{ DisplayMessageFunction MenuStateMasterserver::pCB_DisplayMessage = NULL; -static string IRC_SERVER = "irc.freenode.net"; +static string IRC_SERVER = "irc.libera.chat"; static string IRC_CHANNEL = "#megaglest-lobby"; // ===================================================== diff --git a/source/masterserver b/source/masterserver index c8717d3a..fda4f82d 160000 --- a/source/masterserver +++ b/source/masterserver @@ -1 +1 @@ -Subproject commit c8717d3a5df60f623b454de020090cfededde149 +Subproject commit fda4f82d1eab1c23bbec351cdd2e0ba49c88b4fa