From fd91f87c214e7a565105f47e87150f40c1e87acb Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Sun, 18 Jan 2026 15:15:14 -0500 Subject: [PATCH] style: re-format tree with editorconfig ``` find $PWD \ -type f \ ! -path '*/.git/*' ! -path '*/flatpak/shared-modules/*' \ ! -path '*/libraries/*' ! -path '*/testdata/*' ! -name '*.patch' \ ! -name '*.svg' ! -name '*.scd' ! -path '*/program_info/LICENSE' \ ! -path '*/COPYING.md' ! -path '*/cmake/*' ! -name '.gitmodules' \ -exec eclint -fix {} \; ``` Signed-off-by: Seth Flynn --- .github/ISSUE_TEMPLATE/rfc.yml | 4 +- .github/workflows/blocked-prs.yml | 20 +- .github/workflows/merge-blocking-pr.yml | 4 +- CMakeLists.txt | 2 +- CMakePresets.json | 436 +++++++++--------- launcher/FastFileIconProvider.cpp | 2 +- launcher/FastFileIconProvider.h | 2 +- launcher/GZip.cpp | 2 +- launcher/InstanceCopyPrefs.cpp | 2 +- launcher/InstanceCopyTask.cpp | 2 +- launcher/Launcher.in | 2 +- launcher/MMCTime.cpp | 2 +- launcher/Markdown.cpp | 2 +- launcher/Markdown.h | 2 +- launcher/PSaveFile.h | 2 +- launcher/QVariantUtils.h | 2 +- launcher/StringUtils.cpp | 2 +- launcher/archive/ArchiveReader.h | 2 +- launcher/archive/ArchiveWriter.h | 2 +- launcher/archive/ExportToZipTask.cpp | 2 +- launcher/archive/ExportToZipTask.h | 2 +- launcher/archive/ExtractZipTask.cpp | 2 +- launcher/archive/ExtractZipTask.h | 2 +- launcher/java/JavaMetadata.h | 2 +- .../java/download/ArchiveDownloadTask.cpp | 2 +- launcher/java/download/ArchiveDownloadTask.h | 2 +- launcher/java/download/ManifestDownloadTask.h | 2 +- launcher/java/download/SymlinkTask.cpp | 2 +- launcher/java/download/SymlinkTask.h | 2 +- launcher/logs/AnonymizeLog.cpp | 2 +- launcher/logs/AnonymizeLog.h | 2 +- launcher/minecraft/MinecraftInstance.h | 2 +- launcher/minecraft/MinecraftLoadAndCheck.cpp | 2 +- launcher/minecraft/auth/AuthSession.cpp | 2 +- launcher/minecraft/mod/Resource.cpp | 2 +- .../mod/tasks/LocalDataPackParseTask.h | 2 +- launcher/minecraft/skins/SkinList.h | 2 +- launcher/minecraft/skins/SkinModel.h | 2 +- launcher/modplatform/ResourceType.h | 2 +- .../modplatform/atlauncher/ATLPackIndex.h | 2 +- launcher/modplatform/flame/FlameModIndex.h | 2 +- .../modplatform/helpers/ExportToModList.cpp | 2 +- launcher/resources/documents/documents.qrc | 2 +- launcher/resources/flat_white/flat_white.qrc | 2 +- launcher/resources/shaders/shaders.qrc | 2 +- .../resources/shaders/vshader_skin_model.glsl | 2 +- launcher/screenshots/ImgurAlbumCreation.cpp | 2 +- launcher/tools/GenericProfiler.cpp | 2 +- launcher/ui/dialogs/ChooseOfflineNameDialog.h | 2 +- launcher/ui/dialogs/IconPickerDialog.cpp | 2 +- launcher/ui/dialogs/MSALoginDialog.cpp | 2 +- .../ui/dialogs/skins/draw/BoxGeometry.cpp | 2 +- launcher/ui/dialogs/skins/draw/Scene.cpp | 2 +- launcher/ui/dialogs/skins/draw/Scene.h | 2 +- launcher/ui/pages/instance/DataPackPage.h | 2 +- launcher/ui/pages/instance/ServerPingTask.cpp | 2 +- .../modplatform/ModpackProviderBasePage.h | 2 +- .../modplatform/import_ftb/ListModel.cpp | 2 +- .../pages/modplatform/import_ftb/ListModel.h | 2 +- launcher/ui/widgets/CheckComboBox.h | 2 +- launcher/ui/widgets/JavaSettingsWidget.h | 2 +- program_info/PrismLauncher.icon/icon.json | 2 +- program_info/win_install.nsi.in | 62 +-- scripts/compress_images.sh | 4 +- 64 files changed, 323 insertions(+), 323 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/rfc.yml b/.github/ISSUE_TEMPLATE/rfc.yml index fa7cdbe61..4d285047e 100644 --- a/.github/ISSUE_TEMPLATE/rfc.yml +++ b/.github/ISSUE_TEMPLATE/rfc.yml @@ -44,8 +44,8 @@ body: attributes: label: Unresolved Questions description: | - Are there any portions of your proposal which need to be discussed with the community before the RFC can proceed? - Be careful here -- an RFC with a lot of remaining questions is likely to be stalled. + Are there any portions of your proposal which need to be discussed with the community before the RFC can proceed? + Be careful here -- an RFC with a lot of remaining questions is likely to be stalled. If your RFC is mostly unresolved questions and not too much substance, it may not be ready. placeholder: Do a lot of users care about the cat? validations: diff --git a/.github/workflows/blocked-prs.yml b/.github/workflows/blocked-prs.yml index 6311ac2f7..1a482b32b 100644 --- a/.github/workflows/blocked-prs.yml +++ b/.github/workflows/blocked-prs.yml @@ -76,11 +76,11 @@ jobs: run: | prs=$( jq -c ' - .prBody as $body + .prBody as $body | ( - $body | - reduce ( - . | scan("[Bb]locked (?:[Bb]y|[Oo]n):? #([0-9]+)") + $body | + reduce ( + . | scan("[Bb]locked (?:[Bb]y|[Oo]n):? #([0-9]+)") | map({ "type": "Blocked on", "number": ( . | tonumber ) @@ -88,8 +88,8 @@ jobs: ) as $i ([]; . + [$i[]]) ) as $bprs | ( - $body | - reduce ( + $body | + reduce ( . | scan("[Ss]tacked [Oo]n:? #([0-9]+)") | map({ "type": "Stacked on", @@ -97,8 +97,8 @@ jobs: }) ) as $i ([]; . + [$i[]]) ) as $sprs - | ($bprs + $sprs) as $prs - | { + | ($bprs + $sprs) as $prs + | { "blocking": $prs, "numBlocking": ( $prs | length), } @@ -126,7 +126,7 @@ jobs: "number": .number, "merged": .merged, "state": (if .state == "open" then "Open" elif .merged then "Merged" else "Closed" end), - "labels": (reduce .labels[].name as $l ([]; . + [$l])), + "labels": (reduce .labels[].name as $l ([]; . + [$l])), "basePrUrl": .html_url, "baseRepoName": .head.repo.name, "baseRepoOwner": .head.repo.owner.login, @@ -143,7 +143,7 @@ jobs: echo "current_blocking=$(jq -c 'map( select( (.type == "Stacked on" and (.merged | not)) or - (.type == "Blocked on" and (.state == "Open")) + (.type == "Blocked on" and (.state == "Open")) ) | .number )' <<< "$blocked_pr_data" )"; } >> "$GITHUB_OUTPUT" diff --git a/.github/workflows/merge-blocking-pr.yml b/.github/workflows/merge-blocking-pr.yml index d37c33761..182e40984 100644 --- a/.github/workflows/merge-blocking-pr.yml +++ b/.github/workflows/merge-blocking-pr.yml @@ -38,7 +38,7 @@ jobs: gh -R ${{ github.repository }} pr list --label 'blocked' --json 'number,body' \ | jq -c --argjson pr "$PR_NUMBER" ' reduce ( .[] | select( - .body | + .body | scan("(?:blocked (?:by|on)|stacked on):? #([0-9]+)") | map(tonumber) | any(.[]; . == $pr) @@ -47,7 +47,7 @@ jobs: ) { echo "deps=$blocked_prs" - echo "numdeps=$(jq -r '. | length' <<< "$blocked_prs")" + echo "numdeps=$(jq -r '. | length' <<< "$blocked_prs")" } >> "$GITHUB_OUTPUT" - name: Trigger Blocked PR Workflows for Dependants diff --git a/CMakeLists.txt b/CMakeLists.txt index 18e6e3f54..d480de21b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -427,7 +427,7 @@ if(UNIX AND APPLE) else() message(WARNING "actool not found. Cannot compile macOS app icons.\n" - "Install Xcode command line tools: 'xcode-select --install'") + "Install Xcode command line tools: 'xcode-select --install'") endif() diff --git a/CMakePresets.json b/CMakePresets.json index 9ef04ede6..5e9ee8b39 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -1,221 +1,221 @@ { - "$schema": "https://cmake.org/cmake/help/latest/_downloads/3e2d73bff478d88a7de0de736ba5e361/schema.json", - "version": 8, - "cmakeMinimumRequired": { - "major": 3, - "minor": 28 - }, - "configurePresets": [ - { - "name": "base", - "hidden": true, - "binaryDir": "build", - "installDir": "install", - "generator": "Ninja Multi-Config", - "cacheVariables": { - "Launcher_BUILD_ARTIFACT": "$penv{ARTIFACT_NAME}", - "Launcher_BUILD_PLATFORM": "$penv{BUILD_PLATFORM}", - "Launcher_ENABLE_JAVA_DOWNLOADER": "ON", - "ENABLE_LTO": "ON" - } - }, - { - "name": "linux", - "displayName": "Linux", - "inherits": [ - "base" - ], - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Linux" - } - }, - { - "name": "macos", - "displayName": "macOS", - "inherits": [ - "base" - ], - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Darwin" - }, - "cacheVariables": { - "CMAKE_TOOLCHAIN_FILE": "$penv{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" - } - }, - { - "name": "macos_universal", - "displayName": "macOS (Universal Binary)", - "inherits": [ - "macos" - ], - "cacheVariables": { - "CMAKE_TOOLCHAIN_FILE": "$penv{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", - "CMAKE_OSX_ARCHITECTURES": "x86_64;arm64", - "VCPKG_TARGET_TRIPLET": "universal-osx" - } - }, - { - "name": "windows_mingw", - "displayName": "Windows (MinGW)", - "inherits": [ - "base" - ], - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - } - }, - { - "name": "windows_msvc", - "displayName": "Windows (MSVC)", - "inherits": [ - "base" - ], - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - }, - "cacheVariables": { - "CMAKE_TOOLCHAIN_FILE": "$penv{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" - } - } - ], - "buildPresets": [ - { - "name": "linux", - "displayName": "Linux", - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Linux" - }, - "configurePreset": "linux" - }, - { - "name": "macos", - "displayName": "macOS", - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Darwin" - }, + "$schema": "https://cmake.org/cmake/help/latest/_downloads/3e2d73bff478d88a7de0de736ba5e361/schema.json", + "version": 8, + "cmakeMinimumRequired": { + "major": 3, + "minor": 28 + }, + "configurePresets": [ + { + "name": "base", + "hidden": true, + "binaryDir": "build", + "installDir": "install", + "generator": "Ninja Multi-Config", + "cacheVariables": { + "Launcher_BUILD_ARTIFACT": "$penv{ARTIFACT_NAME}", + "Launcher_BUILD_PLATFORM": "$penv{BUILD_PLATFORM}", + "Launcher_ENABLE_JAVA_DOWNLOADER": "ON", + "ENABLE_LTO": "ON" + } + }, + { + "name": "linux", + "displayName": "Linux", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Linux" + } + }, + { + "name": "macos", + "displayName": "macOS", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Darwin" + }, + "cacheVariables": { + "CMAKE_TOOLCHAIN_FILE": "$penv{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" + } + }, + { + "name": "macos_universal", + "displayName": "macOS (Universal Binary)", + "inherits": [ + "macos" + ], + "cacheVariables": { + "CMAKE_TOOLCHAIN_FILE": "$penv{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", + "CMAKE_OSX_ARCHITECTURES": "x86_64;arm64", + "VCPKG_TARGET_TRIPLET": "universal-osx" + } + }, + { + "name": "windows_mingw", + "displayName": "Windows (MinGW)", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "windows_msvc", + "displayName": "Windows (MSVC)", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + }, + "cacheVariables": { + "CMAKE_TOOLCHAIN_FILE": "$penv{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" + } + } + ], + "buildPresets": [ + { + "name": "linux", + "displayName": "Linux", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Linux" + }, + "configurePreset": "linux" + }, + { + "name": "macos", + "displayName": "macOS", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Darwin" + }, "configurePreset": "macos" - }, - { - "name": "macos_universal", - "displayName": "macOS (Universal Binary)", - "inherits": [ - "macos" - ], - "configurePreset": "macos_universal" - }, - { - "name": "windows_mingw", - "displayName": "Windows (MinGW)", - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - }, - "configurePreset": "windows_mingw" - }, - { - "name": "windows_msvc", - "displayName": "Windows (MSVC)", - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - }, - "configurePreset": "windows_msvc" - } - ], - "testPresets": [ - { - "name": "base", - "hidden": true, - "output": { - "outputOnFailure": true - }, - "execution": { - "noTestsAction": "error" - }, - "filter": { - "exclude": { - "name": "^example64|example$" - } - } - }, - { - "name": "linux", - "displayName": "Linux", - "inherits": [ - "base" - ], - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Linux" - }, - "configurePreset": "linux" - }, - { - "name": "macos", - "displayName": "macOS", - "inherits": [ - "base" - ], - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Darwin" - }, - "configurePreset": "macos" - }, - { - "name": "macos_universal", - "displayName": "macOS (Universal Binary)", - "inherits": [ - "base" - ], - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Darwin" - }, - "configurePreset": "macos_universal" - }, - { - "name": "windows_mingw", - "displayName": "Windows (MinGW)", - "inherits": [ - "base" - ], - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - }, - "configurePreset": "windows_mingw" - }, - { - "name": "windows_msvc", - "displayName": "Windows (MSVC)", - "inherits": [ - "base" - ], - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - }, - "configurePreset": "windows_msvc" - } - ] + }, + { + "name": "macos_universal", + "displayName": "macOS (Universal Binary)", + "inherits": [ + "macos" + ], + "configurePreset": "macos_universal" + }, + { + "name": "windows_mingw", + "displayName": "Windows (MinGW)", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + }, + "configurePreset": "windows_mingw" + }, + { + "name": "windows_msvc", + "displayName": "Windows (MSVC)", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + }, + "configurePreset": "windows_msvc" + } + ], + "testPresets": [ + { + "name": "base", + "hidden": true, + "output": { + "outputOnFailure": true + }, + "execution": { + "noTestsAction": "error" + }, + "filter": { + "exclude": { + "name": "^example64|example$" + } + } + }, + { + "name": "linux", + "displayName": "Linux", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Linux" + }, + "configurePreset": "linux" + }, + { + "name": "macos", + "displayName": "macOS", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Darwin" + }, + "configurePreset": "macos" + }, + { + "name": "macos_universal", + "displayName": "macOS (Universal Binary)", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Darwin" + }, + "configurePreset": "macos_universal" + }, + { + "name": "windows_mingw", + "displayName": "Windows (MinGW)", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + }, + "configurePreset": "windows_mingw" + }, + { + "name": "windows_msvc", + "displayName": "Windows (MSVC)", + "inherits": [ + "base" + ], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + }, + "configurePreset": "windows_msvc" + } + ] } diff --git a/launcher/FastFileIconProvider.cpp b/launcher/FastFileIconProvider.cpp index f2b6f4425..1dbab27ba 100644 --- a/launcher/FastFileIconProvider.cpp +++ b/launcher/FastFileIconProvider.cpp @@ -44,4 +44,4 @@ QIcon FastFileIconProvider::icon(const QFileInfo& info) const } return QApplication::style()->standardIcon(icon); -} \ No newline at end of file +} diff --git a/launcher/FastFileIconProvider.h b/launcher/FastFileIconProvider.h index 208534044..7799b7879 100644 --- a/launcher/FastFileIconProvider.h +++ b/launcher/FastFileIconProvider.h @@ -23,4 +23,4 @@ class FastFileIconProvider : public QFileIconProvider { public: QIcon icon(const QFileInfo& info) const override; -}; \ No newline at end of file +}; diff --git a/launcher/GZip.cpp b/launcher/GZip.cpp index 29c71c012..dc786e10e 100644 --- a/launcher/GZip.cpp +++ b/launcher/GZip.cpp @@ -215,4 +215,4 @@ QString GZip::readGzFileByBlocks(QFile* source, std::function #include -QString markdownToHTML(const QString& markdown); \ No newline at end of file +QString markdownToHTML(const QString& markdown); diff --git a/launcher/PSaveFile.h b/launcher/PSaveFile.h index ba6154ad8..67a57a1a2 100644 --- a/launcher/PSaveFile.h +++ b/launcher/PSaveFile.h @@ -68,4 +68,4 @@ class PSaveFile : public QSaveFile { }; #else #define PSaveFile QSaveFile -#endif \ No newline at end of file +#endif diff --git a/launcher/QVariantUtils.h b/launcher/QVariantUtils.h index 91f2ad29c..23fe82573 100644 --- a/launcher/QVariantUtils.h +++ b/launcher/QVariantUtils.h @@ -66,4 +66,4 @@ inline QVariant fromList(QList val) return variantList; } -} // namespace QVariantUtils \ No newline at end of file +} // namespace QVariantUtils diff --git a/launcher/StringUtils.cpp b/launcher/StringUtils.cpp index 4b283c597..a79cfb5c5 100644 --- a/launcher/StringUtils.cpp +++ b/launcher/StringUtils.cpp @@ -231,4 +231,4 @@ QString StringUtils::htmlListPatch(QString htmlStr) pos = htmlStr.indexOf(s_ulMatcher, pos); } return htmlStr; -} \ No newline at end of file +} diff --git a/launcher/archive/ArchiveReader.h b/launcher/archive/ArchiveReader.h index 379006278..aaeba6095 100644 --- a/launcher/archive/ArchiveReader.h +++ b/launcher/archive/ArchiveReader.h @@ -69,4 +69,4 @@ class ArchiveReader { QStringList m_fileNames = {}; }; -} // namespace MMCZip \ No newline at end of file +} // namespace MMCZip diff --git a/launcher/archive/ArchiveWriter.h b/launcher/archive/ArchiveWriter.h index 807bb297c..50858b517 100644 --- a/launcher/archive/ArchiveWriter.h +++ b/launcher/archive/ArchiveWriter.h @@ -43,4 +43,4 @@ class ArchiveWriter { QString m_filename; QString m_format = "zip"; }; -} // namespace MMCZip \ No newline at end of file +} // namespace MMCZip diff --git a/launcher/archive/ExportToZipTask.cpp b/launcher/archive/ExportToZipTask.cpp index 9df9539be..bd3bc9032 100644 --- a/launcher/archive/ExportToZipTask.cpp +++ b/launcher/archive/ExportToZipTask.cpp @@ -97,4 +97,4 @@ bool ExportToZipTask::abort() } return false; } -} // namespace MMCZip \ No newline at end of file +} // namespace MMCZip diff --git a/launcher/archive/ExportToZipTask.h b/launcher/archive/ExportToZipTask.h index 21ad1db48..0c8329c93 100644 --- a/launcher/archive/ExportToZipTask.h +++ b/launcher/archive/ExportToZipTask.h @@ -69,4 +69,4 @@ class ExportToZipTask : public Task { QFuture m_buildZipFuture; QFutureWatcher m_buildZipWatcher; }; -} // namespace MMCZip \ No newline at end of file +} // namespace MMCZip diff --git a/launcher/archive/ExtractZipTask.cpp b/launcher/archive/ExtractZipTask.cpp index b958640c9..acbcd39d5 100644 --- a/launcher/archive/ExtractZipTask.cpp +++ b/launcher/archive/ExtractZipTask.cpp @@ -132,4 +132,4 @@ bool ExtractZipTask::abort() return false; } -} // namespace MMCZip \ No newline at end of file +} // namespace MMCZip diff --git a/launcher/archive/ExtractZipTask.h b/launcher/archive/ExtractZipTask.h index 284d873fe..03c391aee 100644 --- a/launcher/archive/ExtractZipTask.h +++ b/launcher/archive/ExtractZipTask.h @@ -50,4 +50,4 @@ class ExtractZipTask : public Task { QFuture m_zipFuture; QFutureWatcher m_zipWatcher; }; -} // namespace MMCZip \ No newline at end of file +} // namespace MMCZip diff --git a/launcher/java/JavaMetadata.h b/launcher/java/JavaMetadata.h index 2e569ee39..0757a6935 100644 --- a/launcher/java/JavaMetadata.h +++ b/launcher/java/JavaMetadata.h @@ -61,4 +61,4 @@ DownloadType parseDownloadType(QString javaDownload); QString downloadTypeToString(DownloadType javaDownload); MetadataPtr parseJavaMeta(const QJsonObject& libObj); -} // namespace Java \ No newline at end of file +} // namespace Java diff --git a/launcher/java/download/ArchiveDownloadTask.cpp b/launcher/java/download/ArchiveDownloadTask.cpp index 92357930b..c60908cec 100644 --- a/launcher/java/download/ArchiveDownloadTask.cpp +++ b/launcher/java/download/ArchiveDownloadTask.cpp @@ -114,4 +114,4 @@ bool ArchiveDownloadTask::abort() aborted = m_task->abort(); return aborted; }; -} // namespace Java \ No newline at end of file +} // namespace Java diff --git a/launcher/java/download/ArchiveDownloadTask.h b/launcher/java/download/ArchiveDownloadTask.h index 4cd919543..cfcdf9dcf 100644 --- a/launcher/java/download/ArchiveDownloadTask.h +++ b/launcher/java/download/ArchiveDownloadTask.h @@ -42,4 +42,4 @@ class ArchiveDownloadTask : public Task { QString m_checksum_hash; Task::Ptr m_task; }; -} // namespace Java \ No newline at end of file +} // namespace Java diff --git a/launcher/java/download/ManifestDownloadTask.h b/launcher/java/download/ManifestDownloadTask.h index 0f65b343c..e68c8236f 100644 --- a/launcher/java/download/ManifestDownloadTask.h +++ b/launcher/java/download/ManifestDownloadTask.h @@ -43,4 +43,4 @@ class ManifestDownloadTask : public Task { QString m_checksum_hash; Task::Ptr m_task; }; -} // namespace Java \ No newline at end of file +} // namespace Java diff --git a/launcher/java/download/SymlinkTask.cpp b/launcher/java/download/SymlinkTask.cpp index 843c7caa9..9bbd50c63 100644 --- a/launcher/java/download/SymlinkTask.cpp +++ b/launcher/java/download/SymlinkTask.cpp @@ -78,4 +78,4 @@ void SymlinkTask::executeTask() } } -} // namespace Java \ No newline at end of file +} // namespace Java diff --git a/launcher/java/download/SymlinkTask.h b/launcher/java/download/SymlinkTask.h index 88cb20dd7..e38323eae 100644 --- a/launcher/java/download/SymlinkTask.h +++ b/launcher/java/download/SymlinkTask.h @@ -33,4 +33,4 @@ class SymlinkTask : public Task { QString m_path; Task::Ptr m_task; }; -} // namespace Java \ No newline at end of file +} // namespace Java diff --git a/launcher/logs/AnonymizeLog.cpp b/launcher/logs/AnonymizeLog.cpp index e5021a616..b808b35a3 100644 --- a/launcher/logs/AnonymizeLog.cpp +++ b/launcher/logs/AnonymizeLog.cpp @@ -65,4 +65,4 @@ void anonymizeLog(QString& log) for (auto rule : anonymizeRules) { log.replace(rule.reg, rule.with); } -} \ No newline at end of file +} diff --git a/launcher/logs/AnonymizeLog.h b/launcher/logs/AnonymizeLog.h index 2409ecee7..215d1e468 100644 --- a/launcher/logs/AnonymizeLog.h +++ b/launcher/logs/AnonymizeLog.h @@ -37,4 +37,4 @@ #include -void anonymizeLog(QString& log); \ No newline at end of file +void anonymizeLog(QString& log); diff --git a/launcher/minecraft/MinecraftInstance.h b/launcher/minecraft/MinecraftInstance.h index 256e982ff..909962d5e 100644 --- a/launcher/minecraft/MinecraftInstance.h +++ b/launcher/minecraft/MinecraftInstance.h @@ -171,4 +171,4 @@ class MinecraftInstance : public BaseInstance { std::unique_ptr m_texture_pack_list; std::unique_ptr m_data_pack_list; std::unique_ptr m_world_list; -}; \ No newline at end of file +}; diff --git a/launcher/minecraft/MinecraftLoadAndCheck.cpp b/launcher/minecraft/MinecraftLoadAndCheck.cpp index c0a82e61e..149e7cf19 100644 --- a/launcher/minecraft/MinecraftLoadAndCheck.cpp +++ b/launcher/minecraft/MinecraftLoadAndCheck.cpp @@ -43,4 +43,4 @@ bool MinecraftLoadAndCheck::abort() return status; } return Task::abort(); -} \ No newline at end of file +} diff --git a/launcher/minecraft/auth/AuthSession.cpp b/launcher/minecraft/auth/AuthSession.cpp index 3657befec..a74eabb7a 100644 --- a/launcher/minecraft/auth/AuthSession.cpp +++ b/launcher/minecraft/auth/AuthSession.cpp @@ -39,4 +39,4 @@ void AuthSession::MakeDemo(QString name, QString u) access_token = "0"; player_name = name; status = PlayableOnline; // needs online to download the assets -}; \ No newline at end of file +}; diff --git a/launcher/minecraft/mod/Resource.cpp b/launcher/minecraft/mod/Resource.cpp index 6f2efe740..8f67d5d94 100644 --- a/launcher/minecraft/mod/Resource.cpp +++ b/launcher/minecraft/mod/Resource.cpp @@ -260,4 +260,4 @@ auto Resource::getOriginalFileName() const -> QString if (!m_enabled) fileName.chop(9); return fileName; -} \ No newline at end of file +} diff --git a/launcher/minecraft/mod/tasks/LocalDataPackParseTask.h b/launcher/minecraft/mod/tasks/LocalDataPackParseTask.h index 6bdf55880..82bb507e7 100644 --- a/launcher/minecraft/mod/tasks/LocalDataPackParseTask.h +++ b/launcher/minecraft/mod/tasks/LocalDataPackParseTask.h @@ -67,4 +67,4 @@ class LocalDataPackParseTask : public Task { int m_token; DataPack* m_data_pack; -}; \ No newline at end of file +}; diff --git a/launcher/minecraft/skins/SkinList.h b/launcher/minecraft/skins/SkinList.h index 5a160909a..9db476f3c 100644 --- a/launcher/minecraft/skins/SkinList.h +++ b/launcher/minecraft/skins/SkinList.h @@ -77,4 +77,4 @@ class SkinList : public QAbstractListModel { QList m_skinList; QDir m_dir; MinecraftAccountPtr m_acct; -}; \ No newline at end of file +}; diff --git a/launcher/minecraft/skins/SkinModel.h b/launcher/minecraft/skins/SkinModel.h index 711d7edb8..af8ca046f 100644 --- a/launcher/minecraft/skins/SkinModel.h +++ b/launcher/minecraft/skins/SkinModel.h @@ -56,4 +56,4 @@ class SkinModel { QString m_capeId; Model m_model; QString m_url; -}; \ No newline at end of file +}; diff --git a/launcher/modplatform/ResourceType.h b/launcher/modplatform/ResourceType.h index 7f3e3042c..390ade7ff 100644 --- a/launcher/modplatform/ResourceType.h +++ b/launcher/modplatform/ResourceType.h @@ -36,4 +36,4 @@ static const std::set VALID_RESOURCES = { ResourceType::DataPack, ResourceType::ShaderPack, ResourceType::World, ResourceType::Mod }; QString getName(ResourceType type); } // namespace ResourceTypeUtils -} // namespace ModPlatform \ No newline at end of file +} // namespace ModPlatform diff --git a/launcher/modplatform/atlauncher/ATLPackIndex.h b/launcher/modplatform/atlauncher/ATLPackIndex.h index 0df5e237c..bb0434533 100644 --- a/launcher/modplatform/atlauncher/ATLPackIndex.h +++ b/launcher/modplatform/atlauncher/ATLPackIndex.h @@ -45,4 +45,4 @@ void loadIndexedPack(IndexedPack& m, QJsonObject& obj); } // namespace ATLauncher Q_DECLARE_METATYPE(ATLauncher::IndexedPack) -Q_DECLARE_METATYPE(QList) \ No newline at end of file +Q_DECLARE_METATYPE(QList) diff --git a/launcher/modplatform/flame/FlameModIndex.h b/launcher/modplatform/flame/FlameModIndex.h index b583b518f..2631fab74 100644 --- a/launcher/modplatform/flame/FlameModIndex.h +++ b/launcher/modplatform/flame/FlameModIndex.h @@ -15,4 +15,4 @@ void loadURLs(ModPlatform::IndexedPack& m, QJsonObject& obj); void loadBody(ModPlatform::IndexedPack& m); void loadIndexedPackVersions(ModPlatform::IndexedPack& pack, QJsonArray& arr); ModPlatform::IndexedVersion loadIndexedPackVersion(QJsonObject& obj, bool load_changelog = false); -} // namespace FlameMod \ No newline at end of file +} // namespace FlameMod diff --git a/launcher/modplatform/helpers/ExportToModList.cpp b/launcher/modplatform/helpers/ExportToModList.cpp index 678f89917..2432853c9 100644 --- a/launcher/modplatform/helpers/ExportToModList.cpp +++ b/launcher/modplatform/helpers/ExportToModList.cpp @@ -220,4 +220,4 @@ QString exportToModList(QList mods, QString lineTemplate) } return lines.join("\n"); } -} // namespace ExportToModList \ No newline at end of file +} // namespace ExportToModList diff --git a/launcher/resources/documents/documents.qrc b/launcher/resources/documents/documents.qrc index e1ee240ba..f4202c8dd 100644 --- a/launcher/resources/documents/documents.qrc +++ b/launcher/resources/documents/documents.qrc @@ -2,7 +2,7 @@ ../../../COPYING.md - credits.html + credits.html diff --git a/launcher/resources/flat_white/flat_white.qrc b/launcher/resources/flat_white/flat_white.qrc index d873e40d6..b57c576f4 100644 --- a/launcher/resources/flat_white/flat_white.qrc +++ b/launcher/resources/flat_white/flat_white.qrc @@ -42,7 +42,7 @@ scalable/status-running.svg scalable/status-yellow.svg scalable/viewfolder.svg - scalable/worlds.svg + scalable/worlds.svg scalable/delete.svg scalable/export.svg scalable/rename.svg diff --git a/launcher/resources/shaders/shaders.qrc b/launcher/resources/shaders/shaders.qrc index 6667e8b61..005bdbcbe 100644 --- a/launcher/resources/shaders/shaders.qrc +++ b/launcher/resources/shaders/shaders.qrc @@ -4,4 +4,4 @@ vshader_skin_background.glsl fshader.glsl - \ No newline at end of file + diff --git a/launcher/resources/shaders/vshader_skin_model.glsl b/launcher/resources/shaders/vshader_skin_model.glsl index 790881352..ed8e75778 100644 --- a/launcher/resources/shaders/vshader_skin_model.glsl +++ b/launcher/resources/shaders/vshader_skin_model.glsl @@ -3,7 +3,7 @@ // https://code.qt.io/cgit/qt/qtbase.git/tree/examples/opengl/cube/vshader.glsl // Dylan Schooner - 2025 -// Modification: Implemented final Z-NDC re-inversion to compensate +// Modification: Implemented final Z-NDC re-inversion to compensate // for rigid OpenGL 2.0 context forcing glClearDepth(1.0). // This flips the high-precision Reverse Z output to the standard [0, W] range. diff --git a/launcher/screenshots/ImgurAlbumCreation.cpp b/launcher/screenshots/ImgurAlbumCreation.cpp index 7974d4a9f..411e4f793 100644 --- a/launcher/screenshots/ImgurAlbumCreation.cpp +++ b/launcher/screenshots/ImgurAlbumCreation.cpp @@ -108,4 +108,4 @@ auto ImgurAlbumCreation::Sink::finalize(QNetworkReply&) -> Task::State m_result->deleteHash = object.value("data").toObject().value("deletehash").toString(); m_result->id = object.value("data").toObject().value("id").toString(); return Task::State::Succeeded; -} \ No newline at end of file +} diff --git a/launcher/tools/GenericProfiler.cpp b/launcher/tools/GenericProfiler.cpp index feb775981..66c63d01a 100644 --- a/launcher/tools/GenericProfiler.cpp +++ b/launcher/tools/GenericProfiler.cpp @@ -43,4 +43,4 @@ BaseExternalTool* GenericProfilerFactory::createTool(BaseInstance* instance, QOb { return new GenericProfiler(globalSettings, instance, parent); } -#include "GenericProfiler.moc" \ No newline at end of file +#include "GenericProfiler.moc" diff --git a/launcher/ui/dialogs/ChooseOfflineNameDialog.h b/launcher/ui/dialogs/ChooseOfflineNameDialog.h index fb3bb4257..ce3c24ef9 100644 --- a/launcher/ui/dialogs/ChooseOfflineNameDialog.h +++ b/launcher/ui/dialogs/ChooseOfflineNameDialog.h @@ -47,4 +47,4 @@ class ChooseOfflineNameDialog final : public QDialog { private: Ui::ChooseOfflineNameDialog* ui; QRegularExpressionValidator* m_usernameValidator; -}; \ No newline at end of file +}; diff --git a/launcher/ui/dialogs/IconPickerDialog.cpp b/launcher/ui/dialogs/IconPickerDialog.cpp index 52a5ffbbb..b56e95dba 100644 --- a/launcher/ui/dialogs/IconPickerDialog.cpp +++ b/launcher/ui/dialogs/IconPickerDialog.cpp @@ -181,4 +181,4 @@ void IconPickerDialog::openFolder() void IconPickerDialog::filterIcons(const QString& query) { proxyModel->setFilterFixedString(query); -} \ No newline at end of file +} diff --git a/launcher/ui/dialogs/MSALoginDialog.cpp b/launcher/ui/dialogs/MSALoginDialog.cpp index 79131a74c..e6b53d292 100644 --- a/launcher/ui/dialogs/MSALoginDialog.cpp +++ b/launcher/ui/dialogs/MSALoginDialog.cpp @@ -230,4 +230,4 @@ MinecraftAccountPtr MSALoginDialog::newAccount(QWidget* parent) return dlg.m_account; } return nullptr; -} \ No newline at end of file +} diff --git a/launcher/ui/dialogs/skins/draw/BoxGeometry.cpp b/launcher/ui/dialogs/skins/draw/BoxGeometry.cpp index f91fe2f1f..4404442a4 100644 --- a/launcher/ui/dialogs/skins/draw/BoxGeometry.cpp +++ b/launcher/ui/dialogs/skins/draw/BoxGeometry.cpp @@ -280,4 +280,4 @@ void BoxGeometry::scale(const QVector3D& vector) { m_matrix.scale(vector); } -} // namespace opengl \ No newline at end of file +} // namespace opengl diff --git a/launcher/ui/dialogs/skins/draw/Scene.cpp b/launcher/ui/dialogs/skins/draw/Scene.cpp index ad51187ca..7e84a3a49 100644 --- a/launcher/ui/dialogs/skins/draw/Scene.cpp +++ b/launcher/ui/dialogs/skins/draw/Scene.cpp @@ -183,4 +183,4 @@ void Scene::setElytraVisible(bool elytraVisible) { m_elytraVisible = elytraVisible; } -} // namespace opengl \ No newline at end of file +} // namespace opengl diff --git a/launcher/ui/dialogs/skins/draw/Scene.h b/launcher/ui/dialogs/skins/draw/Scene.h index 31526de45..897fbcad9 100644 --- a/launcher/ui/dialogs/skins/draw/Scene.h +++ b/launcher/ui/dialogs/skins/draw/Scene.h @@ -49,4 +49,4 @@ class Scene : protected QOpenGLFunctions { bool m_capeVisible = false; bool m_elytraVisible = false; }; -} // namespace opengl \ No newline at end of file +} // namespace opengl diff --git a/launcher/ui/pages/instance/DataPackPage.h b/launcher/ui/pages/instance/DataPackPage.h index 0a121a5bc..a3e6627d4 100644 --- a/launcher/ui/pages/instance/DataPackPage.h +++ b/launcher/ui/pages/instance/DataPackPage.h @@ -73,4 +73,4 @@ class GlobalDataPackPage : public QWidget, public BasePage { MinecraftInstance* m_instance; DataPackPage* m_underlyingPage = nullptr; -}; \ No newline at end of file +}; diff --git a/launcher/ui/pages/instance/ServerPingTask.cpp b/launcher/ui/pages/instance/ServerPingTask.cpp index f88865afc..98c9060b2 100644 --- a/launcher/ui/pages/instance/ServerPingTask.cpp +++ b/launcher/ui/pages/instance/ServerPingTask.cpp @@ -44,4 +44,4 @@ void ServerPingTask::executeTask() // Delete McResolver object when done connect(resolver, &McResolver::finished, [resolver]() { resolver->deleteLater(); }); resolver->ping(); -} \ No newline at end of file +} diff --git a/launcher/ui/pages/modplatform/ModpackProviderBasePage.h b/launcher/ui/pages/modplatform/ModpackProviderBasePage.h index 6cc0b8e99..03faebaf5 100644 --- a/launcher/ui/pages/modplatform/ModpackProviderBasePage.h +++ b/launcher/ui/pages/modplatform/ModpackProviderBasePage.h @@ -26,4 +26,4 @@ class ModpackProviderBasePage : public BasePage { virtual void setSearchTerm(QString) = 0; /** Get the current term in the search bar. */ virtual QString getSerachTerm() const = 0; -}; \ No newline at end of file +}; diff --git a/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp index daa2189ad..1a0f8310b 100644 --- a/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp +++ b/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp @@ -214,4 +214,4 @@ QString ListModel::getUserPath() path = m_instances_path; return path; } -} // namespace FTBImportAPP \ No newline at end of file +} // namespace FTBImportAPP diff --git a/launcher/ui/pages/modplatform/import_ftb/ListModel.h b/launcher/ui/pages/modplatform/import_ftb/ListModel.h index a842ac8ff..72628465f 100644 --- a/launcher/ui/pages/modplatform/import_ftb/ListModel.h +++ b/launcher/ui/pages/modplatform/import_ftb/ListModel.h @@ -67,4 +67,4 @@ class ListModel : public QAbstractListModel { ModpackList m_modpacks; const QString m_instances_path; }; -} // namespace FTBImportAPP \ No newline at end of file +} // namespace FTBImportAPP diff --git a/launcher/ui/widgets/CheckComboBox.h b/launcher/ui/widgets/CheckComboBox.h index 469587762..10e2a81be 100644 --- a/launcher/ui/widgets/CheckComboBox.h +++ b/launcher/ui/widgets/CheckComboBox.h @@ -61,4 +61,4 @@ class CheckComboBox : public QComboBox { QString m_default_text; QString m_separator; bool m_containerMousePress = false; -}; \ No newline at end of file +}; diff --git a/launcher/ui/widgets/JavaSettingsWidget.h b/launcher/ui/widgets/JavaSettingsWidget.h index a84bd7c66..65154597a 100644 --- a/launcher/ui/widgets/JavaSettingsWidget.h +++ b/launcher/ui/widgets/JavaSettingsWidget.h @@ -65,4 +65,4 @@ class JavaSettingsWidget : public QWidget { BaseInstance* m_instance; Ui::JavaSettingsWidget* m_ui; unique_qobject_ptr m_checker; -}; \ No newline at end of file +}; diff --git a/program_info/PrismLauncher.icon/icon.json b/program_info/PrismLauncher.icon/icon.json index 131c7de4c..23d8b18b6 100644 --- a/program_info/PrismLauncher.icon/icon.json +++ b/program_info/PrismLauncher.icon/icon.json @@ -69,4 +69,4 @@ "macOS" ] } -} \ No newline at end of file +} diff --git a/program_info/win_install.nsi.in b/program_info/win_install.nsi.in index 910c6943c..e957f4d36 100644 --- a/program_info/win_install.nsi.in +++ b/program_info/win_install.nsi.in @@ -134,7 +134,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@ WriteRegStr ShCtx "Software\Classes\${APP_ID}" "" `${DESCRIPTION}` WriteRegStr ShCtx "Software\Classes\${APP_ID}\DefaultIcon" "" `${ICON}` ; default open verb - WriteRegStr ShCtx "Software\Classes\${APP_ID}\shell" "" "open" + WriteRegStr ShCtx "Software\Classes\${APP_ID}\shell" "" "open" WriteRegStr ShCtx "Software\Classes\${APP_ID}\shell\open" "" `${COMMANDTEXT}` WriteRegStr ShCtx "Software\Classes\${APP_ID}\shell\open\command" "" `${COMMAND}` @@ -153,7 +153,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@ !insertmacro APP_SETUP_Def `${DESCRIPTION}` `${ICON}` `${APP_ID}` `${APP_NAME}` `${APP_EXE}` `${COMMANDTEXT}` `${COMMAND}` - # Register "Default Programs" + # Register "Default Programs" WriteRegStr ShCtx "Software\Classes\Applications\${APP_EXE}\Capabilities" "ApplicationDescription" `${DESCRIPTION}` WriteRegStr ShCtx "Software\RegisteredApplications" `${APP_NAME}` "Software\Classes\Applications\${APP_EXE}\Capabilities" @@ -231,7 +231,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@ ${IfNot} ${Errors} DeleteRegKey ShCtx "Software\Classes\${APP_ID}\DefaultIcon" ${EndIf} - + # Unregister "Open With" DeleteRegKey ShCtx "Software\Classes\Applications\${APP_EXE}" @@ -256,7 +256,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@ !macro APP_TEARDOWN_DEFAULT APP_ID APP_NAME APP_EXE !insertmacro APP_TEARDOWN_Def `${APP_ID}` `${APP_NAME}` `${APP_EXE}` - + # Unregister "Default Programs" DeleteRegValue ShCtx "Software\RegisteredApplications" `${APP_NAME}` DeleteRegKey ShCtx "Software\Classes\Applications\${APP_EXE}\Capabilities" @@ -303,27 +303,27 @@ Function RunUninstall StrCpy $2 $1 1 ; take first char of string StrCmp $2 '"' quoteloop stringloop stringloop: ; get string length - StrCpy $2 $1 1 $3 ; get next char - IntOp $3 $3 + 1 ; index += 1 - StrCmp $2 "" +2 stringloop ; if empty exit loop - IntOp $3 $3 - 1 ; index -= 1 - Goto run + StrCpy $2 $1 1 $3 ; get next char + IntOp $3 $3 + 1 ; index += 1 + StrCmp $2 "" +2 stringloop ; if empty exit loop + IntOp $3 $3 - 1 ; index -= 1 + Goto run quoteloop: ; get string length with quotes removed - StrCmp $3 "" 0 +2 ; if index is set skip quote removal - StrCpy $1 $1 "" 1 ; Remove initial quote - IntOp $3 $3 + 1 ; index += 1 - StrCpy $2 $1 1 $3 ; get next char - StrCmp $2 "" +2 ; if empty exit loop - StrCmp $2 '"' 0 quoteloop ; if ending quote exit loop, else loop + StrCmp $3 "" 0 +2 ; if index is set skip quote removal + StrCpy $1 $1 "" 1 ; Remove initial quote + IntOp $3 $3 + 1 ; index += 1 + StrCpy $2 $1 1 $3 ; get next char + StrCmp $2 "" +2 ; if empty exit loop + StrCmp $2 '"' 0 quoteloop ; if ending quote exit loop, else loop run: - StrCpy $2 $1 $3 ; Path to uninstaller ; (copy string up to ending quote - if it exists) - StrCpy $1 161 ; ERROR_BAD_PATHNAME ; set exit code (it get's overwritten with uninstaller exit code if ExecWait call doesn't error) - GetFullPathName $3 "$2\.." ; $InstDir - IfFileExists "$2" 0 +4 - ExecWait $4 $1 ; The file exists, call the saved command - IntCmp $1 0 "" +2 +2 ; Don't delete the installer if it was aborted ; - Delete "$2" ; Delete the uninstaller - RMDir "$3" ; Try to delete $InstDir + StrCpy $2 $1 $3 ; Path to uninstaller ; (copy string up to ending quote - if it exists) + StrCpy $1 161 ; ERROR_BAD_PATHNAME ; set exit code (it get's overwritten with uninstaller exit code if ExecWait call doesn't error) + GetFullPathName $3 "$2\.." ; $InstDir + IfFileExists "$2" 0 +4 + ExecWait $4 $1 ; The file exists, call the saved command + IntCmp $1 0 "" +2 +2 ; Don't delete the installer if it was aborted ; + Delete "$2" ; Delete the uninstaller + RMDir "$3" ; Try to delete $InstDir Pop $4 Pop $3 Pop $2 @@ -337,13 +337,13 @@ Section "" UninstallPrevious ${If} $0 == "" ReadRegStr $0 HKCU "${UNINST_KEY}" "UninstallString" ${EndIf} - + ${If} $0 != "" - !insertmacro RunUninstall $0 $0 - ${If} $0 <> 0 - MessageBox MB_YESNO|MB_ICONSTOP "Failed to uninstall, continue anyway?" /SD IDYES IDYES +2 - Abort - ${EndIf} + !insertmacro RunUninstall $0 $0 + ${If} $0 <> 0 + MessageBox MB_YESNO|MB_ICONSTOP "Failed to uninstall, continue anyway?" /SD IDYES IDYES +2 + Abort + ${EndIf} ${EndIf} SectionEnd @@ -447,7 +447,7 @@ SectionEnd Section /o "Shell Association (Open-With dialog)" SHELL_ASSOC !insertmacro APP_SETUP `${APPDESCRIPTION}` `${APPICON}` `${APPID}` `${APPCMDTEXT}` `${APPEXE}` `${APPCMDTEXT}` '$INSTDIR\${APPEXE} -I "%1"' - + !insertmacro APP_ASSOCIATE_DEFAULT ".mrpack" `${APPID}` `${APPEXE}` true !insertmacro APP_ASSOCIATE ".zip" `${APPID}` `${APPEXE}` false @@ -489,7 +489,7 @@ Section "Uninstall" SectionEnd Section -un.ShellAssoc - + !insertmacro APP_TEARDOWN_DEFAULT `${APPID}` `${APPNAME}` `${APPEXE}` !insertmacro APP_UNASSOCIATE ".zip" `${APPID}` `${APPEXE}` diff --git a/scripts/compress_images.sh b/scripts/compress_images.sh index 1eef9f1c4..136059ff8 100755 --- a/scripts/compress_images.sh +++ b/scripts/compress_images.sh @@ -2,8 +2,8 @@ ## If current working dirctory is ./scripts, ask to invoke from one directory up if [ ! -d "scripts" ]; then - echo "Please run this script from the root directory of the project" - exit 1 + echo "Please run this script from the root directory of the project" + exit 1 fi find . -type f -name '*.png' -not -path '*/libraries/*' -exec oxipng --opt max --strip all --alpha --interlace 0 {} \;