fn2006
|
70e6f323fe
|
fix regressions
|
2023-09-04 00:43:23 +01:00 |
|
fn2006
|
b6904ba50a
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
|
2023-09-04 00:39:20 +01:00 |
|
Sefa Eyeoglu
|
3098aecf97
|
Merge pull request #1498 from Scrumplex/neoforge
|
2023-08-18 22:56:55 +02:00 |
|
Sefa Eyeoglu
|
f4ebeedc21
|
fix: fix browse button size in skin upload dialog
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-18 09:01:57 +02: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
|
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 |
|
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 |
|
fn2006
|
847430b113
|
Merge branch 'release-7.x' of https://github.com/PrismLauncher/PrismLauncher into develop
|
2023-08-10 10:09:08 +01:00 |
|
Sefa Eyeoglu
|
74fe2fb2a6
|
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle
|
2023-08-06 21:54:00 +02:00 |
|
Sefa Eyeoglu
|
99fd1e622c
|
chore: replace fabricmc icons with SVG
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-06 17:46:33 +02:00 |
|
Trial97
|
377fc0352a
|
Merge branch 'staging' of https://github.com/PrismLauncher/PrismLauncher into icons
|
2023-08-05 19:00:12 +03:00 |
|
TheKodeToad
|
1bafa36c17
|
icon -> iconName
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-02 20:33:01 +01:00 |
|
TheKodeToad
|
afaf6f894c
|
Merge branch 'PrismLauncher:develop' into better-component-installation
|
2023-08-02 20:27:37 +01:00 |
|
TheKodeToad
|
8b3c465a50
|
Use protected inheritance for BasePageProvider
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-02 20:24:15 +01:00 |
|
TheKodeToad
|
40c614b3a5
|
Pressed -> Clicked (doh)
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-02 20:23:30 +01:00 |
|
Sefa Eyeoglu
|
01d3eea379
|
Merge pull request #1359 from Trial97/import
|
2023-08-02 18:25:51 +02:00 |
|
Apix
|
16e6a01881
|
fix: fix copyright year
Signed-off-by: Apix <apix0n@outlook.com>
|
2023-08-02 11:35:54 +02:00 |
|
Rachel Powers
|
7091bc81c2
|
chore(rename): fix unfinshed renames from deshadow changes
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-30 15:56:38 -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
|
4789708cc2
|
added missing )
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-28 13:16:57 +03:00 |
|
Alexandru Ionut Tripon
|
83fce74bb1
|
Update launcher/ui/dialogs/NewInstanceDialog.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-07-28 13:11:56 +03:00 |
|
Trial97
|
97ff7afbe7
|
keep the icon suffix
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-28 08:37:45 +03:00 |
|
LostLuma
|
f326db11f1
|
Ignore cache files entirely, also apply to modpack export
Signed-off-by: LostLuma <lilly@lostluma.net>
(cherry picked from commit 4a9ea832ff)
|
2023-07-27 07:40:51 +00:00 |
|
LostLuma
|
f8c6a33134
|
Address review comments
Signed-off-by: LostLuma <lilly@lostluma.net>
(cherry picked from commit a9fefb2eeb)
|
2023-07-27 07:40:51 +00:00 |
|
LostLuma
|
64228bdddf
|
Ignore cache files when exporting instances
Signed-off-by: LostLuma <lilly@lostluma.net>
(cherry picked from commit 361583edfc)
|
2023-07-27 07:40:51 +00:00 |
|
LostLuma
|
4a9ea832ff
|
Ignore cache files entirely, also apply to modpack export
Signed-off-by: LostLuma <lilly@lostluma.net>
|
2023-07-27 01:42:14 +02:00 |
|
LostLuma
|
a9fefb2eeb
|
Address review comments
Signed-off-by: LostLuma <lilly@lostluma.net>
|
2023-07-26 15:22:22 +02:00 |
|
LostLuma
|
361583edfc
|
Ignore cache files when exporting instances
Signed-off-by: LostLuma <lilly@lostluma.net>
|
2023-07-26 04:23:01 +02:00 |
|
TheKodeToad
|
0be4db30eb
|
Merge branch 'PrismLauncher:develop' into better-component-installation
|
2023-07-21 11:02:57 +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 |
|
TheKodeToad
|
fe1ea7240e
|
Merge pull request #1334 from TheKodeToad/litemod-dl
LiteMod downloading
|
2023-07-18 22:43:35 +02:00 |
|
Trial97
|
b0940d696b
|
Added QFutureWatcher
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
abort
forgot
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 17:52:00 +03:00 |
|
seth
|
1d4cf0fd03
|
Merge pull request #1329 from Ryex/fix/progress_dialog_centering
fix(progress dialog): if there is a parent center on creation
|
2023-07-16 20:43:02 +02:00 |
|
Rachel Powers
|
a65e4af365
|
Merge pull request #1302 from Ryex/fix/progress-dialog-segfault
fix: segfault in progress dialog
|
2023-07-16 20:43:02 +02:00 |
|
seth
|
fb5655085f
|
Merge pull request #1292 from Trial97/export5
Removed logs from instance export
|
2023-07-16 20:42:48 +02:00 |
|
Sefa Eyeoglu
|
316ef9b725
|
Merge pull request #1266 from TheKodeToad/smol-tweaks
|
2023-07-16 20:42:48 +02:00 |
|
Rachel Powers
|
21ccf47ea7
|
Merge pull request #1255 from Trial97/export4
Added Thumbs.db to excluded files in MrPackExport
|
2023-07-16 20:42:26 +02:00 |
|
Rachel Powers
|
6856c2f922
|
Merge pull request #1259 from PrismLauncher/update-devs
Update developers
|
2023-07-16 20:42:26 +02:00 |
|
Rachel Powers
|
05056e1abf
|
Merge pull request #1200 from Trial97/net_job_crash
Made ByteSynkArray to use shared_ptr
|
2023-07-16 20:42:25 +02:00 |
|
Sefa Eyeoglu
|
8b017f9a5f
|
Merge pull request #1243 from Trial97/export
Added regex expresion to exclude .DS_Store files
|
2023-07-16 20:42:25 +02:00 |
|
Trial97
|
cadb7142f0
|
Added progress bar to Prism instance export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-16 20:57:57 +03:00 |
|
Trial97
|
251055302e
|
format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-16 20:53:58 +03:00 |
|
Alexandru Ionut Tripon
|
da87e825a1
|
Update launcher/ui/dialogs/ExportToModListDialog.ui
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-07-15 15:59:19 +03: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 |
|