Ian Paschal 87e1f98156

Merge pull request #3663 from Ultimaker/feature_material_marketplace ...

Feature material toolbox; all changes made

2018-05-02 12:23:13 +02:00

..

definitions

Merge pull request #3477 from smartavionics/mb-retract-on-long-combs

2018-05-01 15:34:54 +02:00

extruders

Merge remote-tracking branch 'Ultimaker/master' into Felix_Profile

2018-04-23 21:05:34 -07:00

i18n

Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3

2018-04-24 12:43:49 +02:00

images

Add Ultimaker S5 resources

2018-04-23 11:27:13 +02:00

meshes

Merge remote-tracking branch 'Ultimaker/master' into Felix_Profile

2018-04-23 21:05:34 -07:00

qml

Merge master into material marketplace

2018-05-01 11:56:34 +02:00

quality

CURA-5035 Review feedback

2018-05-02 12:01:29 +02:00

setting_visibility

Merge branch 'master' into feature_setting_visibility_profiles

2018-03-09 15:45:24 +01:00

shaders

GLES shader fixes

2018-03-29 21:07:51 +02:00

themes

CURA-5035 Remove un-used base_unit in theme

2018-04-26 13:24:15 +02:00

variants

CURA-5035 Review feedback

2018-05-02 12:01:29 +02:00