|
|
11ae169087
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 09:34:48 +03:00 |
|
|
|
95e7f36732
|
Merge pull request #2054 from Trial97/add_configurable_updater_interval
Made updater interval configurable
|
2024-06-10 09:22:54 +03:00 |
|
|
|
6607c3bfa4
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 09:04:09 +03:00 |
|
|
|
3f0fa54fe8
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into retry_auth
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 09:03:04 +03:00 |
|
|
|
e63f25c9e4
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 09:01:01 +03:00 |
|
|
|
dc39698c48
|
Merge pull request #1609 from Trial97/skin_selector
Skin management
|
2024-06-10 08:43:37 +03:00 |
|
|
|
12e04c412b
|
Merge pull request #1776 from Trial97/resource_size
feat:added size column
|
2024-06-10 08:42:29 +03:00 |
|
|
|
154f4811c0
|
Merge pull request #2166 from Trial97/ftb2
Updated ftb app import instance detection
|
2024-06-10 00:45:22 +03:00 |
|
|
|
29d32f0d9a
|
Update size order for folders
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 00:18:21 +03:00 |
|
|
|
242ddbb7e1
|
fix size column sorting
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-09 23:53:40 +03:00 |
|
|
|
34e1a5e660
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size
|
2024-06-09 22:18:40 +03:00 |
|
|
|
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 |
|
|
|
6c76ba5163
|
Merge pull request #1032 from deadmeu/shorten-description
refactor: shorten desktop entry comment field
|
2024-06-09 20:59:23 +03:00 |
|
|
|
04b2ac2efa
|
update fail url skin messagebox
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-09 20:48:49 +03:00 |
|
|
|
689b76885c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
|
2024-06-09 20:13:09 +03:00 |
|
|
|
6a99312df5
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-06-09 19:57:16 +03:00 |
|
|
|
ca369ac2b0
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-09 19:52:37 +03:00 |
|
|
|
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 |
|
|
|
d6a03d3f2c
|
Merge pull request #1554 from Trial97/instance_copy_progress
updated instance copy
|
2024-06-09 16:05:11 +03:00 |
|
|
|
3af4c94612
|
Merge pull request #2390 from Trial97/delete_tmp
Delete instaces tmp diectory on startup
|
2024-06-09 16:03:51 +03:00 |
|
|
|
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 |
|
|
|
7e5db651fd
|
Merge pull request #1823 from Trial97/refresh_cats
Added button to refresh themes and catpacks
|
2024-06-09 16:02:26 +03:00 |
|
|
|
6f6ddc00c8
|
Merge pull request #2486 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
|
2024-06-09 16:01:15 +03:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
052ee0d71c
|
chore: update Qt to 6.7.1
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
|
2024-06-07 15:48:19 +02:00 |
|
|
|
39b8451130
|
Merge pull request #2383 from Trial97/scroll_new_instance
Made Custom New Instance scrollable
|
2024-06-07 16:37:21 +10:00 |
|
|
|
8ff53e47e8
|
Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader
|
2024-06-07 00:22:54 +03:00 |
|
|
|
6e5c41fc8e
|
Merge pull request #2471 from Trial97/replace_auth_ping
replace auth server ping
|
2024-06-07 00:18:48 +03:00 |
|
|
|
e961cab352
|
Merge pull request #1409 from Trial97/import_zip
feat: refactored Instance ImportTask
|
2024-06-07 00:11:37 +03:00 |
|
|
|
b096ee6a0c
|
fix file permisions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-06 14:12:55 +03:00 |
|
|
|
aeb174fc55
|
DCO Remediation Commit for coolguy1842 <kian.goslett@protonmail.com>
I, coolguy1842 <kian.goslett@protonmail.com>, hereby add my Signed-off-by to this commit: 448ded2387
Signed-off-by: coolguy1842 <kian.goslett@protonmail.com>
|
2024-06-06 16:58:12 +10:00 |
|
|
|
71b2c4b1fd
|
fix formatting
Signed-off-by: coolguy1842 <kian.goslett@protonmail.com>
|
2024-06-06 16:32:49 +10:00 |
|
|
|
448ded2387
|
simple fix for resizing too small causing an index out of range crash
Signed-off-by: coolguy1842 <coolguy1842.deport391@passfwd.com>
|
2024-06-06 16:18:47 +10:00 |
|
|
|
b7008d2880
|
replace auth server ping
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-06 00:09:08 +03:00 |
|
|
|
45463dcd75
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
|
2024-06-04 11:04:02 +03:00 |
|
|
|
3263a706b4
|
chore(deps): update determinatesystems/update-flake-lock action to v22
|
2024-06-03 18:39:15 +00:00 |
|
|
|
080e64faaf
|
Merge pull request #2346 from SabrePenguin/list-image-append-fix
List image append
|
2024-06-02 18:53:17 +03:00 |
|
|
|
a6788a92cf
|
Merge pull request #2459 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
|
2024-06-02 08:23:23 +02:00 |
|
|
|
bbff31bcc0
|
chore(nix): update lockfile
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/8dc45382d5206bd292f9c2768b8058a8fd8311d9?narHash=sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78%3D' (2024-05-16)
→ 'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8?narHash=sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw%3D' (2024-06-01)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/47e03a624662ce399e55c45a5f6da698fc72c797?narHash=sha256-9dUxZf8MOqJH3vjbhrz7LH4qTcnRsPSBU1Q50T7q/X8%3D' (2024-05-25)
→ 'github:nixos/nixpkgs/6132b0f6e344ce2fe34fc051b72fb46e34f668e0?narHash=sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY%3D' (2024-05-30)
|
2024-06-02 00:20:40 +00:00 |
|
|
|
a70aeeea2b
|
Merge branch 'develop' into list-image-append-fix
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2024-06-01 15:20:21 +01:00 |
|
|
|
83883cadf9
|
fix qt5 build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-31 19:30:10 +03:00 |
|
|
|
f350918186
|
force initial size for the Add Instance dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-31 19:03:40 +03:00 |
|
|
|
c9c39b8203
|
fix double borders
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-31 17:47:39 +03:00 |
|
|
|
f7120a4f6f
|
Made Custom New Instance scrollable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-31 16:46:46 +03:00 |
|
|
|
f4f0a61bf2
|
fix vanilla technic modpacks
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-31 16:15:12 +03:00 |
|
|
|
817ff1ecbd
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-31 10:20:48 +03:00 |
|
|
|
2145f9f0ac
|
Merge pull request #1847 from Trial97/move_export2
Improvements to modlist export
|
2024-05-31 09:58:32 +03:00 |
|
|
|
7ab8f8ef54
|
Merge pull request #2423 from Trial97/fix_time3
fix incorrect launch time
|
2024-05-31 08:17:07 +02:00 |
|
