Made cat scalable #1127
Merged
Made cat scalable #1127
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
getchoo
added
enhancement
getchoo
approved these changes
Jun 14, 2023
getchoo
removed
the
needs-testing
TheKodeToad
requested changes
Jun 28, 2023
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
TayouVR
approved these changes
Jul 3, 2023
TheKodeToad
approved these changes
Jul 3, 2023
Scrumplex
pushed a commit
that referenced
this pull request
Jul 16, 2023
1 task
Trial97
added a commit
to Trial97/PrismLauncher
that referenced
this pull request
Aug 5, 2023
commit a23c672b6cb48bbc2927def5ce305bdf6859eaa6
Merge: d3d44ec7 60dde753
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat Aug 5 17:38:09 2023 +0300
Merge branch 'develop' of github.com:Trial97/PrismLauncher into develop
commit 60dde7532c021c7b9bdad1fba2fd488c6cbb54e3
Author: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Fri Aug 4 22:16:00 2023 +0300
Apply suggestions from code review
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
commit 5598ec010e380d979220dced49a0dc0057bc9fb1
Author: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Fri Aug 4 22:15:17 2023 +0300
Apply suggestions from code review
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
commit 1a7a54e1607336cb7a0cce4323e1ebfbc96bf7d9
Merge: fbee834b ae793f6c
Author: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Fri Aug 4 22:12:40 2023 +0300
Merge branch 'develop' into develop
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
commit ae793f6cf11658c9abc5111e82d5ba7b3e6af127
Merge: 50c7d39e 1d638e01
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri Aug 4 19:42:36 2023 +0200
Merge pull request #1459 from Scrumplex/format
commit 1d638e018ac40fbfb35dd117f9a948c0cf35eadd
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri Aug 4 19:41:47 2023 +0200
chore: update license headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit 50c7d39e082f0a7dbd977401e16d5adf534d9770
Merge: ac36a228 b013133c
Author: seth <getchoo@tuta.io>
Date: Fri Aug 4 12:05:45 2023 -0400
Merge pull request #1483 from DioEgizio/update-qt652
[macOS,Windows] Update to Qt 6.5.2
commit b013133cc1a66d777c0c16969302e23fb8cd2e16
Author: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Date: Thu Aug 3 09:24:47 2023 +0200
chore: update to qt 6.5.2
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
commit ac36a2289faf331af17b51e2c9ebb78d005f9bfa
Merge: 01e17806 fa2b784f
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Aug 2 19:28:01 2023 +0200
Merge pull request #1452 from getchoo/sparkle-disable
commit fa2b784f7eb817e97d0af45fe78d205932ada193
Merge: b1aa9e58 01e17806
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Aug 2 19:27:48 2023 +0200
Merge branch 'develop' into sparkle-disable
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit 01e17806f67534140a6db6cf90191f4db4dd30ac
Merge: f561e7fe 62aa7a52
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Aug 2 19:27:14 2023 +0200
Merge pull request #1391 from Trial97/prism_export2
commit f561e7febfdbc7124dc27804dfc3c6e90553803e
Merge: ea56ff25 39d4f0df
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Aug 2 19:24:24 2023 +0200
Merge pull request #1476 from Scrumplex/fix-saving-metaurl
commit 39d4f0df66c2981c20e897416db2e8b551c52f03
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Aug 2 18:54:52 2023 +0200
fix: don't reset meta url on launch
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit 1d468ac35ad88d8c77cc83f25e3704d9bd7df01b
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Aug 2 18:35:35 2023 +0200
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit ce2ca1381519a2e261d7f76dffa874d559d979c2
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon Jul 31 15:37:35 2023 +0200
fix: add missing headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit f256b836f4ea88e253d3a54e10faa124bc5c04f9
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Sat Jul 29 13:16:21 2023 +0100
Make more options generic
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
commit 71fb38c91f16ce46a7103d8a606de2e0aeb04395
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Sat Jul 29 13:01:09 2023 +0100
Fix alignment properties
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
commit 076c189948b89787b34a2a4aded7a9c88f580ee1
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat Jul 29 11:30:33 2023 +0200
fix: format all languages using clang-format
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit 9f66f6495ad1f91d7cdb1677431069f27bc24f58
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat Jul 29 11:10:16 2023 +0200
fix: fix undisciplined multiple inheritance
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit c07a8573590f9d0daf82bebe053411e0b9e6ad9f
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat Jul 29 11:05:40 2023 +0200
fix: remove irregular enum initialization
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit 76df836378aa5dd90b0d039358d9927628d48878
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat Jul 29 11:02:10 2023 +0200
fix: simplify switch statement
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit a545f67a211173ae0649e7dda59e1e0fecb2e160
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat Jul 29 11:00:33 2023 +0200
fix: take JavaCheckResult by const reference
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit 9d5818916af39b32f64e20381a4530efa6247e38
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri Jul 28 16:09:43 2023 +0200
fix(nix): enable clang-format
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit ea56ff255d42a0bb4aadfe834fcc1a91c305f8f4
Merge: 01d3eea3 e21756ea
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Aug 2 18:31:27 2023 +0200
Merge pull request #1339 from TheKodeToad/remove-direct-launch
commit 01d3eea379e7cb843104130b205e68147c6d6f27
Merge: 39d7bc6c f13eccb0
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Aug 2 18:25:51 2023 +0200
Merge pull request #1359 from Trial97/import
commit f13eccb03d053453fd063850a35d7d17d76f9ce3
Author: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Wed Aug 2 19:24:58 2023 +0300
Update launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
commit 39d7bc6c24922c2d6e3d6f7eb2ab7efb9b35940a
Merge: bb039d4b 6a7f6316
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Aug 2 18:24:54 2023 +0200
Merge pull request #1294 from ashuntu/develop
commit 6a7f63166d9d65a48b4bc0b0f1355aba047967ee
Author: ashuntu <101582426+ashuntu@users.noreply.github.com>
Date: Wed Aug 2 10:04:53 2023 -0500
DCO Remediation Commit for ashuntu <101582426+ashuntu@users.noreply.github.com>
I, ashuntu <101582426+ashuntu@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 10678096e57eb5b344f0dd39ad178403640b722a
I, ashuntu <101582426+ashuntu@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 51d7a6289e1cf2df463ae8d7c0b08b4a61faea3c
I, ashuntu <101582426+ashuntu@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 1467072f3dcd6ea5d2e3375ad5d69f3ee6d58af2
Signed-off-by: ashuntu <101582426+ashuntu@users.noreply.github.com>
commit bb039d4bc71863bd068efbadb788e76cf1b7bce3
Merge: 92b2f463 31b62203
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Wed Aug 2 12:55:49 2023 +0100
Merge pull request #1445 from Trial97/curse
feat: removed flame quilt warning
commit 92b2f463e3a150169f30b7fda223bbeb7b22ada2
Merge: 9137721e 16e6a018
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Aug 2 12:08:34 2023 +0200
Merge pull request #1474 from apix0n/develop
commit 16e6a01881815e7cc1db4a8d9746f1eaa5daaa15
Author: Apix <apix0n@outlook.com>
Date: Wed Aug 2 11:35:54 2023 +0200
fix: fix copyright year
Signed-off-by: Apix <apix0n@outlook.com>
commit 9137721e8e5b44f2338a36874a393435cbc6daa3
Merge: 56642516 d1513732
Author: seth <getchoo@tuta.io>
Date: Sun Jul 30 04:45:10 2023 -0400
Merge pull request #1461 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
commit 566425166b343c3c4ffd8eaa3ca54167de1d3d14
Merge: bdec11c5 1e82cb6a
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun Jul 30 09:47:40 2023 +0200
Merge pull request #1449 from Trial97/tehnic
Reintroduce parsing of INI files
commit d1513732be63a0aed8f97c5bcf1bd5ecd94a423c
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date: Sun Jul 30 00:20:33 2023 +0000
chore(nix): update lockfile
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/f465da166263bc0d4b39dfd4ca28b777c92d4b73' (2023-07-22)
→ 'github:nixos/nixpkgs/d2b52322f35597c62abf56de91b0236746b2a03d' (2023-07-29)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/eb433bff05b285258be76513add6f6c57b441775' (2023-07-18)
→ 'github:cachix/pre-commit-hooks.nix/1e2443dd3f669eb65433b2fc26a3065e05a7dc9c' (2023-07-29)
commit 1467072f3dcd6ea5d2e3375ad5d69f3ee6d58af2
Author: ashuntu <101582426+ashuntu@users.noreply.github.com>
Date: Fri Jul 28 16:25:32 2023 -0500
Removed snapcraft.yaml in favor of dedicated repo: https://github.com/ashuntu/prismlauncher-snap
commit d133b40b254630f988c57c1111e4659023324edc
Merge: 51d7a628 bdec11c5
Author: Ash <101582426+ashuntu@users.noreply.github.com>
Date: Fri Jul 28 21:22:35 2023 +0000
Merge branch 'PrismLauncher:develop' into develop
commit bdec11c501a6438706f62465d89f2344f7856342
Merge: 928e18b6 4a9ea832
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Thu Jul 27 09:40:31 2023 +0200
Merge pull request #1437 from LostLuma/instance-export-ignore-caches-2
commit b1aa9e584624a0732dd55fc6c459524a8abfe6ba
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Thu Jul 27 09:37:56 2023 +0200
refactor: introduce internal Launcher_ENABLE_UPDATER variable
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit 51bfda937d47837ed426150ed6f43a60b4ca0ce1
Author: seth <getchoo@tuta.io>
Date: Thu Jul 27 00:59:01 2023 -0400
chore: don't include sparkle when not enabled
Signed-off-by: seth <getchoo@tuta.io>
commit 4a9ea832ff63a3f1f6f779b35b8a7a3e705fc6a3
Author: LostLuma <lilly@lostluma.net>
Date: Thu Jul 27 01:42:14 2023 +0200
Ignore cache files entirely, also apply to modpack export
Signed-off-by: LostLuma <lilly@lostluma.net>
commit a8498b0dab94d0ab6c9e5cf395e5003db541b749
Author: seth <getchoo@tuta.io>
Date: Wed Jul 26 19:03:14 2023 -0400
chore: make INSTALL_BUNDLE a cached variable
Signed-off-by: seth <getchoo@tuta.io>
commit 48e50401968a72846350c6fbd76cc957b64a6b5a
Author: seth <getchoo@tuta.io>
Date: Wed Jul 26 17:27:52 2023 -0400
feat: disable sparkle when update url is empty
Signed-off-by: seth <getchoo@tuta.io>
commit 928e18b66dbee8ea4b245416206a9e73427ce0f1
Merge: d960effb f7ffbcca
Author: seth <getchoo@tuta.io>
Date: Wed Jul 26 17:10:07 2023 -0400
Merge pull request #1446 from getchoo/nix-fixes
disable darwin in flake + cleanup garnix.yaml + fix markdownlint warnings
commit 62aa7a52c4f10848b5645b57332afd26421a1f4e
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu Jul 27 00:07:38 2023 +0300
fiexed conflicts
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 3c472fd7e0cbe517c63f41f8c02767e372e916a1
Merge: 477b72ad d960effb
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu Jul 27 00:05:59 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2
commit d3d44ec7730592a6573cc47ca59a85b2f29601b8
Merge: 6e2bb5cd d960effb
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu Jul 27 00:02:54 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
commit d960effb994ba421c502d8d5e0a1bb4d46efd9a3
Merge: a0944dab af59c417
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Jul 26 22:56:31 2023 +0200
Merge pull request #1447 from getchoo/typomoment
fix: typo in task.h
commit 1e82cb6a7c9c7e8d0a9bfa3d2505b4b8eb132944
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed Jul 26 23:56:01 2023 +0300
fix: add support for QByteArray inifile
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 31b62203a77c9e480e8ea51b9c8ff366211f5b58
Author: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Wed Jul 26 23:44:35 2023 +0300
Update launcher/ui/MainWindow.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
commit af59c4171344d6727c8d67205cc02406729250a3
Author: seth <getchoo@tuta.io>
Date: Wed Jul 26 16:20:30 2023 -0400
fix: typo in task.h
Signed-off-by: seth <getchoo@tuta.io>
commit f7ffbcca6c5490e24ee74486cfc6698a38512561
Author: seth <getchoo@tuta.io>
Date: Wed Jul 26 14:45:30 2023 -0400
chore(docs): correct markdownlint warnings
Signed-off-by: seth <getchoo@tuta.io>
commit 342a0d0091fafece11f2b18e38c3786f112ac20b
Author: seth <getchoo@tuta.io>
Date: Wed Jul 26 14:47:47 2023 -0400
fix(nix): disable x86_64-darwin
Signed-off-by: seth <getchoo@tuta.io>
commit 1974bb7e59803fc9fc219a8d7f59896320bd58ea
Author: seth <getchoo@tuta.io>
Date: Wed Jul 26 14:34:11 2023 -0400
chore(ci): cleanup garnix.yaml
Signed-off-by: seth <getchoo@tuta.io>
commit e6b4fc918250b415762b525ebce763b81f7d5cf9
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed Jul 26 21:36:40 2023 +0300
removed quilt warning
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit c778dcbc9c326c1bf563852d7393bf43c1514346
Merge: d7f4e40f a0944dab
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed Jul 26 21:33:15 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
commit a0944dab7a8fff9b5d9c2c8d35cc55349c93a3cd
Merge: bcadffa0 4ad44899
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Jul 26 20:30:04 2023 +0200
Merge pull request #1438 from Scrumplex/update-docs
commit a9fefb2eebf8ded7322b778d9a3f36bfc65cf113
Author: LostLuma <lilly@lostluma.net>
Date: Wed Jul 26 15:22:22 2023 +0200
Address review comments
Signed-off-by: LostLuma <lilly@lostluma.net>
commit 4ad448993c01a41a6af23b1154c5ae64649eef91
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Jul 26 14:48:53 2023 +0200
fix: fix typo in README
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit bcadffa0e365581e818609ee990de395a228526f
Merge: ce2d2c9f fbf29274
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Jul 26 14:47:14 2023 +0200
Merge pull request #1434 from getchoo/garnix
commit ce2d2c9f32242dcb1bf27f658cd2329f030dfbdf
Merge: 4f000122 b4159d30
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Wed Jul 26 13:41:54 2023 +0100
Merge pull request #1427 from tjw123hh/develop
Add some missing strings to translations
commit 6f652e1d2fbe362387c886bf7047f425cc25004d
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Jul 26 14:38:32 2023 +0200
chore: update information for downstreams
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit 361583edfcf7e647b7bdf6ba9b82dd810a50b845
Author: LostLuma <lilly@lostluma.net>
Date: Wed Jul 26 03:08:38 2023 +0200
Ignore cache files when exporting instances
Signed-off-by: LostLuma <lilly@lostluma.net>
commit fbf29274e8c0f9b362e1630c3cee1199a889fa9f
Author: seth <getchoo@tuta.io>
Date: Tue Jul 25 19:22:48 2023 -0400
chore(ci): remove nix job
we're using garnix now
Signed-off-by: seth <getchoo@tuta.io>
commit 3c35d647b87f774877b7c090186622801bd75f10
Author: seth <getchoo@tuta.io>
Date: Tue Jul 25 19:04:22 2023 -0400
feat(ci): init garnix.yaml
Signed-off-by: seth <getchoo@tuta.io>
commit b4159d30fc24ce248804bd0abd5a68934f3d4739
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Tue Jul 25 15:17:20 2023 +0100
Revert permission change
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
commit f843d0732baaca3301255d0fe365d9577d916ac8
Merge: 280f041a 4ab630b8
Author: tjw123hh <tjw123hh@outlook.com>
Date: Tue Jul 25 17:36:38 2023 +0800
Merge branch 'develop' of https://github.com/tjw123hh/PrismLauncher into develop
commit 280f041acb449d8eafc138c48339b258a6e99c64
Author: tjw123hh <tjw123hh@outlook.com>
Date: Tue Jul 25 17:35:31 2023 +0800
Delete some incorrect `notr="true"` tags
Signed-off-by: tjw123hh <tjw123hh@outlook.com>
commit 4f000122688a0967d9d7df95d7ebb9241b284d53
Merge: 684c2ec4 f505d43f
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon Jul 24 20:41:23 2023 +0200
Merge pull request #1426 from TheKodeToad/token-censor-fix
commit 4ab630b832db9adb6b2b77a229cb845e63fc9336
Author: tjw123hh <56749271+tjw123hh@users.noreply.github.com>
Date: Mon Jul 24 20:50:11 2023 +0800
Update org.prismlauncher.PrismLauncher.desktop.in
Signed-off-by: tjw123hh <56749271+tjw123hh@users.noreply.github.com>
commit a32ca432882943bc83f085a0d95e7189a0fd679b
Author: tjw123hh <tjw123hh@outlook.com>
Date: Mon Jul 24 20:48:27 2023 +0800
DCO Remediation Commit for tjw123hh <tjw123hh@outlook.com>
I, tjw123hh <tjw123hh@outlook.com>, hereby add my Signed-off-by to this commit: 6a01c277e8f98797e3325a2b249e59ee95f43c7e
Signed-off-by: tjw123hh <tjw123hh@outlook.com>
commit f505d43fc0399d944cad9e51ab6cc7189052cba1
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Mon Jul 24 13:43:26 2023 +0100
Fix token "0" being replaced
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
commit 6a01c277e8f98797e3325a2b249e59ee95f43c7e
Author: tjw123hh <tjw123hh@outlook.com>
Date: Mon Jul 24 20:41:22 2023 +0800
Delete some incorrect tags
commit 684c2ec47a4b91c57461284f9a8bffa25ce6d05d
Merge: 273d75fd 6f6b0b96
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun Jul 23 11:45:31 2023 +0200
Merge pull request #1420 from PrismLauncher/update_flake_lock_action
commit 273d75fd515cc72299b92ddf4718e8e7fd34d2d0
Merge: 6ffcfcd7 2253100a
Author: seth <getchoo@tuta.io>
Date: Sat Jul 22 20:41:27 2023 -0400
Merge pull request #1419 from pandaninjas/update-libnbtplusplus
Update libnbtplusplus submodule
commit 6f6b0b9661fb2d211ea4437b54717d7fced79373
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date: Sun Jul 23 00:21:25 2023 +0000
chore(nix): update lockfile
Flake lock file updates:
• Updated input 'libnbtplusplus':
'github:PrismLauncher/libnbtplusplus/2203af7eeb48c45398139b583615134efd8d407f' (2022-04-15)
→ 'github:PrismLauncher/libnbtplusplus/a5e8fd52b8bf4ab5d5bcc042b2a247867589985f' (2023-07-22)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/46ed466081b9cad1125b11f11a2af5cc40b942c7' (2023-07-15)
→ 'github:nixos/nixpkgs/f465da166263bc0d4b39dfd4ca28b777c92d4b73' (2023-07-22)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/5e28316db471d1ac234beb70031b635437421dd6' (2023-07-14)
→ 'github:cachix/pre-commit-hooks.nix/eb433bff05b285258be76513add6f6c57b441775' (2023-07-18)
commit 2253100ac6a5dd58f9413b8e82a474e36e0929f0
Author: PandaNinjas <admin@malwarefight.wip.la>
Date: Sat Jul 22 14:26:49 2023 -0400
Update libnbtplusplus submodule
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
commit 6ffcfcd7e9d96ae0a2846d1cf23b27425a838709
Merge: 821dd840 f8d9cd9a
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Sat Jul 22 11:14:12 2023 +0100
Merge pull request #1402 from Trial97/flame_import
feat:made flame instace creation use metadata for recommended version
commit 0b74b3833a95598d1770d7bd98acf15f2582ccb6
Merge: ef21879d 821dd840
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri Jul 21 19:30:06 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import
commit ef21879df4f7c2822381e1b6af4901e0e6b0d339
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri Jul 21 19:30:00 2023 +0300
replaced require with ensure for jvmArgs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 821dd8400b1a27ab1f932200bfa77d7a04edef5d
Merge: 593f4529 b7bccb90
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri Jul 21 11:11:12 2023 +0200
Merge pull request #1253 from Trial97/catpacks
commit f8d9cd9a0344d8afa806e7b3b73e8b3c59315d17
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed Jul 19 23:08:16 2023 +0300
use range for
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit b7bccb905829eebea039a32edf93606f5fc5defa
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed Jul 19 12:27:02 2023 +0300
removed subdirectory flag
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit f046bd7d500c16f530db48f9da5b0809a02b7519
Merge: ec32618e 593f4529
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed Jul 19 12:26:12 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
commit 593f45298614843c14acb11994320f90a474c750
Merge: f8d88cc8 f8fcb98c
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Wed Jul 19 10:16:27 2023 +0100
Merge pull request #1399 from Scrumplex/offline-uuid
fix: generate predictable UUIDs for offline accounts
commit f8d88cc83d45c63685852a2c015f2556ba8f0494
Merge: 3728cbb6 6597a5c8
Author: seth <getchoo@tuta.io>
Date: Tue Jul 18 21:19:58 2023 +0000
Merge pull request #1372 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
commit f393aa684e74ca870eb2108e2b74a7c93a70c366
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue Jul 18 23:59:43 2023 +0300
wait to load metadata
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 4c319c8f4fa19a6e999f547a8f43b855cc6de36a
Merge: 39149764 3728cbb6
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue Jul 18 23:49:52 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into flame_import
commit 477b72ad33c29de097585ed415e1940cc25e2b34
Merge: 5162203c 3728cbb6
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue Jul 18 23:48:02 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2
commit 3728cbb62abf1027f6d7daaa7b3c08f15e1e8c79
Merge: 3fbc2515 1fbb41f5
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue Jul 18 22:47:55 2023 +0200
Merge pull request #1397 from Gaming32/develop
commit 015f88bf83ce577b2be4f3a70b41156d76daa00b
Merge: 002430db 3fbc2515
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue Jul 18 23:46:19 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 3fbc25155b71820c233ac2d8383fa5b9bd1867df
Merge: ecac05b2 440afced
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue Jul 18 22:28:27 2023 +0200
Merge pull request #1362 from Trial97/fix_warning
commit ecac05b2fcfb8d025f034b47dab69b0c05d3f7db
Merge: 5b54475d b0940d69
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue Jul 18 22:26:56 2023 +0200
Merge pull request #1378 from Trial97/prism_export
Added progress bar to Prism instance export
commit 5b54475d3e6c101f2bdd645350f3c81ad4fc12a3
Merge: 01afa895 2eff1de5
Author: seth <getchoo@tuta.io>
Date: Tue Jul 18 20:12:39 2023 +0000
Merge pull request #1385 from orowith2os/flatpak-updates
Update Flatpak manifest
commit 391497645ff2054dbc1eac48c8bc49133b86b319
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue Jul 18 22:33:39 2023 +0300
feat:made flame instace creation use metadata for recommended version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit f8fcb98c6837c0bf66c2175ea98198449c36b165
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue Jul 18 09:06:49 2023 +0200
fix: generate predictable UUIDs for offline accounts
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit 2eff1de560c9b4ac76316d2c6d812438b4488222
Author: Dallas Strouse <dastrouses@gmail.com>
Date: Mon Jul 17 00:29:24 2023 -0500
Update Flatpak manifest
Signed-off-by: Dallas Strouse <dastrouses@gmail.com>
commit 1fbb41f5e2c4426b1b1e469c78cfbc7e1c4d7999
Author: Josiah Glosson <soujournme@gmail.com>
Date: Mon Jul 17 17:07:06 2023 -0500
Make Launch Offline not launch online in 1.6+
Signed-off-by: Josiah Glosson <soujournme@gmail.com>
commit 01afa8957f477d347c5103305a038a30edd24ca2
Merge: e8c44e70 2be63090
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Mon Jul 17 17:40:42 2023 +0100
Merge pull request #1387 from Scrumplex/fix-quilt-beacon
Check if any modloader is installed
commit 5162203c7d31ad58fbd8eac838f48466151af389
Merge: cd9310af b0940d69
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 17 17:58:42 2023 +0300
Merge branch 'prism_export' of github.com:Trial97/PrismLauncher into prism_export2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit b0940d696baa24ddcf29a5d3393196c1047dcd3f
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 17 17:42:15 2023 +0300
Added QFutureWatcher
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
abort
forgot
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit fe73d696cb714d724948176f0bfbb356412b0f11
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 17 16:57:52 2023 +0300
replace emplace with insert
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 2ea4a78541c5d6dc682ec76c2e0846fe11fe1cf9
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 17 16:24:43 2023 +0300
Upgraded ExportToZipTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit cd9310afedace04a887a82ea1856672a26647935
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 17 16:57:52 2023 +0300
replace emplace with insert
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 64041a84a2da2d0ba07d6eb663ff7cbc3b351b7b
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 17 16:55:26 2023 +0300
handle file removal in ExportToZipTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 78ee63af388ec53871cd3505a64a5d2059dbb922
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 17 16:40:01 2023 +0300
simplify modrinth export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 455c4953382b0548804ce45b5bb850641cff90f2
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 17 16:25:51 2023 +0300
simplify flame export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
s
commit 0bf70d677e5cc2e72907d7df5dbb54020a1e32a9
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 17 16:24:43 2023 +0300
Upgraded ExportToZipTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 2be630904f89c9308d3e0bab94eb9e5a4fa6ae03
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon Jul 17 14:33:01 2023 +0200
fix: don't take modloaders by reference
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit e8c44e700d68078ec4242347b505ed2bddabbe06
Merge: aaf17269 81c0a1c4
Author: Tayou <31988415+TayouVR@users.noreply.github.com>
Date: Mon Jul 17 11:55:31 2023 +0200
Merge pull request #1286 from TayouVR/better-instance-group-separator
commit 54a091ca597608e732f00eb7f086fe26448daea1
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon Jul 17 10:09:01 2023 +0200
fix: check if any modloader is installed
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit ec32618e1158beba1cf5b4c91c3835a233eceeeb
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 17 10:20:22 2023 +0300
reveted back to add years
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit aaf1726965313a0f8712479d0619ddc81f6347a0
Merge: 6b970954 a2a09ffe
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon Jul 17 06:42:46 2023 +0200
Merge pull request #1357 from getchoo/quilt-beacon
feat: add toggle for quilt beacon
commit 6b970954d6531f74fb661cd629c9e760e6a785d3
Merge: 5e0df9b6 ed2f6802
Author: seth <getchoo@tuta.io>
Date: Sun Jul 16 18:36:51 2023 -0400
Merge pull request #1381 from getchoo/backporting-docs
chore(docs): add backporting info to CONTRIBUTING.md
commit ed2f680202316c2ecf33a8926866a47da17f44e2
Author: seth <getchoo@tuta.io>
Date: Sun Jul 16 17:28:14 2023 -0400
chore(docs): add backporting info to CONTRIBUTING.md
Signed-off-by: seth <getchoo@tuta.io>
commit 5e0df9b6965fae285d35580d19d1ab9bbc39c16a
Merge: b54d1651 40fb3871
Author: seth <getchoo@tuta.io>
Date: Sun Jul 16 17:15:55 2023 -0400
Merge pull request #1276 from Scrumplex/print-build-platform
Print build platform on launch
commit ec41252535d9432d0b15228dc301e3a57e1c281d
Author: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Sun Jul 16 23:47:54 2023 +0300
Update launcher/MMCZip.h
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
commit 4df9df03ab2e6eddae08f95ec2d34b4e811158ed
Author: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Sun Jul 16 23:47:47 2023 +0300
Update launcher/MMCZip.cpp
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
commit 79222a56e38a696168dddcc92a970242e0f34053
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun Jul 16 21:12:53 2023 +0300
use shared pointer
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
use shared pointer
commit cadb7142f0fe5eab16198ca8079d544456a977cc
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun Jul 16 20:57:57 2023 +0300
Added progress bar to Prism instance export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 251055302eec0232a89f0466efe3e7e7f3fa7de3
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun Jul 16 20:53:58 2023 +0300
format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit b54d1651ab5ec822bff92c3e44bfeb0fd601ee60
Merge: b9568279 18ebc858
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun Jul 16 19:42:09 2023 +0200
Merge pull request #1373 from Scrumplex/backport-bot
commit 002430db4668df1816feba550f5c2f432683996c
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun Jul 16 15:43:47 2023 +0300
added path to flatpack
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit de30a72c4e1f051eef2a0bd389fc51e6a64d54c3
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun Jul 16 15:16:16 2023 +0300
made the date a object
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 0a956bbc732f2258866f3e07e947551dfd993be6
Merge: 1e9a5969 b9568279
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun Jul 16 14:18:26 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
commit 1e9a596908ba85dea974e6d041b53c675f8d7b78
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun Jul 16 14:18:17 2023 +0300
simplified code in cat packs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit b9568279dc364a462e9837ea13bc3c4f61abdda8
Merge: fcdd9ea9 c0f9ccc5
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun Jul 16 12:30:22 2023 +0200
Merge pull request #1010 from TayouVR/add_default_editorconfig
commit fcdd9ea986e7e54a038a5e9f5a3070c2c126e01e
Merge: c145bfa5 da87e825
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun Jul 16 12:24:42 2023 +0200
Merge pull request #1246 from Trial97/export
commit c145bfa5241a3ee6faa5ad401fdda5c087be86f4
Merge: a6305ac8 06fc8358
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun Jul 16 12:21:17 2023 +0200
Merge pull request #1369 from Trial97/autoselect
commit 18ebc858fdebbd08703d9e5ddeaf23abcfceaa94
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun Jul 16 11:47:47 2023 +0200
feat(actions): add backport action
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit 6597a5c8604c580994958c2fff87ccbe90988df4
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date: Sun Jul 16 00:23:55 2023 +0000
chore(nix): update lockfile
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/267149c58a14d15f7f81b4d737308421de9d7152' (2023-07-01)
→ 'github:hercules-ci/flake-parts/8e8d955c22df93dbe24f19ea04f47a74adbdc5ec' (2023-07-04)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/cd99c2b3c9f160cd004318e0697f90bbd5960825' (2023-07-01)
→ 'github:nixos/nixpkgs/46ed466081b9cad1125b11f11a2af5cc40b942c7' (2023-07-15)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/42587d3414d1747999a5f71e92a83cf6547b62da' (2023-07-03)
→ 'github:cachix/pre-commit-hooks.nix/5e28316db471d1ac234beb70031b635437421dd6' (2023-07-14)
commit a6305ac89111fe4ec40dfbf1c2d2ba20e866a0ff
Merge: 37fb52aa c346d875
Author: Tayou <31988415+TayouVR@users.noreply.github.com>
Date: Sat Jul 15 23:13:00 2023 +0200
Merge pull request #1368 from Trial97/crash_curse_import
commit 06fc8358d9836a203cd31580fa57f055c9bcef05
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat Jul 15 23:57:32 2023 +0300
auto focus search line on resource download
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit c346d875a2d26435f680efb07f785c43af5ad95a
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat Jul 15 23:26:52 2023 +0300
make FileResolvingTask accept empty modlist
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit a2a09ffe01fe8eb6cd1f557b0feb98ed0271151e
Author: seth <getchoo@tuta.io>
Date: Thu Jul 13 20:57:38 2023 -0400
chore: better explain quilt loader beacon
Signed-off-by: seth <getchoo@tuta.io>
commit da87e825a154bc87a6017270d80e4afc1b3c2e64
Author: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Sat Jul 15 15:59:19 2023 +0300
Update launcher/ui/dialogs/ExportToModListDialog.ui
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
commit 7befd63ccedd96c52b94c1845fff36f24ee3f1d1
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat Jul 15 00:28:58 2023 +0300
fixed settings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 2c2c39b42c61011698c14869dda71dc1fe3cda64
Author: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Sat Jul 15 00:17:48 2023 +0300
Update launcher/modplatform/import_ftb/PackInstallTask.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
commit 0692cbe701723e203d16154fa97f67fc5c22198c
Author: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Sat Jul 15 00:17:32 2023 +0300
Update launcher/modplatform/import_ftb/PackInstallTask.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
commit ab10524cd763ab9e7796608d40682fdb70912fd0
Merge: 1ccfba13 37fb52aa
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri Jul 14 23:45:40 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 1ccfba13ebe11a1d6ea2897db45b47c2452931f5
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri Jul 14 23:39:54 2023 +0300
renames
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit b9ed8283b7e22fff5920dcd81ae347822d31353a
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu Jul 13 20:38:08 2023 +0300
Added buttons
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 1495bfb73ead50b45942e94a8e3b18e111820b4b
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue Jul 11 22:43:27 2023 +0300
Made custom template enabled all time
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 9b02c31f8dab0f36f3d0c30115ab323dabe21541
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue Jul 4 17:48:20 2023 +0300
escaped text for html export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 50dae9d4f38d84f168922552e9f87bf2d1130d98
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue Jun 27 18:09:29 2023 +0300
Moved to separate functions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 9a3931dac6e75a79989f13b10604a142dbafcfbb
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue Jun 27 16:57:30 2023 +0300
Added json and csv format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 515197fba2da1d674dbe7bd17dae4e0f22f64097
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jun 26 11:57:21 2023 +0300
fix: html sintax for modlist export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 37fb52aada16fa8533ecee3932e10fcbee0ca1d5
Merge: 094af0f7 c8533c0b
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Fri Jul 14 12:41:21 2023 -0700
Merge pull request #1351 from Trial97/ftb_import
fixed substatus on ftb_import
commit 094af0f78f76d9d20cdbc034074d39afcc8ed34c
Merge: 3becd438 3487e1cb
Author: seth <getchoo@tuta.io>
Date: Fri Jul 14 14:19:44 2023 -0400
Merge pull request #1336 from Ryex/packaging/fix-duplicate-share-directories
packaging: fix duplicate share directories (use only lowercase)
commit 3487e1cb640962ee95520309d5e4b00d6f629c3f
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Fri Jul 14 03:56:18 2023 -0700
Update launcher/Application.cpp
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 6e2bb5cd0a1df986bfc96276349935cb404012c6
Merge: fbee834b 3becd438
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri Jul 14 13:47:48 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
commit 440afcedb02bd878deb2053d2905170763df673d
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri Jul 14 13:32:18 2023 +0300
fixed warning
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit b0a21c9389dfb6962713b61cdb28fa0022c25eeb
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri Jul 14 13:31:28 2023 +0300
insert header
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit fc4a1ef1935059b3c8e4f5d7bdac9fa2311485ac
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri Jul 14 13:31:13 2023 +0300
format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit c8533c0b0d4e510bfe6c6818a25f5c45bc796a53
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed Jul 12 17:58:24 2023 +0300
fixed substatus on ftb_import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit b0a018d8239df32272a7145f2cf71d1413333060
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri Jul 14 12:28:23 2023 +0300
format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 3becd4386bd49c9c91a72647de10faa16c6d700a
Merge: 3099a70e 7f138e35
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri Jul 14 10:11:34 2023 +0200
Merge pull request #1306 from Ryex/ci/address-sanitiser_on_debug_builds
commit 3099a70edc4a8a928247efd032fdd43988cd1e0a
Merge: 5d10045c cde85947
Author: seth <getchoo@tuta.io>
Date: Fri Jul 14 00:16:43 2023 -0400
Merge pull request #1335 from Ryex/fix/gh-1322-old-zip-mods-in-wrong-place
fix(flame install): don't assume .zip is a resource pack. default to mod
commit cde85947c7dd4c2508938490789fef60cd464828
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Thu Jul 13 21:12:12 2023 -0700
Update launcher/minecraft/mod/tasks/LocalResourceParse.cpp
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 5d10045cc823037709d33034663d177af6446f43
Merge: 94d4d12e 25f7cf23
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Thu Jul 13 21:11:47 2023 -0700
Merge pull request #1352 from Trial97/crash_after_abort
Do not reset shared pointer if it's already empty
commit 95b300f1ea7791a7a358d95abb473699d1f016b7
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Thu Jul 13 19:56:36 2023 -0700
packaging: use PascalCase folder name instead
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit bd6e8533adbce78d7cf791d323662af70d052fff
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu Jul 13 19:58:08 2023 +0300
send by reference
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 843c2d67eb04ecd215c9bc3de6f458c8d293b54f
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu Jul 13 18:41:29 2023 +0300
Added FTBAPP Import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 89aaedc06c3eb7a035d8be593a7bbe417cb2f712
Author: seth <getchoo@tuta.io>
Date: Wed Jul 12 21:10:48 2023 -0400
feat: add toggle for quilt beacon
Signed-off-by: seth <getchoo@tuta.io>
commit 94d4d12ee0a12572b2b661003f10cfbdda1b434a
Merge: 94990663 76cc8ce0
Author: Tayou <31988415+TayouVR@users.noreply.github.com>
Date: Thu Jul 13 01:56:12 2023 +0200
Merge pull request #1345 from Trial97/time2
feat:Added option to use system locale
commit 76cc8ce0437b7047ee984993daab57b2605f52a6
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed Jul 12 21:05:13 2023 +0300
renamed setting
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 9499066375d1d5728155a92b51727dfc614044bc
Merge: 06a7d447 766e833a
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Wed Jul 12 09:55:31 2023 -0700
Merge pull request #1350 from Trial97/fix_managed_pack_crash
fixed crash if no version is loaded on managed page
commit 25f7cf23d3572e444617c347ade71fffddd8af8b
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed Jul 12 19:55:11 2023 +0300
the other place
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 9ee68b926829495b4b87e7044bd31352ef6a6a84
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed Jul 12 18:12:31 2023 +0300
small pointer check
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 06a7d447f6ad1f2b77d47e4a43bdbe5b6aa9aa3a
Merge: 640aaa8c 1aa5fa03
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Jul 12 15:53:46 2023 +0200
Merge pull request #1333 from Ryex/fix/null_instance_edit_crash
commit 766e833a7386c9b027c02687ce345b985b4a256d
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed Jul 12 16:25:05 2023 +0300
fixed crash if no version is loaded
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 634612ae816f2c8687efa43aa204b361dc0bc274
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue Jul 11 18:20:44 2023 +0300
added missing header
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit f0d2aab784fd0ff0fc495d5f0c44715887741eb1
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue Jul 11 18:05:43 2023 +0300
feat:Added option to use system locale
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 640aaa8c23d714ce17bc8e78754af6219abc6466
Merge: 99ba02af 0c6362f2
Author: seth <getchoo@tuta.io>
Date: Mon Jul 10 16:31:43 2023 -0400
Merge pull request #1331 from TheKodeToad/hungry-trash
Fix updating trashing resources
commit 1aa5fa03f94438ce53899e4660f12e794fd8bc35
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Mon Jul 10 12:05:01 2023 -0700
Update launcher/ui/MainWindow.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 99ba02afb6a7af1bc0800552338ab811b027eb9e
Author: Nathan <subtype.kitsch_0w@icloud.com>
Date: Mon Jul 10 11:26:25 2023 -0700
Shortcuts on macOS (#1081)
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
commit 9aedb5afffdda7db1b614f4f17ac5901b467d69d
Merge: 91c9082d d53d58a5
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Mon Jul 10 16:42:38 2023 +0100
Merge pull request #1334 from TheKodeToad/litemod-dl
LiteMod downloading
commit e21756ea8c35d04d78046fea44ac5e52f069f699
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Mon Jul 10 16:10:58 2023 +0100
Remove direct launch
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
commit fbee834bc7994ff0e063b3fe88d1b0d2d3babe65
Merge: 7e033aa3 91c9082d
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 10 16:42:21 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
commit 35ccfdb7996ba727039ad2c0ab2974a49eecb6cc
Merge: 6d758795 91c9082d
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 10 16:25:15 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 91c9082d19b957c3295e7a0b5bc6add71e6459b8
Merge: 4f4ccdaa 908ac813
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Mon Jul 10 14:20:29 2023 +0100
Merge pull request #1249 from Trial97/curse
Curseforge modpack export
commit 4f4ccdaa59b166f74318d78beb7da62512677f96
Merge: 01e058d8 308877aa
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Mon Jul 10 13:06:32 2023 +0100
Merge pull request #1338 from Trial97/unlockVersionPage
feat:unlocked versions page
commit 01e058d8c1d90aa6fd2755d069ce21d392c58664
Merge: f816e3cd 8e4de055
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun Jul 9 14:11:33 2023 -0700
Merge pull request #1337 from getchoo/fix-flake-workflow
fix(actions): give update-flake content write perms
commit f816e3cd3fff4e27ec4f66db9f98bddab2efd1c9
Merge: 49109b92 bc2940e1
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Sun Jul 9 22:10:43 2023 +0100
Merge pull request #1241 from Trial97/settings
Allow editing of running instances
commit 49109b9213a14718316e1e6328f37b4e86599dd4
Merge: d43399c2 08c140b9
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun Jul 9 14:07:34 2023 -0700
Merge pull request #1332 from TheKodeToad/widebar-pain
Fix crash when editing instance and prevent similar crashes in future
commit d43399c2b4359b5c3c38a25197ea170388190369
Merge: 67d473aa 6e2fcc9e
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun Jul 9 14:03:47 2023 -0700
Merge pull request #1321 from TheKodeToad/mr-optional
Optional mods in mrpack export
commit 308877aa8f105de408c4c8fe87d3476116b23cf4
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun Jul 9 23:18:38 2023 +0300
removed redundant code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 159f14c0768a1cd8ab99b8a46f2021d163e6740c
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun Jul 9 22:47:38 2023 +0300
feat:unlocked versions page
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 8e4de055b841a6a2ca93b758344ddb72d2ea0f59
Author: seth <getchoo@tuta.io>
Date: Sun Jul 9 15:19:11 2023 -0400
chore(actions): only run update-flake in our repo
Signed-off-by: seth <getchoo@tuta.io>
commit d7f4e40f85d1e253fe62e1c9e1cfb1842ffb0c86
Merge: 908ac813 67d473aa
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun Jul 9 19:38:17 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
commit 6e2fcc9e1102d3955a509c3346b8df15ce52a6a1
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Sun Jul 9 12:08:15 2023 +0100
Replace string manipulation in favour of QFileInfo
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
commit 0d31e31282008e2b6df6b551facb64a2dfc98db8
Author: seth <getchoo@tuta.io>
Date: Sun Jul 9 01:56:21 2023 -0400
fix(actions): give update-flake content write perms
Signed-off-by: seth <getchoo@tuta.io>
commit 4dc4c589ba21df9c5e04081e35788862b498f29d
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sat Jul 8 15:44:09 2023 -0700
packaging: fix duplicate share directories (use only lowercase)
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit d53d58a5d42684c5151680016f38a0f4bd1c0298
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Sat Jul 8 22:03:47 2023 +0100
LiteMod downloading
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
commit e70407289266a205147bfb1293763e64dacb0f3e
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sat Jul 8 13:38:00 2023 -0700
fix(flame install): don't assume .zip is a resource pack. default to mod
let identifier move it if needed
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit a54bbae62282e8adce76df9626c58b6bb3e12967
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sat Jul 8 12:59:55 2023 -0700
fix(instance edit): don't allow editing if no selected instance or instance doesn't support editing
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 08c140b9b45b1a8afd134793acedf867526d6432
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Sat Jul 8 20:51:27 2023 +0100
Fix actionVisitItemPage insersion, and prevent widebar segfault
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
commit 0c6362f28d1caec4d256c538d2874b226390ad85
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Sat Jul 8 18:51:28 2023 +0100
Make trash hungry
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
commit 7e033aa3caa2f5179e829000983e064cc876845e
Merge: 7779f974 67d473aa
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat Jul 8 18:30:00 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
commit 67d473aab773e7f94c394ebdde05581dc8f805de
Merge: 3211b265 20c781b2
Author: seth <getchoo@tuta.io>
Date: Sat Jul 8 07:50:13 2023 -0400
Merge pull request #1329 from Ryex/fix/progress_dialog_centering
fix(progress dialog): if there is a parent center on creation
commit 20c781b23b0d2bd2be8bed0c015eb6c82312c29a
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sat Jul 8 02:28:37 2023 -0700
fix(progress dialog): if there is a parent center on creation
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 7f138e353801d0dde7608f2900b78cbe48d9488d
Merge: b8b8c8d4 3211b265
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sat Jul 8 01:27:30 2023 -0700
Merge branch 'develop' into ci/address-sanitiser_on_debug_builds
commit 3211b265d75dc7e28b1608935396bce2ac4648dd
Merge: 1131038f e5b9bfb2
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Fri Jul 7 21:25:14 2023 -0700
Merge pull request #1302 from Ryex/fix/progress-dialog-segfault
fix: segfault in progress dialog
commit bc2940e16a8a7839a120a45be9232b5adebbe751
Merge: cf2393a5 1131038f
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat Jul 8 00:14:05 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 1131038fdb0093ef9c732b18d699b6176fc6d82c
Merge: d1528c10 b8482a5d
Author: Tayou <31988415+TayouVR@users.noreply.github.com>
Date: Fri Jul 7 22:23:59 2023 +0200
Merge pull request #1120 from Trial97/visit_mod_page
commit d1528c10440f424117e487f4a6e692c3e3a4277e
Merge: e225a721 51e62761
Author: seth <getchoo@tuta.io>
Date: Fri Jul 7 14:31:22 2023 -0400
Merge pull request #1325 from Scrumplex/validate-meta-url
Validate Meta URL
commit 51d7a6289e1cf2df463ae8d7c0b08b4a61faea3c
Author: ashuntu <101582426+ashuntu@users.noreply.github.com>
Date: Fri Jul 7 13:23:05 2023 -0500
Fix URL open crash (#596)
commit 10678096e57eb5b344f0dd39ad178403640b722a
Author: ashuntu <101582426+ashuntu@users.noreply.github.com>
Date: Fri Jul 7 13:20:15 2023 -0500
Persist app data between install versions
commit 51e62761ee8e8cd868c5f2a7eb63d54de5b71d6a
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri Jul 7 19:25:12 2023 +0200
fix: improve QUrl construction
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit b8482a5d89b4044482e7b55aa1c2e2547b41f4fd
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Fri Jul 7 15:53:50 2023 +0100
Update ModFolderPage.cpp
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
commit 3139af8487ae8ea20468023e477be02cf0b96a4d
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri Jul 7 17:12:10 2023 +0300
Made action text simpler
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 6fcdac0d36865eadc2454244ce03c77e6eed767b
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri Jul 7 15:57:24 2023 +0200
fix: reset invalid meta url on launch
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit 073cb91f885b780ae04b6d9a4b94702307f07321
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri Jul 7 15:56:04 2023 +0200
fix(ui): validate meta override url
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit e225a721807b00297a5733e9d60fe2b5603de77c
Merge: 2cb22ad2 13d67c65
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri Jul 7 15:19:00 2023 +0200
Merge pull request #1128 from pandaninjas/fix-implicit-fallthrough
commit 8ae67b84dbf154bef957bfba1342eac27cd4837e
Author: TheKodeToad <TheKodeToad@proton.me>
Date: Thu Jul 6 20:03:25 2023 +0100
Optional mods in mrpack export
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
commit b8b8c8d4acab8c794555956fae699d5706e222f3
Author: flow <flowlnlnln@gmail.com>
Date: Thu Jul 6 06:38:36 2023 -0300
fix(tests): Fix abort of Task test on Linux
Not sure exactly what caused the issue, though I suppose using QThread's
exec instead of our own thingie is nice. I can't remember why I didn't
use that before, so I hope there's no issue with that! :^)
Signed-off-by: flow <flowlnlnln@gmail.com>
commit 93870c315f84d2bb599d669be8205990ee48907d
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu Jul 6 18:46:59 2023 +0300
better url handling
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 13d67c6524a29daea51242d17ba0c6a2b8593747
Author: PandaNinjas <admin@malwarefight.wip.la>
Date: Thu Jul 6 08:51:42 2023 -0400
Keep formatting consistent
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
commit 71e73bb6f8c4a695e39f0c0fec901d8a5e5121b3
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Wed Jul 5 21:18:49 2023 -0700
fix(tests): linux big task memory leak.
- move big_task into function scope
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 8638076aa1cf3f1a975ac59ddaf0286acc7d39e2
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Wed Jul 5 20:19:22 2023 -0700
fix(test): tasks test memmory leak. don't store local task copy.
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 965ee5687a475aa0a7e3756f0e5a7e1db26c6a16
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Wed Jul 5 20:05:18 2023 -0700
fix(test): task test memory leak *again*
- put Big thread on the stack so stack will clean it up.
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 2cb22ad280ec0b540ec6e96759d478c60562bc9a
Merge: 5ba13297 24b9ed10
Author: seth <getchoo@tuta.io>
Date: Wed Jul 5 23:25:12 2023 +0000
Merge pull request #1310 from getchoo/autoupdate-flake
feat(actions): add update-flake-lock
commit 4dbcedd03f6d90a9557cd401c2236f9cda60cf9f
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Wed Jul 5 11:51:37 2023 -0700
fix: Task test memory leaks again
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 5ba13297c6295acf76e69fe1b3cf7723b9d2ad05
Merge: 7c8a0103 00be2111
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed Jul 5 19:26:07 2023 +0200
Merge pull request #1284 from Ryex/fix/properly-track-failed-copies-and-clones
commit 5fe9a7a6c352735801fbbea69f8d2a6cd3b884f4
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Wed Jul 5 03:02:20 2023 -0700
fix: extra } in CXX args
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit a028894855f29c49d4bf8b0f745c66e1ea7dd4c6
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Tue Jul 4 23:43:39 2023 -0700
Apply suggestions from code review
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 183ed7b90bbe015b09f545087387e1345ccaf927
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Tue Jul 4 19:43:22 2023 -0700
chore: cleanup compiler type branches
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 24b9ed106f3c217271468de565ff6706fd832ea5
Author: seth <getchoo@tuta.io>
Date: Tue Jul 4 18:49:17 2023 -0400
feat(actions): add update-flake-lock
Signed-off-by: seth <getchoo@tuta.io>
commit 7c8a010378a6b49e80861936106a497f4fa0ad96
Merge: dedc9e4e 14692eed
Author: seth <getchoo@tuta.io>
Date: Tue Jul 4 22:43:00 2023 +0000
Merge pull request #1304 from Scrumplex/chore-flake-update-1
flake.lock: Update
commit 817ecf822583caf3a510f177d40fe8c6b3218165
Author: PandaNinjas <admin@malwarefight.wip.la>
Date: Tue Jul 4 17:19:08 2023 -0400
Fix VersionProxyModel.cpp
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
commit 4509fde410beab8687d605d0a7fd39038ab94183
Merge: 34cf2871 dedc9e4e
Author: PandaNinjas <admin@malwarefight.wip.la>
Date: Tue Jul 4 16:41:34 2023 -0400
Merge branch 'develop' into fix-implicit-fallthrough
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
commit 34cf28712c254ba378bdbf728471d0dfbb4ab58f
Author: PandaNinjas <admin@malwarefight.wip.la>
Date: Tue Jul 4 16:39:24 2023 -0400
Replace break with return true;
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
commit 1fbc17d275b99d194906302f98412f78fbb77538
Author: PandaNinjas <admin@malwarefight.wip.la>
Date: Tue Jul 4 16:38:04 2023 -0400
Remove break and add fallthrough comment in WorldListPage.cpp
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
commit 908ac813e0f96126a643851e99379956faa08cda
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue Jul 4 15:16:54 2023 +0300
escaped modlist inner html
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 3c96d5e0d568408e0505841af39aa2d539ebaf36
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Mon Jul 3 20:04:24 2023 -0700
fix: memory leaks in tests
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit c5705705d5b40e8157a88612c8a7e83f32f6745b
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Mon Jul 3 18:35:42 2023 -0700
fix: memory leaks in ResourceModel Test
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 03a1d68b742b8ec74b472e5fb32d3f9c34594b5e
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Mon Jul 3 18:18:48 2023 -0700
fix: memory leaks in filesystem test
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 50eff80ca16a351ec80f75f0f6cf5f0f87207fb1
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Mon Jul 3 18:07:59 2023 -0700
build: optimize address-sanitizer
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 96c118779daff9ea099710957a62c83115c149ef
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Mon Jul 3 17:42:57 2023 -0700
build: enable address sanitiser in debug builds
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 7779f974a3a40484822789b08703ffd01a66adf5
Merge: 6f7d901a dedc9e4e
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 3 23:56:26 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
commit 6d758795af8a414d13db4951e3e9ed60af7091fd
Merge: 5d5f1b86 dedc9e4e
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 3 17:00:56 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit dedc9e4edc2769c62f33b6564f3009414245d9f3
Merge: 43e6f05e 0008b22d
Author: Tayou <31988415+TayouVR@users.noreply.github.com>
Date: Mon Jul 3 15:46:56 2023 +0200
Merge pull request #1127 from Trial97/scale_cat
commit fa7cfc77d8b723a53577734a0a3c76df7d9dc6d7
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 3 16:08:20 2023 +0300
fixed template
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 14692eed4052ae550d046278f559e66d3a77fb40
Author: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon Jul 3 14:25:54 2023 +0200
flake.lock: Update
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/006c75898cf814ef9497252b022e91c946ba8e17' (2023-05-08)
→ 'github:hercules-ci/flake-parts/267149c58a14d15f7f81b4d737308421de9d7152' (2023-07-01)
• Updated input 'flake-parts/nixpkgs-lib':
'github:NixOS/nixpkgs/da45bf6ec7bbcc5d1e14d3795c025199f28e0de0?dir=lib' (2023-04-30)
→ 'github:NixOS/nixpkgs/4bc72cae107788bf3f24f30db2e2f685c9298dc9?dir=lib' (2023-06-29)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/aeb75dba965e790de427b73315d5addf91a54955' (2023-05-25)
→ 'github:nixos/nixpkgs/cd99c2b3c9f160cd004318e0697f90bbd5960825' (2023-07-01)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/61e567d6497bc9556f391faebe5e410e6623217f' (2023-05-23)
→ 'github:cachix/pre-commit-hooks.nix/42587d3414d1747999a5f71e92a83cf6547b62da' (2023-07-03)
• Updated input 'pre-commit-hooks/flake-utils':
'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02)
→ 'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31)
• Added input 'pre-commit-hooks/flake-utils/systems':
'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
commit f0aab541f817347a932c65d3b06d2d4c1e7b90c1
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 3 15:09:35 2023 +0300
fixed typo
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 026293f7731181b1198c3c5a9552dd340d13b4b5
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 3 14:17:39 2023 +0300
updated option text
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit 5d5f1b86fdaa865bf8627acd86163469389ebb83
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 3 09:21:25 2023 +0300
fixed logic regarding range over multiple years
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
commit ba159ba971c14b21b281fcbe8d15d61b36ebf435
Merge: 6fc745e9 43e6f05e
Author: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon Jul 3 09:01:22 2023 +0300
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
commit e5b9bfb2e78ca86917d91fd41de1e797e570cf83
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun Jul 2 22:30:25 2023 -0700
fix: update if new size is larger
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 8cb8273e67d4770300fdb7c3ce61feb19b1a899b
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun Jul 2 22:29:45 2023 -0700
fix: update if new size is larger
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 73d83439140377a7ece34e262ca4efab1608a03d
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun Jul 2 22:27:24 2023 -0700
fix: header `<qpoint.h>` -> `<QPoint>`
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 3960eb7d32af6ea776634b9f94e12f8df2397627
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun Jul 2 21:24:43 2023 -0700
fix: properly calculate min size for progress dialog, apply it at creation
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
commit 4004e0faeed99b3deb0ffb0b0f469594843ca14b
Author: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun Jul 2 20:22:25 2023 -0700
fix: segfault in progress dialog
- dialog tries to resize after unhiding the subtask scroll area
- after resize attempts to recenter on parent
- `calls parentWidget()->{x|y}()`
- what if there is no parent? nullptr->() = segfault
- recenter on last pos, d…
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #273