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
TheKodeToad
9986fe4c45
Fix unicode characters being invalid in filenames 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-04-06 13:33:13 +01:00
timoreo
363273a17b
Merge pull request #2275 from TheKodeToad/invalid-zip-files 2024-04-06 14:18:13 +02:00
TheKodeToad
8056a2fa46
Replace invalid characters when extracting ZIP 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-04-05 23:31:18 +01:00
Alexandru Ionut Tripon
44ea8cd885
Merge pull request #2268 from Scrumplex/fix/nix/jdk21 
[Linux] Add jdk21 to Nix packages
 2024-04-04 20:38:35 +03:00
TheKodeToad
df209c7b44
Merge pull request #2272 from DioEgizio/flatpakupdate 
fix: update flatpak manifest for java 21
 2024-04-04 17:38:07 +01:00
DioEgizio
e704fbbcec fix: update flatpak manifest for java 21 
backport of https://github.com/flathub/org.prismlauncher.PrismLauncher/pull/54 for our CI builds

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-04-04 17:53:30 +02:00
Trial97
3ddcadcdd1
Moved getPathNameInLocal8bit inside FileSystem namespace 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-04 18:01:24 +03:00
Trial97
8ecab305ac
Moved the creation of natives folder in ExtractNatives task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-04 13:49:27 +03:00
Sefa Eyeoglu
0d372d2fbf
fix(nix): add jdk21 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2024-04-03 21:04:26 +02:00
Trial97
450b73328e
Fixed crash on non-latin instance name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-03 19:34:35 +03:00
Sefa Eyeoglu
90097f1309
Merge pull request #2263 from DioEgizio/update-qt670 2024-04-02 21:49:35 +02:00
DioEgizio
5f11b2e77f
chore: update to Qt 6.7.0 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-04-02 19:10:40 +02:00
TheKodeToad
186a6d0c52
Make filters vertical 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-04-01 17:00:10 +01:00
TheKodeToad
71904b52c1
Make option groups plural 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-04-01 15:31:18 +01:00
TheKodeToad
71998cb7d9
Rework filter widget 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-04-01 15:22:27 +01:00
Trial97
a0eba1ace6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-31 21:15:49 +03:00
Sefa Eyeoglu
a2d28f6872
Merge pull request #2257 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-03-31 11:23:57 +02:00
github-actions[bot]
f1351a143e chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/20bc93ca7b2158ebc99b8cef987a2173a81cde35' (2024-03-23)
  → 'github:nixos/nixpkgs/807c549feabce7eddbf259dbdcec9e0600a0660d' (2024-03-29)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/e611897ddfdde3ed3eaac4758635d7177ff78673' (2024-03-20)
  → 'github:cachix/pre-commit-hooks.nix/c11e43aed6f17336c25cd120eac886b96c455731' (2024-03-30)
 2024-03-31 00:20:10 +00:00
Alexandru Ionut Tripon
b7835036d4
Merge pull request #2255 from PrismLauncher/renovate/korthout-backport-action-2.x 
chore(deps): update korthout/backport-action action to v2.5.0
 2024-03-30 13:03:21 +02:00
renovate[bot]
e6a9badb73
chore(deps): update korthout/backport-action action to v2.5.0 2024-03-30 10:42:48 +00:00
Trial97
28cfd31269
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-29 10:30:42 +02:00
Trial97
1930689a27
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into dependency_removal 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-29 10:12:02 +02:00
Trial97
81874f22f7
Fixed tar extract 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-29 00:10:59 +02:00
Trial97
45028ddc61
Added java downloader to CI build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-28 14:58:05 +02:00
Alexandru Ionut Tripon
2012b2c243
Merge pull request #1977 from Trial97/resource_clear 
Force clear the resource selection
 2024-03-28 14:49:03 +02:00
Alexandru Ionut Tripon
b3abc052b5
Merge pull request #1529 from Trial97/portabledatadir 
Added UserData as another posible path for portable builds
 2024-03-28 14:48:34 +02:00
Alexandru Ionut Tripon
6b967d3f76
Merge pull request #1822 from Trial97/new_cats 
Add random and slideshow modes to Catpacks
 2024-03-28 14:48:18 +02:00
timoreo
e4742fdb3d
Merge pull request #2221 from Trial97/fix_curseforge3 
Set Forge version correctly when exporting to CurseForge
 2024-03-28 09:41:11 +01:00
Tayou
0f178270be
Merge pull request #1786 from Trial97/deps_improve 
Make dependency checking more lax
 2024-03-27 20:42:26 +01:00
Alexandru Ionut Tripon
93f6315b16
Update CMakeLists.txt 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-03-27 19:34:04 +02:00
Tayou
0e5727315b
Merge pull request #2243 from Trial97/quick-play2 
Allow joining servers to work on 1.20 take 2
 2024-03-27 18:20:22 +01:00
Trial97
f6572c1244
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader 2024-03-27 18:55:34 +02:00
Alexandru Ionut Tripon
e212c019a0
Merge pull request #2209 from chouzz/add-totalPlayTime-ftb-import 
Add totalTimePlayed for FTBApp import
 2024-03-27 16:20:21 +02:00
Alexandru Ionut Tripon
ccf3a1582d
Merge pull request #2231 from DioEgizio/bzip2-fix 
fix: include libbz2.so.1.0
 2024-03-27 16:19:53 +02:00
Alexandru Ionut Tripon
5117b21262
Merge pull request #1769 from Trial97/error_codes 
added more microsoft error codes
 2024-03-27 16:19:31 +02:00
Sefa Eyeoglu
5d72ee1c4f
Merge pull request #1837 from Trial97/import_ok 2024-03-27 10:50:58 +01:00
Trial97
765bdf67c9
Changed the trait name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-27 00:56:12 +02:00
Trial97
23bdccc91d
Merge branch 'develop' of github.com:Trial97/PrismLauncher into quick-play 2024-03-26 23:58:56 +02:00
Sefa Eyeoglu
df0280f52b
Merge pull request #2237 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-03-24 09:35:07 +01:00
github-actions[bot]
3a833b659a chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/9af9c1c87ed3e3ed271934cb896e0cdd33dae212' (2024-03-15)
  → 'github:nixos/nixpkgs/20bc93ca7b2158ebc99b8cef987a2173a81cde35' (2024-03-23)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/5df5a70ad7575f6601d91f0efec95dd9bc619431' (2024-02-15)
  → 'github:cachix/pre-commit-hooks.nix/e611897ddfdde3ed3eaac4758635d7177ff78673' (2024-03-20)
• Updated input 'pre-commit-hooks/flake-utils':
    'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04)
  → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11)
• Updated input 'pre-commit-hooks/gitignore':
    'github:hercules-ci/gitignore.nix/43e1aa1308018f37118e34d3a9cb4f5e75dc11d5' (2023-12-29)
  → 'github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394' (2024-02-28)
 2024-03-24 00:19:57 +00:00
Trial97
3c12e27226
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-23 23:53:25 +02:00
Trial97
c0754b80a2
Add resize to last column 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-22 22:17:58 +02:00
Trial97
0b87e4c03b
Fiexed codeql warning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-22 12:29:15 +02:00
Trial97
a7029a9e53
Fixed qMin 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-21 20:01:40 +02:00
Trial97
3046822272
Fixed buid 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-21 19:53:52 +02:00
Trial97
1a6dfd04d6
Made tar.gz parser 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-21 19:46:57 +02:00
DioEgizio
37d348e60e fix: include libbz2.so.1.0 
fixes portable installs not working on fedora anymore

i did this only on portable builds and not system installs so that it doesn't create problems to people packaging them, as to fix system installs i would have to put it in bin/

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-03-21 10:39:12 +01:00
txtsd
794a60b684
Merge pull request #2224 from PrismLauncher/renovate/actions-cache-4.x 
chore(deps): update actions/cache action to v4.0.2
 2024-03-21 05:51:22 +00:00
Trial97
ab7fc2e46c
Fixed archive java download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-21 00:42:04 +02:00
Alexandru Ionut Tripon
93f19bda6e
Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-03-21 00:07:06 +02:00