Trial97
|
cf2393a509
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings
|
2023-07-02 15:56:39 +03:00 |
|
Trial97
|
6c4cf085e0
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-02 12:50:45 +03:00 |
|
Sefa Eyeoglu
|
b51f1f1d41
|
Merge pull request #1298 from TurboWafflz/develop
|
2023-07-02 09:52:59 +02:00 |
|
Finian Wright
|
3fe518ff2b
|
Fix compiling on OpenBSD
Signed-off-by: Finian Wright <turbowafflz@gmail.com>
|
2023-07-02 00:36:21 -04:00 |
|
seth
|
c523765c19
|
Merge pull request #1292 from Trial97/export5
Removed logs from instance export
|
2023-07-01 04:14:35 +00:00 |
|
Trial97
|
18e628e873
|
removed extra condition
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-30 12:10:00 +03:00 |
|
Trial97
|
81207c6502
|
Made sure the logs are ignored when collecting files
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-30 10:52:10 +03:00 |
|
Trial97
|
87efa700ab
|
Removed logs from instance export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-30 00:01:36 +03:00 |
|
Trial97
|
0008b22d8b
|
Renamed function
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-28 18:41:47 +03:00 |
|
Trial97
|
8f9bd9617f
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into scale_cat
|
2023-06-28 18:29:04 +03:00 |
|
Trial97
|
0f64ee6a5f
|
Added warnings for running instances
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-28 18:28:25 +03:00 |
|
Trial97
|
c23bf2fd22
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings
|
2023-06-28 17:46:01 +03:00 |
|
Sefa Eyeoglu
|
faec21d572
|
Merge pull request #1266 from TheKodeToad/smol-tweaks
|
2023-06-28 08:47:53 +02:00 |
|
seth
|
213f03351f
|
Merge pull request #1280 from Trial97/shortcut
Fixed illegal characters in shortcuts name
|
2023-06-27 20:01:48 +00:00 |
|
Rachel Powers
|
00be211169
|
Update launcher/FileSystem.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-06-27 13:01:28 -07:00 |
|
seth
|
90fc720190
|
Merge pull request #1281 from Trial97/screenshot
Added more information to the screenshot upload warning
|
2023-06-27 20:01:18 +00:00 |
|
Rachel Powers
|
23b3711f96
|
fix(filesystem): track failed copies and clones
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-06-27 12:41:36 -07:00 |
|
Trial97
|
54cb077b40
|
Added more information to the screenshot upload warning
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-27 19:31:36 +03:00 |
|
Trial97
|
92847b9774
|
omit icon remove on macos
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-27 19:15:20 +03:00 |
|
Trial97
|
6e5716f097
|
Fixed illegal characters in shortcuts name
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-27 19:05:32 +03:00 |
|
TheKodeToad
|
904b128afe
|
Merge pull request #1277 from Trial97/remove_mojang
Removed unused files
|
2023-06-26 23:09:27 +01:00 |
|
Trial97
|
dffffc784e
|
Removed unused files
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-26 22:33:10 +03:00 |
|
Sefa Eyeoglu
|
d25452a64e
|
Merge pull request #1274 from TheKodeToad/java-signature
|
2023-06-26 11:19:53 +02:00 |
|
Sefa Eyeoglu
|
41d0f74750
|
Merge pull request #1275 from Scrumplex/git-blame-ignore
|
2023-06-26 10:56:26 +02:00 |
|
Alexandru Ionut Tripon
|
22bb260ae3
|
Update launcher/ui/dialogs/ExportToModListDialog.cpp
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-06-26 11:45:26 +03:00 |
|
Alexandru Ionut Tripon
|
d82ae31fc1
|
Update launcher/ui/dialogs/ExportToModListDialog.cpp
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-06-26 11:45:05 +03:00 |
|
Alexandru Ionut Tripon
|
cf5c01a5b1
|
Update launcher/ui/dialogs/ExportToModListDialog.cpp
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-06-26 11:44:55 +03:00 |
|
Alexandru Ionut Tripon
|
f2015eee80
|
Update launcher/ui/MainWindow.ui
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-06-26 11:44:47 +03:00 |
|
Sefa Eyeoglu
|
f8f1c3cf23
|
chore: add Git Blame ignore file
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-06-26 09:08:03 +02:00 |
|
Sefa Eyeoglu
|
ed4dce2fb6
|
fix: install logo to multimc theme in genicons.sh
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-06-26 08:59:48 +02:00 |
|
Sefa Eyeoglu
|
4d49486cc9
|
Merge pull request #1065 from leo78913/gamescope-close-button
|
2023-06-26 08:45:28 +02:00 |
|
TheKodeToad
|
8bebd7f042
|
Generate special signature ✨ composed of multiple elements instead of relying on timestamp for Java version cache invalidation
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-06-26 01:30:47 +01:00 |
|
seth
|
903fae94be
|
Merge pull request #1272 from Trial97/fix_selected
fix: Page container extra info set on logs page
|
2023-06-25 21:16:18 +00:00 |
|
Trial97
|
6d0e255ca1
|
fix: Page container extra info set on logs page
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 22:00:33 +03:00 |
|
TheKodeToad
|
1bd778d0ae
|
Merge pull request #1270 from TheKodeToad/fix-unchecked-value
Fix unsafe usage of std::optional::value in FlameAPI
|
2023-06-25 18:24:29 +01:00 |
|
Trial97
|
87155e346c
|
Complicated a little task progress
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 19:44:18 +03:00 |
|
Trial97
|
52dd09bdf7
|
Merge branch 'curse' of github.com:Trial97/PrismLauncher into curse
|
2023-06-25 17:51:30 +03:00 |
|
Trial97
|
d344ffe370
|
Removed some setProgress calls
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 17:50:56 +03:00 |
|
TheKodeToad
|
4745ab64cd
|
Deduplicate launcher icon
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-06-25 15:02:25 +01:00 |
|
TheKodeToad
|
288ea3d19b
|
Remove metaurl function
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-06-25 14:52:33 +01:00 |
|
TheKodeToad
|
8ade44c9a3
|
Simplify
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-06-25 14:40:22 +01:00 |
|
Trial97
|
fa3a46498f
|
Removed dupliacte code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 16:23:50 +03:00 |
|
Leo
|
953a2590e2
|
Add fixme comment for no SSD detection
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Leo <leo3758@riseup.net>
|
2023-06-25 10:11:58 -03:00 |
|
TheKodeToad
|
02b628653b
|
Fix markdown header
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-06-25 13:43:03 +01:00 |
|
Trial97
|
3546f57a42
|
Use internal markdown implementation
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 15:17:09 +03:00 |
|
Trial97
|
8d3bc6b6b9
|
Added markdown QT version check
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 14:58:54 +03:00 |
|
TheKodeToad
|
c75ba0f855
|
Fix big mistake :iea:
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-06-25 12:46:07 +01:00 |
|
Trial97
|
d1603f1945
|
Made it more similar to mrpack export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 14:43:11 +03:00 |
|
Trial97
|
84c63f4f01
|
Added plantxt export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 14:11:41 +03:00 |
|
TheKodeToad
|
514080653f
|
Fix unsafe usage of std::optional::value in FlameAPI
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-06-25 11:56:28 +01:00 |
|