Ghostkeeper bdd4e359a7

Merge branch 'master' into CURA-8466_version_upgrade_50 ...

Conflicts:
	resources/definitions/fdmprinter.def.json -> Removed a setting while on master it was made hidden. Conflicting CURA-8466 with CURA-9069.

2022-03-29 15:46:03 +02:00

..

bundled_packages

Merge branch 'marketplace_redesign' of github.com:Ultimaker/Cura into CURA-8588_replace_toolbox_with_marketplace

2022-01-03 11:32:06 +01:00

definitions

Merge branch 'master' into CURA-8466_version_upgrade_50

2022-03-29 15:46:03 +02:00

extruders

Merge pull request #10978 from dagoma3d/dagoma-pro430

2022-02-09 15:13:55 +01:00

i18n

Update cura.po

2022-02-01 16:29:24 +01:00

images

removed wrong enterprise image

2022-03-25 10:44:50 +01:00

intent

Increment setting_version to 20

2022-03-29 15:03:48 +02:00

meshes

Merge branch 'master' of https://github.com/baldaaaa/Cura

2022-02-09 15:16:15 +01:00

qml

Remove Extruders property from global stack

2022-03-24 14:26:03 +01:00

quality

Remove filter_out_tiny_gaps from prepackaged profiles too

2022-03-29 15:08:46 +02:00

setting_visibility

Remove filter_out_tiny_gaps from prepackaged profiles too

2022-03-29 15:08:46 +02:00

shaders

…

texts

Update change_log.txt

2022-01-28 11:50:39 +01:00

themes

Merge branch 'master' into CURA-8979_Materials_Preference_Page

2022-03-21 13:39:16 +01:00

variants

Increment setting_version to 20

2022-03-29 15:03:48 +02:00

public_key.pem

…

README_resources.txt

Fix various typos

2021-09-07 11:33:54 -04:00