Merge remote-tracking branch 'upstream/master'

modules/config_games/server_configs/squad_linux64.xml

@@ -82,7 +82,7 @@
     <file description="Server Configurations">SquadGame/ServerConfig/Server.cfg</file>
     <file description="RCON Configurations">SquadGame/ServerConfig/Rcon.cfg</file>
     <file description="Admin Configurations">SquadGame/ServerConfig/Admins.cfg</file>
-    <file description="Map Rotation Configurations">SquadGame/ServerConfig/MapRotation.cfg</file>
+    <file description="Map Rotation Configurations">SquadGame/ServerConfig/LayerRotation.cfg</file>
     <file description="Server Messages Configurations">SquadGame/ServerConfig/ServerMessages.cfg</file>
   </configuration_files>
 </game_config>

modules/config_games/server_configs/squad_win64.xml

@@ -78,7 +78,7 @@
     <file description="Server Configurations">SquadGame/ServerConfig/Server.cfg</file>
     <file description="RCON Configurations">SquadGame/ServerConfig/Rcon.cfg</file>
     <file description="Admin Configurations">SquadGame/ServerConfig/Admins.cfg</file>
-    <file description="Map Rotation Configurations">SquadGame/ServerConfig/MapRotation.cfg</file>
+    <file description="Map Rotation Configurations">SquadGame/ServerConfig/LayerRotation.cfg</file>
     <file description="Server Messages Configurations">SquadGame/ServerConfig/ServerMessages.cfg</file>
   </configuration_files>
 </game_config>

modules/config_games/server_configs/valheim_linux64.xml

@@ -9,7 +9,6 @@
  <cli_params>
   <cli_param options="sq" cli_string="-savedir" id="HOME_PATH"/>
   <cli_param id="PORT" cli_string="-port" options="s"/>
-  <cli_param id="HOSTNAME" cli_string="-name" options="sq"/>
  </cli_params>
 <max_user_amount>10</max_user_amount>
  <mods>
@@ -20,6 +19,10 @@
   </mod>
  </mods>
 <server_params>
+ <param id="HOSTNAME" key="-name" type="text">
+ <default>Valheim server</default>
+ <caption>Server Name</caption>
+</param>
  <param id="WORLD" key="-world" type="text">
 <default>Dedicated</default>
  <caption>Server World</caption>

modules/config_games/server_configs/valheim_win64.xml

@@ -8,8 +8,7 @@
  <cli_template>%HOSTNAME% %PORT% %HOME_PATH% %WORLD% %PASSWORD% %PUBLIC%</cli_template>
  <cli_params>
   <cli_param options="sq" cli_string="-savedir" id="HOME_PATH"/>
-  <cli_param id="PORT" cli_string="-port" options="s"/>  
-  <cli_param id="HOSTNAME" cli_string="-name" options="sq"/>
+  <cli_param id="PORT" cli_string="-port" options="s"/>
  </cli_params>
 <console_log>logs/connection_log_29615.txt</console_log>
 <max_user_amount>10</max_user_amount>
@@ -21,6 +20,10 @@
   </mod>
  </mods>
 <server_params>
+ <param id="HOSTNAME" key="-name" type="text">
+ <default>Valheim server</default>
+ <caption>Server Name</caption>
+</param>
 <param id="WORLD" key="-world" type="text">
  <default>Dedicated</default>
  <caption>Server World</caption>