ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
9,303 Commits 4 Branches 5 Tags 40 MiB
84e9606e4f
Commit Graph

9303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
130714a9ab translate standard buttons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit bd82737efbb99dfc488d6d073046e5fe62693a9e)
 2024-10-28 20:34:51 +00:00
Tayou
bf57d77075
Merge pull request #3017 from PrismLauncher/backport-3002-to-release-9.x 2024-10-28 14:24:25 +01:00
Trial97
98fe035442 replace unzipping with unpacking 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9eb1ce3ad7dde0b2ca551b0b281081724e6fd58e)
 2024-10-28 13:23:42 +00:00
Trial97
8e4994590b fix unzipping typo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 685d3c79ac78d7e41ab257de82dc743020189a33)
 2024-10-28 13:23:42 +00:00
Tayou
0722dba820
Merge pull request #3016 from PrismLauncher/backport-3009-to-release-9.x 2024-10-28 14:04:52 +01:00
Trial97
9560447c92 swap search with filter button for modpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 61448a61ea400eebd91f97aa07e9419cc2f35823)
 2024-10-28 13:04:39 +00:00
Alexandru Ionut Tripon
4d89512ca1
Merge pull request #3013 from PrismLauncher/backport-3008-to-release-9.x 
[Backport release-9.x] change contributors name
 2024-10-27 22:30:02 +02:00
Trial97
42a6bd1151 change ZekeZ name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c4cd7cf6c173b7052f31614b4641d2172defa91a)
 2024-10-27 19:31:56 +00:00
Trial97
f06505b138 change contributors name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f373a5cea0e816158cdabca3423107989aed0a85)
 2024-10-27 19:31:56 +00:00
Evan Goode
5c8bdf99cd Gray out "Manage Skins" button for authlib-injector accounts 
Support for this is blocked by
https://github.com/unmojang/FjordLauncher/issues/37, which we can get to
after the 9.0 release.
 2024-10-27 13:19:38 -04:00
Evan Goode
fab399c094 Remove extra code comment 2024-10-26 19:36:26 -04:00
Evan Goode
e177117a8f Fix FTB import goof 2024-10-26 19:08:36 -04:00
Evan Goode
9a0f9a9f67 Fix Windows build 2024-10-26 18:30:16 -04:00
Evan Goode
95af313f49 Merge tag '9.1' into evan-goode/merge-9.0 2024-10-26 17:54:34 -04:00
Evan Goode
da9c085a06 Clean up some lingering differences from upstream 2024-10-26 17:52:25 -04:00
Evan Goode
b496316241 Change a few occurrences of "prism" to "fjord" 2024-10-26 16:45:14 -04:00
Evan Goode
c15afbda4a Fix build? 2024-10-26 16:12:01 -04:00
Evan Goode
7f52d57454 Fix MSA login 2024-10-26 14:56:55 -04:00
Evan Goode
d40b6d8eb3 Error handling for Yggdrasil accounts 2024-10-26 13:40:09 -04:00
Evan Goode
c32aaf244d It compiles, Yggdrasil login working except error handling 2024-10-26 00:17:24 -04:00
seth
d854087089
Merge pull request #2997 from PrismLauncher/backport-2992-to-release-9.x 
[Backport release-9.x] Sync Flake with Nixpkgs
 2024-10-25 21:20:31 -04:00
seth
31031ec923 chore(nix): use self for version 
Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit 63b10738b2a1065d55077e729fcada6e7f64d10a)
 2024-10-26 00:57:00 +00:00
seth
5f06517b62 chore(nix): sync with nixpkgs 
Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit a5c554cf6ee32afa41c5a2af1ea8e8feb0087a49)
 2024-10-26 00:57:00 +00:00
Evan Goode
7dbaa896a6 Merge tag '9.0' into develop 
This is an intermediate/halfway commit, more refactoring is needed to
get this to build.
 2024-10-25 15:34:57 -04:00
Tayou
dde5fc47d3
Merge pull request #2987 from Trial97/bump_9.2 2024-10-25 09:53:49 +02:00
Alexandru Ionut Tripon
76d5f632dc
Merge pull request #2993 from PrismLauncher/backport-2982-to-release-9.x 
[Backport release-9.x] Use Launcher log level in AutoInstallJava
 2024-10-25 09:46:30 +03:00
TheKodeToad
27c6596bcb Use Launcher log level in AutoInstallJava 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit d8702e1357d36423a0d40b916d49fd937284a204)
 2024-10-25 06:42:32 +00:00
Alexandru Ionut Tripon
e2f5fb27a6
Merge pull request #2991 from PrismLauncher/backport-2963-to-release-9.x 
[Backport release-9.x] chore(deps): update actions/cache action to v4.1.2
 2024-10-25 09:33:52 +03:00
renovate[bot]
98819a0d02 chore(deps): update actions/cache action to v4.1.2 
(cherry picked from commit 210d0d8aa25578cbbf8250797504ae1652544600)
 2024-10-25 06:30:00 +00:00
seth
2dde2c4bec
Merge pull request #2990 from PrismLauncher/backport-2980-to-release-9.x 
[Backport release-9.x] Sync with Flathub manifest
 2024-10-25 02:20:10 -04:00
Arcitec
008d69e5e5 fix: bring back Flathub manifest improvements to the repo 
- Brings back all manifest improvements, such as the incredibly important Mojang Java Downloader (without it, the Flatpak doesn't work), and important fixes for Wayland.

Signed-off-by: Arcitec <38923130+Arcitec@users.noreply.github.com>
(cherry picked from commit 4ce025c0a209a4eec20f7f1b9a7777bbe886be8c)
 2024-10-25 06:19:25 +00:00
Trial97
a839258c07
bump develop to 9.2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-25 00:19:06 +03:00
TheKodeToad
07addf2449
Bump version to 9.1 2024-10-24 13:32:23 +01:00
TheKodeToad
eea119d9c9
Merge remote-tracking branch 'TheKodeToad/vc-redist-norestart' into 9.1-hotfix 2024-10-24 13:31:21 +01:00
Alexandru Ionut Tripon
89041531e1
Merge pull request #2981 from PrismLauncher/backport-2975-to-release-9.x 
[Backport release-9.x] fix: don't hang the ui for a full version load
 2024-10-24 15:09:19 +03:00
Rachel Powers
729cec5f45 fix don't hang the ui for a full version load 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit 7bd04ae928527b065174021fba98dc78d0d119a3)
 2024-10-24 10:24:53 +00:00
TheKodeToad
80d675d2e6
Merge pull request #2974 from PrismLauncher/backport-2972-to-release-9.x 
[Backport release-9.x] Fix launching Minecraft in portable Linux
 2024-10-23 22:39:58 +01:00
TheKodeToad
fb7d19941f Fix CleanEnviroment()'s usage of stripVariableEntries 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit e7cd8fe078e3a68bd3179816020a9ed08f1b2847)
 2024-10-23 21:30:57 +00:00
Alexandru Ionut Tripon
877ab62c2f
Merge pull request #2964 from PrismLauncher/backport-2958-to-release-9.x 
[Backport release-9.x] skip parsing open QSaveFile temprary files as resources
 2024-10-22 17:41:45 +03:00
Trial97
b983ae0fb0 fix small leak 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 836aebc0d91fe8658052b8c4a5a4ab31da4a4b15)
 2024-10-22 14:41:34 +00:00
Trial97
85422427b9 Replaced QSet with QHash 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 73d33f93b30f658f9671358ac52bf4e03afeaefd)
 2024-10-22 14:41:34 +00:00
Trial97
51a71d0471 skip QSaveFile temprary files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 562c3013269dbb9cad411f58ded333dee1aea158)
 2024-10-22 14:41:34 +00:00
Alexandru Ionut Tripon
25eaa4eba6
Merge pull request #2959 from PrismLauncher/backport-2954-to-release-9.x 
[Backport release-9.x] do not try to import skin if path is empty
 2024-10-22 00:15:10 +03:00
Alexandru Ionut Tripon
6da14d66bb Update launcher/ui/dialogs/skins/SkinManageDialog.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 69028969f1a6c42b698b900256ad2e6d9ee208eb)
 2024-10-21 21:14:30 +00:00
Trial97
199c5497d3 do not try to import skin if path is empty 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9a5b773e69e7198cc37413ab7d69ba6d0a66f854)
 2024-10-21 21:14:30 +00:00
Alexandru Ionut Tripon
740db2db02
Merge pull request #2956 from PrismLauncher/backport-2953-to-release-9.x 
[Backport release-9.x] Fix removing portable.txt on Linux portable build
 2024-10-21 22:46:49 +03:00
TheKodeToad
577f8074e1 Fix removing portable.txt on Linux portable build 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit f3f4c446206647b69b9c19e63617b163b99c6164)
 2024-10-21 19:45:10 +00:00
Alexandru Ionut Tripon
c5e7bb90c5
Merge pull request #2952 from PrismLauncher/backport-2947-to-release-9.x 
[Backport release-9.x] do not require java if auto-download is enabled
 2024-10-21 18:04:53 +03:00
Trial97
1cf91fa5d9 do not require java if auto-download is enabled 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit fcadbbb739076096a9057ec340f7f6d39bc4b72f)
 2024-10-21 15:02:54 +00:00
Tayou
3bf4fbf8f4
Merge pull request #2951 from PrismLauncher/backport-2948-to-release-9.x 2024-10-21 16:55:28 +02:00