Tayou
|
df2a92d5f4
|
Merge pull request #1742 from TayouVR/fix-resourcepack-crash
fix switch/case fallthrough in resource parse tasks
|
2023-10-28 12:44:40 +02:00 |
|
Trial97
|
33cf7066b4
|
formated the code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-27 21:51:35 +03:00 |
|
Trial97
|
2256850cb6
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-27 00:12:50 +03:00 |
|
LocalSpook
|
9d972ccc63
|
Localize account type in account list
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
|
2023-10-26 13:32:33 -07:00 |
|
Sefa Eyeoglu
|
3719ea21b0
|
Merge pull request #1355 from TheKodeToad/env-vars
Custom environment variables
|
2023-10-26 22:10:26 +02:00 |
|
TheKodeToad
|
bd11b93a0c
|
Use hidden tab bar like other pages
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-26 21:01:24 +01:00 |
|
Trial97
|
12d567a9b8
|
made env vars behave like the rest of the settings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-26 22:51:38 +03:00 |
|
Trial97
|
60a7628dbb
|
delete duplicate mods
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-26 20:43:26 +03:00 |
|
Trial97
|
3d84635b24
|
Remove file on mod duplication
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-26 20:09:12 +03:00 |
|
Trial97
|
321bbf1fa8
|
fixed asan stuff
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-26 19:06:38 +03:00 |
|
Trial97
|
dba54332fb
|
fixed some asan stuf
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-26 18:31:52 +03:00 |
|
Trial97
|
04acd27dab
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent
|
2023-10-26 13:45:47 +03:00 |
|
Trial97
|
8b8ea2d270
|
ensured that the variant is allways uppercase
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-26 13:37:25 +03:00 |
|
Trial97
|
44cdf3f697
|
Fixed skin variant
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-26 13:33:00 +03:00 |
|
Trial97
|
263dc5af67
|
Fixed remane and delete of selected skin
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-25 19:56:26 +03:00 |
|
Trial97
|
a5938a7de9
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-25 19:26:05 +03:00 |
|
txtsd
|
38d77b58cd
|
Merge pull request #1748 from LocalSpook/using
|
2023-10-25 16:08:42 +00:00 |
|
Trial97
|
d4d345ee7d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps
|
2023-10-24 23:40:36 +03:00 |
|
Tayou
|
a161f5cfe2
|
Merge pull request #1747 from Trial97/fix_initial_java
fix: java memory not set on initial setup
|
2023-10-24 19:04:56 +02:00 |
|
LocalSpook
|
5be80df1ee
|
Replace typedef with using
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
|
2023-10-24 01:36:27 -07:00 |
|
Trial97
|
6a19f2dae8
|
fixed icon import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-24 11:19:19 +03:00 |
|
Trial97
|
694840937b
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
|
2023-10-24 10:32:09 +03:00 |
|
Trial97
|
87f2f88d4c
|
fix: java memory not set on initial setup
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-23 23:38:03 +03:00 |
|
Trial97
|
f7c9972db0
|
separated dependecy check from mod update
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-23 19:46:30 +03:00 |
|
Sefa Eyeoglu
|
b376888f43
|
Merge pull request #1515 from TheKodeToad/sysprops
|
2023-10-22 21:57:11 +02:00 |
|
Tayou
|
0fe3241df6
|
remove now unneeded Q_ASSERTs
Signed-off-by: Tayou <git@tayou.org>
|
2023-10-22 21:25:06 +02:00 |
|
Tayou
|
7d5206818b
|
fix switch/case fallthrough
Signed-off-by: Tayou <git@tayou.org>
|
2023-10-22 21:25:00 +02:00 |
|
Sefa Eyeoglu
|
db19362a97
|
feat: add launcher brand and version props
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-10-22 21:19:44 +02:00 |
|
Trial97
|
2aeb829176
|
removed the concurent task destructor behaivior
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-22 19:58:10 +03:00 |
|
Trial97
|
0ca3873f1c
|
small fix
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-22 17:48:19 +03:00 |
|
Trial97
|
a748f49362
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent
|
2023-10-22 11:34:55 +03:00 |
|
Trial97
|
932cd9e262
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-22 11:32:05 +03:00 |
|
Sefa Eyeoglu
|
cefb96e812
|
Merge pull request #1743 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
|
2023-10-22 09:40:49 +02:00 |
|
github-actions[bot]
|
e7e80e704f
|
chore(nix): update lockfile
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/01441e14af5e29c9d27ace398e6dd0b293e25a54' (2023-10-11)
→ 'github:nixos/nixpkgs/44881e03af1c730cbb1d72a4d41274a2c957813a' (2023-10-21)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/42e1b6095ef80a51f79595d9951eb38e91c4e6ca' (2023-10-09)
→ 'github:cachix/pre-commit-hooks.nix/8cc349bfd082da8782b989cad2158c9ad5bd70fd' (2023-10-19)
|
2023-10-22 00:18:23 +00:00 |
|
Trial97
|
10ae808da9
|
fixed codeql
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-22 00:06:08 +03:00 |
|
Trial97
|
d151e97e3a
|
Fixed some headers
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-21 22:40:37 +03:00 |
|
Trial97
|
41c9ca4f8a
|
Added categories filter
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-21 22:15:07 +03:00 |
|
Trial97
|
35d62cc5f2
|
Updated dependencies
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-21 19:05:31 +03:00 |
|
Trial97
|
9aac8e389f
|
made release type visible
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-21 18:48:55 +03:00 |
|
Trial97
|
9e85297f7a
|
Connected filters
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-21 18:28:33 +03:00 |
|
Alexandru Ionut Tripon
|
2c4af7e793
|
Merge pull request #1290 from Trial97/refactor/NetActions
Refactor ImgurUpload
|
2023-10-21 12:32:16 +01:00 |
|
Trial97
|
4850434c67
|
added releaseType?
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-21 12:16:02 +03:00 |
|
Alexandru Ionut Tripon
|
f0fd1bd5e5
|
Merge pull request #1737 from Trial97/fix_ftb_app_import_icon
Fixed FTBApp import icon
|
2023-10-21 07:48:21 +01:00 |
|
Trial97
|
5d926582c7
|
added Image column size hint
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-20 19:08:56 +03:00 |
|
Trial97
|
7b62d14683
|
fixed squished mod icons
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-20 17:15:12 +03:00 |
|
Trial97
|
a9d7af9096
|
removed some unused stuff
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-20 16:44:37 +03:00 |
|
Trial97
|
80723eeca1
|
Fixed FTBApp import icon
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-20 16:41:32 +03:00 |
|
TheKodeToad
|
e9fd02baca
|
Fix code style
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-20 13:12:16 +01:00 |
|
TheKodeToad
|
db4a7ce239
|
Fix code style
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-20 13:11:17 +01:00 |
|
Trial97
|
35a8ab2393
|
Removed processEvents
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-20 10:32:45 +03:00 |
|