CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,287 Commits 10 Branches 30 Tags 34 MiB
develop
Commit Graph

336 Commits

Author SHA1 Message Date
Rachel Powers
520594e529
Merge branch 'develop' into chore/add-compiler-warnings 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-13 20:05:16 -07:00
Trial97
843c2d67eb
Added FTBAPP Import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-13 18:41:29 +03:00
TheKodeToad
997a3709d4 Custom environment variables UI and implementation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-12 19:21:38 +01:00
TheKodeToad
4c69290381
Merge branch 'develop' into better-component-installation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-11 11:14:06 +01:00
TheKodeToad
e21756ea8c Remove direct launch 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-10 16:22:37 +01:00
Trial97
35ccfdb799
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-10 16:25:15 +03:00
Trial97
7ac2a23bc8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks 2023-07-02 13:14:19 +03:00
Trial97
6c4cf085e0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-02 12:50:45 +03:00
Rachel Powers
d7d2d9f612
chore: remove WARNINGS_AS_ERRORS 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-01 17:03:11 -07:00
Rachel Powers
671d3c1c80
Merge branch 'develop' into chore/add-compiler-warnings 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-01 17:03:11 -07:00
TheKodeToad
7138425c85
Merge branch 'develop' into better-component-installation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-01 13:05:55 +01:00
Rachel Powers
00f75e2d54
fix(updater): avoid windows installer detection with "asInvoker" in xml exe.manifest 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-30 00:54:29 -07:00
Trial97
25ffc4c4b0
Refactor ImgurUpload 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-29 17:58:09 +03:00
Rachel Powers
f287d9deac
fix add NetRequest source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-28 11:09:59 -07:00
Rachel Powers
95969e87a1
Merge branch 'refactor/net-split-headers-to-proxy-class' into feat/launcher-updater 2023-06-28 11:05:11 -07:00
Rachel Powers
e29126ca26
fix: add split markdown source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-28 10:56:16 -07:00
Rachel Powers
1b5c78b066
Merge branch 'develop' into feat/launcher-updater 2023-06-28 10:54:39 -07:00
Trial97
1c3402d081
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions 2023-06-28 20:23:35 +03:00
Sefa Eyeoglu
faec21d572
Merge pull request #1266 from TheKodeToad/smol-tweaks 2023-06-28 08:47:53 +02:00
Trial97
385babb458
Simplify Upload and Download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-27 08:51:17 +03:00
Trial97
dffffc784e
Removed unused files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-26 22:33:10 +03:00
Rachel Powers
1f70589deb
feat(updater): tie in part 2, let there be UI! 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-26 01:22:33 -07:00
Rachel Powers
d8e0b14dc4
feat(updater): tie in updater part 1 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 21:37:47 -07:00
Rachel Powers
516dd6bd1a
support windows console 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:47:31 -07:00
Rachel Powers
44bc60021d
feat(updater): unpack portable archive 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:47:31 -07:00
Rachel Powers
50d5eb0621
feat(updater): download new & back up old 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:47:31 -07:00
Rachel Powers
bee88b1c7f
feat(updater) select valid asset 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:47:30 -07:00
Rachel Powers
98174b7a37
refactor: use Net tasks for github api download 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:47:30 -07:00
Rachel Powers
2357d167b8
Merge branch 'packaging/windows-installer-uninstall-previous' into feat/windows-updater 2023-06-25 13:46:28 -07:00
Rachel Powers
013a26aafe
fix: add ApiUpload to CMakeLists.txt 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:23:43 -07:00
Rachel Powers
fe9927d10d
Merge branch 'refactor/net-split-headers-to-proxy-class' into feat/windows-updater 2023-06-25 12:44:25 -07:00
Rachel Powers
df4fd7df7f
Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class 2023-06-25 12:43:48 -07:00
Rachel Powers
418677ef31
refactor: override / mask static make functions for ApiDownload 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 11:09:25 -07:00
Rachel Powers
9c10965997
refactor: split out setting api headers for downloads 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 11:09:25 -07:00
TheKodeToad
02b628653b Fix markdown header 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 13:43:03 +01:00
Trial97
84c63f4f01
Added plantxt export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 14:11:41 +03:00
Trial97
ef0752972a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export 2023-06-25 12:26:54 +03:00
TheKodeToad
529e2054ea A few tweaks, with inspiration from Zeke :3 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-24 23:26:27 +01:00
Trial97
81c1a95166
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 2023-06-24 20:04:56 +03:00
Trial97
25579fbedc
Renamed ExportMrPackDialog to ExportPackDialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 14:54:39 +03:00
Trial97
59e1e51903
Removed unused files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 14:51:12 +03:00
Trial97
bf95cfb30e
Added CatPacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 01:37:28 +03:00
Trial97
58321f3491
Added curseforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 20:03:44 +03:00
Trial97
9ad356d66f
Added ExportModsToStringTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 17:44:12 +03:00
Trial97
f7d502c68c
Added ExportModsToStringDialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 16:08:04 +03:00
Trial97
9d2516a199
Added ExportModsToStringTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 16:07:55 +03:00
TheKodeToad
6ccc7e77f9 Basic, unfinished & broken impl 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-19 22:42:30 +01:00
Trial97
182e19eae3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-15 10:35:26 +03:00
Rachel Powers
7e0e1ec51d chore: add better default compiler warnings 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-04 14:10:17 -07:00
TheKodeToad
e26827b849 Optimised icons 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-03 13:39:42 +01:00
Rachel Powers
74d4a98864 refactor: split out setting api headers for downloads 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-01 16:39:04 -07:00
Rachel Powers
f619a04fe7 refactor: rename app class 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-01 14:55:20 -07:00
Rachel Powers
1c91d2f242 feat: paliminary updater 
- can check for need to update
- can select a version to update to
- perform update: TODO

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-30 23:03:44 -07:00
Trial97
ffcc58cb3e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-14 14:20:24 +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
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
9fbec3793f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-04 20:29:33 +03:00
Sefa Eyeoglu
64ba5e4ed1
Merge pull request #833 from Ryex/advanced_copy_instance 2023-05-02 12:11:41 +02: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
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
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
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
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
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
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
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
Rachel Powers
5b50b806ec refactor: remove data duplication in statis FS Names 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-03 17:14:06 -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
6d160a7b7e feat: successful process elevation and comunication! 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
32409a361b fix CMakeLits.txt for non MSVC windows builds 
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
1893871a99
Merge branch 'PrismLauncher:develop' into mrpack-export 2023-03-18 14:02:05 +00:00
TheKodeToad
970ec8187c More refactoring 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-05 18:25:57 +00:00
Sefa Eyeoglu
f3f0652d2b
Merge pull request #853 from kumquat-ir/nil 
NilLoader mod metadata support
 2023-03-05 13:39:00 +01:00
TheKodeToad
f28a7b9d08 Add PackIgnoreProxy.h to cmake 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 19:50:42 +00:00
TheKodeToad
6505b0c065 Move logic to task 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 19:48:41 +00:00
TheKodeToad
46cc325f7c Add file tree 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 11:25:36 +00:00
TheKodeToad
a80b820e94 UI for mrpack export (broken) 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 10:31:53 +00:00
kumquat-ir
c07fff7503 switch to qdcss for parsing 
make it not horrible to look at

Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-12 17:23:15 -05:00
flow
ada5e88eb9
feat(RD): add texture pack downloader 
This extends the resource pack downloader, with the custom behavior of
filtering the versions that shows up, to those <= 1.6. As always, Flame
is funky and requires a bit more workarounds than average.

This will also get a nice improvement when the Version parsing and
comparison PR gets merged! :D

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-05 17:02:56 -03:00
flow
b724607e31
feat(RD): add shader pack downloader 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-05 17:02:56 -03:00
flow
c3ea303a37
feat(RD): add resource pack downloader 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-05 17:02:52 -03:00
flow
c78db5459e
Merge pull request #724 from leo78913/dot-ui-mainwindow 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/594
Closes https://github.com/PrismLauncher/PrismLauncher/issues/69
Closes https://github.com/PrismLauncher/PrismLauncher/issues/473
 2023-01-27 10:55:49 -08:00
Sefa Eyeoglu
6e841a3b7e
Merge branch 'develop' into remove-updater 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-24 14:40:17 +01:00
Sefa Eyeoglu
16477a8f6c
Merge pull request #675 from flowln/generalize_mod_model 2023-01-23 23:58:52 +01:00
leo78913
f3acf35aea refactor: Port the main window to a .ui file 
some stuff still needs to be done in the c++ side because qt designer is dumb >:(

the instance toolbar icon and instance name buttons are still added manually inside MainWindow.cpp

looks almost identical, with some minor tweaks:
- the instance toolbar is now a WideBar, so you can customize what actions you want :D
- the instance toolbar buttons are now fullwidth
- the close window button is now at the end of the file menu
- the help menu has some layout changes

this also fixes some stuff:
- menus not having tooltips
- the top toolbar not connecting to the title bar in kde
- the instance toolbar separators looking weird after you move the toolbar

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
Sefa Eyeoglu
1a35fec134
Merge pull request #696 from Ryex/import-all-the-things 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/581
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/700
 2023-01-16 10:04:09 +01:00
flow
39b7ac90d4
refactor(RD): unify download dialogs into a single file 
No need for multiple files since the subclasses are so small now

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:06 -03:00
flow
6a18079953
refactor: generalize mod models and APIs to resources 
Firstly, this abstract away behavior in the mod download models that can
also be applied to other types of resources into a superclass, allowing
other resource types to be implemented without so much code duplication.

For that, this also generalizes the APIs used (currently, ModrinthAPI
and FlameAPI) to be able to make requests to other types of resources.

It also does a general cleanup of both of those. In particular, this
makes use of std::optional instead of invalid values for errors and,
well, optional values :p

This is a squash of some commits that were becoming too interlaced
together to be cleanly separated.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:00 -03:00
flow
b937d33436
Merge pull request #714 from redstrate/cmark 2023-01-13 16:16:00 -03:00
Sefa Eyeoglu
22a2b7ac46 refactor: support system and bundled cmark 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-12 10:08:52 -05:00
Joshua Goins
24a4bd3a1c refactor: replace hoedown markdown parser with cmark 
Signed-off-by: Joshua Goins <josh@redstrate.com>
 2023-01-12 10:08:52 -05:00
Tayou
1b80ae0fca
add theme setup wizard 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-10 16:06:01 +01:00
TheLastRar
78bbcac0ea ui: Let Qt 6.4.2 handle dark mode titlebar 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2023-01-09 19:44:11 +00:00
Rachel Powers
03b75bf2a9 feat: Import all the things! 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-07 15:04:22 -07:00
Sefa Eyeoglu
f3f628410d
Merge pull request #576 from Ryex/identify-zip-packs 
fix https://github.com/PrismLauncher/PrismLauncher/issues/349
 2023-01-07 17:33:34 +01:00
Rachel Powers
7f438425aa refactor: add an identify function to make easy to reuse 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-29 19:47:19 -07:00