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

2236 Commits

Author SHA1 Message Date
Alexandru Ionut Tripon
ddcaf25149
Merge pull request #2650 from Trial97/help-pages 
fix a few missing help pages
 2024-07-19 15:45:57 +03:00
Ben Westover
fb10cb5fdf
Fix a few typos 
As part of packaging Prism Launcher for Debian, I have run a package linter
called lintian which found a few spelling errors throughout the source.

I am not a fan of contributions that only fix cosmetics like spelling errors,
but Debian encourages forwarding this stuff upstream instead of letting it get
fixed naturally over time.

Signed-off-by: Ben Westover <me@benthetechguy.net>
 2024-07-18 22:08:18 -04:00
UnownPlain
e6019ab396
Fix dead link to Modrinth authentication docs 
Signed-off-by: UnownPlain <38232575+UnownPlain@users.noreply.github.com>
 2024-07-17 23:04:52 -04:00
Trial97
6d425717e9
fix a few missing help pages 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-16 14:42:23 +03:00
Trial97
061fdc1ada
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into clean_net 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-09 18:36:23 +03:00
Alexandru Ionut Tripon
5f345cedea
Merge pull request #2596 from TayouVR/more-system-themes 
Display all system themes in widget theme selector
 2024-07-09 12:55:22 +03:00
Trial97
c07260e836
remove duplicate code from net folder 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-07 02:49:27 +03:00
Trial97
a09742a406
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-07-06 01:07:00 +03:00
Kationor
83a5fe1984
Rename setting to SkipModpackUpdatePrompt 
Was ModpackUpdatePromptDisabled

Signed-off-by: Kationor <n96211028@gmail.com>
 2024-07-03 23:13:39 +02:00
Kationor
9b172278f8
Add ModpackUpdatePromptDisabled setting 
When creating an instance of a modpack that's already associated with
another instance, the user gets asked if they want to update that
instance instead. This commit introduces a setting to suppress the
prompt and directly create the new instance.

Signed-off-by: Kationor <n96211028@gmail.com>
 2024-07-03 12:43:05 +02:00
Tayou
dbcfefca1b fix system theme 
Signed-off-by: Tayou <git@tayou.org>
 2024-07-01 23:05:54 +02:00
Tayou
d70be5121c tooltips 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 23:27:45 +02:00
Tayou
4f795eb6ef format 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 22:06:01 +02:00
Trial97
0f311453e1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-30 22:54:23 +03:00
Tayou
7104f8909d another oop 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 21:52:26 +02:00
Tayou
a184b26a00 #ifdef, not #if... I'm smort 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 21:47:52 +02:00
Trial97
4b4da8e6f6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-30 22:41:49 +03:00
Tayou
f0c9b52055 oop 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 21:41:37 +02:00
Tayou
046e3588af more system themes initial changes 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 21:35:03 +02:00
Alexandru Ionut Tripon
fc445078cd
Merge pull request #2415 from Trial97/configure_timeout 
Add config for transfer timeout
 2024-06-30 22:26:19 +03:00
Alexandru Ionut Tripon
7ff173d72a
Merge pull request #2173 from Trial97/dependency_removal 
Remove dependencies if review mods is rejected
 2024-06-30 22:21:38 +03:00
Rachel Powers
cf319649f9
fix qt5 lwjgl recommend + spelling 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:09 -07:00
Rachel Powers
44bf0315ad
feat(components) recomend the correct lwjgl version for the minecraft version 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:33:51 -07:00
Trial97
25bae20db4
trim input from import page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-30 00:17:25 +03:00
Trial97
f1a4a1e8ee
increase 'or' font size for login dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-29 08:41:35 +03:00
Trial97
ebad11d34f
made sure const method is respected 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 22:04:11 +03:00
Trial97
06add2b0a8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:55:16 +03:00
Trial97
2af6902b42
validate metadata on launch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:26 +03:00
Trial97
4f8b20437f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-28 20:49:37 +03:00
Trial97
515baffb8e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 2024-06-28 20:48:28 +03:00
Trial97
0b79abcdcd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:45:30 +03:00
Trial97
90e756c041
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into coremods 2024-06-28 20:41:48 +03:00
Trial97
147741e616
increment clang-tools version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 12:48:52 +03:00
Alexandru Ionut Tripon
68292aff6c
Merge pull request #2574 from ajerick/develop 
fix non-persistent user icon selection in NewInstanceDialog.cpp
 2024-06-27 08:38:46 +03:00
seth
3f3351f89e
Merge pull request #1892 from Trial97/change_version 
Added mod reinstall dialog
 2024-06-27 02:12:00 +00:00
Aiden J Erickson
37388e1d48
fix non-persistent user icon selection in NewInstanceDialog.cpp 
Signed-off-by: Aiden J Erickson <aiden.j.erickson@gmail.com>
 2024-06-26 20:54:04 -04:00
Trial97
7c38edc93d
Apply suggestion from code review 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-25 16:10:05 +03:00
Alexandru Ionut Tripon
555c4a7c59
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-06-25 15:33:11 +03:00
Alexandru Ionut Tripon
52839774e6
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-06-25 15:19:23 +03:00
Trial97
2f88da9de2
add warnning when user closes the resource download dialog with selection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-25 09:50:33 +03:00
Trial97
00b83efb9a
fix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 20:12:40 +03:00
Evan Goode
c3bdc0f79b
Merge pull request #15 from unmojang/evan-goode/disable-updater 
Disable updater, news
 2024-06-24 00:10:14 -04:00
Evan Goode
b8f9d18e26 Remove news toolbar 2024-06-23 23:51:52 -04:00
Evan Goode
bf997aa117
Merge pull request #14 from unmojang/evan-goode/msa 
Use Nintendo Switch client ID
 2024-06-23 23:16:59 -04:00
Evan Goode
62f87c423f Use Nintendo Switch client ID 
Reputable projects such as prismarine-auth and azalea-auth hardcode the
Nintendo Switch client ID instead of their own custom Azure application,
so we should be fine to go ahead and do the same.

Unfortunately, client IDs created for custom Azure applications, such as
Prism Launcher's client ID, will no longer work with Fjord Launcher, so
users who manually supplied a client ID will need to clear theirs.
 2024-06-23 22:57:31 -04:00
Evan Goode
810ab868b3 Fetch CurseForge API key from official files 
Instead of fetching the CurseForge API key from PolyMC's server, fetch
it from the files of the CurseForge app, mirrored by archive.org. We can
do this without downloading the entire 100MiB+ application by
range-requesting the specific DEFLATE block where the key is and
decompressing just that block.
 2024-06-23 22:35:06 -04:00
Trial97
e57c2180da
Resolve issue with multiple loaders during update 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 03:06:10 +03:00
Trial97
c04031ff00
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 2024-06-23 23:40:12 +03:00
Evan Goode
51da756e19 Merge remote-tracking branch 'prismlauncher/release-8.x' into develop 2024-06-23 11:34:11 -04:00
seth
92b9f1a3e3
Merge pull request #2515 from Trial97/size_for_skin 
force aspect ratio for skin preview
 2024-06-22 19:21:59 -04:00
Trial97
27ee8374e7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-22 22:54:38 +03:00
Tayou
178bd4a9c3 don't tr() file types on file save/open, etc. dialogs 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-22 17:28:59 +02:00
Trial97
766ddc80e3
refactored hassing task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-18 16:51:26 +03:00
Trial97
94fd02a34f
fix java download button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 14:26:19 +03:00
Trial97
bbf52e3549
renamed dialog and button action 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 01:59:50 +03:00
Trial97
d0584684f2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-06-16 01:17:01 +03:00
Trial97
5fbbdb9707
fix merge issues 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 00:31:31 +03:00
Trial97
c01f3107a4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 00:18:11 +03:00
Trial97
98f8bc526d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-15 10:21:53 +03:00
Trial97
d5fb9f0935
force aspect ratio for skin preview 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-15 10:21:21 +03:00
Trial97
cfdf4a9e1f
Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader 2024-06-14 22:50:20 +03:00
Alexandru Ionut Tripon
3c4eed13a3
Merge pull request #1829 from Trial97/demo 
Fixed demo mode
 2024-06-14 18:41:02 +03:00
Trial97
3db4f4dc2b
fix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 13:00:59 +03:00
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
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
Trial97
6e8dc6ccc0
add mouse interaction on microsoft link 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-13 19:20:32 +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
Trial97
5f5296ef5e
update ui once again 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-12 19:34:19 +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
快乐的老鼠宝宝
1c1e296960
fix(SkinManageDialog.cpp): typo 
Signed-off-by: 快乐的老鼠宝宝 <laoshubaby@protonmail.com>
 2024-06-10 17:15:38 +08: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
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
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
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
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
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
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
Trial97
a053a4040c force initial size for the Add Instance dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f350918186)
 2024-06-07 06:37:36 +00:00
Trial97
975b0b5761 fix double borders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c9c39b8203)
 2024-06-07 06:37:36 +00:00
Trial97
446740ba4f Made Custom New Instance scrollable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f7120a4f6f)
 2024-06-07 06:37:36 +00: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
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
45463dcd75
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2024-06-04 11:04:02 +03:00
SabrePenguin
6a49f513d8
Fixed more clang formatting 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
5d25e21719
Fixing CI format issues 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
da2a67227a
Added patch to all setHtml calls 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +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
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
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
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
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
694ea65457
disable retry dialog for logo fetching 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-26 11:13:01 +03:00
Trial97
7a200a337f
update retry netjob dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-26 11:04:41 +03:00
Evan Goode
4f9fdcc293 pre-commit run --all-files 2024-05-23 16:49:09 -04:00
Evan Goode
513361df25 DRM: check for valid account, not just any account 2024-05-22 19:46:43 -04: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
Evan Goode
13a32a6642 Add back DRM for offline and authlib-injector accounts 2024-05-20 13:24:16 -04:00
Trial97
7a42fb284a
reverse java version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-20 18:33:40 +03:00
Trial97
0e239dfb2a
fix crash on first display with java downloader off 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-20 18:24:19 +03:00
Trial97
abb628edb3
remove OverrideJava 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-20 18:23:43 +03:00
Trial97
d9e2badf71
Rename timeout option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 08:54:19 +03:00
Trial97
6078a771c1
add config for transfer timeout 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 21:46:05 +03:00
Trial97
5bd28e2cc8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-05-18 17:11:41 +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
c9c67ef79e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version 2024-05-18 15:27:02 +03:00
Trial97
d77d1f3be3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into coremods 2024-05-18 14:44:33 +03:00
Trial97
7a5348a179
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-05-18 14:14:31 +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
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
6aaf3a3ed4
Merge branch 'skin_selector' of github.com:Trial97/PrismLauncher into skin_selector 2024-05-18 11:57:06 +03:00