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

3236 Commits

Author SHA1 Message Date
Trial97
28378c77aa Fix image width in project description 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c902da4461)
 2024-05-09 05:15:48 +00:00
Alexandru Ionut Tripon
cf87aed7ff
Merge pull request #2360 from PrismLauncher/backport-2348-to-release-8.x 
[Backport release-8.x] Use proxy style to force ActivateItemOnSingleClick off
 2024-04-30 10:24:52 +03:00
TheKodeToad
257297d966 Use proxy style to force ActivateItemOnSingleClick off 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit e3f55f6865)
 2024-04-30 05:56:01 +00:00
ColonelGerdauf
ea0c74b302 Change of parameters 
To help deal with adjustments

Signed-off-by: ColonelGerdauf <ColonelGerdauf@users.noreply.github.com>
(cherry picked from commit a877f9146d)
 2024-04-30 05:53:48 +00:00
ColonelGerdauf
c02257024e Renaming and removing redundancies 
old's do not make sense here

Signed-off-by: ColonelGerdauf <ColonelGerdauf@users.noreply.github.com>
(cherry picked from commit f91f97e56d)
 2024-04-30 05:53:48 +00:00
Trial97
119ee7a5b4 Fixed curseforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a5b059ebad)
 2024-04-29 16:30:17 +00:00
Trial97
c74099ec7b Fixed windows bundled java path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 5ae98f4f90)
 2024-04-24 15:46:21 +00:00
Trial97
f06bd54d6f Removed duplicate local 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 10d1720da5)
 2024-04-23 16:19:50 +00:00
Trial97
0b535e44e1 Changed env variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 73c3794c1b)
 2024-04-23 16:19:50 +00:00
Trial97
877de6da40 Fixed windows appdata path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit dac7027846)
 2024-04-23 16:19:50 +00:00
Trial97
c330452e84 Fix bundled java detection on mac 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit dbfd535b38)
 2024-04-23 16:19:50 +00:00
William Gray
47bd02637a Update JavaUtils.cpp 
Signed-off-by: William Gray <ruwagray@gmail.com>
(cherry picked from commit 9f4654ede9)
 2024-04-21 17:45:15 +00:00
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
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
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
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
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