Ghostkeeper 1d7792861d

Merge branch '3.0' ...

Conflict in ClusterControlItem.qml where there was a new element in Master that wasn't present in 3.0. That element wasn't referenced anywhere else so I just removed it.

2017-10-02 17:40:24 +02:00

..

definitions

Merge branch '3.0'

2017-10-02 17:40:24 +02:00

extruders

Update the active extruder index when the global container changes. This

2017-09-28 18:02:39 +02:00

i18n

Add translations for strings that were added after string freeze

2017-10-02 13:33:08 +02:00

images

Make the robot bigger

2017-09-14 14:56:45 +02:00

meshes

Merge pull request #2162 from FABtotum/master

2017-08-31 12:56:24 +02:00

qml

Merge branch '3.0'

2017-10-02 17:40:24 +02:00

quality

Added NOT SUPPORTED profile for UM2++ and quality slider validation if value:-1

2017-09-25 15:38:47 +02:00

shaders

Remove z-fighting kludge

2017-09-12 15:06:06 +02:00

themes

Update camera color

2017-10-02 14:41:06 +02:00

variants

Set raft air gap to 0.25mm for 0.25mm nozzles

2017-09-25 12:31:23 +02:00