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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
Trial97
|
5012178a98
|
trigger search on filter change
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-28 14:48:03 +03:00 |
|
Trial97
|
3f7847ad34
|
made ResourcePage elements resizable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-28 14:47:44 +03:00 |
|
Trial97
|
4b52c72629
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-05-27 22:35:38 +03:00 |
|
Celeste Peláez
|
f5f32e2c6e
|
Reformatted FileSystem.h
Signed-off-by: Celeste Peláez <KernelFreeze@users.noreply.github.com>
|
2024-05-26 01:40:31 -05:00 |
|
Celeste Peláez
|
a2b5ac73ff
|
Added support for bcachefs
Signed-off-by: Celeste Peláez <KernelFreeze@users.noreply.github.com>
|
2024-05-26 01:33:22 -05:00 |
|
Trial97
|
eacd7758e9
|
fix pre-commit hook
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-22 22:49:28 +03:00 |
|
Trial97
|
2b949a8059
|
improve login account checking
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-22 10:53:24 +03:00 |
|
Richard-Rogalski
|
399071c717
|
Fix Java auto-detect so it finds Gentoo installed JDKs
Signed-off-by: Richard-Rogalski <rrogalski@tutanota.com>
|
2024-05-21 11:41:47 -05:00 |
|
Fourmisain
|
23095b70a4
|
please the pre-commit check
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
|
2024-05-21 13:44:00 +02:00 |
|
Fourmisain
|
dbe4adc034
|
detect IBM Semeru Certified Edition on linux
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
|
2024-05-21 10:51:37 +02:00 |
|
Fourmisain
|
af157c1613
|
fix x86 detection on 64 bit windows
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
|
2024-05-20 23:13:44 +02:00 |
|
Fourmisain
|
08918be11e
|
add detection for IBM Semeru Java runtime
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
|
2024-05-20 21:44:35 +02:00 |
|
Trial97
|
428889a68d
|
removed + from bad chars in filenames
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-19 19:38:06 +03:00 |
|
Trial97
|
1b0e8260ac
|
fix zero launch time
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-19 15:36:39 +03:00 |
|
Alexandru Ionut Tripon
|
74c2f2599f
|
Merge pull request #1365 from Trial97/netjob_retry
Ask user to retry if netjob fails
|
2024-05-18 17:54:12 +03:00 |
|
Trial97
|
5a598db608
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
|
2024-05-18 17:40:54 +03:00 |
|
Trial97
|
5bd28e2cc8
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-05-18 17:11:41 +03:00 |
|
Trial97
|
477d1408ad
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size
|
2024-05-18 16:53:14 +03:00 |
|
Trial97
|
83fdfe8091
|
fix regression
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-18 16:52:29 +03:00 |
|
Trial97
|
4d21f71ccf
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats
|
2024-05-18 16:34:21 +03:00 |
|
Trial97
|
31d0cad377
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo
|
2024-05-18 16:24:22 +03:00 |
|
Trial97
|
c9c67ef79e
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version
|
2024-05-18 15:27:02 +03:00 |
|
Trial97
|
633489884d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-18 13:27:31 +03:00 |
|
Alexandru Ionut Tripon
|
3887cfe5df
|
Merge pull request #1525 from Trial97/waitprofiler
Add wait profiler
|
2024-05-18 13:17:24 +03:00 |
|
Alexandru Ionut Tripon
|
7b39ec5048
|
Merge pull request #2377 from dqfan2012/AddSdkmanToMacOs
Adding sdkman java location to MacOs
|
2024-05-18 13:15:57 +03:00 |
|
Trial97
|
ba947993c2
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
|
2024-05-18 12:47:01 +03:00 |
|
Tayou
|
acd23ff163
|
Merge pull request #2402 from Trial97/refactor_auth
Improve Microsoft login
|
2024-05-18 11:07:16 +02:00 |
|
Alexandru Ionut Tripon
|
c8ff768d64
|
Merge pull request #1827 from Trial97/shader
fixed shader packs detection
|
2024-05-18 12:02:13 +03:00 |
|
Trial97
|
b6d87fc090
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into instance_copy_progress
|
2024-05-18 11:57:41 +03:00 |
|
Trial97
|
6aaf3a3ed4
|
Merge branch 'skin_selector' of github.com:Trial97/PrismLauncher into skin_selector
|
2024-05-18 11:57:06 +03:00 |
|
Trial97
|
2ac6efaa4a
|
Fix reggresion
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-18 11:56:43 +03:00 |
|
Trial97
|
23134d4b72
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
|
2024-05-18 11:38:18 +03:00 |
|
Trial97
|
318819afc6
|
Made recommended button default
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-18 11:36:46 +03:00 |
|
Alexandru Ionut Tripon
|
eb0d0450e3
|
Merge pull request #2382 from Trial97/neoforge_technic
Add neoforge support for technic packs and atlauncher packs
|
2024-05-18 10:40:45 +03:00 |
|
Alexandru Ionut Tripon
|
0f2736306e
|
Update launcher/ui/dialogs/skins/SkinManageDialog.ui
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2024-05-18 10:36:15 +03:00 |
|
Trial97
|
639c6e7f80
|
Add cancel to Add account dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-17 00:49:00 +03:00 |
|
Trial97
|
75a457ebfa
|
Add custom page to land after microsoft login
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-17 00:31:04 +03:00 |
|
Trial97
|
ce09f06bda
|
Fix CI3
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-16 22:16:42 +03:00 |
|
Trial97
|
09c0c11033
|
Add back device code flow
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-16 21:58:25 +03:00 |
|
Alexandru Ionut Tripon
|
ab5f628453
|
Update launcher/updater/prismupdater/PrismUpdater.cpp
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2024-05-16 19:45:43 +03:00 |
|
Alexandru Ionut Tripon
|
051e788683
|
Update launcher/updater/prismupdater/PrismUpdater.cpp
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2024-05-16 19:45:00 +03:00 |
|
Trial97
|
2a58fb0ac5
|
Remove cobrandid
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-16 17:31:25 +03:00 |
|
Trial97
|
c15f6fcd2a
|
Fix portable if manifest is missing
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-16 17:21:30 +03:00 |
|
Alexandru Ionut Tripon
|
898ee67a07
|
Update launcher/ui/dialogs/MSALoginDialog.cpp
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2024-05-16 00:41:07 +03:00 |
|
Trial97
|
abedc6a23c
|
Improve login UI
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-15 17:25:15 +03:00 |
|
Trial97
|
849c3faeb4
|
Fix CI
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-15 14:07:03 +03:00 |
|
Trial97
|
80d8e3ee06
|
Remove katabasis
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-15 12:53:06 +03:00 |
|
Trial97
|
c2ed50627d
|
Added back qt version check
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-14 00:36:35 +03:00 |
|
Trial97
|
e285a85fe8
|
Removed AccountTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-14 00:21:51 +03:00 |
|
Trial97
|
3336f8107c
|
Removed AuthRequest and NetAction
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-14 00:21:45 +03:00 |
|