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

5525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
8c194cd245
Merge pull request #649 from Scrumplex/fix-winget-release-no9999999 2022-12-19 16:36:42 +01:00
Sefa Eyeoglu
8cbec3d5a0
fix: update installers-regex for winget releaser again 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-19 16:31:50 +01:00
Sefa Eyeoglu
cdf05e74c8
Merge pull request #647 from Scrumplex/update-flake 2022-12-19 16:09:55 +01:00
Sefa Eyeoglu
b98b4f1027
chore(nix): update flakes 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-19 15:54:10 +01:00
Sefa Eyeoglu
fc11dfd6b4
refactor(nix): use tomlplusplus from nixpkgs 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-19 15:54:09 +01:00
Sefa Eyeoglu
483a5b6cae
fix(nix): use jdk17 instead of jdk 
See NixOS/nixpkgs#206806

Co-authored-by: Infinidoge <infinidoge@doge-inc.net>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-19 15:44:05 +01: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
Sefa Eyeoglu
11c8237d8b
Merge pull request #642 from DioEgizio/dont-ship-unnecessary-tlsbackends 
fix: exclude unused tls backends
 2022-12-18 16:27:48 +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
40f16b6d62
Merge pull request #631 from getchoo/better-msvc-flags 2022-12-17 05:53:17 -08:00
seth
a61daa40dc
fix: re-enable /GS and only use some flags on release builds 
Signed-off-by: seth <getchoo@tuta.io>
 2022-12-16 16:05:12 -05: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
seth
7b805a38b9
feat: improve msvc build flags 
- adds /GL, /Gy, and /LTCG for better optimizations
- adds /Gw for a smaller binary size
- adds /guard:cf for added security at runtime
- removes unneeded /GS flag as that's already enabled by default

Signed-off-by: seth <getchoo@tuta.io>
 2022-12-15 18:50:35 -05: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
flow
fdac978c84
Merge pull request #625 from Edgars-Cirulis/develop 2022-12-15 07:55:28 -08:00
Sefa Eyeoglu
3b81ada1c3
Merge pull request #593 from Scrumplex/fix-winget-release-no999999 2022-12-15 16:35:15 +01: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
Sefa Eyeoglu
b2285be5bc
Merge pull request #612 from DioEgizio/move-cat-right 
closes https://github.com/PrismLauncher/PrismLauncher/issues/611
 2022-12-14 13:04:41 +01:00
Sefa Eyeoglu
6ede02bb84
Merge pull request #608 from Scrumplex/bump-7.0 2022-12-14 11:33:46 +01: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
4f3786c2e1
chore: bump to 7.0 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-13 11:10:05 +01:00
Sefa Eyeoglu
107977f3d1
fix: update source strings 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-13 10:40:35 +01:00
Sefa Eyeoglu
813663485d
Merge pull request #604 from flowln/fix_crash_with_gtk2 
fix: crash with GTK2 theme due to QProxyStyle in ManagedPackPage
 2022-12-13 08:31:52 +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
flow
aaef448959
Merge pull request #600 from TheLastRar/reset-stylesheet 
Resolves https://github.com/PrismLauncher/PrismLauncher/issues/510
 2022-12-12 13:28:24 -08: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
Sefa Eyeoglu
c44f931059
fix: update installers-regex for winget releaser 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-12 19:03:32 +01:00
flow
15084c8d6d
Merge pull request #587 from unascribed/patch/libraries-wording 2022-12-11 16:57:45 -08:00
Una
822c5a530e
Not all libraries are from Mojang 
Signed-off-by: Una <me@unascribed.com>
 2022-12-11 16:11:32 -08:00
flow
6eb641ae56
Merge pull request #585 from DioEgizio/remove-leftover-todo 2022-12-11 13:02:08 -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