Evan Goode
|
48689d1b79
|
Merge remote-tracking branch 'upstream/release-9.x' into develop
|
2025-04-06 18:16:05 -05:00 |
|
Evan Goode
|
7dbaa896a6
|
Merge tag '9.0' into develop
This is an intermediate/halfway commit, more refactoring is needed to
get this to build.
|
2024-10-25 15:34:57 -04:00 |
|
seth
|
38fa2e0cd4
|
style: format with clang-format
Signed-off-by: seth <getchoo@tuta.io>
|
2024-09-30 16:32:55 -04:00 |
|
QazCetelic
|
1c6bd74ed8
|
Disable folder action instead of hiding it and add additional information in the tooltip.
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com>
|
2024-09-14 22:04:18 +02:00 |
|
Trial97
|
312009513d
|
add open java folder action
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-09-14 19:35:43 +03:00 |
|
Trial97
|
4f8b20437f
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3
|
2024-06-28 20:49:37 +03:00 |
|
Evan Goode
|
b8f9d18e26
|
Remove news toolbar
|
2024-06-23 23:51:52 -04:00 |
|
Trial97
|
27ee8374e7
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3
|
2024-06-22 22:54:38 +03:00 |
|
Tayou
|
178bd4a9c3
|
don't tr() file types on file save/open, etc. dialogs
Signed-off-by: Tayou <git@tayou.org>
|
2024-06-22 17:28:59 +02:00 |
|
Alexandru Ionut Tripon
|
3c4eed13a3
|
Merge pull request #1829 from Trial97/demo
Fixed demo mode
|
2024-06-14 18:41:02 +03:00 |
|
Trial97
|
c4a65dd861
|
update login flow
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-12 00:34:39 +03:00 |
|
Trial97
|
689b76885c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
|
2024-06-09 20:13:09 +03:00 |
|
Alexandru Ionut Tripon
|
2145f9f0ac
|
Merge pull request #1847 from Trial97/move_export2
Improvements to modlist export
|
2024-05-31 09:58:32 +03:00 |
|
Trial97
|
eacd7758e9
|
fix pre-commit hook
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-22 22:49:28 +03:00 |
|
Trial97
|
2b949a8059
|
improve login account checking
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-22 10:53:24 +03:00 |
|
Trial97
|
2ac6efaa4a
|
Fix reggresion
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-18 11:56:43 +03:00 |
|
Trial97
|
23134d4b72
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
|
2024-05-18 11:38:18 +03:00 |
|
Jan200101
|
a30c7193a2
|
remove server side decorations FIXME and document why its needed
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
|
2024-04-25 17:00:03 +02:00 |
|
Trial97
|
d88fb266a5
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
|
2024-04-20 17:42:58 +03:00 |
|
Sefa Eyeoglu
|
fec1a00dc8
|
fix: simplify openPath calls
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 67d088dc53)
|
2024-01-17 14:19:03 +00:00 |
|
Sefa Eyeoglu
|
6f5d074b4b
|
fix: open paths directly
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 0ccdcd23e3)
|
2024-01-17 14:19:03 +00:00 |
|
Sefa Eyeoglu
|
67d088dc53
|
fix: simplify openPath calls
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2024-01-14 11:36:17 +01:00 |
|
Sefa Eyeoglu
|
0ccdcd23e3
|
fix: open paths directly
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-12-14 13:02:29 +01:00 |
|
Trial97
|
4498d32cc0
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
|
2023-12-13 14:37:02 +02:00 |
|
Archy
|
faedd0fd65
|
Add togglable status bar
Signed-off-by: Archy <59789660+IceCryptonym@users.noreply.github.com>
|
2023-12-06 23:40:22 +10:00 |
|
Trial97
|
d5d8b7be8d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
|
2023-11-23 10:45:35 +02:00 |
|
Trial97
|
54c308e5b5
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-19 21:15:12 +02:00 |
|
Trial97
|
e99926ea94
|
Added more open folder actions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-19 02:40:25 +02:00 |
|
Trial97
|
6804e2ba59
|
moved export to list to the mods page
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-14 18:40:45 +02:00 |
|
Trial97
|
869f654a10
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-16 22:46:11 +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 |
|
Tayou
|
5985d8b118
|
Merge pull request #1383 from TheKodeToad/rename-groups
Rename groups
|
2023-10-15 23:38:27 +02:00 |
|
Trial97
|
0b6373e4df
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-10 19:46:27 +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 |
|
Trial97
|
93be8b0735
|
refresh default account when list changes
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-02 09:13:02 +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
|
b8d9c3d779
|
format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-26 20:19:35 +03:00 |
|
Trial97
|
c86b8b0f70
|
added skin manage dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-05 00:18:36 +03:00 |
|
Trial97
|
9ad029e028
|
added skins directory
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-01 23:10:33 +03:00 |
|
TheKodeToad
|
befa3baa6a
|
Merge branch 'develop' into feat/launcher-updater
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-30 11:47:33 +01:00 |
|
TheKodeToad
|
8c30cb3706
|
Fix CI
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-29 13:27:06 +01:00 |
|
TheKodeToad
|
c1855c6ce3
|
Merge branch 'develop' into rename-groups
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-29 12:41:40 +01: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 |
|
Trial97
|
e6ba2f4970
|
Added loaders check on versions load
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-23 12:52:51 +03:00 |
|
TheKodeToad
|
f7951f6082
|
Merge pull request #1548 from Trial97/version_label
Reset status label when deleting instance
|
2023-08-22 15:14:02 +01:00 |
|
Trial97
|
c3d03f0c33
|
added check for valid query items in curse url install
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-21 22:20:33 +03:00 |
|
Danny Dorazio
|
8092c321a9
|
Replace instances of “Minecraft account”
|
2023-08-20 23:00:25 -04:00 |
|