Commit Graph

  • 6aaf3a3ed4 Merge branch 'skin_selector' of github.com:Trial97/PrismLauncher into skin_selector Trial97 2024-05-18 11:57:06 +03:00
  • 2ac6efaa4a Fix reggresion Trial97 2024-05-18 11:56:43 +03:00
  • 23134d4b72 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector Trial97 2024-05-18 11:38:18 +03:00
  • 318819afc6 Made recommended button default Trial97 2024-05-18 11:36:46 +03:00
  • eb0d0450e3 Merge pull request #2382 from Trial97/neoforge_technic Alexandru Ionut Tripon 2024-05-18 10:40:45 +03:00
  • 0f2736306e Update launcher/ui/dialogs/skins/SkinManageDialog.ui Alexandru Ionut Tripon 2024-05-18 10:36:15 +03:00
  • 639c6e7f80 Add cancel to Add account dialog Trial97 2024-05-17 00:49:00 +03:00
  • 78804b26ee Maybe fix nix Trial97 2024-05-17 00:34:39 +03:00
  • 75a457ebfa Add custom page to land after microsoft login Trial97 2024-05-17 00:28:37 +03:00
  • ce09f06bda Fix CI3 Trial97 2024-05-16 22:16:42 +03:00
  • 09c0c11033 Add back device code flow Trial97 2024-05-16 21:58:25 +03:00
  • ab5f628453 Update launcher/updater/prismupdater/PrismUpdater.cpp Alexandru Ionut Tripon 2024-05-16 19:45:43 +03:00
  • 051e788683 Update launcher/updater/prismupdater/PrismUpdater.cpp Alexandru Ionut Tripon 2024-05-16 19:45:00 +03:00
  • 2a58fb0ac5 Remove cobrandid Trial97 2024-05-16 17:31:25 +03:00
  • c15f6fcd2a Fix portable if manifest is missing Trial97 2024-05-16 17:21:30 +03:00
  • 898ee67a07 Update launcher/ui/dialogs/MSALoginDialog.cpp Alexandru Ionut Tripon 2024-05-16 00:41:07 +03:00
  • 1d384544d3 chore(deps): update cachix/install-nix-action action to v27 renovate[bot] 2024-05-15 19:40:15 +00:00
  • 8b051b97fd Fix CI2 Trial97 2024-05-15 17:54:35 +03:00
  • abedc6a23c Improve login UI Trial97 2024-05-15 17:25:15 +03:00
  • 849c3faeb4 Fix CI Trial97 2024-05-15 13:06:55 +03:00
  • 80d8e3ee06 Remove katabasis Trial97 2024-05-15 12:53:06 +03:00
  • c2ed50627d Added back qt version check Trial97 2024-05-14 00:36:35 +03:00
  • e285a85fe8 Removed AccountTask Trial97 2024-05-14 00:20:32 +03:00
  • 3336f8107c Removed AuthRequest and NetAction Trial97 2024-05-13 23:25:08 +03:00
  • 93da066aa2 Merge pull request #2398 from PrismLauncher/update_flake_lock_action Sefa Eyeoglu 2024-05-12 09:24:48 +02:00
  • d74926e60d chore(nix): update lockfile github-actions[bot] 2024-05-12 00:20:20 +00:00
  • d795ba25e7 Delete instaces tmp diectory on startup Trial97 2024-05-10 20:55:26 +03:00
  • f15981d786 Merge pull request #2358 from DioEgizio/nosystem-portablewithqt Alexandru Ionut Tripon 2024-05-09 08:22:43 +03:00
  • c703babda9 Merge pull request #2379 from kthchew/fix/blocked-desc Alexandru Ionut Tripon 2024-05-09 08:17:03 +03:00
  • 72e9d7b148 Merge pull request #2366 from Trial97/modrint_import2 Alexandru Ionut Tripon 2024-05-09 08:16:16 +03:00
  • 7bcb1777a1 Merge pull request #2341 from Trial97/image_size Alexandru Ionut Tripon 2024-05-09 08:15:35 +03:00
  • a4142573ac Merge pull request #2311 from SolidStateDj/gen->ui Alexandru Ionut Tripon 2024-05-09 08:15:15 +03:00
  • a95c1768a7 Add neoforge support for technic packs and atlauncher packs Trial97 2024-05-08 14:16:12 +03:00
  • e7c95c9ccb Fix bug where watched directories are not clickable on macOS Kenneth Chew 2024-05-07 18:57:04 -04:00
  • 4787141698 Improved blocked mods dialog permissions prompt Kenneth Chew 2024-05-07 18:22:23 -04:00
  • adf0cfdebf Fixed the code. Samuel Stidham 2024-05-05 20:01:29 -04:00
  • 8e0af16de9 Add extra java locations for MacOs. Samuel Stidham 2024-05-05 19:53:18 -04:00
  • 5ce8cd6b84 Merge pull request #2375 from PrismLauncher/update_flake_lock_action Sefa Eyeoglu 2024-05-05 08:09:00 +02:00
  • 5d36ed9cf9 chore(nix): update lockfile github-actions[bot] 2024-05-05 00:19:38 +00:00
  • 0c76e7ab20 Made Regex static and const, removed dist SabrePenguin 2024-05-01 13:00:55 -04:00
  • ce873e4a0d Regex correction SabrePenguin 2024-05-01 12:49:34 -04:00
  • 814f84efab Fixed more clang formatting SabrePenguin 2024-05-01 00:21:32 -04:00
  • 51f4ede797 Fixing CI format issues SabrePenguin 2024-05-01 00:11:53 -04:00
  • b9c010ffb2 Added patch to all setHtml calls SabrePenguin 2024-04-30 23:43:36 -04:00
  • e3d64608b9 Switched </ul> to a Regex expression SabrePenguin 2024-04-30 23:28:50 -04:00
  • cec27fd014 Moved html patch to StringUtils SabrePenguin 2024-04-30 22:40:04 -04:00
  • 30ce8ecb5f Fixed imports Trial97 2024-04-30 23:20:24 +03:00
  • 5400c24c73 Ensure valid file names for resource names Trial97 2024-04-30 23:04:50 +03:00
  • e068120375 Fix invalid characters filename download on windows Trial97 2024-04-30 22:56:03 +03:00
  • 48f3ca56ba Fixed NetRequest not failing on sink init Trial97 2024-04-30 22:38:01 +03:00
  • bfac12604e Merge pull request #2348 from TheKodeToad/single-click-hint Sefa Eyeoglu 2024-04-30 07:55:48 +02:00
  • 4dddf62e5e Merge pull request #2345 from Jan200101/PR/ssdfixmegamescope Sefa Eyeoglu 2024-04-30 07:54:17 +02:00
  • 603d196dac Merge pull request #2292 from ColonelGerdauf/develop Sefa Eyeoglu 2024-04-30 07:53:32 +02:00
  • d2568333ed Merge pull request #2048 from erikLundstedt/develop TheKodeToad 2024-04-29 18:22:22 +01:00
  • 9b70606d7e Merge pull request #2353 from Trial97/fix_curseforge4 Alexandru Ionut Tripon 2024-04-29 19:30:01 +03:00
  • cb9a83320c chore: make Qt 5 Linux use official Qt builds DioEgizio 2024-04-29 15:51:31 +02:00
  • be8ac0b5bb fix: make portable builds bundle Qt DioEgizio 2024-04-27 10:35:26 +02:00
  • a5b059ebad Fixed curseforge export Trial97 2024-04-29 00:27:15 +03:00
  • 23a38b19f2 Merge pull request #2351 from PrismLauncher/update_flake_lock_action Sefa Eyeoglu 2024-04-28 10:42:34 +02:00
  • 890fd0b09c chore(nix): update lockfile github-actions[bot] 2024-04-28 00:20:12 +00:00
  • c14e6a67a8 Merge pull request #2349 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x Alexandru Ionut Tripon 2024-04-27 13:11:07 +03:00
  • ccf0b01de7 chore!: make install_bundle work on linux, removed prebuilt tarballs DioEgizio 2024-04-27 10:18:04 +02:00
  • 46b291d02e chore(deps): update hendrikmuhs/ccache-action action to v1.2.13 renovate[bot] 2024-04-27 07:16:54 +00:00
  • 5348a90a15 Fix img tag allowing img.... SabrePenguin 2024-04-26 18:21:17 -04:00
  • e3f55f6865 Use proxy style to force ActivateItemOnSingleClick off TheKodeToad 2024-04-26 20:43:57 +01:00
  • a988415028 Pleasing the format check SabrePenguin 2024-04-26 16:59:51 -04:00
  • 6ecd2c7f31 Update launcher/Markdown.cpp SabrePenguin 2024-04-26 16:51:23 -04:00
  • 3c9a207192 Update launcher/ui/widgets/VariableSizedImageObject.cpp Alexandru Ionut Tripon 2024-04-26 22:04:50 +03:00
  • 60bd8104c4 Merge remote-tracking branch 'upstream/develop' into resource-meta TheKodeToad 2024-04-26 01:53:51 +01:00
  • 9ce10231ed Remove redundant event handler TheKodeToad 2024-04-26 01:44:43 +01:00
  • 803e26a401 Make actions more consistent TheKodeToad 2024-04-26 01:40:18 +01:00
  • e1ed317c13 Updated CheckComboBox to look more like QComboBox Trial97 2024-04-26 00:16:48 +03:00
  • 2cfe482298 Formatting and fixed img_pos allowed as negative SabrePenguin 2024-04-25 15:40:24 -04:00
  • dedea2c05d Added a naive implementation of a <br> inserter SabrePenguin 2024-04-25 14:56:22 -04:00
  • a30c7193a2 remove server side decorations FIXME and document why its needed Jan200101 2024-04-25 16:55:15 +02:00
  • 1961e2081f Removed scroll from version checkbox Trial97 2024-04-25 00:48:40 +03:00
  • e07e182e95 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters Trial97 2024-04-24 23:51:43 +03:00
  • e33ddbadd2 Merge branch 'filters' of github.com:Trial97/PrismLauncher into filters Trial97 2024-04-24 23:51:33 +03:00
  • be15abda90 Merge pull request #2 from TheKodeToad/better-filters Alexandru Ionut Tripon 2024-04-24 23:52:08 +03:00
  • c902da4461 Fix image width in project description Trial97 2024-04-24 22:02:55 +03:00
  • e777201187 Merge pull request #2337 from Trial97/java_path Sefa Eyeoglu 2024-04-24 17:46:08 +02:00
  • 5ae98f4f90 Fixed windows bundled java path Trial97 2024-04-24 15:49:05 +03:00
  • 3a4f82ffd1 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip Trial97 2024-04-24 00:21:39 +03:00
  • f6f0f3b08d Merge pull request #2333 from Trial97/fix_bundled_java_mac TheKodeToad 2024-04-23 17:19:37 +01:00
  • 10d1720da5 Removed duplicate local Trial97 2024-04-23 19:08:14 +03:00
  • 73c3794c1b Changed env variable Trial97 2024-04-23 19:03:19 +03:00
  • dac7027846 Fixed windows appdata path Trial97 2024-04-23 18:59:31 +03:00
  • dbfd535b38 Fix bundled java detection on mac Trial97 2024-04-23 08:52:17 +03:00
  • 5eeb3b7768 Merge pull request #2328 from Trial97/appimage Tayou 2024-04-22 22:51:57 +02:00
  • 8e8877cf8c Merge pull request #2327 from wagyourtail/patch-1 Tayou 2024-04-21 19:45:02 +02:00
  • 1c8d333bfd Fixed build Trial97 2024-04-21 15:07:10 +03:00
  • a96f957b02 Removed java from appimage Trial97 2024-04-21 14:48:27 +03:00
  • 9f4654ede9 Update JavaUtils.cpp William Gray 2024-04-21 03:35:27 -05:00
  • de5de6f88f Merge pull request #2325 from PrismLauncher/update_flake_lock_action Sefa Eyeoglu 2024-04-21 09:49:14 +02:00
  • 210841606c chore(nix): update lockfile github-actions[bot] 2024-04-21 00:19:37 +00:00
  • 89230c4f8a Moved the export modlist out of the sub-menu Trial97 2024-04-20 18:01:25 +03:00
  • d88fb266a5 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 Trial97 2024-04-20 17:42:58 +03:00
  • d185f6b856 Merge pull request #2319 from TheKodeToad/neoforge-mods-toml Sefa Eyeoglu 2024-04-20 09:49:47 +02:00
  • 252406ba3e Support neoforge.mods.toml TheKodeToad 2024-04-19 21:19:36 +01:00
  • a8a234b666 Merge pull request #2294 from Trial97/import_crash Alexandru Ionut Tripon 2024-04-19 00:12:47 +03:00