From 26d21ca956943965940e8c84c1b10091fd09a2a0 Mon Sep 17 00:00:00 2001 From: florianvazelle Date: Thu, 7 Dec 2023 22:44:55 +0100 Subject: [PATCH] fix: include override cfg in export presets --- CHANGELOG.md | 1 + Justfile | 2 +- export_presets.cfg | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d19b4f..4bbfd4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Removed ### Fixed - Correct loading of sound effects for the menu ([#27](https://github.com/MechanicalFlower/Marble/pull/27)) +- Include `override.cfg` in each export presets ([#28](https://github.com/MechanicalFlower/Marble/pull/28)) ### Security ### Dependencies diff --git a/Justfile b/Justfile index 84f44d5..c8a6ced 100644 --- a/Justfile +++ b/Justfile @@ -133,7 +133,7 @@ import-resources: echo "Create the override.cfg" touch override.cfg - echo '[build_info]\npackage/version="{{ game_version }}"\npackage/build_date="{{ build_date }}"\nsource/commit="{{ commit_hash }}"' > override.cfg + echo -e '[build_info]\npackage/version="{{ game_version }}"\npackage/build_date="{{ build_date }}"\nsource/commit="{{ commit_hash }}"' > override.cfg # Godot binary wrapper @godot *ARGS: makedirs install-godot install-templates diff --git a/export_presets.cfg b/export_presets.cfg index a19db53..1162a11 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -6,7 +6,7 @@ runnable=true dedicated_server=false custom_features="" export_filter="all_resources" -include_filter="" +include_filter="override.cfg" exclude_filter="" export_path="" encryption_include_filters="" @@ -70,7 +70,7 @@ runnable=true dedicated_server=false custom_features="" export_filter="all_resources" -include_filter="" +include_filter="override.cfg" exclude_filter="" export_path="" encryption_include_filters="" @@ -110,7 +110,7 @@ runnable=true dedicated_server=false custom_features="" export_filter="all_resources" -include_filter="" +include_filter="override.cfg" exclude_filter="" export_path="" encryption_include_filters="" @@ -217,7 +217,7 @@ runnable=true dedicated_server=false custom_features="" export_filter="all_resources" -include_filter="" +include_filter="override.cfg" exclude_filter="" export_path="" encryption_include_filters=""