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

2314 Commits

Author SHA1 Message Date
PandaNinjas
95f6860005
Apply suggestions from code review 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-06-08 10:12:27 -04:00
PandaNinjas
e6872aba75
Readd deleted line 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-06-07 22:15:44 -04:00
PandaNinjas
11cbeb8f96
Fix shadowing and add copyright header 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-06-07 22:13:57 -04:00
PandaNinjas
886b372ade
Fix accidentally renamed variable 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-06-07 20:03:58 -04:00
PandaNinjas
534328f16d
Remove unnecessary switch statement 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>

DCO Remediation Commit for PandaNinjas <admin@malwarefight.wip.la>

I, PandaNinjas <admin@malwarefight.wip.la>, hereby add my Signed-off-by to this commit: 318d11481d

Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-06-07 19:46:36 -04:00
PandaNinjas
318d11481d
Resolve other switch fallthrough issues 2023-06-07 19:37:54 -04:00
PandaNinjas
5d425ecc02
Fix the AccountList code 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-06-07 18:14:05 -04:00
PandaNinjas
c225ecbb55
Add sensible defaults in AccountList.cpp 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-06-07 18:01:39 -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
TheKodeToad
1191c33c2b Remove flawed implementation 
This seems to add the latest icon (bug) as a fallback if not provided...
but it mainly seems to cause problems... 🤷

I swear I did `git add .`.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-07 22:45:21 +01:00
TheKodeToad
52054469cd Fix *bug* lol 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-07 22:39:23 +01: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
62d1bc87ae
Merge pull request #1117 from leo78913/update-pack-formats 2023-06-07 17:49:52 +02:00
Tayou
51ed39804f
Merge pull request #1125 from Ryex/fix/link-crash-1118 2023-06-07 16:14:53 +02:00
Rachel Powers
d12110b47b
fix #1118 : use filePath not path on QFileInfo 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-07 06:26:58 -07: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
leo78913
a9302468e7 update resource and data pack pack_format_versions 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-06-06 16:10:15 -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
7c5047b2ac cAsE iNsEnSiTiVe 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-05 23:12:47 +01: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
DioEgizio
e1b37f3cd3
Merge pull request #1108 from Ryex/fix/memory-leak-translation 2023-06-05 20:34:56 +02:00
DioEgizio
0c24827a52
Merge pull request #1103 from Ryex/fix/1.120-allowed_symlinks.txt 2023-06-05 20:32:30 +02: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
5824047ffa fix(memory leak): cyclic refrence in translations model dl task 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-05 01:12:16 -07:00
Rachel Powers
3dccc38f42
Merge pull request #904 from TheKodeToad/mrpack-export 
mrpack export
 2023-06-04 19:01:50 -07:00
Rachel Powers
f613b03efd
Typo fix 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-03 08:28:49 -07:00
TheKodeToad
3c87e5d31e Make mcInstance mutable 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-03 13:48:15 +01:00
TheKodeToad
e26827b849 Optimised icons 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-03 13:39:42 +01:00
Rachel Powers
8eb10e991f fix: use isSymLink (i've made this mistake before but I've made it again) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-02 16:14:38 -07:00
Rachel Powers
f6f32914de fix: add origonal instance path to allowed_symlinks.txt when copying via symlinks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-02 16:04:27 -07: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
Trial97
d50bd096a4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into logdir 2023-06-03 00:44:53 +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
Trial97
17691ab515
Made use of moveFile function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-02 01:22:25 +03:00
Trial97
3a6657596b
Added migration for old logs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-01 23:48:48 +03:00
Trial97
6c082403c4
Fixed comments 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-31 20:23:23 +03:00
Trial97
29c3dc40ef
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into logdir 2023-05-31 20:12:12 +03: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
4eb9083ddc refactor: column names as class property, use string names in setting 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 13:00:08 -07:00
Rachel Powers
b28f682ad9 Merge branch 'develop' into feature/images-for-resource-page 2023-05-28 12:01:49 -07:00
Trial97
51c39ec681
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop 2023-05-28 19:16:14 +03:00
Trial97
10436ed70c
Fixed code quality 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 19:15:41 +03:00
Trial97
775236a1b3
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 18:27:54 +03:00
Trial97
b9503ff15f
Added Q_DECLARE_METATYPE(ModPlatform::IndexedPack::Ptr) 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 18:27:02 +03: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
TheKodeToad
86974b046e
Clarify comment 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-28 11:48:09 +01: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
c81cb59b4b fix(memory leak): don't capture job and create cyclic refrence 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-26 21:21:10 -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
Rachel Powers
7983977156 feat: Qt 5.15 adds transfer timeouts. at least use it for downloads 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-21 01:48:34 -07:00
Rachel Powers
21cb459899 fix: memory leak NetJob wans't getting cleaned up. ensure lambda capture of job doens;t increase refcount or it will be cyclic 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-21 01:47:54 -07:00
Rachel Powers
1b3ff96ffd fix: memory leak with NetJob and responce not getting cleaned up 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-21 01:46:28 -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
94cd831e8d
Made sure the metadata is valid when checking mod deps 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-14 22:13:53 +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
18cfe219fe Hopefully This Works™ 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-13 18:58:05 +01:00
TheKodeToad
129e959a3b Move setAbortable(true) 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-13 18:28:51 +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
Kode
5b8d025440
ty! 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-05-12 14:43:55 +01: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
Rachel Powers
b16829b0f9
Gib -> GiB 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-12 00:21:37 -07:00
Rachel Powers
f27716656c fix: remove qt < 5.6 support process error signal 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-11 16:32:00 -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
30cf73a22f typo fix 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-07 13:23:59 -07: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
Rachel Powers
718abaae0e doc fixes 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-06 19:18:39 -07:00
Rachel Powers
62a402d05a refactor: move functions to utils + code-review fixes 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-06 19:10:58 -07: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
d0b6f0124b change: don't search appdata locaiton for logging rules if using custom data dir 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-05 14:13:34 -07: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
ee94be624e use 32x32 images for image column 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-05 11:28:19 -07:00
Rachel Powers
2fe3dc5960 fix: fix qchar conversion and codeql 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-05 11:13:36 -07:00
Rachel Powers
fd7338d3f3 fix: grow pixmapcache if it is evicting too fast 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-04 23:47:27 -07:00
Rachel Powers
ed185f047f feat(resourcePackPage): icon column 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-04 23:46:00 -07:00
Rachel Powers
d384d991fa feat(texturepackPage): icon column 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-04 23:45:24 -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
Rachel Powers
ec157b766e feat(mod parsing): load extra mod details 
- (image, license, issuetracker)

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-04 23:42:42 -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
f6ed2036b3
Removed comment 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-03 00:55:18 +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
TheKodeToad
e0380960fd Change to use future 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-02 14:23:31 +01:00
Sefa Eyeoglu
64ba5e4ed1
Merge pull request #833 from Ryex/advanced_copy_instance 2023-05-02 12:11:41 +02:00
Rachel Powers
733619ca74 feat: estimate remining time on downloads 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
9f9c829bc5 fix: prevent logspam, fix MacOS theme artifacts 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07: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
a80b425551 fix: no need for const bool 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
d7032d975c fix: no need to loop all sub tasks 
pathc by flowin

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
96decbac27 feat: default qtlogging.ini file 
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
fe36471b8d refactor: logging.h -> Logging.h 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
6b28af6cc5 fix: clean up license headers for Tasks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
6306fb564b feat: add UID to debug lines of upload tasks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
cdccb25fe3 feat: add download size to download details alongside speed 
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
495103f72e fix: set x-xbl-contract-version header during xbox auth step 
Refrencing GDlauncher and ATLauncher code for auth as well as https://learn.microsoft.com/en-us/gaming/gdk/_content/gc/reference/live/rest/additional/httpstandardheaders
it is possible some of microsoft's server's are rejecting our request because of this missing header?

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:43:31 -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
Rachel Powers
788fa40c2a refactor: Move ini to use QSettings && drop get/setList functions 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-29 19:55:24 -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
Japa
7298f9c273
Fixed typo 
Signed-off-by: Japa <japa4551@protonmail.com>
 2023-04-26 16:06:17 -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
Japa
672f5cf160
Update launcher/minecraft/MinecraftInstance.cpp 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Japa <japa4551@protonmail.com>
 2023-04-21 19:46: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
b4fa6e120a
Fixed tipo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:06 +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
Trial97
5655a33515
Added Dependency API 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:05 +03:00
Japa
92cda68480
Update launcher/minecraft/MinecraftInstance.cpp 
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Signed-off-by: Japa <japa4551@protonmail.com>
 2023-04-21 11:18:17 -03:00
Japa
f41426f394
Instance Description displays the last launch date 
Initial Draft using the Standard C++ Library, still requires testing.

Signed-off-by: Japa <japa4551@protonmail.com>
 2023-04-21 00:30:38 -03:00
TheKodeToad
709736d3f9 Make response const 
I don't think the segfault fix was ideal :P
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-18 09:28:10 +01: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
2e9403a324 This was moved 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-17 13:19:59 +01:00
TheKodeToad
ba17efa381 Smol fixes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-17 13:18:25 +01: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
Trial97
11f8d25d94
Added missing character 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-12 00:49:50 +03:00
Trial97
4fbd5abe41
Added task to load dependencies 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-12 00:45:44 +03:00
Trial97
d524935b67
Added task to load local mod information 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-11 20:55:10 +03:00
Trial97
6d5c629b43
Added dependencies to the APIs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-10 00:04:35 +03:00
Kode
3a7961834a
Remove seek 
Don't need it if the data is already in a byte array.

Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-04-09 21:28:40 +01: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
TheKodeToad
813ccc1381 How did i- 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-07 11:03:11 +01:00
TheKodeToad
b65f4c9536 Better collectFileListRecursively error 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-06 19:59:24 +01:00
TheKodeToad
012d8bb468 Revert concurrent syntax 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-06 19:58:09 +01:00
TheKodeToad
d7a137ad13 Remove more prototype not good code 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-06 19:24:19 +01:00
TheKodeToad
073aaf9b3b Remove "prototype" field 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-06 19:19:41 +01:00
TheKodeToad
871d647c93 Use local metadata 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-06 19:18:36 +01:00
Rachel Powers
0ce3049579 fix: sysinfo libs needed too 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-03 18:48:28 -07:00
Rachel Powers
de20258aa7 fix: filelink needs network for local socket 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-03 18:30:28 -07:00
Rachel Powers
41c5e523b2 fix: add back QT::Widgets link 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-03 18:09:01 -07:00