Ghostkeeper ee0918f1d0

Merge branch '2.6'

2017-06-26 17:23:57 +02:00

..

definitions

Merge branch '2.6'

2017-06-26 17:23:57 +02:00

extruders

Updated helloBEEprusa printer profiles

2017-06-07 13:28:26 +01:00

i18n

Remove translation for Material category

2017-06-23 16:50:36 +02:00

images

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

meshes

Add DiscoEasy printer (dagoma.fr)

2017-06-26 01:02:52 +02:00

qml

Merge branch 'feature_tab_navigation' of https://github.com/fieldOfView/Cura

2017-06-26 14:39:12 +02:00

quality

Merge branch '2.6'

2017-06-26 17:23:57 +02:00

shaders

Revert "Removed unneeded shader duplication."

2017-06-16 11:48:11 +02:00

themes

Merge branch 'feature_tab_navigation' of https://github.com/fieldOfView/Cura

2017-06-26 14:39:12 +02:00

variants

Change to use machine_nozzle_id

2017-06-22 14:00:04 +02:00