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

820 Commits

Author SHA1 Message Date
Rachel Powers
30b01ef053 fix: *sigh* no implicit QString->QFileInfo conversion in Qt6, again... 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-07 15:04:23 -07: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
Joshua Goins
f04703f09b Strip certain HTML tags when rendering mod pages 
Some mod pages use certain tags for centering purposes, but trips up
hoedown.

Signed-off-by: Joshua Goins <josh@redstrate.com>
 2023-01-06 15:05:19 -05:00
flow
d55f47077a
Merge pull request #626 from leo78913/mods-provider-column 
closes https://github.com/PrismLauncher/PrismLauncher/issues/402
 2022-12-30 11:39:03 -03:00
flow
141e94369e
feat(Mods): hide 'Provider' column when no mods have providers 
This makes the mod list look a bit less polluted in the common case of
mods having no provider whatsoever.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-29 13:21:49 -03: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
leo78913
c8d8dda79a fix: only show scrollbars when needed 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-15 16:34:52 -03:00
flow
4f1ea712da
Merge pull request #605 from flowln/fix_crash_in_downloader_image 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/590
 2022-12-15 04:47:56 -08:00
Sefa Eyeoglu
d193ed9eeb
Merge pull request #561 from leo78913/iconpicker-stuff 
closes https://github.com/PrismLauncher/PrismLauncher/issues/494
 2022-12-14 23:15:21 +01:00
TheKodeToad
ee003cd9ee Add confirmation on customised components 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-14 15:40:20 +00:00
TheKodeToad
127b094c41 Improve handling of destructive actions 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-14 15:20:42 +00:00
DioEgizio
821c424b66 move cat to bottom right 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-14 08:36:35 +01:00
flow
e05ccc0e55
Merge pull request #601 from Scrumplex/fix-translations-3 2022-12-13 07:01:23 -08:00
Sefa Eyeoglu
107977f3d1
fix: update source strings 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-13 10:40:35 +01:00
flow
756d933d1a
fix: bind image fetch callback lambda to the parent object 
Fixes a possible crash with the callback being called after the image
object was already deleted.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-12 23:51:22 -03:00
flow
83deccf266
fix(ManagedPackPage): crash with GTK2 theme due to QProxyStyle 
Seemingly related issue: https://bugreports.qt.io/browse/QTBUG-49940

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-12 23:31:10 -03:00
TheLastRar
7e96077ed7 Fix: Reset stylesheet before setting style 
Resolves #510

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-12-12 20:22:08 +00:00
DioEgizio
9eb14e6b9b fix: remove leftover TODO 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-11 20:35:39 +01:00
flow
d95625ed88
Merge pull request #486 from flowln/wide_bar_customization 2022-12-11 04:16:45 -08:00
flow
4a13d72997
Merge pull request #32 from flowln/modpack_update_page 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/180
Closes https://github.com/PrismLauncher/PrismLauncher/issues/170
 2022-12-10 06:34:18 -08:00
Rachel Powers
8f30237765 fix: prevent potental crash if droping non local files 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-09 17:21:40 -07:00
Sefa Eyeoglu
e427174ff0
Merge pull request #571 from Ryex/blocked-targetFolder 
fix(blockedmods): Track and use targetFolder for blocked files
 2022-12-09 08:33:10 +01:00
flow
9ad4ae5340
Merge pull request #568 from leo78913/flatpak-shortcuts 2022-12-08 17:53:33 -08:00
Rachel Powers
0f48e0fc06 fix(blockedmods): Track and use targetFolder for blocked files 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-08 18:42:51 -07:00
leo78913
37ad1b40d8 fix: fix creating instance shortcuts in flatpak 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-08 20:18:07 -03:00
leo78913
ab2f3bb5bc make removeButton a member of IconPickerDialog 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-08 11:13:53 -03:00
flow
34230bfcf4
fix: don't try updating Flame instance names when updating versions 
Since the exact version string is only available in the manifest,
there's no easy way of getting it before commiting to the update, so
there's not much of a good way of showing the updated name in the UI,
and using the displayName is weird and gives some buggy behavior.

We may want to re-enable it in the future if we find a reliable way of
showing the correct info on the UI before starting the update.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-07 18:05:46 -03:00
DioEgizio
b0d69db878 fix: add instance shortcut creation action to menubar 
also moves deleteinstance to the same place as the instance toolbar

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-07 16:52:06 +01:00
leo78913
8c99edd3c5 feat+refactor: trash instance icons 
also refactor IconList::deleteIcon

Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-06 20:25:42 -03:00
leo78913
8036272e87 fix: disable remove icon button for default icons 
pressing this button in the icon picker dialog when a default icon is selected does nothing so why not disable it

Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-06 20:10:30 -03:00
flow
6f50809457
fix(FlamePage): don't assert / suggest blocked modpacks 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:35 -03:00
flow
bb386a1162
fix(ManagedPackPage): only update the current instance exactly 
Also carry on the original ID to avoid updating the wrong instance.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:34 -03:00
flow
80054e4db2
fix(ManagedPackPage): preserve pack ID from Modrinth update 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:34 -03:00
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