THeijmans 392605014a Merge branch 'M&P-Setting-Optimization' of https://github.com/Ultimaker/Cura into M&P-Setting-Optimization ...

Fixed conflicts

2018-03-13 11:58:33 +01:00

..

abax_pri3

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

abax_pri5

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

abax_titan

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

anycubic_i3_mega

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

builder_premium

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

cartesio

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

deltacomb

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

fabtotum

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

gmax15plus

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

imade3d_jellybox

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

kemiq_q2

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

malyan_m200

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

monoprice_select_mini_v2

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

peopoly_moai

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

tevo_blackwidow

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

ultimaker2

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

ultimaker2_plus

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

ultimaker3

Merge branch 'M&P-Setting-Optimization' of https://github.com/Ultimaker/Cura into M&P-Setting-Optimization

2018-03-13 11:58:33 +01:00

vertex_delta_k8800

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

coarse.inst.cfg

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

draft.inst.cfg

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

extra_coarse.inst.cfg

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

fast.inst.cfg

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

high.inst.cfg

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00

normal.inst.cfg

Increment instance container version number instead of just quality_changes

2018-03-09 16:14:24 +01:00