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

9213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
515baffb8e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 2024-06-28 20:48:28 +03:00
Trial97
4ad19cded5
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:45:54 +03: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
Trial97
90e756c041
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into coremods 2024-06-28 20:41:48 +03:00
Trial97
ddf1ea014c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 2024-06-28 20:39:37 +03:00
Alexandru Ionut Tripon
4aa2e5b85d
Merge pull request #2571 from Trial97/account_refresh 
refresh account if it should refresh on instance launch
 2024-06-28 20:38:05 +03:00
Trial97
55f740453c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 2024-06-28 20:34:59 +03:00
Trial97
72dd3dfba5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:30:05 +03:00
Trial97
1021222c95
create mod meta information when importing modrinth pack 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:28:52 +03:00
Alexandru Ionut Tripon
2cd0223cff
Merge pull request #2578 from Trial97/clang-format 
chore:increment clang-tools version
 2024-06-28 19:33:18 +03:00
Trial97
09d258670a
create mod meta information when importing curseforge pack 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 19:26:11 +03:00
Evan Goode
6bf88b7bfc Don't use archive.org for CurseForge launcher 2024-06-28 12:16:13 -04:00
Trial97
2c02d02214
do not display message that no update is avvailable if the check was done in the background 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 14:11:27 +03:00
Trial97
bac678a7fc
format files outside launcher 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 12:54:37 +03:00
Trial97
147741e616
increment clang-tools version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 12:48:52 +03:00
seth
66e6fc04d3
Merge pull request #2520 from Trial97/metadata 2024-06-28 04:57:39 +00:00
Trial97
9d7c36c2fc
made identty certain if the login ended 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-27 15:35:44 +03:00
Alexandru Ionut Tripon
5928bc30e1
Merge pull request #2572 from Trial97/sdkman_macos 
fix sdkman on macos
 2024-06-27 13:20:10 +03:00
Alexandru Ionut Tripon
68292aff6c
Merge pull request #2574 from ajerick/develop 
fix non-persistent user icon selection in NewInstanceDialog.cpp
 2024-06-27 08:38:46 +03:00
seth
3f3351f89e
Merge pull request #1892 from Trial97/change_version 
Added mod reinstall dialog
 2024-06-27 02:12:00 +00:00
Aiden J Erickson
37388e1d48
fix non-persistent user icon selection in NewInstanceDialog.cpp 
Signed-off-by: Aiden J Erickson <aiden.j.erickson@gmail.com>
 2024-06-26 20:54:04 -04:00
Trial97
3b473b24d8
fix sdkman on macos 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-26 10:16:27 +03:00
Trial97
b1a86bec34
refresh account if it should refresh on instance launch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-26 09:51:12 +03:00
Alexandru Ionut Tripon
3aaa36a2bc
Merge pull request #2566 from Trial97/mod_warning 
add warnning when user closes the resource download dialog with selec…
 2024-06-26 08:17:16 +03:00
Alexandru Ionut Tripon
8e2bb21e23
Merge pull request #2570 from porterporter/patch-1 
add ~/Library/Java/JavaVirtualMachines/* to java installation detection
 2024-06-26 08:16:37 +03:00
porter milton
2958691857
add ~/Library/Java/JavaVirtualMachines/* to java installation detection 
Signed-off-by: porter milton <57007161+porterporter@users.noreply.github.com>
 2024-06-25 23:16:26 +00:00
Evan Goode
f4b7872823 Add Gentoo installation instructions 2024-06-25 18:21:12 -04:00
Evan Goode
d1b018e8d8 Fetch CurseForge API key from Linux app, not macOS 2024-06-25 13:05:35 -04:00
Trial97
7c38edc93d
Apply suggestion from code review 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-25 16:10:05 +03:00
Alexandru Ionut Tripon
555c4a7c59
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-06-25 15:33:11 +03:00
Alexandru Ionut Tripon
4e9e7212a6
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-06-25 15:22:30 +03:00
Alexandru Ionut Tripon
52839774e6
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-06-25 15:19:23 +03:00
Alexandru Ionut Tripon
1a66db78a9
Apply text change suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-06-25 15:17:51 +03:00
Rachel Powers
14b09549e1
feat(instanceList) persist "ungrouped" hidden state 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-25 01:55:54 -07:00
Trial97
2f88da9de2
add warnning when user closes the resource download dialog with selection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-25 09:50:33 +03:00
Alexandru Ionut Tripon
12db1efd20
Merge pull request #2561 from Trial97/fix_curseforge_logo 
fix missing curseforge logo
 2024-06-25 00:01:03 +03:00
Tayou
6b1c16b01a
Merge pull request #2562 from Trial97/fix_update_message 
fix update message
 2024-06-24 22:17:48 +02:00
Alexandru Ionut Tripon
1fcad8d427
Merge pull request #1886 from Trial97/time4 
Fixed playtime recording
 2024-06-24 23:07:41 +03:00
Trial97
096266c141
fix update message 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 21:31:26 +03:00
Trial97
73db320bff
fix missing curseforge logo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 21:13:21 +03:00
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