fieldOfView 1924946b59 Merge branch 'master' into feature_mesh_types ... # Conflicts: # plugins/SolidView/SolidView.py		2017-11-18 11:28:15 +01:00
..
definitions	Merge pull request #2685 from Ultimaker/container_stack_improvements	2017-11-17 13:09:54 +01:00
extruders	Merge pull request #2584 from Builder3D/master	2017-10-27 10:25:11 +02:00
i18n	Fix technical mistakes of Japanese translation	2017-11-17 16:49:56 +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 branch 'master' into container_stack_improvements	2017-11-06 09:49:44 +01:00
quality	CURA-4556 Add profiles for AA0.25 and BAM material	2017-11-13 11:06:27 +01:00
shaders	Use material color for cutting_mesh and infill_mesh	2017-11-10 12:24:32 +01:00
themes	Merge branch 'master' into feature_mesh_types	2017-11-18 11:28:15 +01:00
variants	CURA-4556 Add profiles for AA0.25 and BAM material	2017-11-13 11:06:27 +01:00