Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge to master for v0.7.5.1 #48

Merged
merged 3 commits into from
Jul 18, 2024
Merged

Merge to master for v0.7.5.1 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61ed0b1
Update actions versions
oblivioncth Jul 14, 2024
7e0849a
Replace '-' with "_" for LaunchBox docs
oblivioncth Jul 18, 2024
a62e670
Bump for release
oblivioncth Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/master-pull-request-merge-reaction.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
1 change: 1 addition & 0 deletions app/src/frontend/launchbox/lb-install.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ QString Install::translateDocName(const QString& originalName, Fe::DataDoc::Type
// LB specific changes
translatedName.replace('#','_');
translatedName.replace('\'','_');
translatedName.replace('-','_');

return translatedName;
}
Expand Down
Loading