Trial97
|
b6f48f6fe0
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-16 23:13:53 +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 |
|
TheKodeToad
|
c4882e7162
|
Merge pull request #443 from TheKodeToad/skinfix
Add legacy skin fix
|
2023-10-15 21:46:29 +01: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 |
|
TheKodeToad
|
6fb7a98901
|
Fix small mistake 😭
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-15 14:45:05 +01:00 |
|
Tayou
|
9705e6325a
|
Merge pull request #1673 from Trial97/win_attr
fix folder attributes on windows copy
|
2023-10-15 15:15:36 +02:00 |
|
TheKodeToad
|
7112d04df5
|
Mark setting as optional
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-15 14:11:08 +01:00 |
|
Alexandru Ionut Tripon
|
2ab48a43dd
|
Merge pull request #1706 from Trial97/develop
removed the better release for modrinth modpacks
|
2023-10-15 12:24:20 +01:00 |
|
Trial97
|
023b3e3c39
|
Fixed arch build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-14 09:41:04 +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
|
32eaaa25d9
|
removed the better release for modrinth modpacks
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-13 00:04:36 +03:00 |
|
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 |
|
Trial97
|
5cb6d93136
|
fixed updater build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-09 22:25:45 +03:00 |
|
Trial97
|
7e6a08548d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater
|
2023-10-09 19:58:43 +03: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 |
|
TheKodeToad
|
d49f81d132
|
Drop leftover mod loader settings
I messed up the merge.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-06 11:27:04 +01: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 |
|
Trial97
|
8069de29b2
|
fix folder attributes on windows copy
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-02 21:53:08 +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
|
09a10a916b
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-28 23:23:42 +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 |
|
Trial97
|
bef701eba8
|
chaged folder again
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-28 21:27:11 +03:00 |
|
Trial97
|
742384909f
|
updated portable update
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-28 21:24:31 +03:00 |
|
Trial97
|
606c12ffeb
|
more fixing
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-28 18:47:21 +03:00 |
|