Commit Graph

3114 Commits

Author SHA1 Message Date
Alexandru Ionut Tripon
0f2736306e Update launcher/ui/dialogs/skins/SkinManageDialog.ui
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-05-18 10:36:15 +03:00
Trial97
908072710a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-23 14:34:56 +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
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
a7be21733f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2023-11-23 10:41:55 +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
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
Tayou
24f2102596 Merge pull request #1869 from Trial97/icons_folder
Added more open folder actions
2023-11-19 15:06:30 +01:00
Trial97
e99926ea94 Added more open folder actions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-19 02:40:25 +02: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
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
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
Trial97
926942a973 Fixed modrinth sort swap
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-10 20:00:35 +02: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
Desoroxxx
6093399f5c Update LauncherPage.ui
Signed-off-by: Desoroxxx <desoroxxx@gmail.com>
2023-11-08 17:32:30 +01:00
Trial97
ae62e48c7c Moved some buttons around
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-08 12:25:56 +02:00
Trial97
a7bfe385ea Renamed Remove Metadata button
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-08 12:10:39 +02:00
Trial97
e4fecd1f97 Made sure mangoHub libs are present
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-08 11:55:38 +02:00
Alexandru Ionut Tripon
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
Alexandru Ionut Tripon
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
Trial97
4dc9e65875 Formated the suggestion
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-07 20:41:45 +02:00
Alexandru Ionut Tripon
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
Hazel Hofmann
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
Hazel Hofmann
9ada8d906d Use same categories as main desktop entry 2023-11-07 14:54:04 +01:00
Trial97
8897f16d1d simplify microsoft login
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-07 10:52:52 +02:00
Trial97
c78d35d699 added additional minecraft java path for windows
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-07 10:20:53 +02:00
Trial97
5d5adbd7da add update menu conditionaly
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-07 09:48:07 +02:00
Trial97
6506e93e4a Removed some buttons
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-07 09:44:27 +02:00
Trial97
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
Trial97
7a0b2a316a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-06 23:19:58 +02:00
TheKodeToad
baa988ec81 Merge pull request #1739 from Trial97/mod_icons
fixed squished mod icons
2023-11-06 20:49:05 +00:00
Alexandru Ionut Tripon
8eac0d34bd Merge pull request #1796 from Trial97/dep_global_toggle
Added Global Dependenicies toggle
2023-11-06 20:48:51 +00:00
Alexandru Ionut Tripon
0b1dcb3ea7 Merge pull request #1760 from LocalSpook/sorting
Localize sorting options for resource and shader packs
2023-11-06 20:45:52 +00:00