Commit Graph

9941 Commits

Author SHA1 Message Date
Sefa Eyeoglu 5291268565 Merge pull request #1900 from PrismLauncher/renovate/cachix-install-nix-action-24.x 2023-11-28 21:53:57 +01:00
renovate[bot] a74c3d57b4 chore(deps): update cachix/install-nix-action action to v24 2023-11-28 20:27:48 +00:00
TheKodeToad 284e536e81 Data pack management
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-11-28 14:08:08 +00:00
Trial97 463ff4c6ae Removed assert permanantly
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-27 11:30:07 +02:00
Trial97 6f6b6312a5 Moved the button up
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-27 09:39:31 +02:00
seth 6fa8e07d62 Merge pull request #1897 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2023-11-27 03:44:43 +00:00
Trial97 2d91bd09d4 Fixed crash on abort function not initialized
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-26 23:49:56 +02:00
github-actions[bot] 67b51b7a18 chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/7414e9ee0b3e9903c24d3379f577a417f0aae5f1' (2023-11-16)
  → 'github:nixos/nixpkgs/0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1' (2023-11-24)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/e558068cba67b23b4fbc5537173dbb43748a17e8' (2023-11-15)
  → 'github:cachix/pre-commit-hooks.nix/e5ee5c5f3844550c01d2131096c7271cec5e9b78' (2023-11-25)
2023-11-26 00:19:22 +00:00
Trial97 f4e098f7f5 Formated file
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-25 09:36:55 +02:00
Trial97 1a0fd5f993 Added mod reinstall dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-25 00:18:10 +02:00
Trial97 20e0cb43b9 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-11-23 23:58:47 +02:00
Trial97 2db5677281 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-11-23 23:57:44 +02:00
Trial97 ff5a968de0 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file2 2023-11-23 23:57:20 +02:00
Trial97 1650237c8f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into some_removals 2023-11-23 23:37:13 +02:00
Trial97 e0d776e551 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 2023-11-23 23:29:10 +02:00
Trial97 403a7f5d46 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps2 2023-11-23 23:21:11 +02:00
Trial97 af628be648 Merge branch 'error_codes' of github.com:Trial97/PrismLauncher into error_codes 2023-11-23 23:20:27 +02:00
Trial97 3c75d761a2 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into error_codes 2023-11-23 23:11:11 +02:00
Trial97 b47ec7f2dc Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 2023-11-23 17:14:50 +02:00
Trial97 3234bb5a8c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve 2023-11-23 17:05:37 +02:00
Trial97 bb9df1684b Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into new_cats 2023-11-23 16:58:42 +02:00
Trial97 0d44c0df1d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats 2023-11-23 16:50:53 +02:00
Trial97 c5cdebb42f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into ftb_import 2023-11-23 16:43:33 +02:00
Trial97 2318a83881 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader 2023-11-23 16:33:57 +02:00
Trial97 be67067fa2 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo 2023-11-23 16:23:56 +02:00
Alexandru Ionut Tripon 7f6027498e Merge pull request #1871 from Trial97/cat_day
changed prism aniversary
2023-11-23 14:14:04 +00:00
Trial97 9c13504b06 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_ok 2023-11-23 16:13:09 +02:00
deadmeu ac223a29ef refactor: shorten desktop entry comment field
Signed-off-by: deadmeu <dmu@duck.com>
2023-11-24 00:03:33 +10:00
Trial97 afcdb7595c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-11-23 16:01:54 +02:00
Trial97 f71e622f71 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into copy_time 2023-11-23 15:51:54 +02:00
Trial97 4f49a56e4d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into supported_files 2023-11-23 15:40:31 +02:00
Trial97 85e875fe08 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day 2023-11-23 15:32:48 +02:00
Trial97 944ed48a61 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into time4 2023-11-23 14:58:05 +02:00
Trial97 e503d44c54 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into current_time 2023-11-23 14:47:47 +02:00
Trial97 908072710a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-23 14:34:56 +02:00
bit6tream d414599974 (#1693) Use a better approach to detect a noexec mount option
Signed-off-by: bit6tream <megapixel483@gmail.com>
2023-11-23 15:23:03 +03:00
Trial97 e43a557a0b Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into instance_copy_progress 2023-11-23 14:08:49 +02:00
Trial97 7d4778ffd6 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into portabledatadir 2023-11-23 13:54:36 +02:00
Trial97 80383d237a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 2023-11-23 13:38:11 +02:00
Trial97 1095d0698a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into waitprofiler 2023-11-23 13:25:12 +02:00
Trial97 c2fc2d330b Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2023-11-23 12:57:31 +02:00
Trial97 f16f0ed93e Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry 2023-11-23 12:47:52 +02:00
Trial97 9345416361 Fixed localization stuff
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-23 12:36:40 +02:00
Trial97 2268e46b91 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into account 2023-11-23 12:22:41 +02:00
Trial97 ceb88a170e Extracted reauthenticateCurrentAccount as a separate function
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-23 12:22:31 +02:00
Sefa Eyeoglu a2aa303770 Merge pull request #1843 from Trial97/fix_not_found_dep 2023-11-23 11:02:16 +01:00
Sefa Eyeoglu a966289944 Merge pull request #1852 from Trial97/war_ning 2023-11-23 11:01:53 +01:00
Sefa Eyeoglu 7c9c3d2c5f Merge pull request #1815 from Trial97/fix_mangohub 2023-11-23 11:00:57 +01:00
Trial97 d8c5ed55c2 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file2 2023-11-23 12:00:18 +02:00
Trial97 6169af70db Added back the FIXME comment
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-23 11:59:35 +02:00