renovate[bot]
|
07f25d6cca
|
chore(deps): update korthout/backport-action action to v1.4.0
|
2023-08-15 14:19:42 +00:00 |
|
Trial97
|
c22eec8f27
|
fixed crash on atlauncher pack install
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 17:03:51 +03:00 |
|
Trial97
|
1faf741004
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 13:29:42 +03:00 |
|
TheKodeToad
|
8cff7c4de6
|
Merge branch 'develop' into rename-groups
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-15 11:03:19 +01:00 |
|
Trial97
|
38d92bbcf1
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 12:59:25 +03:00 |
|
Trial97
|
cf27d2f9ab
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 12:49:21 +03:00 |
|
Trial97
|
c94ee67077
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle3
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 12:16:00 +03:00 |
|
Sefa Eyeoglu
|
62c14cea2a
|
fix: allow NeoForge in resource APIs
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 11:06:14 +02:00 |
|
Sefa Eyeoglu
|
01c3750835
|
feat: support NeoForge mrpack modpacks
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 11:06:14 +02:00 |
|
Sefa Eyeoglu
|
52e5ee7111
|
feat: add NeoForge to UIs
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 11:06:14 +02:00 |
|
Sefa Eyeoglu
|
3a0aa353cc
|
feat: add NeoForge to ModLoaderType
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 11:06:13 +02:00 |
|
Sefa Eyeoglu
|
8f5bb982cd
|
Merge pull request #1513 from lumiscosity/fix/skin_transparency_bug
|
2023-08-15 10:54:07 +02:00 |
|
Sefa Eyeoglu
|
a360ddbe0b
|
Merge pull request #1508 from comp500/fix/allow-empty-lines
|
2023-08-15 10:53:43 +02:00 |
|
Sefa Eyeoglu
|
06aba530d7
|
fix: add missing header
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 10:52:40 +02:00 |
|
Sefa Eyeoglu
|
c2d6a137ab
|
fix: only add native library overrides if files exist
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 10:52:08 +02:00 |
|
Sefa Eyeoglu
|
b927e58126
|
fix: improve debug message
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 10:52:08 +02:00 |
|
Sefa Eyeoglu
|
f1c3da6583
|
fix: fix typo
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 10:52:08 +02:00 |
|
Sefa Eyeoglu
|
4c446ccd50
|
fix: remove meta OpenAL workaround
LWJGL 2 doesn't have a separate zip for OpenAL. So there is no reason
for this code.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 10:51:48 +02:00 |
|
Sefa Eyeoglu
|
83aa0062c7
|
feat: add custom native library path settings
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 10:51:21 +02:00 |
|
Sefa Eyeoglu
|
ff67fd10c3
|
feat: implement override for GLFW/OpenAL with split natives
Fixes PrismLauncher/PrismLauncher#513
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 10:50:38 +02:00 |
|
Sefa Eyeoglu
|
7ba1e7d356
|
Merge pull request #1407 from TheKodeToad/icon-indexing
|
2023-08-15 10:43:29 +02:00 |
|
Sefa Eyeoglu
|
f533173b95
|
Merge pull request #1516 from Trial97/abort_connect
|
2023-08-15 10:40:12 +02:00 |
|
Sefa Eyeoglu
|
14d5fd7edb
|
Merge pull request #1520 from PrismLauncher/update_flake_lock_action
|
2023-08-15 10:39:08 +02:00 |
|
Sefa Eyeoglu
|
740ca54c87
|
Merge pull request #1462 from getchoo/labels
|
2023-08-15 10:38:28 +02:00 |
|
Sefa Eyeoglu
|
6ce7e426d2
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 10:38:04 +02:00 |
|
Sefa Eyeoglu
|
0c753619a4
|
Merge pull request #1467 from Scrumplex/update-nix-docs
|
2023-08-15 10:36:38 +02:00 |
|
Sefa Eyeoglu
|
4b06255cc2
|
Merge pull request #1486 from PrismLauncher/staging
|
2023-08-15 10:36:09 +02:00 |
|
Sefa Eyeoglu
|
1939e3e6ed
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 09:02:15 +02:00 |
|
Trial97
|
9546c77113
|
Some warnings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 00:52:34 +03:00 |
|
Trial97
|
0ba88ff138
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into staging
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 00:33:24 +03:00 |
|
Sefa Eyeoglu
|
215d7dbb74
|
chore: update license headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-14 18:17:05 +02:00 |
|
Sefa Eyeoglu
|
91ba4cf75e
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-14 18:16:53 +02:00 |
|
Sefa Eyeoglu
|
779f70057b
|
Merge commit 'ce2ca1381519a2e261d7f76dffa874d559d979c2' into staging
|
2023-08-14 18:16:13 +02:00 |
|
TheKodeToad
|
a44cb6430e
|
Merge pull request #1107 from Ryex/chore/add-compiler-warnings
Introduce more strict compiler warnings and fix them
|
2023-08-13 13:10:58 +01:00 |
|
github-actions[bot]
|
1aadaa208d
|
chore(nix): update lockfile
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/0d2fb29f5071a12d7983319c2c2576be6a130582' (2023-08-05)
→ 'github:nixos/nixpkgs/f0451844bbdf545f696f029d1448de4906c7f753' (2023-08-12)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/3139c4d1f7732cab89f06492bdd4677b877e3785' (2023-08-05)
→ 'github:cachix/pre-commit-hooks.nix/c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a' (2023-08-11)
|
2023-08-13 00:16:46 +00:00 |
|
TheKodeToad
|
5056a51c18
|
Improvements and refinements to pack export
- Persist fields
- Toggle optional files
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-12 21:20:51 +01:00 |
|
TheKodeToad
|
3c209ba502
|
theme -> catpacks
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-12 19:04:34 +01:00 |
|
Trial97
|
71890707c0
|
format and apply the sugestion
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-12 13:08:39 +03:00 |
|
Alexandru Ionut Tripon
|
b3b2e9df35
|
Merge branch 'develop' into feat/acknowledge_release_type
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-08-12 12:42:30 +03:00 |
|
Sefa Eyeoglu
|
3aba7f8fec
|
Merge pull request #1518 from Scrumplex/asan-develop
|
2023-08-12 11:38:01 +02:00 |
|
Alexandru Ionut Tripon
|
d6e4fe7c1f
|
Update CMakeLists.txt
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-08-12 11:29:08 +02:00 |
|
Trial97
|
c9d628bf18
|
revert asan on debug on by default
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-12 11:29:08 +02:00 |
|
Sefa Eyeoglu
|
35358f8180
|
Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings
|
2023-08-12 11:17:11 +02:00 |
|
Sefa Eyeoglu
|
019e5ca3e8
|
fix: use ApiDownload for CF URL handling
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-12 11:11:58 +02:00 |
|
Sefa Eyeoglu
|
6423edaa76
|
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle
|
2023-08-12 10:58:27 +02:00 |
|
Sefa Eyeoglu
|
44153a28e3
|
Merge pull request #1517 from Trial97/revert_asan
|
2023-08-12 10:57:29 +02:00 |
|
Alexandru Ionut Tripon
|
bcf0635efd
|
Update CMakeLists.txt
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-08-12 10:55:53 +02:00 |
|
Trial97
|
92dbe1684e
|
revert asan on debug on by default
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-12 10:55:53 +02:00 |
|
seth
|
7879091cea
|
Merge pull request #1512 from Trial97/curseforge_import
Fix importing Quilt/Fabric packs from CurseForge
|
2023-08-11 10:16:17 -04:00 |
|
Sefa Eyeoglu
|
73adac2501
|
fix: use QColorConstants in Qt 5.14+
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-11 15:57:12 +02:00 |
|