Lipu Fei 75573da9dd Fix merge conflicts with master

2018-02-27 13:08:29 +01:00

..

abax_pri3

WIP: Fix quality profiles for abax_pri3

2018-02-21 11:06:28 +01:00

abax_pri5

Revert "WIP: Fix quality profiles for abax_pri5"

2018-02-22 15:01:03 +01:00

abax_titan

WIP: Update quality profiles

2018-02-16 14:20:02 +01:00

anycubic_i3_mega

WIP: Update quality profiles

2018-02-16 14:20:02 +01:00

builder_premium

CURA-4606 in all quality profiles, rename all the specific 1.75mm materials back to the generic material

2018-02-21 14:16:26 +01:00

cartesio

Fix merge conflicts with master

2018-02-27 13:08:29 +01:00

deltacomb

CURA-4606 in all quality profiles, rename all the specific 1.75mm materials back to the generic material

2018-02-21 14:16:26 +01:00

fabtotum

WIP: Update quality profiles

2018-02-16 14:20:02 +01:00

gmax15plus

CURA-4606 fix material names for 1.75mm materials

2018-02-16 14:23:11 +01:00

imade3d_jellybox

Fix imade3d jellybox quality profiles

2018-02-22 15:12:15 +01:00

kemiq_q2

WIP: Change low quality_type to fast

2018-02-16 14:23:11 +01:00

malyan_m200

CURA-4606 in all quality profiles, rename all the specific 1.75mm materials back to the generic material

2018-02-21 14:16:26 +01:00

monoprice_select_mini_v2

CURA-4606 in all quality profiles, rename all the specific 1.75mm materials back to the generic material

2018-02-21 14:16:26 +01:00

peopoly_moai

WIP: Update quality profiles

2018-02-16 14:20:02 +01:00

tevo_blackwidow

WIP: Update quality profiles

2018-02-16 14:20:02 +01:00

ultimaker2

Fix UM2 qualities

2018-02-21 16:39:34 +01:00

ultimaker2_plus

Merge branch 'master' into refactoring_machine_manager

2018-02-27 10:24:56 +01:00

ultimaker3

WIP: Update quality profiles

2018-02-16 14:20:02 +01:00

vertex_delta_k8800

WIP: Update quality profiles

2018-02-16 14:20:02 +01:00

coarse.inst.cfg

WIP: Update quality profiles

2018-02-16 14:20:02 +01:00

draft.inst.cfg

WIP: Update quality profiles

2018-02-16 14:20:02 +01:00

extra_coarse.inst.cfg

WIP: Fix Cartesio quality_type "Extra coarse" -> "extra coarse"

2018-02-16 14:23:11 +01:00

fast.inst.cfg

WIP: Change low quality_type to fast

2018-02-16 14:23:11 +01:00

high.inst.cfg

WIP: Update quality profiles

2018-02-16 14:20:02 +01:00

normal.inst.cfg

WIP: Update quality profiles

2018-02-16 14:20:02 +01:00