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

8568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
0f95bf1e42
Updated readme 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-04 12:08:49 +02:00
Trial97
f828ea8929
updated the texture pack tooltips 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-04 11:49:05 +02:00
Trial97
79e299123c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2023-11-04 00:15:09 +02:00
Trial97
a4978946d5
disabled lax deps 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-04 00:07:51 +02:00
Trial97
2b6d8b8a2d
updated tooltip messages 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-03 23:02:17 +02:00
Trial97
cbb453a0ed
minimize the permisions for extracted files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-03 22:55:10 +02:00
TheKodeToad
b446bdf4a9
Merge pull request #1783 from Trial97/visual_bug 
Fixed visual bug with Modlist export
 2023-11-03 15:20:57 +00:00
Sefa Eyeoglu
ef40ba8439
Merge pull request #1782 from Trial97/warn_remove_account 2023-11-03 12:56:13 +01:00
Trial97
1b2654bfa6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2023-11-03 12:53:23 +02:00
Alexandru Ionut Tripon
1bd69ecbb2
Update launcher/ui/pages/global/AccountListPage.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-03 11:42:40 +02:00
Trial97
b18082376d
Fixed visual bug with Modlist export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-03 11:04:13 +02:00
Trial97
127a31ba3a
Added warning for remove account 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-03 10:31:40 +02:00
Trial97
4081c51573
made dependency check more lax 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-02 23:52:12 +02:00
Trial97
220a1de99a
made sure that we do not relay for undefined behavior 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-02 22:41:56 +02:00
Trial97
3cbc63bb9f
added size column 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-02 12:18:24 +02:00
Trial97
2349f29be0
jsut a overflow protection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-02 01:26:04 +02:00
Alexandru Ionut Tripon
f8bb1a872a
Merge pull request #1766 from TheKodeToad/groups-fix 
Fix group issues
 2023-11-01 15:26:41 +00:00
Tayou
86e2f6c58c
Merge pull request #1685 from Trial97/java 
Autodetect Java bundled with official launcher
 2023-10-31 18:03:41 +01:00
Trial97
2863a691ef
moved refresh out of the loop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-31 08:45:08 +02:00
Alexandru Ionut Tripon
60fd7f0ae6
Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-10-31 08:43:26 +02:00
Trial97
7166d68736
fixed account refresh after sleep 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-31 00:45:18 +02:00
Trial97
e42a2404a9
added more microsoft error codes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-30 22:55:23 +02:00
Trial97
1490193402
added button to disable dependencies on the mod review 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-30 22:14:26 +02:00
TheKodeToad
2526275c5e
Better check 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-30 09:51:37 +00:00
TheKodeToad
5a54d80c6e
Fix group issues 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-30 09:26:38 +00:00
Sefa Eyeoglu
ea7dd9cfcc
Merge pull request #1761 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-10-29 09:31:28 +01:00
Alexandru Ionut Tripon
eb3f1ee27a
Merge pull request #1758 from IThundxr/patch-1 
[Windows] Remove Windows 7/8 support from app manifest
 2023-10-29 07:12:40 +00:00
LocalSpook
0de4d8902e Remove top-level const qualifiers in function declarations 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-28 22:12:09 -07:00
github-actions[bot]
55ac17c45b chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/44881e03af1c730cbb1d72a4d41274a2c957813a' (2023-10-21)
  → 'github:nixos/nixpkgs/808c0d8c53c7ae50f82aca8e7df263225cf235bf' (2023-10-26)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/8cc349bfd082da8782b989cad2158c9ad5bd70fd' (2023-10-19)
  → 'github:cachix/pre-commit-hooks.nix/bd38df3d508dfcdff52cd243d297f218ed2257bf' (2023-10-25)
 2023-10-29 00:18:11 +00:00
LocalSpook
54305397e4 Localize sorting options for resource and shader packs 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-28 12:50:40 -07:00
Sefa Eyeoglu
736246e6c8
Merge pull request #1759 from PrismLauncher/renovate/korthout-backport-action-2.x 2023-10-28 18:50:45 +02:00
renovate[bot]
9dcb7e9759
chore(deps): update korthout/backport-action action to v2 2023-10-28 16:03:11 +00:00
Tayou
69c2720872
Merge pull request #1691 from Trial97/no_color 
Add no_color env variable
 2023-10-28 18:02:53 +02:00
IThundxr
364cb4ff6a
chore: remove windows 7/8 support 
With 8.0 windows legacy support was dropped, this just removes it from the manifest

Signed-off-by: IThundxr <contact@ithundxr.dev>
 2023-10-28 07:39:32 -04:00
Tayou
df2a92d5f4
Merge pull request #1742 from TayouVR/fix-resourcepack-crash 
fix switch/case fallthrough in resource parse tasks
 2023-10-28 12:44:40 +02:00
Trial97
33cf7066b4
formated the code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-27 21:51:35 +03:00
Trial97
2256850cb6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-27 00:12:50 +03:00
LocalSpook
9d972ccc63 Localize account type in account list 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-26 13:32:33 -07:00
Sefa Eyeoglu
3719ea21b0
Merge pull request #1355 from TheKodeToad/env-vars 
Custom environment variables
 2023-10-26 22:10:26 +02:00
TheKodeToad
bd11b93a0c
Use hidden tab bar like other pages 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-26 21:01:24 +01:00
Trial97
12d567a9b8
made env vars behave like the rest of the settings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 22:51:38 +03:00
Trial97
60a7628dbb
delete duplicate mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 20:43:26 +03:00
Trial97
3d84635b24
Remove file on mod duplication 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 20:09:12 +03:00
Trial97
321bbf1fa8
fixed asan stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 19:06:38 +03:00
Trial97
dba54332fb
fixed some asan stuf 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 18:31:52 +03:00
Trial97
04acd27dab
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-10-26 13:45:47 +03:00
Trial97
8b8ea2d270
ensured that the variant is allways uppercase 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 13:37:25 +03:00
Trial97
44cdf3f697
Fixed skin variant 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 13:33:00 +03:00
Trial97
263dc5af67
Fixed remane and delete of selected skin 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-25 19:56:26 +03:00
Trial97
a5938a7de9
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-25 19:26:05 +03:00