Ghostkeeper 2974c4d7ab

Merge branch 'cura/Cura/master' of https://github.com/maukcc/Cura into maukcc-cura/Cura/master

2017-11-20 13:04:34 +01:00

..

definitions

Merge branch 'cura/Cura/master' of https://github.com/maukcc/Cura into maukcc-cura/Cura/master

2017-11-20 13:04:34 +01:00

extruders

Merge branch 'master' into cura/Cura/master

2017-11-14 11:59:35 +01:00

i18n

Fix technical mistakes of Japanese translation

2017-11-17 16:38:02 +01:00

images

Move robot to the left

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

meshes

New machine definition : Deltacomb 3D

2017-11-06 10:01:57 +01:00

qml

Merge pull request #2669 from fieldOfView/feature_jogging

2017-11-01 16:15:40 +01:00

quality

Merge branch 'master' into cura/Cura/master

2017-11-14 11:59:35 +01:00

shaders

Fix the OpenGL shader for older (legacy?) OpenGL. As the grid shader was no longer working.

2017-10-06 15:44:10 +02:00

themes

Change_Color_UI_elements_CURA-4548

2017-11-15 13:40:46 +01:00

variants

CURA-4556 Add profiles for AA0.25 and BAM material

2017-11-13 11:06:27 +01:00