Tayou
|
df2a92d5f4
|
Merge pull request #1742 from TayouVR/fix-resourcepack-crash
fix switch/case fallthrough in resource parse tasks
|
2023-10-28 12:44:40 +02:00 |
|
Sefa Eyeoglu
|
3719ea21b0
|
Merge pull request #1355 from TheKodeToad/env-vars
Custom environment variables
|
2023-10-26 22:10:26 +02:00 |
|
Trial97
|
12d567a9b8
|
made env vars behave like the rest of the settings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-26 22:51:38 +03:00 |
|
LocalSpook
|
5be80df1ee
|
Replace typedef with using
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
|
2023-10-24 01:36:27 -07:00 |
|
Sefa Eyeoglu
|
b376888f43
|
Merge pull request #1515 from TheKodeToad/sysprops
|
2023-10-22 21:57:11 +02:00 |
|
Tayou
|
0fe3241df6
|
remove now unneeded Q_ASSERTs
Signed-off-by: Tayou <git@tayou.org>
|
2023-10-22 21:25:06 +02:00 |
|
Tayou
|
7d5206818b
|
fix switch/case fallthrough
Signed-off-by: Tayou <git@tayou.org>
|
2023-10-22 21:25:00 +02:00 |
|
Sefa Eyeoglu
|
db19362a97
|
feat: add launcher brand and version props
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-10-22 21:19:44 +02:00 |
|
Alexandru Ionut Tripon
|
2c4af7e793
|
Merge pull request #1290 from Trial97/refactor/NetActions
Refactor ImgurUpload
|
2023-10-21 12:32:16 +01:00 |
|
TheKodeToad
|
e9fd02baca
|
Fix code style
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-20 13:12:16 +01:00 |
|
TheKodeToad
|
cf33927f21
|
Merge remote-tracking branch 'upstream/develop' into sysprops
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-19 11:28:07 +01:00 |
|
TheKodeToad
|
cc990c4f94
|
Merge branch 'develop' into env-vars
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-15 21:57:20 +01:00 |
|
TheKodeToad
|
c4882e7162
|
Merge pull request #443 from TheKodeToad/skinfix
Add legacy skin fix
|
2023-10-15 21:46:29 +01:00 |
|
Trial97
|
ca9b593483
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
|
2023-10-15 20:44:45 +03:00 |
|
Alexandru Ionut Tripon
|
4eb8db16f1
|
Merge pull request #1543 from Trial97/packwiz
refactor packwiz file write
|
2023-10-10 16:16:57 +01:00 |
|
Alexandru Ionut Tripon
|
6150908025
|
Merge pull request #1658 from Trial97/neoforge_version
Added version check for neoforge filter
|
2023-10-10 16:16:21 +01:00 |
|
Alexandru Ionut Tripon
|
bca5e8f395
|
Update launcher/minecraft/PackProfile.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-10-06 16:16:03 +03:00 |
|
Trial97
|
e913f61305
|
added a more strict condition for neoforge forge support
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-04 19:29:37 +03:00 |
|
Tayou
|
024c474658
|
Merge pull request #1678 from Trial97/release_order
fixed quilt dependencies
|
2023-10-04 10:28:45 +02:00 |
|
Sefa Eyeoglu
|
03ad430699
|
Merge pull request #1537 from Trial97/warnings
|
2023-10-04 09:40:38 +02:00 |
|
Trial97
|
ac38585a2a
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into release_order
|
2023-10-04 09:41:49 +03:00 |
|
Trial97
|
3cba5adb5a
|
updated dependency cycle
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-04 09:41:40 +03:00 |
|
Sefa Eyeoglu
|
bfa9613373
|
Merge pull request #1657 from Trial97/shader_txt
|
2023-10-02 11:56:50 +02:00 |
|
Sefa Eyeoglu
|
eab1180f68
|
Merge pull request #1090 from Ryex/feat/acknowledge_release_type
|
2023-10-01 14:32:58 +02:00 |
|
Sefa Eyeoglu
|
e3a147f56d
|
Merge pull request #1656 from Trial97/remove_mojang2
|
2023-10-01 14:32:42 +02:00 |
|
Alexandru Ionut Tripon
|
317c7b5544
|
Update launcher/minecraft/auth/AccountList.cpp
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-10-01 00:32:17 +03:00 |
|
Trial97
|
4802f6950e
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-28 23:06:18 +03:00 |
|
Sefa Eyeoglu
|
531b58093e
|
Merge pull request #1263 from Trial97/develop
|
2023-09-28 22:03:14 +02:00 |
|
Sefa Eyeoglu
|
2ff9ef0620
|
Merge pull request #1363 from Trial97/download_threads
|
2023-09-28 22:02:57 +02:00 |
|
Trial97
|
9acbf98f94
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-28 22:50:12 +03:00 |
|
seth
|
f370f0d749
|
chore: cleanup a few more mentions of mojang accounts
Signed-off-by: seth <getchoo@tuta.io>
|
2023-09-27 05:34:48 -04:00 |
|
Trial97
|
4ee6a6711d
|
Added version check for neoforge filter
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-25 23:04:21 +03:00 |
|
Trial97
|
86b47b3421
|
Do not display invalid shaders
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-25 22:33:36 +03:00 |
|
Trial97
|
7c636d4608
|
Removed mojang
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-25 17:44:04 +03:00 |
|
alexia
|
1684cff7ac
|
Update links to Minecraft Wiki
Minecraft Wiki has officially moved from Fandom to their own wiki.
I updated some links I found in comments.
Signed-off-by: alexia <me@alexia.lol>
|
2023-09-25 15:49:12 +02:00 |
|
Alexandru Ionut Tripon
|
81a3ba18bc
|
Update launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-09-20 18:45:23 +03:00 |
|
Trial97
|
9445a555e4
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into packwiz
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-10 16:24:59 +03:00 |
|
Trial97
|
47d1f23568
|
added side for modrinth mods
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-10 16:22:57 +03:00 |
|
Sefa Eyeoglu
|
d483b613b1
|
Merge pull request #1578 from TheKodeToad/antialiasing
|
2023-09-04 17:05:29 +02:00 |
|
Sefa Eyeoglu
|
546d49e183
|
Merge pull request #1530 from Trial97/metadata_delete
|
2023-09-04 17:02:52 +02:00 |
|
TheKodeToad
|
347228a246
|
Legacy settings override default -> false
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-09-02 22:29:26 +01:00 |
|
TheKodeToad
|
1213a5ab46
|
Merge remote-tracking branch 'upstream/develop' into skinfix
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-09-02 22:27:57 +01:00 |
|
TheKodeToad
|
f23a8e4b4b
|
Enable antialiasing for mod and pack icons
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-29 23:34:19 +01:00 |
|
Sefa Eyeoglu
|
fbf6833124
|
Merge pull request #1519 from TheKodeToad/better-export-pack
|
2023-08-28 10:29:32 +02:00 |
|
Trial97
|
0680d2dceb
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-27 20:41:56 +03:00 |
|
TheKodeToad
|
9110fbf282
|
Merge pull request #1560 from Trial97/curse_multiple_loaders2
Add suport for flame multiple loaders
|
2023-08-27 18:21:14 +01:00 |
|
TheKodeToad
|
e3b04d10cf
|
Merge pull request #1536 from Trial97/time3
Allow showing playtime in hours
|
2023-08-27 18:14:04 +01:00 |
|
Trial97
|
c5aac24a93
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse_multiple_loaders2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-27 15:53:35 +03:00 |
|
Sefa Eyeoglu
|
df14f88307
|
Merge pull request #1532 from Trial97/curseforge-url-handle
|
2023-08-27 12:26:57 +02:00 |
|
TheKodeToad
|
d1566f2610
|
Merge branch 'develop' into env-vars
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-26 23:12:02 +01:00 |
|