Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,447 Commits 9 Branches 38 Tags
40b10ecf300b54594faeaf9bb4d4ded4e074dc40
Commit Graph

8447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
7a200a337f update retry netjob dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-26 11:04:41 +03:00
Sefa Eyeoglu
764463ada7 Merge pull request #2436 from PrismLauncher/update_flake_lock_action 2024-05-26 09:29:18 +02:00
Celeste Peláez
f5f32e2c6e Reformatted FileSystem.h 
Signed-off-by: Celeste Peláez <KernelFreeze@users.noreply.github.com>
 2024-05-26 01:40:31 -05:00
Celeste Peláez
a2b5ac73ff Added support for bcachefs 
Signed-off-by: Celeste Peláez <KernelFreeze@users.noreply.github.com>
 2024-05-26 01:33:22 -05:00
github-actions[bot]
a8712f7126 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/02923630b89aa1ab36ef8e422501a6f4fd4b2016?narHash=sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA%3D' (2024-05-18)
  → 'github:nixos/nixpkgs/47e03a624662ce399e55c45a5f6da698fc72c797?narHash=sha256-9dUxZf8MOqJH3vjbhrz7LH4qTcnRsPSBU1Q50T7q/X8%3D' (2024-05-25)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/fa606cccd7b0ccebe2880051208e4a0f61bfc8c1?narHash=sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0%3D' (2024-05-16)
  → 'github:cachix/pre-commit-hooks.nix/0e8fcc54b842ad8428c9e705cb5994eaf05c26a0?narHash=sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA%3D' (2024-05-20)
 2024-05-26 00:20:28 +00:00
Trial97
eacd7758e9 fix pre-commit hook 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-22 22:49:28 +03:00
Trial97
2b949a8059 improve login account checking 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-22 10:53:24 +03:00
Richard-Rogalski
399071c717 Fix Java auto-detect so it finds Gentoo installed JDKs 
Signed-off-by: Richard-Rogalski <rrogalski@tutanota.com>
 2024-05-21 11:41:47 -05:00
Fourmisain
23095b70a4 please the pre-commit check 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
 2024-05-21 13:44:00 +02:00
Fourmisain
dbe4adc034 detect IBM Semeru Certified Edition on linux 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
 2024-05-21 10:51:37 +02:00
Trial97
f6a7fc215a update java sorting by taking into consideration release time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-21 08:33:26 +03:00
Fourmisain
af157c1613 fix x86 detection on 64 bit windows 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
 2024-05-20 23:13:44 +02:00
Fourmisain
08918be11e add detection for IBM Semeru Java runtime 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
 2024-05-20 21:44:35 +02:00
Trial97
7a42fb284a reverse java version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-20 18:33:40 +03:00
Trial97
0e239dfb2a fix crash on first display with java downloader off 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-20 18:24:19 +03:00
Trial97
abb628edb3 remove OverrideJava 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-20 18:23:43 +03:00
Sefa Eyeoglu
0ecdceccd2 Merge pull request #2426 from Luk-ESC/develop 2024-05-20 17:18:25 +02:00
Lukas Eschbacher
201c4d2cc6 nix: replace mesa-demos with glxinfo 
Signed-off-by: Lukas Eschbacher <eschbacher.lukas@gmail.com>
 2024-05-20 14:39:24 +02:00
Alexandru Ionut Tripon
529dc7c6b7 Merge pull request #2412 from DioEgizio/update-upstreamflatpak 
fix: update bundled flatpak to switch it to Qt 6
 2024-05-19 22:54:35 +03:00
Trial97
428889a68d removed + from bad chars in filenames 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 19:38:06 +03:00
Trial97
1b0e8260ac fix zero launch time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 15:36:39 +03:00
Sefa Eyeoglu
be66a91295 Merge pull request #2418 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-05-19 10:36:16 +02:00
Trial97
425a6e0919 Fix code format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 10:09:34 +03:00
Trial97
d9e2badf71 Rename timeout option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 08:54:19 +03:00
github-actions[bot]
d21597cf89 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e?narHash=sha256-yzcRNDoyVP7%2BSCNX0wmuDju1NUCt8Dz9%2BlyUXEI0dbI%3D' (2024-05-02)
  → 'github:hercules-ci/flake-parts/8dc45382d5206bd292f9c2768b8058a8fd8311d9?narHash=sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78%3D' (2024-05-16)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d?narHash=sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4%3D' (2024-05-11)
  → 'github:nixos/nixpkgs/02923630b89aa1ab36ef8e422501a6f4fd4b2016?narHash=sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA%3D' (2024-05-18)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/2849da033884f54822af194400f8dff435ada242?narHash=sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk%3D' (2024-04-30)
  → 'github:cachix/pre-commit-hooks.nix/fa606cccd7b0ccebe2880051208e4a0f61bfc8c1?narHash=sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0%3D' (2024-05-16)
• Removed input 'pre-commit-hooks/flake-utils'
• Removed input 'pre-commit-hooks/flake-utils/systems'
 2024-05-19 00:20:26 +00:00
Trial97
76a656a017 retry auth step on fail 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 22:44:17 +03:00
Trial97
6078a771c1 add config for transfer timeout 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 21:46:05 +03:00
Alexandru Ionut Tripon
5cf7466e4c Merge pull request #2404 from PrismLauncher/renovate/cachix-install-nix-action-27.x 
Update cachix/install-nix-action action to v27
 2024-05-18 19:49:58 +03:00
Alexandru Ionut Tripon
74c2f2599f Merge pull request #1365 from Trial97/netjob_retry 
Ask user to retry if netjob fails
 2024-05-18 17:54:12 +03:00
Trial97
5a598db608 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 2024-05-18 17:40:54 +03:00
Trial97
5bd28e2cc8 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-05-18 17:11:41 +03:00
Trial97
e42dfbc391 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 2024-05-18 17:02:10 +03:00
Trial97
477d1408ad Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 2024-05-18 16:53:14 +03:00
Trial97
83fdfe8091 fix regression 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 16:52:29 +03:00
Trial97
4d21f71ccf Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats 2024-05-18 16:34:21 +03:00
Trial97
31d0cad377 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo 2024-05-18 16:24:22 +03:00
Trial97
c9c67ef79e Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version 2024-05-18 15:27:02 +03:00
Trial97
d77d1f3be3 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into coremods 2024-05-18 14:44:33 +03:00
Trial97
b23b53d98d Add missing header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 14:43:58 +03:00
Trial97
7a5348a179 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-05-18 14:14:31 +03:00
DioEgizio
3ba84cb844 fix: update bundled flatpak 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-05-18 12:57:09 +02:00
Trial97
633489884d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 13:27:31 +03:00
Alexandru Ionut Tripon
3887cfe5df Merge pull request #1525 from Trial97/waitprofiler 
Add wait profiler
 2024-05-18 13:17:24 +03:00
Alexandru Ionut Tripon
7b39ec5048 Merge pull request #2377 from dqfan2012/AddSdkmanToMacOs 
Adding sdkman java location to MacOs
 2024-05-18 13:15:57 +03:00
Trial97
ba947993c2 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2024-05-18 12:47:01 +03:00
Tayou
acd23ff163 Merge pull request #2402 from Trial97/refactor_auth 
Improve Microsoft login
 2024-05-18 11:07:16 +02:00
Alexandru Ionut Tripon
c8ff768d64 Merge pull request #1827 from Trial97/shader 
fixed shader packs detection
 2024-05-18 12:02:13 +03:00
Trial97
b6d87fc090 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into instance_copy_progress 2024-05-18 11:57:41 +03:00
Trial97
6aaf3a3ed4 Merge branch 'skin_selector' of github.com:Trial97/PrismLauncher into skin_selector 2024-05-18 11:57:06 +03:00
Trial97
2ac6efaa4a Fix reggresion 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 11:56:43 +03:00