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

5501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
DioEgizio
4b12c85d91
Merge pull request #673 from PrismLauncher/renovate/flatpak-flatpak-github-actions-5.x 
chore(deps): update flatpak/flatpak-github-actions action to v5
 2022-12-30 19:23:10 +01: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
Sefa Eyeoglu
11df4845b7
fix: remove Flatpak cache key workaround 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-30 15:36:35 +01: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
flow
67ac3da8a0
Merge pull request #684 from Scrumplex/logging-categories 
Prevents private credentials from leaking in the logs of general users
 2022-12-28 09:54:23 -08:00
Sefa Eyeoglu
c1e5179b5f
Merge pull request #680 from AshtakaOOf/flathub-screenshots 2022-12-28 13:48:39 +01: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
Sefa Eyeoglu
4d334b645d
Merge pull request #681 from PrismLauncher/renovate/actions-cache-3.x 2022-12-27 13:54:00 +01:00
renovate[bot]
58d3779efb
chore(deps): update actions/cache action to v3.2.2 2022-12-27 12:20:21 +00:00
Adrien
463b4fbe0c Fix 
Me when me when me when

Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com>
 2022-12-26 20:09:47 +01:00
Adrien
9f1c79a5ec Update org.prismlauncher.PrismLauncher.metainfo.xml.in 
Add ModpackUpdate and change some lines

Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com>
 2022-12-26 19:59:46 +01:00
Adrien
70573b6f31 Update org.prismlauncher.PrismLauncher.metainfo.xml.in 
Should be the right properties (I hope)

Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com>
 2022-12-26 19:24:17 +01: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
renovate[bot]
e4296c48c8
chore(deps): update flatpak/flatpak-github-actions action to v5 2022-12-24 16:20:44 +00:00
flow
dd3848d7b1
Merge pull request #666 from getchoo/pls-scrump 
scrump heard your pleads, rejoice!
 2022-12-24 06:38:49 -08:00
flow
56ac1a0813
Merge pull request #665 from flowln/logging_categories 2022-12-24 03:58:49 -08:00
TheKodeToad
cbe5af235c Make requested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-24 08:59:55 +00:00
seth
f932ffcc5b
fix: check if GIT_REFSPEC is empty 
Signed-off-by: seth <getchoo@tuta.io>
 2022-12-23 20:50:08 -05:00
flow
0a50c5bf40
Merge pull request #644 from RaptaG/new-readme 2022-12-23 04:39:57 -08:00
flow
e416e5d301
Merge pull request #667 from PrismLauncher/renovate/actions-cache-3.x 2022-12-23 04:00:43 -08:00
renovate[bot]
3227859992
chore(deps): update actions/cache action to v3.2.1 2022-12-23 08:18:30 +00:00
seth
01139c3b50
fix: assume builds are stable when git isn't installed 
Signed-off-by: seth <getchoo@tuta.io>
 2022-12-22 19:25:04 -05: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
flow
bf2ce54076
Merge pull request #656 from PrismLauncher/renovate/actions-cache-3.x 2022-12-21 07:30:23 -08:00
renovate[bot]
07de285299
chore(deps): update actions/cache action to v3.2.0 2022-12-21 14:46:35 +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
RaptaG
a566d1c5de
Change numbered list to bullet list 
Signed-off-by: RaptaG <77157639+RaptaG@users.noreply.github.com>
 2022-12-18 18:01:44 +02: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
RaptaG
6dc19c85a8
Improve the README 
Not very serious changes, just some enhancements to make it look better!

Signed-off-by: RaptaG <77157639+RaptaG@users.noreply.github.com>
 2022-12-18 15:23:22 +02: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