Sefa Eyeoglu
73adac2501
fix: use QColorConstants in Qt 5.14+
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-11 15:57:12 +02:00
maple!
97ef8e8d0e
Fix transparency in skin icon
...
QPainter has a bug where drawing transparency to a freshly initialized, empty QPixmap causes garbage data to be drawn. This broke the rendering of the skin icon. The fix is simply to fill the QPixmap with empty transparent pixels beforehand.
Signed-off-by: maple! <averyrudelphe@gmail.com>
2023-08-10 15:32:47 +02:00
Sefa Eyeoglu
7c547f6452
Merge pull request #1370 from Trial97/pack_changelog
2023-08-05 22:50:38 +02:00
Trial97
91eb30f037
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pack_changelog
2023-08-05 19:04:53 +03:00
Sefa Eyeoglu
ae793f6cf1
Merge pull request #1459 from Scrumplex/format
2023-08-04 19:42:36 +02:00
Sefa Eyeoglu
1d638e018a
chore: update license headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-04 19:41:47 +02:00
seth
50c7d39e08
Merge pull request #1483 from DioEgizio/update-qt652
...
[macOS,Windows] Update to Qt 6.5.2
2023-08-04 12:05:45 -04:00
DioEgizio
b013133cc1
chore: update to qt 6.5.2
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2023-08-03 09:24:47 +02:00
Sefa Eyeoglu
ac36a2289f
Merge pull request #1452 from getchoo/sparkle-disable
2023-08-02 19:28:01 +02:00
Sefa Eyeoglu
fa2b784f7e
Merge branch 'develop' into sparkle-disable
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02 19:27:48 +02:00
Sefa Eyeoglu
01e17806f6
Merge pull request #1391 from Trial97/prism_export2
2023-08-02 19:27:14 +02:00
Sefa Eyeoglu
f561e7febf
Merge pull request #1476 from Scrumplex/fix-saving-metaurl
2023-08-02 19:24:24 +02:00
Sefa Eyeoglu
39d4f0df66
fix: don't reset meta url on launch
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02 18:56:54 +02:00
Sefa Eyeoglu
1d468ac35a
chore: reformat
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02 18:35:35 +02:00
Sefa Eyeoglu
ce2ca13815
fix: add missing headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02 18:35:08 +02:00
TheKodeToad
f256b836f4
Make more options generic
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-02 18:35:08 +02:00
TheKodeToad
71fb38c91f
Fix alignment properties
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-02 18:35:08 +02:00
Sefa Eyeoglu
076c189948
fix: format all languages using clang-format
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02 18:35:08 +02:00
Sefa Eyeoglu
9f66f6495a
fix: fix undisciplined multiple inheritance
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02 18:35:07 +02:00
Sefa Eyeoglu
c07a857359
fix: remove irregular enum initialization
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02 18:35:07 +02:00
Sefa Eyeoglu
76df836378
fix: simplify switch statement
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02 18:35:07 +02:00
Sefa Eyeoglu
a545f67a21
fix: take JavaCheckResult by const reference
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02 18:35:07 +02:00
Sefa Eyeoglu
9d5818916a
fix(nix): enable clang-format
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02 18:35:07 +02:00
Sefa Eyeoglu
ea56ff255d
Merge pull request #1339 from TheKodeToad/remove-direct-launch
2023-08-02 18:31:27 +02:00
Sefa Eyeoglu
01d3eea379
Merge pull request #1359 from Trial97/import
2023-08-02 18:25:51 +02:00
Alexandru Ionut Tripon
f13eccb03d
Update launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-08-02 19:24:58 +03:00
Sefa Eyeoglu
39d7bc6c24
Merge pull request #1294 from ashuntu/develop
2023-08-02 18:24:54 +02:00
ashuntu
6a7f63166d
DCO Remediation Commit for ashuntu <101582426+ashuntu@users.noreply.github.com>
...
I, ashuntu <101582426+ashuntu@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 10678096e551d7a6289e1467072f3d
2023-08-02 10:04:53 -05:00
TheKodeToad
bb039d4bc7
Merge pull request #1445 from Trial97/curse
...
feat: removed flame quilt warning
2023-08-02 12:55:49 +01:00
Sefa Eyeoglu
92b2f463e3
Merge pull request #1474 from apix0n/develop
2023-08-02 12:08:34 +02:00
Apix
16e6a01881
fix: fix copyright year
...
Signed-off-by: Apix <apix0n@outlook.com>
2023-08-02 11:35:54 +02:00
seth
9137721e8e
Merge pull request #1461 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2023-07-30 04:45:10 -04:00
Sefa Eyeoglu
566425166b
Merge pull request #1449 from Trial97/tehnic
...
Reintroduce parsing of INI files
2023-07-30 09:47:40 +02:00
github-actions[bot]
d1513732be
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/f465da166263bc0d4b39dfd4ca28b777c92d4b73' (2023-07-22)
→ 'github:nixos/nixpkgs/d2b52322f35597c62abf56de91b0236746b2a03d' (2023-07-29)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/eb433bff05b285258be76513add6f6c57b441775' (2023-07-18)
→ 'github:cachix/pre-commit-hooks.nix/1e2443dd3f669eb65433b2fc26a3065e05a7dc9c' (2023-07-29)
2023-07-30 00:20:33 +00:00
ashuntu
1467072f3d
Removed snapcraft.yaml in favor of dedicated repo: https://github.com/ashuntu/prismlauncher-snap
2023-07-28 16:25:32 -05:00
Ash
d133b40b25
Merge branch 'PrismLauncher:develop' into develop
2023-07-28 21:22:35 +00:00
Sefa Eyeoglu
bdec11c501
Merge pull request #1437 from LostLuma/instance-export-ignore-caches-2
2023-07-27 09:40:31 +02:00
Sefa Eyeoglu
b1aa9e5846
refactor: introduce internal Launcher_ENABLE_UPDATER variable
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-27 09:37:56 +02:00
seth
51bfda937d
chore: don't include sparkle when not enabled
...
Signed-off-by: seth <getchoo@tuta.io>
2023-07-27 02:19:21 -04:00
LostLuma
4a9ea832ff
Ignore cache files entirely, also apply to modpack export
...
Signed-off-by: LostLuma <lilly@lostluma.net>
2023-07-27 01:42:14 +02:00
seth
a8498b0dab
chore: make INSTALL_BUNDLE a cached variable
...
Signed-off-by: seth <getchoo@tuta.io>
2023-07-26 19:03:14 -04:00
seth
48e5040196
feat: disable sparkle when update url is empty
...
Signed-off-by: seth <getchoo@tuta.io>
2023-07-26 19:01:39 -04:00
seth
928e18b66d
Merge pull request #1446 from getchoo/nix-fixes
...
disable darwin in flake + cleanup garnix.yaml + fix markdownlint warnings
2023-07-26 17:10:07 -04:00
Trial97
62aa7a52c4
fiexed conflicts
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-27 00:07:38 +03:00
Trial97
3c472fd7e0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2
2023-07-27 00:05:59 +03:00
Sefa Eyeoglu
d960effb99
Merge pull request #1447 from getchoo/typomoment
...
fix: typo in task.h
2023-07-26 22:56:31 +02:00
Trial97
1e82cb6a7c
fix: add support for QByteArray inifile
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-26 23:56:01 +03:00
Alexandru Ionut Tripon
31b62203a7
Update launcher/ui/MainWindow.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-07-26 23:44:35 +03:00
seth
af59c41713
fix: typo in task.h
...
Signed-off-by: seth <getchoo@tuta.io>
2023-07-26 16:20:30 -04:00
seth
f7ffbcca6c
chore(docs): correct markdownlint warnings
...
Signed-off-by: seth <getchoo@tuta.io>
2023-07-26 14:49:09 -04:00
