2f6a355e1a
Edit readme again
2023-06-21 18:02:08 -04:00
0e24b55f33
Edit readme
2023-06-21 18:00:35 -04:00
ebbfaf8713
Add custom login support
2023-06-21 13:23:24 -04:00
8e6c20dc99
Fix the various different bugs i initially created
2023-06-20 15:08:02 -04:00
daa73a756a
Merge branch 'develop' of https://github.com/fn2006/PollyMC into develop
2023-06-20 14:35:28 -04:00
94f3d61302
Add custom login support
2023-06-20 14:35:02 -04:00
Sayantan Chaudhuri
b2c9183c41
Fix tabs with spaces in build.yml ( #65 )
...
* Fix tabs with spaces
* Switching to manual dispatch for the built workflow
This is for private testing
* Switching to simpler manual dispatch trigger
* Back to original trigger
2023-06-12 17:23:01 +00:00
fn2006
a3e64b6f1b
fix typo
2023-06-09 16:23:27 +01:00
fn2006
a13d3f4a38
Attempt to get flatpak builds working
2023-06-09 16:20:36 +01:00
fn2006
392822ec7a
Add support for 2FA on ely.by accounts ( #64 )
2023-06-09 13:42:13 +00:00
fn2006
cc85b44ff2
Merge branch 'release-7.x' of https://github.com/PrismLauncher/PrismLauncher into develop
2023-06-09 13:35:03 +01:00
DioEgizio
bfe7e3afed
Merge pull request #1133 from DioEgizio/bump-mac-11.0
2023-06-08 18:11:59 +02:00
DioEgizio
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
Sefa Eyeoglu
7fb4c8358b
Merge pull request #1131 from DioEgizio/revert-to-qt650
2023-06-08 16:20:22 +02:00
DioEgizio
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
Tayou
9b9d439fce
Merge pull request #1111 from Trial97/requires
2023-06-07 18:57:46 +02:00
Sefa Eyeoglu
62d1bc87ae
Merge pull request #1117 from leo78913/update-pack-formats
2023-06-07 17:49:52 +02:00
Tayou
51ed39804f
Merge pull request #1125 from Ryex/fix/link-crash-1118
2023-06-07 16:14:53 +02:00
Rachel Powers
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
Sefa Eyeoglu
accf0cd40e
Merge pull request #1115 from leo78913/fix-resource-downloader-crash
2023-06-07 08:47:19 +02:00
leo78913
a9302468e7
update resource and data pack pack_format_versions
...
Signed-off-by: leo78913 <leo3758@riseup.net>
2023-06-06 16:10:15 -03:00
Tayou
3b9d822d72
Merge pull request #1073 from leo78913/accounts-menus-fixes
2023-06-06 20:34:41 +02:00
Tayou
f3a7de6b76
fix: save meta custom url as string, not QUrl ( #1114 )
2023-06-06 20:25:29 +02:00
leo78913
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
leo78913
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
Tayou
e884341795
save meta custom url as string, not QUrl
...
Signed-off-by: Tayou <tayou@gmx.net>
2023-06-06 18:15:26 +02:00
Rachel Powers
3a068970f9
Packaging: file manifest in portable install ( #1101 )
2023-06-06 16:03:13 +02:00
Trial97
1043d29dd5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into requires
2023-06-06 10:34:36 +03:00
Trial97
6505a62801
Renamed requires fields
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-06 10:34:05 +03:00
Sefa Eyeoglu
7e016c44c1
Merge pull request #1093 from getchoo/use-flake-parts
...
Refactor Nix Flake
2023-06-06 08:10:39 +02:00
DioEgizio
e1b37f3cd3
Merge pull request #1108 from Ryex/fix/memory-leak-translation
2023-06-05 20:34:56 +02:00
DioEgizio
0c24827a52
Merge pull request #1103 from Ryex/fix/1.120-allowed_symlinks.txt
2023-06-05 20:32:30 +02:00
Sefa Eyeoglu
e6eee82fb9
Merge pull request #1100 from Ryex/packaging/windows-installer-uninstall-previous
2023-06-05 20:30:57 +02:00
Sefa Eyeoglu
c5cf78205a
Merge pull request #1109 from TheKodeToad/mrpack-export-validate
2023-06-05 19:44:45 +02:00
TheKodeToad
37b4f606c8
Validate input lengths on mrpack export
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-05 17:54:24 +01:00
Rachel Powers
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
Rachel Powers
3dccc38f42
Merge pull request #904 from TheKodeToad/mrpack-export
...
mrpack export
2023-06-04 19:01:50 -07:00
Rachel Powers
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
TheKodeToad
3c87e5d31e
Make mcInstance mutable
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-03 13:48:15 +01:00
TheKodeToad
e26827b849
Optimised icons
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-03 13:39:42 +01:00
Rachel Powers
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
Rachel Powers
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
Alexandru Ionut Tripon
1840505a0f
Fix crash when selecting same mod from different providers ( #1029 )
2023-06-02 18:04:06 -03:00
seth
29e532c096
fix(nix): fix prismlauncher-qt5
...
Signed-off-by: seth <getchoo@tuta.io>
2023-06-02 11:53:09 -04:00
Sefa Eyeoglu
0f0cbd4c1f
refactor(nix): introduce unwrapped packages
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-06-02 12:41:18 +02:00
Sefa Eyeoglu
0ece0b5b27
Merge pull request #1086 from TayouVR/fix-qt6_5-brown-system-theme
2023-06-02 12:18:37 +02:00
Rachel Powers
6a4fb6a271
packaging: remove redundant "do you want to uninstall previous version"
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-01 12:40:08 -07:00
Rachel Powers
4593538fc8
fix: typo - space before comment
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-31 14:36:24 -07:00
Rachel Powers
03b66ba7a5
packaging: make windows nsis installer run the uninstaller for previous install before installing
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-31 13:25:14 -07:00
fn2006
51adc79fe1
Revert "chore: remove FTB modpack support"
...
This reverts commit ff07714e8c
2023-05-30 19:54:28 +01:00
