From 7b418dc62f79a580407af0ce98bd9f43ee56647f Mon Sep 17 00:00:00 2001 From: = Date: Wed, 12 Nov 2025 18:21:27 -0500 Subject: [PATCH 1/2] Fix server.properties overwritten in bedrock update --- app/classes/shared/import_helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/classes/shared/import_helper.py b/app/classes/shared/import_helper.py index 86a82906..a43e6388 100644 --- a/app/classes/shared/import_helper.py +++ b/app/classes/shared/import_helper.py @@ -244,7 +244,7 @@ class ImportHelpers: unzip_path = self.helper.wtol_path(file_path) # unzips archive that was downloaded. - self.file_helper.unzip_file(unzip_path) + self.file_helper.unzip_file(unzip_path, True) # adjusts permissions for execution if os is not windows if not self.helper.is_os_windows(): -- GitLab From 0c1ed6e77b0f8f156c112cff23a7f0c49bda1f65 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sat, 22 Nov 2025 16:31:45 +0000 Subject: [PATCH 2/2] Update changelog !915 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88aef332..2e353a32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ TBD - Fix import directory cleanup was not pointing to the proper directory ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/918)) - Fix survey not appearing on first login ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/917)) - Fix failue deleting server's DB files on server delete ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/916)) +- Fix server.properties overwritten in bedrock update ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/915)) ### Tweaks TBD ### Lang -- GitLab