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

433 Commits

Author SHA1 Message Date
Evan Goode
48689d1b79 Merge remote-tracking branch 'upstream/release-9.x' into develop 2025-04-06 18:16:05 -05:00
Evan Goode
7050d01aab Support authlib-injector skin upload 2025-04-06 17:46:06 -05:00
Evan Goode
7c6204b5f1 Add back AuthlibInjectorMetadataStep 
Apparently this was forgotten during the 9.0 merging.
 2025-04-06 17:46:05 -05:00
Evan Goode
491cb1e5a2 Merge remote-tracking branch 'prismlauncher/release-9.x' into develop 2025-01-12 12:46:48 -06:00
Luna
41e90afbab Revert "Merge in Changes from Prism 9.2" 
This reverts commit b4b9051793.
 2025-01-11 14:19:46 -06:00
Luna
b4b9051793 Merge in Changes from Prism 9.2 2025-01-11 13:58:12 -06:00
Evan Goode
9a0f9a9f67 Fix Windows build 2024-10-26 18:30:16 -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
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
Trial97
2030041fcc
Fix tests segfault 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-19 21:42:14 +03:00
Trial97
946e791d39
sync modpack search field 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-01 08:53:27 +03:00
Trial97
0afdce8a31
Add extra step to macos java install 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-14 21:18:20 +03:00
Trial97
c85294af9d
Improve wizzard page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-13 19:33:24 +03:00
Trial97
2622d3daa9
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_mc_launch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-09 08:11:11 +03:00
Trial97
14fb54afd9
Fix launch when no java is loaded 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-08 09:10:29 +03:00
Trial97
575cdb043b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-23 08:29:43 +03:00
Trial97
92495494ca
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-23 08:16:59 +03:00
TheKodeToad
2ad34c724e
Make log colours themeable 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-08-21 22:19:50 +01:00
Trial97
23c06f23c3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion 2024-08-19 22:35:11 +03:00
Trial97
b5bbe93775 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-17 00:20:40 +03:00
Trial97
c9809fff6d
add setting for quickplay singleplayer 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-08 16:53:26 +03:00
Evan Goode
c7de09bcc6 Implement MANIFEST.MF parser 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-07-27 00:49:51 -04:00
Trial97
c07260e836
remove duplicate code from net folder 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-07 02:49:27 +03:00
Rachel Powers
a94a081b9c
add better profile logging properly resolve important dependencies 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:08 -07:00
Trial97
0b79abcdcd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:45:30 +03:00
Evan Goode
51da756e19 Merge remote-tracking branch 'prismlauncher/release-8.x' into develop 2024-06-23 11:34:11 -04:00
leia uwu
c1d0560524
perf: print api servers asynchronously on instance launch 
Doing this on the main thread can cause the launcher to freeze for up to
5 seconds when launching an instance on my system
so i moved it to a launch step where it gets all the servers info
asynchronously to print

Signed-off-by: leia uwu <leia@tutamail.com>
 2024-06-20 17:58:00 -03:00
Trial97
d0584684f2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-06-16 01:17:01 +03:00
Trial97
2ffabbdc6d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 10:00:52 +03:00
Trial97
11ae169087
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 09:34:48 +03:00
Trial97
5bd28e2cc8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-05-18 17:11:41 +03:00
Trial97
7a5348a179
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-05-18 14:14:31 +03:00
Trial97
633489884d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 13:27:31 +03:00
Alexandru Ionut Tripon
3887cfe5df
Merge pull request #1525 from Trial97/waitprofiler 
Add wait profiler
 2024-05-18 13:17:24 +03:00
Trial97
23134d4b72
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2024-05-18 11:38:18 +03:00
Trial97
09c0c11033
Add back device code flow 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-16 21:58:25 +03:00
Trial97
abedc6a23c
Improve login UI 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-15 17:25:15 +03:00
Trial97
80d8e3ee06
Remove katabasis 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-15 12:53:06 +03:00
Trial97
e285a85fe8
Removed AccountTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-14 00:21:51 +03:00
Trial97
3336f8107c
Removed AuthRequest and NetAction 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-14 00:21:45 +03:00
Alexandru Ionut Tripon
f15981d786
Merge pull request #2358 from DioEgizio/nosystem-portablewithqt 
Remove prebuilt system tarballs on Linux, bundle Qt with Linux portable
 2024-05-09 08:22:43 +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
DioEgizio
be8ac0b5bb fix: make portable builds bundle Qt 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-04-29 15:08:10 +02:00
DioEgizio
ccf0b01de7 chore!: make install_bundle work on linux, removed prebuilt tarballs 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-04-27 11:06:08 +02:00
TheKodeToad
e3f55f6865
Use proxy style to force ActivateItemOnSingleClick off 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-04-26 22:08:45 +01:00
Trial97
1a6dfd04d6
Made tar.gz parser 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-21 19:46:57 +02:00
Trial97
09c2c6793b
Improve UI 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-20 00:15:02 +02:00
Trial97
ef4e5eb3cf
fixed java build option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-18 19:15:36 +02:00
Trial97
9120848278
Made java downloader as a build option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-06 19:33:14 +02:00