CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,548 Commits 10 Branches 30 Tags
3587e728d4665b6dc3271c7dfb5b2f4d16e37720
Commit Graph

1269 Commits

Author SHA1 Message Date
Trial97
836e8d2e28 Fixed code quality 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 17:39:57 +03:00
Trial97
b84dc8551a Fixed trigger function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 16:49:19 +03:00
Trial97
f7d502c68c Added ExportModsToStringDialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 16:08:04 +03:00
Trial97
0063d52952 Merge branch 'settings2' of github.com:Trial97/PrismLauncher into settings 2023-06-21 23:25:37 +03:00
Trial97
2e82c1d40c Added regex expresion to exclude .DS_Store files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-21 23:22:25 +03:00
Trial97
820892d7cc Made settings editable when instance is running 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-21 22:42:08 +03:00
Trial97
0d2105dec4 Made buttons on ModsFolderPage enabled all the time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-21 21:34:40 +03:00
Trial97
480faca559 Removed unused variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-21 21:17:17 +03:00
TheKodeToad
0975dbc3dd Merge pull request #1228 from Trial97/curent_pack_crash 
Fixes #1212
 2023-06-21 15:35:09 +01:00
Rachel Powers
470518eb3a fix: resize columns on hide ^& uniform heights 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-21 02:31:40 -07:00
Trial97
ba609f3600 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-21 09:14:58 +03:00
seth
ca659136e2 Merge pull request #1119 from Trial97/mods_txt 
Added dynamic page extra info
 2023-06-20 19:56:38 -04:00
Alfio
f769b0b4c6 Remove inconsistent/unneeded question marks in UI 
Signed-off-by: P2 <tomarchioalfio5@gmail.com>
 2023-06-20 10:40:27 +02:00
James Beddek
75bd626f33 Screenshots: do not retry image thumbnailing on null result 
This causes the thumbnailing thread pool to spend a lot of time attempting to
retry an image that failed. A null result is common where the image is too large
to be allocated (>128MiB alloc).

The repeated retries continue after page delete, causing hangs if a user
tries to exit the application.

Fixes: #1201
Signed-off-by: James Beddek <telans@posteo.de>
 2023-06-20 16:59:59 +12:00
James Beddek
f2471f0f68 Screenshots: clear the thumbnailing pool on page delete 
Removes pending QThreadPool jobs which linger after page delete.
May help with #1201 by allowing the pool to finish earlier.

Signed-off-by: James Beddek <telans@posteo.de>
 2023-06-20 16:54:15 +12:00
James Beddek
d9b24f7705 Screenshots: remove path from watcher if it no longer exists 
Signed-off-by: James Beddek <telans@posteo.de>
 2023-06-20 16:52:57 +12:00
Trial97
6fd729e285 Fixed regresion regarding modrinth project_id in dependence array 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 17:42:16 +03:00
Trial97
d02858040e Fixes #1212 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 13:09:37 +03:00
Trial97
3ee0fec729 Removed mods from lambda 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 12:22:22 +03:00
Trial97
ec063470d7 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt 2023-06-19 12:20:50 +03:00
Trial97
1bdde1f947 Small fixes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 00:36:37 +03:00
Trial97
319ce8c19f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-19 00:06:44 +03:00
Trial97
4e66f55d84 Removed extra headers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-18 23:32:17 +03:00
Trial97
6826f1d605 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash 2023-06-18 23:27:41 +03:00
Trial97
0161520b33 Fixed leaks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-18 23:27:26 +03:00
seth
fd9a8d1551 Merge pull request #1110 from TheKodeToad/version-search 
Add a search bar to version lists
 2023-06-16 14:47:39 -04:00
DioEgizio
412349ac58 Merge pull request #1135 from Trial97/installed_mods 2023-06-16 09:56:51 +02:00
Trial97
147366bc0a Made ByteSynkArray to use shared_ptr 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 22:59:41 +03:00
Trial97
98a07da39b Renamed variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 14:12:29 +03:00
Sefa Eyeoglu
90a4f622d2 Merge pull request #1063 from RedsonBr140/feat/RootFolder 2023-06-15 12:49:21 +02:00
Sefa Eyeoglu
6812823b55 fix: simplify resolving of data path 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-15 12:48:22 +02:00
Trial97
cb52be433d Made the installed mods more apparent 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 13:20:08 +03:00
Trial97
1f2b0ad698 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into installed_mods 2023-06-15 12:39:20 +03:00
Trial97
6667ff9330 Updated text and fixed mod page text update 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 12:32:48 +03:00
Trial97
5bf091149d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt 2023-06-15 11:46:44 +03:00
Trial97
be0df38453 Added tooltip for name label 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 11:40:39 +03:00
Trial97
fcfb3d2df7 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page 2023-06-15 10:37:10 +03:00
Trial97
1ff8136f98 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into scale_cat 2023-06-15 10:36:05 +03:00
Trial97
182e19eae3 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-15 10:35:26 +03:00
TheKodeToad
3526d00a23 Merge branch 'develop' into feat/dont-hide-settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-14 20:05:02 +01:00
DioEgizio
a4502f44c2 Merge pull request #1145 from Trial97/net_job_crash 2023-06-14 12:46:00 +02:00
Tayou
b174f82261 Merge pull request #1162 from leo78913/i-hate-naming-branches 2023-06-12 21:41:17 +02:00
leo78913
d6c7b4e813 add icons to export menu 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-06-11 21:50:29 -03:00
Tayou
5aa1c340dc rainbow konami & toggle 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-11 01:58:37 +02:00
Trial97
ae9e8dbafd Removed const specification 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-10 22:04:08 +03:00
TheKodeToad
b7d82354cb [ci skip] License headers!! (yay) 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-10 14:43:58 +01:00
Trial97
b3d743635c Updated the messages 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-09 21:29:12 +03:00
Trial97
f2932c6d03 Fixed some crashes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-09 21:23:41 +03:00
Trial97
f96b135ef7 Higlight installed mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-08 20:26:09 +03:00
PandaNinjas
318d11481d Resolve other switch fallthrough issues 2023-06-07 19:37:54 -04:00