Jaime van Kessel 1b8b5415f7 Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding

2019-04-01 13:46:00 +02:00

..

bundled_packages

Fix merge conflicts with master

2019-03-21 14:59:53 +01:00

definitions

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

2019-04-01 13:33:41 +02:00

extruders

Adding platform to HMS434

2019-03-29 14:26:42 +01:00

i18n

Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action

2019-03-21 15:00:15 +01:00

images

Adding platform to HMS434

2019-03-29 14:26:42 +01:00

meshes

Adding platform to HMS434

2019-03-29 14:26:42 +01:00

qml

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

2019-04-01 13:46:00 +02:00

quality

Add HMS434

2019-03-27 10:23:59 +01:00

setting_visibility

Explicitly also check for Raft when checking for prime-tower=brim. [CURA-5864]

2019-02-13 15:46:39 +01:00

shaders

Fix support blocker on older (legacy) opengl

2018-05-14 14:29:41 +02:00

texts

Load change log from file for on-boarding page

2019-03-26 15:49:40 +01:00

themes

Fix merge conflicts

2019-04-01 13:28:42 +02:00

variants

Add HMS434

2019-03-27 10:23:59 +01:00