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
8,173 Commits 9 Branches 38 Tags
fcdedc795c95d79b92b24d92b6df1aa78bfa2dcf
Commit Graph

3708 Commits

Author SHA1 Message Date
Trial97
2bfb5fc138 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-17 22:26:17 +02:00
Trial97
53c6493b9a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-11-17 21:56:23 +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
a531f32b69 fixed settings saving 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-16 13:26:29 +02: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
bedb4da869 Added filename to the modlist export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-14 19:37:23 +02:00
Trial97
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
Trial97
99fbcbee4c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-11-14 18:12:48 +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
Trial97
17916dbd24 Fixed inconsistent Ok in instance import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-12 20:27:55 +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
50a4d61ded Fixed demo mode 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-10 23:26:41 +02:00
Trial97
926942a973 Fixed modrinth sort swap 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-10 20:00:35 +02:00
Trial97
463608b289 fixed shader packs detection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-10 19:37:11 +02:00
Trial97
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
Trial97
b4bfc03e8b Added button to refresh themes and catpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-09 21:48:46 +02:00
Trial97
7532a41043 Improvements to catpack 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-09 21:38:38 +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
Alexandru Ionut Tripon
3d529b0c3e Merge pull request #1772 from Trial97/pixmap_crash 
Fix crash with mod icon caching
 2023-11-06 20:44:27 +00:00
Trial97
ca226d2ab5 Fixed comparation warning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-06 11:24:19 +02:00
Trial97
670e91cb60 Increased the step to around 10MB 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-06 11:08:18 +02:00
Trial97
cc291219f9 apply suggested changes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-06 10:51:34 +02:00
Sefa Eyeoglu
0eda2447dc Merge pull request #1797 from Trial97/fix_mangohub 
[Linux] Fix loading MangoHud
 2023-11-06 08:14:55 +01:00
Trial97
867e6223ce Fixed mangoHub loading 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-05 23:48:26 +02:00