Merge branch 'develop' into feature/prettier

.editorconfig

@@ -12,14 +12,17 @@ trim_trailing_whitespace = true
 end_of_line = lf
 insert_final_newline = true
 
-# JSON Files
-[*.{json,json5,webmanifest}]
-indent_size = 2
-
 # YAML Files
 [*.{yml,yaml}]
 indent_size = 2
+indent_style = space
 
-# Bash Files
-[*.sh]
-end_of_line = lf
+# JSON Files
+[*.{json,json5,webmanifest}]
+indent_size = 2
+indent_style = space
+
+# BASH Files
+[*.{.sh}]
+indent_style = tab
+indent_size = 4

lgsm/config-default/config-lgsm/stserver/_default.cfg

@@ -10,16 +10,17 @@
 
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
 ip="0.0.0.0"
+servername="LinuxGSM"
 port="27500"
 queryport="27015"
 worldtype="Moon"
+maxplayers="10"
 autosaveinterval=300
-clearinterval=60
 worldname="moon_save"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 # Edit with care
-startparameters="-batchmode -nographics -autostart -gameport=${port} -updateport=${queryport} -worldtype=${worldtype} -loadworld=${worldname} -worldname=${worldname} -autosaveinterval=${autosaveinterval} -clearallinterval=${clearinterval}"
+startparameters="-NEWGAME ${worldtype} -LOADGAME ${worldname} -settings ServerName ${servername} StartLocalHost true ServerVisible true ServerMaxPlayers ${maxplayers} GamePort ${port} UpdatePort ${queryport} UPNPEnabled true AutoSave true SaveInterval ${autosaveinterval}"
 
 #### LinuxGSM Settings ####
 
@@ -139,7 +140,7 @@ steammaster="false"
 # 9: GoldSrc
 # 10: Avorion
 # 11: end
-stopmode="2"
+stopmode="3"
 
 ## Query mode
 # 1: session only
@@ -168,8 +169,8 @@ systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executable="./rocketstation_DedicatedServer.x86_64"
 servercfgdir="${systemdir}"
-servercfg="default.ini"
-servercfgdefault="default.ini"
+servercfg="setting.xml"
+servercfgdefault="setting.xml"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory

lgsm/functions/command_debug.sh

@@ -32,7 +32,7 @@ info_game.sh
 fn_print_header
 {
 	echo -e "${lightblue}Distro:\t\t${default}${distroname}"
-	echo -e "${lightblue}Arch:\t\t${default}${arch}"
+	echo -e "${lightblue}Architecture:\t\t${default}${arch}"
 	echo -e "${lightblue}Kernel:\t\t${default}${kernel}"
 	echo -e "${lightblue}Hostname:\t\t${default}${HOSTNAME}"
 	echo -e "${lightblue}tmux:\t\t${default}${tmuxv}"