Commit Graph

  • b15f689ccf Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions Trial97 2023-07-27 00:03:42 +03:00
  • d960effb99 Merge pull request #1447 from getchoo/typomoment Sefa Eyeoglu 2023-07-26 22:56:31 +02:00
  • 1e82cb6a7c fix: add support for QByteArray inifile Trial97 2023-07-26 23:56:01 +03:00
  • 31b62203a7 Update launcher/ui/MainWindow.cpp Alexandru Ionut Tripon 2023-07-26 23:44:35 +03:00
  • af59c41713 fix: typo in task.h seth 2023-07-26 16:20:30 -04:00
  • f7ffbcca6c chore(docs): correct markdownlint warnings seth 2023-07-26 14:45:30 -04:00
  • 342a0d0091 fix(nix): disable x86_64-darwin seth 2023-07-26 14:47:47 -04:00
  • 1974bb7e59 chore(ci): cleanup garnix.yaml seth 2023-07-26 14:34:11 -04:00
  • e6b4fc9182 removed quilt warning Trial97 2023-07-26 21:36:40 +03:00
  • c778dcbc9c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse Trial97 2023-07-26 21:33:15 +03:00
  • a0944dab7a Merge pull request #1438 from Scrumplex/update-docs Sefa Eyeoglu 2023-07-26 20:30:04 +02:00
  • 719d87de3b Update MainWindow.ui TheKodeToad 2023-07-26 17:21:12 +01:00
  • 816acc9c76 Open catpak folder action TheKodeToad 2023-07-26 17:17:02 +01:00
  • a9fefb2eeb Address review comments LostLuma 2023-07-26 15:22:22 +02:00
  • 4ad448993c fix: fix typo in README Sefa Eyeoglu 2023-07-26 14:48:53 +02:00
  • bcadffa0e3 Merge pull request #1434 from getchoo/garnix Sefa Eyeoglu 2023-07-26 14:47:14 +02:00
  • ce2d2c9f32 Merge pull request #1427 from tjw123hh/develop TheKodeToad 2023-07-26 13:41:54 +01:00
  • 6f652e1d2f chore: update information for downstreams Sefa Eyeoglu 2023-07-26 14:38:32 +02:00
  • 361583edfc Ignore cache files when exporting instances LostLuma 2023-07-26 03:08:38 +02:00
  • fbf29274e8 chore(ci): remove nix job seth 2023-07-25 19:22:48 -04:00
  • 3c35d647b8 feat(ci): init garnix.yaml seth 2023-07-25 19:04:22 -04:00
  • b4159d30fc Revert permission change TheKodeToad 2023-07-25 15:17:20 +01:00
  • f843d0732b Merge branch 'develop' of https://github.com/tjw123hh/PrismLauncher into develop tjw123hh 2023-07-25 17:36:38 +08:00
  • 280f041acb Delete some incorrect notr="true" tags tjw123hh 2023-07-25 17:35:31 +08:00
  • 4f00012268 Merge pull request #1426 from TheKodeToad/token-censor-fix Sefa Eyeoglu 2023-07-24 20:41:23 +02:00
  • 4ab630b832 Update org.prismlauncher.PrismLauncher.desktop.in tjw123hh 2023-07-24 20:50:11 +08:00
  • a32ca43288 DCO Remediation Commit for tjw123hh <tjw123hh@outlook.com> tjw123hh 2023-07-24 20:48:27 +08:00
  • f505d43fc0 Fix token "0" being replaced TheKodeToad 2023-07-24 13:43:26 +01:00
  • 6a01c277e8 Delete some incorrect tags tjw123hh 2023-07-24 20:41:22 +08:00
  • 684c2ec47a Merge pull request #1420 from PrismLauncher/update_flake_lock_action Sefa Eyeoglu 2023-07-23 11:45:31 +02:00
  • 273d75fd51 Merge pull request #1419 from pandaninjas/update-libnbtplusplus seth 2023-07-22 20:41:27 -04:00
  • 6f6b0b9661 chore(nix): update lockfile github-actions[bot] 2023-07-23 00:21:25 +00:00
  • 2253100ac6 Update libnbtplusplus submodule PandaNinjas 2023-07-22 14:26:49 -04:00
  • b31644e228 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions Trial97 2023-07-22 18:16:03 +03:00
  • 57430fd189 Merge branch 'develop' into better-launch TheKodeToad 2023-07-22 11:26:02 +01:00
  • 6ffcfcd7e9 Merge pull request #1402 from Trial97/flame_import TheKodeToad 2023-07-22 11:14:12 +01:00
  • 516ddb22ae More catpack changes :3 This is just embarrasing TheKodeToad 2023-07-21 17:58:48 +01:00
  • 0b74b3833a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import Trial97 2023-07-21 19:30:06 +03:00
  • ef21879df4 replaced require with ensure for jvmArgs Trial97 2023-07-21 19:30:00 +03:00
  • ad92c30472 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background Trial97 2023-07-21 19:12:16 +03:00
  • bfafbdc51e Merge branch 'develop' into env-vars TheKodeToad 2023-07-21 14:30:24 +01:00
  • 1a7c5693cc Remove redundant methods TheKodeToad 2023-07-21 13:01:01 +01:00
  • f8b935ab37 Merge remote-tracking branch 'upstream/develop' into icon-indexing TheKodeToad 2023-07-21 12:48:05 +01:00
  • 8705e88e91 Fix build on Windows TheKodeToad 2023-07-21 11:19:55 +01:00
  • 0be4db30eb Merge branch 'PrismLauncher:develop' into better-component-installation TheKodeToad 2023-07-21 11:02:57 +01:00
  • 821dd8400b Merge pull request #1253 from Trial97/catpacks Sefa Eyeoglu 2023-07-21 11:11:12 +02:00
  • c37e1fb9f1 Merge branch 'develop' into skinfix TheKodeToad 2023-07-20 18:11:27 +01:00
  • 5088d33fd2 Finish things :P TheKodeToad 2023-07-20 14:16:44 +01:00
  • 39f7bea53e Revert accidental change in MainWindow TheKodeToad 2023-07-20 14:13:29 +01:00
  • 842f08dcfc (UX) Add open folder button next to combo boxes TheKodeToad 2023-07-20 11:51:44 +01:00
  • f8d9cd9a03 use range for Trial97 2023-07-19 23:08:16 +03:00
  • 960093700a Better theme reset TheKodeToad 2023-07-19 20:57:08 +01:00
  • 54d393632d Automatically create theme folders, and add an action to open them TheKodeToad 2023-07-19 16:29:52 +01:00
  • c633c6d083 Colors->Widgets TheKodeToad 2023-07-19 14:17:17 +01:00
  • 96ebdfc9a8 Sorting and invalid reset TheKodeToad 2023-07-19 14:12:39 +01:00
  • f55120654a Merge branch 'PrismLauncher:develop' into icon-indexing TheKodeToad 2023-07-19 12:51:26 +01:00
  • 44ca7c7d22 Licenses TheKodeToad 2023-07-19 12:29:51 +01:00
  • 58c2059e10 Remove recursion It will add icon packs which aren't available - as QIcon's search paths are not recursed! TheKodeToad 2023-07-19 10:38:56 +01:00
  • b7bccb9058 removed subdirectory flag Trial97 2023-07-19 12:27:02 +03:00
  • f046bd7d50 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks Trial97 2023-07-19 12:26:12 +03:00
  • 593f452986 Merge pull request #1399 from Scrumplex/offline-uuid TheKodeToad 2023-07-19 10:16:27 +01:00
  • 43cc04433d feat: refactored Instance ImportTask Trial97 2023-07-19 11:58:27 +03:00
  • 97662f5c8e Multiple icon themes! TheKodeToad 2023-07-18 22:50:43 +01:00
  • f8d88cc83d Merge pull request #1372 from PrismLauncher/update_flake_lock_action seth 2023-07-18 21:19:58 +00:00
  • f393aa684e wait to load metadata Trial97 2023-07-18 23:59:43 +03:00
  • 4c319c8f4f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into flame_import Trial97 2023-07-18 23:49:52 +03:00
  • 477b72ad33 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2 Trial97 2023-07-18 23:48:02 +03:00
  • 3728cbb62a Merge pull request #1397 from Gaming32/develop Sefa Eyeoglu 2023-07-18 22:47:55 +02:00
  • 015f88bf83 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import Trial97 2023-07-18 23:46:19 +03:00
  • 02082cda09 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file Trial97 2023-07-18 23:40:11 +03:00
  • 5eec0f5901 feat:managed packs can update from file Trial97 2023-07-18 23:40:03 +03:00
  • 3fbc25155b Merge pull request #1362 from Trial97/fix_warning Sefa Eyeoglu 2023-07-18 22:28:27 +02:00
  • ecac05b2fc Merge pull request #1378 from Trial97/prism_export Sefa Eyeoglu 2023-07-18 22:26:56 +02:00
  • 5b54475d3e Merge pull request #1385 from orowith2os/flatpak-updates seth 2023-07-18 20:12:39 +00:00
  • 391497645f feat:made flame instace creation use metadata for recommended version Trial97 2023-07-18 22:33:39 +03:00
  • f8fcb98c68 fix: generate predictable UUIDs for offline accounts Sefa Eyeoglu 2023-07-18 09:06:49 +02:00
  • 2eff1de560 Update Flatpak manifest Dallas Strouse 2023-07-17 00:29:24 -05:00
  • 1fbb41f5e2 Make Launch Offline not launch online in 1.6+ Josiah Glosson 2023-07-17 17:07:06 -05:00
  • 01afa8957f Merge pull request #1387 from Scrumplex/fix-quilt-beacon TheKodeToad 2023-07-17 17:40:42 +01:00
  • 5162203c7d Merge branch 'prism_export' of github.com:Trial97/PrismLauncher into prism_export2 Trial97 2023-07-17 17:58:42 +03:00
  • b0940d696b Added QFutureWatcher Trial97 2023-07-17 17:42:15 +03:00
  • fe73d696cb replace emplace with insert Trial97 2023-07-17 16:57:52 +03:00
  • 2ea4a78541 Upgraded ExportToZipTask Trial97 2023-07-17 16:24:43 +03:00
  • f5891940e0 translate strings Trial97 2023-07-17 17:22:35 +03:00
  • cd9310afed replace emplace with insert Trial97 2023-07-17 16:57:52 +03:00
  • 64041a84a2 handle file removal in ExportToZipTask Trial97 2023-07-17 16:55:26 +03:00
  • 78ee63af38 simplify modrinth export Trial97 2023-07-17 16:40:01 +03:00
  • 455c495338 simplify flame export Trial97 2023-07-17 16:25:51 +03:00
  • 0bf70d677e Upgraded ExportToZipTask Trial97 2023-07-17 16:24:43 +03:00
  • 2be630904f fix: don't take modloaders by reference Sefa Eyeoglu 2023-07-17 14:33:01 +02:00
  • 49cebc2da4 More consistent behaviour TheKodeToad 2023-07-17 12:49:12 +01:00
  • 049abc9b1a Merge remote-tracking branch 'upstream/develop' into rename-groups TheKodeToad 2023-07-17 12:13:58 +01:00
  • e8c44e700d Merge pull request #1286 from TayouVR/better-instance-group-separator Tayou 2023-07-17 11:55:31 +02:00
  • 54a091ca59 fix: check if any modloader is installed Sefa Eyeoglu 2023-07-17 10:09:01 +02:00
  • ec32618e11 reveted back to add years Trial97 2023-07-17 10:20:22 +03:00
  • aaf1726965 Merge pull request #1357 from getchoo/quilt-beacon Sefa Eyeoglu 2023-07-17 06:42:46 +02:00
  • 6b970954d6 Merge pull request #1381 from getchoo/backporting-docs seth 2023-07-16 18:36:51 -04:00
  • fb5aefffb2 Reduce bugginess TheKodeToad 2023-07-16 23:36:01 +01:00
  • 20e2c70464 Rename groups and janky reference counting map TheKodeToad 2023-07-16 23:23:33 +01:00
  • ed2f680202 chore(docs): add backporting info to CONTRIBUTING.md seth 2023-07-16 17:28:14 -04:00