Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-11 12:47:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,830 Commits 9 Branches 38 Tags
e7eada9002be4abd893c6c20a71ab12ae4f3562d
Commit Graph

4125 Commits

Author SHA1 Message Date
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
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
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
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
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
Trial97
8ff53e47e8 Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader 2024-06-07 00:22:54 +03: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
Trial97
b096ee6a0c fix file permisions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-06 14:12:55 +03:00
coolguy1842
71b2c4b1fd fix formatting 
Signed-off-by: coolguy1842 <kian.goslett@protonmail.com>
 2024-06-06 16:32:49 +10:00
coolguy1842
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
Trial97
b7008d2880 replace auth server ping 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-06 00:09:08 +03:00
Trial97
45463dcd75 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2024-06-04 11:04:02 +03:00
TheKodeToad
a70aeeea2b Merge branch 'develop' into list-image-append-fix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-06-01 15:20:21 +01:00
Trial97
83883cadf9 fix qt5 build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 19:30:10 +03:00
Trial97
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
Trial97
c9c39b8203 fix double borders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 17:47:39 +03:00
Trial97
f7120a4f6f Made Custom New Instance scrollable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 16:46:46 +03:00
Trial97
f4f0a61bf2 fix vanilla technic modpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 16:15:12 +03:00
Trial97
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
Alexandru Ionut Tripon
2145f9f0ac Merge pull request #1847 from Trial97/move_export2 
Improvements to modlist export
 2024-05-31 09:58:32 +03:00
timoreo
7ab8f8ef54 Merge pull request #2423 from Trial97/fix_time3 
fix incorrect launch time
 2024-05-31 08:17:07 +02:00
Trial97
2635d7c3be replaced grid with vertical layout on all add modpack pages 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 09:07:51 +03:00
Trial97
d1286bbe90 add some comments 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 21:54:32 +03:00
Trial97
eaccdca02d added error message for import skin from user 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 16:21:08 +03:00
Trial97
75fbdc2df5 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2024-05-30 14:25:51 +03:00
Trial97
44a16c1ca1 fix CI 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 14:20:35 +03:00
Trial97
a7a1b28765 improve invalid path name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 13:49:23 +03:00
Trial97
8704cd8402 remove duplicate proggress bar 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 11:49:09 +03:00
Trial97
e94243f99b fix blocked mods api 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 09:56:55 +03:00
Trial97
7fed5e9173 Capitalize the mod categories 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 08:51:36 +03:00
Trial97
5e36def18b remove search button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 00:36:02 +03:00
Trial97
469f051e30 remove search button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 00:14:37 +03:00
Tayou
b8fe93efa3 fix & clean ResourcePage.ui 
Qt is cursed.

Signed-off-by: Tayou <git@tayou.org>
 2024-05-29 20:00:36 +02:00
Trial97
29444cfe0f fix win combobox take#2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-29 17:19:15 +03:00
Trial97
660772d4d7 swap buttons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-29 01:06:11 +03:00
Trial97
b256d325f7 fix win combobox 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-29 01:03:17 +03:00
Alexandru Ionut Tripon
f332503088 Apply suggestions from code review 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-05-29 00:32:17 +03:00