Arjen Hiemstra c5c67ee8be Merge branch 'master' of github.com:ultimaker/Cura into transparent_limit_to_extruder ... * 'master' of github.com:ultimaker/Cura: (94 commits) Re-enable Japanese from language selection menu Add Japanese translations for setting descriptions Update PVA profiles Changed profile names Simplified some code Changed final spot where we still used findContainer when looking for container with specific type Directly use property instead of searching Added a type hinting to QualityManager JSON description fix: warn users when not to use spiralize (CURA-3636) Add setting_version every time we create InstanceContainer Increase warning value for gradual infill steps Convert all metadata fields to string cleanup: prime => prime blob and lil doc (CURA-3634) fix: don't make disallowed area if blob is disabled (CURA-3634) Be robust against older specification version numbers Read setting_version from version attribute on root Added bunch of typing to extruder manager Fix resolve strategy "new" for user instance container Added missing typehinting Row element was not used ...		2017-05-16 10:57:06 +02:00
..
definitions	Merge branch 'master' of github.com:ultimaker/Cura into transparent_limit_to_extruder	2017-05-16 10:57:06 +02:00
extruders	Merge branch 'maukcc-master'	2017-05-08 16:45:02 +02:00
i18n	Add Japanese translations for setting descriptions	2017-05-16 09:38:10 +02:00
images	T466: Revert the previous commit since it messed up the file rights.	2016-12-23 15:53:15 -05:00
meshes	Convert ASCII STL files to binary STL	2017-05-10 11:55:24 +02:00
qml	Merge pull request #1757 from fieldOfView/fix_material_uniqueness	2017-05-16 09:44:10 +02:00
quality	Update PVA profiles	2017-05-15 17:11:39 +02:00
shaders	WIP OpenGL 4.1 core profile. CURA-3273	2017-01-31 17:05:00 +01:00
themes/cura	A gradual infill icon untill we have a better one	2017-05-09 14:53:26 +02:00
variants	Update PVA profiles	2017-05-15 17:11:39 +02:00