Merge branch 'develop' into repo-sync/master

Author: dgibbs64

.editorconfig

@@ -1,28 +1,17 @@
 # EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs.
-# Atom: Please assure your Atom's config setting Tab Type is set to auto, otherwise Atom-EditorConfig may not work as expected. Also disable whitespace package.
 # http://editorconfig.org/
 
 root = true
 
 [*]
 charset = utf-8
-indent_style = tab
-indent_size = 4
-trim_trailing_whitespace = true
 end_of_line = lf
-insert_final_newline = true
-
-# YAML Files
-[*.{yml,yaml}]
-indent_size = 2
-indent_style = space
-
-# JSON Files
-[*.{json,json5,webmanifest}]
 indent_size = 2
 indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
 
 # BASH Files
 [*.{.sh}]
-indent_style = tab
 indent_size = 4
+indent_style = tab

.github/workflows/details-check.yml

@@ -68,6 +68,10 @@ jobs:
           else
             curl -f -o config "https://raw.githubusercontent.com/GameServerManagers/Game-Server-Configs/main/${{ matrix.shortname }}/${{ steps.sets-servercfgname.outputs.servercfgname }}"
           fi
+
+      - name: Pre-load LinuxGSM
+        run: LGSM_GITHUBBRANCH="${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server details
+
       - name: Display config
         run: |
           if [ "${{ steps.sets-servercfgname.outputs.servercfgname }}" == "" ]; then

.github/workflows/update-check.yml

@@ -13,12 +13,12 @@ concurrency:
 jobs:
   update-check:
     if: github.repository_owner == 'GameServerManagers'
-    continue-on-error: true
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
-        shortname: [css, fctr, jk2, mc, mcb, mta, pmc, ts3, ut99, vints]
+        shortname: [css, fctr, jk2, mc, mcb, mta, pmc, ts3, ut99, vints, xnt]
 
     steps:
       - name: Download linuxgsm.sh

.shellcheckrc

@@ -0,0 +1 @@
+disable=SC2154

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

@@ -9,6 +9,8 @@
 #### Game Server Settings ####
 
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
+# Note that for HL2DM, maxplayers > 33 must be specified like so:
+# maxplayers="101 -unrestricted_maxplayers"
 ip="0.0.0.0"
 port="27015"
 clientport="27005"

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

@@ -12,11 +12,12 @@
 ip="0.0.0.0"
 queryport="15777"
 beaconport="15000"
+reliableport="8888"
 port="7777"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 ## Game Server Docs | https://satisfactory.fandom.com/wiki/Dedicated_servers
-startparameters="FactoryGame -Port=${port} -ServerQueryPort=${queryport} -BeaconPort=${beaconport} -log"
+startparameters="FactoryGame -Port=${port} -ServerQueryPort=${queryport} -BeaconPort=${beaconport} -ReliablePort=${reliableport} -log"
 
 #### LinuxGSM Settings ####
 

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

@@ -9,6 +9,8 @@
 #### Game Server Settings ####
 
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
+# Note that for TF2, maxplayers > 33 must be specified like so:
+# maxplayers="101 -unrestricted_maxplayers"
 ip="0.0.0.0"
 port="27015"
 clientport="27005"

lgsm/data/almalinux-8.csv

@@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel,libatomic,pulseaudio-libs-devel
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,java-21-openjdk
 vs
 wet

lgsm/data/almalinux-9.csv

@@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel,libatomic,pulseaudio-libs-devel
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,java-21-openjdk
 vs
 wet

lgsm/data/centos-7.csv

@@ -127,7 +127,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel,libatomic,pulseaudio-libs-devel
-vints,dotnet-runtime-7.0
+vints,dotnet-runtime-8.0
 vpmc,java-11-openjdk
 vs
 wet