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

8601 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sefa Eyeoglu
f8a6a099c7
Merge pull request #1732 from Trial97/update_file2 2023-12-11 11:08:07 +01:00
Sefa Eyeoglu
9467b11897
Merge pull request #1694 from Trial97/concurrent 2023-12-11 11:07:03 +01:00
Sefa Eyeoglu
bcaeab1ddc
Merge pull request #1857 from Trial97/copy_time 2023-12-11 10:58:21 +01:00
Sefa Eyeoglu
f8db991727
Merge pull request #1908 from DioEgizio/update-qt661 2023-12-11 10:57:56 +01:00
Sefa Eyeoglu
ad6ca1c6ea
Merge pull request #1931 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-12-10 10:16:00 +01:00
github-actions[bot]
d7cb139235 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nix-filter':
    'github:numtide/nix-filter/41fd48e00c22b4ced525af521ead8792402de0ea' (2023-09-16)
  → 'github:numtide/nix-filter/c843418ecfd0344ecb85844b082ff5675e02c443' (2023-12-04)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/f5c27c6136db4d76c30e533c20517df6864c46ee' (2023-11-30)
  → 'github:nixos/nixpkgs/09dc04054ba2ff1f861357d0e7e76d021b273cd7' (2023-12-08)
 2023-12-10 00:20:06 +00:00
TheKodeToad
4db00897c6
Merge pull request #1922 from IceCryptonym/togglable-status-bar 
Add togglable status bar
 2023-12-07 20:37:36 +00:00
Sefa Eyeoglu
e408a047ed
Merge pull request #1923 from TayouVR/more-instance-group-seperator 2023-12-07 21:34:41 +01:00
Tayou
877eb4172a
add line back to group separator 
Signed-off-by: Tayou <git@tayou.org>
 2023-12-07 17:26:47 +01:00
Archy
faedd0fd65 Add togglable status bar 
Signed-off-by: Archy <59789660+IceCryptonym@users.noreply.github.com>
 2023-12-06 23:40:22 +10:00
renovate[bot]
132344df1c
chore(deps): update korthout/backport-action action to v2.2.0 2023-12-04 12:06:39 +00:00
Trial97
657416fe30
Removed header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-12-03 21:29:02 +02:00
Trial97
577c737d68
Fixed askIfShouldUpdate dialog on mac 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-12-03 20:00:50 +02:00
Sefa Eyeoglu
c721fa795d
Merge pull request #1912 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-12-03 10:51:26 +01:00
github-actions[bot]
8b4b0f2f01 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/8c9fa2545007b49a5db5f650ae91f227672c3877' (2023-11-01)
  → 'github:hercules-ci/flake-parts/34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5' (2023-12-01)
• Updated input 'flake-parts/nixpkgs-lib':
    'github:NixOS/nixpkgs/0cbe9f69c234a7700596e943bfae7ef27a31b735?dir=lib' (2023-10-29)
  → 'github:NixOS/nixpkgs/e92039b55bcd58469325ded85d4f58dd5a4eaf58?dir=lib' (2023-11-29)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1' (2023-11-24)
  → 'github:nixos/nixpkgs/f5c27c6136db4d76c30e533c20517df6864c46ee' (2023-11-30)
 2023-12-03 00:19:28 +00:00
DioEgizio
eb011e6729 chore: update qt to qt 6.6.1 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-12-02 17:42:24 +01:00
Sefa Eyeoglu
4c59a1ba1b
Merge pull request #1882 from bit69tream/notify-user-if-tmp-is-noexec 2023-11-28 21:57:23 +01:00
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
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