Alexandru Ionut Tripon
6c76ba5163
Merge pull request #1032 from deadmeu/shorten-description
...
refactor: shorten desktop entry comment field
2024-06-09 20:59:23 +03:00
Trial97
04b2ac2efa
update fail url skin messagebox
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-09 20:48:49 +03:00
Trial97
689b76885c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
2024-06-09 20:13:09 +03:00
Trial97
6a99312df5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
2024-06-09 19:57:16 +03:00
Trial97
ca369ac2b0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-09 19:52:37 +03: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
Alexandru Ionut Tripon
9560f9ed98
Merge pull request #2474 from coolguy1842/develop
...
simple fix for resizing too small causing an index out of range crash
2024-06-09 16:10:57 +03:00
Alexandru Ionut Tripon
d6a03d3f2c
Merge pull request #1554 from Trial97/instance_copy_progress
...
updated instance copy
2024-06-09 16:05:11 +03:00
Alexandru Ionut Tripon
3af4c94612
Merge pull request #2390 from Trial97/delete_tmp
...
Delete instaces tmp diectory on startup
2024-06-09 16:03:51 +03:00
Alexandru Ionut Tripon
55b6490530
Merge pull request #1617 from cullvox/components-resource-pack-fix
...
added functionality for components in resource pack descriptions.
2024-06-09 16:03:19 +03:00
Alexandru Ionut Tripon
7e5db651fd
Merge pull request #1823 from Trial97/refresh_cats
...
Added button to refresh themes and catpacks
2024-06-09 16:02:26 +03:00
Alexandru Ionut Tripon
6f6ddc00c8
Merge pull request #2486 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-06-09 16:01:15 +03:00
Alexandru Ionut Tripon
0e996270b7
Merge pull request #2055 from Trial97/show_minecraft_version_modrinth
...
Display minecraft version if not mentioned for modrinth/curse packs
2024-06-09 15:59:24 +03:00
github-actions[bot]
24cf671370
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/6132b0f6e344ce2fe34fc051b72fb46e34f668e0?narHash=sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY%3D' (2024-05-30)
→ 'github:nixos/nixpkgs/d226935fd75012939397c83f6c385e4d6d832288?narHash=sha256-HV97wqUQv9wvptiHCb3Y0/YH0lJ60uZ8FYfEOIzYEqI%3D' (2024-06-07)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/0e8fcc54b842ad8428c9e705cb5994eaf05c26a0?narHash=sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA%3D' (2024-05-20)
→ 'github:cachix/pre-commit-hooks.nix/cc4d466cb1254af050ff7bdf47f6d404a7c646d1?narHash=sha256-7XfBuLULizXjXfBYy/VV%2BSpYMHreNRHk9nKMsm1bgb4%3D' (2024-06-06)
2024-06-09 00:22:00 +00: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
TheKodeToad
3ef5cd20f4
Merge pull request #2428 from Fourmisain/semeru
...
add detection for IBM Semeru Java runtime and fix x86 detection on 64 bit Windows
2024-06-07 20:17:20 +01:00
DioEgizio
052ee0d71c
chore: update Qt to 6.7.1
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-06-07 15:48:19 +02: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
ZekeZ
39b8451130
Merge pull request #2383 from Trial97/scroll_new_instance
...
Made Custom New Instance scrollable
2024-06-07 16:37:21 +10:00
Trial97
8ff53e47e8
Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader
2024-06-07 00:22:54 +03: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
6e5c41fc8e
Merge pull request #2471 from Trial97/replace_auth_ping
...
replace auth server ping
2024-06-07 00:18:48 +03:00
Alexandru Ionut Tripon
e961cab352
Merge pull request #1409 from Trial97/import_zip
...
feat: refactored Instance ImportTask
2024-06-07 00:11:37 +03:00
Trial97
b096ee6a0c
fix file permisions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-06 14:12:55 +03:00
coolguy1842
aeb174fc55
DCO Remediation Commit for coolguy1842 <kian.goslett@protonmail.com>
...
I, coolguy1842 <kian.goslett@protonmail.com>, hereby add my Signed-off-by to this commit: 448ded2387
2024-06-06 16:58:12 +10:00
coolguy1842
71b2c4b1fd
fix formatting
...
Signed-off-by: coolguy1842 <kian.goslett@protonmail.com>
2024-06-06 16:32:49 +10:00
coolguy1842
448ded2387
simple fix for resizing too small causing an index out of range crash
...
Signed-off-by: coolguy1842 <coolguy1842.deport391@passfwd.com>
2024-06-06 16:18:47 +10:00
Trial97
b7008d2880
replace auth server ping
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-06 00:09:08 +03:00
Trial97
45463dcd75
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
2024-06-04 11:04:02 +03:00
renovate[bot]
3263a706b4
chore(deps): update determinatesystems/update-flake-lock action to v22
2024-06-03 18:39:15 +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
