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

9236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
aab82705cd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mac_java 2024-09-16 20:05:18 +03:00
Alexandru Ionut Tripon
914ae6ead6
Use macOS 14 in CI (#2826) 
* chore: fix mac CI build

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

* try what the error says

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

* set -DCMAKE_OSX_ARCHITECTURES=x86_64

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

---------

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 13:00:38 -04:00
Trial97
e53a5b3eca
replace TRANSLATIONS_BASE_URL with TRANSLATION_FILES_URL 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 17:51:35 +03:00
Alexandru Ionut Tripon
2e537e55de
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-09-16 17:47:58 +03:00
seth
7eac06cad9
Merge pull request #2829 from Trial97/ask_retry2 
disable retry for translation files
 2024-09-16 10:15:21 -04:00
Alexandru Ionut Tripon
8d14060ad1
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-09-16 16:46:01 +03:00
seth
8faebe320e
Merge pull request #2807 from Trial97/fix_server_launch 
fix server launch
 2024-09-16 09:42:54 -04:00
Trial97
580fc32518
split the auth loading screen 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 16:41:16 +03:00
Alexandru Ionut Tripon
db3c7d01fd
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-09-16 16:36:05 +03:00
seth
160d2962e6
Merge pull request #2827 from Trial97/prefix_option 
add Launcher_ prefix to enable java option
 2024-09-16 09:30:54 -04:00
Trial97
75756b49c3
reshow login dialog in case account login fails 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 16:15:36 +03:00
Trial97
81f30f0360
disable retry for translation files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 15:53:54 +03:00
Trial97
ca6b62c773
move some URLs in cmake 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 15:51:51 +03:00
Trial97
2c2defb266
add Launcher_ prefix to enable java option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 14:30:23 +03:00
Trial97
d2f0d1d8d5
Wrap FS::write in try catch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 12:42:09 +03:00
Trial97
d38e7fa142
Add more null protection for skin management 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 12:41:33 +03:00
Alexandru Ionut Tripon
bee59c904a
Merge pull request #2773 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-09-15 08:49:07 +03:00
github-actions[bot]
8932a42644 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c374d94f1536013ca8e92341b540eba4c22f9c62?narHash=sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh%2BaRKoCdaAv5fiO0%3D' (2024-08-21)
  → 'github:NixOS/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f?narHash=sha256-IiA3jfbR7K/B5%2B9byVi9BZGWTD4VSbWe8VLpp9B/iYk%3D' (2024-09-11)
 2024-09-15 00:24:43 +00:00
Alexandru Ionut Tripon
71dda06276
Merge pull request #5 from QazCetelic/java_dir_disable_alt 
Disable folder action instead of hiding it and add additional informa…
 2024-09-14 23:27:57 +03:00
QazCetelic
1c6bd74ed8 Disable folder action instead of hiding it and add additional information in the tooltip. 
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com>
 2024-09-14 22:04:18 +02: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
Alexandru Ionut Tripon
6492ad7076
Merge pull request #2813 from Trial97/fix_java_autodetect 
fix java autodetect when instance settings are open
 2024-09-14 20:19:15 +03:00
Alexandru Ionut Tripon
ad786fb983
Merge pull request #2811 from Trial97/fix_java_abort 
fix download java abort being stuck
 2024-09-14 20:19:02 +03:00
Alexandru Ionut Tripon
281621cfc0
Merge pull request #2808 from Trial97/fix_java_download_crash 
fix java crash on refresh
 2024-09-14 20:18:51 +03:00
Trial97
312009513d
add open java folder action 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-14 19:35:43 +03:00
ZhiYi
5d803ccc86 MultiProfile Login issue workaround for now 
Signed-off-by: ZhiYi <RobertBernard.c01@gmail.com>
 2024-09-14 17:48:37 +08:00
ZhiYi
2113df5d8d MultiProfile Login issue workaround for now 2024-09-14 17:44:20 +08:00
Trial97
5073fc19d4
fix java autodetect when instance settings are open 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-14 00:36:31 +03:00
Alexandru Ionut Tripon
e59f90eca8
Update launcher/ui/pages/global/APIPage.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-09-14 00:19:48 +03:00
Trial97
22ebf7e961
fix download java abort being stuck 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-14 00:13:16 +03:00
Trial97
6706317f20
fix java crash on refresh 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-13 23:26:04 +03:00
Trial97
e18e9b0509
fix server launch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-13 22:57:08 +03:00
timoreo
f46b73acb5
Merge pull request #2789 from Trial97/fix_concurrent_task 
Remove all the slowdown code from CocurrentTask
 2024-09-13 21:10:30 +02:00
Trial97
40b10ecf30
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_concurrent_task 2024-09-13 21:38:29 +03:00
Trial97
1db122f1a2
fix typo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-13 21:37:50 +03:00
Trial97
e34ebc1a0d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 2024-09-13 21:14:48 +03:00
Alexandru Ionut Tripon
d20f24d96f
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-09-13 21:13:21 +03:00
seth
ef76894587
Merge pull request #2799 from PrismLauncher/renovate/determinatesystems-update-flake-lock-24.x 
chore(deps): update determinatesystems/update-flake-lock action to v24
 2024-09-13 14:03:42 -04:00
Alexandru Ionut Tripon
f1ef243617
Merge pull request #2803 from Trial97/java_setup 
Improve wizzard page
 2024-09-13 21:01:02 +03:00
Trial97
973b43ca7a
Add techinc client ID 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-13 20:01:45 +03:00
Trial97
c85294af9d
Improve wizzard page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-13 19:33:24 +03:00
Alexandru Ionut Tripon
fa68428a90
Merge pull request #2795 from Trial97/fix_mc_launch 
Fix launch when no java is loaded
 2024-09-10 18:57:09 +03:00
Alexandru Ionut Tripon
b17a688237
Merge pull request #2771 from Kurumi78/develop 
Add webp to validIconExtensions
 2024-09-10 12:27:02 +03:00
TheKodeToad
e3f78e0205
Merge pull request #2798 from QazCetelic/chronological-screenshot-list 
Sort screenshots chronologically in descending order
 2024-09-10 09:38:11 +01:00
renovate[bot]
7e49fa0426
chore(deps): update determinatesystems/update-flake-lock action to v24 2024-09-09 19:05:56 +00:00
QazCetelic
e2ef280da9 DCO Remediation Commit for QazCetelic <qaz.cetelic@protonmail.com> 
I, QazCetelic <qaz.cetelic@protonmail.com>, hereby add my Signed-off-by to this commit: 7fbf0d3bf3

Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com>
 2024-09-09 16:24:40 +02:00
QazCetelic
7fbf0d3bf3 Sort files chronologically in descending order 
Signed-off-by: Qaz <dev@malplena.net>
 2024-09-09 15:40:31 +02: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
TheKodeToad
01015a7345
Merge pull request #2547 from Ryex/fix/component-version-resolusion 
Component version resolusion on Minecraft version change
 2024-09-08 23:44:07 +01:00
Evan Goode
99cc76c95a
Merge pull request #30 from i-can-not-program/develop 
fix(nix): make java paths work again
 2024-09-08 09:31:44 -04:00