CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,935 Commits 10 Branches 30 Tags 34 MiB
1684cff7ac
Commit Graph

6935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheKodeToad
e3b04d10cf
Merge pull request #1536 from Trial97/time3 
Allow showing playtime in hours
 2023-08-27 18:14:04 +01:00
Trial97
8c607ae734
removed extra if 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 20:02:12 +03:00
Trial97
c5aac24a93
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse_multiple_loaders2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 15:53:35 +03:00
Trial97
4036cecfc0
Added progress widget to some modpack providers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 15:04:42 +03:00
Sefa Eyeoglu
df14f88307
Merge pull request #1532 from Trial97/curseforge-url-handle 2023-08-27 12:26:57 +02:00
seth
29736b3b1f
Merge pull request #1570 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-08-27 01:47:58 -04:00
github-actions[bot]
9735e46a7e chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/ca3c9ac9f4cdd4bea19f592b32bb59b74ab7d783' (2023-08-19)
  → 'github:nixos/nixpkgs/c66ccfa00c643751da2fd9290e096ceaa30493fc' (2023-08-26)
 2023-08-27 00:17:22 +00:00
Trial97
288d0d1fd4
Added back api loader filtering if just one is selected 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-26 22:26:01 +03:00
Trial97
abfd1a4205
minor dependency crash fix 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-25 18:35:25 +03:00
Sefa Eyeoglu
094cee8ec6
Merge pull request #1561 from Scrumplex/nix-miscs 2023-08-25 10:08:53 +02:00
Trial97
c54fecf5d9
added condition for empty loader type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-25 09:05:04 +03:00
Trial97
172680abf8
removed aditional header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-24 13:42:36 +03:00
Trial97
5f3e9672cd
made the loaders check more generic 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-24 13:31:57 +03:00
Sefa Eyeoglu
3e448904a3
Merge pull request #1562 from PrismLauncher/renovate/determinatesystems-update-flake-lock-20.x 
chore(deps): update determinatesystems/update-flake-lock action to v20
 2023-08-24 08:11:30 +02:00
renovate[bot]
783af2c06a
chore(deps): update determinatesystems/update-flake-lock action to v20 2023-08-24 04:32:25 +00:00
Trial97
6c0492c0d1
return 0 for any 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 21:09:32 +03:00
Trial97
1515607060
updated getMappedModLoader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 20:16:51 +03:00
Sefa Eyeoglu
41bd008f5d
chore(nix): remove pre-commit tools from shell 
use `pre-commit` CLI instead!

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-23 13:49:10 +02:00
Sefa Eyeoglu
d7b6450613
fix(nix): reload direnv if parts change 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-23 13:47:04 +02:00
Sefa Eyeoglu
85c23b26de
chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-23 13:46:23 +02:00
Sefa Eyeoglu
095de5ed4b
chore(nix): update clang-format to clang-tools 16 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-23 13:46:04 +02:00
Trial97
6178e5a975
reverted change for optional 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 13:55:38 +03:00
Trial97
aa065f2b51
Updated dependency resolution 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 13:28:23 +03:00
Sefa Eyeoglu
59ec0135d7
Merge pull request #1559 from Scrumplex/nix-canonicalize-jars 2023-08-23 12:23:26 +02:00
Sefa Eyeoglu
2283498ccb
Merge pull request #1552 from Trial97/memory_quick_setup 2023-08-23 11:56:53 +02:00
Trial97
e6ba2f4970
Added loaders check on versions load 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 12:52:51 +03:00
Sefa Eyeoglu
b93cd88292
fix(nix): add canonicalize-jars-hook 
See https://github.com/NixOS/nixpkgs/pull/250757

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-23 11:52:32 +02:00
Trial97
f8f9ffa118
added loaders for flame version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 11:33:45 +03:00
Trial97
4704c522e0
moved modloaderTypes to ModPlatform 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 10:26:57 +03:00
TheKodeToad
f7951f6082
Merge pull request #1548 from Trial97/version_label 
Reset status label when deleting instance
 2023-08-22 15:14:02 +01:00
Alexandru Ionut Tripon
eed7e996da
Update launcher/ui/widgets/JavaSettingsWidget.cpp 
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-08-22 16:17:05 +03:00
Alexandru Ionut Tripon
06dbd381f8
Update launcher/ui/pages/instance/InstanceSettingsPage.cpp 
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-08-22 16:16:57 +03:00
Alexandru Ionut Tripon
3574d89e0f
Update launcher/ui/pages/global/JavaPage.cpp 
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-08-22 16:16:50 +03:00
TheKodeToad
0e96111116
Merge pull request #1556 from Trial97/metacache 
Gracefully handle invalid cache metadata
 2023-08-22 14:09:44 +01:00
Trial97
09aca7a0b5
Added warning to settings page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-22 10:52:35 +03:00
Sefa Eyeoglu
b1783d8fb1
Merge pull request #1557 from Trial97/curse_crash 2023-08-21 23:04:45 +02:00
Trial97
c3d03f0c33
added check for valid query items in curse url install 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-21 22:20:33 +03:00
Trial97
7acfe36a62
fixed httpmetacache load 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-21 21:30:44 +03:00
Trial97
45dad27a6d
fixed check 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-21 17:46:50 +03:00
TheKodeToad
fff378b643
Merge pull request #1553 from TheKodeToad/list-fixes 
A few boring list-related fixes
 2023-08-21 15:33:16 +01:00
TheKodeToad
d7dadabfbf
List fixes 
Double-click to toggle profile components.
Restore double-click to toggle resources.
Fix clicking on checkbox to select account.
Double-click to select account.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-21 14:44:46 +01:00
Trial97
1eb75b6852
fixed build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-21 15:34:45 +03:00
Trial97
492bf373c6
updated memory allocation on quick setup 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-21 15:00:11 +03:00
Sefa Eyeoglu
fcb436f1f4
Merge pull request #1551 from dannydorazio/develop 2023-08-21 08:29:25 +02:00
Danny Dorazio
e2e0a7af45 DCO Remediation Commit for Danny Dorazio <danny@dorazio.me> 
I, Danny Dorazio <danny@dorazio.me>, hereby add my Signed-off-by to this commit: 8092c321a9
I, Danny Dorazio <danny@dorazio.me>, hereby add my Signed-off-by to this commit: 3638fc0a7d
I, Danny Dorazio <danny@dorazio.me>, hereby add my Signed-off-by to this commit: c50c3eaa94

Signed-off-by: Danny Dorazio <danny@dorazio.me>
 2023-08-21 01:24:23 -04:00
Danny Dorazio
c50c3eaa94 DCO Remediation Commit for Danny Dorazio <hello@dorazio.me> 
I, Danny Dorazio <hello@dorazio.me>, hereby add my Signed-off-by to this commit: 8092c321a9
I, Danny Dorazio <hello@dorazio.me>, hereby add my Signed-off-by to this commit: 3638fc0a7d

Signed-off-by: Danny Dorazio <hello@dorazio.me>
 2023-08-21 01:21:48 -04:00
Danny Dorazio
3638fc0a7d Update “Welcome” message on account list page 2023-08-20 23:00:50 -04:00
Danny Dorazio
8092c321a9 Replace instances of “Minecraft account” 2023-08-20 23:00:25 -04:00
Trial97
19316e22b4
fixed status label after instance remove 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-20 22:46:44 +03:00
Sefa Eyeoglu
5c95448f1f
Merge pull request #1485 from getchoo/nix-darwin 2023-08-20 21:20:09 +02:00