Ghostkeeper b5d8c1af6f Merge branch 'master' into fieldOfView-feature_firmware_updater ... Conflicts: cura/PrinterOutput/PrinterOutputModel.py - Bunch of code that was moved. plugins/USBPrinting/USBPrinterOutputDevice.py - Collisions with code style fixes. plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml - Bunch of code that was moved.		2018-10-15 16:52:22 +02:00
..
bundled_packages	Move Firmware Updater into a plugin of its own	2018-10-03 20:55:51 +02:00
definitions	Merge branch 'master' into fieldOfView-feature_firmware_updater	2018-10-15 16:52:22 +02:00
extruders	Correct some printers to use 1.75mm filament	2018-10-15 13:55:47 +02:00
i18n	Add missing quote.	2018-10-03 16:57:26 +02:00
images	updated moai plate image	2018-08-28 08:01:51 +02:00
meshes	Add Creality Ender-3 machine definition.	2018-09-01 19:37:53 +09:00
qml	Update outputDevice when the global container changed	2018-10-12 14:56:27 +02:00
quality	Also rename dagoma_neva_magis profiles to dagoma_magis	2018-09-17 11:38:51 +02:00
setting_visibility	Update unit test for 'visibilit_settings' and removed unused settings from expert.cfv	2018-09-18 11:10:24 +02:00
shaders	Fix support blocker on older (legacy) opengl	2018-05-14 14:29:41 +02:00
themes	Improve inactive coloring	2018-09-10 14:35:05 +02:00
variants	Actually ensure that walls don't get slower than 1 mm/s	2018-09-13 16:22:36 +02:00