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

1791 Commits

Author SHA1 Message Date
Rachel Powers
a4870d4834 fix: fix #700 
fixed by properly converting from a file path and converting to native seperators.
should have known naive handling of file path as a URL would come back to bite us cross platform.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-09 17:00:12 -07: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
Sefa Eyeoglu
ca9b2525c8
Merge pull request #715 from getchoo/add-teawie 2023-01-09 09:46:31 +01:00
seth
9de6927c3f
feat: add CC BY-SA 4.0 info for teawie images 
Signed-off-by: seth <getchoo@tuta.io>
 2023-01-07 19:18:22 -05:00
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
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
Sefa Eyeoglu
9901ecda49
Merge pull request #710 from byquanton/develop 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/708
 2023-01-07 17:18:10 +01:00
seth
f5955a4738
feat: add bday teawie 
Signed-off-by: seth <getchoo@tuta.io>
 2023-01-07 04:47:53 -05:00
seth
e018b30875
fix: make spooky teawie load 
gimp fail

Signed-off-by: seth <getchoo@tuta.io>
 2023-01-07 04:38:26 -05:00
seth
2dbd775cf3
feat: add xmas teawie 
Signed-off-by: seth <getchoo@tuta.io>
 2023-01-07 04:37:41 -05:00
seth
a5051327db
feat: add spooky teawie 
Signed-off-by: seth <getchoo@tuta.io>
 2023-01-07 03:42:53 -05:00
seth
8140f5136d
feat: add teawie 
drawn by sympathytea (https://github.com/SympathyTea)

Signed-off-by: seth <getchoo@tuta.io>
 2023-01-06 22:28:15 -05: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
byquanton
2faf8332ee
fix: Add 1.16+ Forge library prefix in TechnicPackProcessor.cpp 
Signed-off-by: byquanton <32410361+byquanton@users.noreply.github.com>
 2023-01-06 02:44:10 +01:00
Aaron Sonin
e0e3d4d8fe
Merge branch 'PrismLauncher:develop' into instance-accounts 2023-01-02 11:59:29 -07: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
Rachel Powers
0ebf04a021
fix newlines 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-30 10:21:49 -07: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
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
Rachel Powers
c470f05abf refactor: use std::filesystem::rename insted of copy and then moving. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-29 17:21:54 -07: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
flow
257970c27d
refactor(Mods): make provider() return a std::optional 
This makes it easier to check if a mod has a provider or not, without
having to do a string comparison.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-29 13:21:49 -03:00
Sefa Eyeoglu
7a651bdc53
feat: install launcher logging categories 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-27 18:10:01 +01:00
Sefa Eyeoglu
f33f596584
refactor: use ECM logging categories instead 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-27 17:34:21 +01:00
Sefa Eyeoglu
c8d8046412
refactor: add logging category for credentials 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-27 17:04:42 +01:00
Rachel Powers
3691f3a296 fix: cleanup and suggested changes 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-26 14:50:15 -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
Rachel Powers
b2082bfde7 fix: explicit QFileInfo converison for qt6 
fix: validatePath in validateZIPResouces

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-25 17:16:26 -07:00
Rachel Powers
78984eea3a feat: support installing worlds during flame pack import. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-25 16:49:56 -07:00
Rachel Powers
8422e3ac01 feat: zip resource validation check for flame 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-24 20:43:17 -07:00
Rachel Powers
cfce54fe46 fix: update parse tests 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-24 20:43:17 -07:00
Rachel Powers
a7c9b2f172 feat: validate world saves 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-24 20:43:17 -07:00
Rachel Powers
eb31a951a1 feat: worldSave parsing and validation 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-24 20:43:01 -07:00
Rachel Powers
ccfe605920 feat: add shaderpack validation 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-24 15:55:10 -07:00
Rachel Powers
878614ff68 feat: add a ModUtils::validate 
moves the reading of mod files into `ModUtils` namespace

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-24 09:42:02 -07:00
Rachel Powers
64c51a70a3 feat: add initial support for parseing datapacks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-24 09:42:02 -07:00
TheKodeToad
cbe5af235c Make requested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-24 08:59:55 +00:00
flow
ee3e65d759
feat(docs): add note about logging env variables in man page 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-22 19:18:16 -03:00
flow
c85867395d
feat: use Qt logging facilities instead of our own 
This system allows us to globally define categories, and control whether
they are shown or not at runtime. It also does some things by it's own,
so we can remove some (uhhh) code.

Lastly, this allows changing the behavior of the logger at runtime via
environment variables that Qt takes care of for us.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-22 19:15:50 -03:00
Sefa Eyeoglu
df1b7f1656
Merge pull request #628 from flowln/fix_multiple_resource_packs_crash 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/624
 2022-12-19 15:35:34 +01:00
DioEgizio
6e07c11f65 fix: exclude unused tls backends 
makes bundles slightly smaller on windows and macos:

- qopensslbackend will not be used neither on macos nor on qt6 windows, so let's just not copy it
- qcertonlybackend won't be used and wouldn't work for prism anyways as it doesn't support some features we use

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-18 11:03:48 +01:00
Sefa Eyeoglu
8da6667816
Merge pull request #636 from flowln/fix_component_version_when_updating 
Correctly set component versions in Modrinth pack updating
 2022-12-17 17:26:34 +01:00
flow
81fedbf03c
refactor(Tasks): remove 'm_total_size' from ConcurrentTask 
We can use the queues directly instead.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-17 13:10:19 -03:00
flow
0516055b31
Merge pull request #630 from leo78913/yeet-scrollbars 2022-12-17 08:02:41 -08:00
flow
e3f8d99087
refactor(Inst. Import): use m_* for member variables in MR components 
Makes it clearer what is being changed when.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-17 12:41:10 -03:00
flow
22aebc2215
fix(Inst. Import): correctly set component versions when updating 
This makes it so that the later call to parse the old manifest doesn't
change the class data, so that the new data con continue there and be
reflected on the component list later.

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-17 12:38:58 -03: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
flow
ee67b5f1ad
Merge pull request #607 from flowln/dont_crash_on_zip_import 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/609
 2022-12-16 07:22:22 -08:00
leo78913
aa3633d2d7
fix: translate unknown mod provider 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-16 11:13:54 -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
c440f33122
fix(ResourceModel): use a single ConcurrentTask for parsing tasks 
This avoids creating a bunch of threads that fills up the maximum amount
allowed by QThreadPool, and causes a deadlock between the helper threads
and the main thread (main thread tries to create threads in painting
code, but isn't able to, so it keeps waiting for a thread to free up,
but all the threads are waiting on the main thread to process some
events).

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-15 13:51:07 -03:00
flow
b0c866bfaa
feat(Tasks): allow adding subtasks while running in ConcurrentTask 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-15 13:48:53 -03:00
flow
dd578354c4
feat(Tasks): add ConcurrentTask::clear to allow re-using tasks 
This way old runs won't pile up in the internal DSs

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-15 13:45:50 -03:00
leo78913
4ee29b388d feat: add a provider column to the mods page 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-15 12:02:08 -03:00
Edgars Cīrulis
52dc9068e5
ApplicationMessage: Use QHash instead of QMap 
QHash provides faster lookup times than QMap because it uses a hash table to store the elements, while QMap uses a self-balancing binary tree.

Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>
 2022-12-15 16:17:19 +02: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
5450e0edf3
fix(Inst.Import): don't set managed pack info from imported ZIPs 
This prevents the Managed Pack page from showing up even though there's
no way for it to work correctly.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-13 13:43:27 -03: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
64585d8f78
fix(Inst.Import): don't assert extra data when importing from ZIP 
ZIPs don't have the necessary data in those cases.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-13 00:31:41 -03: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
Una
822c5a530e
Not all libraries are from Mojang 
Signed-off-by: Una <me@unascribed.com>
 2022-12-11 16:11:32 -08: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
Sefa Eyeoglu
7cc42269a9
Merge pull request #569 from Jan200101/PR/fix-mangohud 2022-12-11 18:31:05 +01:00
Tayou
83f0611200
fix breeze icon colors and matrix icon 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-12-11 17:36:05 +01:00
flow
d95625ed88
Merge pull request #486 from flowln/wide_bar_customization 2022-12-11 04:16:45 -08:00
flow
5622bcc563
Merge pull request #461 from flowln/fix_big_resource_pack_imgs 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/360
 2022-12-11 04:16:21 -08:00
Jan200101
deb9c98630
chore: replace naive mangohud preload with vklayer detection 
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 2022-12-11 11:01:34 +01:00
Jan200101
2c1e887c8d
chore: replace naive mangohud detection with vulkan layer detection 
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 2022-12-11 11:01:33 +01: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
leo78913
2d5820e910
Update launcher/icons/IconList.cpp 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-10 10:31:44 -03:00
leo78913
6cb857b895
Update launcher/icons/IconList.cpp 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-10 10:31:30 -03: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
flow
cb0339b492
Merge pull request #572 from DioEgizio/breeze-icons-improvements 2022-12-09 04:14:36 -08: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
DioEgizio
fc4c57f0d9 feat: improve new.svg in breeze icon packs 
makes it better and more similar to the one in legacy

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-09 07:49:16 +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
Jan200101
514e7ae6a0
fix: re-add LD_LIBARY_PATH to mangohud 
Upstream officially supports the use of $LIB/mangohud/

Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 2022-12-08 23:09:14 +01: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