Cherubim 0ebb2a35fe Merge branch '4.1' ... Conflicts: resources/i18n/es_ES/cura.po -> Correction being made on master while translations were being done for 4.1.		2019-05-28 11:07:20 +02:00
..
bundled_packages	Fix merge issue	2019-04-26 11:53:50 +02:00
definitions	Merge pull request #4599 from DesktopMetal/feature_nozzle_switch_extra_prime_distance	2019-05-21 09:18:11 +02:00
extruders	Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master	2019-05-13 15:11:32 +02:00
i18n	Merge branch '4.1'	2019-05-28 11:07:20 +02:00
images	add START and STE320 profiles	2019-04-25 15:42:59 +04:00
meshes	Add files via upload	2019-05-02 12:12:31 -04:00
qml	Merge branch '4.1'	2019-05-28 11:07:20 +02:00
quality	Remove override for outer wall line width	2019-05-20 13:56:57 +02:00
setting_visibility	Merge branch 'master' into feature_z_hop_extruder_switch	2019-04-22 10:45:57 +03:00
shaders	Move multiplication from Python to shaders. (Needs the same-named Uranium branch.)	2019-04-19 16:58:38 +02:00
texts	Some minor fixes to change log	2019-05-28 09:42:07 +02:00
themes	Merge remote-tracking branch 'origin/4.1'	2019-05-22 07:44:26 +02:00
variants	Merge pull request #5497 from TinkerGnome/Mark2_definition	2019-04-04 08:08:46 +02:00