|
4e3132e8b2
|
reseted the setting
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-17 22:40:36 +02:00 |
|
|
53c6493b9a
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
|
2023-11-17 21:56:23 +02:00 |
|
|
7ef2bda269
|
Improve description
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-11-17 19:49:48 +00:00 |
|
|
1150249cec
|
Merge pull request #1746 from Trial97/toggle_deps
separated dependecy check from mod update
|
2023-11-17 19:42:22 +00:00 |
|
|
b5f8054d8c
|
Merge pull request #1849 from Trial97/column_size
Made resource columns resizable
|
2023-11-17 20:19:02 +01:00 |
|
|
a531f32b69
|
fixed settings saving
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-16 13:26:29 +02:00 |
|
|
890965746f
|
Added warning on mods update while running
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-15 11:07:46 +02:00 |
|
|
361329d5d1
|
Made resource columns resizable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-14 23:21:53 +02:00 |
|
|
bedb4da869
|
Added filename to the modlist export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-14 19:37:23 +02:00 |
|
|
6804e2ba59
|
moved export to list to the mods page
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-14 18:40:45 +02:00 |
|
|
99fbcbee4c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
|
2023-11-14 18:12:48 +02:00 |
|
|
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 |
|
|
a3445cbbdd
|
Merge pull request #1704 from Leafeling/develop
Add game category to generated Linux shortcuts
|
2023-11-13 07:32:33 +00:00 |
|
|
0e57eeca69
|
Added missing variable from lambda capture
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-13 09:28:59 +02:00 |
|
|
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 |
|
|
17916dbd24
|
Fixed inconsistent Ok in instance import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-12 20:27:55 +02:00 |
|
|
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 |
|
|
94d67b827e
|
Merge pull request #1832 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
|
2023-11-12 06:28:26 +00:00 |
|
|
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 |
|
|
e7b2dbdd00
|
Merge pull request #1828 from Trial97/swap
Fixed modrinth sort swap
|
2023-11-11 18:34:53 +01:00 |
|
|
926942a973
|
Fixed modrinth sort swap
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-10 20:00:35 +02:00 |
|
|
463608b289
|
fixed shader packs detection
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-10 19:37:11 +02:00 |
|
|
5e2eb7bbbb
|
Added button to select the FTBApp instances directory
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-09 23:30:30 +02:00 |
|
|
7532a41043
|
Improvements to catpack
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-09 21:38:38 +02:00 |
|
|
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 |
|
|
0f68a2dd61
|
Only open/close groups on left button
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-11-09 16:40:23 +00:00 |
|
|
a30292009a
|
Merge pull request #1819 from Desoroxxx/patch-1
Improve name and tooltip of mod dependency management option
|
2023-11-08 20:47:56 +00:00 |
|
|
6093399f5c
|
Update LauncherPage.ui
Signed-off-by: Desoroxxx <desoroxxx@gmail.com>
|
2023-11-08 17:32:30 +01:00 |
|
|
ae62e48c7c
|
Moved some buttons around
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-08 12:25:56 +02:00 |
|
|
a7bfe385ea
|
Renamed Remove Metadata button
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-08 12:10:39 +02:00 |
|
|
e4fecd1f97
|
Made sure mangoHub libs are present
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-08 11:55:38 +02:00 |
|
|
403c4bad86
|
Merge pull request #1799 from Trial97/improve_login
|
2023-11-08 08:51:13 +01:00 |
|
|
1d56bb8513
|
Merge pull request #1805 from PrismLauncher/renovate/korthout-backport-action-2.x
chore(deps): update korthout/backport-action action to v2.1.1
|
2023-11-08 07:25:45 +00:00 |
|
|
7313630615
|
Update launcher/java/JavaUtils.cpp
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-11-08 09:01:31 +02:00 |
|
|
9d653f172a
|
Update launcher/ui/dialogs/MSALoginDialog.cpp
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-11-08 08:56:48 +02:00 |
|
|
d4b479a186
|
chore(deps): update korthout/backport-action action to v2.1.1
|
2023-11-07 23:55:40 +00:00 |
|
|
4dc9e65875
|
Formated the suggestion
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-07 20:41:45 +02:00 |
|
|
54187a505f
|
Update launcher/ui/dialogs/MSALoginDialog.cpp
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-11-07 20:39:12 +02:00 |
|
|
1dea83580e
|
DCO Remediation Commit for Hazel Hofmann <hazel@theopensource.company>
I, Hazel Hofmann <hazel@theopensource.company>, hereby add my Signed-off-by to this commit: 9ada8d906d
Signed-off-by: Hazel Hofmann <hazel@theopensource.company>
|
2023-11-07 15:05:56 +01:00 |
|
|
9ada8d906d
|
Use same categories as main desktop entry
|
2023-11-07 14:54:04 +01:00 |
|
|
8897f16d1d
|
simplify microsoft login
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-07 10:52:52 +02:00 |
|
|
c78d35d699
|
added additional minecraft java path for windows
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-07 10:20:53 +02:00 |
|
|
5d5adbd7da
|
add update menu conditionaly
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-07 09:48:07 +02:00 |
|
|
6506e93e4a
|
Removed some buttons
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-07 09:44:27 +02:00 |
|
|
011e87b421
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-06 23:38:14 +02:00 |
|
|
baa988ec81
|
Merge pull request #1739 from Trial97/mod_icons
fixed squished mod icons
8.0
|
2023-11-06 20:49:05 +00:00 |
|
|
8eac0d34bd
|
Merge pull request #1796 from Trial97/dep_global_toggle
Added Global Dependenicies toggle
|
2023-11-06 20:48:51 +00:00 |
|
|
0b1dcb3ea7
|
Merge pull request #1760 from LocalSpook/sorting
Localize sorting options for resource and shader packs
|
2023-11-06 20:45:52 +00:00 |
|
|
3d529b0c3e
|
Merge pull request #1772 from Trial97/pixmap_crash
Fix crash with mod icon caching
|
2023-11-06 20:44:27 +00:00 |
|
|
a2ab4804dd
|
Merge pull request #1788 from Trial97/readme
Updated the readme
|
2023-11-06 16:41:56 +00:00 |
|