Ghostkeeper ee81326d6a Fix remaining merge conflicts ... - When both branches added Controls1 as OldControls, it's not marked as a merge conflict. But the merge removed the need for OldControls, so the import can be removed. - There was one instance where I had removed the OldControls for a checkbox but there it should remain since the checkboxes are updated in a separate ticket. Contributes to issue CURA-8684.		2022-01-31 17:08:56 +01:00
..
bundled_packages	Update SDK version to 7.9.0	2021-12-16 17:15:59 +01:00
definitions	Merge pull request #11251 from Ultimaker/CURA-8868_raft_interface_extruder	2022-01-14 09:11:07 +01:00
extruders	Merge branch 'master' of https://github.com/mixware011/Cura into mixware011-master	2021-12-17 15:27:02 +01:00
i18n	Shorten translation for 'sync materials with printers'	2022-01-10 17:11:31 +01:00
images	Remove what's new images again	2022-01-19 16:34:14 +01:00
intent	Remove Cura 4 settings	2021-12-15 10:09:42 +01:00
meshes	Merge branch 'master' of https://github.com/mixware011/Cura into mixware011-master	2021-12-17 15:27:02 +01:00
qml	Fix remaining merge conflicts	2022-01-31 17:08:56 +01:00
quality	Merge branch '4.13'	2021-12-31 15:01:30 +01:00
setting_visibility	Add raft top extruder to expert settings	2022-01-12 14:12:06 +01:00
shaders	Add missing type to lowestPrintableHeight variable	2021-05-12 13:26:10 +02:00
texts	More consistent header for change log	2022-01-11 13:24:29 +01:00
themes	Update Buttons to QtControls 2.0 in the simulation view expend menu bar	2022-01-21 14:07:41 +01:00
variants	Add 0.4mm nozzle for CR100	2021-12-21 13:59:04 +01: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