mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-06 13:34:01 -06:00
![]() Conflicts: plugins/Marketplace/resources/qml/Marketplace.qml -> Whole layout changed, while the onboarding banner got added. I re-added the onboarding banner item and the new search link at locations where I thought it was appropriate. plugins/Marketplace/resources/qml/Packages.qml -> A small conflict where new properties got added while I moved the width property up a bit for consistency. Easy enough to fix. |
||
---|---|---|
.. | ||
resources | ||
__init__.py | ||
LocalPackageList.py | ||
Marketplace.py | ||
PackageList.py | ||
PackageModel.py | ||
plugin.json | ||
RemotePackageList.py |