Commit Graph

4297 Commits

Author SHA1 Message Date
3f68b68691 Merge pull request #2531 from Trial97/relax_fat
relax fat FS filename restrictions
2024-06-18 12:51:22 +03:00
c07e791d7f chore: clang-format ResourcePack.cpp
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-06-18 10:17:48 +02:00
6af52c97c2 fix: update datapack and resourcepack versions
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-06-18 09:47:07 +02:00
c9827f8085 Spelling mistake
in m_column_names and translated it is Miecraft and not Minecraft

Signed-off-by: Cart <81428538+Cartrigger@users.noreply.github.com>
2024-06-17 23:12:07 -04:00
a587de8553 relax fat FS filename restrictions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-17 13:35:23 +03:00
2fb3e12492 fix auto java install
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-16 17:54:13 +03:00
8d3e6667cd fix java download tasks
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-16 15:09:49 +03:00
94fd02a34f fix java download button
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-16 14:26:19 +03:00
bbf52e3549 renamed dialog and button action
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-16 01:59:50 +03:00
d0584684f2 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-06-16 01:17:01 +03:00
2108ddcc1d completly remove metadata on refresh
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-16 01:16:09 +03:00
5fbbdb9707 fix merge issues
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-16 00:31:31 +03:00
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
f1d1c9e22c forget sort keys
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-15 11:06:20 +03:00
a121bfbb15 add size back to texture view
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-15 10:43:21 +03:00
98f8bc526d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-15 10:21:53 +03:00
d5fb9f0935 force aspect ratio for skin preview
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-15 10:21:21 +03:00
8cdaf5d05f fix tests
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 23:27:27 +03:00
cfdf4a9e1f Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader 2024-06-14 22:50:20 +03:00
1a84dc9bca no need for extra exist check
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 22:47:42 +03:00
b872f88617 do not double rename
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 22:46:39 +03:00
d2510b851b mark files as duplicate
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 22:45:15 +03:00
2d51008304 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 2024-06-14 21:05:11 +03:00
3c4eed13a3 Merge pull request #1829 from Trial97/demo
Fixed demo mode
2024-06-14 18:41:02 +03:00
9d16557328 simplify constructor
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 16:40:27 +03:00
863ebe421c randomize server port
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 16:38:41 +03:00
52490743b4 revert desktop file creation
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 14:16:23 +03:00
164d31dcb1 fix win build take#2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 13:09:22 +03:00
3db4f4dc2b fix build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 13:00:59 +03:00
8db0b5f421 Register mime-type on the fly
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 12:48:37 +03:00
f60d0135f7 made login link to open browser
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 12:47:44 +03:00
1bd4e60e99 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-14 11:23:52 +03:00
c35461b314 remove aspect ratio
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 11:23:14 +03:00
014721ca10 remove unused import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 11:19:54 +03:00
712fbc3a4b reverse login layout
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 11:15:40 +03:00
6e8dc6ccc0 add mouse interaction on microsoft link
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 19:20:32 +03:00
3fc5f56ed6 Merge pull request #2405 from Trial97/fix_missing_manifest
Fix portable if manifest is missing
2024-06-13 19:16:12 +03:00
ce5b2c54c5 Merge pull request #2439 from Trial97/fix_vanila_technic
fix vanilla technic modpacks
2024-06-13 19:15:43 +03:00
7fdc65eda8 add tooltip to url button
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 08:51:11 +03:00
2b229d7326 increase qr code size
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 00:20:16 +03:00
80ea67f7cf finish login dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 00:00:08 +03:00
a74bebb358 Merge pull request #2499 from Trial97/imgur3
update imgur upload
2024-06-12 23:45:17 +03:00
125fb2eaf2 remove png qr code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 19:34:58 +03:00
5f5296ef5e update ui once again
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 19:34:19 +03:00
bbbe7c879e update callback
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 12:35:02 +03:00
df142550fe update Add account question
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 11:55:56 +03:00
c4a65dd861 update login flow
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 00:34:39 +03:00
c1c182fd0c update imgur upload
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-10 12:38:59 +03:00
1c1e296960 fix(SkinManageDialog.cpp): typo
Signed-off-by: 快乐的老鼠宝宝 <laoshubaby@protonmail.com>
2024-06-10 17:15:38 +08:00
7d418a32e7 Merge pull request #2425 from Trial97/win_char
improve invalid path name
2024-06-10 12:11:21 +03:00