73adac2501
fix: use QColorConstants in Qt 5.14+
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-11 15:57:12 +02:00
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
91eb30f037
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pack_changelog
2023-08-05 19:04:53 +03:00
ae793f6cf1
Merge pull request #1459 from Scrumplex/format
2023-08-04 19:42:36 +02:00
1d638e018a
chore: update license headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-04 19:41:47 +02:00
fa2b784f7e
Merge branch 'develop' into sparkle-disable
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 19:27:48 +02:00
01e17806f6
Merge pull request #1391 from Trial97/prism_export2
2023-08-02 19:27:14 +02:00
f561e7febf
Merge pull request #1476 from Scrumplex/fix-saving-metaurl
2023-08-02 19:24:24 +02:00
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
1d468ac35a
chore: reformat
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:35 +02:00
ce2ca13815
fix: add missing headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:08 +02:00
9f66f6495a
fix: fix undisciplined multiple inheritance
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:07 +02:00
c07a857359
fix: remove irregular enum initialization
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:07 +02:00
76df836378
fix: simplify switch statement
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:07 +02:00
a545f67a21
fix: take JavaCheckResult by const reference
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-02 18:35:07 +02:00
ea56ff255d
Merge pull request #1339 from TheKodeToad/remove-direct-launch
2023-08-02 18:31:27 +02:00
01d3eea379
Merge pull request #1359 from Trial97/import
2023-08-02 18:25:51 +02:00
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
39d7bc6c24
Merge pull request #1294 from ashuntu/develop
2023-08-02 18:24:54 +02:00
bb039d4bc7
Merge pull request #1445 from Trial97/curse
...
feat: removed flame quilt warning
2023-08-02 12:55:49 +01:00
16e6a01881
fix: fix copyright year
...
Signed-off-by: Apix <apix0n@outlook.com >
2023-08-02 11:35:54 +02:00
566425166b
Merge pull request #1449 from Trial97/tehnic
...
Reintroduce parsing of INI files
2023-07-30 09:47:40 +02:00
d133b40b25
Merge branch 'PrismLauncher:develop' into develop
2023-07-28 21:22:35 +00:00
bdec11c501
Merge pull request #1437 from LostLuma/instance-export-ignore-caches-2
2023-07-27 09:40:31 +02:00
b1aa9e5846
refactor: introduce internal Launcher_ENABLE_UPDATER variable
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-27 09:37:56 +02:00
51bfda937d
chore: don't include sparkle when not enabled
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-27 02:19:21 -04:00
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
48e5040196
feat: disable sparkle when update url is empty
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-26 19:01:39 -04:00
62aa7a52c4
fiexed conflicts
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-27 00:07:38 +03:00
3c472fd7e0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2
2023-07-27 00:05:59 +03:00
1e82cb6a7c
fix: add support for QByteArray inifile
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-26 23:56:01 +03:00
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
af59c41713
fix: typo in task.h
...
Signed-off-by: seth <getchoo@tuta.io >
2023-07-26 16:20:30 -04:00
e6b4fc9182
removed quilt warning
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-26 21:36:40 +03:00
a9fefb2eeb
Address review comments
...
Signed-off-by: LostLuma <lilly@lostluma.net >
2023-07-26 15:22:22 +02:00
ce2d2c9f32
Merge pull request #1427 from tjw123hh/develop
...
Add some missing strings to translations
2023-07-26 13:41:54 +01:00
361583edfc
Ignore cache files when exporting instances
...
Signed-off-by: LostLuma <lilly@lostluma.net >
2023-07-26 04:23:01 +02:00
280f041acb
Delete some incorrect notr="true" tags
...
Signed-off-by: tjw123hh <tjw123hh@outlook.com >
2023-07-25 17:35:31 +08:00
4f00012268
Merge pull request #1426 from TheKodeToad/token-censor-fix
2023-07-24 20:41:23 +02:00
f505d43fc0
Fix token "0" being replaced
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-24 13:43:26 +01:00
6a01c277e8
Delete some incorrect tags
2023-07-24 20:41:22 +08:00
6ffcfcd7e9
Merge pull request #1402 from Trial97/flame_import
...
feat:made flame instace creation use metadata for recommended version
2023-07-22 11:14:12 +01:00
0b74b3833a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import
2023-07-21 19:30:06 +03:00
ef21879df4
replaced require with ensure for jvmArgs
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-21 19:30:00 +03:00
f8d9cd9a03
use range for
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-19 23:08:16 +03:00
b7bccb9058
removed subdirectory flag
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-19 12:27:02 +03:00
f046bd7d50
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
2023-07-19 12:26:12 +03:00
593f452986
Merge pull request #1399 from Scrumplex/offline-uuid
...
fix: generate predictable UUIDs for offline accounts
2023-07-19 10:16:27 +01:00
f393aa684e
wait to load metadata
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-18 23:59:43 +03:00
4c319c8f4f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into flame_import
2023-07-18 23:49:52 +03:00
