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
|
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 |
|
Sefa Eyeoglu
|
df14f88307
|
Merge pull request #1532 from Trial97/curseforge-url-handle
|
2023-08-27 12:26:57 +02:00 |
|
Trial97
|
e6ba2f4970
|
Added loaders check on versions load
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-23 12:52:51 +03:00 |
|
TheKodeToad
|
f7951f6082
|
Merge pull request #1548 from Trial97/version_label
Reset status label when deleting instance
|
2023-08-22 15:14:02 +01:00 |
|
Trial97
|
c3d03f0c33
|
added check for valid query items in curse url install
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-21 22:20:33 +03:00 |
|
Danny Dorazio
|
8092c321a9
|
Replace instances of “Minecraft account”
|
2023-08-20 23:00:25 -04:00 |
|
Trial97
|
19316e22b4
|
fixed status label after instance remove
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-20 22:46:44 +03:00 |
|
TheKodeToad
|
f99b04bd16
|
Merge pull request #1320 from TheKodeToad/better-launch
Combine launch buttons in instance window, persist profiler
|
2023-08-19 11:08:02 +01:00 |
|
Trial97
|
6d1c67663d
|
feat:added option to show playtime in hours
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-18 12:24:28 +03:00 |
|
TheKodeToad
|
ffd8ed550f
|
Reformat
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-17 18:53:32 +01:00 |
|
Trial97
|
5e2d1ffdfb
|
removed line
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-17 00:23:53 +03:00 |
|
TheKodeToad
|
3e2733d840
|
Merge branch 'develop' into better-launch
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-16 22:23:38 +01:00 |
|
Trial97
|
bad44ea264
|
feat:added flame install mod metadata
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-17 00:14:49 +03:00 |
|
Trial97
|
c94ee67077
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle3
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 12:16:00 +03:00 |
|
Sefa Eyeoglu
|
7ba1e7d356
|
Merge pull request #1407 from TheKodeToad/icon-indexing
|
2023-08-15 10:43:29 +02:00 |
|
Sefa Eyeoglu
|
91ba4cf75e
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-14 18:16:53 +02:00 |
|
Sefa Eyeoglu
|
019e5ca3e8
|
fix: use ApiDownload for CF URL handling
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-12 11:11:58 +02:00 |
|
Sefa Eyeoglu
|
ef6f9487f4
|
Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings
|
2023-08-10 20:38:32 +02:00 |
|
Tayou
|
9afa7cc91f
|
Merge branch 'develop' into icon-indexing
Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>
|
2023-08-07 10:32:38 +02:00 |
|
Sefa Eyeoglu
|
74fe2fb2a6
|
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle
|
2023-08-06 21:54:00 +02:00 |
|
Sefa Eyeoglu
|
a83e5be8f2
|
fix: makeShared for QByteArray
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-06 21:51:03 +02:00 |
|
Rachel Powers
|
b9fe37aec1
|
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-30 15:33:46 -07:00 |
|
Alexandru Ionut Tripon
|
31b62203a7
|
Update launcher/ui/MainWindow.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-07-26 23:44:35 +03:00 |
|
Trial97
|
e6b4fc9182
|
removed quilt warning
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-26 21:36:40 +03:00 |
|
TheKodeToad
|
816acc9c76
|
Open catpak folder action
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-26 17:19:39 +01:00 |
|
TheKodeToad
|
57430fd189
|
Merge branch 'develop' into better-launch
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-22 11:26:02 +01:00 |
|
TheKodeToad
|
842f08dcfc
|
(UX) Add open folder button next to combo boxes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-20 11:54:15 +01:00 |
|
TheKodeToad
|
54d393632d
|
Automatically create theme folders, and add an action to open them
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-19 16:29:52 +01:00 |
|
Trial97
|
ab10524cd7
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:45:40 +03:00 |
|
Rachel Powers
|
520594e529
|
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-13 20:05:16 -07:00 |
|
Sefa Eyeoglu
|
06a7d447f6
|
Merge pull request #1333 from Ryex/fix/null_instance_edit_crash
|
2023-07-12 15:53:46 +02:00 |
|
Rachel Powers
|
149bc8e9ce
|
cleanup: pull out data object so I'm not repeating myself
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-11 21:42:34 -07:00 |
|
Rachel Powers
|
9957aeb003
|
Merge branch 'develop' into curseforge-url-handle
|
2023-07-11 21:42:29 -07:00 |
|
Rachel Powers
|
1aa5fa03f9
|
Update launcher/ui/MainWindow.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-10 12:05:01 -07:00 |
|
Nathan
|
99ba02afb6
|
Shortcuts on macOS (#1081)
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-10 20:26:25 +02:00 |
|
TheKodeToad
|
91c9082d19
|
Merge pull request #1249 from Trial97/curse
Curseforge modpack export
|
2023-07-10 14:20:29 +01:00 |
|
Rachel Powers
|
a54bbae622
|
fix(instance edit): don't allow editing if no selected instance or instance doesn't support editing
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-08 12:59:55 -07:00 |
|
TheKodeToad
|
22327bbe71
|
Combine launch buttons in Instance window, persist profiler
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-06 18:07:45 +01: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 |
|
Rachel Powers
|
8d7dcdfc5b
|
chore: fix shadowed member and signed/unsigned mismatch
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: supress unused with [[maybe_unused]]
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: unshadow ^&^& static_cast implicit return
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: deshadow and mark unused in parse task
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: mark unused in folder models
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: deshadow and mark unused with instances
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: more deshadow and unused
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: remove uneeded simicolons
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: mark unused
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: prevent shadow
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-01 23:39:38 -07: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
|
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 |
|
Sefa Eyeoglu
|
4d49486cc9
|
Merge pull request #1065 from leo78913/gamescope-close-button
|
2023-06-26 08:45:28 +02: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 |
|
Trial97
|
84c63f4f01
|
Added plantxt export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 14:11:41 +03:00 |
|
Trial97
|
fd5b155ee7
|
Added error message when exporting snapshots with curseforge
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 12:24:59 +03:00 |
|