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

674 commits

Author SHA1 Message Date
Octol1ttle
3ecb1ca9ba fix(OtherLogsPage): remove CR when removing LF 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 3f11b185a8)
 2026-02-21 20:44:30 +00:00
Octol1ttle
fe2bd2ddbd fix(OtherLogsPage): make UI strings translatable 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 668cbf4ee0)
 2026-02-21 20:42:37 +00:00
Alexandru Ionut Tripon
b7b4fc8aa4
[Backport release-10.x] Application.h cleanup (#5001) 2026-02-17 21:08:50 +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
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
Rachel Powers
18f1513aac Reduce include chain further, forward declare settings and log model 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit 45df360e4c)
 2026-02-11 16:02:57 +00:00
Trial97
8e6979258a start core update task only if not running already 
This line crashes develop builds because the task is running already.

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit bc6a6e959b)
 2026-02-04 09:18:36 +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
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
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
Octol1ttle
6ee81b527d refactor: remove broken Qt includes 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 56392a20ed)
 2026-01-06 11:06:15 +00:00
Trial97
75215b0d31 fix mod update remaining disabled on second open 
fixes
https://discord.com/channels/1031648380885147709/1450161125172707390/1453013386144124929
basically when opening the edit window a second time the model doesn't
get any updates as the data is already loaded into the memory.

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 7f68f2fe3b)
 2025-12-23 22:10:44 +00:00
Dylan Schooner
ab71c44ed6 Check specifically for GarbageAtEnd error 
- Out parameter for garbage data\n- Rename parseUntilMalformed to parseUntilGarbage

Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
(cherry picked from commit 51b47050f9)
 2025-12-18 21:51:35 +00:00
Dylan Schooner
9fef9c7bd8 Use Json::parseUntilMalformed in McClient::parseResponse 
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
(cherry picked from commit 9c7fe72f9c)
 2025-12-18 21:51:35 +00:00
Tayou
474be07724 server player req: parse malformed json 
ATM10 server seems to send a extra json object after the default response, that we need to cut off.
Signed-off-by: Tayou <git@tayou.org>
Co-authored-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 5ebd386797)
 2025-12-16 14:35:33 +00:00
Alexandru Ionut Tripon
aa3d78b3dc
Fix server columns text other than name being invisible (#4475) 2025-12-14 00:54:42 +02:00
TheKodeToad
0d7244d56f
Remove unused code 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-12-12 12:18:56 +00:00
TheKodeToad
7baac92f56
Fix server columns being totally invisible 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-12-12 12:07:19 +00:00
Rachel Powers
28d27d4f19
refactor(MessageLevel): move and rename 'FromLine*' functions 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2025-12-11 09:59:33 -07: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
4f5e348b66
Merge branch 'develop' into fix-log-level-bleed 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-12-08 09:21:27 +00:00
TheKodeToad
fd3ae85d45
Simplify MessageLevel::Enum -> MessageLevel 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-12-07 13:15:22 +00:00
TheKodeToad
c018b60816
Only continue log level if line starts with whitespace; reintroduce exception detection 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-12-05 12:38:21 +00:00
Pagwin
331c1de9cd
Edited a comment for clarity 
Signed-off-by: Pagwin <git@pagwin.xyz>
 2025-11-25 13:34:31 -05:00
Pagwin
55a212f3c4
Grammar/Spelling nit fix for Missing Mod loader dialog 
Co-authored-by: Seth Flynn <getchoo@tuta.io>
Signed-off-by: Pagwin <git@pagwin.xyz>
 2025-11-23 14:06:06 -05:00
Pagwin
5e2c8bdcf7
Fixed Loader Install Cancel crash 
Fixed a crash which occurred when the mod loader dialog was cancelled
after being reached from the no loader dialog

Signed-off-by: Pagwin <dev@pagwin.xyz>
 2025-11-22 17:10:22 -05:00
Pagwin
fca8ac40ff
Minor remaining fixes for PR (#4374) 
- changed case of `handleNoModLoader` to match project style

- made default case in switch statement for `handleNoModLoader` return
  true for safety

Signed-off-by: Pagwin <dev@pagwin.xyz>
 2025-11-21 16:19:41 -05:00
Pagwin
1dae1a210b
Made changes to address feedback from code review (#4374) 
Signed-off-by: Pagwin <dev@pagwin.xyz>
 2025-11-20 20:48:53 -05:00
Pagwin
9ce7738912
Implemented #4369 
Signed-off-by: Pagwin <dev@pagwin.xyz>
 2025-11-19 10:48:34 -05:00
Alexandru Ionut Tripon
7ca8556211
Fix issues with log level handling (#4254) 2025-11-16 18:13:12 +02:00
Trial97
31cdca77df
fix mod select 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-05 14:24:38 +02:00
TheKodeToad
ff3968e36e
Fix brace war crime 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-10-27 11:36:38 +00:00
TheKodeToad
d626604b5e
Fix issues with log level handling and clean up code 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-10-25 14:20:15 +01:00
Gingeh
abc63e4432 fix: warn before double-click toggling resource while game is running 
Closes #4119

Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
 2025-10-07 16:17:43 +11:00
TheKodeToad
d384970694
Merge remote-tracking branch 'upstream/develop' into unused-code 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-09-19 11:06:34 +01:00
TheKodeToad
7789ba8608
Remove unused code 
GameOptions.{h,cpp}, GameOptionsPage.{h,cpp}, ThemeWizardPage.cpp

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-09-19 09:04:29 +01:00
TheKodeToad
cd4f119e4b
Replace getThemedIcon with APPLICATION->logo() 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-09-19 00:07:05 +01:00
Trial97
29cff14fd6
removed some duplicate code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-09-15 18:25:07 +03:00
TheKodeToad
2b0d135afd
More consistent padding and frames 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-08-21 15:08:18 +01:00
TheKodeToad
83736950d9
Consistent case style 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-08-21 15:08:18 +01:00
TheKodeToad
81e4f1cf7a
Prevent View Configs showing in places it shouldn't 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-08-21 15:08:18 +01:00
TheKodeToad
40f45b19f4
Make search bars consistent 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-08-21 15:08:16 +01:00
TheKodeToad
22d651f041
Fix buggy movement in screenshots page 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-08-21 13:05:13 +01:00
TheKodeToad
d7eddd3773
Replace IPathMatcher stuff with Filter 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-08-04 15:03:22 +01:00
TheKodeToad
29d73a474f
Reduce usage of [[nodiscard]] attributes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-07-07 20:56:29 +01:00
Yihe Li
836c558c6c
Merge branch 'develop' into launcher-log-page 2025-06-06 21:36:03 +08:00
Tayou
f17e443b12
chore: fix some codeql warnings (#3838) 2025-06-06 15:20:07 +02:00
Tayou
a17ea196c1
chore: fix some codeql warnings (#3840) 2025-06-06 14:19:27 +02:00
Alexandru Ionut Tripon
2d90144cd9
More intuitive version changing for modpacks (#3841) 2025-06-06 08:12:52 +03:00
Yihe Li
dea8de01e3
Merge branch 'develop' into launcher-log-page 2025-06-05 23:20:46 +08:00