Lipu Fei a85f2ce156 Fix merge conflicts

2019-03-26 09:01:01 +01:00

..

bundled_packages

Fix merge conflicts with master

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

definitions

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

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

extruders

Add profile for JGAurora JGMaker Magic (#5430)

2019-03-18 16:42:43 +01:00

i18n

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

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

images

Merge branch '4.0' of https://github.com/BluefireXD/Cura into BluefireXD-4.0

2019-03-08 16:48:56 +01:00

meshes

Merge pull request #5179 from nbennett1978/master

2019-03-18 16:39:39 +01:00

qml

Fix merge conflicts

2019-03-26 09:01:01 +01:00

quality

Merge pull request #5179 from nbennett1978/master

2019-03-18 16:39:39 +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

…

themes

Fix merge conflicts

2019-03-26 09:01:01 +01:00

variants

Fixed incorrect version numbers

2019-03-13 15:34:33 +01:00