Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-11 20:57:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,366 Commits 9 Branches 38 Tags
13d29ac6f466776f13b01f90ba805af0490a41ca
Commit Graph

7366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
13d29ac6f4 Updated the size sort code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-12-22 23:35:48 +02:00
Trial97
b47ec7f2dc Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 2023-11-23 17:14:50 +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
85e875fe08 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day 2023-11-23 15:32:48 +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
Sefa Eyeoglu
2b17a61d38 Merge pull request #1589 from Trial97/instance_reload 
Fully reload the instance list once the folder is changed
 2023-11-23 10:48:01 +01:00
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
670a0c1442 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 2023-11-23 10:46:03 +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
a1ac3ef7ae Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day 2023-11-23 10:43:15 +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
196d24330a Fixed open link on settings page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-21 17:47:59 +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
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
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
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
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
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
Trial97
361329d5d1 Made resource columns resizable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-14 23:21:53 +02:00
Trial97
c05c001ab2 Remove the dep if it fails for any reason 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-13 23:49:49 +02:00
Alexandru Ionut Tripon
a3445cbbdd Merge pull request #1704 from Leafeling/develop 
Add game category to generated Linux shortcuts
 2023-11-13 07:32:33 +00:00
Trial97
0e57eeca69 Added missing variable from lambda capture 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-13 09:28:59 +02:00
Alexandru Ionut Tripon
32a8d9b9c6 Update launcher/ui/pages/instance/ModFolderPage.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-13 09:23:56 +02:00
Tayou
a991d48c76 Merge pull request #1798 from Trial97/java 
[Windows] Autodetect Java from the Microsoft Store version of the official launcher
 2023-11-12 15:39:17 +01:00
Alexandru Ionut Tripon
94d67b827e Merge pull request #1832 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-11-12 06:28:26 +00:00
github-actions[bot]
cb648c180c chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'libnbtplusplus':
    'github:PrismLauncher/libnbtplusplus/a5e8fd52b8bf4ab5d5bcc042b2a247867589985f' (2023-07-22)
  → 'github:PrismLauncher/libnbtplusplus/23b955121b8217c1c348a9ed2483167a6f3ff4ad' (2023-11-06)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/9d5d25bbfe8c0297ebe85324addcb5020ed1a454' (2023-11-04)
  → 'github:nixos/nixpkgs/ec750fd01963ab6b20ee1f0cb488754e8036d89d' (2023-11-07)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/dec10399e5b56aa95fcd530e0338be72ad6462a0' (2023-11-01)
  → 'github:cachix/pre-commit-hooks.nix/ea758da1a6dcde6dc36db348ed690d09b9864128' (2023-11-06)
 2023-11-12 00:18:56 +00:00
Tayou
e7b2dbdd00 Merge pull request #1828 from Trial97/swap 
Fixed modrinth sort swap
 2023-11-11 18:34:53 +01:00
Trial97
926942a973 Fixed modrinth sort swap 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-10 20:00:35 +02:00
Tayou
913d81e371 Merge pull request #1821 from TheKodeToad/group-click-fix 
Only open/close groups on left button
 2023-11-09 19:18:12 +01:00
TheKodeToad
0f68a2dd61 Only open/close groups on left button 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-11-09 16:40:23 +00:00