TheKodeToad
|
d49f81d132
|
Drop leftover mod loader settings
I messed up the merge.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-06 11:27:04 +01:00 |
|
TheKodeToad
|
19b5a5e00b
|
Remove final conflict - kept by mistake
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-09-02 22:38:14 +01:00 |
|
TheKodeToad
|
347228a246
|
Legacy settings override default -> false
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-09-02 22:29:26 +01:00 |
|
TheKodeToad
|
1213a5ab46
|
Merge remote-tracking branch 'upstream/develop' into skinfix
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-09-02 22:27:57 +01:00 |
|
TheKodeToad
|
c01e95b79c
|
Merge pull request #1592 from kumquat-ir/desktop-open-fix
Fix opening files from curseforge:// and file:// links etc on linux
|
2023-09-01 16:13:48 +01:00 |
|
kumquat-ir
|
984e870bca
|
actually it can handle multiple files just fine
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
|
2023-09-01 10:32:35 -04:00 |
|
kumquat-ir
|
eb66e37b83
|
fix opening files from curseforge: links on linux
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
|
2023-09-01 10:29:56 -04:00 |
|
TheKodeToad
|
25ce11d85d
|
Merge pull request #1539 from Trial97/refactor_modpack_ux
Improvements to modpack UX
|
2023-08-31 14:58:54 +01:00 |
|
Sefa Eyeoglu
|
b83fdbd1b7
|
Merge pull request #1575 from TheKodeToad/more-pack-export-fixes
|
2023-08-28 22:18:58 +02:00 |
|
TheKodeToad
|
0e67686295
|
Hide index folder in pack export dialog
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-28 17:25:07 +01:00 |
|
TheKodeToad
|
e98bca4749
|
Fix cancelling pack save
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-28 17:09:40 +01:00 |
|
Sefa Eyeoglu
|
fbf6833124
|
Merge pull request #1519 from TheKodeToad/better-export-pack
|
2023-08-28 10:29:32 +02:00 |
|
Sefa Eyeoglu
|
e4e4c4a430
|
Merge pull request #1573 from PrismLauncher/renovate/lock-file-maintenance
|
2023-08-28 10:14:45 +02:00 |
|
Sefa Eyeoglu
|
97d932db62
|
Revert "chore(deps): enable nix lockfile maintenance for renovate"
This reverts commit 5d14724e66.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-28 10:14:21 +02:00 |
|
renovate[bot]
|
66cbbfec0c
|
chore(deps): lock file maintenance
|
2023-08-28 00:23:14 +00:00 |
|
TheKodeToad
|
9110fbf282
|
Merge pull request #1560 from Trial97/curse_multiple_loaders2
Add suport for flame multiple loaders
|
2023-08-27 18:21:14 +01:00 |
|
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 |
|