964 Commits

Author SHA1 Message Date
Trial97
4f49a56e4d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into supported_files 2023-11-23 15:40: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
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
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
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
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
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
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
Trial97
2256850cb6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-10-27 00:12:50 +03: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
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
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
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