j.delarago b7ad18d149 Merge branch 'master' into PP-54_decrease-resolution ...

# Conflicts:
#	resources/definitions/ultimaker.def.json
#	resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg
#	resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg
#	resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg
#	resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg

2022-04-07 11:14:30 +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 PP-54_decrease-resolution

2022-04-07 11:14:30 +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

Merge branch 'master' into PP-54_decrease-resolution

2022-04-07 11:14:30 +02:00

setting_visibility

Removed the rather hacky implementation of the shrinkage factor averaging. Issues with dual extrusion were the second extruder is not used should solved in a different way.

2022-04-06 13:28:55 +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