79b79b752c
fix(Inst.Import): Show error reason in fail dialog
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-01 15:32:26 -03:00
a116778402
fix(Inst.Import): don't search inside 'overrides/' for the manifest
...
It will never be there anyways, and saves a **bunch** of time when the
overrides folder is big and we traverse all the tree when searching for
the MMC 'instance.cfg' file.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-01 15:15:15 -03:00
9e1653ebb4
Merge pull request #436 from Scrumplex/feat-change-maxmem
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/426
2022-11-30 18:22:55 +01:00
42c00213ce
Merge pull request #238 from santiagocezar/new-icons
2022-11-29 14:30:29 -08:00
52d06ed814
chore: move instance_icons.svg
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-29 20:07:00 +01:00
4e27e132a0
fix: don't disable interaction on non-mod models when inst. is running
...
It is still useful for mods though, since we don't wnt to allow
disabling mods when the instance is running, as that wouldn't affect the
running instance, possibly causing confusion
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-28 12:02:38 -03:00
a5b0b4800a
fix: make resource buttons work when instance is running
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-27 23:10:32 +01:00
e6244c937a
Merge branch 'develop' into new-icons
...
Signed-off-by: Santiago Cézar <48573316+santiagocezar@users.noreply.github.com >
2022-11-27 16:28:42 -03:00
3cbf8d4993
resolving reviews
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-27 16:24:45 -03:00
c90f2c3ac6
fix: use monochrome icon for breeze
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-11-26 15:05:08 +01:00
a8943ce1ee
remove unused ftb icon
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 15:15:08 -03:00
71d35dc70b
meat is now round
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 15:15:08 -03:00
9daf2a2996
resize to 24x24
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 15:15:07 -03:00
f5d6aea942
forgot ftb
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 15:15:07 -03:00
5850447fd0
merge with upstream
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 15:14:52 -03:00
e12a7a4415
gradients!
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 14:22:49 -03:00
81d84b8d02
initial icons
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-25 14:22:49 -03:00
cbf4159c7e
fix: add missing shortcut icons
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-25 14:03:10 +01:00
fd8b4c5368
Merge pull request #227 from Leo40Git/feature/instance-shortcuts
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/210
2022-11-25 13:11:00 +01:00
5872c34315
Merge pull request #412 from leo78913/legacy-icons
...
add the missing icons to the legacy icon theme
2022-11-25 08:36:42 +01:00
4208c2c72a
fix: actually emit fileCopied
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-21 15:47:15 +01:00
5cc91965d0
Merge pull request #487 from TayouVR/breeze-icon-themes
2022-11-21 14:43:58 +01:00
c74f852364
Merge pull request #243 from Scrumplex/migration-dialog
...
Closes https://github.com/PrismLauncher/PrismLauncher/issues/46
Closes https://github.com/PrismLauncher/PrismLauncher/issues/204
2022-11-21 12:14:49 +01:00
884fe0d574
feat: validate maximum memory allocation in wizard
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-20 18:16:19 +01:00
bb7a321c6e
add breeze themes
...
Signed-off-by: Tayou <tayou@gmx.net >
2022-11-20 05:24:10 +01:00
30607c34a1
Merge pull request #291 from TheKodeToad/betterjavalauncher
2022-11-19 18:45:15 +01:00
d1db7a0e23
Fix New Zealand English display
...
Signed-off-by: jopejoe1 <34899572+jopejoe1@users.noreply.github.com >
2022-11-19 16:28:27 +00:00
c6d9edb78f
chore: improve display names of more languages
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-18 22:21:55 +01:00
dbd01d35e6
Merge pull request #455 from leo78913/menubar-stuff
2022-11-18 17:20:50 +01:00
b24c09665f
Merge pull request #439 from Ryex/better-blocked-mods
2022-11-17 11:29:28 -08:00
52d43f843b
feat(BlockModsDialog): remove redundant Ui info
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-17 11:46:14 -07:00
5cf2a8b5fc
Merge pull request #454 from RedsonBr140/menu-themes
2022-11-17 09:47:55 -08:00
f72ac94c11
fix: Fix usage below
...
Signed-off-by: Redson <redson@riseup.net >
2022-11-17 06:39:05 -03:00
bd3a693e70
chore: Change var name
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: RedsonBr140 <redson@riseup.net >
2022-11-17 06:20:53 -03:00
298871e207
Merge pull request #467 from Scrumplex/fix-meta-extensions-json
...
Fix serialization of components with custom metadata
2022-11-16 23:54:26 +01:00
ce958f4ffd
refactor: use isEmpty instead of size for lists
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-16 23:20:47 +01:00
40970a1a87
fix: serialize metadata extensions
...
Prism has introduced a few extensions to the meta component version
format, which were not exported as JSON in the launcher. This caused the
`Customize` button on the version page to not write these new properties
to the custom component file.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-16 18:11:18 +01:00
8aae652be1
fix: remove unnecessary condition
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-16 18:10:54 +01:00
37a117d2ef
chore: Var definition inside the for loop
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: RedsonBr140 <redson@riseup.net >
2022-11-16 12:24:28 -03:00
e8b871ac72
Merge branch 'PrismLauncher:develop' into version
2022-11-15 18:34:24 -07:00
9f30c6d94b
Add commit hash to --version
...
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com >
2022-11-15 18:33:51 -07:00
7439fd6bcb
fix: Fix some stuff in the menu bar
...
- Remove duplicated launch actions
- Enable the add instance action icon in menus
- Remove ugly separator at the end of the help menu if the updater is disabled
- Add icons to the help and news menu items
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-11-15 10:56:41 -03:00
6fe626ab9a
feat: Make the changes persistent.
...
Signed-off-by: Redson <redson@riseup.net >
2022-11-15 06:09:13 -03:00
a12f892841
fix: Check the box when the theme is changed via settings
...
Signed-off-by: Redson <redson@riseup.net >
2022-11-15 05:46:24 -03:00
aa3ea79f94
fix: Check the current theme box on startup.
...
Signed-off-by: Redson <redson@riseup.net >
2022-11-15 05:38:31 -03:00
ef53455b66
fix: Build on QT6
...
Signed-off-by: Redson <redson@riseup.net >
2022-11-15 05:19:46 -03:00
ba46ff6692
Merge remote-tracking branch 'upstream/develop' into feature/instance-shortcuts
2022-11-15 10:05:04 +02:00
0e916244f0
feat: Add themes and their logic.
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-11-14 21:10:48 -03:00
1e4ee02cbc
Merge branch 'PrismLauncher:develop' into menu-themes
2022-11-14 21:09:37 -03:00
cedc7754d9
Merge pull request #428 from DioEgizio/fixes-to-CI
2022-11-14 14:16:01 -08:00