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
|
403a7f5d46
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps2
|
2023-11-23 23:21:11 +02:00 |
|
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
|
0d44c0df1d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats
|
2023-11-23 16:50:53 +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
|
85e875fe08
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day
|
2023-11-23 15:32:48 +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
|
a1ac3ef7ae
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day
|
2023-11-23 10:43:15 +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
|
140a55810d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2023-11-22 14:20:30 +02: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
|
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 |
|
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
|
bedb4da869
|
Added filename to the modlist export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-14 19:37:23 +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 |
|