Tyler Gibson 203fc37c7c Merge branch 'master' into malyan_m200 ...

# Conflicts:
#	resources/qml/SidebarSimple.qml

Resolving with updated 2 digit truncation

2018-01-07 22:54:56 -08:00

..

abax_pri3

Add upgrade script for 3.0 to 3.1

2017-10-30 12:45:25 +01:00

abax_pri5

Add upgrade script for 3.0 to 3.1

2017-10-30 12:45:25 +01:00

abax_titan

Add upgrade script for 3.0 to 3.1

2017-10-30 12:45:25 +01:00

anycubic_i3_mega

Added 3D model for Tevo Black Widow + small fix

2017-12-31 23:15:00 +01:00

builder_premium

Changed Setting version

2017-11-28 09:28:25 +01:00

cartesio

Merge pull request #2814 from Ultimaker/feature_maximum_resolution

2017-11-20 18:09:11 +01:00

deltacomb

Set all "setting_version" in qualitites to 4

2017-11-09 10:25:30 +01:00

fabtotum

Add upgrade script for 3.0 to 3.1

2017-10-30 12:45:25 +01:00

imade3d_jellybox

Add upgrade script for 3.0 to 3.1

2017-10-30 12:45:25 +01:00

kemiq_q2

Add upgrade script for 3.0 to 3.1

2017-10-30 12:45:25 +01:00

malyan_m200

Removing nozzle variants, adding material definitions

2018-01-07 22:39:54 -08:00

monoprice_select_mini_v2

Removing nozzle variants, adding material definitions

2018-01-07 22:39:54 -08:00

peopoly_moai

Add upgrade script for 3.0 to 3.1

2017-10-30 12:45:25 +01:00

tevo_blackwidow

Added 3D model for Tevo Black Widow + small fix

2017-12-31 23:15:00 +01:00

ultimaker2

Add upgrade script for 3.0 to 3.1

2017-10-30 12:45:25 +01:00

ultimaker2_plus

Add upgrade script for 3.0 to 3.1

2017-10-30 12:45:25 +01:00

ultimaker3

CURA-4721 removed comment from breakaway 0.1mm quality profile

2017-12-18 09:39:20 +01:00

coarse.inst.cfg

Add upgrade script for 3.0 to 3.1

2017-10-30 12:45:25 +01:00

draft.inst.cfg

Add upgrade script for 3.0 to 3.1

2017-10-30 12:45:25 +01:00

extra_coarse.inst.cfg

Add upgrade script for 3.0 to 3.1

2017-10-30 12:45:25 +01:00

high.inst.cfg

Add upgrade script for 3.0 to 3.1

2017-10-30 12:45:25 +01:00

low.inst.cfg

Add upgrade script for 3.0 to 3.1

2017-10-30 12:45:25 +01:00

normal.inst.cfg

Add upgrade script for 3.0 to 3.1

2017-10-30 12:45:25 +01:00