Jack Ha 72c24c2b5b Merge branch 'master' of github.com:Ultimaker/Cura

2018-01-10 11:15:23 +01:00

..

definitions

Merge branch 'master' of github.com:Ultimaker/Cura

2018-01-10 11:15:23 +01:00

extruders

Merge pull request #2814 from Ultimaker/feature_maximum_resolution

2017-11-20 18:09:11 +01:00

i18n

Corrections for Portuguese translation

2017-12-29 11:49:04 +01:00

images

Move robot to the left

2017-10-06 12:03:37 +02:00

meshes

Merge branch 'master' into malyan_m200

2018-01-07 22:54:56 -08:00

qml

Merge pull request #2874 from tylergibson/malyan_m200

2018-01-10 08:58:22 +01:00

quality

Merge branch 'master' into malyan_m200

2018-01-07 22:54:56 -08:00

shaders

Use material color for cutting_mesh and infill_mesh

2017-11-10 12:24:32 +01:00

themes

CURA-4525 solved merge conflicts

2018-01-03 13:52:55 +01:00

variants

Removing nozzle variants, adding material definitions

2018-01-07 22:39:54 -08:00