Cura/resources
Ghostkeeper d6143103d0
Merge branch 'marketplace_redesign' into CURA-8565_marketplace_plugin_details
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.
2021-11-30 16:16:20 +01:00
..
bundled_packages Merge branch 'master' into CURA-8510_version_upgrade 2021-09-23 17:01:00 +02:00
definitions Make my name more anonymous 2021-10-16 11:45:48 +02:00
extruders Merge branch 'master' of https://github.com/venkatkamesh/Cura into venkatkamesh-master 2021-10-15 16:07:59 +02:00
i18n Update fdmprinter.def.json.po 2021-10-18 18:37:56 +07:00
images Squashed commit of the following: 2021-10-01 16:55:26 +02:00
intent - Reverted the print profiles to changes agreed by the Print Profile CCB from 06-10-2021 14:00-15:00 2021-10-11 11:35:38 +02:00
meshes Merge branch 'master' of https://github.com/venkatkamesh/Cura into venkatkamesh-master 2021-10-15 16:07:59 +02:00
qml Make icons smaller for tertiary buttons 2021-11-30 14:56:09 +01:00
quality - Reverted the print profiles to changes agreed by the Print Profile CCB from 06-10-2021 14:00-15:00 2021-10-11 11:35:38 +02:00
setting_visibility Added lightning infill description and sub-settings level. 2021-10-12 09:17:58 +02:00
shaders Add missing type to lowestPrintableHeight variable 2021-05-12 13:26:10 +02:00
texts Fix typo in changelog 2021-09-22 13:00:45 +02:00
themes Merge branch 'marketplace_redesign' into CURA-8565_marketplace_plugin_details 2021-11-30 16:16:20 +01:00
variants Update setting_version to 19 2021-10-15 16:12:27 +02:00
public_key.pem Move the package signature pem file to the Resources folder 2020-03-19 15:14:21 +01:00
README_resources.txt Fix various typos 2021-09-07 11:33:54 -04:00