Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-10 20:35:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,771 Commits 9 Branches 38 Tags
616aa002e1c007c381c7d352fcd03ede9be173b5
Commit Graph

670 Commits

Author SHA1 Message Date
timoreo
736ecf266d Merge pull request #3019 from Trial97/task_parent 
fixed double deletion for tasks
 2024-11-15 06:19:40 +01:00
Alexandru Ionut Tripon
7d03cb114d Merge pull request #3031 from Trial97/lambda 
do not capture by default all values in lambdas
 2024-11-07 23:45:31 +02:00
Trial97
2b590f24ed remove task parent from constuctor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-01 00:11:45 +02:00
Trial97
670c932f32 Fix installed typo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-31 14:51:18 +02:00
Trial97
0e80aae1b8 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into lambda 2024-10-30 19:35:25 +02:00
TheKodeToad
c142d38f08 Merge pull request #1588 from TheKodeToad/resource-meta 
Implement tracking and updates for files other than mods
 2024-10-30 17:03:54 +00:00
Trial97
82bffabb69 do not capture by default all values in lambdas 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-30 18:16:43 +02:00
TheKodeToad
f57ca1e79e Add Change Version action to all pages 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 16:07:41 +00:00
Trial97
bd82737efb translate standard buttons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-28 15:46:47 +02:00
TheKodeToad
1809858fc7 Ignore .index in ExportPackDialog 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 11:01:30 +00:00
TheKodeToad
6a6fe60a5b Revert "Use non-mod metadata in ModrinthPackExportTask" 
Out-of-scope

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 10:29:49 +00:00
Trial97
c4cd7cf6c1 change ZekeZ name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-27 13:17:58 +02:00
Trial97
f373a5cea0 change contributors name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-27 11:58:34 +02:00
TheKodeToad
13e13ea8fc Use non-mod metadata in ModrinthPackExportTask 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-25 19:13:41 +01:00
TheKodeToad
89a327d363 Merge remote-tracking branch 'upstream/develop' into resource-meta 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-23 14:19:07 +01:00
Alexandru Ionut Tripon
79439a0217 Merge pull request #2958 from Trial97/crash_QsaveFile 
skip parsing open QSaveFile temprary files as resources
 2024-10-22 17:38:32 +03:00
Trial97
562c301326 skip QSaveFile temprary files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-22 01:22:31 +03:00
Alexandru Ionut Tripon
69028969f1 Update launcher/ui/dialogs/skins/SkinManageDialog.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-10-21 22:59:51 +03:00
Trial97
9a5b773e69 do not try to import skin if path is empty 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-21 19:28:34 +03:00
ZekeZ
3ac080806d Merge pull request #2831 from Trial97/fix_login 
split the auth loading screen
 2024-10-21 00:14:36 +10:00
Rachel Powers
a108b5b420 fix: ensure all connections to the ProgressDialogs's Task the dialog made are dissconnected 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-14 00:45:45 -07:00
TheKodeToad
538815e033 Merge remote-tracking branch 'upstream/develop' into resource-meta 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-08 17:16:10 +01:00
TheKodeToad
3fae659b30 Merge remote-tracking branch 'upstream/develop' into resource-meta 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-08 17:15:42 +01:00
timoreo
62f19a6ac9 Merge pull request #2863 from Trial97/fix_resource_search_equal 2024-10-01 11:41:11 +02:00
timoreo
c57e26cf57 Merge pull request #2874 from Trial97/modpack_equal 2024-10-01 11:40:42 +02:00
Trial97
946e791d39 sync modpack search field 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-01 08:53:27 +03:00
Trial97
5ea2dece54 fix search term not remaining the same between providers on resource download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-01 08:52:07 +03:00
Trial97
0eefa52dbc fix some transtaions warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-01 08:51:06 +03:00
Trial97
b676a67b3c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_login 2024-10-01 08:49:03 +03:00
Trial97
580fc32518 split the auth loading screen 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 16:41:16 +03:00
Trial97
d2f0d1d8d5 Wrap FS::write in try catch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 12:42:09 +03:00
Trial97
d38e7fa142 Add more null protection for skin management 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 12:41:33 +03:00
Trial97
92495494ca Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-23 08:16:59 +03:00
Trial97
002fc71b8d allways load java list on autodetect 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-20 01:18:37 +03:00
Trial97
b5bbe93775 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-17 00:20:40 +03:00
Trial97
63a380a039 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into clean_net 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-22 22:06:09 +03:00
Trial97
29a6db171f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-07-22 08:57:31 +03:00
Alexandru Ionut Tripon
69c55d90ce Merge pull request #2558 from Trial97/update_filters 
Resolve issue with multiple loaders during mod update
 2024-07-19 15:46:15 +03:00
Trial97
c07260e836 remove duplicate code from net folder 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-07 02:49:27 +03:00
Trial97
0f311453e1 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-30 22:54:23 +03:00
Alexandru Ionut Tripon
7ff173d72a Merge pull request #2173 from Trial97/dependency_removal 
Remove dependencies if review mods is rejected
 2024-06-30 22:21:38 +03:00
Trial97
f1a4a1e8ee increase 'or' font size for login dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-29 08:41:35 +03:00
Trial97
06add2b0a8 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:55:16 +03:00
Trial97
4f8b20437f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-28 20:49:37 +03:00
Trial97
0b79abcdcd Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:45:30 +03:00
Trial97
147741e616 increment clang-tools version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 12:48:52 +03:00
Alexandru Ionut Tripon
68292aff6c Merge pull request #2574 from ajerick/develop 
fix non-persistent user icon selection in NewInstanceDialog.cpp
 2024-06-27 08:38:46 +03:00
seth
3f3351f89e Merge pull request #1892 from Trial97/change_version 
Added mod reinstall dialog
 2024-06-27 02:12:00 +00:00
Aiden J Erickson
37388e1d48 fix non-persistent user icon selection in NewInstanceDialog.cpp 
Signed-off-by: Aiden J Erickson <aiden.j.erickson@gmail.com>
 2024-06-26 20:54:04 -04:00
Trial97
2f88da9de2 add warnning when user closes the resource download dialog with selection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-25 09:50:33 +03:00