CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,578 Commits 10 Branches 30 Tags 34 MiB
9f66f6495a
Commit Graph

1279 Commits

Author SHA1 Message Date
Trial97
763b3c3236
Added Thumbs.db to excluded files in MrPackExport 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 10:38:26 +03:00
Trial97
718aca3d06
Fixed date constructor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 09:24:18 +03:00
Trial97
bf95cfb30e
Added CatPacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 01:37:28 +03:00
seth
8df5ab8aa7
Merge pull request #1251 from getchoo/github-clarify 
chore: add 'suggest a feature' message in help
 2023-06-22 17:13:00 -04:00
seth
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
Rachel Powers
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
seth
a4521ac0bb
chore: avoid confusion in file/url import dialog 
Signed-off-by: seth <getchoo@tuta.io>
 2023-06-22 16:15:03 -04:00
seth
03361e51ef
chore: add 'suggest a feature' message in help 
Signed-off-by: seth <getchoo@tuta.io>
 2023-06-22 15:58:53 -04:00
Trial97
049b02cee4
finished up the curesforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 21:06:01 +03:00
Trial97
58321f3491
Added curseforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 20:03:44 +03:00
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
TheKodeToad
0b4807dc1f Questionable fix two 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-07 22:55:37 +01:00
Trial97
d33de2e427
Made cat scalable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-08 00:54:32 +03:00
Trial97
bbd9e4de9b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt 2023-06-07 20:18:56 +03:00
Trial97
8abe6b6732
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page 2023-06-07 20:18:36 +03:00
Tayou
9b9d439fce
Merge pull request #1111 from Trial97/requires 2023-06-07 18:57:46 +02:00
Sefa Eyeoglu
accf0cd40e
Merge pull request #1115 from leo78913/fix-resource-downloader-crash 2023-06-07 08:47:19 +02:00
Trial97
e936bc4c60
Added custom text for multiple selection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-07 01:38:10 +03:00
Trial97
f724059b88
Added visit mod's page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-07 01:23:53 +03:00
Trial97
1e702ee40f
Added dynamic page extra info 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-07 00:16:23 +03:00
Tayou
3b9d822d72
Merge pull request #1073 from leo78913/accounts-menus-fixes 2023-06-06 20:34:41 +02:00
leo78913
a807b231a7 fix: fix crash when selecting resource/texture/shader packs 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-06-06 15:17:13 -03:00
TheKodeToad
a2d0d5a71d Allow arrow key movement, fix auto-focus 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-06 18:26:26 +01:00
leo78913
d59a06344a fix main toolbar accounts toolbutton name 
previously it was not using the selected account name when opening the launcher

and i also added an action group to the menu items so it uses radio buttons instead of checkboxes :p

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-06-06 14:21:41 -03:00
Tayou
e884341795
save meta custom url as string, not QUrl 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-06 18:15:26 +02:00
TheKodeToad
c343036d3b Simplify 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-06 12:24:53 +01:00
Trial97
1043d29dd5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into requires 2023-06-06 10:34:36 +03:00
Trial97
6505a62801
Renamed requires fields 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-06 10:34:05 +03:00
TheKodeToad
961285d6ab Add a search bar to version lists 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-05 22:47:42 +01:00
TheKodeToad
37b4f606c8 Validate input lengths on mrpack export 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-05 17:54:24 +01:00
Rachel Powers
3dccc38f42
Merge pull request #904 from TheKodeToad/mrpack-export 
mrpack export
 2023-06-04 19:01:50 -07:00
TheKodeToad
e26827b849 Optimised icons 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-03 13:39:42 +01:00
Trial97
9ca74cd009
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-03 00:48:13 +03:00
Alexandru Ionut Tripon
1840505a0f
Fix crash when selecting same mod from different providers (#1029) 2023-06-02 18:04:06 -03:00
Sefa Eyeoglu
0ece0b5b27
Merge pull request #1086 from TayouVR/fix-qt6_5-brown-system-theme 2023-06-02 12:18:37 +02:00
Rachel Powers
5fe9e30f39 fix: use instance settings, make image column user resizeable, fix memory leak 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 14:53:15 -07:00
Rachel Powers
b28f682ad9 Merge branch 'develop' into feature/images-for-resource-page 2023-05-28 12:01:49 -07:00
Trial97
b4dff181f7
Fixed Ptr logic 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 18:22:55 +03:00
Trial97
737fc1a2a4
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 18:01:39 +03:00
Trial97
bdff8591aa
Removed extra loop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 17:54:46 +03:00
Trial97
27c3775f99
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 17:44:23 +03:00
Trial97
bf0a577fb9
Fixed repaint issue 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 16:57:35 +03:00
Rachel Powers
7af116fb00 refactor: function scope statics 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 05:06:28 -07:00
Rachel Powers
0357921284 cleanup: move qstyle getInstance decl inline 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 04:37:09 -07:00
Rachel Powers
a04a6f1e0d fix(memory leak): don't give shared pointers out to foldermodels (causes cyclic refrence) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 02:15:39 -07:00
Rachel Powers
37420405c7 fix(memory leak): refactor NoBigComboStyle -> singleton 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-27 23:22:40 -07:00
Rachel Powers
ff03dd22fe fix(memory leak): don't override default deconstructor + reset shared_ptr + ensure modal get's cleaned up 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-26 21:10:49 -07:00
Rachel Powers
aae892dfd1 fix(memory leak): IndexedPack too large to live inside a qlist without pointers () 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-26 19:21:07 -07:00
Rachel Powers
e61d8e4dc8 fix: katabasis and QStyle leaks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-25 16:16:58 -07:00
Rachel Powers
086a7e19f0 feat: Column on left, hideable 
- columns are hideable (saves to settings)
- image column moved to left
- datamodals can provide resize modes

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-24 20:15:34 -07:00
Tayou
3c937532f2
fix System theme colors on windows 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-05-24 15:18:08 +02:00
TheKodeToad
863027cbe8 Enable size grip 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-22 11:56:54 +01:00
Rachel Powers
6b8fe283f0 fix: memory leak, set parent so it's in tree to get cleaned up. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-21 01:49:13 -07:00
leo78913
4f0ec908ec feat: add a close button to the main toolbar when running on gamescope 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-05-17 00:57:28 -03:00
Kode
3be18b58bb
Better variable name :p 
Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-05-15 19:15:56 +01:00
TheKodeToad
22aaf56855 De-hardcode .index 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-15 18:48:49 +01:00
leo78913
7537ea1ef5 make instance settings account selector a comboBox 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-05-14 16:33:41 -03:00
Trial97
ffcc58cb3e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-14 14:20:24 +03:00
Trial97
8c7fd3327e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert 2023-05-14 14:20:04 +03:00
Kode
f60562c5a2
Merge branch 'develop' into mrpack-export 
Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-05-13 19:07:03 +01:00
TheKodeToad
e1b6020b76 Make some changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-13 18:24:01 +01:00
Redson
79ce7eb1fc
fix: shouldDisplay() is now redundant. 
Signed-off-by: Redson <redson@riseup.net>
 2023-05-13 09:00:10 -03:00
Rachel Powers
6b6d6a01dc
Merge branch 'develop' into fix/network_and_signals 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-12 01:13:17 -07:00
Redson
37a6ef95f0
feat: Don't hide the settings tab when an instance is running 
Signed-off-by: Redson <redson@riseup.net>
 2023-05-10 08:25:13 -03:00
Redson
475761b295
fix: Prism sets the data dir to the working directory. 
Signed-off-by: Redson <redson@riseup.net>
 2023-05-09 06:36:21 -03:00
Redson
0b251fa754
feat: Add the launcher root folder to the Folders menu 
Signed-off-by: Redson <redson@riseup.net>
 2023-05-08 19:57:30 -03:00
Rachel Powers
884ac73078 Merge remote-tracking branch 'upstream/develop' into better-tasks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-07 13:21:21 -07:00
Trial97
ef6cbdfa2a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-07 19:01:20 +03:00
Sefa Eyeoglu
ce5bb29c44
Merge pull request #1054 from Ryex/more-lax-block-mods-filename-check 2023-05-06 09:54:59 +02:00
Sefa Eyeoglu
d535f73a58
Merge pull request #950 from DioEgizio/resize-settings 
fix: divide minecraftpage into tabs
 2023-05-06 08:28:46 +02:00
DioEgizio
d38696f411
Update launcher/ui/pages/global/MinecraftPage.ui 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-05-06 07:15:14 +02:00
Rachel Powers
b266068644
Apply suggestions from code review 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-05 14:07:10 -07:00
Rachel Powers
74e7c13a17 feat: display license and issue tracker 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-05 13:46:38 -07:00
Rachel Powers
3cfcc83ea9 change: don't toggle a resource's enabeling just by selecting it. only if they are on the checkbox. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-05 13:46:01 -07:00
Rachel Powers
9913080a82 feat(modpage): mod icon in description and column 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-04 23:44:28 -07:00
Trial97
469ef3e06d
Fixed code error 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-05 00:04:24 +03:00
Trial97
107b470289
Updated required_by as dependency 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-04 23:54:46 +03:00
Rachel Powers
e0635955df fix: super lax compare 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-04 13:30:39 -07:00
Trial97
8b14b946e2
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-04 22:35:16 +03:00
Trial97
f7b912fc9d
Fixed comments 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-04 22:25:05 +03:00
Trial97
9fbec3793f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-04 20:29:33 +03:00
Rachel Powers
5ec4cbf1cb fix add an addtion lax file name match with replaced with + 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-03 20:31:15 -07:00
Trial97
e4449a0ba3
Initialized variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-03 09:09:07 +03:00
Trial97
42dc3ed03f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert 2023-05-03 00:56:26 +03:00
Trial97
f8bf71e152
Moved the selected resources to one list 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-03 00:49:54 +03:00
Sefa Eyeoglu
64ba5e4ed1
Merge pull request #833 from Ryex/advanced_copy_instance 2023-05-02 12:11:41 +02:00
Rachel Powers
236764adf6 refactor: Qt can handle const& in signals and slots 
While most Qt types cna use implicit data sharing
pasing our own structs means copies. const& ensure
it's only copied as needed by Qt.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
0fb6a2836b refactor: propogate only only one StepProgress at a time 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
b6452215c1 feat: add details signal to Task 
feat: add details to mod pack downloading
feat: add logging rule sloading form `ligging.ini at data path root
feat: add `launcher.task` `launcher.task.net` and `launcher.task.net.[down|up]load` logging categories
fix: add new subtask progress to the end of the lay out not the beginning (cuts down on flickering)

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:47:50 -07:00
Rachel Powers
f1028fa66d fix: properly map progress range 
- doument PCRE used for URL compacting

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:47:31 -07:00
Rachel Powers
9d2f0e4dc8 feat: Propogated subtask progress 
Oh boy this is big.

> TaskStepProgress struct is now QMetaObject compatabile and can be sent through signals
> Task now has a method to propogates sub task progress it must be signal bound by each task containing a task wishing to report progress of it's children.
> Downloads report speed
> Tasks now have UUIDS to track them
  - use when reporting
  - use when logging
  - use when storeing them or objects related to them

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:47:20 -07:00
Rachel Powers
f997529cd4 feat: better task tracking 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:45:34 -07:00
Rachel Powers
d80dee2a54 refactor: pass instance ptr to resource models. use it to find instance root. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-29 19:55:37 -07:00
Sefa Eyeoglu
ff07714e8c
chore: remove FTB modpack support 
We have been contacted by Feed the Beast to drop support for the FTB
modpack browser from Prism Launcher.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-04-28 11:35:20 +02:00
Trial97
61a2355618
Removed formated but not used files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-27 01:41:26 +03:00
Trial97
248920a221
Removed extra code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-27 01:33:46 +03:00
Trial97
b2ecb9ac09
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop 2023-04-22 22:28:08 +03:00
Trial97
f738d7566e
Fixed code qulity 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-22 22:27:33 +03:00
Trial97
1d167f8fda
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-22 01:32:33 +03:00
Trial97
460e83207f
Fixed removeIf for Qt version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-22 01:18:27 +03:00
Trial97
75116364c6
Small Cleanup 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-22 00:55:11 +03:00
Trial97
f7931c2ee2
Better version handling 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-22 00:47:51 +03:00
Trial97
10aac4fe17
Fixed assert 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 21:03:01 +03:00
Trial97
42bc91463e
Updated links 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 20:37:17 +03:00
Trial97
2c744da9f7
More cleanup 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:06 +03:00
Trial97
ffaa47bf54
Small cleanup 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:06 +03:00
Trial97
c1490cd627
Refator task to work with multiple providers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:06 +03:00
Trial97
fac33498db
Made some copy by reference 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:06 +03:00
Trial97
31e84780a8
Hope to fix windows build errors 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:06 +03:00
Trial97
f3f8f3574a
Small headers removal 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:05 +03:00
Trial97
7bd26ce468
Semi fixed the Modrinth dependency implementation 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:05 +03:00
Trial97
bcea19b957
Tried to fix codeQL 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:05 +03:00
Trial97
5079ce8d64
Fixed headers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:05 +03:00
Alexandru Ionut Tripon
f231a33f6e
Merge branch 'PrismLauncher:develop' into develop 2023-04-21 18:42:05 +03:00
Trial97
4fe497cd68
First working version with curseforge mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:05 +03:00
Rachel Powers
12f0d51c0c Fix: signal/slot macro -> func pointer & network fixes 
- convert qt connect calls to use function pointers instead of the signal/slot macros wherever practical (UI classes were mostly left alone, target was tasks and processes)
- give signals an explicit receivers to use the static method over the instance method wherever practical
- ensure networks tasks are using the `errorOccured` signal added in Qt5.15 over the deprecated `error` signal
- ensure all networks tasks have an sslErrors signal connected
- add seemingly missing `MinecraftAccount::authSucceeded` connection for `MSAInteractive` login flow

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-17 18:23:18 -07:00
TheKodeToad
b8e0c8ebc6 Boring changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-17 10:16:03 +01:00
Sefa Eyeoglu
1b05303250
Merge pull request #946 from Ryex/subfolder-watch 2023-04-14 17:10:25 +02:00
Rachel Powers
a02f67ed0e refactor: rename watch_subdirectories -> watch_recurisve (prevent confusion of behavior) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-12 11:30:02 -07:00
Sefa Eyeoglu
a988111507
fix: do not apply system theme on launch 
Closes PrismLauncher/PrismLauncher#490

Regression introduced by PrismLauncher/PrismLauncher#249

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-04-08 18:48:05 +02:00
Rachel Powers
c56db0408b fix: load setting state with page. don't translate "..." 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-08 07:26:56 -07:00
Rachel Powers
2321d9c065 fix: canonical*File*Path() 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-07 18:36:35 -07:00
Rachel Powers
62c59820cf fix: harden watchPath. NO DUPLICATES! >:( 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-03 15:26:26 -07:00
Rachel Powers
5ce7874280 fix: no loops in watch paths! >:( 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-02 18:55:21 -07:00
Rachel Powers
ba2b5c3a65
fix: Apply suggestions from code review 
-expand columspan on new UI element
-improve tooltip

Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-02 16:39:13 -07:00
Rachel Powers
4df4b43900
fix: Apply suggestions from code review (string changes) 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-31 18:25:29 -07:00
TheKodeToad
e42050cc8a Skip lookup if no files and fail if zipping fails 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-28 14:22:28 +01:00
Rachel Powers
df17f5e899 fix: use QDir::Filter::NoDotAndDotDot 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-27 19:11:26 -07:00
Rachel Powers
a0045ece07 feat: add setting to watch recursively 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-27 19:01:53 -07:00
DioEgizio
4c013e59f0 divide minecraftpage into tabs 
this way small screen users can use the launcher settings without having window a bigger than their actual screens
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-03-25 13:12:50 +01:00
Rachel Powers
ef50e5595e fix: don't try to watch the entier filesystem by watching parent links 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-21 12:17:01 -07:00
Rachel Powers
02bf086c09 feat: watch sub directories for mods 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-21 11:07:20 -07:00
Rachel Powers
0c986ba4d0 spelling and formatting 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 16:38:40 -07:00
Rachel Powers
a28193430c fix: adjust geometry and add missing tooltip 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:33 -07:00
Rachel Powers
458c2f38bc cleanup: code review sugestions 
clean up translation strings

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:33 -07:00
Rachel Powers
ae289c923c fix: clean up initial review comments (flowin) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:33 -07:00
Rachel Powers
e0ef86340f feat: connect new help button help-pages/instance-copy 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:33 -07:00
Rachel Powers
1ca2c59f2e feat: track instance copies that use links 
confirm deleations when other instances link to it

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
a0e03c41c0 fix: typos 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
a1053a4c5a feat: warnings when instance resources are linked 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
9f441a9678 feat: Add UAC icon when symlinking on windows. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
2837236d81 fix: intelegent recursive links & symlink follow on export 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
bc8336a4b1 fix: cleanup UI, detect FAT and turn off links 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
397e7f0363 feat(reflink): hook up relink / clone on the copy dialog 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
c9105e525e fix: follow symlinks when exporting 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
1bed7754e0 feat(symlinks): make recursive links explicit 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
5978882378 feat(symlinks&hardlinks): linkup copy dialog 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
f794e49bb6 we want to make links! 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:27 -07:00
TheKodeToad
ec8cb056bf QRegExp -> QRegularExpression :P 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-19 11:49:24 +00:00
TheKodeToad
1893871a99
Merge branch 'PrismLauncher:develop' into mrpack-export 2023-03-18 14:02:05 +00:00
TheKodeToad
5346dfc782 Use first line of notes for summary 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-18 12:57:44 +00:00