Commit Graph

7974 Commits

Author SHA1 Message Date
Trial97 f60d0135f7 made login link to open browser
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 12:47:44 +03:00
Trial97 74a86df53c update the desktop file
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 12:41:37 +03:00
Trial97 1bd4e60e99 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-14 11:23:52 +03:00
Trial97 c35461b314 remove aspect ratio
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 11:23:14 +03:00
Trial97 014721ca10 remove unused import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 11:19:54 +03:00
Trial97 712fbc3a4b reverse login layout
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 11:15:40 +03:00
Alexandru Ionut Tripon e9d681a088 Merge pull request #2509 from Scrumplex/fix/flatpak/glfw
fix(flatpak): disable docs for glfw
2024-06-14 08:57:50 +03:00
Sefa Eyeoglu 52338f0e88 fix(flatpak): disable docs for glfw
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2024-06-13 19:55:50 +02:00
Trial97 6e8dc6ccc0 add mouse interaction on microsoft link
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 19:20:32 +03:00
Alexandru Ionut Tripon 3fc5f56ed6 Merge pull request #2405 from Trial97/fix_missing_manifest
Fix portable if manifest is missing
2024-06-13 19:16:12 +03:00
Alexandru Ionut Tripon ce5b2c54c5 Merge pull request #2439 from Trial97/fix_vanila_technic
fix vanilla technic modpacks
2024-06-13 19:15:43 +03:00
Trial97 f7c3e08ac8 add prismlauncher to plist
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 18:27:37 +03:00
Trial97 7fdc65eda8 add tooltip to url button
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 08:51:11 +03:00
Trial97 2b229d7326 increase qr code size
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 00:20:16 +03:00
Trial97 80ea67f7cf finish login dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 00:00:08 +03:00
Alexandru Ionut Tripon a74bebb358 Merge pull request #2499 from Trial97/imgur3
update imgur upload
2024-06-12 23:45:17 +03:00
Trial97 125fb2eaf2 remove png qr code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 19:34:58 +03:00
Trial97 5f5296ef5e update ui once again
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 19:34:19 +03:00
Trial97 bbbe7c879e update callback
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 12:35:02 +03:00
Trial97 df142550fe update Add account question
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 11:55:56 +03:00
Trial97 c4a65dd861 update login flow
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 00:34:39 +03:00
Tayou 6b1c4981e7 Merge pull request #2498 from LaoshuBaby/patch-1
fix(SkinManageDialog.cpp): typo
2024-06-10 13:21:51 +02:00
Trial97 c1c182fd0c update imgur upload
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-10 12:38:59 +03:00
快乐的老鼠宝宝 1c1e296960 fix(SkinManageDialog.cpp): typo
Signed-off-by: 快乐的老鼠宝宝 <laoshubaby@protonmail.com>
2024-06-10 17:15:38 +08:00
Alexandru Ionut Tripon 7d418a32e7 Merge pull request #2425 from Trial97/win_char
improve invalid path name
2024-06-10 12:11:21 +03:00
Alexandru Ionut Tripon 93a0277479 Merge pull request #2450 from Trial97/remove_search
remove search button
2024-06-10 10:56:54 +03:00
Alexandru Ionut Tripon 95e7f36732 Merge pull request #2054 from Trial97/add_configurable_updater_interval
Made updater interval configurable
2024-06-10 09:22:54 +03:00
Alexandru Ionut Tripon dc39698c48 Merge pull request #1609 from Trial97/skin_selector
Skin management
2024-06-10 08:43:37 +03:00
Alexandru Ionut Tripon 12e04c412b Merge pull request #1776 from Trial97/resource_size
feat:added size column
2024-06-10 08:42:29 +03:00
Alexandru Ionut Tripon 154f4811c0 Merge pull request #2166 from Trial97/ftb2
Updated ftb app import instance detection
2024-06-10 00:45:22 +03:00
Trial97 29d32f0d9a Update size order for folders
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-10 00:18:21 +03:00
Trial97 242ddbb7e1 fix size column sorting
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-09 23:53:40 +03:00
Trial97 34e1a5e660 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 2024-06-09 22:18:40 +03:00
Trial97 1e0db46728 add a more verbose error message in case user skin import fails
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-09 21:29:56 +03:00
Alexandru Ionut Tripon 6c76ba5163 Merge pull request #1032 from deadmeu/shorten-description
refactor: shorten desktop entry comment field
2024-06-09 20:59:23 +03:00
Trial97 04b2ac2efa update fail url skin messagebox
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-09 20:48:49 +03:00
Trial97 689b76885c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2024-06-09 20:13:09 +03:00
Alexandru Ionut Tripon 9560f9ed98 Merge pull request #2474 from coolguy1842/develop
simple fix for resizing too small causing an index out of range crash
2024-06-09 16:10:57 +03:00
Alexandru Ionut Tripon d6a03d3f2c Merge pull request #1554 from Trial97/instance_copy_progress
updated instance copy
2024-06-09 16:05:11 +03:00
Alexandru Ionut Tripon 3af4c94612 Merge pull request #2390 from Trial97/delete_tmp
Delete instaces tmp diectory on startup
2024-06-09 16:03:51 +03:00
Alexandru Ionut Tripon 55b6490530 Merge pull request #1617 from cullvox/components-resource-pack-fix
added functionality for components in resource pack descriptions.
2024-06-09 16:03:19 +03:00
Alexandru Ionut Tripon 7e5db651fd Merge pull request #1823 from Trial97/refresh_cats
Added button to refresh themes and catpacks
2024-06-09 16:02:26 +03:00
Alexandru Ionut Tripon 6f6ddc00c8 Merge pull request #2486 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2024-06-09 16:01:15 +03:00
Alexandru Ionut Tripon 0e996270b7 Merge pull request #2055 from Trial97/show_minecraft_version_modrinth
Display minecraft version if not mentioned for modrinth/curse packs
2024-06-09 15:59:24 +03:00
github-actions[bot] 24cf671370 chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/6132b0f6e344ce2fe34fc051b72fb46e34f668e0?narHash=sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY%3D' (2024-05-30)
  → 'github:nixos/nixpkgs/d226935fd75012939397c83f6c385e4d6d832288?narHash=sha256-HV97wqUQv9wvptiHCb3Y0/YH0lJ60uZ8FYfEOIzYEqI%3D' (2024-06-07)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/0e8fcc54b842ad8428c9e705cb5994eaf05c26a0?narHash=sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA%3D' (2024-05-20)
  → 'github:cachix/pre-commit-hooks.nix/cc4d466cb1254af050ff7bdf47f6d404a7c646d1?narHash=sha256-7XfBuLULizXjXfBYy/VV%2BSpYMHreNRHk9nKMsm1bgb4%3D' (2024-06-06)
2024-06-09 00:22:00 +00:00
TheKodeToad 3ef5cd20f4 Merge pull request #2428 from Fourmisain/semeru
add detection for IBM Semeru Java runtime and fix x86 detection on 64 bit Windows
2024-06-07 20:17:20 +01:00
ZekeZ 39b8451130 Merge pull request #2383 from Trial97/scroll_new_instance
Made Custom New Instance scrollable
2024-06-07 16:37:21 +10:00
Alexandru Ionut Tripon 6e5c41fc8e Merge pull request #2471 from Trial97/replace_auth_ping
replace auth server ping
2024-06-07 00:18:48 +03:00
Alexandru Ionut Tripon e961cab352 Merge pull request #1409 from Trial97/import_zip
feat: refactored Instance ImportTask
2024-06-07 00:11:37 +03:00
Trial97 b096ee6a0c fix file permisions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-06 14:12:55 +03:00