DioEgizio
81ea7cef5a
fix: add more datapack formats and clang-format it
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit a63842c727
2024-06-18 18:06:49 +00:00
DioEgizio
0df7a8dd3c
chore: clang-format ResourcePack.cpp
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit c07e791d7f
2024-06-18 18:06:49 +00:00
DioEgizio
c254a8961c
fix: update datapack and resourcepack versions
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 6af52c97c2
2024-06-18 18:06:49 +00:00
Trial97
0ea9190d25
relax fat FS filename restrictions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a587de8553
2024-06-18 09:51:34 +00:00
Alexandru Ionut Tripon
119295c87f
Update launcher/updater/prismupdater/PrismUpdater.cpp
...
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit ab5f628453
2024-06-13 16:16:28 +00:00
Alexandru Ionut Tripon
263b167aae
Update launcher/updater/prismupdater/PrismUpdater.cpp
...
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 051e788683
2024-06-13 16:16:28 +00:00
Trial97
56b64edc44
Fix portable if manifest is missing
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c15f6fcd2a
2024-06-13 16:16:27 +00:00
Trial97
e475f4ed36
fix vanilla technic modpacks
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f4f0a61bf2
2024-06-13 16:15:57 +00:00
Trial97
cd6f061335
update imgur upload
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c1c182fd0c
2024-06-12 20:45:31 +00:00
Trial97
317b127330
add some comments
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit d1286bbe90
2024-06-10 09:11:36 +00:00
Trial97
354f4ef3d8
fix CI
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 44a16c1ca1
2024-06-10 09:11:36 +00:00
Trial97
8984cd5f66
improve invalid path name
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a7a1b28765
2024-06-10 09:11:36 +00:00
Trial97
5934849d87
removed + from bad chars in filenames
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 428889a68d
2024-06-10 09:11:36 +00:00
Trial97
62a2217291
Added the new ftb settings path
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 1c3c9d2457
2024-06-09 21:45:37 +00:00
Trial97
1af7126582
Removed static path
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 27e76d0dcb
2024-06-09 21:45:37 +00:00
Trial97
4d0e4f434f
Updated ftb app import instance detection
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 344398f238
2024-06-09 21:45:37 +00:00
coolguy1842
616556ea7b
fix formatting
...
Signed-off-by: coolguy1842 <kian.goslett@protonmail.com>
(cherry picked from commit 71b2c4b1fd
2024-06-09 16:34:32 +03:00
coolguy1842
d23fa73f52
simple fix for resizing too small causing an index out of range crash
...
Signed-off-by: coolguy1842 <coolguy1842.deport391@passfwd.com>
(cherry picked from commit 448ded2387
2024-06-09 16:34:32 +03:00
Fourmisain
dda7e3073d
please the pre-commit check
...
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
(cherry picked from commit 23095b70a4
2024-06-07 19:17:34 +00:00
Fourmisain
a800b86689
detect IBM Semeru Certified Edition on linux
...
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
(cherry picked from commit dbe4adc034
2024-06-07 19:17:34 +00:00
Fourmisain
cfeb72450e
fix x86 detection on 64 bit windows
...
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
(cherry picked from commit af157c1613
2024-06-07 19:17:34 +00:00
Fourmisain
67e0b68cd5
add detection for IBM Semeru Java runtime
...
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
(cherry picked from commit 08918be11e
2024-06-07 19:17:34 +00:00
Trial97
be2ecff97c
fix qt5 build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 83883cadf9
2024-06-07 06:37:36 +00:00
Trial97
a053a4040c
force initial size for the Add Instance dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f350918186
2024-06-07 06:37:36 +00:00
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
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
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
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
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
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
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
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
