Merge pull request #48 from oblivioncth/dev

Merge to master for v0.7.5.1
oblivioncth · Jul 18, 2024 · e90f475 · e90f475
2 parents de856e6 + a62e670
commit e90f475
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/master-pull-request-merge-reaction.yml b/.github/workflows/master-pull-request-merge-reaction.yml
@@ -82,7 +82,7 @@ jobs:
           7z a "${{ env.zips_path }}/${name}.zip" "${path}/*"
         }
     - name: Generate release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       with:
         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 }})"
         tag_name: "v${{ needs.tag_master_and_sync_dev.outputs.new_version }}"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.24.0...3.26.0)
 # Project
 # NOTE: DON'T USE TRAILING ZEROS IN VERSIONS
 project(FIL
-    VERSION 0.7.5
+    VERSION 0.7.5.1
     LANGUAGES CXX
     DESCRIPTION "Flashpoint Importer for Launchers"
 )

diff --git a/app/src/frontend/launchbox/lb-install.cpp b/app/src/frontend/launchbox/lb-install.cpp
@@ -312,6 +312,7 @@ QString Install::translateDocName(const QString& originalName, Fe::DataDoc::Type
     // LB specific changes
     translatedName.replace('#','_');
     translatedName.replace('\'','_');
+    translatedName.replace('-','_');
 
     return translatedName;
 }