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

193 Commits

Author SHA1 Message Date
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
Tayou
3b9d822d72
Merge pull request #1073 from leo78913/accounts-menus-fixes 2023-06-06 20:34:41 +02: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
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
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
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
7537ea1ef5 make instance settings account selector a comboBox 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-05-14 16:33:41 -03: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
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
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
Sefa Eyeoglu
f3f0652d2b
Merge pull request #853 from kumquat-ir/nil 
NilLoader mod metadata support
 2023-03-05 13:39:00 +01:00
Sefa Eyeoglu
9265c319a9
Merge pull request #788 from flowln/other_resource_downloaders_two 
Add resource pack, texture pack and shader pack downloaders
 2023-03-02 10:08:45 +00:00
Sefa Eyeoglu
89255e34bd
fix: change wording of TP/RP download buttons 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-02 09:42:28 +01:00
Sefa Eyeoglu
4878f1a438
Merge pull request #735 from Scrumplex/import-component 2023-03-01 09:49:47 +01:00
kumquat-ir
9c2a3231c5 do not create nilmods folder 
"it cant be that easy" - me, clueless

Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-13 01:45:23 -05:00
kumquat-ir
7896dd19c1 nilmods instance page 
mostly copied from the coremod page impl

Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-11 17:46:17 -05:00
flow
46c6cc2d2b
chore: add my copyright headers 
.-.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-05 17:02:56 -03: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
29f7ea752f
refactor: make shared_qobject_ptr ctor explicit 
This turns issues like creating two shared ptrs from a single raw ptr
from popping up at runtime, instead making them a compile error.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-25 16:57:51 -03:00
Sefa Eyeoglu
199a7df807
refactor: add error handling to component import 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-25 10:43:23 +01: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
flow
ea5020e188
fix(license): add/fix my copyright/license headers 
*sobbing in messy legal stuff i know nothing about*

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-23 11:12:43 -03:00
Sefa Eyeoglu
cd893e18d2
chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-14 17:21:52 +01:00
flow
3de681d2d6
Merge pull request #685 from byteduck/instance-accounts 2023-01-13 17:21:12 -03:00
flow
ba677a8cb7
refactor: change some ResourceAPI from NetJob to Task 
This makes it easier to create resource apis that aren't network-based.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 16:23:09 -03: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
433a802c6e
refactor: put resource downloading classes in common namespace 
Puts them all inside the 'ResourceDownload' namespace, so that it's a
bit clearer from the outside that those belong to the same 'module'.

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
Aaron
160dd09fc2
Fix instance account selector face for offline accounts 2023-01-12 20:03:31 -08: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
Sefa Eyeoglu
fff52cb247
feat: add button to import component JSONs 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-11 13:50:57 +01:00
Aaron
ba81ad1ac3 Reword instance-specific account settings, apply clang-format 
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>
 2023-01-02 11:17:19 -07:00
Aaron Sonin
eefb259ddf Remove unecessary delete in InstanceSettingsPage destructor 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Aaron Sonin <10217842+byteduck@users.noreply.github.com>
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>
 2023-01-02 11:17:19 -07:00
Aaron Sonin
9b8add1961 Properly connect signal in instance settings for account selector 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Aaron Sonin <10217842+byteduck@users.noreply.github.com>
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>
 2023-01-02 11:17:19 -07:00
Aaron Sonin
e186523878 Add null check for face in instance account settings selector 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Aaron Sonin <10217842+byteduck@users.noreply.github.com>
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>
 2023-01-02 11:17:19 -07:00
Aaron Sonin
021e6c02d7 Replace unecessary type check with assertion in InstanceSettingsPage 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Aaron Sonin <10217842+byteduck@users.noreply.github.com>
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>
 2023-01-02 11:17:19 -07:00
Aaron
cba3d68063 Fix conflicting layout name in InstanceSettingsPage 
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>
 2023-01-02 11:17:19 -07:00
Aaron
7e2d78bab5 Allow selecting a default account to use with an instance 
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>
 2023-01-02 11:17:19 -07:00
Sefa Eyeoglu
6ea1234a3b
Merge pull request #618 from TheKodeToad/safer-destructive-actions 
Fixes https://github.com/PolyMC/PolyMC/issues/948
 2022-12-26 17:48:43 +01:00
TheKodeToad
434f639b0c Use optional instead of hardcoded cancelled string 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-26 14:58:37 +00:00
TheKodeToad
bf04becc9e About to -> you are about to 
You're is used in some other places but im lazy

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-26 14:45:04 +00:00
TheKodeToad
cbe5af235c Make requested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-24 08:59:55 +00:00
flow
0516055b31
Merge pull request #630 from leo78913/yeet-scrollbars 2022-12-17 08:02:41 -08:00
leo78913
3653e9d5e3 let the theme decide the notes page right margin 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-17 12:05:20 -03:00