CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,177 Commits 10 Branches 30 Tags
Commit Graph

1522 Commits

Author SHA1 Message Date
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
TheKodeToad
479335dfe0
Rewrite optional mod dialog 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-27 00:50:33 +01: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
f897b14e3e
changed technic icon name retrival 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-24 13:05:27 +03:00
Trial97
bb4b89470d
fixed icon importing 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-24 12:46:23 +03:00
Trial97
2990c5d0c9
Added optional mods dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-24 12:44:11 +03:00
Sefa Eyeoglu
85c23b26de
chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-23 13:46:23 +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
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
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
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
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
8e5be6f420
added suport for atlauncher browser download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-21 00:09:46 +03: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
5b4dcae7d9
Revert "feat: add toggle for quilt beacon" 
This reverts commit 89aaedc06c3eb7a035d8be593a7bbe417cb2f712.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-20 13:23:11 +02:00
Sefa Eyeoglu
963627fe98
Revert "chore: better explain quilt loader beacon" 
This reverts commit a2a09ffe01fe8eb6cd1f557b0feb98ed0271151e.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-20 13:23:08 +02:00
TheKodeToad
f99b04bd16
Merge pull request #1320 from TheKodeToad/better-launch 
Combine launch buttons in instance window, persist profiler
 2023-08-19 11:08:02 +01:00
Trial97
ab6301d5a1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-19 00:38:40 +03:00
Sefa Eyeoglu
3098aecf97
Merge pull request #1498 from Scrumplex/neoforge 2023-08-18 22:56:55 +02:00
Trial97
05094b7382
more fixes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-18 22:24:30 +03:00
Trial97
58efd3e9e2
fixed code scaning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-18 21:43:57 +03:00
Trial97
4c52b18bdd
replaced removeFirst with mid 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-18 20:19:51 +03:00
Trial97
44ff247f5f
feat:refactored modpack ux 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-18 20:03:02 +03:00
Trial97
d3acac16e6
added -Wno-gnu-zero-variadic-macro-arguments and fixed more warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-18 13:10:13 +03:00
Alexandru Ionut Tripon
28ffa8bf44
Update launcher/ui/pages/global/MinecraftPage.ui 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-08-18 12:57:08 +03:00
Trial97
6d1c67663d
feat:added option to show playtime in hours 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-18 12:24:28 +03:00
Sefa Eyeoglu
f4ebeedc21
fix: fix browse button size in skin upload dialog 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-18 09:01:57 +02:00
TheKodeToad
ffd8ed550f
Reformat 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-17 18:53:32 +01:00
Trial97
c5bac475e8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-17 17:29:57 +03:00
Sefa Eyeoglu
e88418ab7f
Merge pull request #1392 from Scrumplex/feat-native-override 2023-08-17 16:09:16 +02:00
Trial97
044ce4df32
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file 2023-08-17 15:24:14 +03:00
Trial97
4a1d85f999
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-17 14:23:37 +03:00
Trial97
5e2d1ffdfb
removed line 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-17 00:23:53 +03:00
TheKodeToad
3e2733d840
Merge branch 'develop' into better-launch 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-16 22:23:38 +01:00
Trial97
bad44ea264
feat:added flame install mod metadata 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-17 00:14:49 +03:00