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

9223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
00b83efb9a
fix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 20:12:40 +03:00
Evan Goode
c3bdc0f79b
Merge pull request #15 from unmojang/evan-goode/disable-updater 
Disable updater, news
 2024-06-24 00:10:14 -04:00
Evan Goode
b8f9d18e26 Remove news toolbar 2024-06-23 23:51:52 -04:00
Evan Goode
1b98be00f6 Disable updater, users should use package managers 2024-06-23 23:51:46 -04:00
Evan Goode
9a5edf7d41 We have a client ID, Fjord is usable 2024-06-23 23:46:11 -04:00
Evan Goode
bf997aa117
Merge pull request #14 from unmojang/evan-goode/msa 
Use Nintendo Switch client ID
 2024-06-23 23:16:59 -04:00
Evan Goode
5e9b3c2baa
Merge pull request #13 from unmojang/evan-goode/curseforge 
Fetch CurseForge API key from official files
 2024-06-23 22:58:01 -04:00
Evan Goode
62f87c423f Use Nintendo Switch client ID 
Reputable projects such as prismarine-auth and azalea-auth hardcode the
Nintendo Switch client ID instead of their own custom Azure application,
so we should be fine to go ahead and do the same.

Unfortunately, client IDs created for custom Azure applications, such as
Prism Launcher's client ID, will no longer work with Fjord Launcher, so
users who manually supplied a client ID will need to clear theirs.
 2024-06-23 22:57:31 -04:00
Evan Goode
810ab868b3 Fetch CurseForge API key from official files 
Instead of fetching the CurseForge API key from PolyMC's server, fetch
it from the files of the CurseForge app, mirrored by archive.org. We can
do this without downloading the entire 100MiB+ application by
range-requesting the specific DEFLATE block where the key is and
decompressing just that block.
 2024-06-23 22:35:06 -04:00
Trial97
e57c2180da
Resolve issue with multiple loaders during update 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 03:06:10 +03:00
Trial97
bb48d1ec9d
made sure that the retry dialog is not displayed offline 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 00:29:21 +03:00
Trial97
c04031ff00
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 2024-06-23 23:40:12 +03:00
Evan Goode
51da756e19 Merge remote-tracking branch 'prismlauncher/release-8.x' into develop 2024-06-23 11:34:11 -04:00
Alexandru Ionut Tripon
98d68bafeb
Merge pull request #2481 from DioEgizio/qt671 
chore: update Qt to 6.7.1
 2024-06-23 08:41:02 +03:00
seth
92b9f1a3e3
Merge pull request #2515 from Trial97/size_for_skin 
force aspect ratio for skin preview
 2024-06-22 19:21:59 -04:00
seth
e0063b1ee7
Merge pull request #2429 from Richard-Rogalski/GENTOOweloveyou 
[Linux] Auto-detect Gentoo installed JDKs
 2024-06-22 19:14:46 -04:00
seth
d8b47f5c8a
Merge pull request #2466 from PrismLauncher/renovate/determinatesystems-update-flake-lock-22.x 
chore(deps): update determinatesystems/update-flake-lock action to v22
 2024-06-22 19:11:20 -04:00
Alexandru Ionut Tripon
369d7d83f5
Merge pull request #2542 from leia-uwu/perf/async-print-servers 
perf: print api servers asynchronously on instance launch
 2024-06-23 01:51:53 +03:00
Alexandru Ionut Tripon
5f1d86d91a
Merge pull request #2553 from TayouVR/tr-file-types-in-dialogs 
don't translate file types on file save/open, etc. dialogs
 2024-06-23 01:51:27 +03:00
Trial97
2ac89c2378
add more states for account refresh fail 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-23 01:49:37 +03:00
Trial97
b0386a4c2f
added better error handling 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-23 00:47:48 +03:00
Trial97
24aa337a64
fixed offline accounts 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-23 00:27:49 +03:00
Trial97
27ee8374e7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-22 22:54:38 +03:00
Tayou
178bd4a9c3 don't tr() file types on file save/open, etc. dialogs 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-22 17:28:59 +02: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
Alexandru Ionut Tripon
8014283bf4
Merge pull request #2536 from Trial97/refactor_hash 
Refactor hash task
 2024-06-18 22:55:32 +03:00
Trial97
888b22b4c7
rename variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-18 22:36:39 +03:00
Sefa Eyeoglu
8607dd46b5
Merge pull request #2361 from Scrumplex/fix/nix/drop-qt5 2024-06-18 21:32:31 +02:00
Trial97
97147f2d24
fix(nix): drop unsupported Qt 5 package 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-18 22:31:41 +03:00
Alexandru Ionut Tripon
a58f7bf240
Merge pull request #2537 from PrismLauncher/backport-2534-to-release-8.x 
[Backport release-8.x] fix: update datapack and resourcepack versions
 2024-06-18 21:07:06 +03:00
DioEgizio
81ea7cef5a fix: add more datapack formats and clang-format it 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit a63842c727)
 2024-06-18 18:06:49 +00:00
DioEgizio
0df7a8dd3c chore: clang-format ResourcePack.cpp 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit c07e791d7f)
 2024-06-18 18:06:49 +00:00
DioEgizio
c254a8961c fix: update datapack and resourcepack versions 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 6af52c97c2)
 2024-06-18 18:06:49 +00:00
Alexandru Ionut Tripon
5f3d3c3294
Merge pull request #2534 from DioEgizio/dataresourceupdate 
fix: update datapack and resourcepack versions
 2024-06-18 21:06:31 +03:00
DioEgizio
a63842c727 fix: add more datapack formats and clang-format it 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-06-18 18:05:34 +02:00
Trial97
ac8c7baff2
fix tipo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-18 17:49:07 +03:00
Trial97
9cbdbddb08
made hasing task async 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-18 17:27:17 +03:00
Trial97
766ddc80e3
refactored hassing task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-18 16:51:26 +03:00
Alexandru Ionut Tripon
2cd69664ab
Merge pull request #2535 from PrismLauncher/backport-2531-to-release-8.x 
[Backport release-8.x] relax fat FS filename restrictions
 2024-06-18 12:52:00 +03:00
Trial97
0ea9190d25 relax fat FS filename restrictions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a587de8553)
 2024-06-18 09:51:34 +00:00
Alexandru Ionut Tripon
3f68b68691
Merge pull request #2531 from Trial97/relax_fat 
relax fat FS filename restrictions
 2024-06-18 12:51:22 +03:00
DioEgizio
c07e791d7f chore: clang-format ResourcePack.cpp 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-06-18 10:17:48 +02:00
Alexandru Ionut Tripon
35e195b397
Merge pull request #2533 from Cartrigger/patch-1 
Spelling mistake for Minecraft
 2024-06-18 10:59:39 +03:00
DioEgizio
6af52c97c2 fix: update datapack and resourcepack versions 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-06-18 09:47:07 +02:00
Cart
c9827f8085
Spelling mistake 
in m_column_names and translated it is Miecraft and not Minecraft

Signed-off-by: Cart <81428538+Cartrigger@users.noreply.github.com>
 2024-06-17 23:12:07 -04:00
Trial97
a587de8553
relax fat FS filename restrictions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-17 13:35:23 +03:00
Trial97
2fb3e12492
fix auto java install 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 17:54:13 +03:00
Trial97
8d3e6667cd
fix java download tasks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 15:09:49 +03:00
Trial97
94fd02a34f
fix java download button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 14:26:19 +03:00
Alexandru Ionut Tripon
fdd302bc11
Merge pull request #2521 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-06-16 09:00:16 +03:00