Jaime van Kessel ef6f666c3e Remove duplicate alias definition ...

Yay. Merges.

2018-12-14 16:41:07 +01:00

..

bundled_packages

Merge remote-tracking branch 'origin/master' into ui_rework_4_0

2018-12-04 15:08:50 +01:00

definitions

Remove obsolete description detail about old Cura versions

2018-12-13 16:49:45 +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

…

meshes

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

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

qml

Remove duplicate alias definition

2018-12-14 16:41:07 +01:00

quality

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

2018-12-11 13:24:43 +01:00

setting_visibility

…

shaders

…

themes

Merge branch 'CURA-5876_fixes' into 4.0

2018-12-14 16:28:04 +01:00

variants

CC06 profile fix

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