Skip to content

Commit 1e165ce

Browse files
committed
Merge branch 'hotfix/v24.1.3'
2 parents c3349fc + 94849a1 commit 1e165ce

File tree

7 files changed

+19
-8
lines changed

7 files changed

+19
-8
lines changed

.github/workflows/details-check.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: Details Check
33
on:
44
workflow_dispatch:
55
push:
6+
branches:
7+
- develop
68

79
concurrency:
810
group: details-check-${{ github.ref_name }}

.github/workflows/update-check.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: Update Check
33
on:
44
workflow_dispatch:
55
push:
6+
branches:
7+
- develop
68

79
concurrency:
810
group: update-check-${{ github.ref_name }}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111
## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
1212
servername="LinuxGSM"
1313

14-
# Use game server config file to edit, used for port check script (workaround)
14+
# For community servers (serverlist) you need to change these settings (publicip & publicport) in the gameserver config file aswell
1515
port="8211"
16+
steamport="27015"
1617

1718
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
1819
## Game Server Docs | https://tech.palworldgame.com/dedicated-server-guide#linux
19-
startparameters="EpicApp=PalServer -useperfthreads -NoAsyncLoadingThread -UseMultithreadForDS -servername='${servername}'"
20+
startparameters="EpicApp=PalServer -useperfthreads -NoAsyncLoadingThread -UseMultithreadForDS -servername='${servername}' -port='${port}' -queryport='${steamport}'"
2021

2122
#### LinuxGSM Settings ####
2223

lgsm/modules/core_modules.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
1010

11-
modulesversion="v24.1.2"
11+
modulesversion="v24.1.3"
1212

1313
# Core
1414

lgsm/modules/info_game.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ fn_info_game_pvr() {
621621
fn_info_game_pw() {
622622
servername="${servername:-"NOT SET"}"
623623
port="${port:-"0"}"
624-
steamport="27015"
624+
steamport="${steamport:-"0"}"
625625
unknownport="1985"
626626
}
627627

@@ -1978,7 +1978,7 @@ fn_info_game_sdtd() {
19781978
# Config Type: Parameters (with an ini)
19791979
fn_info_game_sf() {
19801980
# Parameters
1981-
servername="${selfname:-"NOT SET"}"
1981+
servername="${servername:-"NOT SET"}"
19821982
port="${port:-"0"}"
19831983
queryport="${queryport:-"0"}"
19841984
beaconport="${beaconport:-"0"}"
@@ -2131,7 +2131,7 @@ fn_info_game_tw() {
21312131

21322132
# Config Type: Parameters
21332133
fn_info_game_unt() {
2134-
servername="${selfname:-"NOT SET"}"
2134+
servername="${servername:-"NOT SET"}"
21352135
port="${port:-"0"}"
21362136
queryport="${port}"
21372137
steamport="$((port + 1))"

lgsm/modules/mods_list.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@ steamworksscrapeurl="https://users.alliedmods.net/~kyles/builds/SteamWorks"
7171
steamworkslatestfile=$(curl --connect-timeout 10 -sL ${steamworksscrapeurl} | grep -m 1 linux | cut -d '"' -f 4)
7272
steamworksdownloadurl="${steamworksscrapeurl}/${steamworkslatestfile}"
7373
steamworksurl="${steamworksdownloadurl}"
74+
# Stripper:Source
75+
stripperversion="1.2.2-git141"
76+
stripperlatestfile="stripper-${stripperversion}-linux.tar.gz"
77+
stripperdownloadurl="http://www.bailopan.net/stripper/snapshots/1.2/${stripperlatestfile}"
78+
stripperurl="${stripperdownloadurl}"
79+
7480
# CS:GO Mods
7581
get5lastbuild=$(curl --connect-timeout 10 -sL https://api.github.com/repos/splewis/get5/releases/latest | jq '.assets[] |select(.browser_download_url | endswith(".tar.gz"))')
7682
get5latestfile=$(echo -e "${get5lastbuild}" | jq -r '.name')
@@ -149,7 +155,7 @@ mod_info_ts_amxx=(MOD "amxmodxts" "AMX Mod X: The Specialists" "${amxxtsurl}" "$
149155
mod_info_metamodsource=(MOD "metamodsource" "Metamod: Source" "${metamodsourceurl}" "${metamodsourcelatestfile}" "0" "LowercaseOff" "${systemdir}" "addons/metamod/metaplugins.ini;" "source;" "GAMES" "NOTGAMES" "https://www.sourcemm.net" "Plugins Framework")
150156
mod_info_sourcemod=(MOD "sourcemod" "SourceMod" "${sourcemodurl}" "${sourcemodlatestfile}" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "source;" "GAMES" "NOTGAMES" "http://www.sourcemod.net" "Admin Features (requires Metamod: Source)")
151157
mod_info_steamworks=(MOD "steamworks" "SteamWorks" "${steamworksurl}" "${steamworkslatestfile}" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Counter-Strike: Global Offensive;" "NOTGAMES" "https://github.com/KyleSanderson/SteamWorks" "Exposing SteamWorks functions to SourcePawn")
152-
mod_info_stripper=(MOD "stripper" "Stripper Source" "http://www.bailopan.net/stripper/snapshots/1.2/stripper-1.2.2-git129-linux.tar.gz" "stripper-1.2.2-git129-linux.tar.gz" "0" "LowercaseOff" "${systemdir}" "addons/stripper/maps;" "ENGINES" "Counter-Strike: Global Offensive;Counter-Strike: Source;Day of Defeat: Source;Half Life: Deathmatch;Half Life 2: Deathmatch;Insurgency;Left 4 Dead;Left 4 Dead 2;Nuclear Dawn;Team Fortress 2;" "NOTGAMES" "http://www.bailopan.net/stripper/" "Add or remove objects from map (requires MetaMod)")
158+
mod_info_stripper=(MOD "stripper" "Stripper Source" "${stripperurl}" "${stripperlatestfile}" "0" "LowercaseOff" "${systemdir}" "addons/stripper/maps;" "ENGINES" "Counter-Strike: Global Offensive;Counter-Strike: Source;Day of Defeat: Source;Half Life: Deathmatch;Half Life 2: Deathmatch;Insurgency;Left 4 Dead;Left 4 Dead 2;Nuclear Dawn;Team Fortress 2;" "NOTGAMES" "http://www.bailopan.net/stripper/" "Add or remove objects from map (requires MetaMod)")
153159

154160
# CS:GO Mods
155161
mod_info_gokz=(MOD "gokz" "GOKZ" "${gokzlatestlink}" "${gokzlatestfile}" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "ENGINES" "Counter-Strike: Global Offensive;" "NOTGAMES" "https://github.com/KZGlobalTeam/gokz" "GOKZ ${gokzlatestversion} - Implements the KZ game mode (requires SourceMod and MetaMod)")

linuxgsm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if [ -f ".dev-debug" ]; then
2424
set -x
2525
fi
2626

27-
version="v24.1.2"
27+
version="v24.1.3"
2828
shortname="core"
2929
gameservername="core"
3030
commandname="CORE"

0 commit comments

Comments
 (0)