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

8384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sefa Eyeoglu
bff8d7220d
Merge pull request #2150 from DioEgizio/fix-ghactions-macos 2024-02-22 11:02:09 +01:00
DioEgizio
4421746c0e fix: fix sparkle signing 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-22 10:00:21 +01:00
DioEgizio
01c4e6a65c
Merge pull request #2137 from DioEgizio/zink 2024-02-21 17:42:11 +01:00
crpz1
9aa81cf005 Use empty list label code for welcome screen 
Signed-off-by: crpz1 <8588315+crpz1@users.noreply.github.com>
 2024-02-20 00:21:37 +11:00
Trial97
1c96ae5807
Fixed java refresh button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-18 22:32:54 +02:00
Trial97
889f604a41
Removed JavaExtraSearchPaths 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-18 21:38:31 +02:00
Trial97
a288779790
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-02-18 16:49:35 +02:00
Trial97
038d3e4596
Fixed asan complains 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-18 16:49:10 +02:00
DioEgizio
44327980db feat: add "use zink" button 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-18 13:30:55 +01:00
Trial97
b4f3a969b3
Updated strings that are displayed to user 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-18 14:30:38 +02:00
DioEgizio
99cbb5d0b2
Merge pull request #2110 from Trial97/fix_curseforge 2024-02-18 12:42:09 +01:00
DioEgizio
dbdd96edc3
Merge pull request #2130 from DioEgizio/updates 2024-02-18 12:41:49 +01:00
Trial97
4aafa98852
Improved the message boxes for java wizzard 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-18 12:58:34 +02:00
Trial97
2f489d1aec
Added auto java options to the java wizzard page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-18 11:34:54 +02:00
Sefa Eyeoglu
976f5f10cf
Merge pull request #2132 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-02-18 09:38:24 +01:00
Trial97
4c76f7afe0
Made auto java checkbox dependent 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-18 09:46:44 +02:00
Trial97
a7dad96a70
Added refresh button on managed java list 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-18 09:32:31 +02:00
github-actions[bot]
54bfbe562e chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/442d407992384ed9c0e6d352de75b69079904e4e' (2024-02-09)
  → 'github:nixos/nixpkgs/6e2f00c83911461438301db0dba5281197fe4b3a' (2024-02-17)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/0db2e67ee49910adfa13010e7f012149660af7f0' (2024-02-07)
  → 'github:cachix/pre-commit-hooks.nix/5df5a70ad7575f6601d91f0efec95dd9bc619431' (2024-02-15)
 2024-02-18 00:18:59 +00:00
Trial97
5232b3cd89
Added some logs and fixed natives extraction 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-17 12:17:00 +02:00
Trial97
ea2adf909d
Added progeess dialog to autodownload java 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-17 11:14:32 +02:00
seth
599a08d309
Merge pull request #2126 from TheComputerGuy96/mr/mangohud-fix 
Use absolute path to load MangoHUD library
 2024-02-16 19:57:12 -05:00
Trial97
2941307581
Added basic java auto-detect and auto-download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-16 23:42:39 +02:00
DioEgizio
25b69b4c0d fix: fix sparkle hash 
:/ oops

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-16 17:29:49 +01:00
DioEgizio
94b48e9702 fix: remove cmark_static 
cmark 0.31 removed CMARK_STATIC/CMARK_SHARED and replaced it with the native cmake BUILD_SHARED_LIBS

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-16 17:06:28 +01:00
DioEgizio
5d36067c74 chore: update libraries 
updated qt to 6.6.2
updated some submodules
updated sparkle framework to the latest version

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-16 16:21:53 +01:00
Echo J
01180c20e1 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>
 2024-02-14 10:11:49 +02:00
Sefa Eyeoglu
e738b78044
Merge pull request #2112 from TheKodeToad/log-performance 2024-02-13 09:15:47 +01:00
Sefa Eyeoglu
b02eef9358
Merge pull request #2116 from TheKodeToad/use-after-free 2024-02-13 09:14:34 +01:00
TheKodeToad
8cf2a04f31
Fix formatting issues 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-02-12 15:24:56 +00:00
TheKodeToad
7f4c74ffbe
Fix immediate free in Exception.h 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-02-11 22:16:03 +00:00
Trial97
fdaaee64d1
Fixed curseforge neoforge export for 1.20.1 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-11 21:49:28 +02:00
TheKodeToad
ff989b4305
Fix ResourceModel error display 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-02-11 15:43:36 +00:00
TheKodeToad
ded77e6183
Fix NetJob use-after-free 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-02-11 15:43:36 +00:00
Sefa Eyeoglu
b0b77c2178
Merge pull request #2114 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-02-11 09:57:06 +01:00
github-actions[bot]
0f254c8425 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/79a13f1437e149dc7be2d1290c74d378dad60814' (2024-02-03)
  → 'github:nixos/nixpkgs/442d407992384ed9c0e6d352de75b69079904e4e' (2024-02-09)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf' (2024-01-28)
  → 'github:cachix/pre-commit-hooks.nix/0db2e67ee49910adfa13010e7f012149660af7f0' (2024-02-07)
 2024-02-11 00:19:31 +00:00
Alexandru Ionut Tripon
29bf6cc68c
Update launcher/modplatform/flame/FlameInstanceCreationTask.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-02-10 23:15:26 +02:00
Trial97
830ce246e1
Fixed curseforge neoforge import for 1.20.1 versions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-10 13:48:02 +02:00
Trial97
f3600972a0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into instance_copy_progress 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-10 11:09:45 +02:00
Trial97
031a9f4738
Replaced QFile::remove with FS::deletePath 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-10 11:03:51 +02:00
Trial97
5099061a5c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-10 11:02:29 +02:00
Trial97
c0fb053ccc
Added warning for x86 java 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-09 23:14:49 +02:00
Trial97
27d662e642
Added management for downloaded javas from prism 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-09 22:47:39 +02:00
Trial97
0a3303bcbd
Added button to add extra java path to the Java Wizzard 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-09 21:07:12 +02:00
Trial97
379f1a70e9
Leave headers alone 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 22:37:57 +02:00
Trial97
b3fc07d444
Added extra java search paths 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 21:47:59 +02:00
Trial97
3d29da916d
Made Java path configurable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 20:15:19 +02:00
Trial97
ba990e075b
Added JavaPath function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 19:45:46 +02:00
TheKodeToad
7cac8ad2b4
Use QTextFragment for inserting log lines 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-02-06 20:42:18 +00:00
Sefa Eyeoglu
6935c0dc3b
Merge pull request #2089 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-02-04 10:01:20 +01:00
github-actions[bot]
15670cc27b chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/07f6395285469419cf9d078f59b5b49993198c00' (2024-01-11)
  → 'github:hercules-ci/flake-parts/b253292d9c0a5ead9bc98c4e9a26c6312e27d69f' (2024-02-01)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/4fddc9be4eaf195d631333908f2a454b03628ee5' (2024-01-25)
  → 'github:nixos/nixpkgs/79a13f1437e149dc7be2d1290c74d378dad60814' (2024-02-03)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/f56597d53fd174f796b5a7d3ee0b494f9e2285cc' (2024-01-20)
  → 'github:cachix/pre-commit-hooks.nix/7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf' (2024-01-28)
 2024-02-04 00:19:10 +00:00