Sefa Eyeoglu
|
67d088dc53
|
fix: simplify openPath calls
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2024-01-14 11:36:17 +01:00 |
|
Tayou
|
35ad4448d9
|
Merge pull request #2012 from Trial97/openal_settings
Fixed openAL placeholder
|
2024-01-07 00:21:21 +01:00 |
|
TheKodeToad
|
f285c3fe13
|
Merge pull request #1972 from lumiscosity/feature/cat_opacity
Add a cat opacity option
|
2024-01-06 19:42:17 +00:00 |
|
Trial97
|
219e2862f9
|
Fixed openAL placeholder
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-01-05 23:02:42 +02:00 |
|
Alexandru Ionut Tripon
|
57a589367f
|
Merge pull request #1979 from lumiscosity/feature/mod_page_improvements
Mod downloader page improvements
|
2024-01-03 22:43:18 +02:00 |
|
Sefa Eyeoglu
|
9523a2d77b
|
Merge pull request #1999 from TheKodeToad/more-legacy-fixes
|
2024-01-03 18:16:41 +01:00 |
|
TheKodeToad
|
05e4533096
|
Add online mode fix for legacy versions; minor refactors in legacy
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2024-01-02 18:11:54 +00:00 |
|
timoreo
|
0ce0769842
|
Merge pull request #1978 from Trial97/double_links
|
2023-12-28 19:48:34 +01:00 |
|
lumiscosity
|
c29af83dc3
|
fix styling
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
|
2023-12-23 14:16:29 +01:00 |
|
lumiscosity
|
1e48bf838d
|
move simplify call to drawing
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
|
2023-12-23 12:05:07 +01:00 |
|
lumiscosity
|
1bf386603d
|
Strip newlines in mod descriptions
Mirrors Modrinth page behaviour.
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
|
2023-12-23 11:27:19 +01:00 |
|
Trial97
|
9a33bdcf50
|
Fixed openURL cast for resource
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-12-23 01:02:04 +02:00 |
|
Trial97
|
526e580fbb
|
Force clear the resource selection
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-12-23 00:33:38 +02:00 |
|
lumiscosity
|
358cf5b348
|
add archived project warning
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
|
2023-12-22 22:04:33 +01:00 |
|
lumiscosity
|
43306350e0
|
Add cat opacity
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
|
2023-12-22 15:02:41 +01:00 |
|
lumiscosity
|
eb8e150fa8
|
one more
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
|
2023-12-16 13:00:22 +01:00 |
|
lumiscosity
|
56397446db
|
Update ModFolderPage.cpp
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
|
2023-12-16 12:53:59 +01:00 |
|
Sefa Eyeoglu
|
0ccdcd23e3
|
fix: open paths directly
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-12-14 13:02:29 +01:00 |
|
Trial97
|
763eab6b96
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2023-12-13 14:48:31 +02:00 |
|
Trial97
|
4498d32cc0
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
|
2023-12-13 14:37:02 +02:00 |
|
Trial97
|
d10b075677
|
Sort mods before export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-12-13 14:36:58 +02:00 |
|
Sefa Eyeoglu
|
79218cf13b
|
Merge pull request #1738 from Trial97/some_removals
|
2023-12-11 11:08:26 +01:00 |
|
Sefa Eyeoglu
|
f8a6a099c7
|
Merge pull request #1732 from Trial97/update_file2
|
2023-12-11 11:08:07 +01:00 |
|
Trial97
|
6f6b6312a5
|
Moved the button up
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-27 09:39:31 +02:00 |
|
Trial97
|
2d91bd09d4
|
Fixed crash on abort function not initialized
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-26 23:49:56 +02:00 |
|
Trial97
|
f4e098f7f5
|
Formated file
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-25 09:36:55 +02:00 |
|
Trial97
|
1a0fd5f993
|
Added mod reinstall dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-25 00:18:10 +02:00 |
|
Trial97
|
20e0cb43b9
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent
|
2023-11-23 23:58:47 +02:00 |
|
Trial97
|
2db5677281
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2023-11-23 23:57:44 +02:00 |
|
Trial97
|
ff5a968de0
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file2
|
2023-11-23 23:57:20 +02:00 |
|
Trial97
|
1650237c8f
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into some_removals
|
2023-11-23 23:37:13 +02:00 |
|
Trial97
|
c5cdebb42f
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into ftb_import
|
2023-11-23 16:43:33 +02:00 |
|
Trial97
|
2318a83881
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader
|
2023-11-23 16:33:57 +02:00 |
|
Trial97
|
9c13504b06
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_ok
|
2023-11-23 16:13:09 +02:00 |
|
Trial97
|
afcdb7595c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
|
2023-11-23 16:01:54 +02:00 |
|
Trial97
|
4f49a56e4d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into supported_files
|
2023-11-23 15:40:31 +02: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 |
|
Trial97
|
c2fc2d330b
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
|
2023-11-23 12:57:31 +02:00 |
|
Sefa Eyeoglu
|
a966289944
|
Merge pull request #1852 from Trial97/war_ning
|
2023-11-23 11:01:53 +01:00 |
|
Trial97
|
d8c5ed55c2
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file2
|
2023-11-23 12:00:18 +02:00 |
|
Trial97
|
6169af70db
|
Added back the FIXME comment
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-23 11:59:35 +02: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
|
e11b7e3770
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2023-11-23 10:46:27 +02:00 |
|
Trial97
|
d5d8b7be8d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
|
2023-11-23 10:45:35 +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
|
f0cff15d56
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into supported_files
|
2023-11-23 10:43:43 +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 |
|
Trial97
|
80c85aef99
|
fixed const stuff
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-19 15:37:18 +02:00 |
|
Alexandru Ionut Tripon
|
76216335b1
|
Update launcher/ui/pages/modplatform/ImportPage.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-11-19 15:26:47 +02:00 |
|
Trial97
|
f7e478c755
|
Added all supported files filter
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-19 02:02:02 +02:00 |
|
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
|
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
|
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
|
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 |
|
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 |
|
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
|
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 |
|
Alexandru Ionut Tripon
|
3e7f9083ca
|
Update launcher/ui/pages/instance/ModFolderPage.cpp
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-11-05 23:41:54 +02:00 |
|
TheKodeToad
|
bd9d5e0990
|
Reword
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-11-05 20:31:48 +00:00 |
|
Trial97
|
9a8667e99c
|
Added Global Dependenicies toggle
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-05 22:22:49 +02:00 |
|
Trial97
|
79e299123c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
|
2023-11-04 00:15:09 +02:00 |
|
Trial97
|
1b2654bfa6
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
|
2023-11-03 12:53:23 +02:00 |
|
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 |
|
LocalSpook
|
0de4d8902e
|
Remove top-level const qualifiers in function declarations
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
|
2023-10-28 22:12:09 -07:00 |
|
LocalSpook
|
9d972ccc63
|
Localize account type in account list
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
|
2023-10-26 13:32:33 -07: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 |
|
Trial97
|
04acd27dab
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent
|
2023-10-26 13:45:47 +03:00 |
|
Trial97
|
a5938a7de9
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-25 19:26:05 +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 |
|
Trial97
|
694840937b
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
|
2023-10-24 10:32:09 +03:00 |
|
Trial97
|
f7c9972db0
|
separated dependecy check from mod update
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-23 19:46:30 +03:00 |
|
Trial97
|
a748f49362
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent
|
2023-10-22 11:34:55 +03:00 |
|
Trial97
|
932cd9e262
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-22 11:32:05 +03:00 |
|
Trial97
|
d151e97e3a
|
Fixed some headers
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-21 22:40:37 +03:00 |
|
Trial97
|
41c9ca4f8a
|
Added categories filter
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-21 22:15:07 +03:00 |
|
Trial97
|
9e85297f7a
|
Connected filters
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-21 18:28:33 +03:00 |
|
Alexandru Ionut Tripon
|
2c4af7e793
|
Merge pull request #1290 from Trial97/refactor/NetActions
Refactor ImgurUpload
|
2023-10-21 12:32:16 +01:00 |
|
Trial97
|
a9d7af9096
|
removed some unused stuff
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-20 16:44:37 +03:00 |
|
Trial97
|
80723eeca1
|
Fixed FTBApp import icon
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-20 16:41:32 +03:00 |
|
Trial97
|
03a27d5b5a
|
Updated Managed Packs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-19 19:47:48 +03:00 |
|
Trial97
|
30f73a0696
|
Merge branch 'fail_concurrent_task' of github.com:Trial97/PrismLauncher into concurrent
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-18 18:08:31 +03:00 |
|
Trial97
|
fea4c4eba8
|
Updated filters
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-18 09:00:45 +03:00 |
|
Trial97
|
9400879242
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-16 23:32:24 +03:00 |
|
Trial97
|
869f654a10
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-16 22:46:11 +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 |
|
Trial97
|
5d56ac7cf2
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
|
2023-10-10 21:15:31 +03:00 |
|
Trial97
|
0b6373e4df
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-10 19:46:27 +03: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
|
2e4fcd6aa3
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-28 23:26:15 +03: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 |
|
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
|
abbac5c26c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-01 22:28:59 +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 |
|
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 |
|