0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,460 Commits 1 Branch 0 Tags
ee3e65d759da95aa524aad76c2a190792f716560
Commit Graph

5460 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sefa Eyeoglu
46a1c855a9 Merge pull request #528 from Scrumplex/fix-resourcepages-runningstate 2022-11-29 19:50:00 +01:00
TheKodeToad
31dc82b1a6 Make requested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-29 09:43:08 +00:00
flow
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
Sefa Eyeoglu
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
Santiago Cézar
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
Santiago Cézar
3cbf8d4993 resolving reviews 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-27 16:24:45 -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
6c09efd630 fix: use qt 6.4.0 on windows msvc for now 
qt 6.4.1 has a very bad scaling regression

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-11-27 15:24:15 +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
Santiago Cézar
a8943ce1ee remove unused ftb icon 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 15:15:08 -03:00
Santiago Cézar
71d35dc70b meat is now round 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 15:15:08 -03:00
Santiago Cézar
9daf2a2996 resize to 24x24 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 15:15:07 -03:00
Santiago Cézar
f5d6aea942 forgot ftb 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 15:15:07 -03:00
Santiago Cézar
5850447fd0 merge with upstream 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 15:14:52 -03:00
Santiago Cézar
e12a7a4415 gradients! 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 14:22:49 -03:00
Santiago Cézar
81d84b8d02 initial icons 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 14:22:49 -03: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
flow
4a1d082614 reafctor(WideBar): connect to signal instead of overriding menu method 
This makes stuff more standard and closer to what we do in other places
in the codebase.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-25 09:33:05 -03: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
TheKodeToad
96e8217b00 Button to add agent 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-23 09:46:55 +00: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
20c281d6f8 fix: reset wide bar settings when the list of actions changes 
This prevents changes to the actions to cause non-intuitive issues in
the Wide bar, hiding items that previously weren't hidden.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-22 14:30:54 -03:00
Trisave
66f9fed2f2 Remove blue-ish tint from flat white icons 
Signed-off-by: Trisave <42098407+Protrikk@users.noreply.github.com>
 2022-11-22 18:30:21 +01: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
Sefa Eyeoglu
884fe0d574 feat: validate maximum memory allocation in wizard 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-20 18:16:19 +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
flow
2d69d63efe feat(InstancePages): save/load wide bar visibility settings 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-19 18:41:31 -03:00
flow
479843f56b feat(WideBar): allow loading/unloading visibility via a byte array 
I really wanted to use a QBitArray :c

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-19 18:41:31 -03:00
flow
6e1639551b feat(WideBar): allow hiding buttons with right-click 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-19 18:41:30 -03:00