ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
6,933 Commits 4 Branches 5 Tags 40 MiB
f3c089792a
Commit Graph

431 Commits

Author SHA1 Message Date
bolli24
f3c089792a Skip folders when updating mods. 
Previously the mod updater would fail, reporting "The mod updater was aborted!", when trying to update a folder.

Signed-off-by: bolli24 <4827765-bolli24@users.noreply.gitlab.com>
 2023-09-22 21:36:19 +02:00
TheKodeToad
94c1cd6bcf
CurseForge shader downloading 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-04 14:15:37 +01:00
TheKodeToad
0e67686295
Hide index folder in pack export dialog 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-28 17:25:07 +01:00
TheKodeToad
e98bca4749
Fix cancelling pack save 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-28 17:09:40 +01:00
Sefa Eyeoglu
fbf6833124
Merge pull request #1519 from TheKodeToad/better-export-pack 2023-08-28 10:29:32 +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
Trial97
4704c522e0
moved modloaderTypes to ModPlatform 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 10:26:57 +03: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
TheKodeToad
5056a51c18
Improvements and refinements to pack export 
- Persist fields
- Toggle optional files

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-12 21:20:51 +01: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
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
Sefa Eyeoglu
1d638e018a
chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-04 19:41:47 +02: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
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
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
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
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
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
Trial97
1ccfba13eb
renames 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:41:51 +03:00
Trial97
b9ed8283b7
Added buttons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:41:45 +03:00
Trial97
1495bfb73e
Made custom template enabled all time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:41:37 +03:00
Trial97
9a3931dac6
Added json and csv format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:34:21 +03:00
Trial97
515197fba2
fix: html sintax for modlist export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:34:03 +03:00