Commit Graph

5010 Commits

Author SHA1 Message Date
Trial97 8fbc665acb Added UserData as another posible path for portable builds
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-16 18:28:46 +03:00
TheKodeToad f3baa420b2 Fix broken tab order
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-16 13:45:22 +01:00
TheKodeToad 8778313170 Merge remote-tracking branch 'upstream/develop' into feature/java-downloader
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-16 13:39:14 +01:00
Trial97 c41c39b5d8 cleanup the mod name checking
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15 23:55:09 +03:00
Trial97 fa164aa081 rename to GenericProfiler
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15 22:18:28 +03:00
Trial97 f7f7bc6865 Removed update disabled warning
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15 20:52:17 +03:00
Trial97 c28d9161cf added unused
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15 18:54:22 +03:00
Trial97 748a644e2c added wait profiler
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15 18:50:32 +03: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 42a6c670c7 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15 12:52:59 +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 6c362afc21 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15 12:41:46 +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 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 6ce7e426d2 chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15 10:38:04 +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 6d070e8607 "Format"
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-12 21:50:02 +01:00
TheKodeToad 983c943eef Merge branch 'develop' into quick-play
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-12 21:48:41 +01: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 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 73adac2501 fix: use QColorConstants in Qt 5.14+
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-11 15:57:12 +02:00
Trial97 d801151d5c connect the abort signal in concurent task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-11 15:41:41 +03:00
Sefa Eyeoglu ea43d0f687 fix: fix more warnings
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-11 10:57:57 +02:00
Sefa Eyeoglu 396f812496 Merge pull request #1230 from TheKodeToad/better-component-installation
Revamp loader installation UI
2023-08-11 08:24:14 +02:00