mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-30 02:20:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
10480 commits 19 branches 53 tags 60 MiB
Commit graph

896 commits

Author SHA1 Message Date
m0nstrum
2c946258af fix(flame): gate modrinth fallback parsing on success 
Signed-off-by: m0nstrum <m0nstrum@proton.me>
(cherry picked from commit 3576c2f101)
 2026-02-17 20:44:49 +00:00
m0nstrum
374ecfd2fb fix(flame): avoid double-fail assert in file resolving 
Signed-off-by: m0nstrum <m0nstrum@proton.me>
(cherry picked from commit f2cf982ea8)
 2026-02-17 20:44:49 +00:00
Alexandru Ionut Tripon
9fc5e1c650
[Backport release-10.x] refactor: replace std::list with std::vector (#4845) 2026-02-17 21:01:12 +02:00
Trial97
27ea967fc8
fix build 
also fixed some warninigs of unused vars and formated the code again

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit d05b996c8a)
 2026-02-17 20:38:25 +02:00
Octol1ttle
782cda92a9
refactor(instance creation): use RAII lock to suspend instance settings saving 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit c24fd2f570)
 2026-02-17 20:23:08 +02:00
Octol1ttle
e89ce1124a
refactor!!!: migrate from shared pointers 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 549405ab2f)
 2026-02-17 20:23:05 +02:00
Octol1ttle
bc092d688f fix(ModrinthCheckUpdate): always increment loader index 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit e7382fd43d)
 2026-02-01 07:58:34 +01:00
Alexandru Ionut Tripon
9cee254a88
[Backport release-10.x] remove followSymlinks calls (#4906) 2026-01-30 13:11:15 +02:00
Trial97
c3a0e26923 remove followSymlinks calls 
most probably they were used incorectly anyway

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit e5aa5e298f)
 2026-01-30 11:10:38 +00:00
Octol1ttle
8cfeb30c56 chore: remove double spaces from logs 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 584dc47da5)
 2026-01-30 11:10:01 +00:00
Octol1ttle
ea42d6f676 refactor: replace std::list with std::vector 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 19b9557c19)
 2026-01-22 21:04:12 +00:00
Octol1ttle
168816d796
ModrinthCheckUpdate: don't send a request that is doomed to fail 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 29afecdbde)
 2026-01-22 22:43:07 +02:00
Octol1ttle
1ff7d25352 fix: add missing returns after emitSucceeded 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit e27246c3f9)
 2026-01-22 20:40:11 +00:00
Octol1ttle
eacebcc153 fix: add missing returns after emitFailed/Aborted 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 507de0fcbd)
 2026-01-22 20:40:11 +00:00
Seth Flynn
da4bf6e8c2
style: re-format tree with editorconfig 
```
find $PWD \
  -type f \
  ! -path '*/.git/*' ! -path '*/flatpak/shared-modules/*' \
  ! -path '*/libraries/*' ! -path '*/testdata/*' ! -name '*.patch' \
  ! -name '*.svg' ! -name '*.scd' ! -path '*/program_info/LICENSE' \
  ! -path '*/COPYING.md' ! -path '*/cmake/*' ! -name '.gitmodules' \
  -exec eclint -fix {} \;
```

Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit fd91f87c21)
 2026-01-18 23:01:42 +02:00
Trial97
d1605ec02a fix ftb import for old packs 
fixes #4786

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 3496b7b3a0)
 2026-01-17 15:04:08 +00:00
Trial97
b2e195a651 format the code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 53acc60983)
 2026-01-09 21:36:46 +00:00
Trial97
131dc0acf3 fix Pre-release filter 
introduced here https://github.com/PrismLauncher/PrismLauncher/pull/3260
fixes #4415
reason: some snapshot have Pre-Release in our meta but when searching in
Modrinth this needs to be translated to -pre and the reverse needed to
be done for filtering after we fetched the version.
Now there are snapshots with -pre in name and that works with Modrinth
but when we translate it back we replace it with Pre-Release so the
easeiest patch is just to double the version(one with -pre one with
Pre-Release)

The correct one would be to complicate the code and identify the
versions that need the transition and only apply this for those.

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit b1408775b3)
 2025-12-22 21:45:48 +00:00
Rachel Powers
d1b6d7c402
chore: Re-simplify IndexVersionType and MessageLevel with c++20 
This sets our compiler requirements to gcc 11 and clang 13. If we
forgo the use of `using enum` we can drop to gcc 10 and clang 10 but
that means using `MessageLevel::Enum::Unknown` for direct enum access

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2025-12-11 09:59:33 -07:00
TheKodeToad
de5c7bac72
Simplify IndexedVersionType::VersionType -> IndexedVersionType 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-12-07 14:34:00 +00:00
Trial97
aa265a45ee
fix nix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-26 18:41:56 +02:00
Trial97
8cace06df9
move libarchive outside bundle libs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-26 18:41:22 +02:00
Trial97
30ef158716
finish moving all code to libarchive 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-26 18:40:41 +02:00
Trial97
f38a0c8f98
move more zip parsings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-26 18:40:40 +02:00
Trial97
8c36be048c
move ExtractZipTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-26 18:39:18 +02:00
Trial97
60b2585711
move some functions from MMCZip to use libarchive 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-26 18:39:18 +02:00
Trial97
fa930afe4b
move ExportToZipTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-26 18:39:18 +02:00
Seth Flynn
63e6fc28dc
change packwiz extra warnings to debug (#4388) 2025-11-26 11:24:24 -05:00
Edvin Bryntesson
9e614f94cd
fix FTBA instance loading 
Signed-off-by: Edvin Bryntesson <epost@edvinbryntesson.se>
 2025-11-24 13:33:54 +01:00
Trial97
9de2f96341
change packwiz extra warnings to debug 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-23 09:24:51 +02:00
Trial97
f832a361e2
add support for neoforge in atl packs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-21 22:51:43 +02:00
Alexandru Ionut Tripon
f93e21fa2d
deduplicate includes and reformat (#4228) 2025-11-16 18:12:52 +02:00
Octol1ttle
7cbec465cd
fix(ModrinthPackIndex): set logo name correctly 
Fixes: f90c0a59a7
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2025-11-15 22:42:16 +05:00
TheKodeToad
29bb9fe9f3
Revert some things caught in the crossfire 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-11-10 19:01:24 +00:00
TheKodeToad
51a1e3bfe0
Merge remote-tracking branch 'upstream/develop' into no-ensure 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-11-10 18:56:32 +00:00
TheKodeToad
ff1690532d
fix mod select (#4305) 2025-11-10 16:55:21 +00:00
TheKodeToad
e42c9d2a1d
Remove ensure JSON helpers 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-11-09 21:35:11 +00:00
Alexandru Ionut Tripon
b070ffaf72
Fix modpack search abort crash (#4327) 2025-11-09 23:17:55 +02:00
Alexandru Ionut Tripon
609aa9f7f3
fix crash when failing to download file (#4249) 2025-11-09 23:08:20 +02:00
TheKodeToad
98afd2086a
Make sure nullptr on_abort never gets called 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-11-09 10:52:24 +00:00
Trial97
31cdca77df
fix mod select 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-05 14:24:38 +02:00
Dylan Schooner
8d42bdaf6b Check return value of 'virtual bool QFile::open(QIODeviceBase::OpenMode)' 
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
 2025-10-30 03:15:14 -04:00
Trial97
2981d9109b
fix crash when failing to download file 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-10-23 19:34:44 +03:00
Edgars Cīrulis
91a02a1dc6
style: run-run clang-format on launcher/* 
Signed-off-by: Edgars Cīrulis <e.cirulis@proton.me>
 2025-10-14 04:05:56 +03:00
Edgars Cīrulis
577f9ca94c
style: remove duplicate #include headers 
Signed-off-by: Edgars Cīrulis <e.cirulis@proton.me>
 2025-10-14 04:03:02 +03:00
Marco von Rosenberg
182d130c18 fix: prioritize .ftbapp/version.json in FTB App import 
Newer versions of FTB App create a stub version.json in the instance
root with only a comment directing to .ftbapp/version.json. The old
logic would find this stub file first and fail to parse it, causing
modpacks to not be detected.

This fix checks .ftbapp/version.json first (newer location) before
falling back to the root version.json (older location).

Signed-off-by: Marco von Rosenberg <codingmarco@gmail.com>
 2025-10-06 21:56:19 +09:00
Trial97
88399cf922
fix: modrinth modpacks icon importing 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-09-22 14:47:56 +03:00
Trial97
29cff14fd6
removed some duplicate code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-09-15 18:25:07 +03:00
timoreo
31852724b1
Fix resource update with loaders (#3108) 2025-09-12 11:14:02 +02:00
Seth Flynn
4a7772e2d1
Use C++20 (#3957) 2025-08-18 12:15:53 -04:00