Alexandru Ionut Tripon
|
1bd69ecbb2
|
Update launcher/ui/pages/global/AccountListPage.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-11-03 11:42:40 +02:00 |
|
Trial97
|
127a31ba3a
|
Added warning for remove account
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-03 10:31:40 +02:00 |
|
Sefa Eyeoglu
|
3719ea21b0
|
Merge pull request #1355 from TheKodeToad/env-vars
Custom environment variables
|
2023-10-26 22:10:26 +02:00 |
|
TheKodeToad
|
bd11b93a0c
|
Use hidden tab bar like other pages
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-26 21:01:24 +01:00 |
|
Trial97
|
12d567a9b8
|
made env vars behave like the rest of the settings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-26 22:51:38 +03:00 |
|
LocalSpook
|
5be80df1ee
|
Replace typedef with using
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
|
2023-10-24 01:36:27 -07:00 |
|
Alexandru Ionut Tripon
|
2c4af7e793
|
Merge pull request #1290 from Trial97/refactor/NetActions
Refactor ImgurUpload
|
2023-10-21 12:32:16 +01:00 |
|
Trial97
|
80723eeca1
|
Fixed FTBApp import icon
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-20 16:41:32 +03:00 |
|
TheKodeToad
|
cc990c4f94
|
Merge branch 'develop' into env-vars
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-15 21:57:20 +01:00 |
|
TheKodeToad
|
c4882e7162
|
Merge pull request #443 from TheKodeToad/skinfix
Add legacy skin fix
|
2023-10-15 21:46:29 +01:00 |
|
Trial97
|
ca9b593483
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
|
2023-10-15 20:44:45 +03:00 |
|
TheKodeToad
|
6fb7a98901
|
Fix small mistake 😭
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-15 14:45:05 +01:00 |
|
TheKodeToad
|
7112d04df5
|
Mark setting as optional
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-15 14:11:08 +01:00 |
|
Tayou
|
7015b8f7b2
|
Merge pull request #1563 from Trial97/modrinth_pack
Pack import fixes and improvements
|
2023-10-13 16:38:37 +02:00 |
|
Alexandru Ionut Tripon
|
ca4b58d5d7
|
Merge pull request #1405 from Trial97/update_file
Allow updating managed packs from local file
|
2023-10-10 16:17:08 +01:00 |
|
Trial97
|
2cea7454ef
|
fix: do not update mods if no mod loader is selected
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-01 23:04:19 +03:00 |
|
Sefa Eyeoglu
|
eab1180f68
|
Merge pull request #1090 from Ryex/feat/acknowledge_release_type
|
2023-10-01 14:32:58 +02:00 |
|
Sefa Eyeoglu
|
e3a147f56d
|
Merge pull request #1656 from Trial97/remove_mojang2
|
2023-10-01 14:32:42 +02:00 |
|
Trial97
|
4802f6950e
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-28 23:06:18 +03:00 |
|
Sefa Eyeoglu
|
2ff9ef0620
|
Merge pull request #1363 from Trial97/download_threads
|
2023-09-28 22:02:57 +02:00 |
|
Trial97
|
9acbf98f94
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-28 22:50:12 +03:00 |
|
seth
|
f370f0d749
|
chore: cleanup a few more mentions of mojang accounts
Signed-off-by: seth <getchoo@tuta.io>
|
2023-09-27 05:34:48 -04:00 |
|
Trial97
|
7c636d4608
|
Removed mojang
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-25 17:44:04 +03:00 |
|
Sefa Eyeoglu
|
bf6dc10f35
|
Merge pull request #1605 from TheKodeToad/flame-shaders
|
2023-09-16 18:20:45 +02: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
|
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 |
|
TheKodeToad
|
25ce11d85d
|
Merge pull request #1539 from Trial97/refactor_modpack_ux
Improvements to modpack UX
|
2023-08-31 14:58:54 +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 |
|
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 |
|
TheKodeToad
|
479335dfe0
|
Rewrite optional mod dialog
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-27 00:50:33 +01:00 |
|
TheKodeToad
|
d1566f2610
|
Merge branch 'develop' into env-vars
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-26 23:12:02 +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 |
|
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 |
|