Commit Graph

  • ad9fb7349f Merge pull request #1647 from PrismLauncher/update_flake_lock_action Sefa Eyeoglu 2023-09-24 09:02:43 +02:00
  • 14af7044be Update launcher/ui/dialogs/ModUpdateDialog.cpp bolli24 2023-09-24 03:01:47 +02:00
  • fa65ac3ff7 chore(nix): update lockfile github-actions[bot] 2023-09-24 00:18:03 +00:00
  • f3c089792a Skip folders when updating mods. bolli24 2023-09-22 21:10:27 +02:00
  • 81a3ba18bc Update launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp Alexandru Ionut Tripon 2023-09-20 18:45:23 +03:00
  • 98bc102f5b Merge pull request #1618 from getchoo/cool-nix-stuff Sefa Eyeoglu 2023-09-20 07:47:22 +02:00
  • 97da8892b9 chore(nix): add meta.mainProgram attribute seth 2023-09-19 13:45:52 -04:00
  • 97ced1f459 fix(nix): include libusb1 as a runtime dependency seth 2023-09-19 13:45:12 -04:00
  • a49851cb40 updated blocked mods with empty hash Trial97 2023-09-19 15:48:12 +03:00
  • d72c3aba80 Merge pull request #1632 from PrismLauncher/update_flake_lock_action Sefa Eyeoglu 2023-09-17 09:30:30 +02:00
  • 9afe80b0e0 chore(nix): update lockfile github-actions[bot] 2023-09-17 00:18:04 +00:00
  • 00af385619 Merge pull request #1572 from Trial97/catpacks2 Sefa Eyeoglu 2023-09-16 18:22:13 +02:00
  • bf6dc10f35 Merge pull request #1605 from TheKodeToad/flame-shaders Sefa Eyeoglu 2023-09-16 18:20:45 +02:00
  • 0e41ceffc4 removed missed header Trial97 2023-09-16 19:18:58 +03:00
  • 01e98a6ce8 simplify the raw json parsing Trial97 2023-09-16 10:20:24 +03:00
  • 4053229544 DCO Remediation Commit for cullvox <cullvox@outlook.com> cullvox 2023-09-15 20:55:34 -04:00
  • 07645984b5 Merge branch 'components-resource-pack-fix' of https://github.com/cadenmiller/PrismLauncher into components-resource-pack-fix cullvox 2023-09-15 20:41:27 -04:00
  • c81689d393 fixes html elide issue with InfoFrame cullvox 2023-09-15 20:41:21 -04:00
  • e96d0b6caf DCO Remediation Commit for cullvox <cullvox@outlook.com> cullvox 2023-09-13 14:31:04 -04:00
  • ee7016fa54 use clang-format cullvox 2023-09-13 14:28:56 -04:00
  • e1dda6c005 DCO Remediation Commit for cullvox <cullvox@outlook.com> cullvox 2023-09-12 21:50:33 -04:00
  • ddf0c28b1b clang-format fixes cullvox 2023-09-12 21:45:29 -04:00
  • a4e6530513 added tests, fixed issues with overriding/format cullvox 2023-09-12 21:34:42 -04:00
  • df88ccd419 clean up and add review suggestions, links open cullvox 2023-09-11 15:49:01 -04:00
  • b16085f66c attempt to fix clang-format and ubuntu build. cullvox 2023-09-11 02:05:05 -04:00
  • fbe4043651 fix formatting and add more proper errors. cullvox 2023-09-11 01:34:53 -04:00
  • 58bd6d929f added formatting with colors. cullvox 2023-09-10 23:37:26 -04:00
  • 4cb424470b Merge pull request #1619 from PrismLauncher/update_flake_lock_action seth 2023-09-10 15:57:03 -04:00
  • 9445a555e4 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into packwiz Trial97 2023-09-10 16:24:59 +03:00
  • 47d1f23568 added side for modrinth mods Trial97 2023-09-10 16:22:57 +03:00
  • 7a7c3015f4 fix not properly reading json text. cullvox 2023-09-09 20:25:49 -04:00
  • 82a0a5bca1 chore(nix): update lockfile github-actions[bot] 2023-09-10 00:17:57 +00:00
  • 1261908ef7 remove space for clang-format cullvox 2023-09-09 19:55:55 -04:00
  • ef1dc2afac DCO Remediation Commit for cullvox <cullvox@outlook.com> cullvox 2023-09-09 19:50:59 -04:00
  • 05f4214cc5 fix clang-format failing cullvox 2023-09-09 19:50:13 -04:00
  • 04aa0155bf DCO Remediation Commit for cullvox <cullvox@outlook.com> cullvox 2023-09-09 19:45:30 -04:00
  • 093d09efe3 fix style, and use qWarning instead of throw. cullvox 2023-09-09 19:03:33 -04:00
  • 10192c540b feat(nix): add source filtering seth 2023-09-09 15:10:15 -04:00
  • 6aa821df9c refactor(nix): match inputs value in flake seth 2023-09-09 14:34:38 -04:00
  • 89e434bd5b refactor(nix): don't concat final attr in fixed point seth 2023-09-09 14:32:50 -04:00
  • d2e662ddbb added support for components in resource pack descriptions. cullvox 2023-09-09 12:35:34 -04:00
  • 78f8a31cd6 Merge pull request #1613 from PrismLauncher/renovate/actions-cache-3.x Sefa Eyeoglu 2023-09-08 23:28:03 +02:00
  • e7d6be531f chore(deps): update actions/cache action to v3.3.2 renovate[bot] 2023-09-08 17:22:12 +00:00
  • 6ec1cf6e49 made skin upload more generic Trial97 2023-09-08 19:50:46 +03:00
  • 8c8e4329d7 fix codeql Trial97 2023-09-05 23:45:32 +03:00
  • 8bad255a91 added more import options Trial97 2023-09-05 20:13:16 +03:00
  • ab648e58ce Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector Trial97 2023-09-05 00:18:45 +03:00
  • c86b8b0f70 added skin manage dialog Trial97 2023-09-05 00:18:36 +03:00
  • ba3a1b6280 Merge pull request #1606 from PrismLauncher/renovate/actions-checkout-4.x Sefa Eyeoglu 2023-09-04 17:11:45 +02:00
  • d483b613b1 Merge pull request #1578 from TheKodeToad/antialiasing Sefa Eyeoglu 2023-09-04 17:05:29 +02:00
  • cf599865f6 Merge pull request #1581 from getchoo/old-gcc Sefa Eyeoglu 2023-09-04 17:04:10 +02:00
  • 546d49e183 Merge pull request #1530 from Trial97/metadata_delete Sefa Eyeoglu 2023-09-04 17:02:52 +02:00
  • 7dd2530027 chore(deps): update actions/checkout action to v4 renovate[bot] 2023-09-04 15:02:01 +00:00
  • e9ecdd05b9 Merge pull request #1574 from Scrumplex/refactor-flake Sefa Eyeoglu 2023-09-04 17:02:01 +02:00
  • ad6f15f293 Merge pull request #1604 from PrismLauncher/renovate/cachix-install-nix-action-23.x Sefa Eyeoglu 2023-09-04 17:01:43 +02:00
  • 94c1cd6bcf CurseForge shader downloading TheKodeToad 2023-09-04 14:13:44 +01:00
  • e155844671 chore(deps): update cachix/install-nix-action action to v23 renovate[bot] 2023-09-04 10:22:11 +00:00
  • 2918d61b16 refactor(nix): use pre-commit flake module Sefa Eyeoglu 2023-09-04 08:52:56 +02:00
  • bbf4e3b04d refactor(nix): use fixed points over rec seth 2023-09-03 18:11:23 -04:00
  • caf925cbad Merge pull request #1601 from PrismLauncher/update_flake_lock_action Sefa Eyeoglu 2023-09-03 09:42:31 +02:00
  • 88f3e19f81 chore(nix): update lockfile github-actions[bot] 2023-09-03 00:17:45 +00:00
  • 19b5a5e00b Remove final conflict - kept by mistake TheKodeToad 2023-09-02 22:38:14 +01:00
  • 347228a246 Legacy settings override default -> false TheKodeToad 2023-09-02 22:29:26 +01:00
  • 1213a5ab46 Merge remote-tracking branch 'upstream/develop' into skinfix TheKodeToad 2023-09-02 22:13:50 +01:00
  • 179abfa03e Resource provider column TheKodeToad 2023-09-01 22:05:44 +01:00
  • 9ad029e028 added skins directory Trial97 2023-09-01 23:10:33 +03:00
  • abbac5c26c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task Trial97 2023-09-01 22:28:59 +03:00
  • 17f696bffc small tweaks to atl icons Trial97 2023-09-01 22:25:15 +03:00
  • e095780cc3 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into modrinth_pack Trial97 2023-09-01 21:36:28 +03:00
  • 609eaa67ab refactored skin apis Trial97 2023-09-01 21:23:51 +03:00
  • ad16d61208 Resource metadata writing TheKodeToad 2023-09-01 17:42:05 +01:00
  • c01e95b79c Merge pull request #1592 from kumquat-ir/desktop-open-fix TheKodeToad 2023-09-01 16:13:48 +01:00
  • 984e870bca actually it can handle multiple files just fine kumquat-ir 2023-09-01 10:32:35 -04:00
  • eb66e37b83 fix opening files from curseforge: links on linux kumquat-ir 2023-09-01 10:29:16 -04:00
  • 30ff417074 fix: make cached instead of file for ftb pack import Trial97 2023-09-01 16:25:49 +03:00
  • 6aecbfc38f Fix crashes TheKodeToad 2023-09-01 12:50:20 +01:00
  • ee48766996 More generalistaion for ResourceFolderModels TheKodeToad 2023-09-01 00:27:05 +01:00
  • c2b03d0f71 Fully reload the instance list once the folder is changed Trial97 2023-08-31 20:34:34 +03:00
  • 93876e27f8 Generalise resource metadata TheKodeToad 2023-08-31 17:32:55 +01:00
  • 7e65aea2ef format json Trial97 2023-08-31 19:04:41 +03:00
  • 6cfe2dbc50 moved catpack data to testdata Trial97 2023-08-31 17:34:05 +03:00
  • 25ce11d85d Merge pull request #1539 from Trial97/refactor_modpack_ux TheKodeToad 2023-08-31 14:58:54 +01:00
  • 707da5a25a fix(nix): include udev dependency Sefa Eyeoglu 2023-08-30 21:59:41 +02:00
  • 584e800279 fix: remove -Wextra-semi seth 2023-08-30 11:13:39 -04:00
  • befa3baa6a Merge branch 'develop' into feat/launcher-updater TheKodeToad 2023-08-30 11:47:33 +01:00
  • f23a8e4b4b Enable antialiasing for mod and pack icons TheKodeToad 2023-08-29 23:30:10 +01:00
  • 8c30cb3706 Fix CI TheKodeToad 2023-08-29 13:27:06 +01:00
  • c1855c6ce3 Merge branch 'develop' into rename-groups TheKodeToad 2023-08-29 12:41:40 +01:00
  • b83fdbd1b7 Merge pull request #1575 from TheKodeToad/more-pack-export-fixes Sefa Eyeoglu 2023-08-28 22:18:58 +02:00
  • 0e67686295 Hide index folder in pack export dialog TheKodeToad 2023-08-28 17:25:07 +01:00
  • e98bca4749 Fix cancelling pack save TheKodeToad 2023-08-28 17:09:40 +01:00
  • bdc2fca711 refactor(nix): don't instantiate nixpkgs Sefa Eyeoglu 2023-08-28 10:26:03 +02:00
  • 211865a1e1 handle gracefully the upload abort Trial97 2023-08-28 13:31:19 +03:00
  • 311e36b5d6 added new line Trial97 2023-08-28 11:52:26 +03:00
  • fbf6833124 Merge pull request #1519 from TheKodeToad/better-export-pack Sefa Eyeoglu 2023-08-28 10:29:32 +02:00
  • e4e4c4a430 Merge pull request #1573 from PrismLauncher/renovate/lock-file-maintenance Sefa Eyeoglu 2023-08-28 10:14:45 +02:00
  • 97d932db62 Revert "chore(deps): enable nix lockfile maintenance for renovate" Sefa Eyeoglu 2023-08-28 10:13:44 +02:00
  • 5d70f4dbca removed if Trial97 2023-08-28 08:50:10 +03:00
  • 66cbbfec0c chore(deps): lock file maintenance renovate[bot] 2023-08-28 00:23:14 +00:00
  • 07d8598638 added catpacks tests Trial97 2023-08-27 23:40:32 +03:00