CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,017 Commits 10 Branches 30 Tags 34 MiB
ca4b58d5d7
Commit Graph

2848 Commits

Author SHA1 Message Date
Alexandru Ionut Tripon
ca4b58d5d7
Merge pull request #1405 from Trial97/update_file 
Allow updating managed packs from local file
 2023-10-10 16:17:08 +01: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
a7842ecc33
Merge pull request #1591 from Trial97/ftb_import_fix 
fix: make cached instead of file for ftb pack import
 2023-10-10 16:16:40 +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
nea
c6c17036e3
Add more Java installation dirs 
Signed-off-by: nea <nea@nea.moe>
 2023-10-04 21:20:59 +02: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
d186c34385
Merge pull request #1676 from Trial97/release_order 
revert back the release order
 2023-10-04 07:43:21 +02:00
Trial97
77979b4c95
revert back the release order 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-03 17:23:26 +03:00
Tayou
540fc7d2a8
Merge pull request #1670 from Trial97/seg_fault 
Don't update mods if no mod loader is installed
 2023-10-02 17:05:07 +02:00
Sefa Eyeoglu
d612ab94a7
Merge pull request #1672 from Trial97/skin_refresh 
refresh default account when list changes
 2023-10-02 16:06:12 +02:00
Sefa Eyeoglu
bfa9613373
Merge pull request #1657 from Trial97/shader_txt 2023-10-02 11:56:50 +02:00
Trial97
93be8b0735
refresh default account when list changes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-02 09:13:02 +03:00
Trial97
2cea7454ef
fix: do not update mods if no mod loader is selected 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-01 23:04:19 +03: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
Alexandru Ionut Tripon
00bbbdc6e9
Update launcher/LaunchController.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-10-01 00:31:51 +03:00
Trial97
34294383eb
added version type to dep update 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 23:18:23 +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
5b7c5607a9
removed flame consturctor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 22:53:40 +03: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
Sefa Eyeoglu
59e565ef96
Merge pull request #1643 from bolli24/develop 2023-09-27 17:34:32 +02: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
bolli24
14af7044be
Update launcher/ui/dialogs/ModUpdateDialog.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: bolli24 <9805065+bolli24@users.noreply.github.com>
 2023-09-24 03:01:47 +02:00
bolli24
f3c089792a Skip folders when updating mods. 
Previously the mod updater would fail, reporting "The mod updater was aborted!", when trying to update a folder.

Signed-off-by: bolli24 <4827765-bolli24@users.noreply.gitlab.com>
 2023-09-22 21:36:19 +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
Sefa Eyeoglu
00af385619
Merge pull request #1572 from Trial97/catpacks2 2023-09-16 18:22:13 +02:00
Sefa Eyeoglu
bf6dc10f35
Merge pull request #1605 from TheKodeToad/flame-shaders 2023-09-16 18:20:45 +02: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
94c1cd6bcf
CurseForge shader downloading 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-04 14:15:37 +01:00
Trial97
30ff417074
fix: make cached instead of file for ftb pack import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 16:25:49 +03:00
TheKodeToad
25ce11d85d
Merge pull request #1539 from Trial97/refactor_modpack_ux 
Improvements to modpack UX
 2023-08-31 14:58:54 +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
TheKodeToad
0e67686295
Hide index folder in pack export dialog 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-28 17:25:07 +01:00
TheKodeToad
e98bca4749
Fix cancelling pack save 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-28 17:09:40 +01:00
Sefa Eyeoglu
fbf6833124
Merge pull request #1519 from TheKodeToad/better-export-pack 2023-08-28 10:29:32 +02:00