Ghostkeeper 74016f0fb3 Merge branch 'jbkim-3.3' into 3.3		2018-04-20 14:19:03 +02:00
..
definitions	Merge pull request #3584 from ohrn/zyyx	2018-04-19 09:38:19 +02:00
extruders	Fix punchtec extruder IDs	2018-02-22 15:17:15 +01:00
i18n	Undo some of the changes that we thought were wrong	2018-04-20 14:18:45 +02:00
images	Move robot to the left	2017-10-06 12:03:37 +02:00
meshes	Add ZYYX Agile printer.	2018-03-28 22:35:59 +02:00
qml	CURA-5250 Add color to the text so it also works fine with other themes.	2018-04-20 10:19:25 +02:00
quality	Merge pull request #3584 from ohrn/zyyx	2018-04-19 09:38:19 +02:00
setting_visibility	Merge branch 'master' into feature_setting_visibility_profiles	2018-03-09 15:45:24 +01:00
shaders	Fix rendering depth pass	2018-03-13 19:44:53 +01:00
themes	Merge branch 'feature_model_check'	2018-03-22 01:56:46 +01:00
variants	Merge branch 'M&P-Setting-Optimization' into 3.3	2018-04-17 13:56:11 +02:00