Mark b52bf6decf resolve conflict

2018-02-09 13:01:56 +01:00

..

definitions

CURA-4923 corrected the material diameter of malyan_m200

2018-02-07 11:42:15 +01:00

extruders

Merge pull request #2814 from Ultimaker/feature_maximum_resolution

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

i18n

Fix brackets in Korean translation

2018-02-06 16:25:15 +01:00

images

Move robot to the left

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

meshes

Decimate Tevo Black Widow model

2018-01-16 09:28:29 +01:00

qml

resolve conflict

2018-02-09 13:01:56 +01:00

quality

Merge branch 'master' into malyan_m200

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

shaders

Render support meshes with a vertical stripe...

2018-01-05 18:33:05 +01:00

themes

resolve conflict

2018-02-09 13:01:56 +01:00

variants

Removing nozzle variants, adding material definitions

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