Commit Graph

6030 Commits

Author SHA1 Message Date
e91d84c6e1 revert(actions): build setup.exes for modern msvc again
Signed-off-by: seth <getchoo@tuta.io>
2023-06-22 16:31:34 -04:00
13461940a0 chore(actions): use msix for modern builds in winget release
Signed-off-by: seth <getchoo@tuta.io>
2023-06-19 04:39:23 -04:00
92f8253ec3 chore(packaging): use org.prismlauncher in msix app id
Signed-off-by: seth <getchoo@tuta.io>
2023-06-19 04:21:24 -04:00
7d389386d5 chore(packaging): use correct publisher name for msix
Signed-off-by: seth <getchoo@tuta.io>
2023-06-18 22:50:02 -04:00
1c27da1956 chore(actions): include prism_version in matrix for msix
Signed-off-by: seth <getchoo@tuta.io>
2023-06-18 22:43:48 -04:00
c07369b930 feat(packaging): register file associations in msix
Signed-off-by: seth <getchoo@tuta.io>
2023-06-18 22:43:01 -04:00
d9b0f1c55a feat(packaging): bundle vc++2022 with msix
Signed-off-by: seth <getchoo@tuta.io>
2023-06-12 13:41:08 -04:00
bd6d002fa6 feat(packaging): support older windows versions in msix
Signed-off-by: seth <getchoo@tuta.io>
2023-06-11 20:03:58 -04:00
3ebec9c967 chore(actions): add msix(bundle)/appinstaller to trigger_release
this probably works...right?

Signed-off-by: seth <getchoo@tuta.io>
2023-06-11 02:32:21 -04:00
f959ab5403 chore(actions): distribute appinstaller
Signed-off-by: seth <getchoo@tuta.io>
2023-06-11 01:37:41 -04:00
1494d572e2 feat(packaging): add support for appinstaller
Signed-off-by: seth <getchoo@tuta.io>
2023-06-10 23:25:24 -04:00
ac273ead72 fix(actions): limit msix version suffix to 3 numbers
good thing i got an unlucky commit hash :p

Signed-off-by: seth <getchoo@tuta.io>
2023-06-10 22:20:44 -04:00
b6afccf261 fix(actions): checkout repo during bundle-msix
Signed-off-by: seth <getchoo@tuta.io>
2023-06-10 21:41:47 -04:00
b3a57c7410 fix(packaging): don't use letters in msix version
Signed-off-by: seth <getchoo@tuta.io>
2023-06-10 21:21:14 -04:00
846d2fd9c4 feat(packaging): start using msixbundles
Signed-off-by: seth <getchoo@tuta.io>
2023-06-10 20:49:24 -04:00
e31a1f94a3 fix(packaging): don't hardcode arch/version in appmanifest
Signed-off-by: seth <getchoo@tuta.io>
2023-06-10 20:06:13 -04:00
6e8f9541b8 feat(packaging): use msix for msvc builds
Signed-off-by: seth <getchoo@tuta.io>
2023-06-10 18:11:06 -04:00
bfe7e3afed Merge pull request #1133 from DioEgizio/bump-mac-11.0 7.0 2023-06-08 18:11:59 +02:00
75b1eaed0c chore: bump macOS requirement to 11.0
Noticed only now that Qt 6.5 bumps the macOS requirement to macOS 11.
This was basically already effective in prism since with the Qt 6.5 bump pr macOS 10.15 user's wouldn't be able to run this, but updating the requirement here makes it more clear for the end user trying to run prism on macOS 10.15

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2023-06-08 17:12:49 +02:00
7fb4c8358b Merge pull request #1131 from DioEgizio/revert-to-qt650 2023-06-08 16:20:22 +02:00
5b3431b268 chore: revert macOS Qt version back to 6.5.0
Qt 6.5.1 seems to cause issues with Rectangle

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2023-06-08 14:55:09 +02:00
9b9d439fce Merge pull request #1111 from Trial97/requires 2023-06-07 18:57:46 +02:00
62d1bc87ae Merge pull request #1117 from leo78913/update-pack-formats 2023-06-07 17:49:52 +02:00
51ed39804f Merge pull request #1125 from Ryex/fix/link-crash-1118 2023-06-07 16:14:53 +02:00
d12110b47b fix #1118 : use filePath not path on QFileInfo
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-07 06:26:58 -07:00
accf0cd40e Merge pull request #1115 from leo78913/fix-resource-downloader-crash 2023-06-07 08:47:19 +02:00
a9302468e7 update resource and data pack pack_format_versions
Signed-off-by: leo78913 <leo3758@riseup.net>
2023-06-06 16:10:15 -03:00
3b9d822d72 Merge pull request #1073 from leo78913/accounts-menus-fixes 2023-06-06 20:34:41 +02:00
f3a7de6b76 fix: save meta custom url as string, not QUrl (#1114) 2023-06-06 20:25:29 +02:00
a807b231a7 fix: fix crash when selecting resource/texture/shader packs
Signed-off-by: leo78913 <leo3758@riseup.net>
2023-06-06 15:17:13 -03:00
d59a06344a fix main toolbar accounts toolbutton name
previously it was not using the selected account name when opening the launcher

and i also added an action group to the menu items so it uses radio buttons instead of checkboxes :p

Signed-off-by: leo78913 <leo3758@riseup.net>
2023-06-06 14:21:41 -03:00
e884341795 save meta custom url as string, not QUrl
Signed-off-by: Tayou <tayou@gmx.net>
2023-06-06 18:15:26 +02:00
3a068970f9 Packaging: file manifest in portable install (#1101) 2023-06-06 16:03:13 +02:00
1043d29dd5 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into requires 2023-06-06 10:34:36 +03:00
6505a62801 Renamed requires fields
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-06 10:34:05 +03:00
7e016c44c1 Merge pull request #1093 from getchoo/use-flake-parts
Refactor Nix Flake
2023-06-06 08:10:39 +02:00
e1b37f3cd3 Merge pull request #1108 from Ryex/fix/memory-leak-translation 2023-06-05 20:34:56 +02:00
0c24827a52 Merge pull request #1103 from Ryex/fix/1.120-allowed_symlinks.txt 2023-06-05 20:32:30 +02:00
e6eee82fb9 Merge pull request #1100 from Ryex/packaging/windows-installer-uninstall-previous 2023-06-05 20:30:57 +02:00
c5cf78205a Merge pull request #1109 from TheKodeToad/mrpack-export-validate 2023-06-05 19:44:45 +02:00
37b4f606c8 Validate input lengths on mrpack export
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-05 17:54:24 +01:00
5824047ffa fix(memory leak): cyclic refrence in translations model dl task
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-05 01:12:16 -07:00
3dccc38f42 Merge pull request #904 from TheKodeToad/mrpack-export
mrpack export
2023-06-04 19:01:50 -07:00
f613b03efd Typo fix
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-03 08:28:49 -07:00
3c87e5d31e Make mcInstance mutable
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-03 13:48:15 +01:00
e26827b849 Optimised icons
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-03 13:39:42 +01:00
8eb10e991f fix: use isSymLink (i've made this mistake before but I've made it again)
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-02 16:14:38 -07:00
f6f32914de fix: add origonal instance path to allowed_symlinks.txt when copying via symlinks
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-02 16:04:27 -07:00
1840505a0f Fix crash when selecting same mod from different providers (#1029) 2023-06-02 18:04:06 -03:00
29e532c096 fix(nix): fix prismlauncher-qt5
Signed-off-by: seth <getchoo@tuta.io>
2023-06-02 11:53:09 -04:00