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

2043 Commits

Author SHA1 Message Date
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
fn2006
876f12f71b add polly to cat selection 2022-12-20 22:43:57 +00:00
fn2006
979d33ab83
Use PolyMC's CurseForge workaround (#47) 
* Curseforge workarounds

This should allow people to use Curseforge without having to manually
paste a working key into the settings or change the user agent.

Signed-off-by: Lenny McLennington <lenny@sneed.church>

* chore: update cf api key api url

Sascha says the domain name we're using is not gonna be renewed, so I'm
switching it to a domain controlled by me instead so that this won't be
a problem in the future.

Signed-off-by: Lenny McLennington <lenny@sneed.church>

* feat: add ability to disable cf api key fetching

by setting the cf api key api url to a blank string

Signed-off-by: Lenny McLennington <lenny@sneed.church>

* don't ask before fetching key

* change polymc mention to pollymc

Signed-off-by: Lenny McLennington <lenny@sneed.church>
Co-authored-by: Lenny McLennington <lenny@sneed.church>
 2022-12-20 22:42:34 +00:00
fn2006
e71284c812 remove drm from download all button 2022-12-20 20:31:28 +00:00
fn2006
64b7562919 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2022-12-20 20:23:42 +00: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
849b92665e
Merge branch 'develop' into remove-updater 2022-12-14 23:22:27 +01: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
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
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
0ff8891c66
feat: add ManagedPackPage to the instance pages 
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
82699cc297
feat: allow skipping the update confirmation dialog 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
08d008a5aa
refactor: abstract away update confirmation dialog 
... so that we can avoid code duplication.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:29 -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
flow
5ae044db93
Merge pull request #556 from DioEgizio/modrinth-icon-larger 2022-12-06 11:50:35 -08:00
flow
c6e4fdac7e
Merge pull request #557 from Scrumplex/fix-fswatcher-segfault 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/555
 2022-12-06 11:50:03 -08:00
Sefa Eyeoglu
c8c3fe1023
chore: add license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 13:18:50 +01:00
Sefa Eyeoglu
85bddbed86
chore: reformat code 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 13:16:27 +01:00
Edgar Onghena
318a2a429c
Fix minutes unit 
Replaced "m" with "min" in `Time::prettifyDuration`

Signed-off-by: Edgar Onghena <dev@edgar.bzh>
 2022-12-06 13:01:43 +01:00
Sefa Eyeoglu
07359865c6
fix: don't allocate BlockedsModsDialog 
Fixes temporary memory leak!

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-05 21:39:26 +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
ce3cfa212c fix: make modrinth icon larger 
before it was considerably smaller than the other modpack platform icons which looked weird

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-05 20:27:29 +01:00
DioEgizio
b29c99656e
Merge pull request #546 from DioEgizio/add-server-icon 
feat: add a proper server icon
 2022-12-05 07:49:55 +01:00
DioEgizio
aceafb28f6 feat: add server icon to simple colored icons too 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Co-Authored-By: leo78913 <leo3758@riseup.net>
 2022-12-04 21:29:00 +01:00
flow
928939cbe3
fix(Inst.Copy): create FS::copy object inside the secundary thread 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-04 12:29:38 -03:00
DioEgizio
2462b8e524 feat+fix: better flat icon 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-04 13:30:24 +01:00
DioEgizio
263a72879d fix: oyxgen is lgpl3! 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-04 12:50:40 +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
Sefa Eyeoglu
5c6f325071
Remove blue-ish tint from remaining flat white icons 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-02 20:47:11 +01:00
Sefa Eyeoglu
b9a17f5999
Merge branch 'upstream/develop' into develop 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-02 20:46:04 +01: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
flow
386fb28a35
fix(FileResolvingTask): Fail instead of crash when there's API errors 
Also remove non-used variable (rip).

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-01 15:33:35 -03:00
flow
79b79b752c
fix(Inst.Import): Show error reason in fail dialog 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-01 15:32:26 -03:00
flow
a116778402
fix(Inst.Import): don't search inside 'overrides/' for the manifest 
It will never be there anyways, and saves a **bunch** of time when the
overrides folder is big and we traverse all the tree when searching for
the MMC 'instance.cfg' file.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-01 15:15:15 -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
flow
42c00213ce
Merge pull request #238 from santiagocezar/new-icons 2022-11-29 14:30:29 -08:00
Sefa Eyeoglu
52d06ed814
chore: move instance_icons.svg 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-29 20:07:00 +01:00
TheKodeToad
31dc82b1a6 Make requested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-29 09:43:08 +00:00
flow
4e27e132a0
fix: don't disable interaction on non-mod models when inst. is running 
It is still useful for mods though, since we don't wnt to allow
disabling mods when the instance is running, as that wouldn't affect the
running instance, possibly causing confusion

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-28 12:02:38 -03: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
Santiago Cézar
e6244c937a
Merge branch 'develop' into new-icons 
Signed-off-by: Santiago Cézar <48573316+santiagocezar@users.noreply.github.com>
 2022-11-27 16:28:42 -03:00
Santiago Cézar
3cbf8d4993 resolving reviews 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-27 16:24:45 -03: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
8cac61f0be
fix: check resource pack validity solely using pack format 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-27 18:41:52 +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
DioEgizio
c90f2c3ac6 fix: use monochrome icon for breeze 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-11-26 15:05:08 +01:00
Santiago Cézar
a8943ce1ee remove unused ftb icon 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 15:15:08 -03:00
Santiago Cézar
71d35dc70b meat is now round 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 15:15:08 -03:00
Santiago Cézar
9daf2a2996 resize to 24x24 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 15:15:07 -03:00
Santiago Cézar
f5d6aea942 forgot ftb 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 15:15:07 -03:00
Santiago Cézar
5850447fd0 merge with upstream 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 15:14:52 -03:00
Santiago Cézar
e12a7a4415 gradients! 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 14:22:49 -03:00
Santiago Cézar
81d84b8d02 initial icons 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 14:22:49 -03: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
Sefa Eyeoglu
cbf4159c7e
fix: add missing shortcut icons 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-25 14:03:10 +01: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
Sefa Eyeoglu
5872c34315
Merge pull request #412 from leo78913/legacy-icons 
add the missing icons to the legacy icon theme
 2022-11-25 08:36:42 +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
Trisave
66f9fed2f2
Remove blue-ish tint from flat white icons 
Signed-off-by: Trisave <42098407+Protrikk@users.noreply.github.com>
 2022-11-22 18:30:21 +01: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
Sefa Eyeoglu
fdbd8d9d2b
refactor: remove old updater 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-21 16:18:05 +01:00
Sefa Eyeoglu
4208c2c72a
fix: actually emit fileCopied 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-21 15:47:15 +01: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
f55fc51e9b
fix: remove commented-out assertions 
They may not hold true at all times, and that's fine.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-20 11:11:08 -03: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
Sefa Eyeoglu
30607c34a1
Merge pull request #291 from TheKodeToad/betterjavalauncher 2022-11-19 18:45:15 +01: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
jopejoe1
d1db7a0e23
Fix New Zealand English display 
Signed-off-by: jopejoe1 <34899572+jopejoe1@users.noreply.github.com>
 2022-11-19 16:28:27 +00: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
a33b804923
fix: add resource pack format for 1.19.3 
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-19 23:47:47 +08:00
Ryan Cao
f527958cb3
fix: check if packFormat is valid for resourcepack parsing 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-19 23:42:56 +08:00
Ryan Cao
b1bdc6f745
fix resource packs and add support for texture packs 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-19 23:38:05 +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
Sefa Eyeoglu
c6d9edb78f
chore: improve display names of more languages 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-18 22:21:55 +01: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
flow
5cf2a8b5fc
Merge pull request #454 from RedsonBr140/menu-themes 2022-11-17 09:47:55 -08: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
Sefa Eyeoglu
298871e207
Merge pull request #467 from Scrumplex/fix-meta-extensions-json 
Fix serialization of components with custom metadata
 2022-11-16 23:54:26 +01:00
Sefa Eyeoglu
ce958f4ffd
refactor: use isEmpty instead of size for lists 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-16 23:20:47 +01:00
Sefa Eyeoglu
40970a1a87
fix: serialize metadata extensions 
Prism has introduced a few extensions to the meta component version
format, which were not exported as JSON in the launcher. This caused the
`Customize` button on the version page to not write these new properties
to the custom component file.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-16 18:11:18 +01:00
Sefa Eyeoglu
8aae652be1
fix: remove unnecessary condition 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-16 18:10:54 +01: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
Fayne Aldan
e8b871ac72
Merge branch 'PrismLauncher:develop' into version 2022-11-15 18:34:24 -07:00
Fayne Aldan
9f30c6d94b Add commit hash to --version 
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>
 2022-11-15 18:33:51 -07:00
flow
c4c1e75de8
fix: use QPixmapCache only from the main thread 
It's a required condition.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-15 18:14:03 -03:00
flow
7705f290ca
fix: don't retry to load RP images that can't fit in the cache 
Avoids an infinite loop when the image is too big.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-15 12:07:11 -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
ADudeCalledLeo
cca052ccc9
Restore QRC headers 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-14 22:46:41 +02: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
leo78913
8d6aecd944 add the missing icons to the legacy icon theme 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-14 16:16:52 -03:00
TheLastRar
aef5349aee Pass index.parent() as parent parameter for rowCount 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:57 +00:00
TheLastRar
ac993aa31f Use Q_UNUSED instead of [[maybe_unused]] in onParseFailed 
Qt5 on Ubuntu cannot handle [[maybe_unused]] in this function

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:57 +00: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
5558f3d2cc Mark paramaters of dropMimeData as unused 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:57 +00:00
TheLastRar
08f8623cb7 Mark paramaters of onParseFailed as unused 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:56 +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
TheLastRar
3cba359d38 Mark paramater runtimeContext as unused 
Base class uses variable, but ImplicitRule does not

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:56 +00:00
TheLastRar
b8d7aedb2c Mark paramater line as unused in guessLevel() 
The base method doesn't use this variable, but classes overriding this method do

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:56 +00:00
TheLastRar
55c7b291e1 Remove unused qhash function 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:56 +00:00
TheLastRar
472d931b4b Prefix member variables in HttpMetaCache 
MSVC warns about shadowing variables

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
fn2006
ef713cf414 Merge branch 'develop' of upstream into develop 2022-11-13 23:28:58 +00: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
txtsd
0a04c3a2a7 fix: Fix the error that CodeQL caught 
Signed-off-by: txtsd <code@ihavea.quest>
 2022-11-13 18:54:55 +01:00
ADudeCalledLeo
acd50969e0
Linux: remove TryExec entry from .desktop files 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 19:50:27 +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
fe94c3609e
fix: implement code review suggestions 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
173aed7fd8
chore: add REUSE headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:30 +01: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
Sefa Eyeoglu
bbb7e9f5c7
feat: show current copy operation in migration dialog 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
086304f7f2
feat: add initial Migration dialog 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
bd7065eece
feat: add SimplePrefixMatcher 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:30 +01:00
Sefa Eyeoglu
15aaff7c1c
feat: add dryRun to copy operation 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:28:29 +01:00
Sefa Eyeoglu
e048bce13e
refactor: allow copy operation with whitelist 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:27:13 +01:00
Sefa Eyeoglu
ddfb449b28
fix: remove PolyMC data paths 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-12 20:27:13 +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
7e5076b068
Linux: fix path shortcut is written to 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:32 +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
ADudeCalledLeo
4d4dfab388
Windows: add instance icon to shortcut 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:28 +02:00
ADudeCalledLeo
b83f9be1bd
Add missing fail check for CoInitialize 
Add a few comments

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:27 +02:00
ADudeCalledLeo
6ae3b183fd
Remove unnessecary "is defined" check 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:27 +02:00
ADudeCalledLeo
f12117c532
[UNTESTED] Linux: add icons to shortcuts 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:26 +02:00
ADudeCalledLeo
70768189ba
Windows: implement FS::createShortcut 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:25 +02:00
ADudeCalledLeo
30b266622c
Add 'Create shortcut' button to instance toolbar 
Implemented on Windows only rn!

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:18:49 +02:00
Rachel Powers
25b306b7e1 feat: mark folder paths as links 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 18:32:11 -07:00
Rachel Powers
9af1b00df5 feat: add list of watched folders 
move explanation text into dialog class and it's own label

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 18:05:19 -07:00
Rachel Powers
51c27e2748 always use the pending path set to avoid task duplication. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 16:33:52 -07:00
Rachel Powers
b9e2c3524c chore: clang format & cleanup 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 16:07:57 -07:00
Rachel Powers
3f6cc17818 properly handle a currently running hashing task 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 15:45:40 -07:00
Rachel Powers
5909af9878 drag&drop + add folder to watch 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 14:17:33 -07:00
flow
64576f4c4c
Merge pull request #304 from Ryex/move-downloads 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/222
 2022-11-11 12:48:53 -08:00
Sefa Eyeoglu
b57fee1a44
fix: swap spin box and state icon 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-11 15:24:14 +01:00
Sefa Eyeoglu
cabd887866
feat: use icons to show memory allocation state 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-11 15:22:16 +01:00
Sefa Eyeoglu
863a168cb5
feat: raise memory limits to 1TiB 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-11 15:05:00 +01:00
Sefa Eyeoglu
5ee4fb3522
feat: validate maximum memory allocation 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-11 15:04:05 +01:00
Rachel Powers
2f10fa8b61 add some extra debug logs for CF blocked mods 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 05:41:32 -07: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
flow
6c53e68a52
Merge pull request #406 from Scrumplex/fix-clear-metadata 2022-11-10 07:50:14 -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
Sefa Eyeoglu
e6d057fe6d
Merge pull request #415 from TayouVR/fix-main-warning 2022-11-09 18:27:40 +01:00
flow
9ad6eb11a3
refactor: fix CodeQL warnings in StringUtils::naturalCompare 
I have no idea why this function exists, so better to just let it exist.
=D

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-09 14:14:25 -03:00
TheKodeToad
32c2ad2bbd A lot more cleanup 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 17:51:18 +00:00
TheKodeToad
9931c9a286 Remove arguments being passed twice 
Passing the classpath into stdin has no effect. Java is already provided the classpath with -cp, which pretty much takes up the largest part of the arguments anyway, which leads me to wonder, what's the point of stdin arguments at all?

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:37:00 +00:00
TheKodeToad
e68dcea6bc Various tweaks to the Java component of the launcher 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-08 16:24:55 +00:00
txtsd
fcb9733df0
Merge pull request #392 from PrismLauncher/max_ram_logic 2022-11-08 12:23:24 +05:30
flow
589d160515
fix: use cross-platform toStdString in FlameHasher 
Almost the same issue from toml++ :p

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-07 14:04:48 -03:00
Tayou
9ac6114b63
Fix warning in main function 
main could according to the compiler end up not returning. of course it will always return, but I satisfied the compiler by adding a default case.

Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-07 14:33:37 +01:00
TheLastRar
456999eee6 Fix: Configuration-less config for Qt Install 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-06 14:25:38 +00:00
TheKodeToad
16e3b786fc Implement Scrumplex's suggestions 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-06 10:09:06 +00:00
DioEgizio
126bbd67f7
Merge pull request #405 from AshtakaOOf/spooky 2022-11-06 07:27:39 +01:00
Sefa Eyeoglu
9fb80a2687
Merge pull request #242 from marcelohdez/more-copy-options 2022-11-06 01:10:24 +01:00
Sefa Eyeoglu
d5d224d89a
fix: save metacache after clearing 
If the user closes the launcher right after clearing, it probably
didn't actually clear the cache yet.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-06 01:05:13 +01:00
Sefa Eyeoglu
4708ce4226
refactor: rename halloween cats to -spooky 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-06 00:47:33 +01:00
Sefa Eyeoglu
a0580946dc
fix: allow -ween variants for all cats 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-06 00:04:43 +01:00
Sefa Eyeoglu
e68fd7c1e3
Merge pull request #383 from leo78913/toolbar-lock 2022-11-06 00:00:47 +01:00
Adrien
369419870e add: Spooky Rory 
Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com>
 2022-11-05 23:55:43 +01:00
leo78913
0938f80b41
Update launcher/ui/MainWindow.cpp 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-05 18:10:36 -03:00
Ryan Cao
3df31579a1
fix: @timoreo22 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-05 22:31:38 +08:00
Ryan Cao
f1d3481a29
fix: remove dumb FS::symlink function 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-05 22:25:22 +08:00
Ryan Cao
cf3aad9c41
fix: use osascript to get admin privileges 
inspired from VSCode's approach

Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-05 22:18:05 +08:00
Ryan Cao
7b1e68bfa8
initial support for add to PATH action 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-05 22:17:59 +08:00
Sefa Eyeoglu
4af22d663a
Merge pull request #229 from ryanccn/macos-drag-n-drop 2022-11-05 11:17:21 +01:00
Sefa Eyeoglu
ba8322aa5c
Merge pull request #396 from leozamboni/develop 2022-11-05 11:17:13 +01:00
Sefa Eyeoglu
e4bd82190a
Merge pull request #149 from TayouVR/better-custom-themes 2022-11-05 11:16:41 +01:00
Sefa Eyeoglu
695734636f
Merge pull request #294 from piperswe/add-snapcraft-yml 2022-11-05 11:09:51 +01:00
Sefa Eyeoglu
5e9b26dbef
Merge pull request #366 from TheLastRar/MSVC-Build 2022-11-04 23:49:54 +01:00
flow
d35c2db41e
fix: separate types of std::string in Packwiz 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-04 16:53:25 -03:00
flow
dff5fea976
feat: add more separation between types of std::string in StringUtils 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-04 16:53:25 -03:00
flow
ab6c7244fc
refactor: move FS's toStdString to StringUtils 
This is so that anyone can use it :)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-04 16:53:25 -03: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
flow
76050880f1
fix: use unicode variant for marking '.index' hidden 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-04 16:53:21 -03:00
TheLastRar
e29259cd55 Fix: Resolve ambiguous overload errors 
Clang-cl fails to select the correct function and instead errors

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:39 +00:00
TheLastRar
f8ad1a052f CMake: Support multi-configuration generators 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:38 +00:00
TheLastRar
653a953d2f CMake: Add zlib 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:35 +00:00
leozamboni
9f5537d936
feat: spooky cat for halloween 
Signed-off-by: leozamboni <leonardonunes169@gmail.com>
 2022-11-04 15:09:57 -03:00
Sefa Eyeoglu
21a7af535c
Merge branch 'develop' into macos-drag-n-drop 2022-11-04 18:30:42 +01:00
txtsd
8f045af867
Merge pull request #374 from flowln/fix_lto 2022-11-04 15:39:41 +05:30
TheLastRar
e682c3e9b8 Fix: Correct exclusions for debug QT plugins 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-03 21:35:28 +00:00
TheLastRar
c993209b76 Fix: Explicitly specify Version.h path 
MSVC uses a different search mechanism that ends up picking the mete Version.h

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-03 21:35:27 +00:00
Tayou
c2f37716e5
clang_format for PR files 
I'm getting a rendezvous... I thought I did this already

Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-03 05:05:07 +01:00
Tayou
e9bfd43ff7
added requested changes 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-03 05:04:36 +01:00
leo78913
3d11d044d2 add an option to lock the toolbars 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-02 20:33:02 -03:00
TheKodeToad
cb796dbdfb
Remove unnecessary block 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 16:38:32 +00:00
Sefa Eyeoglu
094b57bb23
Merge pull request #372 from santiagocezar/rory 2022-11-02 12:06:08 +01:00
Santiago Cézar
9ca4f19aea remove logcat 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-02 07:45:43 -03: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
txtsd
d12323396f
Merge pull request #346 from ryanccn/more-user-friendly-java-warning-text-ahaha 2022-11-02 10:38:26 +05:30
Santiago Cézar
48d34741f3 keyboard navigation is important 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-01 22:53:45 -03:00
Santiago Cézar
76203018e9 forgot the qrc 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-01 20:21:34 -03: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
Santiago Cézar
668342b470 add rory flat too (and holiday variants) 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com>
 2022-11-01 19:31:37 -03:00
Santiago Cézar
0a0ce74105 add rory 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com>
 2022-11-01 19:06:27 -03:00
fn2006
d53a539764 update launcher.svg 2022-11-01 19:51:35 +00:00
txtsd
718a9a3559
change: Update credits 
Replaces txtsd's GitHub link with their website
Moves DioEgizio and flowln from contributors to dev team

Signed-off-by: txtsd <code@ihavea.quest>
 2022-11-02 01:20:58 +05:30
Tayou
afcdf4b9cf
condensed icon theme code 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-01 20:18:07 +01:00
Tayou
a3f5ea3598
added suggested changes 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-01 20:17:53 +01:00
Tayou
fef60a9da0
add support for multiple custom themes 
also moved theme related code from Application.cpp to new ui/themes/ThemeManager.cpp, this class should cleanly isolate theme related functions and help avoid code duplication in future theme related additions.
Themes can now be just qss or css files, they won't have color pallette information with them in that case

Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-01 20:10:12 +01:00
fn2006
44a5130926 Merge branch 'release-5.x' of https://github.com/PrismLauncher/PrismLauncher into prism 2022-11-01 18:48:31 +00: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
Rachel Powers
209a1650e4 clang_format and code cleanup 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 07:06:36 -07:00
Rachel Powers
6010ce0dc5 chore(remove FS::copyFile): 
Now that #333 is merged and FS::copy works on non directory copyFile can be removed.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:28:57 -07:00
Rachel Powers
a7a331a26e ensure FS::copyFile is marked for removal 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
fda2c116be code quality cleanup 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
d2f3dbaa29 fix mispellings and wrap strings for translation 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
e9d4793b1e minor clean up and add some docs 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
13c7efa058 copy found mods to instance (FTB and Flame) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
1598d65824 watch filesystem, compute and match hashes 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
028e086960 send blocked mod info to dialog & prototype UI 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
timoreo
32b526b729
Merge pull request #333 from flowln/fix_atl_packs_post_modpack_update 2022-11-01 11:01:15 +01:00
timoreo
7f6515dbe4
Merge pull request #329 from flowln/only_safe_workarounds 2022-11-01 11:01:15 +01:00
timoreo
04b39294ba
Merge pull request #333 from flowln/fix_atl_packs_post_modpack_update 2022-11-01 09:56:16 +01:00
timoreo
3a446c410c
Merge pull request #329 from flowln/only_safe_workarounds 2022-11-01 09:55:43 +01:00
DioEgizio
a39390b8b4
Merge pull request #359 from Chrono-byte/develop 2022-11-01 09:48:13 +01:00
Chrono
ce1a4857cc
Merge branch 'PrismLauncher:develop' into develop 2022-10-31 20:06:59 -04:00
Chrono
dfdf739282
remove one space 
Signed-off-by: Chrono <me@disilla.org>
 2022-10-31 19:44:55 -04:00
Sefa Eyeoglu
63a3dd1919
Merge pull request #351 from Scrumplex/fix-trash 2022-10-31 22:58:09 +01:00
Sefa Eyeoglu
7086b1e65c
Merge pull request #351 from Scrumplex/fix-trash 2022-10-31 22:56:07 +01:00