CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,903 Commits 10 Branches 30 Tags 34 MiB
8b14b946e2
Commit Graph

288 Commits

Author SHA1 Message Date
Sefa Eyeoglu
fdbd8d9d2b
refactor: remove old updater 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-21 16:18:05 +01:00
flow
cedc7754d9
Merge pull request #428 from DioEgizio/fixes-to-CI 2022-11-14 14:16:01 -08:00
Sefa Eyeoglu
5be9472912
fix: fix potentially uninitialized variable 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-14 21:20:38 +01:00
TheLastRar
fce323b945 Check parent in rowCount/columnCount/canFetchMore 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:57 +00:00
TheLastRar
f8a137a26e Mark loadExtraPackInfo abstract 
All classes that inherit from ModModel override this method

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:56 +00:00
flow
46a8e18841
Merge pull request #367 from TheKodeToad/linkjumping 
fix https://github.com/PrismLauncher/PrismLauncher/issues/363
 2022-11-10 08:08:44 -08:00
Sefa Eyeoglu
392452d422
Merge pull request #397 from flowln/windows_mod_updater_fixes_maybe 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/226
 2022-11-10 14:34:15 +01:00
TheKodeToad
99ed0b6c2c Implement flowln's suggestions 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-10 11:14:58 +00:00
TheKodeToad
16e3b786fc Implement Scrumplex's suggestions 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-06 10:09:06 +00:00
flow
353b51f11e
refactor: move MMCStrings -> StringUtils 
General utilities can go in here >:)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-04 16:53:24 -03:00
TheKodeToad
cb796dbdfb
Remove unnecessary block 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 16:38:32 +00:00
TheKodeToad
a29d88c313 Even more fixes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 09:59:58 +00:00
TheKodeToad
a1ed8154f7 Another fix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 09:31:39 +00:00
TheKodeToad
6c45a990ef A good use of auto 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 09:13:44 +00:00
TheKodeToad
8dfa3393dc Formatting and forward-declaration 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 08:43:46 +00:00
flow
7956e6f04e
fix: don't use forward-declared Ptr types in meta/ 
This would cause ODR violations when those headers were included in
other places that also included stuff like "Version.h" (note the
"meta/Version.h"), which can cause problems, especially in LTO.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-01 19:48:26 -03:00
TheKodeToad
576867605d Add another fallback 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:40:12 +00:00
TheKodeToad
d1626d20bd Slight cleanup 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:30:11 +00:00
TheKodeToad
c890aa18f7 Only select correct mod 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:25:54 +00:00
TheKodeToad
6c7d040439 Hacky tweaks 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:12:27 +00:00
TheKodeToad
d03ae34b61 Auto-select first result 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 17:19:54 +00:00
TheKodeToad
b9547adce7 Add more license headers 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 17:02:24 +00:00
TheKodeToad
7f32c6464d Initial better mod browser link implementation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 16:58:22 +00:00
flow
b638a6ae95
fix: retry mod search job after aborting it 
This way, we don't get stuck with an aborted job in our way! :o

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-24 09:09:24 -03:00
Jamie Mansfield
0e17eee096
ATLauncher: Fix pack installation always aborting 
I made a mistake during when cherry picking a previous commit, this
applies the change - and fixes installing ATLauncher packs.
 2022-10-22 15:22:30 +01:00
flow
81f1305270
Merge pull request #215 from forkiesassds/develop 2022-10-22 10:48:00 -03:00
Jamie Mansfield
a6b13487f0
ATLauncher: Abort install if optional mods dialog is closed 
This matches the behaviour of ATLauncher.
 2022-10-22 12:35:34 +01:00
forkiesassds
9b17cde019 CurseForge modpack page improvements 
Signed-off-by: forkiesassds <icanttellyou@memeware.net>
 2022-10-22 01:20:08 +03:00
Sefa Eyeoglu
4e08f28246
Merge pull request #31 from flowln/who_needs_webview 2022-10-19 14:28:29 +02:00
Sefa Eyeoglu
46c57e120f
Merge pull request #27 from flowln/ftb_install_improve 2022-10-19 13:51:35 +02:00
Sefa Eyeoglu
3ac398ac49
fix: use display name in code 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-18 09:50:27 +02:00
Sefa Eyeoglu
722194405a
refactor: initial rebrand 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-18 09:37:59 +02:00
flow
dfa220ef02
fix: issues with aborts (again) 
i hate it

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-13 15:10:35 -03:00
flow
f26be00571
fix: abort search if we're already trying to download a pack 
Meaning we don't have to wait for the searches to finish in the
background to finally start the modpack download, when we have already
selected it -_-

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-13 13:49:06 -03:00
flow
b2a5d8daf4
fix: don't include opted out versions with the 'Any' filter on the MD 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-12 10:26:14 -03:00
flow
d194b02e28
fix: prevent images overriding content when changing pages 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-11 15:51:54 -03:00
flow
d7992ab29d
feat: add image support for FTB packs 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-08 14:12:05 -03:00
flow
60f19f305e
feat: add image support for modrinth modpack pages 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-08 14:12:03 -03:00
flow
d99976f5d7
fix: make mod and modpack caches separate for Modrinth 
This makes it similar to CF mods / modpacks. The mods cache is
maintained with the same name because it most likely has more data it
in, so this commit will affect existing caches as minimally as possible.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-08 14:11:20 -03:00
flow
db158a5735
feat: add image support for mod pages 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-08 14:11:20 -03:00
Sefa Eyeoglu
787234a53a
Merge pull request #1163 from flowln/fix_list_icons 2022-10-08 12:12:38 +02:00
flow
370c3aa598
Merge pull request #894 from flowln/update_from_external_source 
epic PR
 2022-09-26 08:25:12 -03:00
ErogigGit
8a4f1c66f8 Allow double clicking to mark for dowload 
Signed-off-by: Erogig <erogigabyte@gmail.com>
 2022-09-24 22:37:51 +02:00
flow
e7380e70a3
fix: use placeholder icon when the project has no icon in MR 
Projects with no icon return a null icon URL in Modrinth's API.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-23 18:05:58 -03:00
flow
3df8594f19
feat: change project item delegate for modrinth modpacks 
more info! \ ^-^/

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-23 16:59:40 -03:00
flow
ee4a829293
fix: remove manual icon resize in ModModel 
THis fixes a FIXME, now that we fixed the issue :o

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-23 16:59:40 -03:00
flow
6541570969
fix: simplify abort handling and add missing emits 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
6131346e2f
refactor: change the way instance names are handled 
While working on pack updating, instance naming always gets in the way,
since we need both way of respecting the user's name choice, and a
standarized way of getting the original pack name / version.

This tries to circunvent such problems by abstracting away the naming
schema into it's own struct, holding both the original name / version,
and the user-defined name, so that everyone can be happy and world peace
can be achieved! (at least that's what i'd hope :c).

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
941d75824a
refactor: add instance creation abstraction and move vanilla 
This is so that 1. Code is more cleanly separated, and 2. Allows to more
easily add instance updating :)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:32:36 -03:00
flow
42eb265624
refactor: create mod pages and filter widget by factory methods 
This takes most expensive operations out of the constructors.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-07 08:29:58 -03:00
flow
1b0ca47682
Merge pull request #939 from flowln/mod_downloader_improve 
Some more UI / UX improvements to the mod downloader!
 2022-09-07 08:27:11 -03:00
flow
7b6d269904
refactor: make NetJob inherit from ConcurrentTask as well! 
Avoids lots of code duplication

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:01 -03:00
DioEgizio
13184eb8e9 fix: fix urls on ftb legacy 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-08-24 12:31:38 +02:00
timoreo
c375e7b4df
Merge pull request #897 from jamierocks/atl-updating-initial 2022-08-11 08:50:05 +02:00
flow
4a8abc948e
fix: prevent segfault due to callbacks into deleted objects 
Since network requests are, for the most part, asynchronous, there's a
chance a request only comes through after the request sender has already
been deleted.

This adds a global (read static) hash table relating models for the mod
downloader to their status (true = alive, false = destroyed). It is a
bit of a hack, but I couldn't come up with a better way of doing this.

To reproduce the issue before this commit: scroll really quickly through
CF mods, to trigger network requests for their versions and description.
Then, in the middle of it close the mod downloader. Sometimes this will
create a crash.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 18:34:15 -03:00
flow
cee41b87f7
fix(ui): force redraw of mod list when (de)selecting a mod 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:31 -03:00
flow
6aaf1f4f21
feat: lazy-load CF mod descriptions 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:30 -03:00
flow
0808a10b7b
feat: cache mod versions 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:30 -03:00
flow
6f052baa94
refactor: use function cb instead of class cb in getVersions 
I've discovered even more functional programming! :^)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:30 -03:00
flow
5bc67d3f6b
feat: cache extra mod info (like links and body) 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:30 -03:00
flow
74c6c5cfbc
refactor: use function cb instead of class cb in getModInfo 
I've discovered functional programming :^)
This makes this route more fit for general use.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:30 -03:00
flow
158b7fd166
feat+refactor: clean up ProgressWidget and add progress indicatior to 
mod downloader

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:30 -03:00
flow
c3f647dc96
feat: add (semi) instant searching in mod downloader 
It has a delay of 350ms from the last typed character to search, in
order to cache small changes while typing.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:30 -03:00
flow
5936c7b65c
change: preserve search term across different mod providers 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:29 -03:00
flow
a8bcd85c93
feat+refactor: add shortcuts to mod downloader and clean up 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:29 -03:00
flow
6e9a27f40f
feat: display the 'body' of a MR mod on the mod downloader 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:29 -03:00
flow
4a13dbe3bb
feat: create delegate for project item views 
This allows us to define custom painting for list view items. In
particular, this is applied to the mod downloader, in order to allow
displaying both the mod name and mod description, and settings their
effects (like bold or underline) independent of each other.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:29 -03:00
Sefa Eyeoglu
fb289c6b17
chore: add license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-26 20:33:29 +02:00
Sefa Eyeoglu
75a7ea55d4
feat: implement mod resolving for FTB 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-26 20:33:10 +02:00
flow
9a07ede615
fix: filter out opted-out mods in mod downloader 
Maintains Pre-Updater behaviour

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:43 -03:00
Sefa Eyeoglu
8f4d7ac655
Merge pull request #678 from Scrumplex/improvements-around-proprietary-services 2022-07-11 14:56:09 +02:00
Jamie Mansfield
bf560f4594
ATLauncher: Move the UI support implementation into it's own class 
This will allow it to be used in multiple locations.
 2022-07-10 11:27:42 +01:00
Sefa Eyeoglu
3b4539de79
chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
984692dc62
refactor: fix deprecation up to Qt 5.15 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:17:52 +02:00
dada513
3b187b5246
Merge pull request #876 from Scrumplex/revert-updater-stuff 
Revert "fix: remove updater if it is not used"
 2022-07-10 10:50:03 +02:00
flow
35a698ef72
Merge pull request #884 from jopejoe1/ftbuifixed 
Updated FTB Classic layout
 2022-07-08 16:19:14 -03:00
Sefa Eyeoglu
906f26698b
fix: spelling of CF 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
jopejoe1
9e19b73ce6 Updated FTB Classic layout 
Signed-off-by: jopejoe1 <johannes@joens.email>
 2022-07-07 23:18:13 +02:00
Sefa Eyeoglu
e210a4b244
Revert "fix: remove updater if it is not used" 
This reverts commit 2ff0aa09e3.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-06 18:13:51 +02:00
flow
e5f6dc1b14
fix: aborts when using a Qt build with assertions enabled 
Preventing undefined behaviour hooray! :D

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-03 12:44:19 -03:00
flow
145da82cd8
fix: show invalid version even when there's none 
Having a blank instead of _anything_ is bad UX. Instead, even when
there's not a valid version (most likely disabled redistribution), we
show a message in the UI, to differentiate from the loading state.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-03 12:43:05 -03:00
flow
64776d6bac
feat+fix: cache Flame modpack versions 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-03 12:43:05 -03:00
flow
64d123f524
fix: use better naming for Modrinth pack versions 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-03 12:43:04 -03:00
flow
0ec4ade683
feat+fix: cache versions and extra info in Modrinth packs 
When you change a copy thinking you're changing the original data smh

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-03 12:43:04 -03:00
flow
4232b1cedb
fix: don't use uniform sizes in Modrinth modpack viewer 
Apparently, when Qt sees an icon with the height smaller than the rest,
with this option set, it will change the height of all other items to be
that one, causing #828.

While we do lose some performance changing this option, the issue is
gone, so :|

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-03 12:43:00 -03:00
Ezekiel Smith
7aba7b6064
Merge pull request #818 from flowln/tiny_mod_icons 
Always scale mod icons to the right size
 2022-07-03 01:49:09 +10:00
timoreo22
ed5415aeb8
Merge pull request #837 from DioEgizio/fix-sort-mr 2022-06-30 08:24:51 +02:00
DioEgizio
04e8780dd0
fix(modrinth): fix sorting 2022-06-24 10:47:02 +02:00
DioEgizio
0fe4384067
Update launcher/ui/pages/modplatform/flame/FlamePage.ui 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-06-23 17:58:54 +02:00
DioEgizio
bdfcd0b99e chore(flame): reword warning 2022-06-23 17:06:49 +02:00
flow
a135c06bcf
fix: scale mod icons to the right size 2022-06-21 06:41:56 -03:00
Ezekiel Smith
3e8d450741
Merge pull request #665 from jamierocks/h-managed-packs 
PackPlatforms: Record where packs come from
 2022-06-14 23:54:44 +10:00
Ezekiel Smith
27239b2dde
Merge pull request #634 from flowln/donate_links 
More links for CF / Modrinth mods / modpacks
 2022-06-14 23:52:00 +10:00
Sefa Eyeoglu
a4ef0940ed
chore: add license headers 2022-06-12 13:50:58 +02:00
Sefa Eyeoglu
2ff0aa09e3
fix: remove updater if it is not used 2022-06-12 13:39:47 +02:00
Sefa Eyeoglu
8856c8cd62
refactor(test): fix loading mod metadata setting 2022-06-12 13:33:17 +02:00
dada513
2bd8e7dca4
Merge pull request #780 from flowln/guo_ext_2 2022-06-11 19:45:51 +02:00
Sefa Eyeoglu
81daffe68e
fix: remove file filter from translation 2022-06-11 14:10:42 +02:00
flow
2ea20a8b29
fix: allow discovering mrpacks in languages without dot 2022-06-11 07:12:59 -03:00
flow
1b1f728c58
fix: allow opening external links in technic modpack page 2022-06-09 18:46:19 -03:00