j.delarago e2fe50baf1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup ...

# Conflicts:
#	resources/qml/Widgets/Menu.qml
#	resources/qml/Widgets/MenuItem.qml
#	resources/themes/cura-dark/theme.json
#	resources/themes/cura-light/theme.json

2022-02-28 08:51:42 +01: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 'PP-96_update-(un)retract-speeds' of github.com:Ultimaker/Cura

2022-02-23 10:30:00 +01: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

Add new icon styles

2022-02-09 16:55:28 +01:00

intent

remove duplicate info

2021-12-23 14:58:17 +01:00

meshes

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

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

qml

Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup

2022-02-28 08:51:42 +01:00

quality

material specific exceptions on the defaults

2022-02-22 14:24:47 +01:00

setting_visibility

Add raft interface/middle layers to expert profile.

2022-02-08 12:01:20 +01:00

shaders

…

texts

Update change_log.txt

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

themes

Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup

2022-02-28 08:51:42 +01:00

variants

PVA can handle high unretract speeds

2022-02-22 14:22:49 +01:00

public_key.pem

…

README_resources.txt

Fix various typos

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