ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
7,901 Commits 4 Branches 5 Tags 40 MiB
26a70d74fe
Commit Graph

3425 Commits

Author SHA1 Message Date
TheKodeToad
7960282e07 Support neoforge.mods.toml 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 252406ba3e)
 2024-04-20 07:50:01 +00:00
Trial97
160c8cb70d Fixed application close on open file dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9f48694eb2)
 2024-04-18 21:13:03 +00:00
Trial97
1a44258c9d Fixed crash on invalid curseforge link on import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9cc58fe62c)
 2024-04-08 21:20:14 +00:00
TheKodeToad
d9b133a28d Use UTF-8 for ZIP creation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit d72bd70c05)
 2024-04-06 13:01:11 +00:00
TheKodeToad
e43341ce92 Fix unicode characters being invalid in filenames 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 9986fe4c45)
 2024-04-06 12:54:15 +00:00
Trial97
b2cca30cd9 Moved getPathNameInLocal8bit inside FileSystem namespace 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 3ddcadcdd1)
 2024-04-06 12:40:35 +00:00
Trial97
3e5e131a94 Moved the creation of natives folder in ExtractNatives task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 8ecab305ac)
 2024-04-06 12:40:35 +00:00
Trial97
1e5a29c423 Fixed crash on non-latin instance name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 450b73328e)
 2024-04-06 12:40:35 +00:00
TheKodeToad
17d5d78a5b Replace invalid characters when extracting ZIP 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 8056a2fa46)
 2024-04-06 12:18:29 +00:00
Alexandru Ionut Tripon
99203cbd9b
Merge pull request #2253 from Trial97/manual_backport 
Manual backport to 8.x
 2024-03-28 14:47:45 +02:00
Trial97
d262a081c5
fixed const stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-28 14:44:32 +02:00
Alexandru Ionut Tripon
f9df20aae3
Update launcher/ui/pages/modplatform/ImportPage.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-03-28 14:44:26 +02:00
Trial97
fc4b5205dd
Added all supported files filter 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-28 14:44:20 +02:00
Alexandru Ionut Tripon
7c2a9df98e
Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-03-28 14:43:49 +02:00
Alexandru Ionut Tripon
b854c56c8c
Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-03-28 14:43:40 +02:00
Trial97
2c864a4aad
added more microsoft error codes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-28 14:43:30 +02:00
Trial97
b255c8b17f
Changed the trait name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-28 14:39:32 +02:00
chouzz
ca3516d26d Add totalTimePlayed for FTBApp import 
Signed-off-by: chouzz <zhouhua852@gmail.com>
(cherry picked from commit 92113e233a)
 2024-03-28 12:36:36 +00:00
Trial97
1a379280b8 Fixed curesforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 05487152fe)
 2024-03-28 08:41:26 +00:00
Evan Goode
96b4933326 Merge Prism Launcher 8.2 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-03-21 10:59:32 -04:00
Evan Goode
8f254cb63b Use either authlib-injector or system properties, not both 
Resolves https://github.com/fn2006/PollyMC/issues/154

In 1.20+, authlib-injector wants to intercept
https://api.minecraftservices.com/publickeys [0], but if we override the
services server using -Dminecraft.api.services.host, the request does
not get intercepted.

That's not an issue for API servers that implement the /publickeys
route, but Ely.by does not. A decent solution is to not set these
-Dminecraft.api.*.host system properties when authlib-injector is
available, since authlib-injector expects authlib to make requests to
Mojang's API servers.

[0] 18a0ce2669
 2024-03-18 13:05:46 -04:00
Evan Goode
639a7820fe Fix offline multiplayer in 1.16.4-1.16.5 
Resolves https://github.com/fn2006/PollyMC/issues/150

If the game is launched in offline mode, pass invalid API servers via
the -Dminecraft.api.* system properties. This workaround is mentioned
here:
https://github.com/FabricMC/fabric-loom/issues/915#issuecomment-1609154390

I think this change is appropriate to make here in PollyMC even though
the Fabric developers decided against using it there. If a user wants to
override the API servers back to the vanilla values (in order to use
Auth Me or something), they can do so by setting the following custom
JVM args on the instance:

-Dminecraft.api.env=PROD
-Dminecraft.api.auth.host=https://authserver.mojang.com
-Dminecraft.api.account.host=https://api.mojang.com
-Dminecraft.api.session.host=https://sessionserver.mojang.com
-Dminecraft.api.services.host=https://api.minecraftservices.com

Previously, auth args would override any user-specified args, but this
patch also changes that behavior so user-specified args are now passed
last.
 2024-03-04 21:53:58 -05:00
furokku floc
d4635c1a04
forgot a thing 2024-03-03 23:08:22 +02:00
furokku floc
6e29802de9
change tabs to spaces 2024-03-03 23:06:12 +02:00
Tayou
a8553e7897 add line back to group separator 
Signed-off-by: Tayou <git@tayou.org>
(cherry picked from commit 877eb4172a)
 2024-03-03 17:38:44 +00:00
TheKodeToad
1fe710777a Allow multiline description 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 4101fbb634)
 2024-03-03 15:30:54 +00:00
TheKodeToad
e349e24548 Fix server side mods being marked as unsupported on client 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 138df66355)
 2024-03-03 15:30:54 +00:00
TheKodeToad
b7f079b006 Fix build on Windows and formatting 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit c0eb80947d)
 2024-03-03 14:07:08 +00:00
TheKodeToad
c39ca8852d Fix a mistake 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit fccf857d8e)
 2024-03-03 14:07:08 +00:00
TheKodeToad
69a10e4b3d Add upper-bound for randomisation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit bd0cd82826)
 2024-03-03 14:07:08 +00:00
TheKodeToad
3b02b6b7d7 Add error when staging folder could not be created 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit df60f5cc96)
 2024-03-03 14:07:08 +00:00
TheKodeToad
82584e5d7e Delete staging on abort 
Previously instances would get "stuck" in the folder

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 9574ebe480)
 2024-03-03 14:07:08 +00:00
TheKodeToad
6c8ee3dfa9 Re-randomise key until it does not collide 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 6a9f5540d3)
 2024-03-03 14:07:08 +00:00
Trial97
e37cf125c3 Reduced temporary instance folder name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 726b0ffb3b)
 2024-03-03 14:07:08 +00:00
crpz1
0113456dea Use empty list label code for welcome screen 
Signed-off-by: crpz1 <8588315+crpz1@users.noreply.github.com>
(cherry picked from commit 9aa81cf005)
 2024-02-22 11:36:13 +00:00
Trial97
72c4a52119 Fixed curseforge neoforge export for 1.20.1 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit fdaaee64d1)
 2024-02-18 11:42:43 +00:00
Alexandru Ionut Tripon
8eba326f62 Update launcher/modplatform/flame/FlameInstanceCreationTask.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 29bf6cc68c)
 2024-02-18 11:42:43 +00:00
Trial97
69d675dc76 Fixed curseforge neoforge import for 1.20.1 versions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 830ce246e1)
 2024-02-18 11:42:43 +00:00
Echo J
6da36140eb Use absolute path to load MangoHUD library 
This should finally fix the Arch Linux Java symbol issue with MangoHUD
enabled: https://bugs.archlinux.org/task/77183

Signed-off-by: Echo J <tcg96nougat@gmail.com>
(cherry picked from commit 01180c20e1)
 2024-02-17 00:57:29 +00:00
TheKodeToad
4ebce79353 Use QTextFragment for inserting log lines 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 7cac8ad2b4)
 2024-02-13 08:16:01 +00:00
TheKodeToad
3f30e4c691 Fix formatting issues 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 8cf2a04f31)
 2024-02-13 08:14:52 +00:00
TheKodeToad
ad9dbb4a68 Fix immediate free in Exception.h 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 7f4c74ffbe)
 2024-02-13 08:14:52 +00:00
TheKodeToad
fb04b6fa85 Fix ResourceModel error display 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit ff989b4305)
 2024-02-13 08:14:52 +00:00
TheKodeToad
6badd694c5 Fix NetJob use-after-free 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit ded77e6183)
 2024-02-13 08:14:52 +00:00
TheKodeToad
25ba275230
Revert "[Backport release-8.x] Use minecraft instead of .minecraft for better accessibility" 2024-02-04 16:08:16 +00:00
furokku
2d2b082539 fixes #63 2024-02-03 23:42:19 +02:00
TheKodeToad
5e3b7d88ec Use minecraft instead of .minecraft for better accessibility 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit f54ac25614)
 2024-02-01 17:16:29 +00:00
DioEgizio
a2aede0d94 fix: remove alpha notice on modrinth packs 
with the modrinth app being released for quite a while now it's weird to still have this (tbh they've never been truly alpha)

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 8de1060bfb)
 2024-01-24 16:13:32 +00:00
BatteredBunny
187475e35f Adjusted AuthServerColumn to return authlibInjectorUrl instead of authServerUrl, make the column auto-resize 
Signed-off-by: BatteredBunny <ayes2022@protonmail.com>
 2024-01-23 22:38:41 +02:00
Trial97
bc63e1906f Fixed open path a second time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 12bf913764)
 2024-01-23 08:30:16 +00:00
BatteredBunny
5c95f10f64 Add auth server column to account list 
Signed-off-by: BatteredBunny <ayes2022@protonmail.com>
 2024-01-19 00:40:35 +02:00
Trial97
fce2163350 Fixed askIfShouldUpdate dialog on mac 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 577c737d68)
 2024-01-18 20:05:30 +00:00
Sefa Eyeoglu
5d0c83dec2
Merge pull request #1768 from Trial97/toggle_deps2 2024-01-18 18:19:17 +01:00
Sefa Eyeoglu
557fce577a
Merge pull request #1825 from Trial97/ftb_import 2024-01-18 18:19:17 +01:00
Sefa Eyeoglu
fec1a00dc8 fix: simplify openPath calls 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 67d088dc53)
 2024-01-17 14:19:03 +00:00
Sefa Eyeoglu
8dd898f895 chore: improve param name 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit e5b608447a)
 2024-01-17 14:19:03 +00:00
Sefa Eyeoglu
f8585602d9 chore: remove unused methods 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit a8220cd296)
 2024-01-17 14:19:03 +00:00
Sefa Eyeoglu
0ec3b9ce0e chore: remove maybe_unused 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 213963257c)
 2024-01-17 14:19:03 +00:00
Sefa Eyeoglu
6f5d074b4b fix: open paths directly 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 0ccdcd23e3)
 2024-01-17 14:19:03 +00:00
Alexandru Ionut Tripon
422135b2ab
Merge pull request #1771 from Trial97/account 
Try refreshing account on launch if needed
 2024-01-10 16:24:34 +02:00
Trial97
4a17799449 Fixed openAL placeholder 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 219e2862f9)
 2024-01-06 23:23:49 +00:00
tildejustin
5f4e0dfc14 remove legacy processArguments code 
Signed-off-by: tildejustin <spacepepper3.14@gmail.com>
(cherry picked from commit eca5d88576)
 2024-01-05 12:27:13 +00:00
lumiscosity
f4617d7c90 fix styling 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit c29af83dc3)
 2024-01-03 20:46:44 +00:00
lumiscosity
a00966986c move simplify call to drawing 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit 1e48bf838d)
 2024-01-03 20:46:44 +00:00
lumiscosity
42ea2ecbc8 Strip newlines in mod descriptions 
Mirrors Modrinth page behaviour.

Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit 1bf386603d)
 2024-01-03 20:46:44 +00:00
lumiscosity
568734eb8a add archived project warning 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit 358cf5b348)
 2024-01-03 20:46:44 +00:00
Trial97
bb843b86ab Fixed openURL cast for resource 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9a33bdcf50)
 2024-01-03 20:44:44 +00:00
TheKodeToad
f31bf5a1f1 Add online mode fix for legacy versions; minor refactors in legacy 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 05e4533096)
 2024-01-03 17:25:14 +00:00
TheKodeToad
6816364354 Happy new year :D 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 1130fe8510)
 2024-01-03 17:13:30 +00:00
Sefa Eyeoglu
6912782f4b fix: don't log katabasis by default 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit a1e3901b3f)
 2023-12-19 11:25:00 +00:00
lumiscosity
199312dd5a one more 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit eb8e150fa8)
 2023-12-16 16:25:35 +00:00
lumiscosity
a108a01be7 Update ModFolderPage.cpp 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit 56397446db)
 2023-12-16 16:25:35 +00:00
lumiscosity
7568e90655 Update GetModDependenciesTask.cpp 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit 8cbdecc454)
 2023-12-16 16:25:35 +00:00
theMackabu
9aa8e1d7ad clang-format: fix formatting 
Signed-off-by: theMackabu <theMackabu@gmail.com>
(cherry picked from commit 201c9783d5)
 2023-12-13 18:24:40 +00:00
theMackabu
ff146d5855 #1945 resolve issue on windows 
Signed-off-by: theMackabu <theMackabu@gmail.com>
(cherry picked from commit 836f74cd46)
 2023-12-13 18:24:40 +00:00
theMackabu
d0cb62cb62 #1945 resolve minimized windows pull from dock 
Signed-off-by: theMackabu <theMackabu@gmail.com>
(cherry picked from commit 3567369d44)
 2023-12-13 18:24:40 +00:00
timoreo
743d48744a
Merge pull request #1712 from Trial97/current_time 2023-12-11 16:14:52 +01:00
Sefa Eyeoglu
2837ae8bff
Merge pull request #1738 from Trial97/some_removals 2023-12-11 11:31:55 +01:00
Sefa Eyeoglu
3e54d4ddbb
Merge pull request #1732 from Trial97/update_file2 2023-12-11 11:25:10 +01:00
Sefa Eyeoglu
426deb4454
Merge pull request #1694 from Trial97/concurrent 2023-12-11 11:20:17 +01:00
Sefa Eyeoglu
52ccf3d93b
Merge pull request #1857 from Trial97/copy_time 2023-12-11 11:02:12 +01:00
Sefa Eyeoglu
4c59a1ba1b
Merge pull request #1882 from bit69tream/notify-user-if-tmp-is-noexec 2023-11-28 21:57:23 +01:00
Trial97
85e875fe08
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day 2023-11-23 15:32:48 +02:00
bit6tream
d414599974 (#1693) Use a better approach to detect a noexec mount option 
Signed-off-by: bit6tream <megapixel483@gmail.com>
 2023-11-23 15:23:03 +03:00
Sefa Eyeoglu
a2aa303770
Merge pull request #1843 from Trial97/fix_not_found_dep 2023-11-23 11:02:16 +01:00
Sefa Eyeoglu
a966289944
Merge pull request #1852 from Trial97/war_ning 2023-11-23 11:01:53 +01:00
Sefa Eyeoglu
7c9c3d2c5f
Merge pull request #1815 from Trial97/fix_mangohub 2023-11-23 11:00:57 +01:00
Sefa Eyeoglu
2b17a61d38
Merge pull request #1589 from Trial97/instance_reload 
Fully reload the instance list once the folder is changed
 2023-11-23 10:48:01 +01:00
Sefa Eyeoglu
d60d089cbc
Merge pull request #1751 from LocalSpook/account_type 2023-11-23 10:27:06 +01:00
Alexandru Ionut Tripon
5d6334ef95
Merge pull request #1762 from LocalSpook/const-in-declarations 
Remove top-level `const` qualifiers in function declarations
 2023-11-23 08:53:01 +00:00
Trial97
6b3b54f061
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-23 10:48:11 +02:00
Trial97
673f82e884
Merge branch 'war_ning' of github.com:Trial97/PrismLauncher into war_ning 2023-11-23 10:45:06 +02:00
Trial97
f18f7147b5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into war_ning 2023-11-23 10:44:49 +02:00
Trial97
a1ac3ef7ae
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day 2023-11-23 10:43:15 +02:00
Sefa Eyeoglu
48e9753fb5
Merge pull request #1880 from Trial97/link 2023-11-23 09:07:34 +01:00
Sefa Eyeoglu
b42434bcb6
Merge remote-tracking branch 'upstream/develop' into const-in-declarations 2023-11-23 09:06:23 +01:00
Sefa Eyeoglu
364fb9808e
Merge pull request #1347 from HyperSoop/reduce-min-memory 2023-11-23 08:58:58 +01:00
bit6tream
681e76c551 (#1693) Notify user if /tmp directory has noexec mount option 
Minecraft versions starting from 1.19 would not start at all if /tmp is mounted as `noexec`.

Signed-off-by: bit6tream <megapixel483@gmail.com>
 2023-11-22 01:48:31 +03:00
Trial97
196d24330a
Fixed open link on settings page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-21 17:47:59 +02:00
Tayou
24f2102596
Merge pull request #1869 from Trial97/icons_folder 
Added more open folder actions
 2023-11-19 15:06:30 +01:00
Trial97
a8aa214c0e
changed prism aniversary 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 09:01:59 +02:00
Trial97
e99926ea94
Added more open folder actions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 02:40:25 +02:00
fn2006
439b618f46
Merge pull request #118 from unmojang/unmojang 
Fix authlib-injector not working w/other Java agents
 2023-11-18 10:44:31 +00:00
Trial97
1a06a1424b
Added custom env vars to pre/post launch commands 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-18 10:53:38 +02:00
Evan Goode
bc709f8adc Fix authlib-injector not working w/other Java agents 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-18 00:46:15 -05:00
fn2006
02a1d436ae Fix Polly background not showing up on halloween 2023-11-17 23:12:33 +00:00
fn2006
7c139a5608 Add Evan Goode to credits 2023-11-17 23:12:33 +00:00
TheKodeToad
7ef2bda269
Improve description 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-11-17 19:49:48 +00:00
Alexandru Ionut Tripon
1150249cec
Merge pull request #1746 from Trial97/toggle_deps 
separated dependecy check from mod update
 2023-11-17 19:42:22 +00:00
fn2006
ae6f14a9a0 Fix inaccurate warnings about needing a MS Account 2023-11-17 08:40:13 +00:00
Evan Goode
8f540a5af1 Correctly save Mojang account type 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-16 12:33:03 -05:00
Evan Goode
dcc2d77ebb Fix offline accounts 
Original authlib-injector work had a bug making offline accounts not
save correctly.
 2023-11-16 01:15:17 -05:00
Evan Goode
518962c472 Replace 'Prism Launcher' with 'PollyMC' in updater 2023-11-15 23:01:22 -05:00
Evan Goode
cdb2f09bd4 Merge branch 'unmojang' into unmojang-8.0 2023-11-15 21:23:01 -05:00
Evan Goode
be8c8ad9ad Auto migrate Ely.by accounts to authlib-injector 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-15 15:23:24 -05:00
Evan Goode
9430026192 Merge tag '8.0' into unmojang-8.0 
Upstream changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/8.0

(Imcomplete) list of changes in 8.0 relevant to PollyMC:
- Prism has dropped support for Mojang accounts
  - https://github.com/PrismLauncher/PrismLauncher/pull/1656
  - Added it back to PollyMC primarily since the Mojang authentication
    code is also used for authlib-injector accounts. Some users may also
    still want to be able to log in to Mojang accounts for some reason:
    https://github.com/fn2006/PollyMC/issues/115#issuecomment-1805384658,
    even if they do not provide authentication to multiplayer servers.
  - To my surprise, I could still log in to a Mojang account, get its
    skin, and launch the game. Authentication to servers, of course, did
    not work.
  - Tested: logging into authlib-injector, Mojang, and MSA accounts and
    launching the game.
- Prism has added a built-in updater for Windows and Linux that I assume
  provides similar functionality to Sparkle on macOS:
  https://github.com/PrismLauncher/PrismLauncher/pull/1268. There is a
  Launcher_UPDATER_GITHUB_REPO variable in CMakeLists.txt that specifies
  the repo checked by the updater. I have changed this to the PollyMC
  repository, and since PollyMC follows almost the same CI/release
  patterns as Prism Launcher, it might work with PollyMC, too, but I
  have not tested it yet.
- Add macOS support to Nix
  - https://github.com/PrismLauncher/PrismLauncher/pull/1485
  - Untested
- The "PollyMC-Linux-8.0.tar.gz" and similar build artifacts were
  renamed to "PollyMC-Linux-8.0-Qt5.tar.gz" to match their
  "PollyMC-Linux-8.0-Qt6.tar.gz" counterparts.
- Removed Windows MSVC Legacy builds
- Removed Quilt Beacon toggle, the beacon is now always disabled:
  https://github.com/PrismLauncher/PrismLauncher/pull/1547,
  https://github.com/PrismLauncher/meta/pull/23
- Prism removed FTB support in 7.0, but I tested creating an FTB
  instance to make sure it still works in 8.0

Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-15 14:37:14 -05:00
Evan Goode
b1738deffb authlib-injector: Mark correct account as in use 
Fixes a bug where the wrong account could be marked as "in use" when the
game is launched if there are multiple accounts that share the same
profile ID. This can lead to the launcher trying to refresh an account
that's currently in use by the game, leading to "Invalid session" errors
in-game.

Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-15 12:11:12 -05:00
Evan Goode
79f00f6c50 authlib-injector: link to wiki page with API servers 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-15 12:11:09 -05:00
Trial97
890965746f
Added warning on mods update while running 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-15 11:07:46 +02:00
Trial97
361329d5d1
Made resource columns resizable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-14 23:21:53 +02:00
Trial97
c05c001ab2
Remove the dep if it fails for any reason 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-13 23:49:49 +02:00
Alexandru Ionut Tripon
a3445cbbdd
Merge pull request #1704 from Leafeling/develop 
Add game category to generated Linux shortcuts
 2023-11-13 07:32:33 +00:00
Trial97
0e57eeca69
Added missing variable from lambda capture 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-13 09:28:59 +02:00
Alexandru Ionut Tripon
32a8d9b9c6
Update launcher/ui/pages/instance/ModFolderPage.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-13 09:23:56 +02:00
Tayou
a991d48c76
Merge pull request #1798 from Trial97/java 
[Windows] Autodetect Java from the Microsoft Store version of the official launcher
 2023-11-12 15:39:17 +01:00
Trial97
926942a973
Fixed modrinth sort swap 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-10 20:00:35 +02:00
TheKodeToad
0f68a2dd61
Only open/close groups on left button 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-11-09 16:40:23 +00:00
Desoroxxx
6093399f5c
Update LauncherPage.ui 
Signed-off-by: Desoroxxx <desoroxxx@gmail.com>
 2023-11-08 17:32:30 +01:00
Trial97
ae62e48c7c
Moved some buttons around 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-08 12:25:56 +02:00
Trial97
a7bfe385ea
Renamed Remove Metadata button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-08 12:10:39 +02:00
Trial97
e4fecd1f97
Made sure mangoHub libs are present 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-08 11:55:38 +02:00
Alexandru Ionut Tripon
7313630615
Update launcher/java/JavaUtils.cpp 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-08 09:01:31 +02:00
Alexandru Ionut Tripon
9d653f172a
Update launcher/ui/dialogs/MSALoginDialog.cpp 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-08 08:56:48 +02:00
Trial97
4dc9e65875
Formated the suggestion 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-07 20:41:45 +02:00
Alexandru Ionut Tripon
54187a505f
Update launcher/ui/dialogs/MSALoginDialog.cpp 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-07 20:39:12 +02:00
Hazel Hofmann
1dea83580e
DCO Remediation Commit for Hazel Hofmann <hazel@theopensource.company> 
I, Hazel Hofmann <hazel@theopensource.company>, hereby add my Signed-off-by to this commit: 9ada8d906d

Signed-off-by: Hazel Hofmann <hazel@theopensource.company>
 2023-11-07 15:05:56 +01:00
Hazel Hofmann
9ada8d906d
Use same categories as main desktop entry 2023-11-07 14:54:04 +01:00
Trial97
8897f16d1d
simplify microsoft login 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-07 10:52:52 +02:00
Trial97
c78d35d699
added additional minecraft java path for windows 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-07 10:20:53 +02:00
Trial97
5d5adbd7da
add update menu conditionaly 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-07 09:48:07 +02:00
Trial97
6506e93e4a
Removed some buttons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-07 09:44:27 +02:00
Trial97
011e87b421
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-06 23:38:14 +02:00
TheKodeToad
baa988ec81
Merge pull request #1739 from Trial97/mod_icons 
fixed squished mod icons
 2023-11-06 20:49:05 +00:00
Alexandru Ionut Tripon
8eac0d34bd
Merge pull request #1796 from Trial97/dep_global_toggle 
Added Global Dependenicies toggle
 2023-11-06 20:48:51 +00:00
Alexandru Ionut Tripon
0b1dcb3ea7
Merge pull request #1760 from LocalSpook/sorting 
Localize sorting options for resource and shader packs
 2023-11-06 20:45:52 +00:00
Alexandru Ionut Tripon
3d529b0c3e
Merge pull request #1772 from Trial97/pixmap_crash 
Fix crash with mod icon caching
 2023-11-06 20:44:27 +00:00
Trial97
ca226d2ab5
Fixed comparation warning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-06 11:24:19 +02:00
Trial97
670e91cb60
Increased the step to around 10MB 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-06 11:08:18 +02:00
Trial97
cc291219f9
apply suggested changes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-06 10:51:34 +02:00
Sefa Eyeoglu
0eda2447dc
Merge pull request #1797 from Trial97/fix_mangohub 
[Linux] Fix loading MangoHud
 2023-11-06 08:14:55 +01:00