bc2940e16a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-08 00:14:05 +03:00
1131038fdb
Merge pull request #1120 from Trial97/visit_mod_page
2023-07-07 22:23:59 +02:00
51e62761ee
fix: improve QUrl construction
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-07 19:25:12 +02:00
b8482a5d89
Update ModFolderPage.cpp
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-07-07 15:53:50 +01:00
3139af8487
Made action text simpler
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-07 17:12:10 +03:00
073cb91f88
fix(ui): validate meta override url
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-07-07 15:56:07 +02:00
4509fde410
Merge branch 'develop' into fix-implicit-fallthrough
...
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la >
2023-07-04 16:41:34 -04:00
1fbc17d275
Remove break and add fallthrough comment in WorldListPage.cpp
...
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la >
2023-07-04 16:38:04 -04:00
026293f773
updated option text
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-07-03 14:17:39 +03:00
43e6f05ed5
Merge pull request #1232 from telans/screenshots-update
...
ScreenshotsPage fixes
2023-07-02 16:44:54 +01:00
0f64ee6a5f
Added warnings for running instances
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-28 18:28:25 +03:00
c23bf2fd22
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings
2023-06-28 17:46:01 +03:00
faec21d572
Merge pull request #1266 from TheKodeToad/smol-tweaks
2023-06-28 08:47:53 +02:00
54cb077b40
Added more information to the screenshot upload warning
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-27 19:31:36 +03:00
6d0e255ca1
fix: Page container extra info set on logs page
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-25 22:00:33 +03:00
c75ba0f855
Fix big mistake :iea:
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-25 12:46:07 +01:00
603ed22015
Replace accidental usages of QAbstractButton::pressed
...
This signal is not usually what you want, and creates an inconsistent experience.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-25 10:36:54 +01:00
ce4a86fbcd
Made custom url function
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-25 10:41:29 +03:00
54d7477679
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page
2023-06-25 10:12:29 +03:00
8a3aba1634
Fix Open Global Settings, why not
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-24 23:30:51 +01:00
529e2054ea
A few tweaks, with inspiration from Zeke :3
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-06-24 23:26:27 +01:00
69c709b05a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-23 20:01:17 +03:00
85bbab0e92
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash
2023-06-23 14:38:30 +03:00
83efdccfe1
Merge pull request #1252 from getchoo/import-hehe
...
chore: avoid confusion in file/url import dialog
2023-06-22 17:12:35 -04:00
f1ebec641a
Merge pull request #1058 from Ryex/feature/images-for-resource-page
...
Feature: image coumn for Mod, Resource Pack, and Texturepack pages
2023-06-22 13:26:47 -07:00
a4521ac0bb
chore: avoid confusion in file/url import dialog
...
Signed-off-by: seth <getchoo@tuta.io >
2023-06-22 16:15:03 -04:00
0063d52952
Merge branch 'settings2' of github.com:Trial97/PrismLauncher into settings
2023-06-21 23:25:37 +03:00
820892d7cc
Made settings editable when instance is running
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-21 22:42:08 +03:00
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
480faca559
Removed unused variable
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-21 21:17:17 +03:00
0975dbc3dd
Merge pull request #1228 from Trial97/curent_pack_crash
...
Fixes #1212
2023-06-21 15:35:09 +01:00
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
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
ca659136e2
Merge pull request #1119 from Trial97/mods_txt
...
Added dynamic page extra info
2023-06-20 19:56:38 -04:00
f769b0b4c6
Remove inconsistent/unneeded question marks in UI
...
Signed-off-by: P2 <tomarchioalfio5@gmail.com >
2023-06-20 10:40:27 +02:00
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
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
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
d02858040e
Fixes #1212
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-19 13:09:37 +03:00
3ee0fec729
Removed mods from lambda
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-19 12:22:22 +03:00
ec063470d7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt
2023-06-19 12:20:50 +03:00
319ce8c19f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
2023-06-19 00:06:44 +03:00
4e66f55d84
Removed extra headers
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-18 23:32:17 +03:00
6826f1d605
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash
2023-06-18 23:27:41 +03:00
0161520b33
Fixed leaks
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-18 23:27:26 +03:00
147366bc0a
Made ByteSynkArray to use shared_ptr
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-15 22:59:41 +03:00
1f2b0ad698
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into installed_mods
2023-06-15 12:39:20 +03:00
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
5bf091149d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt
2023-06-15 11:46:44 +03:00
be0df38453
Added tooltip for name label
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-06-15 11:40:39 +03:00