Commit Graph

  • 99fd1e622c chore: replace fabricmc icons with SVG Sefa Eyeoglu 2023-08-06 17:43:30 +02:00
  • 37e5f6af48 chore(nix): update lockfile github-actions[bot] 2023-08-06 00:17:51 +00:00
  • 5b8c997180 Merge pull request #1456 from Trial97/icons Sefa Eyeoglu 2023-08-05 22:50:52 +02:00
  • 7c547f6452 Merge pull request #1370 from Trial97/pack_changelog Sefa Eyeoglu 2023-08-05 22:50:38 +02:00
  • f7e8ec1855 format files Trial97 2023-08-05 21:17:38 +03:00
  • 72de2d5254 Added missing header Trial97 2023-08-05 21:08:16 +03:00
  • f25d0a4e0e Merge branch 'develop' into env-vars TheKodeToad 2023-08-05 18:01:53 +01:00
  • 1d3f2674d1 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions Trial97 2023-08-05 19:21:37 +03:00
  • f9ebcb5d2e Merge branch 'refactor/net-split-headers-to-proxy-class' of https://github.com/Ryex/PrismLauncher into refactor/NetActions Trial97 2023-08-05 19:16:57 +03:00
  • 57692d6ce6 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip Trial97 2023-08-05 19:13:08 +03:00
  • b2fdd83594 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads Trial97 2023-08-05 19:09:10 +03:00
  • 24b47e4ec6 Merge branch 'fail_concurrent_task' of github.com:Trial97/PrismLauncher into fail_concurrent_task Trial97 2023-08-05 19:06:26 +03:00
  • 5981e7815a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task Trial97 2023-08-05 19:06:01 +03:00
  • 91eb30f037 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pack_changelog Trial97 2023-08-05 19:04:53 +03:00
  • d936b25868 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background Trial97 2023-08-05 19:04:15 +03:00
  • e7c2274893 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file Trial97 2023-08-05 19:02:11 +03:00
  • 377fc0352a Merge branch 'staging' of https://github.com/PrismLauncher/PrismLauncher into icons Trial97 2023-08-05 19:00:12 +03:00
  • 939a2d67ed Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop12 Trial97 2023-08-05 18:21:09 +03:00
  • 304e294ea7 Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-class Sefa Eyeoglu 2023-08-04 20:31:43 +02:00
  • ae793f6cf1 Merge pull request #1459 from Scrumplex/format Sefa Eyeoglu 2023-08-04 19:42:36 +02:00
  • 1d638e018a chore: update license headers Sefa Eyeoglu 2023-08-04 19:41:47 +02:00
  • 50c7d39e08 Merge pull request #1483 from DioEgizio/update-qt652 seth 2023-08-04 12:05:45 -04:00
  • c5bffed21e Merge branch 'PrismLauncher:develop' into skinfix TheKodeToad 2023-08-04 16:29:30 +01:00
  • d48dd7eb6a Use override-based setting for online fixes TheKodeToad 2023-08-04 16:00:02 +01:00
  • b013133cc1 chore: update to qt 6.5.2 DioEgizio 2023-08-03 09:24:47 +02:00
  • 1bafa36c17 icon -> iconName TheKodeToad 2023-08-02 20:32:23 +01:00
  • afaf6f894c Merge branch 'PrismLauncher:develop' into better-component-installation TheKodeToad 2023-08-02 20:27:37 +01:00
  • 8b3c465a50 Use protected inheritance for BasePageProvider TheKodeToad 2023-08-02 20:24:15 +01:00
  • 40c614b3a5 Pressed -> Clicked (doh) TheKodeToad 2023-08-02 20:23:09 +01:00
  • ac36a2289f Merge pull request #1452 from getchoo/sparkle-disable Sefa Eyeoglu 2023-08-02 19:28:01 +02:00
  • fa2b784f7e Merge branch 'develop' into sparkle-disable Sefa Eyeoglu 2023-08-02 19:27:48 +02:00
  • 01e17806f6 Merge pull request #1391 from Trial97/prism_export2 Sefa Eyeoglu 2023-08-02 19:27:14 +02:00
  • f561e7febf Merge pull request #1476 from Scrumplex/fix-saving-metaurl Sefa Eyeoglu 2023-08-02 19:24:24 +02:00
  • 39d4f0df66 fix: don't reset meta url on launch Sefa Eyeoglu 2023-08-02 18:54:52 +02:00
  • 1d468ac35a chore: reformat Sefa Eyeoglu 2023-08-02 18:35:35 +02:00
  • ce2ca13815 fix: add missing headers Sefa Eyeoglu 2023-07-31 15:37:35 +02:00
  • f256b836f4 Make more options generic TheKodeToad 2023-07-29 13:16:21 +01:00
  • 71fb38c91f Fix alignment properties TheKodeToad 2023-07-29 13:01:09 +01:00
  • 076c189948 fix: format all languages using clang-format Sefa Eyeoglu 2023-07-29 11:30:33 +02:00
  • 9f66f6495a fix: fix undisciplined multiple inheritance Sefa Eyeoglu 2023-07-29 11:10:16 +02:00
  • c07a857359 fix: remove irregular enum initialization Sefa Eyeoglu 2023-07-29 11:05:40 +02:00
  • 76df836378 fix: simplify switch statement Sefa Eyeoglu 2023-07-29 11:02:10 +02:00
  • a545f67a21 fix: take JavaCheckResult by const reference Sefa Eyeoglu 2023-07-29 11:00:33 +02:00
  • 9d5818916a fix(nix): enable clang-format Sefa Eyeoglu 2023-07-28 16:09:43 +02:00
  • ea56ff255d Merge pull request #1339 from TheKodeToad/remove-direct-launch Sefa Eyeoglu 2023-08-02 18:31:27 +02:00
  • 01d3eea379 Merge pull request #1359 from Trial97/import Sefa Eyeoglu 2023-08-02 18:25:51 +02:00
  • f13eccb03d Update launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h Alexandru Ionut Tripon 2023-08-02 19:24:58 +03:00
  • 39d7bc6c24 Merge pull request #1294 from ashuntu/develop Sefa Eyeoglu 2023-08-02 18:24:54 +02:00
  • 6a7f63166d DCO Remediation Commit for ashuntu <101582426+ashuntu@users.noreply.github.com> ashuntu 2023-08-02 10:04:53 -05:00
  • bae59a8c07 refactor(windows console): reduce code duplication Rachel Powers 2023-08-02 06:19:43 -07:00
  • bb039d4bc7 Merge pull request #1445 from Trial97/curse TheKodeToad 2023-08-02 12:55:49 +01:00
  • 92b2f463e3 Merge pull request #1474 from apix0n/develop Sefa Eyeoglu 2023-08-02 12:08:34 +02:00
  • 16e6a01881 fix: fix copyright year Apix 2023-08-02 11:35:54 +02:00
  • 81bc9e488f DCO Remediation Commit for Rachel Powers <508861+Ryex@users.noreply.github.com> Rachel Powers 2023-08-01 20:27:39 -07:00
  • e64e4d7ef7 Fix: always false comparison Rachel Powers 2023-08-01 18:57:35 -07:00
  • f19e8dd086 Apply suggestions from code review Rachel Powers 2023-08-01 18:53:51 -07:00
  • b4ae6e9774 fix(compiler warnings): suppress omtimisation flag conflict warnings. leave optimisation to Byild type defaults - enable ASan for RelWithDebInfo builds Rachel Powers 2023-07-31 23:25:49 -07:00
  • 5a9f780cf8 fix(FlameInstanceCreationTask): include Net::Apidownload Rachel Powers 2023-07-31 22:36:13 -07:00
  • 2d1197f59f Merge branch 'develop' into refactor/net-split-headers-to-proxy-class Rachel Powers 2023-07-31 22:26:20 -07:00
  • d8f2a1354f chore: update Nix docs Sefa Eyeoglu 2023-07-31 17:52:50 +02:00
  • b572f75dba Merge branch 'PrismLauncher:develop' into icon-indexing TheKodeToad 2023-07-31 14:40:27 +01:00
  • 14e16db01e refactor(filelink): drop moved funciton Rachel Powers 2023-07-30 16:02:37 -07:00
  • 7091bc81c2 chore(rename): fix unfinshed renames from deshadow changes Rachel Powers 2023-07-30 15:56:38 -07:00
  • 1e947ca893 fix(flame creation task): import ApiDownload Rachel Powers 2023-07-30 15:42:15 -07:00
  • b9fe37aec1 Merge branch 'develop' into chore/add-compiler-warnings Rachel Powers 2023-07-30 15:33:46 -07:00
  • 5d68a4c992 fix: religate export zip to launcher app only Rachel Powers 2023-07-30 14:43:04 -07:00
  • 760b80934f fix(filelink exe): add console sources Rachel Powers 2023-07-30 15:22:18 -07:00
  • 6d564628b7 fix(FileLink): drop FreeConsole Rachel Powers 2023-07-30 15:11:00 -07:00
  • f03924478b Merge branch 'fix/windows-console-attach' into feat/launcher-updater Rachel Powers 2023-07-30 14:26:54 -07:00
  • 7c1a465ec9 Merge branch 'develop' into feat/launcher-updater Rachel Powers 2023-07-30 14:19:31 -07:00
  • a7ef663735 fix(windows console): use new logic in FileLink exe Rachel Powers 2023-07-30 14:03:20 -07:00
  • 186211244d refactor(windows console): move to external file Rachel Powers 2023-07-30 13:32:31 -07:00
  • 5740ee0444 fix(windows console): properly bind windows console Rachel Powers 2023-07-30 12:40:32 -07:00
  • 945939ba68 chore(actions): add new labels to update-flake seth 2023-07-30 04:46:44 -04:00
  • 9137721e8e Merge pull request #1461 from PrismLauncher/update_flake_lock_action seth 2023-07-30 04:45:10 -04:00
  • 566425166b Merge pull request #1449 from Trial97/tehnic Sefa Eyeoglu 2023-07-30 09:47:40 +02:00
  • d1513732be chore(nix): update lockfile github-actions[bot] 2023-07-30 00:20:33 +00:00
  • 1467072f3d Removed snapcraft.yaml in favor of dedicated repo: https://github.com/ashuntu/prismlauncher-snap ashuntu 2023-07-28 16:25:32 -05:00
  • d133b40b25 Merge branch 'PrismLauncher:develop' into develop Ash 2023-07-28 21:22:35 +00:00
  • 5538c1d0af Fix compilation (actually this time!), incorporating new changes TheKodeToad 2023-07-28 15:11:24 +01:00
  • d4ea9c2717 Merge branch 'develop' into feature/java-downloader TheKodeToad 2023-07-28 14:50:59 +01:00
  • ce6a36c8b5 Deduplicate fix TheKodeToad 2023-07-28 14:31:53 +01:00
  • c3eb17db74 removed unneded if condition Trial97 2023-07-28 13:22:04 +03:00
  • 4789708cc2 added missing ) Trial97 2023-07-28 13:16:57 +03:00
  • 83fce74bb1 Update launcher/ui/dialogs/NewInstanceDialog.cpp Alexandru Ionut Tripon 2023-07-28 13:11:56 +03:00
  • fcac98b367 removed comment Trial97 2023-07-28 10:05:22 +03:00
  • 97ff7afbe7 keep the icon suffix Trial97 2023-07-28 01:16:00 +03:00
  • 7e58b965b7 refactor icon list Trial97 2023-07-28 01:15:21 +03:00
  • 1ca7e5efe9 added license header Trial97 2023-07-28 01:12:15 +03:00
  • d460986de0 format Trial97 2023-07-28 01:09:21 +03:00
  • bdec11c501 Merge pull request #1437 from LostLuma/instance-export-ignore-caches-2 Sefa Eyeoglu 2023-07-27 09:40:31 +02:00
  • b1aa9e5846 refactor: introduce internal Launcher_ENABLE_UPDATER variable Sefa Eyeoglu 2023-07-27 09:37:56 +02:00
  • 51bfda937d chore: don't include sparkle when not enabled seth 2023-07-27 00:59:01 -04:00
  • 4a9ea832ff Ignore cache files entirely, also apply to modpack export LostLuma 2023-07-27 01:42:14 +02:00
  • a8498b0dab chore: make INSTALL_BUNDLE a cached variable seth 2023-07-26 19:03:14 -04:00
  • 48e5040196 feat: disable sparkle when update url is empty seth 2023-07-26 17:27:52 -04:00
  • 928e18b66d Merge pull request #1446 from getchoo/nix-fixes seth 2023-07-26 17:10:07 -04:00
  • 6768501db1 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip Trial97 2023-07-27 00:09:18 +03:00
  • 62aa7a52c4 fiexed conflicts Trial97 2023-07-27 00:07:38 +03:00
  • 3c472fd7e0 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2 Trial97 2023-07-27 00:05:59 +03:00