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
Sefa Eyeoglu
d60d089cbc
Merge pull request #1751 from LocalSpook/account_type 2023-11-23 10:27:06 +01:00
Alexandru Ionut Tripon
5d6334ef95
Merge pull request #1762 from LocalSpook/const-in-declarations 
Remove top-level `const` qualifiers in function declarations
 2023-11-23 08:53:01 +00:00
Trial97
6b3b54f061
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-23 10:48:11 +02:00
Trial97
e11b7e3770
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-11-23 10:46:27 +02:00
Trial97
670a0c1442
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 2023-11-23 10:46:03 +02:00
Trial97
d5d8b7be8d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-11-23 10:45:35 +02:00
Trial97
673f82e884
Merge branch 'war_ning' of github.com:Trial97/PrismLauncher into war_ning 2023-11-23 10:45:06 +02:00
Trial97
f18f7147b5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into war_ning 2023-11-23 10:44:49 +02:00
Trial97
721a08462c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into copy_time 2023-11-23 10:44:26 +02:00
Trial97
f0cff15d56
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into supported_files 2023-11-23 10:43:43 +02:00
Trial97
a1ac3ef7ae
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day 2023-11-23 10:43:15 +02:00
Trial97
a7be21733f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2023-11-23 10:41:55 +02:00
Trial97
66decbb180
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into current_time 2023-11-23 10:41:06 +02:00
Trial97
4ef626dab3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into time4 2023-11-23 10:40:30 +02:00
Sefa Eyeoglu
48e9753fb5
Merge pull request #1880 from Trial97/link 2023-11-23 09:07:34 +01:00
Sefa Eyeoglu
b42434bcb6
Merge remote-tracking branch 'upstream/develop' into const-in-declarations 2023-11-23 09:06:23 +01:00
Sefa Eyeoglu
364fb9808e
Merge pull request #1347 from HyperSoop/reduce-min-memory 2023-11-23 08:58:58 +01:00
Sefa Eyeoglu
389d75594a
Merge pull request #1887 from PrismLauncher/getchoo-patch-2 2023-11-23 08:58:00 +01:00
seth
d1c33392e7
chore: disable x86_64-darwin in garnix 
this is currently broken on garnix's end, but hopefully we will be able to enable this again in the future

Signed-off-by: seth <getchoo@tuta.io>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-11-23 08:51:30 +01:00
Trial97
e3af4f9a78
Fixed playtime recording 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-22 20:34:12 +02:00
Trial97
85b4e1f24f
Made column hidden by default 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-22 19:23:24 +02:00
Trial97
140a55810d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-11-22 14:20:30 +02:00
bit6tream
681e76c551 (#1693) Notify user if /tmp directory has noexec mount option 
Minecraft versions starting from 1.19 would not start at all if /tmp is mounted as `noexec`.

Signed-off-by: bit6tream <megapixel483@gmail.com>
 2023-11-22 01:48:31 +03:00
Trial97
196d24330a
Fixed open link on settings page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-21 17:47:59 +02:00
Trial97
54c308e5b5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 21:15:12 +02:00
Sefa Eyeoglu
e499aa4783
Merge pull request #1873 from guihkx/sync-flatpak-manifest 2023-11-19 19:57:47 +01:00
guihkx
e3b7aed76b
chore: sync local flatpak manifest with flathub's 
Signed-off-by: guihkx <626206+guihkx@users.noreply.github.com>
 2023-11-19 11:08:52 -03:00
Tayou
24f2102596
Merge pull request #1869 from Trial97/icons_folder 
Added more open folder actions
 2023-11-19 15:06:30 +01:00
Trial97
26931475ae
made folder size reflect the number of elements 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 15:58:30 +02:00
Trial97
80c85aef99
fixed const stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 15:37:18 +02:00
Alexandru Ionut Tripon
76216335b1
Update launcher/ui/pages/modplatform/ImportPage.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-19 15:26:47 +02:00
Sefa Eyeoglu
71ee0e750c
Merge pull request #1868 from PrismLauncher/update_flake_lock_action 2023-11-19 10:38:56 +01:00
Trial97
a8aa214c0e
changed prism aniversary 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 09:01:59 +02:00
Trial97
e99926ea94
Added more open folder actions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 02:40:25 +02:00
github-actions[bot]
69a49e85d0 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/ec750fd01963ab6b20ee1f0cb488754e8036d89d' (2023-11-07)
  → 'github:nixos/nixpkgs/7414e9ee0b3e9903c24d3379f577a417f0aae5f1' (2023-11-16)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/ea758da1a6dcde6dc36db348ed690d09b9864128' (2023-11-06)
  → 'github:cachix/pre-commit-hooks.nix/e558068cba67b23b4fbc5537173dbb43748a17e8' (2023-11-15)
 2023-11-19 00:19:30 +00:00
Trial97
f7e478c755
Added all supported files filter 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 02:02:02 +02:00
TheKodeToad
40cfa145ee
Merge pull request #1860 from Trial97/env_vars2 
Add custom env vars to pre/post launch commands
 2023-11-18 11:15:49 +00:00
Trial97
1a06a1424b
Added custom env vars to pre/post launch commands 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-18 10:53:38 +02:00
Trial97
9f39e45b28
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into current_time 2023-11-18 10:45:24 +02:00
Trial97
4e3132e8b2
reseted the setting 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-17 22:40:36 +02:00
Trial97
6b777653a5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-17 22:38:17 +02:00
Trial97
2bfb5fc138
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-17 22:26:17 +02:00
Trial97
53c6493b9a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-11-17 21:56:23 +02:00
TheKodeToad
7ef2bda269
Improve description 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-11-17 19:49:48 +00:00
Alexandru Ionut Tripon
1150249cec
Merge pull request #1746 from Trial97/toggle_deps 
separated dependecy check from mod update
 2023-11-17 19:42:22 +00:00
Tayou
b5f8054d8c
Merge pull request #1849 from Trial97/column_size 
Made resource columns resizable
 2023-11-17 20:19:02 +01:00
Trial97
a531f32b69
fixed settings saving 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-16 13:26:29 +02:00
Trial97
215465e833
added subdirectories to iteration 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-15 14:11:34 +02:00
Trial97
4d93f4adb1
Fixed folder size 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-15 12:10:47 +02:00
Trial97
890965746f
Added warning on mods update while running 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-15 11:07:46 +02:00