Ghostkeeper f0262abbb5 Combine two property overrides in one setting, for proper JSON ... Otherwise the maximum gets ignored because the JSON results in a dict where the keys are unique. So the second one happens to get skipped then. Contributes to issue CURA-8627.		2021-10-13 15:46:35 +02:00
..
bundled_packages	Merge branch 'master' into CURA-8510_version_upgrade	2021-09-23 17:01:00 +02:00
definitions	Combine two property overrides in one setting, for proper JSON	2021-10-13 15:46:35 +02:00
extruders	Move creaseee extruders and definitions to correct folder	2021-10-08 10:52:10 +02:00
i18n	Fix translations of log-in page and sync message	2021-09-07 14:26:43 +02: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	Adding 3DI D300 (#9863)	2021-10-05 16:38:50 +02:00
qml	Remove unneeded catalog	2021-10-08 18:17:18 +02: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	Use image instead of custom message type	2021-10-05 10:20:52 +02:00
variants	Bug fixes.	2021-10-12 12:54:26 +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