Trial97
|
3234bb5a8c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve
|
2023-11-23 17:05:37 +02:00 |
|
Trial97
|
bb9df1684b
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into new_cats
|
2023-11-23 16:58:42 +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
|
9c13504b06
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_ok
|
2023-11-23 16:13:09 +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
|
85e875fe08
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day
|
2023-11-23 15:32:48 +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
|
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
|
a1ac3ef7ae
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day
|
2023-11-23 10:43:15 +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
|
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
|
a8aa214c0e
|
changed prism aniversary
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-19 09:01:59 +02:00 |
|
Trial97
|
e99926ea94
|
Added more open folder actions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-19 02:40:25 +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 |
|
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
|
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
|
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
|
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 |
|
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 |
|
Trial97
|
8897f16d1d
|
simplify microsoft login
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-07 10:52:52 +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 |
|
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
|
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 |
|
Alex
|
cf4144cb50
|
Fixed link to Fulmine's website
Signed-off-by: Alex <akim8@emich.edu>
|
2023-11-05 00:46:05 -04:00 |
|
Trial97
|
a4978946d5
|
disabled lax deps
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-04 00:07:51 +02:00 |
|
TheKodeToad
|
b446bdf4a9
|
Merge pull request #1783 from Trial97/visual_bug
Fixed visual bug with Modlist export
|
2023-11-03 15:20:57 +00: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
|
b18082376d
|
Fixed visual bug with Modlist export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-03 11:04:13 +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 |
|
Trial97
|
1490193402
|
added button to disable dependencies on the mod review
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-30 22:14:26 +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 |
|
txtsd
|
38d77b58cd
|
Merge pull request #1748 from LocalSpook/using
|
2023-10-25 16:08:42 +00:00 |
|
Trial97
|
d4d345ee7d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps
|
2023-10-24 23:40:36 +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
|
87f2f88d4c
|
fix: java memory not set on initial setup
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-23 23:38:03 +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 |
|
Alexandru Ionut Tripon
|
2c4af7e793
|
Merge pull request #1290 from Trial97/refactor/NetActions
Refactor ImgurUpload
|
2023-10-21 12:32:16 +01:00 |
|
Alexandru Ionut Tripon
|
f0fd1bd5e5
|
Merge pull request #1737 from Trial97/fix_ftb_app_import_icon
Fixed FTBApp import icon
|
2023-10-21 07:48:21 +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 |
|
Tayou
|
b9c1dc7325
|
Merge pull request #1374 from Trial97/welcome_background
Added welcome screen
|
2023-10-19 20:42:47 +02:00 |
|
Trial97
|
03a27d5b5a
|
Updated Managed Packs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-19 19:47:48 +03:00 |
|
Trial97
|
8d4f508cc6
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent
|
2023-10-18 18:08: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 |
|
TheKodeToad
|
c638a63a03
|
Merge pull request #1726 from Trial97/contrib
Added Trial97 as maintainer in about dialog
|
2023-10-18 09:34:12 +01:00 |
|
Trial97
|
165d218300
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into contrib
|
2023-10-18 09:07:36 +03:00 |
|
Sefa Eyeoglu
|
d348f20dd9
|
fix: allow loading themes with missing resources folder
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-10-17 10:00:17 +02:00 |
|
Tayou
|
436db23ffc
|
Merge pull request #1268 from Ryex/feat/launcher-updater
Feat: Windows (And portable linux / appimage) Auto Updater
|
2023-10-16 19:53:50 +02:00 |
|
Alexandru Ionut Tripon
|
0927035a26
|
Merge pull request #1549 from Trial97/atlauncher_browser
added suport for atlauncher browser download
|
2023-10-16 06:39:12 +01:00 |
|
Tayou
|
5985d8b118
|
Merge pull request #1383 from TheKodeToad/rename-groups
Rename groups
|
2023-10-15 23:38:27 +02: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
|
9d15255e0a
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into atlauncher_browser
|
2023-10-15 20:52:38 +03:00 |
|
Trial97
|
ca9b593483
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
|
2023-10-15 20:44:45 +03:00 |
|
Trial97
|
6bbff310bc
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater
|
2023-10-15 17:42:39 +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
|
7e6a08548d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater
|
2023-10-09 19:58:43 +03:00 |
|
Sefa Eyeoglu
|
03ad430699
|
Merge pull request #1537 from Trial97/warnings
|
2023-10-04 09:40:38 +02:00 |
|
Tayou
|
540fc7d2a8
|
Merge pull request #1670 from Trial97/seg_fault
Don't update mods if no mod loader is installed
|
2023-10-02 17:05:07 +02:00 |
|
Trial97
|
93be8b0735
|
refresh default account when list changes
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-02 09:13:02 +03: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
|
34294383eb
|
added version type to dep update
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-28 23:18:23 +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 |
|