Trial97
4f49a56e4d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into supported_files
2023-11-23 15:40:31 +02:00
Trial97
85e875fe08
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day
2023-11-23 15:32:48 +02:00
Trial97
944ed48a61
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into time4
2023-11-23 14:58:05 +02:00
Trial97
e503d44c54
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into current_time
2023-11-23 14:47:47 +02:00
Trial97
908072710a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-23 14:34:56 +02: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
e43a557a0b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into instance_copy_progress
2023-11-23 14:08:49 +02:00
Trial97
7d4778ffd6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into portabledatadir
2023-11-23 13:54:36 +02:00
Trial97
80383d237a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
2023-11-23 13:38:11 +02:00
Trial97
1095d0698a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into waitprofiler
2023-11-23 13:25:12 +02:00
Trial97
c2fc2d330b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
2023-11-23 12:57:31 +02:00
Trial97
f16f0ed93e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry
2023-11-23 12:47:52 +02:00
Trial97
9345416361
Fixed localization stuff
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-23 12:36:40 +02:00
Trial97
2268e46b91
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into account
2023-11-23 12:22:41 +02:00
Trial97
ceb88a170e
Extracted reauthenticateCurrentAccount as a separate function
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-23 12:22:31 +02:00
Sefa Eyeoglu
a2aa303770
Merge pull request #1843 from Trial97/fix_not_found_dep
2023-11-23 11:02:16 +01:00
Sefa Eyeoglu
a966289944
Merge pull request #1852 from Trial97/war_ning
2023-11-23 11:01:53 +01:00
Sefa Eyeoglu
7c9c3d2c5f
Merge pull request #1815 from Trial97/fix_mangohub
2023-11-23 11:00:57 +01:00
Trial97
d8c5ed55c2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file2
2023-11-23 12:00:18 +02:00
Trial97
6169af70db
Added back the FIXME comment
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-23 11:59:35 +02:00
Sefa Eyeoglu
2b17a61d38
Merge pull request #1589 from Trial97/instance_reload
...
Fully reload the instance list once the folder is changed
2023-11-23 10:48:01 +01:00
Sefa Eyeoglu
d60d089cbc
Merge pull request #1751 from LocalSpook/account_type
2023-11-23 10:27:06 +01:00
Alexandru Ionut Tripon
5d6334ef95
Merge pull request #1762 from LocalSpook/const-in-declarations
...
Remove top-level `const` qualifiers in function declarations
2023-11-23 08:53:01 +00:00
Trial97
6b3b54f061
format
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-23 10:48:11 +02:00
Trial97
e11b7e3770
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
2023-11-23 10:46:27 +02:00
Trial97
670a0c1442
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size
2023-11-23 10:46:03 +02:00
Trial97
d5d8b7be8d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
2023-11-23 10:45:35 +02:00
Trial97
673f82e884
Merge branch 'war_ning' of github.com:Trial97/PrismLauncher into war_ning
2023-11-23 10:45:06 +02:00
Trial97
f18f7147b5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into war_ning
2023-11-23 10:44:49 +02:00
Trial97
721a08462c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into copy_time
2023-11-23 10:44:26 +02:00
Trial97
f0cff15d56
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into supported_files
2023-11-23 10:43:43 +02:00
Trial97
a1ac3ef7ae
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cat_day
2023-11-23 10:43:15 +02:00
Trial97
a7be21733f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
2023-11-23 10:41:55 +02:00
Trial97
66decbb180
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into current_time
2023-11-23 10:41:06 +02:00
Trial97
4ef626dab3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into time4
2023-11-23 10:40:30 +02:00
Sefa Eyeoglu
48e9753fb5
Merge pull request #1880 from Trial97/link
2023-11-23 09:07:34 +01:00
Sefa Eyeoglu
b42434bcb6
Merge remote-tracking branch 'upstream/develop' into const-in-declarations
2023-11-23 09:06:23 +01:00
Sefa Eyeoglu
364fb9808e
Merge pull request #1347 from HyperSoop/reduce-min-memory
2023-11-23 08:58:58 +01:00
Sefa Eyeoglu
389d75594a
Merge pull request #1887 from PrismLauncher/getchoo-patch-2
2023-11-23 08:58:00 +01:00
seth
d1c33392e7
chore: disable x86_64-darwin in garnix
...
this is currently broken on garnix's end, but hopefully we will be able to enable this again in the future
Signed-off-by: seth <getchoo@tuta.io>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-11-23 08:51:30 +01:00
Trial97
e3af4f9a78
Fixed playtime recording
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-22 20:34:12 +02:00
Trial97
85b4e1f24f
Made column hidden by default
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-22 19:23:24 +02:00
Trial97
140a55810d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
2023-11-22 14:20:30 +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
196d24330a
Fixed open link on settings page
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-21 17:47:59 +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
Sefa Eyeoglu
e499aa4783
Merge pull request #1873 from guihkx/sync-flatpak-manifest
2023-11-19 19:57:47 +01:00
guihkx
e3b7aed76b
chore: sync local flatpak manifest with flathub's
...
Signed-off-by: guihkx <626206+guihkx@users.noreply.github.com>
2023-11-19 11:08:52 -03:00
Tayou
24f2102596
Merge pull request #1869 from Trial97/icons_folder
...
Added more open folder actions
2023-11-19 15:06:30 +01:00
Trial97
26931475ae
made folder size reflect the number of elements
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-19 15:58:30 +02:00
