Commit Graph

2314 Commits

Author SHA1 Message Date
Trial97
6fd729e285
Fixed regresion regarding modrinth project_id in dependence array
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19 17:42:16 +03:00
Trial97
8ad9692daa
Changed qWarning to qDebug for raw data
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19 14:10:29 +03:00
Trial97
d02858040e
Fixes #1212
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19 13:09:37 +03:00
Trial97
3ee0fec729
Removed mods from lambda
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19 12:22:22 +03:00
Trial97
ec063470d7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt 2023-06-19 12:20:50 +03:00
Trial97
1bdde1f947
Small fixes
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19 00:36:37 +03:00
Trial97
319ce8c19f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-19 00:06:44 +03:00
Trial97
4e66f55d84
Removed extra headers
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-18 23:32:17 +03:00
Trial97
6826f1d605
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash 2023-06-18 23:27:41 +03:00
Trial97
0161520b33
Fixed leaks
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-18 23:27:26 +03:00
seth
fd9a8d1551
Merge pull request #1110 from TheKodeToad/version-search
Add a search bar to version lists
2023-06-16 14:47:39 -04:00
DioEgizio
412349ac58
Merge pull request #1135 from Trial97/installed_mods 2023-06-16 09:56:51 +02:00
Sefa Eyeoglu
000f4386a2
Merge pull request #1192 from Trial97/pre-lauch 2023-06-16 09:46:24 +02:00
Trial97
147366bc0a
Made ByteSynkArray to use shared_ptr
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-15 22:59:41 +03:00
TheKodeToad
13804f80de Fix trailing space in instance name
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-15 16:37:03 +01:00
Trial97
1b42b9a08e
Fixed tests
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-15 14:25:58 +03:00
Trial97
535fb2c4d6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pre-lauch 2023-06-15 14:13:30 +03:00
Trial97
98a07da39b
Renamed variable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-15 14:12:29 +03:00
TheKodeToad
8bf5ba2836
Merge pull request #1195 from Scrumplex/fix-javavendor-instance
Add JavaVendor as an instance override
2023-06-15 12:11:32 +01:00
Sefa Eyeoglu
90a4f622d2
Merge pull request #1063 from RedsonBr140/feat/RootFolder 2023-06-15 12:49:21 +02:00
Sefa Eyeoglu
6812823b55
fix: simplify resolving of data path
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-06-15 12:48:22 +02:00
Sefa Eyeoglu
7ad9abf9bc
fix: add JavaVendor as an instance override
This should suppress a critical error that gets printed every time an
instance gets launched, as JavaCheck wants to store the vendor in the
instance settings.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-06-15 12:45:03 +02:00
Trial97
cb52be433d
Made the installed mods more apparent
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-15 13:20:08 +03:00
Trial97
1f2b0ad698
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into installed_mods 2023-06-15 12:39:20 +03:00
Trial97
6667ff9330
Updated text and fixed mod page text update
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-15 12:32:48 +03:00
Trial97
5bf091149d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt 2023-06-15 11:46:44 +03:00
Trial97
be0df38453
Added tooltip for name label
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-15 11:40:39 +03:00
Trial97
fcfb3d2df7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page 2023-06-15 10:37:10 +03:00
Trial97
1ff8136f98
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into scale_cat 2023-06-15 10:36:05 +03:00
Trial97
182e19eae3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-15 10:35:26 +03:00
seth
9908e115aa
Merge pull request #1067 from RedsonBr140/feat/dont-hide-settings
feat: Don't hide the settings tab when an instance is running
2023-06-15 02:20:00 -04:00
Trial97
811c79423f
Fixed version comparation
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-15 00:43:05 +03:00
Trial97
cf4c1605eb
Fixed qt5 build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-15 00:37:32 +03:00
Trial97
e0b901169a
Added new migration for special characters
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-15 00:27:20 +03:00
seth
3f1548ae0e
Merge pull request #1099 from Trial97/logdir
store logs in seperate directory
2023-06-14 15:38:47 -04:00
TheKodeToad
3526d00a23
Merge branch 'develop' into feat/dont-hide-settings
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-14 20:05:02 +01:00
clickdevin
d4f2059b78 Fix bugs when updating curseforge modpacks
Signed-off-by: clickdevin <git@clickdevin.me>
2023-06-14 10:42:37 -04:00
DioEgizio
a4502f44c2
Merge pull request #1145 from Trial97/net_job_crash 2023-06-14 12:46:00 +02:00
Trial97
b77fb05908
Added back the INIFile read function
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-13 21:07:05 +03:00
DioEgizio
69bfb55397
Merge pull request #1166 from TheKodeToad/mrpack-export-oops 2023-06-13 18:00:44 +02:00
Tayou
b174f82261
Merge pull request #1162 from leo78913/i-hate-naming-branches 2023-06-12 21:41:17 +02:00
TheKodeToad
f4a814b5e6
Remove unnecessary code
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-12 15:46:15 +01:00
TheKodeToad
94ddc8bbf7
Could this work?
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-12 14:14:50 +01:00
leo78913
d6c7b4e813 add icons to export menu
Signed-off-by: leo78913 <leo3758@riseup.net>
2023-06-11 21:50:29 -03:00
Tayou
5aa1c340dc
rainbow konami & toggle
Signed-off-by: Tayou <tayou@gmx.net>
2023-06-11 01:58:37 +02:00
Trial97
ae9e8dbafd
Removed const specification
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-10 22:04:08 +03:00
TheKodeToad
b7d82354cb [ci skip] License headers!! (yay)
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-10 14:43:58 +01:00
Trial97
b3d743635c
Updated the messages
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-09 21:29:12 +03:00
Trial97
f2932c6d03
Fixed some crashes
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-09 21:23:41 +03:00
Trial97
f96b135ef7
Higlight installed mods
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-08 20:26:09 +03:00
PandaNinjas
95f6860005
Apply suggestions from code review
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-06-08 10:12:27 -04:00
PandaNinjas
e6872aba75
Readd deleted line
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-06-07 22:15:44 -04:00
PandaNinjas
11cbeb8f96
Fix shadowing and add copyright header
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-06-07 22:13:57 -04:00
PandaNinjas
886b372ade
Fix accidentally renamed variable
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-06-07 20:03:58 -04:00
PandaNinjas
534328f16d
Remove unnecessary switch statement
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>

DCO Remediation Commit for PandaNinjas <admin@malwarefight.wip.la>

I, PandaNinjas <admin@malwarefight.wip.la>, hereby add my Signed-off-by to this commit: 318d11481d

Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-06-07 19:46:36 -04:00
PandaNinjas
318d11481d
Resolve other switch fallthrough issues 2023-06-07 19:37:54 -04:00
PandaNinjas
5d425ecc02
Fix the AccountList code
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-06-07 18:14:05 -04:00
PandaNinjas
c225ecbb55
Add sensible defaults in AccountList.cpp
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-06-07 18:01:39 -04:00
TheKodeToad
0b4807dc1f Questionable fix two
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-07 22:55:37 +01:00
Trial97
d33de2e427
Made cat scalable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-08 00:54:32 +03:00
TheKodeToad
1191c33c2b Remove flawed implementation
This seems to add the latest icon (bug) as a fallback if not provided...
but it mainly seems to cause problems... 🤷

I swear I did `git add .`.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-07 22:45:21 +01:00
TheKodeToad
52054469cd Fix *bug* lol
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-07 22:39:23 +01:00
Trial97
bbd9e4de9b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt 2023-06-07 20:18:56 +03:00
Trial97
8abe6b6732
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page 2023-06-07 20:18:36 +03:00
Tayou
9b9d439fce
Merge pull request #1111 from Trial97/requires 2023-06-07 18:57:46 +02:00
Sefa Eyeoglu
62d1bc87ae
Merge pull request #1117 from leo78913/update-pack-formats 2023-06-07 17:49:52 +02:00
Tayou
51ed39804f
Merge pull request #1125 from Ryex/fix/link-crash-1118 2023-06-07 16:14:53 +02:00
Rachel Powers
d12110b47b
fix #1118 : use filePath not path on QFileInfo
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-07 06:26:58 -07:00
Sefa Eyeoglu
accf0cd40e
Merge pull request #1115 from leo78913/fix-resource-downloader-crash 2023-06-07 08:47:19 +02:00
Trial97
e936bc4c60
Added custom text for multiple selection
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-07 01:38:10 +03:00
Trial97
f724059b88
Added visit mod's page
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-07 01:23:53 +03:00
Trial97
1e702ee40f
Added dynamic page extra info
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-07 00:16:23 +03:00
leo78913
a9302468e7 update resource and data pack pack_format_versions
Signed-off-by: leo78913 <leo3758@riseup.net>
2023-06-06 16:10:15 -03:00
Tayou
3b9d822d72
Merge pull request #1073 from leo78913/accounts-menus-fixes 2023-06-06 20:34:41 +02:00
leo78913
a807b231a7 fix: fix crash when selecting resource/texture/shader packs
Signed-off-by: leo78913 <leo3758@riseup.net>
2023-06-06 15:17:13 -03:00
TheKodeToad
a2d0d5a71d Allow arrow key movement, fix auto-focus
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-06 18:26:26 +01:00
leo78913
d59a06344a fix main toolbar accounts toolbutton name
previously it was not using the selected account name when opening the launcher

and i also added an action group to the menu items so it uses radio buttons instead of checkboxes :p

Signed-off-by: leo78913 <leo3758@riseup.net>
2023-06-06 14:21:41 -03:00
Tayou
e884341795
save meta custom url as string, not QUrl
Signed-off-by: Tayou <tayou@gmx.net>
2023-06-06 18:15:26 +02:00
TheKodeToad
c343036d3b Simplify
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-06 12:24:53 +01:00
Trial97
1043d29dd5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into requires 2023-06-06 10:34:36 +03:00
Trial97
6505a62801
Renamed requires fields
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-06 10:34:05 +03:00
TheKodeToad
7c5047b2ac cAsE iNsEnSiTiVe
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-05 23:12:47 +01:00
TheKodeToad
961285d6ab Add a search bar to version lists
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-05 22:47:42 +01:00
DioEgizio
e1b37f3cd3
Merge pull request #1108 from Ryex/fix/memory-leak-translation 2023-06-05 20:34:56 +02:00
DioEgizio
0c24827a52
Merge pull request #1103 from Ryex/fix/1.120-allowed_symlinks.txt 2023-06-05 20:32:30 +02:00
TheKodeToad
37b4f606c8 Validate input lengths on mrpack export
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-05 17:54:24 +01:00
Rachel Powers
5824047ffa fix(memory leak): cyclic refrence in translations model dl task
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-05 01:12:16 -07:00
Rachel Powers
3dccc38f42
Merge pull request #904 from TheKodeToad/mrpack-export
mrpack export
2023-06-04 19:01:50 -07:00
Rachel Powers
f613b03efd
Typo fix
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-03 08:28:49 -07:00
TheKodeToad
3c87e5d31e Make mcInstance mutable
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-03 13:48:15 +01:00
TheKodeToad
e26827b849 Optimised icons
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-03 13:39:42 +01:00
Rachel Powers
8eb10e991f fix: use isSymLink (i've made this mistake before but I've made it again)
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-02 16:14:38 -07:00
Rachel Powers
f6f32914de fix: add origonal instance path to allowed_symlinks.txt when copying via symlinks
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-02 16:04:27 -07:00
Trial97
9ca74cd009
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-03 00:48:13 +03:00
Trial97
d50bd096a4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into logdir 2023-06-03 00:44:53 +03:00
Alexandru Ionut Tripon
1840505a0f
Fix crash when selecting same mod from different providers (#1029) 2023-06-02 18:04:06 -03:00
Sefa Eyeoglu
0ece0b5b27
Merge pull request #1086 from TayouVR/fix-qt6_5-brown-system-theme 2023-06-02 12:18:37 +02:00
Trial97
17691ab515
Made use of moveFile function
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-02 01:22:25 +03:00
Trial97
3a6657596b
Added migration for old logs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-01 23:48:48 +03:00
Trial97
6c082403c4
Fixed comments
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-05-31 20:23:23 +03:00
Trial97
29c3dc40ef
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into logdir 2023-05-31 20:12:12 +03:00
Rachel Powers
5fe9e30f39 fix: use instance settings, make image column user resizeable, fix memory leak
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-28 14:53:15 -07:00
Rachel Powers
4eb9083ddc refactor: column names as class property, use string names in setting
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-28 13:00:08 -07:00
Rachel Powers
b28f682ad9 Merge branch 'develop' into feature/images-for-resource-page 2023-05-28 12:01:49 -07:00
Trial97
51c39ec681
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop 2023-05-28 19:16:14 +03:00
Trial97
10436ed70c
Fixed code quality
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-05-28 19:15:41 +03:00
Trial97
775236a1b3
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-05-28 18:27:54 +03:00
Trial97
b9503ff15f
Added Q_DECLARE_METATYPE(ModPlatform::IndexedPack::Ptr)
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-05-28 18:27:02 +03:00
Trial97
b4dff181f7
Fixed Ptr logic
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-05-28 18:22:55 +03:00
Trial97
737fc1a2a4
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-05-28 18:01:39 +03:00
Trial97
bdff8591aa
Removed extra loop
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-05-28 17:54:46 +03:00
Trial97
27c3775f99
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-05-28 17:44:23 +03:00
Trial97
bf0a577fb9
Fixed repaint issue
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-05-28 16:57:35 +03:00
Rachel Powers
7af116fb00 refactor: function scope statics
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-28 05:06:28 -07:00
Rachel Powers
0357921284 cleanup: move qstyle getInstance decl inline
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-28 04:37:09 -07:00
TheKodeToad
86974b046e
Clarify comment
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-05-28 11:48:09 +01:00
Rachel Powers
a04a6f1e0d fix(memory leak): don't give shared pointers out to foldermodels (causes cyclic refrence)
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-28 02:15:39 -07:00
Rachel Powers
37420405c7 fix(memory leak): refactor NoBigComboStyle -> singleton
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-27 23:22:40 -07:00
Rachel Powers
c81cb59b4b fix(memory leak): don't capture job and create cyclic refrence
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-26 21:21:10 -07:00
Rachel Powers
ff03dd22fe fix(memory leak): don't override default deconstructor + reset shared_ptr + ensure modal get's cleaned up
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-26 21:10:49 -07:00
Rachel Powers
aae892dfd1 fix(memory leak): IndexedPack too large to live inside a qlist without pointers ()
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-26 19:21:07 -07:00
Rachel Powers
e61d8e4dc8 fix: katabasis and QStyle leaks
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-25 16:16:58 -07:00
Rachel Powers
086a7e19f0 feat: Column on left, hideable
- columns are hideable (saves to settings)
- image column moved to left
- datamodals can provide resize modes

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-24 20:15:34 -07:00
Tayou
3c937532f2
fix System theme colors on windows
Signed-off-by: Tayou <tayou@gmx.net>
2023-05-24 15:18:08 +02:00
TheKodeToad
863027cbe8 Enable size grip
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-05-22 11:56:54 +01:00
Rachel Powers
6b8fe283f0 fix: memory leak, set parent so it's in tree to get cleaned up.
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-21 01:49:13 -07:00
Rachel Powers
7983977156 feat: Qt 5.15 adds transfer timeouts. at least use it for downloads
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-21 01:48:34 -07:00
Rachel Powers
21cb459899 fix: memory leak NetJob wans't getting cleaned up. ensure lambda capture of job doens;t increase refcount or it will be cyclic
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-21 01:47:54 -07:00
Rachel Powers
1b3ff96ffd fix: memory leak with NetJob and responce not getting cleaned up
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-21 01:46:28 -07:00
leo78913
4f0ec908ec feat: add a close button to the main toolbar when running on gamescope
Signed-off-by: leo78913 <leo3758@riseup.net>
2023-05-17 00:57:28 -03:00
Kode
3be18b58bb
Better variable name :p
Signed-off-by: Kode <TheKodeToad@proton.me>
2023-05-15 19:15:56 +01:00
TheKodeToad
22aaf56855 De-hardcode .index
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-05-15 18:48:49 +01:00
leo78913
7537ea1ef5 make instance settings account selector a comboBox
Signed-off-by: leo78913 <leo3758@riseup.net>
2023-05-14 16:33:41 -03:00
Trial97
94cd831e8d
Made sure the metadata is valid when checking mod deps
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-05-14 22:13:53 +03:00
Trial97
ffcc58cb3e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-14 14:20:24 +03:00
Trial97
8c7fd3327e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert 2023-05-14 14:20:04 +03:00
Kode
f60562c5a2
Merge branch 'develop' into mrpack-export
Signed-off-by: Kode <TheKodeToad@proton.me>
2023-05-13 19:07:03 +01:00
TheKodeToad
18cfe219fe Hopefully This Works™
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-05-13 18:58:05 +01:00
TheKodeToad
129e959a3b Move setAbortable(true)
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-05-13 18:28:51 +01:00
TheKodeToad
e1b6020b76 Make some changes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-05-13 18:24:01 +01:00
Redson
79ce7eb1fc
fix: shouldDisplay() is now redundant.
Signed-off-by: Redson <redson@riseup.net>
2023-05-13 09:00:10 -03:00
Kode
5b8d025440
ty!
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Kode <TheKodeToad@proton.me>
2023-05-12 14:43:55 +01:00
Rachel Powers
6b6d6a01dc
Merge branch 'develop' into fix/network_and_signals
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-12 01:13:17 -07:00
Rachel Powers
b16829b0f9
Gib -> GiB
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-12 00:21:37 -07:00
Rachel Powers
f27716656c fix: remove qt < 5.6 support process error signal
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-11 16:32:00 -07:00
Redson
37a6ef95f0
feat: Don't hide the settings tab when an instance is running
Signed-off-by: Redson <redson@riseup.net>
2023-05-10 08:25:13 -03:00
Redson
475761b295
fix: Prism sets the data dir to the working directory.
Signed-off-by: Redson <redson@riseup.net>
2023-05-09 06:36:21 -03:00
Redson
0b251fa754
feat: Add the launcher root folder to the Folders menu
Signed-off-by: Redson <redson@riseup.net>
2023-05-08 19:57:30 -03:00
Rachel Powers
30cf73a22f typo fix
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-07 13:23:59 -07:00
Rachel Powers
884ac73078 Merge remote-tracking branch 'upstream/develop' into better-tasks
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-07 13:21:21 -07:00