0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,282 Commits 1 Branch 0 Tags 29 MiB
3cc987a5b4
Commit Graph

5282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
flow
3cc987a5b4
fix: explicitly set scheme for local file in -I argument 
Otherwise isLocalFile() will return false for local files without the
file:// thingy.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-01 22:54:03 -03:00
Sefa Eyeoglu
f3279a0697
Merge remote-tracking branch 'upstream/develop' into import-resource-pack-dialog-uwu 2022-11-27 20:05:21 +01:00
Sefa Eyeoglu
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
Sefa Eyeoglu
236c196e68
fix: improve code readability 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-27 18:38:56 +01:00
DioEgizio
cc92e1b0b6
Merge pull request #521 from Scrumplex/missing-icons 2022-11-26 19:02:03 +01:00
DioEgizio
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
Sefa Eyeoglu
6bdd27a08e
Merge pull request #493 from Scrumplex/cachix 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/491
 2022-11-26 14:24:06 +01:00
Sefa Eyeoglu
80ff0b1418
Merge pull request #492 from Scrumplex/update-nix 2022-11-26 14:03:51 +01:00
flow
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
Sefa Eyeoglu
cbf4159c7e
fix: add missing shortcut icons 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-25 14:03:10 +01:00
Sefa Eyeoglu
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
Sefa Eyeoglu
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
flow
b60fe08d44
Merge pull request #514 from DioEgizio/force-bundled-libs-win 2022-11-23 15:11:45 -08:00
DioEgizio
6a51eda361 fix: force bundled libs on win msvc 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-11-23 19:53:55 +01:00
Sefa Eyeoglu
e6cb6cae11
Merge pull request #508 from TheLastRar/ForceBundledLibs 2022-11-23 09:49:24 +01:00
TheLastRar
980f03dd20 Fix: Launcher_FORCE_BUNDLED_LIBS Failing to find bundled zlib 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-22 19:23:09 +00:00
flow
68b7aa0a4d
Merge pull request #498 from Scrumplex/fix-copy-signal 2022-11-21 13:44:43 -08:00
Ryan Cao
f916ce8752
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import-resource-pack-dialog-uwu 2022-11-21 23:19:50 +08:00
Sefa Eyeoglu
4208c2c72a
fix: actually emit fileCopied 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-21 15:47:15 +01:00
DioEgizio
5cc91965d0
Merge pull request #487 from TayouVR/breeze-icon-themes 2022-11-21 14:43:58 +01:00
Sefa Eyeoglu
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
Sefa Eyeoglu
c1b3a3adb4
fix(actions): don't ignore nix files 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-21 11:43:46 +01:00
Ryan Cao
7096f02b88
fix: text wrapping 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-21 18:15:03 +08:00
Sefa Eyeoglu
70a11935a8
feat(actions): add Nix build 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-21 00:22:25 +01:00
Sefa Eyeoglu
f601135cc0
refactor(nix): synchronize changes from nixpkgs 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-20 23:49:11 +01:00
DioEgizio
ffcbf97dcc fix: add Breeze copyright notice to COPYING 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-11-20 17:48:44 +01:00
flow
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
flow
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
Tayou
bb7a321c6e
add breeze themes 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-20 05:24:10 +01:00
Sefa Eyeoglu
30607c34a1
Merge pull request #291 from TheKodeToad/betterjavalauncher 2022-11-19 18:45:15 +01:00
Sefa Eyeoglu
817947c928
Merge pull request #483 from jopejoe1/patch-1 2022-11-19 18:44:09 +01:00
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