Lipu Fei f7fb04d4ae Fix merge conflicts with 4.0

2019-01-03 15:25:40 +01:00

..

bundled_packages

Update Cura Backups sdk_version to 6 in bundled json

2019-01-03 11:26:14 +01:00

definitions

Cura used wrong firmware version for UMO+. The firmware was from UMO.

2018-12-17 16:46:02 +01:00

extruders

Move material diameter and machine nozzle size to the extruder

2018-11-27 13:12:47 +01:00

i18n

Add translation for missing line in Korean

2018-11-08 09:48:52 +01:00

images

updated moai plate image

2018-08-28 08:01:51 +02:00

meshes

Merge pull request #4666 from pinchies/add-jg-a5

2018-11-26 15:43:41 +01:00

qml

Fix merge conflicts with 4.0

2019-01-03 15:25:40 +01:00

quality

Merge pull request #4782 from Ultimaker/M&P-Setting-Optimization

2018-12-11 13:24:43 +01: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

Fix merge conflicts with 4.0

2019-01-03 15:25:40 +01:00

variants

CC06 profile fix

2018-12-04 08:25:05 +01:00