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
7,783 Commits 9 Branches 38 Tags
f4f0a61bf23d5c40fa4310c050e4c39e6a8ce746
Commit Graph

7783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
f4f0a61bf2 fix vanilla technic modpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 16:15:12 +03:00
Alexandru Ionut Tripon
2145f9f0ac Merge pull request #1847 from Trial97/move_export2 
Improvements to modlist export
 2024-05-31 09:58:32 +03:00
timoreo
7ab8f8ef54 Merge pull request #2423 from Trial97/fix_time3 
fix incorrect launch time
 2024-05-31 08:17:07 +02:00
timoreo
da76b72800 Merge pull request #2438 from KernelFreeze/develop 
Added support for bcachefs
 2024-05-31 08:12:28 +02:00
Sefa Eyeoglu
f34c263964 Merge pull request #2441 from PrismLauncher/renovate/korthout-backport-action-3.x 2024-05-28 18:30:14 +02:00
renovate[bot]
4917287292 chore(deps): update korthout/backport-action action to v3 2024-05-28 14:35:10 +00: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
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
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
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
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
DioEgizio
3ba84cb844 fix: update bundled flatpak 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-05-18 12:57:09 +02: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
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
318819afc6 Made recommended button default 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 11:36:46 +03:00
Alexandru Ionut Tripon
eb0d0450e3 Merge pull request #2382 from Trial97/neoforge_technic 
Add neoforge support for technic packs and atlauncher packs
 2024-05-18 10:40:45 +03:00
Trial97
639c6e7f80 Add cancel to Add account dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-17 00:49:00 +03:00
Trial97
78804b26ee Maybe fix nix 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-17 00:34:39 +03:00
Trial97
75a457ebfa Add custom page to land after microsoft login 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-17 00:31:04 +03:00
Trial97
ce09f06bda Fix CI3 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-16 22:16:42 +03:00
Trial97
09c0c11033 Add back device code flow 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-16 21:58:25 +03:00
Trial97
2a58fb0ac5 Remove cobrandid 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-16 17:31:25 +03:00
Alexandru Ionut Tripon
898ee67a07 Update launcher/ui/dialogs/MSALoginDialog.cpp 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-05-16 00:41:07 +03:00
renovate[bot]
1d384544d3 chore(deps): update cachix/install-nix-action action to v27 2024-05-15 19:40:15 +00:00
Trial97
8b051b97fd Fix CI2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-15 17:54:35 +03:00
Trial97
abedc6a23c Improve login UI 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-15 17:25:15 +03:00
Trial97
849c3faeb4 Fix CI 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-15 14:07:03 +03:00
Trial97
80d8e3ee06 Remove katabasis 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-15 12:53:06 +03:00
Trial97
c2ed50627d Added back qt version check 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-14 00:36:35 +03:00
Trial97
e285a85fe8 Removed AccountTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-14 00:21:51 +03:00
Trial97
3336f8107c Removed AuthRequest and NetAction 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-14 00:21:45 +03:00
Sefa Eyeoglu
93da066aa2 Merge pull request #2398 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-05-12 09:24:48 +02:00
github-actions[bot]
d74926e60d chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/5fd8536a9a5932d4ae8de52b7dc08d92041237fc' (2024-05-03)
  → 'github:nixos/nixpkgs/e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d' (2024-05-11)
 2024-05-12 00:20:20 +00:00
Alexandru Ionut Tripon
f15981d786 Merge pull request #2358 from DioEgizio/nosystem-portablewithqt 
Remove prebuilt system tarballs on Linux, bundle Qt with Linux portable
 2024-05-09 08:22:43 +03:00
Alexandru Ionut Tripon
c703babda9 Merge pull request #2379 from kthchew/fix/blocked-desc 
Improve blocked mods dialog (permissions prompt, misc. fixes) on macOS
 2024-05-09 08:17:03 +03:00
Alexandru Ionut Tripon
72e9d7b148 Merge pull request #2366 from Trial97/modrint_import2 
Fix download packs with invalid characters
 2024-05-09 08:16:16 +03:00
Alexandru Ionut Tripon
7bcb1777a1 Merge pull request #2341 from Trial97/image_size 
Fix image width in project description
 2024-05-09 08:15:35 +03:00
Alexandru Ionut Tripon
a4142573ac Merge pull request #2311 from SolidStateDj/gen->ui 
Rename object name "userInterfaceTab" from "generalTab"
 2024-05-09 08:15:15 +03:00
Trial97
a95c1768a7 Add neoforge support for technic packs and atlauncher packs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-08 14:16:12 +03:00
Kenneth Chew
e7c95c9ccb Fix bug where watched directories are not clickable on macOS 
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
 2024-05-07 18:57:04 -04:00
Kenneth Chew
4787141698 Improved blocked mods dialog permissions prompt 
Targeted to macOS (where `~/Downloads` is considered a sensitive location that the system protects behind a prompt even from non-sandboxed apps)

Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
 2024-05-07 18:30:06 -04:00