Sefa Eyeoglu
8d7f916f80
fix(flatpak): disable docs for glfw
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 52338f0e88
2024-06-14 05:58:04 +00:00
Alexandru Ionut Tripon
658244574a
Merge pull request #2508 from PrismLauncher/backport-2405-to-release-8.x
...
[Backport release-8.x] Fix portable if manifest is missing
2024-06-13 19:16:39 +03: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
Alexandru Ionut Tripon
1a51cb76ad
Merge pull request #2507 from PrismLauncher/backport-2439-to-release-8.x
...
[Backport release-8.x] fix vanilla technic modpacks
2024-06-13 19:16:21 +03: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
Alexandru Ionut Tripon
0a27d3859c
Merge pull request #2506 from PrismLauncher/backport-2499-to-release-8.x
...
[Backport release-8.x] update imgur upload
2024-06-12 23:45:55 +03: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
Alexandru Ionut Tripon
ab6c5c122e
Merge pull request #2497 from PrismLauncher/backport-2425-to-release-8.x
...
[Backport release-8.x] improve invalid path name
2024-06-10 12:13:25 +03: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
Alexandru Ionut Tripon
786a452f28
Merge pull request #2492 from PrismLauncher/backport-2166-to-release-8.x
...
[Backport release-8.x] Updated ftb app import instance detection
2024-06-10 00:46:22 +03: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
Alexandru Ionut Tripon
af936353b1
Merge pull request #2490 from PrismLauncher/backport-1032-to-release-8.x
...
[Backport release-8.x] refactor: shorten desktop entry comment field
2024-06-09 21:03:18 +03:00
deadmeu
c728f43533
refactor: shorten desktop entry comment field
...
Signed-off-by: deadmeu <dmu@duck.com>
(cherry picked from commit ac223a29ef
2024-06-09 17:59:36 +00:00
Alexandru Ionut Tripon
bdf3497028
Merge pull request #2489 from Trial97/backport-2474-to-release-8.x
...
Backport 2474 to release 8.x
2024-06-09 16:37:40 +03:00
coolguy1842
9c7d1e80e3
DCO Remediation Commit for coolguy1842 <kian.goslett@protonmail.com>
...
I, coolguy1842 <kian.goslett@protonmail.com>, hereby add my Signed-off-by to this commit: 448ded2387aeb174fc55
2024-06-09 16:34:57 +03: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
TheKodeToad
b2e5ea46d7
Merge pull request #2483 from PrismLauncher/backport-2428-to-release-8.x
...
[Backport release-8.x] add detection for IBM Semeru Java runtime and fix x86 detection on 64 bit Windows
2024-06-07 20:25:03 +01: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
Alexandru Ionut Tripon
fbf819c034
Merge pull request #2480 from PrismLauncher/backport-2383-to-release-8.x
...
[Backport release-8.x] Made Custom New Instance scrollable
2024-06-07 09:38:10 +03: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
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
