Trial97
|
6e8dc6ccc0
|
add mouse interaction on microsoft link
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-13 19:20:32 +03: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 |
|
Alexandru Ionut Tripon
|
3fc5f56ed6
|
Merge pull request #2405 from Trial97/fix_missing_manifest
Fix portable if manifest is missing
|
2024-06-13 19:16:12 +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
|
ce5b2c54c5
|
Merge pull request #2439 from Trial97/fix_vanila_technic
fix vanilla technic modpacks
|
2024-06-13 19:15:43 +03:00 |
|
Trial97
|
f7c3e08ac8
|
add prismlauncher to plist
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-13 18:27:37 +03:00 |
|
Trial97
|
7fdc65eda8
|
add tooltip to url button
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-13 08:51:11 +03:00 |
|
Trial97
|
2b229d7326
|
increase qr code size
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-13 00:20:16 +03:00 |
|
Trial97
|
80ea67f7cf
|
finish login dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-13 00:00:08 +03: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
|
a74bebb358
|
Merge pull request #2499 from Trial97/imgur3
update imgur upload
|
2024-06-12 23:45:17 +03:00 |
|
Trial97
|
125fb2eaf2
|
remove png qr code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-12 19:34:58 +03:00 |
|
Trial97
|
5f5296ef5e
|
update ui once again
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-12 19:34:19 +03:00 |
|
Trial97
|
bbbe7c879e
|
update callback
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-12 12:35:02 +03:00 |
|
Trial97
|
df142550fe
|
update Add account question
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-12 11:55:56 +03:00 |
|
Trial97
|
c4a65dd861
|
update login flow
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-12 00:34:39 +03:00 |
|
Tayou
|
6b1c4981e7
|
Merge pull request #2498 from LaoshuBaby/patch-1
fix(SkinManageDialog.cpp): typo
|
2024-06-10 13:21:51 +02:00 |
|
Trial97
|
c1c182fd0c
|
update imgur upload
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 12:38:59 +03:00 |
|
快乐的老鼠宝宝
|
1c1e296960
|
fix(SkinManageDialog.cpp): typo
Signed-off-by: 快乐的老鼠宝宝 <laoshubaby@protonmail.com>
|
2024-06-10 17:15:38 +08: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
|
7d418a32e7
|
Merge pull request #2425 from Trial97/win_char
improve invalid path name
|
2024-06-10 12:11:21 +03:00 |
|
Alexandru Ionut Tripon
|
93a0277479
|
Merge pull request #2450 from Trial97/remove_search
remove search button
|
2024-06-10 10:56:54 +03:00 |
|
Trial97
|
2ffabbdc6d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 10:00:52 +03:00 |
|
Trial97
|
11ae169087
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 09:34:48 +03:00 |
|
Alexandru Ionut Tripon
|
95e7f36732
|
Merge pull request #2054 from Trial97/add_configurable_updater_interval
Made updater interval configurable
|
2024-06-10 09:22:54 +03:00 |
|
Trial97
|
6607c3bfa4
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 09:04:09 +03:00 |
|
Trial97
|
3f0fa54fe8
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into retry_auth
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 09:03:04 +03:00 |
|
Trial97
|
e63f25c9e4
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 09:01:01 +03:00 |
|
Alexandru Ionut Tripon
|
dc39698c48
|
Merge pull request #1609 from Trial97/skin_selector
Skin management
|
2024-06-10 08:43:37 +03:00 |
|
Alexandru Ionut Tripon
|
12e04c412b
|
Merge pull request #1776 from Trial97/resource_size
feat:added size column
|
2024-06-10 08:42:29 +03: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
|
154f4811c0
|
Merge pull request #2166 from Trial97/ftb2
Updated ftb app import instance detection
|
2024-06-10 00:45:22 +03:00 |
|
Trial97
|
29d32f0d9a
|
Update size order for folders
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 00:18:21 +03:00 |
|
Trial97
|
242ddbb7e1
|
fix size column sorting
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-09 23:53:40 +03:00 |
|
Trial97
|
34e1a5e660
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size
|
2024-06-09 22:18:40 +03:00 |
|
Trial97
|
1e0db46728
|
add a more verbose error message in case user skin import fails
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-09 21:29:56 +03: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 |
|