Commit Graph

7882 Commits

Author SHA1 Message Date
Trial97
975b0b5761 fix double borders
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c9c39b8203)
2024-06-07 06:37:36 +00:00
Trial97
446740ba4f Made Custom New Instance scrollable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f7120a4f6f)
2024-06-07 06:37:36 +00:00
Alexandru Ionut Tripon
9808ab9602
Merge pull request #2478 from PrismLauncher/backport-2471-to-release-8.x
[Backport release-8.x] replace auth server ping
2024-06-07 00:19:38 +03:00
Trial97
865fd91038 replace auth server ping
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit b7008d2880)
2024-06-06 21:19:04 +00:00
Alexandru Ionut Tripon
0cca84a335
Merge pull request #2462 from Trial97/list-image-append-fix-backport
List image append fix backport
2024-06-02 19:02:35 +03:00
SabrePenguin
fa2c2a7c85
Made Regex static and const, removed dist
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
2024-06-02 18:59:44 +03:00
SabrePenguin
f43873a8ba
Regex correction
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
2024-06-02 18:59:44 +03:00
SabrePenguin
6a49f513d8
Fixed more clang formatting
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
2024-06-02 18:59:44 +03:00
SabrePenguin
5d25e21719
Fixing CI format issues
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
2024-06-02 18:59:44 +03:00
SabrePenguin
da2a67227a
Added patch to all setHtml calls
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
2024-06-02 18:59:44 +03:00
SabrePenguin
875c6bbada
Switched </ul> to a Regex expression
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
2024-06-02 18:59:44 +03:00
SabrePenguin
401de52f61
Moved html patch to StringUtils
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
2024-06-02 18:59:44 +03:00
SabrePenguin
0c84d58915
Fix img tag allowing img....
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
2024-06-02 18:59:44 +03:00
SabrePenguin
096028f1a6
Pleasing the format check
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
2024-06-02 18:59:44 +03:00
SabrePenguin
fa0492f606
Update launcher/Markdown.cpp
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
2024-06-02 18:59:44 +03:00
SabrePenguin
e201cad3f8
Formatting and fixed img_pos allowed as negative
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
2024-06-02 18:59:44 +03:00
SabrePenguin
1d8ee37504
Added a naive implementation of a <br> inserter
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
2024-06-02 18:59:44 +03:00
Alexandru Ionut Tripon
672c8c8b4c
Merge pull request #2453 from PrismLauncher/backport-2423-to-release-8.x
[Backport release-8.x] fix incorrect launch time
2024-05-31 09:58:11 +03:00
Alexandru Ionut Tripon
87ca2ce303
Merge pull request #2452 from PrismLauncher/backport-2438-to-release-8.x
[Backport release-8.x] Added support for bcachefs
2024-05-31 09:58:04 +03:00
Trial97
905d9d2826 fix zero launch time
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 1b0e8260ac)
2024-05-31 06:17:25 +00:00
Celeste Peláez
ca359330c2 Reformatted FileSystem.h
Signed-off-by: Celeste Peláez <KernelFreeze@users.noreply.github.com>
(cherry picked from commit f5f32e2c6e)
2024-05-31 06:12:46 +00:00
Celeste Peláez
828222eb27 Added support for bcachefs
Signed-off-by: Celeste Peláez <KernelFreeze@users.noreply.github.com>
(cherry picked from commit a2b5ac73ff)
2024-05-31 06:12:46 +00:00
Evan Goode
e0b545152a Mention PollyMC in README 2024-05-27 12:23:30 -04:00
Evan Goode
f8d9ce2b7c Add Installation section to README.md 2024-05-27 12:04:56 -04:00
Evan Goode
4f9fdcc293 pre-commit run --all-files 2024-05-23 16:49:09 -04:00
Evan Goode
513361df25 DRM: check for valid account, not just any account 2024-05-22 19:46:43 -04:00
Evan Goode
13a32a6642 Add back DRM for offline and authlib-injector accounts 2024-05-20 13:24:16 -04:00
Evan Goode
d19074302c Update nix/README.md 2024-05-20 11:06:23 -04:00
Alexandru Ionut Tripon
f7cad1110e
Merge pull request #2411 from PrismLauncher/backport-2377-to-release-8.x
[Backport release-8.x] Adding sdkman java location to MacOs
2024-05-18 13:16:44 +03:00
Samuel Stidham
bffb2a3609 Fixed the code.
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>
(cherry picked from commit adf0cfdebf)
2024-05-18 10:16:15 +00:00
Samuel Stidham
0d3596c864 Add extra java locations for MacOs.
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>
(cherry picked from commit 8e0af16de9)
2024-05-18 10:16:15 +00:00
Alexandru Ionut Tripon
8eeab0805a
Merge pull request #2410 from PrismLauncher/backport-2382-to-release-8.x
[Backport release-8.x] Add neoforge support for technic packs and atlauncher packs
2024-05-18 10:41:15 +03:00
Trial97
8898eb0a19 Add neoforge support for technic packs and atlauncher packs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a95c1768a7)
2024-05-18 07:40:59 +00:00
Evan Goode
2778fe760b Use $FJORDLAUNCHER_JAVA_PATHS 2024-05-16 21:55:48 -04:00
Evan Goode
59c0625f02 Fix broken in link in Add authlib-injector dialog
Resolves https://github.com/unmojang/FjordLauncher/issues/1
2024-05-15 16:25:34 -04:00
Evan Goode
08b3a1d956 s/Prism/Fjord in .github 2024-05-15 00:01:58 -04:00
Evan Goode
62d2f7d042 Add doc/alternative-auth-servers.md 2024-05-14 23:03:20 -04:00
Evan Goode
f9815c7212 README: Adjust for Fjord Launcher
Took out the installation section, I'll redo that once we make some
packages.
2024-05-14 22:59:28 -04:00
Evan Goode
67846827f5 Add DRM notice 2024-05-14 22:58:19 -04:00
Alexandru Ionut Tripon
43286eea91
Merge pull request #2387 from PrismLauncher/backport-2379-to-release-8.x
[Backport release-8.x] Improve blocked mods dialog (permissions prompt, misc. fixes) on macOS
2024-05-09 08:28:59 +03:00
Kenneth Chew
37af82a3c0 Fix bug where watched directories are not clickable on macOS
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit e7c95c9ccb)
2024-05-09 05:27:53 +00:00
Kenneth Chew
e1555ff74e Improved blocked mods dialog permissions prompt
Targeted to macOS (where `~/Downloads` is considered a sensitive location that the system protects behind a prompt even from non-sandboxed apps)

Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit 4787141698)
2024-05-09 05:27:53 +00:00
Alexandru Ionut Tripon
47e5855527
Merge pull request #2386 from PrismLauncher/backport-2366-to-release-8.x
[Backport release-8.x] Fix download packs with invalid characters
2024-05-09 08:23:49 +03:00
Alexandru Ionut Tripon
3328ec970a
Merge pull request #2385 from PrismLauncher/backport-2341-to-release-8.x
[Backport release-8.x] Fix image width in project description
2024-05-09 08:23:32 +03:00
Trial97
7caed93d2c Fixed imports
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 30ce8ecb5f)
2024-05-09 05:16:33 +00:00
Trial97
c0706b30ee Ensure valid file names for resource names
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 5400c24c73)
2024-05-09 05:16:33 +00:00
Trial97
a57a21af3b Fix invalid characters filename download on windows
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit e068120375)
2024-05-09 05:16:33 +00:00
Trial97
b679a57939 Fixed NetRequest not failing on sink init
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 48f3ca56ba)
2024-05-09 05:16:32 +00:00
Alexandru Ionut Tripon
d3a16715b8 Update launcher/ui/widgets/VariableSizedImageObject.cpp
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 3c9a207192)
2024-05-09 05:15:48 +00:00
Trial97
28378c77aa Fix image width in project description
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c902da4461)
2024-05-09 05:15:48 +00:00