Lipu Fei 3e37487632

Merge pull request #3626 from kaleidoscopeit/patch-1 ...

Update deltacomb.def.json

2018-04-30 10:19:37 +02:00

..

definitions

Merge pull request #3626 from kaleidoscopeit/patch-1

2018-04-30 10:19:37 +02:00

extruders

Merge remote-tracking branch 'Ultimaker/master' into Felix_Profile

2018-04-23 21:05:34 -07:00

i18n

Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3

2018-04-24 12:43:49 +02:00

images

Add Ultimaker S5 resources

2018-04-23 11:27:13 +02:00

meshes

Merge remote-tracking branch 'Ultimaker/master' into Felix_Profile

2018-04-23 21:05:34 -07:00

qml

Merge remote-tracking branch 'origin/3.3'

2018-04-25 12:55:21 +02:00

quality

Merge remote-tracking branch 'origin/3.3'

2018-04-25 12:55:21 +02:00

setting_visibility

Merge branch 'master' into feature_setting_visibility_profiles

2018-03-09 15:45:24 +01:00

shaders

Fix rendering depth pass

2018-03-13 19:44:53 +01:00

themes

Merge branch 'feature_model_check'

2018-03-22 01:56:46 +01:00

variants

Fixed version numbers and moved hardware_type = nozzle to metadata

2018-04-24 17:11:17 -07:00