From 0d81df6c4ec1e27fc3b40a57fc0cfe77cb1983bf Mon Sep 17 00:00:00 2001 From: JacksonTheMaster <81807824+JacksonTheMaster@users.noreply.github.com> Date: Wed, 17 Sep 2025 06:19:20 +0200 Subject: [PATCH 1/3] updated UI texts and defaults for terrain settings as beta is released now. Missing se and de localizations atm, will fallback to en --- UIMod/onboard_bundled/localization/de-DE.json | 8 +------- UIMod/onboard_bundled/localization/en-US.json | 14 +++++++------- UIMod/onboard_bundled/localization/sv-SE.json | 7 +------ UIMod/onboard_bundled/ui/config.html | 8 ++++---- src/config/config.go | 2 +- src/web/configpage.go | 6 +++--- src/web/templatevars.go | 6 +++--- 7 files changed, 20 insertions(+), 31 deletions(-) diff --git a/UIMod/onboard_bundled/localization/de-DE.json b/UIMod/onboard_bundled/localization/de-DE.json index 5ec5abd6..eb1f2454 100644 --- a/UIMod/onboard_bundled/localization/de-DE.json +++ b/UIMod/onboard_bundled/localization/de-DE.json @@ -26,7 +26,6 @@ "UIText_BasicSettings": "Basis", "UIText_NetworkSettings": "Netzwerk", "UIText_AdvancedSettings": "Erweitert", - "UIText_BetaSettings": "Beta", "basic": { "UIText_BasicServerSettings": "Grundlegende Servereinstellungen", "UIText_ServerName": "Servername", @@ -78,11 +77,7 @@ "UIText_GameBranch": "Spiel Branch", "UIText_GameBranchInfo": "Branch des Spiels. Bei Änderung SSUI Neustart erforderlich!" }, - "beta": { - "UIText_BetaOnlySettings": "NUR BETA: NEUE TERRAIN UND SPEICHERSYSTEM EINSTELLUNGEN", - "UIText_BetaWarning": "Diese Einstellungen sind nur nützlich bei Stationeers Dedicated Server Beta. Wechsel möglich unter Erweiterte Einstellungen -> Spiel Branch. Alte Speicherstände NICHT kompatibel, aber migrierbar mit JacksonTheMaster's Migration Tool. \"How to\" Infos im FAQ gelten auch für Dedicated Server.", - "UIText_UseNewTerrainAndSave": "Neues Terrain- und Speichersystem Nutzen", - "UIText_UseNewTerrainAndSaveInfo": "Auf TRUE setzen für .save Dateien im Backup Manager und Argument-Parsing. Bei false funktionieren nur Stationeers Versionen vor Terrain-Überarbeitung (≈ Mitte 2025). Standard false bis neues System veröffentlicht.", + "terrain": { "UIText_Difficulty": "Schwierigkeit", "UIText_DifficultyInfo": "Schwierigkeit für Welterstellung. Standard Normal wenn leer.", "UIText_StartCondition": "Startbedingung", @@ -177,7 +172,6 @@ "UIText_GameBranch_SkipButton": "Release Version nutzen", "UIText_NewTerrainAndSaveSystem_Title": "Wichtig", "UIText_NewTerrainAndSaveSystem_HeaderTitle": "Terrainsystem wählen", - "UIText_NewTerrainAndSaveSystem_StepMessage": "Gerade zu Beta gewechselt? Terrain- und Speichersystem umschalten! 'ja' eingeben zum Aktivieren oder 'nein' zum Deaktivieren.", "UIText_NewTerrainAndSaveSystem_PrimaryPlaceholder": "nein", "UIText_NewTerrainAndSaveSystem_PrimaryLabel": "Neues System aktivieren", "UIText_NewTerrainAndSaveSystem_SubmitButton": "Speichern & Weiter", diff --git a/UIMod/onboard_bundled/localization/en-US.json b/UIMod/onboard_bundled/localization/en-US.json index 4e0b9806..b41e566c 100644 --- a/UIMod/onboard_bundled/localization/en-US.json +++ b/UIMod/onboard_bundled/localization/en-US.json @@ -26,7 +26,7 @@ "UIText_BasicSettings": "Basic Settings", "UIText_NetworkSettings": "Network Settings", "UIText_AdvancedSettings": "Advanced Settings", - "UIText_BetaSettings": "Beta Settings", + "UIText_TerrainSettings": "New Terrain", "basic": { "UIText_BasicServerSettings": "Basic Server Settings", "UIText_ServerName": "Server Name", @@ -80,11 +80,11 @@ "UIText_AllowAutoGameServerUpdates": "Enable Auto Game Server Updates", "UIText_AllowAutoGameServerUpdatesInfo": "Allow the gameserver to automatically query for and update to the latest version. Attention: Restarts the server when a new version was found and installed. Will send multiple warning messages to the sever with SAY commands 60-10 seconds before the restart." }, - "beta": { - "UIText_BetaOnlySettings": "BETA ONLY: NEW TERRAIN AND SAVE SYSTEM SETTINGS", - "UIText_BetaWarning": "These settings are only useful if you are running the Stationeers Dedicated Server Beta. Switching is possible from Advanced Settings -> Game Branch. Old savegames are NOT compatible with the new system, but can be migrated with JacksonTheMaster's Migration tool.. Related \"how to\" Information on the FAQ there also applies to the Dedicated Server.", + "terrain": { + "UIText_TerrainSettingsHeader": "NEW TERRAIN AND SAVE SYSTEM SETTINGS", + "UIText_TerrainWarning": "These settings are only useful if you are running a Stationeers build NEWER than September 2025. Old savegames are NOT compatible with the new system, but can be migrated with JacksonTheMaster's Migration tool.. Related \"how to\" Information on the FAQ there also applies to the Dedicated Server.", "UIText_UseNewTerrainAndSave": "Use New Terrain and Save System", - "UIText_UseNewTerrainAndSaveInfo": "Set to TRUE to enable handling of .save files in the Backup manager and argument parsing. If set to false, only Stationeers versions before the terrain rework (≈ mid 2025) will work. Defaults to false until new Stationeers Terrain and Save System is released.", + "UIText_UseNewTerrainAndSaveInfo": "Set to TRUE to enable handling of .save files in the Backup manager and argument parsing. If set to false, only Stationeers versions before the terrain rework (≈ mid 2025) will work. Defaults to TRUE!", "UIText_Difficulty": "Difficulty", "UIText_DifficultyInfo": "Difficulty to create the world with. Defaults to Normal if empty.", "UIText_StartCondition": "Start Condition", @@ -176,8 +176,8 @@ "UIText_GameBranch_SkipButton": "Use Normal Version", "UIText_NewTerrainAndSaveSystem_Title": "IMPORTANT", "UIText_NewTerrainAndSaveSystem_HeaderTitle": "Select Terrain System", - "UIText_NewTerrainAndSaveSystem_StepMessage": "Just switched to Beta? If yes, enable handling of the new terrain and save system here. Enter 'yes' to enable or 'no' to use the old system.", - "UIText_NewTerrainAndSaveSystem_PrimaryPlaceholder": "no", + "UIText_NewTerrainAndSaveSystem_StepMessage": "Using an OLD branch, such as preterrain or older without the terrain system changes? If yes, disable handling of the new terrain and save system here. Enter 'yes' or skip to enable (default) or 'no' to use the old save and terrain system. If you are unsure, skip this step.", + "UIText_NewTerrainAndSaveSystem_PrimaryPlaceholder": "yes", "UIText_NewTerrainAndSaveSystem_PrimaryLabel": "Enable new System", "UIText_NewTerrainAndSaveSystem_SubmitButton": "Save & Continue", "UIText_NewTerrainAndSaveSystem_SkipButton": "Skip", diff --git a/UIMod/onboard_bundled/localization/sv-SE.json b/UIMod/onboard_bundled/localization/sv-SE.json index ac731882..77784747 100644 --- a/UIMod/onboard_bundled/localization/sv-SE.json +++ b/UIMod/onboard_bundled/localization/sv-SE.json @@ -26,7 +26,6 @@ "UIText_BasicSettings": "Grund", "UIText_NetworkSettings": "Nätverk", "UIText_AdvancedSettings": "Avancerad", - "UIText_BetaSettings": "Beta", "basic": { "UIText_BasicServerSettings": "Grundläggande serverinställningar", "UIText_ServerName": "Servernamn", @@ -80,11 +79,8 @@ "UIText_AllowAutoGameServerUpdates": "Aktivera automatiska uppdateringar av spelservern", "UIText_AllowAutoGameServerUpdatesInfo": "Tillåt spelservern att automatiskt söka efter och uppdatera till den senaste versionen. Obs! Servern startas om när en ny version har hittats och installerats. Flera varningsmeddelanden skickas till servern med SAY-kommandon 60–10 sekunder före omstarten." }, - "beta": { - "UIText_BetaOnlySettings": "ENDAST BETA: INSTÄLLNINGAR FÖR NYTT TERRÄNG- OCH SPARSYSTEM", - "UIText_BetaWarning": "Dessa inställningar är endast användbara om du kör Stationeers Dedicated Server Beta. Byte är möjligt via Avancerade inställningar -> Spelgren. Gamla sparfiler är INTE kompatibla med det nya systemet, men kan migreras med JacksonTheMasters Migreringsverktyg. Relaterad \"hur man gör\"-info i FAQ gäller även för Dedicated Server.", + "terrain": { "UIText_UseNewTerrainAndSave": "Använd nytt system", - "UIText_UseNewTerrainAndSaveInfo": "Sätt till TRUE för att aktivera hantering av .save-filer i Backup-hanteraren och argumentparsning. Om satt till false fungerar endast Stationeers-versioner före terrängomarbetningen (≈ mitten av 2025). Standard är false tills nya Stationeers terräng- och sparsystemet släpps.", "UIText_Difficulty": "Svårighetsgrad", "UIText_DifficultyInfo": "Svårighetsgrad för världsskapande. Standard är Normal om tomt.", "UIText_StartCondition": "Startvillkor", @@ -176,7 +172,6 @@ "UIText_GameBranch_SkipButton": "Använd standardversion", "UIText_NewTerrainAndSaveSystem_Title": "Viktigt", "UIText_NewTerrainAndSaveSystem_HeaderTitle": "Välj terrängsystem", - "UIText_NewTerrainAndSaveSystem_StepMessage": "Bytt till beta? Aktivera terräng- och sparsystem för att stödja det! Ange 'ja' för att aktivera eller 'nej' för att inaktivera.", "UIText_NewTerrainAndSaveSystem_PrimaryPlaceholder": "nej", "UIText_NewTerrainAndSaveSystem_PrimaryLabel": "Aktivera nytt system", "UIText_NewTerrainAndSaveSystem_SubmitButton": "Spara & fortsätt", diff --git a/UIMod/onboard_bundled/ui/config.html b/UIMod/onboard_bundled/ui/config.html index 3ceef7a3..64938633 100644 --- a/UIMod/onboard_bundled/ui/config.html +++ b/UIMod/onboard_bundled/ui/config.html @@ -56,7 +56,7 @@

{{.UIText_ServerConfig}}

- +
@@ -254,9 +254,9 @@

{{.UIText_AdvancedConfiguration}}

-
-

{{.UIText_BetaOnlySettings}}

-
{{.UIText_BetaWarning}}
+
+

{{.UIText_TerrainSettingsHeader}}

+
{{.UIText_TerrainWarning}}
diff --git a/src/config/config.go b/src/config/config.go index f1b304e7..a917c937 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -158,7 +158,7 @@ func applyConfig(cfg *JsonConfig) { BackupCleanupInterval = time.Duration(getInt(cfg.BackupCleanupInterval, "BACKUP_CLEANUP_INTERVAL", 730)) * time.Hour BackupWaitTime = time.Duration(getInt(cfg.BackupWaitTime, "BACKUP_WAIT_TIME", 30)) * time.Second - isNewTerrainAndSaveSystemVal := getBool(cfg.IsNewTerrainAndSaveSystem, "ENABLE_DOT_SAVES", false) + isNewTerrainAndSaveSystemVal := getBool(cfg.IsNewTerrainAndSaveSystem, "ENABLE_DOT_SAVES", true) IsNewTerrainAndSaveSystem = isNewTerrainAndSaveSystemVal cfg.IsNewTerrainAndSaveSystem = &isNewTerrainAndSaveSystemVal diff --git a/src/web/configpage.go b/src/web/configpage.go index 225ab365..41853a2b 100644 --- a/src/web/configpage.go +++ b/src/web/configpage.go @@ -177,7 +177,7 @@ func ServeConfigPage(w http.ResponseWriter, r *http.Request) { UIText_BasicSettings: localization.GetString("UIText_BasicSettings"), UIText_NetworkSettings: localization.GetString("UIText_NetworkSettings"), UIText_AdvancedSettings: localization.GetString("UIText_AdvancedSettings"), - UIText_BetaSettings: localization.GetString("UIText_BetaSettings"), + UIText_TerrainSettings: localization.GetString("UIText_TerrainSettings"), UIText_BasicServerSettings: localization.GetString("UIText_BasicServerSettings"), UIText_ServerName: localization.GetString("UIText_ServerName"), @@ -224,8 +224,8 @@ func ServeConfigPage(w http.ResponseWriter, r *http.Request) { UIText_AutoRestartServerTimerInfo: localization.GetString("UIText_AutoRestartServerTimerInfo"), UIText_GameBranch: localization.GetString("UIText_GameBranch"), UIText_GameBranchInfo: localization.GetString("UIText_GameBranchInfo"), - UIText_BetaOnlySettings: localization.GetString("UIText_BetaOnlySettings"), - UIText_BetaWarning: localization.GetString("UIText_BetaWarning"), + UIText_TerrainSettingsHeader: localization.GetString("UIText_TerrainSettingsHeader"), + UIText_TerrainWarning: localization.GetString("UIText_TerrainWarning"), UIText_UseNewTerrainAndSave: localization.GetString("UIText_UseNewTerrainAndSave"), UIText_UseNewTerrainAndSaveInfo: localization.GetString("UIText_UseNewTerrainAndSaveInfo"), UIText_Difficulty: localization.GetString("UIText_Difficulty"), diff --git a/src/web/templatevars.go b/src/web/templatevars.go index 13cd36c2..f0281fff 100644 --- a/src/web/templatevars.go +++ b/src/web/templatevars.go @@ -89,7 +89,7 @@ type ConfigTemplateData struct { UIText_BasicSettings string UIText_NetworkSettings string UIText_AdvancedSettings string - UIText_BetaSettings string + UIText_TerrainSettings string UIText_BasicServerSettings string UIText_ServerName string @@ -136,8 +136,8 @@ type ConfigTemplateData struct { UIText_AutoRestartServerTimerInfo string UIText_GameBranch string UIText_GameBranchInfo string - UIText_BetaOnlySettings string - UIText_BetaWarning string + UIText_TerrainSettingsHeader string + UIText_TerrainWarning string UIText_UseNewTerrainAndSave string UIText_UseNewTerrainAndSaveInfo string UIText_Difficulty string From 930e6ca09d6f94ec2c187954c0b2df9872c88d01 Mon Sep 17 00:00:00 2001 From: JacksonTheMaster <81807824+JacksonTheMaster@users.noreply.github.com> Date: Wed, 17 Sep 2025 06:44:18 +0200 Subject: [PATCH 2/3] fixed: worldOptions in Save Identifier setup step showed old worldIDs if newterrain. My bad. --- src/web/TwoBoxForm.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/web/TwoBoxForm.go b/src/web/TwoBoxForm.go index 1b4e32bf..76695b3e 100644 --- a/src/web/TwoBoxForm.go +++ b/src/web/TwoBoxForm.go @@ -102,11 +102,7 @@ func ServeTwoBoxFormTemplate(w http.ResponseWriter, r *http.Request) { {Display: "Venus", Value: "Venus"}, {Display: "Mars", Value: "Mars2"}, {Display: "Europa", Value: "Europa3"}, - {Display: "Mimas Herschel", Value: "MimasHerschel"}, - {Display: "Mars", Value: "Mars"}, - {Display: "Europa", Value: "Europa"}, - {Display: "Mimas", Value: "Mimas"}, - } + {Display: "Mimas Herschel", Value: "MimasHerschel"}} } // Define all steps in a map for easy access and modification From 51bd40775532f75ef726b9e6aa2ee022e1707ca7 Mon Sep 17 00:00:00 2001 From: JacksonTheMaster <81807824+JacksonTheMaster@users.noreply.github.com> Date: Wed, 17 Sep 2025 06:45:56 +0200 Subject: [PATCH 3/3] bump patch --- src/config/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/config.go b/src/config/config.go index a917c937..ab63a20f 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -11,7 +11,7 @@ import ( var ( // All configuration variables can be found in vars.go - Version = "5.6.4" + Version = "5.6.5" Branch = "release" )