Commit Graph

5948 Commits

Author SHA1 Message Date
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
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
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
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
25e23e50ca fix: force add of ignored testdata files
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
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
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