CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,355 Commits 10 Branches 30 Tags 34 MiB
968366c2ae
Commit Graph

5355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sefa Eyeoglu
29926a59bb
Merge pull request #482 from DioEgizio/fix-cache-flatpak 2022-11-19 18:10:03 +01:00
Ryan Cao
d92ae530d7
fix: stray include 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-20 00:34:44 +08:00
Ryan Cao
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
jopejoe1
d1db7a0e23
Fix New Zealand English display 
Signed-off-by: jopejoe1 <34899572+jopejoe1@users.noreply.github.com>
 2022-11-19 16:28:27 +00:00
DioEgizio
c27ebde575 fix(actions): fix cache on flatpak 
currently there's a [bug](https://github.com/flatpak/flatpak-github-actions/issues/80) on the stable version of the flatpak action which causes the cache key to be wrong. this commit work arounds it

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-11-19 17:14:19 +01:00
Ryan Cao
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
Ryan Cao
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
Ryan Cao
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
Ryan Cao
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
Ryan Cao
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
Ryan Cao
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
TheKodeToad
70fa92f22c Remove dirty printStackTrace hacks 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-19 13:59:22 +00:00
flow
3482076a20
Merge pull request #476 from Scrumplex/matrix 2022-11-19 05:07:33 -08:00
Sefa Eyeoglu
f7239f7f8a
chore: update community links 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-19 13:34:02 +01:00
flow
20ba787c00
Merge pull request #474 from Scrumplex/translations-maybe2 2022-11-19 03:41:54 -08:00
TheKodeToad
669eef92eb Make requested changes and utilise AssertionError 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-19 08:54:17 +00:00
Sefa Eyeoglu
c6d9edb78f
chore: improve display names of more languages 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-18 22:21:55 +01:00
Sefa Eyeoglu
347ae0a9ad
Merge pull request #456 from DioEgizio/flatpak-build 
closes https://github.com/PrismLauncher/PrismLauncher/issues/62
 2022-11-18 21:37:14 +01:00
DioEgizio
dbd01d35e6
Merge pull request #455 from leo78913/menubar-stuff 2022-11-18 17:20:50 +01:00
flow
b24c09665f
Merge pull request #439 from Ryex/better-blocked-mods 2022-11-17 11:29:28 -08:00
Sefa Eyeoglu
fa96ebd382
Merge pull request #471 from IDeletedSystem64/develop 2022-11-17 20:28:42 +01:00
Rachel Powers
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
Sophie Marie
90376749f0
Fix AUR qt5-git and git having the wrong AUR links 
Signed-off-by: Sophie Marie <twilightsparkle@duck.com>
 2022-11-17 12:42:34 -06:00
flow
5cf2a8b5fc
Merge pull request #454 from RedsonBr140/menu-themes 2022-11-17 09:47:55 -08:00
Redson
f72ac94c11
fix: Fix usage below 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-17 06:39:05 -03:00
RedsonBr140
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
Sefa Eyeoglu
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
Sefa Eyeoglu
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
Sefa Eyeoglu
2de150bfc8
Merge pull request #431 from FayneAldan/version 2022-11-16 18:20:32 +01:00
Sefa Eyeoglu
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
Sefa Eyeoglu
8aae652be1
fix: remove unnecessary condition 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-16 18:10:54 +01:00
RedsonBr140
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
txtsd
debc1659e1
Merge pull request #464 from DioEgizio/qt-6.4.1 2022-11-16 15:23:52 +05:30
flow
23e411c42b
Merge pull request #459 from Scrumplex/bump-tomlplusplus 2022-11-16 01:34:15 -08:00
DioEgizio
88feebe499 chore: use qt 6.4.1 on Windows-MSVC 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-11-16 09:55:46 +01:00
Fayne Aldan
e8b871ac72
Merge branch 'PrismLauncher:develop' into version 2022-11-15 18:34:24 -07:00
Fayne Aldan
9f30c6d94b Add commit hash to --version 
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>
 2022-11-15 18:33:51 -07:00
Sefa Eyeoglu
c1763cc4b0
fix: disable FLOAT16 in toml++ 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-15 21:23:20 +01:00
Sefa Eyeoglu
ee096edfff
chore: bump tomlplusplus 
Should fix issues with builds on aarch64

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-15 20:58:07 +01:00
DioEgizio
464b9ebc95 feat: add flatpak builds to the ci for testing 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-11-15 17:45:12 +01:00
leo78913
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
Redson
6fe626ab9a
feat: Make the changes persistent. 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-15 06:09:13 -03:00
Redson
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
Redson
aa3ea79f94
fix: Check the current theme box on startup. 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-15 05:38:31 -03:00
Redson
ef53455b66
fix: Build on QT6 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-15 05:19:46 -03:00
ADudeCalledLeo
ba46ff6692
Merge remote-tracking branch 'upstream/develop' into feature/instance-shortcuts 2022-11-15 10:05:04 +02:00
leo78913
0e916244f0
feat: Add themes and their logic. 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-14 21:10:48 -03:00
RedsonBr140
1e4ee02cbc
Merge branch 'PrismLauncher:develop' into menu-themes 2022-11-14 21:09:37 -03:00
flow
cedc7754d9
Merge pull request #428 from DioEgizio/fixes-to-CI 2022-11-14 14:16:01 -08:00
flow
fece9e207b
Merge pull request #448 from TheLastRar/fixup-warnings 2022-11-14 14:15:46 -08:00