Trial97
|
3c75d761a2
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into error_codes
|
2023-11-23 23:11:11 +02:00 |
|
Trial97
|
b47ec7f2dc
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size
|
2023-11-23 17:14:50 +02:00 |
|
Trial97
|
3234bb5a8c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve
|
2023-11-23 17:05:37 +02:00 |
|
Trial97
|
bb9df1684b
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into new_cats
|
2023-11-23 16:58:42 +02:00 |
|
Trial97
|
0d44c0df1d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats
|
2023-11-23 16:50:53 +02:00 |
|
Trial97
|
c5cdebb42f
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into ftb_import
|
2023-11-23 16:43:33 +02:00 |
|
Trial97
|
2318a83881
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader
|
2023-11-23 16:33:57 +02:00 |
|
Trial97
|
be67067fa2
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo
|
2023-11-23 16:23:56 +02:00 |
|
Alexandru Ionut Tripon
|
7f6027498e
|
Merge pull request #1871 from Trial97/cat_day
changed prism aniversary
|
2023-11-23 14:14:04 +00:00 |
|
Trial97
|
9c13504b06
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_ok
|
2023-11-23 16:13:09 +02:00 |
|
deadmeu
|
ac223a29ef
|
refactor: shorten desktop entry comment field
Signed-off-by: deadmeu <dmu@duck.com>
|
2023-11-24 00:03:33 +10:00 |
|
Trial97
|
afcdb7595c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
|
2023-11-23 16:01:54 +02:00 |
|
Trial97
|
f71e622f71
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into copy_time
|
2023-11-23 15:51:54 +02:00 |
|
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 |
|