Ghostkeeper b94bcdfa91 Remove duplicate entry ... This happens because the last bits are obtained separately from plug-in JSON files that are manually tacked on the end by a script. The script doesn't check for duplicates. Contributes to issue CURA-4341.		2017-09-19 13:36:56 +02:00
..
definitions	Merge pull request #2441 from pieterbos/master	2017-09-18 14:51:42 +02:00
extruders	Cartesio additional extruder position updates	2017-07-12 15:30:12 +02:00
i18n	Remove duplicate entry	2017-09-19 13:36:56 +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	Add some margin for the helper boxes, not perfect yet	2017-09-19 11:36:05 +02:00
quality	CURA-4318 fix settings weights for abax printers	2017-09-14 13:56:54 +02:00
shaders	Remove z-fighting kludge	2017-09-12 15:06:06 +02:00
themes	Revert "CURA-4321 make sidebar a tad smaller"	2017-09-15 16:51:38 +02:00
variants	Merged branch - CURA-4270	2017-09-13 13:25:00 +02:00