f3279a0697
Merge remote-tracking branch 'upstream/develop' into import-resource-pack-dialog-uwu
2022-11-27 20:05:21 +01:00
8cac61f0be
fix: check resource pack validity solely using pack format
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-27 18:41:52 +01:00
236c196e68
fix: improve code readability
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-27 18:38:56 +01: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
bae0a0530b
fix(RPImportDialog): allow changing item size to accomodate wrapped text
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-25 11:51:08 -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
f916ce8752
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import-resource-pack-dialog-uwu
2022-11-21 23:19:50 +08: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
7096f02b88
fix: text wrapping
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-21 18:15:03 +08:00
f55fc51e9b
fix: remove commented-out assertions
...
They may not hold true at all times, and that's fine.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-20 11:11:08 -03:00
df0f9259c0
refactor: move RP/TP validation to their respective utils
...
This makes it easier to validate individual resources, and allows the
logic to be used in other places in the future, if we need to.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-20 11:10:26 -03: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
d92ae530d7
fix: stray include
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-20 00:34:44 +08:00
e0e428ce38
fix: add support for CLI and drag and drop
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-20 00:28:35 +08: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
a99cd16422
fix: resource pack import dialog icons and add message
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-20 00:14:16 +08:00
1f6b8f9d2b
fix instance IDs and resource pack imports
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-19 23:59:30 +08:00
a33b804923
fix: add resource pack format for 1.19.3
...
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-19 23:47:47 +08:00
f527958cb3
fix: check if packFormat is valid for resourcepack parsing
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-19 23:42:56 +08:00
b1bdc6f745
fix resource packs and add support for texture packs
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-19 23:38:05 +08:00
8dacbafc8b
feat: initial support for smart resource pack parsing on file handler
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-19 23:14:57 +08: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
fece9e207b
Merge pull request #448 from TheLastRar/fixup-warnings
2022-11-14 14:15:46 -08:00
