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

8659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rachel Powers
7f074ca7b9 ci: libxcb-curcsor_dev ? 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit ba6743d134589294ac3ba754e6ad83c2e59d4ffd)
 2024-11-05 10:25:53 +00:00
Rachel Powers
c0394c52b7 ci: bump linux qt version 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit d63a3364111a99337c2096c807550f3d7c62b47a)
 2024-11-05 10:25:53 +00:00
Alexandru Ionut Tripon
53bc20f13f
Merge pull request #3052 from PrismLauncher/backport-3042-to-release-9.x 
[Backport release-9.x] use isPortable to determine if the MSAStep should check for url handler
 2024-11-03 11:56:20 +02:00
Trial97
40af3cf3d2 use isPortable to determine if the MSAStep should check for url handler 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 99cfb6237030f03c148e531da78b8da8f7d4c2f1)
 2024-11-03 09:56:08 +00:00
Alexandru Ionut Tripon
3977918c5b
Merge pull request #3051 from PrismLauncher/backport-3045-to-release-9.x 
[Backport release-9.x] disable retry for modrinth currentVersions API
 2024-11-03 11:56:07 +02:00
Trial97
484d90899f disable retry for modrinth currentVersions API 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 6f2f3c2d3bf6a170060523ad47fe69fef57bd9b4)
 2024-11-03 09:55:50 +00:00
Tayou
0f5eb03839
Merge pull request #3034 from PrismLauncher/backport-3010-to-release-9.x 2024-10-30 21:57:18 +01:00
Trial97
d21cda1880 lock m_instanceExtras 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 11d4d948aa1a1ba67cee59193eb98a7fdad2d909)
 2024-10-30 20:56:30 +00:00
Alexandru Ionut Tripon
52a321b93b
Merge pull request #3033 from PrismLauncher/backport-3030-to-release-9.x 
[Backport release-9.x] Fix system detection for Intel Macs
 2024-10-30 21:21:49 +02:00
Trial97
dd8dec8be8 fix macos system detection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 14c95b9d376975144faddc33e7154cca86621804)
 2024-10-30 19:16:53 +00:00
Tayou
23d6f8aaed
Merge pull request #3028 from PrismLauncher/backport-3027-to-release-9.x 2024-10-29 23:15:22 +01:00
Ben Westover
d105d76f2a Fix some typos 
Signed-off-by: Ben Westover <me@benthetechguy.net>
(cherry picked from commit f6511c601e1fd63a864f1681beef0f85adfe6f7e)
 2024-10-29 22:06:15 +00:00
Ben Westover
698a838b56 Shorten metainfo.xml app summary 
Signed-off-by: Ben Westover <me@benthetechguy.net>
(cherry picked from commit fd109c47401c755e35da9c2884e9b38532bed56c)
 2024-10-29 22:06:15 +00:00
Alexandru Ionut Tripon
1129b4160c
Merge pull request #3022 from PrismLauncher/backport-2989-to-release-9.x 
[Backport release-9.x] add extra protection against empty download link
 2024-10-28 23:00:19 +02:00
Trial97
63a6f823fd add qassert 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 94f65f8727bfd12cc50eb8b62d52bca308cef9b5)
 2024-10-28 20:59:25 +00:00
Trial97
db32b2ad99 remove message box 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9cdda4377b0090a035e286a86fd78f126f995356)
 2024-10-28 20:59:25 +00:00
Trial97
c3cf5d31da replace currentData with itemData on QComboBox::currentIndexChanged slots 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 0cafac84ac6328fefb8992de2c6a2385b1c0053c)
 2024-10-28 20:59:25 +00:00
Trial97
1e696328bb fix #3001 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit b593ff09e9c4b5fa30ca082eea4cd69f12a286e5)
 2024-10-28 20:59:25 +00:00
Trial97
1d9c97803a rename snake_case to camelCase 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 44894a29b1784cfa8a04807c17d21169230ff922)
 2024-10-28 20:59:25 +00:00
Trial97
3d55236fdf add extra protection against empty download link 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 8daa1219a508ddb37070c01046c78b731a277887)
 2024-10-28 20:59:25 +00:00
Alexandru Ionut Tripon
42190819ae
Merge pull request #3020 from PrismLauncher/backport-2837-to-release-9.x 
[Backport release-9.x] translate standard buttons
 2024-10-28 22:36:29 +02:00
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
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
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
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