Commit Graph

340 Commits

Author SHA1 Message Date
Alexandru Ionut Tripon
fc445078cd
Merge pull request #2415 from Trial97/configure_timeout
Add config for transfer timeout
2024-06-30 22:26:19 +03:00
Trial97
7a0b299be9
control Prism data directory via env variable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-29 18:08:28 +03:00
Alexandru Ionut Tripon
2cd0223cff
Merge pull request #2578 from Trial97/clang-format
chore:increment clang-tools version
2024-06-28 19:33:18 +03:00
Trial97
147741e616
increment clang-tools version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-28 12:48:52 +03:00
seth
66e6fc04d3
Merge pull request #2520 from Trial97/metadata 2024-06-28 04:57:39 +00:00
Trial97
096266c141
fix update message
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-24 21:31:26 +03:00
Trial97
2108ddcc1d
completly remove metadata on refresh
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-16 01:16:09 +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
3af4c94612
Merge pull request #2390 from Trial97/delete_tmp
Delete instaces tmp diectory on startup
2024-06-09 16:03:51 +03:00
Trial97
45463dcd75
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2024-06-04 11:04:02 +03:00
Trial97
425a6e0919
Fix code format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-19 10:09:34 +03:00
Trial97
d9e2badf71
Rename timeout option
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-19 08:54:19 +03:00
Trial97
6078a771c1
add config for transfer timeout
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-18 21:46:05 +03:00
Trial97
633489884d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-18 13:27:31 +03:00
Alexandru Ionut Tripon
3887cfe5df
Merge pull request #1525 from Trial97/waitprofiler
Add wait profiler
2024-05-18 13:17:24 +03:00
Trial97
23134d4b72
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2024-05-18 11:38:18 +03:00
Trial97
d795ba25e7
Delete instaces tmp diectory on startup
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-10 20:55:26 +03:00
Trial97
3a4f82ffd1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-24 00:21:39 +03:00
Trial97
9f48694eb2
Fixed application close on open file dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-09 08:28:09 +03:00
Alexandru Ionut Tripon
b3abc052b5
Merge pull request #1529 from Trial97/portabledatadir
Added UserData as another posible path for portable builds
2024-03-28 14:48:34 +02:00
DioEgizio
44327980db feat: add "use zink" button
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-02-18 13:30:55 +01:00
Trial97
031a9f4738
Replaced QFile::remove with FS::deletePath
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-10 11:03:51 +02:00
Sefa Eyeoglu
a62eaba702
Merge pull request #1825 from Trial97/ftb_import 2024-01-18 18:18:17 +01:00
TheKodeToad
f285c3fe13
Merge pull request #1972 from lumiscosity/feature/cat_opacity
Add a cat opacity option
2024-01-06 19:42:17 +00:00
TheKodeToad
1130fe8510
Happy new year :D
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-01-02 18:04:42 +00:00
lumiscosity
43306350e0 Add cat opacity
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-22 15:02:41 +01:00
theMackabu
201c9783d5
clang-format: fix formatting
Signed-off-by: theMackabu <theMackabu@gmail.com>
2023-12-12 13:31:18 -08:00
theMackabu
836f74cd46
#1945 resolve issue on windows
Signed-off-by: theMackabu <theMackabu@gmail.com>
2023-12-12 13:26:44 -08:00
theMackabu
3567369d44
#1945 resolve minimized windows pull from dock
Signed-off-by: theMackabu <theMackabu@gmail.com>
2023-12-12 13:26:44 -08: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
bit6tream
d414599974 (#1693) Use a better approach to detect a noexec mount option
Signed-off-by: bit6tream <megapixel483@gmail.com>
2023-11-23 15:23:03 +03:00
Trial97
7d4778ffd6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into portabledatadir 2023-11-23 13:54:36 +02:00
Trial97
1095d0698a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into waitprofiler 2023-11-23 13:25:12 +02:00
bit6tream
681e76c551 (#1693) Notify user if /tmp directory has noexec mount option
Minecraft versions starting from 1.19 would not start at all if /tmp is mounted as `noexec`.

Signed-off-by: bit6tream <megapixel483@gmail.com>
2023-11-22 01:48:31 +03:00
Trial97
5e2eb7bbbb
Added button to select the FTBApp instances directory
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-09 23:30:30 +02:00
Trial97
7a0b2a316a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-06 23:19:58 +02:00
Trial97
9a8667e99c
Added Global Dependenicies toggle
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-05 22:22:49 +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
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
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
TheKodeToad
7112d04df5
Mark setting as optional
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-10-15 14:11:08 +01:00
Trial97
7e6a08548d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 2023-10-09 19:58:43 +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
Trial97
2e4fcd6aa3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-28 23:26:15 +03:00
Sefa Eyeoglu
2ff9ef0620
Merge pull request #1363 from Trial97/download_threads 2023-09-28 22:02:57 +02:00
Trial97
b8d9c3d779
format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-26 20:19:35 +03: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
Trial97
9ad029e028
added skins directory
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-01 23:10:33 +03:00