Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-11 20:57:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,540 Commits 9 Branches 38 Tags
599a08d30963b55c08149c5c8808dfa813ee862a
Commit Graph

513 Commits

Author SHA1 Message Date
Sefa Eyeoglu
bc75bcdcca Merge pull request #1768 from Trial97/toggle_deps2 2024-01-18 18:18:31 +01:00
Sefa Eyeoglu
0b3e91ac62 Merge pull request #1954 from Scrumplex/fix/open-paths-immediately 2024-01-17 15:18:46 +01:00
TheKodeToad
1130fe8510 Happy new year :D 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-01-02 18:04:42 +00:00
Sefa Eyeoglu
0ccdcd23e3 fix: open paths directly 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-12-14 13:02:29 +01:00
Sefa Eyeoglu
79218cf13b Merge pull request #1738 from Trial97/some_removals 2023-12-11 11:08:26 +01:00
Trial97
20e0cb43b9 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-11-23 23:58:47 +02:00
Trial97
1650237c8f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into some_removals 2023-11-23 23:37:13 +02:00
Trial97
403a7f5d46 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps2 2023-11-23 23:21:11 +02:00
Sefa Eyeoglu
b42434bcb6 Merge remote-tracking branch 'upstream/develop' into const-in-declarations 2023-11-23 09:06:23 +01:00
Alexandru Ionut Tripon
1150249cec Merge pull request #1746 from Trial97/toggle_deps 
separated dependecy check from mod update
 2023-11-17 19:42:22 +00:00
Alexandru Ionut Tripon
9d653f172a Update launcher/ui/dialogs/MSALoginDialog.cpp 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-08 08:56:48 +02:00
Trial97
4dc9e65875 Formated the suggestion 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-07 20:41:45 +02:00
Alexandru Ionut Tripon
54187a505f Update launcher/ui/dialogs/MSALoginDialog.cpp 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-07 20:39:12 +02:00
Trial97
8897f16d1d simplify microsoft login 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-07 10:52:52 +02:00
Trial97
011e87b421 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-06 23:38:14 +02:00
Alexandru Ionut Tripon
8eac0d34bd Merge pull request #1796 from Trial97/dep_global_toggle 
Added Global Dependenicies toggle
 2023-11-06 20:48:51 +00:00
Trial97
9a8667e99c Added Global Dependenicies toggle 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-05 22:22:49 +02:00
Alex
cf4144cb50 Fixed link to Fulmine's website 
Signed-off-by: Alex <akim8@emich.edu>
 2023-11-05 00:46:05 -04:00
Trial97
b18082376d Fixed visual bug with Modlist export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-03 11:04:13 +02:00
Trial97
1490193402 added button to disable dependencies on the mod review 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-30 22:14:26 +02:00
LocalSpook
0de4d8902e Remove top-level const qualifiers in function declarations 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-28 22:12:09 -07:00
Trial97
04acd27dab Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-10-26 13:45:47 +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
Trial97
f7c9972db0 separated dependecy check from mod update 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-23 19:46:30 +03:00
Trial97
a9d7af9096 removed some unused stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-20 16:44:37 +03:00
Trial97
8d4f508cc6 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-10-18 18:08:48 +03:00
Trial97
30f73a0696 Merge branch 'fail_concurrent_task' of github.com:Trial97/PrismLauncher into concurrent 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-18 18:08:31 +03:00
Trial97
165d218300 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into contrib 2023-10-18 09:07:36 +03:00
Tayou
436db23ffc Merge pull request #1268 from Ryex/feat/launcher-updater 
Feat: Windows (And portable linux / appimage) Auto Updater
 2023-10-16 19:53:50 +02:00
Alexandru Ionut Tripon
0927035a26 Merge pull request #1549 from Trial97/atlauncher_browser 
added suport for atlauncher browser download
 2023-10-16 06:39:12 +01:00
Tayou
5985d8b118 Merge pull request #1383 from TheKodeToad/rename-groups 
Rename groups
 2023-10-15 23:38:27 +02:00
Trial97
9d15255e0a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into atlauncher_browser 2023-10-15 20:52:38 +03:00
Trial97
6bbff310bc Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 2023-10-15 17:42:39 +03:00
Tayou
7015b8f7b2 Merge pull request #1563 from Trial97/modrinth_pack 
Pack import fixes and improvements
 2023-10-13 16:38:37 +02:00
Trial97
7e6a08548d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 2023-10-09 19:58:43 +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
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
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
Trial97
b8d9c3d779 format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-26 20:19:35 +03:00
Trial97
ebde563648 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 2023-09-26 20:16:46 +03:00
Trial97
7c636d4608 Removed mojang 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-25 17:44:04 +03: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
Trial97
a49851cb40 updated blocked mods with empty hash 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-19 15:48:12 +03:00
TheKodeToad
94c1cd6bcf CurseForge shader downloading 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-04 14:15:37 +01:00
Trial97
abbac5c26c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 22:28:59 +03:00