Sefa Eyeoglu
|
bf6dc10f35
|
Merge pull request #1605 from TheKodeToad/flame-shaders
|
2023-09-16 18:20:45 +02:00 |
|
Trial97
|
6ec1cf6e49
|
made skin upload more generic
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-08 19:50:46 +03:00 |
|
Trial97
|
8c8e4329d7
|
fix codeql
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-05 23:45:32 +03:00 |
|
Trial97
|
8bad255a91
|
added more import options
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-05 20:13:16 +03:00 |
|
Trial97
|
ab648e58ce
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
|
2023-09-05 00:18:45 +03:00 |
|
Trial97
|
c86b8b0f70
|
added skin manage dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-05 00:18:36 +03:00 |
|
Sefa Eyeoglu
|
546d49e183
|
Merge pull request #1530 from Trial97/metadata_delete
|
2023-09-04 17:02:52 +02:00 |
|
TheKodeToad
|
94c1cd6bcf
|
CurseForge shader downloading
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-09-04 14:15:37 +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 |
|
Trial97
|
9ad029e028
|
added skins directory
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-01 23:10:33 +03:00 |
|
Trial97
|
17f696bffc
|
small tweaks to atl icons
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-01 22:25:15 +03:00 |
|
Trial97
|
e095780cc3
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into modrinth_pack
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-01 21:36:28 +03:00 |
|
Trial97
|
609eaa67ab
|
refactored skin apis
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-01 21:23:51 +03:00 |
|
TheKodeToad
|
25ce11d85d
|
Merge pull request #1539 from Trial97/refactor_modpack_ux
Improvements to modpack UX
|
2023-08-31 14:58:54 +01:00 |
|
TheKodeToad
|
befa3baa6a
|
Merge branch 'develop' into feat/launcher-updater
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-30 11:47:33 +01:00 |
|
TheKodeToad
|
8c30cb3706
|
Fix CI
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-29 13:27:06 +01:00 |
|
TheKodeToad
|
c1855c6ce3
|
Merge branch 'develop' into rename-groups
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-29 12:41:40 +01: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 |
|
Trial97
|
211865a1e1
|
handle gracefully the upload abort
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-28 13:31:19 +03:00 |
|
Sefa Eyeoglu
|
fbf6833124
|
Merge pull request #1519 from TheKodeToad/better-export-pack
|
2023-08-28 10:29:32 +02:00 |
|
Trial97
|
07d8598638
|
added catpacks tests
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-27 23:40:32 +03:00 |
|
Trial97
|
79652799bd
|
Made text smaller
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-27 21:30:46 +03:00 |
|
Trial97
|
630145a1d0
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background
|
2023-08-27 21:03:21 +03:00 |
|
Trial97
|
0680d2dceb
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-27 20:41:56 +03: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 |
|
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 |
|