Commit Graph

678 Commits

Author SHA1 Message Date
6aaf3a3ed4 Merge branch 'skin_selector' of github.com:Trial97/PrismLauncher into skin_selector 2024-05-18 11:57:06 +03:00
2ac6efaa4a Fix reggresion
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-18 11:56:43 +03:00
23134d4b72 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2024-05-18 11:38:18 +03:00
0f2736306e Update launcher/ui/dialogs/skins/SkinManageDialog.ui
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-05-18 10:36:15 +03:00
09c0c11033 Add back device code flow
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-16 21:58:25 +03:00
898ee67a07 Update launcher/ui/dialogs/MSALoginDialog.cpp
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-05-16 00:41:07 +03:00
abedc6a23c Improve login UI
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-15 17:25:15 +03:00
80d8e3ee06 Remove katabasis
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-15 12:53:06 +03:00
e285a85fe8 Removed AccountTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-14 00:21:51 +03:00
3336f8107c Removed AuthRequest and NetAction
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-14 00:21:45 +03:00
e7c95c9ccb Fix bug where watched directories are not clickable on macOS
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
2024-05-07 18:57:04 -04:00
4787141698 Improved blocked mods dialog permissions prompt
Targeted to macOS (where `~/Downloads` is considered a sensitive location that the system protects behind a prompt even from non-sandboxed apps)

Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
2024-05-07 18:30:06 -04:00
51f4ede797 Fixing CI format issues
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
2024-05-01 00:11:53 -04:00
b9c010ffb2 Added patch to all setHtml calls
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
2024-04-30 23:43:36 -04:00
a5b059ebad Fixed curseforge export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-29 00:27:15 +03:00
60bd8104c4 Merge remote-tracking branch 'upstream/develop' into resource-meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-26 01:53:51 +01:00
d88fb266a5 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2024-04-20 17:42:58 +03:00
a0eba1ace6 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-31 21:15:49 +03:00
1930689a27 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into dependency_removal
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-29 10:12:02 +02:00
0f178270be Merge pull request #1786 from Trial97/deps_improve
Make dependency checking more lax
2024-03-27 20:42:26 +01:00
5d72ee1c4f Merge pull request #1837 from Trial97/import_ok 2024-03-27 10:50:58 +01:00
3c12e27226 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-23 23:53:25 +02:00
1322277ae6 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-03-17 20:57:53 +02:00
27780cc7ae Add update UI for all resource types
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-03-06 14:56:04 +00:00
4101fbb634 Allow multiline description
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-03-01 01:05:03 +00:00
41d52dc347 Remove dependencies if review mods is rejected
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-29 00:06:28 +02:00
0a3303bcbd Added button to add extra java path to the Java Wizzard
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-09 21:07:12 +02:00
82d0f204e2 De-OOP ProviderCapabilities
There was no reason for it to be a class, and imo it created quite a code-smell needing to initialise it everywhere.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-01-26 03:06:05 +00:00
97ee0a19b5 Refactor updating mechanisms to work with all resources
Summary:
- It compiles
- I need to go to bed

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-01-26 02:53:57 +00:00
35b5c8097c Merge branch 'develop' into resource-meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-01-23 23:20:40 +00:00
bc75bcdcca Merge pull request #1768 from Trial97/toggle_deps2 2024-01-18 18:18:31 +01:00
0b3e91ac62 Merge pull request #1954 from Scrumplex/fix/open-paths-immediately 2024-01-17 15:18:46 +01:00
a7d293b3f2 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-10 09:17:52 +02:00
1130fe8510 Happy new year :D
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-01-02 18:04:42 +00:00
0ccdcd23e3 fix: open paths directly
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-12-14 13:02:29 +01:00
763eab6b96 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-12-13 14:48:31 +02:00
4498d32cc0 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-12-13 14:37:02 +02:00
79218cf13b Merge pull request #1738 from Trial97/some_removals 2023-12-11 11:08:26 +01:00
6f6b6312a5 Moved the button up
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-27 09:39:31 +02:00
1a0fd5f993 Added mod reinstall dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-25 00:18:10 +02:00
20e0cb43b9 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-11-23 23:58:47 +02:00
2db5677281 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-11-23 23:57:44 +02:00
1650237c8f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into some_removals 2023-11-23 23:37:13 +02:00
403a7f5d46 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps2 2023-11-23 23:21:11 +02:00
3234bb5a8c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve 2023-11-23 17:05:37 +02:00
9c13504b06 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_ok 2023-11-23 16:13:09 +02:00
afcdb7595c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-11-23 16:01:54 +02:00
908072710a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-23 14:34:56 +02:00
b42434bcb6 Merge remote-tracking branch 'upstream/develop' into const-in-declarations 2023-11-23 09:06:23 +01:00
54c308e5b5 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-19 21:15:12 +02:00