ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity
9,213 Commits 4 Branches 5 Tags 40 MiB
b65d0d1fe6
Commit Graph

9213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
354f4ef3d8 fix CI 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 44a16c1ca1)
 2024-06-10 09:11:36 +00:00
Trial97
8984cd5f66 improve invalid path name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a7a1b28765)
 2024-06-10 09:11:36 +00:00
Trial97
5934849d87 removed + from bad chars in filenames 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 428889a68d)
 2024-06-10 09:11:36 +00: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
Trial97
2ffabbdc6d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 10:00:52 +03:00
Trial97
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
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
Trial97
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
Trial97
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
Trial97
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
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
786a452f28
Merge pull request #2492 from PrismLauncher/backport-2166-to-release-8.x 
[Backport release-8.x] Updated ftb app import instance detection
 2024-06-10 00:46:22 +03:00
Trial97
62a2217291 Added the new ftb settings path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 1c3c9d2457)
 2024-06-09 21:45:37 +00:00
Trial97
1af7126582 Removed static path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 27e76d0dcb)
 2024-06-09 21:45:37 +00:00
Trial97
4d0e4f434f Updated ftb app import instance detection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 344398f238)
 2024-06-09 21:45:37 +00: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
af936353b1
Merge pull request #2490 from PrismLauncher/backport-1032-to-release-8.x 
[Backport release-8.x] refactor: shorten desktop entry comment field
 2024-06-09 21:03:18 +03:00
deadmeu
c728f43533 refactor: shorten desktop entry comment field 
Signed-off-by: deadmeu <dmu@duck.com>
(cherry picked from commit ac223a29ef)
 2024-06-09 17:59:36 +00: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
Trial97
6a99312df5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-09 19:57:16 +03:00
Trial97
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
Alexandru Ionut Tripon
bdf3497028
Merge pull request #2489 from Trial97/backport-2474-to-release-8.x 
Backport 2474 to release 8.x
 2024-06-09 16:37:40 +03:00
coolguy1842
9c7d1e80e3
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>
(cherry picked from commit aeb174fc55)
 2024-06-09 16:34:57 +03:00
coolguy1842
616556ea7b
fix formatting 
Signed-off-by: coolguy1842 <kian.goslett@protonmail.com>
(cherry picked from commit 71b2c4b1fd)
 2024-06-09 16:34:32 +03:00
coolguy1842
d23fa73f52
simple fix for resizing too small causing an index out of range crash 
Signed-off-by: coolguy1842 <coolguy1842.deport391@passfwd.com>
(cherry picked from commit 448ded2387)
 2024-06-09 16:34:32 +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
b2e5ea46d7
Merge pull request #2483 from PrismLauncher/backport-2428-to-release-8.x 
[Backport release-8.x] add detection for IBM Semeru Java runtime and fix x86 detection on 64 bit Windows
 2024-06-07 20:25:03 +01:00
Fourmisain
dda7e3073d please the pre-commit check 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
(cherry picked from commit 23095b70a4)
 2024-06-07 19:17:34 +00:00
Fourmisain
a800b86689 detect IBM Semeru Certified Edition on linux 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
(cherry picked from commit dbe4adc034)
 2024-06-07 19:17:34 +00:00
Fourmisain
cfeb72450e fix x86 detection on 64 bit windows 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
(cherry picked from commit af157c1613)
 2024-06-07 19:17:34 +00:00
Fourmisain
67e0b68cd5 add detection for IBM Semeru Java runtime 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
(cherry picked from commit 08918be11e)
 2024-06-07 19:17:34 +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
DioEgizio
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
Alexandru Ionut Tripon
fbf819c034
Merge pull request #2480 from PrismLauncher/backport-2383-to-release-8.x 
[Backport release-8.x] Made Custom New Instance scrollable
 2024-06-07 09:38:10 +03:00
Trial97
be2ecff97c fix qt5 build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 83883cadf9)
 2024-06-07 06:37:36 +00:00