0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,544 Commits 1 Branch 0 Tags 29 MiB
199a7df807
Commit Graph

832 Commits

Author SHA1 Message Date
flow
1630a23fb0
refactor(InstanceImport): require rvalue from 'extra_info' mappings 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:34 -03:00
flow
4e75419e08
fix(ManagedPagePage): don't reload pack info when not needed 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:34 -03:00
flow
089018015a
refactor(ManagedPackPage): use smart pointers instead of raw ones 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:34 -03:00
flow
feb6f285ce
feat(ManagedPackPage): add reload button when in a fail state 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:34 -03:00
flow
cb12c51afc
fix(ManagedPackPage): check app capabilities for creating the CF page 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:34 -03:00
flow
c5c426ecbc
chore(ManagedPackPage): format and add headers 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:33 -03:00
flow
74f7039abf
fix(ManagedPackPage): clear combo boxes when adding new versions 
Prevents versions to undergo mitosis.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:33 -03:00
flow
57b905be24
feat(ManagedPackPage): implement Flame modpack updating button 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:33 -03:00
flow
34794cc4af
fix(ManagedPackPage): give extra_info to InstanceImportTask in MR packs 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:33 -03:00
flow
38f59fdf39
fix(ManagedPackPage): add warning about old bug with pack IDs 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:33 -03:00
flow
527c1113f1
feat(ManagedPackPage): add Flame UI 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:33 -03:00
flow
04dbe28793
fix(ManagedPackPage): better changelog text when fetching / no changelog 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:33 -03:00
flow
968366c2ae
feat+fix: allow forwarding extra info to InstanceImportTask 
This allows us to pass to the creation instances their actual pack ID
and version ID, that in Flame's case, are only available before starting
to create an instance.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
7f5dea28bb
feat(ManagedPackPage): add link to the Modrinth's pack page 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
d4979974b4
fix(ManagedPackPage): better UX for when network requests fail / are pending 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
9539230915
fix: do not display managed pack page for providers without an impl. yet 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
25cfa26e7b
fix: use rich text in changelog for modrinth modpacks 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
58d2c15ffa
feat: add functionality to MR modpack update in the page :D 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
9e17ff884f
feat: add PageContainer::getPage 
This allows us to directly access a page from outside. This will be
useful for telling the ManagedPackPage who is the window it's on, so
that we can close it when updating :^)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 16:54:54 -03:00
flow
1c567232e3
feat: add (current) indicator to the currently installed version in MR 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 16:54:54 -03:00
flow
cba2608c1c
feat: add logic for the modrinth instance modpack page 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 16:54:54 -03:00
flow
e5c42f68c2
feat: add basic ManagedPackPage classes 
The idea is to have a base class that defines common behavior, and
subclasses for each modpack provider, adding specific behavior.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 16:54:54 -03:00
flow
02b4468bcd
feat(ui): add ManagedPackPage ui 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 16:54:50 -03:00
Sefa Eyeoglu
746f6945da
fix: remove rogue notr 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 20:52:32 +01:00
Sefa Eyeoglu
5cab4d8864
chore: reformat code 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 20:52:31 +01:00
Sefa Eyeoglu
5cedfcbfaf
chore: add license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 20:52:14 +01:00
Sefa Eyeoglu
c06abd9b6b
refactor: replace Open All with Open Missing 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 20:52:13 +01:00
Sefa Eyeoglu
e08d97825d
feat: implement lax filename match in BlockedModsDialog 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 20:51:18 +01:00
Sefa Eyeoglu
d61323aa6d
fix: improve resize behavior of BlockedModsDialog 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 20:51:18 +01:00
Sefa Eyeoglu
85bddbed86
chore: reformat code 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 13:16:27 +01:00
Sefa Eyeoglu
2fd7338cd3
dix: disable FS watcher after closing BlockedModsDialog 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-05 21:39:24 +01:00
DioEgizio
70620d5137 feat: add a proper server icon 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-04 12:45:39 +01:00
Ryan Cao
fa3caf091a
fix: warn before trashing instances 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-12-03 21:54:41 +08:00
flow
ab23f542c6
Merge pull request #423 from TheKodeToad/addagent 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/414
 2022-12-02 06:40:18 -08:00
flow
fa98bf1ee7
Merge pull request #481 from ryanccn/import-resource-pack-dialog-uwu 2022-12-02 06:39:54 -08:00
flow
3cc987a5b4
fix: explicitly set scheme for local file in -I argument 
Otherwise isLocalFile() will return false for local files without the
file:// thingy.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-01 22:54:03 -03:00
Sefa Eyeoglu
9e1653ebb4
Merge pull request #436 from Scrumplex/feat-change-maxmem 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/426
 2022-11-30 18:22:55 +01:00
Sefa Eyeoglu
a5b0b4800a
fix: make resource buttons work when instance is running 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-27 23:10:32 +01:00
Sefa Eyeoglu
f3279a0697
Merge remote-tracking branch 'upstream/develop' into import-resource-pack-dialog-uwu 2022-11-27 20:05:21 +01:00
Sefa Eyeoglu
236c196e68
fix: improve code readability 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-27 18:38:56 +01:00
flow
bae0a0530b
fix(RPImportDialog): allow changing item size to accomodate wrapped text 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-25 11:51:08 -03:00
flow
4a1d082614
reafctor(WideBar): connect to signal instead of overriding menu method 
This makes stuff more standard and closer to what we do in other places
in the codebase.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-25 09:33:05 -03:00
Sefa Eyeoglu
fd8b4c5368
Merge pull request #227 from Leo40Git/feature/instance-shortcuts 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/210
 2022-11-25 13:11:00 +01:00
TheKodeToad
96e8217b00 Button to add agent 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-23 09:46:55 +00:00
flow
20c281d6f8
fix: reset wide bar settings when the list of actions changes 
This prevents changes to the actions to cause non-intuitive issues in
the Wide bar, hiding items that previously weren't hidden.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-22 14:30:54 -03:00
Ryan Cao
f916ce8752
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import-resource-pack-dialog-uwu 2022-11-21 23:19:50 +08:00
DioEgizio
5cc91965d0
Merge pull request #487 from TayouVR/breeze-icon-themes 2022-11-21 14:43:58 +01:00
Sefa Eyeoglu
c74f852364
Merge pull request #243 from Scrumplex/migration-dialog 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/46
Closes https://github.com/PrismLauncher/PrismLauncher/issues/204
 2022-11-21 12:14:49 +01:00
Ryan Cao
7096f02b88
fix: text wrapping 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-21 18:15:03 +08:00
Sefa Eyeoglu
884fe0d574
feat: validate maximum memory allocation in wizard 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-20 18:16:19 +01:00
flow
df0f9259c0
refactor: move RP/TP validation to their respective utils 
This makes it easier to validate individual resources, and allows the
logic to be used in other places in the future, if we need to.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-20 11:10:26 -03:00
Tayou
bb7a321c6e
add breeze themes 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-20 05:24:10 +01:00
flow
2d69d63efe
feat(InstancePages): save/load wide bar visibility settings 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-19 18:41:31 -03:00
flow
479843f56b
feat(WideBar): allow loading/unloading visibility via a byte array 
I really wanted to use a QBitArray :c

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-19 18:41:31 -03:00
flow
6e1639551b
feat(WideBar): allow hiding buttons with right-click 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-19 18:41:30 -03:00
flow
2367903ac6
refactor: clean up WideBar a bit 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-19 18:41:30 -03:00
Ryan Cao
d92ae530d7
fix: stray include 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-20 00:34:44 +08:00
Ryan Cao
e0e428ce38
fix: add support for CLI and drag and drop 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-20 00:28:35 +08:00
Ryan Cao
a99cd16422
fix: resource pack import dialog icons and add message 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-20 00:14:16 +08:00
Ryan Cao
1f6b8f9d2b
fix instance IDs and resource pack imports 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-19 23:59:30 +08:00
Ryan Cao
8dacbafc8b
feat: initial support for smart resource pack parsing on file handler 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-19 23:14:57 +08:00
DioEgizio
dbd01d35e6
Merge pull request #455 from leo78913/menubar-stuff 2022-11-18 17:20:50 +01:00
flow
b24c09665f
Merge pull request #439 from Ryex/better-blocked-mods 2022-11-17 11:29:28 -08:00
Rachel Powers
52d43f843b feat(BlockModsDialog): remove redundant Ui info 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-17 11:46:14 -07:00
Redson
f72ac94c11
fix: Fix usage below 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-17 06:39:05 -03:00
RedsonBr140
bd3a693e70
chore: Change var name 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: RedsonBr140 <redson@riseup.net>
 2022-11-17 06:20:53 -03:00
RedsonBr140
37a117d2ef
chore: Var definition inside the for loop 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: RedsonBr140 <redson@riseup.net>
 2022-11-16 12:24:28 -03:00
leo78913
7439fd6bcb fix: Fix some stuff in the menu bar 
- Remove duplicated launch actions
 - Enable the add instance action icon in menus
 - Remove ugly separator at the end of the help menu if the updater is disabled
 - Add icons to the help and news menu items

Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-15 10:56:41 -03:00
Redson
6fe626ab9a
feat: Make the changes persistent. 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-15 06:09:13 -03:00
Redson
a12f892841
fix: Check the box when the theme is changed via settings 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-15 05:46:24 -03:00
Redson
aa3ea79f94
fix: Check the current theme box on startup. 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-15 05:38:31 -03:00
Redson
ef53455b66
fix: Build on QT6 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-15 05:19:46 -03:00
ADudeCalledLeo
ba46ff6692
Merge remote-tracking branch 'upstream/develop' into feature/instance-shortcuts 2022-11-15 10:05:04 +02:00
leo78913
0e916244f0
feat: Add themes and their logic. 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-14 21:10:48 -03:00
RedsonBr140
1e4ee02cbc
Merge branch 'PrismLauncher:develop' into menu-themes 2022-11-14 21:09:37 -03:00
flow
cedc7754d9
Merge pull request #428 from DioEgizio/fixes-to-CI 2022-11-14 14:16:01 -08:00
flow
fece9e207b
Merge pull request #448 from TheLastRar/fixup-warnings 2022-11-14 14:15:46 -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
Redson
be765f8d88
feat: Add empty menu 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-14 16:33:25 -03: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
ADudeCalledLeo
ce892c9e77
Add icon 
NOTE: Currently missing on Legacy, Flat and Flat (White)
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-14 21:02:31 +02:00
Sefa Eyeoglu
e14b998da3
refactor: improve readability 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-14 18:38:12 +01:00
Ryan Cao
2c9452efaf
Merge branch 'develop' into macos-add-to-path 2022-11-14 19:26:31 +08:00
Ryan Cao
97a7af855f
slight reword: "install to PATH" 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-14 19:21:47 +08:00
ADudeCalledLeo
5be8545edc
Windows, Linux: prevent segfault on missing icon 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 20:18:51 +02:00
ADudeCalledLeo
b0269e6dfc
Linux: fixes 
- Fix shortcut icons
- Possibly fix shortcut creation on AppImages
- Fix shortcut not working if path to launcher contains spaces

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 17:51:29 +02:00
ADudeCalledLeo
43b9d9484d
tabs -> spaces 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 15:49:28 +02:00
ADudeCalledLeo
69bbb29328
Mac: attempt 2 
- create .command files instead of .sh
- fix shortcuts not working if path to Prism Launcher contains spaces
- fix path to executable in shortcutss
- add check for running from extracted folder (prevents creating shortcuts)

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 15:47:37 +02:00
flow
577069cfb4
fix: don't have the clear button on instance page filters 
This thing is otherworldly unoptimized. o.O

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-12 19:23:57 -03:00
Sefa Eyeoglu
335bec68fb
fix: prevent abort for un-abortable tasks 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:30 +01:00
ADudeCalledLeo
5322155b19
Mac: fix build 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:48:21 +02:00
ADudeCalledLeo
45ce72593a
Windows: remove icon if shortcut creation fails 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:43:58 +02:00
ADudeCalledLeo
b813c867b5
refactor #if checks 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:41:52 +02:00
ADudeCalledLeo
f7d7d76ee8
Mac: now supported! [UNTESTED] 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:36:49 +02:00
ADudeCalledLeo
dbe0553b4a
Move addAction call above left-align loop 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:31 +02:00
ADudeCalledLeo
9be48f1dc4
this ain't static, falco 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:31 +02:00
ADudeCalledLeo
6043444e4e
Apply suggestions from code review 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:30 +02:00
ADudeCalledLeo
487e352642
Fix nested #if directive 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:29 +02:00
ADudeCalledLeo
cc5f82bfac
Windows: fix window icon being replaced 
Dunno why it happens but the fix was literally 2 lines, so whatever I guess

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:28 +02:00