Skip to content

Commit e90f475

Browse files
authored
Merge pull request #48 from oblivioncth/dev
Merge to master for v0.7.5.1
2 parents de856e6 + a62e670 commit e90f475

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

.github/workflows/master-pull-request-merge-reaction.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
7z a "${{ env.zips_path }}/${name}.zip" "${path}/*"
8383
}
8484
- name: Generate release
85-
uses: softprops/action-gh-release@v1
85+
uses: softprops/action-gh-release@v2
8686
with:
8787
name: "FIL Release v${{ needs.tag_master_and_sync_dev.outputs.new_version }} (Targets FP ${{ needs.tag_master_and_sync_dev.outputs.target_fp_version }})"
8888
tag_name: "v${{ needs.tag_master_and_sync_dev.outputs.new_version }}"

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.24.0...3.26.0)
66
# Project
77
# NOTE: DON'T USE TRAILING ZEROS IN VERSIONS
88
project(FIL
9-
VERSION 0.7.5
9+
VERSION 0.7.5.1
1010
LANGUAGES CXX
1111
DESCRIPTION "Flashpoint Importer for Launchers"
1212
)

app/src/frontend/launchbox/lb-install.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ QString Install::translateDocName(const QString& originalName, Fe::DataDoc::Type
312312
// LB specific changes
313313
translatedName.replace('#','_');
314314
translatedName.replace('\'','_');
315+
translatedName.replace('-','_');
315316

316317
return translatedName;
317318
}

0 commit comments

Comments
 (0)