Danny Dorazio
|
3638fc0a7d
|
Update “Welcome” message on account list page
|
2023-08-20 23:00:50 -04:00 |
|
Danny Dorazio
|
8092c321a9
|
Replace instances of “Minecraft account”
|
2023-08-20 23:00:25 -04:00 |
|
Sefa Eyeoglu
|
5b4dcae7d9
|
Revert "feat: add toggle for quilt beacon"
This reverts commit 89aaedc06c.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-20 13:23:11 +02:00 |
|
Sefa Eyeoglu
|
963627fe98
|
Revert "chore: better explain quilt loader beacon"
This reverts commit a2a09ffe01.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-20 13:23:08 +02: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 |
|
Sefa Eyeoglu
|
3098aecf97
|
Merge pull request #1498 from Scrumplex/neoforge
|
2023-08-18 22:56:55 +02:00 |
|
Trial97
|
05094b7382
|
more fixes
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-18 22:24:30 +03:00 |
|
Trial97
|
58efd3e9e2
|
fixed code scaning
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-18 21:43:57 +03:00 |
|
Trial97
|
4c52b18bdd
|
replaced removeFirst with mid
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-18 20:19:51 +03:00 |
|
Trial97
|
44ff247f5f
|
feat:refactored modpack ux
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-18 20:03:02 +03:00 |
|
Alexandru Ionut Tripon
|
28ffa8bf44
|
Update launcher/ui/pages/global/MinecraftPage.ui
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-08-18 12:57:08 +03: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 |
|
Sefa Eyeoglu
|
e88418ab7f
|
Merge pull request #1392 from Scrumplex/feat-native-override
|
2023-08-17 16:09:16 +02:00 |
|
Trial97
|
044ce4df32
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file
|
2023-08-17 15:24:14 +03: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
|
b0e197de38
|
removed warning for one mod selected
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-16 21:26:43 +03:00 |
|
Alexandru Ionut Tripon
|
6c2c724bd9
|
Update launcher/ui/pages/instance/ExternalResourcesPage.ui
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-08-16 21:03:09 +03:00 |
|
Trial97
|
f919d363b7
|
made safe for vegetarians
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-16 20:02:32 +03:00 |
|
Trial97
|
589d8b6923
|
feat:Added remove metadata button
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-16 19:53:39 +03:00 |
|
Trial97
|
cf27d2f9ab
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 12:49:21 +03:00 |
|
Trial97
|
6c362afc21
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 12:41:46 +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
|
52e5ee7111
|
feat: add NeoForge to UIs
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 11:06:14 +02:00 |
|
Sefa Eyeoglu
|
06aba530d7
|
fix: add missing header
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 10:52:40 +02:00 |
|
Sefa Eyeoglu
|
83aa0062c7
|
feat: add custom native library path settings
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 10:51:21 +02:00 |
|
Sefa Eyeoglu
|
1939e3e6ed
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 09:02:15 +02:00 |
|
Trial97
|
9546c77113
|
Some warnings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 00:52:34 +03:00 |
|
Trial97
|
0ba88ff138
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into staging
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 00:33:24 +03:00 |
|
Sefa Eyeoglu
|
215d7dbb74
|
chore: update license headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-14 18:17:05 +02:00 |
|
Sefa Eyeoglu
|
91ba4cf75e
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-14 18:16:53 +02:00 |
|
Alexandru Ionut Tripon
|
b3b2e9df35
|
Merge branch 'develop' into feat/acknowledge_release_type
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-08-12 12:42:30 +03:00 |
|
Sefa Eyeoglu
|
35358f8180
|
Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings
|
2023-08-12 11:17:11 +02:00 |
|
Sefa Eyeoglu
|
6423edaa76
|
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle
|
2023-08-12 10:58:27 +02:00 |
|
Sefa Eyeoglu
|
396f812496
|
Merge pull request #1230 from TheKodeToad/better-component-installation
Revamp loader installation UI
|
2023-08-11 08:24:14 +02:00 |
|
Sefa Eyeoglu
|
ef6f9487f4
|
Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings
|
2023-08-10 20:38:32 +02:00 |
|
Sefa Eyeoglu
|
2090f958c8
|
Merge pull request #1324 from leia-uwu/ui-tweaks
|
2023-08-10 12:24:41 +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 |
|
Trial97
|
f7e8ec1855
|
format files
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-05 21:17:38 +03:00 |
|
TheKodeToad
|
f25d0a4e0e
|
Merge branch 'develop' into env-vars
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-05 18:01:53 +01:00 |
|
Trial97
|
1d3f2674d1
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-05 19:21:37 +03:00 |
|
Trial97
|
b2fdd83594
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-05 19:09:10 +03:00 |
|
Trial97
|
91eb30f037
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pack_changelog
|
2023-08-05 19:04:53 +03:00 |
|
Trial97
|
e7c2274893
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file
|
2023-08-05 19:02:11 +03:00 |
|
Trial97
|
377fc0352a
|
Merge branch 'staging' of https://github.com/PrismLauncher/PrismLauncher into icons
|
2023-08-05 19:00:12 +03:00 |
|
Sefa Eyeoglu
|
304e294ea7
|
Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-class
|
2023-08-04 20:31:43 +02:00 |
|
Sefa Eyeoglu
|
1d638e018a
|
chore: update license headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-04 19:41:47 +02:00 |
|
TheKodeToad
|
c5bffed21e
|
Merge branch 'PrismLauncher:develop' into skinfix
|
2023-08-04 16:29:30 +01:00 |
|
TheKodeToad
|
d48dd7eb6a
|
Use override-based setting for online fixes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-04 16:00:02 +01:00 |
|
TheKodeToad
|
afaf6f894c
|
Merge branch 'PrismLauncher:develop' into better-component-installation
|
2023-08-02 20:27:37 +01:00 |
|
Sefa Eyeoglu
|
1d468ac35a
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:35 +02:00 |
|
Sefa Eyeoglu
|
01d3eea379
|
Merge pull request #1359 from Trial97/import
|
2023-08-02 18:25:51 +02:00 |
|
Alexandru Ionut Tripon
|
f13eccb03d
|
Update launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-08-02 19:24:58 +03:00 |
|
Rachel Powers
|
2d1197f59f
|
Merge branch 'develop' into refactor/net-split-headers-to-proxy-class
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-31 22:26:20 -07: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 |
|
Trial97
|
97ff7afbe7
|
keep the icon suffix
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-28 08:37:45 +03:00 |
|
Trial97
|
b15f689ccf
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
|
2023-07-27 00:03:42 +03:00 |
|
tjw123hh
|
280f041acb
|
Delete some incorrect notr="true" tags
Signed-off-by: tjw123hh <tjw123hh@outlook.com>
|
2023-07-25 17:35:31 +08:00 |
|
tjw123hh
|
6a01c277e8
|
Delete some incorrect tags
|
2023-07-24 20:41:22 +08:00 |
|
Trial97
|
b31644e228
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-22 18:16:03 +03: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
|
bfafbdc51e
|
Merge branch 'develop' into env-vars
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-21 14:30:24 +01:00 |
|
TheKodeToad
|
0be4db30eb
|
Merge branch 'PrismLauncher:develop' into better-component-installation
|
2023-07-21 11:02:57 +01:00 |
|
TheKodeToad
|
c37e1fb9f1
|
Merge branch 'develop' into skinfix
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-20 18:11:27 +01:00 |
|
Trial97
|
015f88bf83
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-18 23:46:19 +03:00 |
|
Trial97
|
02082cda09
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file
|
2023-07-18 23:40:11 +03:00 |
|
Trial97
|
5eec0f5901
|
feat:managed packs can update from file
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-18 23:40:03 +03:00 |
|
Tayou
|
e8c44e700d
|
Merge pull request #1286 from TayouVR/better-instance-group-separator
|
2023-07-17 11:55:31 +02:00 |
|
Sefa Eyeoglu
|
aaf1726965
|
Merge pull request #1357 from getchoo/quilt-beacon
feat: add toggle for quilt beacon
|
2023-07-17 06:42:46 +02:00 |
|
seth
|
5e0df9b696
|
Merge pull request #1276 from Scrumplex/print-build-platform
Print build platform on launch
|
2023-07-16 17:15:55 -04:00 |
|
Trial97
|
a3ffa64550
|
Upgraded pack changelog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-16 01:59:08 +03:00 |
|
Trial97
|
06fc8358d9
|
auto focus search line on resource download
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-15 23:57:32 +03:00 |
|
seth
|
a2a09ffe01
|
chore: better explain quilt loader beacon
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-15 14:25:05 -04:00 |
|
Trial97
|
21ffed3bf5
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-15 20:35:11 +03:00 |
|
Trial97
|
7befd63cce
|
fixed settings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-15 00:28:58 +03:00 |
|
Trial97
|
149b6d59cf
|
fixed tests
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:22:11 +03:00 |
|
Trial97
|
db9f5f44e0
|
Split in two the options
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 22:26:22 +03:00 |
|
Trial97
|
cebb4dd17a
|
made the number of concurrent tasks configurable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 20:39:53 +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 |
|
Trial97
|
843c2d67eb
|
Added FTBAPP Import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-13 18:41:29 +03:00 |
|
seth
|
89aaedc06c
|
feat: add toggle for quilt beacon
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-12 21:10:48 -04:00 |
|
TheKodeToad
|
997a3709d4
|
Custom environment variables UI and implementation
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-12 19:21:38 +01:00 |
|
Trial97
|
766e833a73
|
fixed crash if no version is loaded
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-12 16:25:05 +03: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 |
|
TheKodeToad
|
4c69290381
|
Merge branch 'develop' into better-component-installation
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-11 11:14:06 +01:00 |
|
TheKodeToad
|
91c9082d19
|
Merge pull request #1249 from Trial97/curse
Curseforge modpack export
|
2023-07-10 14:20:29 +01:00 |
|
TheKodeToad
|
4f4ccdaa59
|
Merge pull request #1338 from Trial97/unlockVersionPage
feat:unlocked versions page
|
2023-07-10 13:06:32 +01:00 |
|
TheKodeToad
|
f816e3cd3f
|
Merge pull request #1241 from Trial97/settings
Allow editing of running instances
|
2023-07-09 22:10:43 +01:00 |
|
Trial97
|
308877aa8f
|
removed redundant code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-09 23:18:38 +03:00 |
|
Trial97
|
159f14c076
|
feat:unlocked versions page
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-09 22:47:38 +03:00 |
|
TheKodeToad
|
08c140b9b4
|
Fix actionVisitItemPage insersion, and prevent widebar segfault
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-08 20:55:30 +01:00 |
|
Trial97
|
bc2940e16a
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-08 00:14:05 +03:00 |
|
Tayou
|
1131038fdb
|
Merge pull request #1120 from Trial97/visit_mod_page
|
2023-07-07 22:23:59 +02:00 |
|
Sefa Eyeoglu
|
51e62761ee
|
fix: improve QUrl construction
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-07 19:25:12 +02:00 |
|
TheKodeToad
|
b8482a5d89
|
Update ModFolderPage.cpp
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-07 15:53:50 +01:00 |
|
Trial97
|
3139af8487
|
Made action text simpler
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-07 17:12:10 +03:00 |
|
Sefa Eyeoglu
|
073cb91f88
|
fix(ui): validate meta override url
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-07 15:56:07 +02: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 |
|