From 4fd14ce55f1bdfed47101bb5f699512bb1675538 Mon Sep 17 00:00:00 2001 From: Sylvain CAU Date: Wed, 28 Dec 2022 11:14:31 -0700 Subject: [PATCH 1/3] [Valheim] Fix some wording and default values (#263) --- valheimconfig.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/valheimconfig.json b/valheimconfig.json index e2d0907..fe86227 100644 --- a/valheimconfig.json +++ b/valheimconfig.json @@ -120,7 +120,7 @@ },{ "DisplayName":"Please Read!", "Category":"Valheim Plus - Basic Settings", - "Description":"The settings on this page are spit up into sections. The start of a section will be labeled with \"sectionName Enable\" the setting in-between are only modifiable if that section is enabled.", + "Description":"The settings on this page are split up into sections. The start of a section will be labeled with \"sectionName Enable\" the setting in-between are only modifiable if that section is enabled.", "Keywords":"Read,Please,Info", "FieldName":"PleaseReadBasicSettings", "InputType":"hidden" @@ -209,7 +209,7 @@ "IncludeInCommandLine":false, "DefaultValue":"4", "EnumValues":{}, - "Suffix": "seconds" + "Suffix": "items" },{ "DisplayName":"Beehive Auto Deposit", "Category":"Valheim Plus - Basic Settings", @@ -2267,7 +2267,7 @@ },{ "DisplayName":"Please Read!", "Category":"Valheim Plus - Player Settings", - "Description":"The settings on this page are spit up into sections. The start of a section will be labeled with \"sectionName Enable\" the setting in-between are only modifiable if that section is enabled.", + "Description":"The settings on this page are split up into sections. The start of a section will be labeled with \"sectionName Enable\" the setting in-between are only modifiable if that section is enabled.", "Keywords":"Read,Please,Info", "FieldName":"PleaseReadPlayerSettings", "InputType":"hidden" @@ -3396,7 +3396,7 @@ },{ "DisplayName":"Please Read!", "Category":"Valheim Plus - Server Settings", - "Description":"The settings on this page are spit up into sections. The start of a section will be labeled with \"sectionName Enable\" the setting in-between are only modifiable if that section is enabled.", + "Description":"The settings on this page are split up into sections. The start of a section will be labeled with \"sectionName Enable\" the setting in-between are only modifiable if that section is enabled.", "Keywords":"Read,Please,Info", "FieldName":"PleaseReadServerSettings", "InputType":"hidden" @@ -3816,7 +3816,7 @@ "IsFlagArgument":false, "ParamFieldName":"Camera.cameraFOV", "IncludeInCommandLine":false, - "DefaultValue":"6", + "DefaultValue":"65", "EnumValues":{}, "Suffix": "FOV" },{ From 1ec3102303171e85b1d9701638946d4071296190 Mon Sep 17 00:00:00 2001 From: IceOfWraith <96364530+IceOfWraith@users.noreply.github.com> Date: Thu, 29 Dec 2022 06:09:30 -0600 Subject: [PATCH 2/3] Update GatekeeperV2 (#264) * Update GatekeeperV2 This removes the requirement to use a special Docker image since the python3 tagged ampbase image includes pip now. This also adds the additional stuff into a script that runs with the update stages instead of being handled by the before mentioned image. These are very quick installs that take only a couple of seconds. * Update gatekeeperv2.kvp Co-authored-by: Greelan <53196309+Greelan@users.noreply.github.com> --- gatekeeperv2.kvp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gatekeeperv2.kvp b/gatekeeperv2.kvp index d3a90a7..043c247 100644 --- a/gatekeeperv2.kvp +++ b/gatekeeperv2.kvp @@ -10,7 +10,7 @@ Meta.ConfigManifest=gatekeeperv2config.json Meta.MetaConfigManifest=gatekeeperv2metaconfig.json Meta.ConfigRoot=gatekeeperv2.kvp Meta.MinAMPVersion= -Meta.SpecificDockerImage=cool11989/iceofwraith:gatekeeperv2 +Meta.SpecificDockerImage=cubecoders/ampbase:python3 Meta.DockerRequired=False Meta.ContainerPolicy=Recommended Meta.Prerequsites=[] @@ -54,7 +54,7 @@ App.RCONConnectRetrySeconds=5 App.RCONHeartbeatMinutes=0 App.RCONHeartbeatCommand=ping App.TelnetLoginFormat={0} -App.UpdateSources=[{"UpdateStageName":"Bot Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://github.com/k8thekat/GatekeeperV2/archive/refs/heads/main.zip","UnzipUpdateSource":true,"OverwriteExistingFiles":true,"DeleteAfterExtract":true}] +App.UpdateSources=[{"UpdateStageName":"Bot Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://github.com/k8thekat/GatekeeperV2/archive/refs/heads/main.zip","UnzipUpdateSource":true,"OverwriteExistingFiles":true,"DeleteAfterExtract":true},{"UpdateStageName":"Pip & Discord.py Script","UpdateSourcePlatform":"Linux","UpdateSource":"Executable","UpdateSourceData":"/bin/bash","UpdateSourceArgs":"-c \"pip install --upgrade pip && pip install numpy requests && git clone https://github.com/Rapptz/discord.py && cd discord.py && python3 -m pip install discord.py\""}] App.Compatibility=None App.SteamUpdateAnonymousLogin=True App.SteamForceLoginPrompt=False From fdea980d3031cc7f1118341135556c8337768e2a Mon Sep 17 00:00:00 2001 From: Greelan <53196309+Greelan@users.noreply.github.com> Date: Fri, 30 Dec 2022 07:32:59 +1100 Subject: [PATCH 3/3] Stationeers: update container policy (#265) --- stationeers.kvp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stationeers.kvp b/stationeers.kvp index 73d466f..1f388db 100644 --- a/stationeers.kvp +++ b/stationeers.kvp @@ -11,7 +11,8 @@ Meta.MetaConfigManifest=stationeersmetaconfig.json Meta.ConfigRoot=stationeers.kvp Meta.MinAMPVersion=2.4.0.2 Meta.SpecificDockerImage= -Meta.ContainerPolicy=Supported +Meta.ContainerPolicy=NotSupported +Meta.ContainerPolicyReason=The server's networking system RocketNet requires version >= 2.35 for glibc, which is not present on the Debian version used by AMP's Docker. Ideally use Ubuntu 22.04 to host the server on Linux. Meta.Prerequsites=[] Meta.ConfigReleaseState=NotSpecified App.DisplayName=Stationeers