Lipu Fei 7f7a195627 Fix merge conflicts from 3.4

2018-06-05 09:02:52 +02:00

..

3dator.def.json

Revert "WIP: Update and fix definition files"

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

101Hero.def.json

101Hero definition: Set the preferred quality to draft (0.2mm) and remove default layer_height so normal profile is back to 0.1. CURA-5217

2018-05-16 09:35:03 +02:00

abax_pri3.def.json

Revert "WIP: Fix quality profiles for abax_pri3"

2018-03-05 11:01:52 +01:00

abax_pri5.def.json

Revert "WIP: Fix quality profiles for abax_pri5"

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

abax_titan.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

alya3dp.def.json

Replace travel_speed with speed_travel

2018-01-15 13:57:38 +01:00

anycubic_i3_mega.def.json

WIP: Fix material lookup problems and update definition files

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

bfb.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

bq_hephestos_2.def.json

Revert "WIP: Update and fix definition files"

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

bq_hephestos_xl.def.json

Fix output type of BQ Hephestos

2018-03-15 16:53:26 +01:00

bq_hephestos.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

bq_witbox_2.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

bq_witbox.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

builder_premium_large.def.json

Revert "WIP: Update and fix definition files"

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

builder_premium_medium.def.json

Revert "WIP: Update and fix definition files"

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

builder_premium_small.def.json

Revert "WIP: Update and fix definition files"

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

cartesio.def.json

Fix merge conflicts with master

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

creality_cr10.def.json

WIP: Fix material lookup problems and update definition files

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

creality_cr10s4.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

creality_cr10s5.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

custom.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

dagoma_discoeasy200.def.json

Fix dagoma discoeasy200 travel speed 100

2018-03-02 09:29:03 +01:00

dagoma_neva.def.json

Fix gcode flave RepRap for dagoma neva

2018-03-02 09:29:38 +01:00

delta_go.def.json

Revert "WIP: Update and fix definition files"

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

deltabot.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

deltacomb.def.json

Fixed values with double-quotes

2018-04-26 14:36:08 +02:00

easyarts_ares.def.json

Replace travel_speed with speed_travel

2018-01-15 13:57:38 +01:00

fabtotum.def.json

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

2018-03-05 11:29:21 +01:00

fdmextruder.def.json

Fix material_diameter handling in ExtruderStacks

2018-01-31 13:32:45 +01:00

fdmprinter.def.json

Merge remote-tracking branch 'origin/3.4'

2018-05-31 12:25:33 +02:00

felixtec4dual.def.json

Corrected preferred variant name

2018-04-25 20:29:09 -07:00

folgertech_FT-5.def.json

Revert "WIP: Update and fix definition files"

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

gmax15plus_dual.def.json

CURA-4606 fix material names for 1.75mm materials

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

gmax15plus.def.json

CURA-4606 fix material names for 1.75mm materials

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

grr_neo.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

helloBEEprusa.def.json

Revert "WIP: Update and fix definition files"

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

imade3d_jellybox.def.json

Revert "WIP: Update and fix definition files"

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

innovo_inventor.def.json

Merge branch 'master' of https://github.com/innovo3d/Cura

2017-12-18 11:24:22 +01:00

julia.def.json

Revert "WIP: Update and fix definition files"

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

kemiq_q2_beta.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

kemiq_q2_gama.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

kossel_mini.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

kossel_pro.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

kupido.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

makeit_pro_l.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

makeit_pro_m.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

makeR_pegasus.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

makeR_prusa_tairona_i3.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

maker_starter.def.json

3DMaker Starter definition: Set the preferred quality to draft (0.2mm) and remove default layer_height so normal profile is back to 0.1. CURA-5217

2018-05-16 09:42:34 +02:00

makerbotreplicator.def.json

Revert "WIP: Update and fix definition files"

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

malyan_m180.def.json

Set machine preset to be equal to Replicator 1 Dual

2018-05-25 10:49:16 +02:00

malyan_m200.def.json

Change minimum and maximum layer heights into a warning

2018-03-20 15:27:04 +01:00

mankati_fullscale_xt_plus.def.json

Revert "WIP: Update and fix definition files"

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

mendel90.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

monoprice_select_mini_v1.def.json

Removing nozzle variants, adding material definitions

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

monoprice_select_mini_v2.def.json

WIP: Fix material lookup problems and update definition files

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

ord.def.json

Revert "WIP: Update and fix definition files"

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

peopoly_moai.def.json

Remove unnecessary usage of value instead of default

2018-02-07 13:25:27 +01:00

printrbot_play_heated.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

printrbot_play.def.json

Revert "WIP: Update and fix definition files"

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

printrbot_simple_extended.def.json

Revert "WIP: Update and fix definition files"

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

printrbot_simple_makers_kit.def.json

Fix preferred material PLA for printrbot simple makers kit

2018-03-14 10:48:05 +01:00

printrbot_simple.def.json

Don't correct bed origin any more

2018-05-11 11:47:35 +02:00

prusa_i3_mk2.def.json

Revert "WIP: Update and fix definition files"

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

prusa_i3_xl.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

prusa_i3.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

punchtec_connect_xl.def.json

Revert "WIP: Update and fix definition files"

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

raise3D_N2_dual.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

raise3D_N2_plus_dual.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

raise3D_N2_plus_single.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

raise3D_N2_single.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

renkforce_rf100.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

rigid3d_3rdgen.def.json

Revert "WIP: Update and fix definition files"

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

rigid3d_hobby.def.json

Revert "WIP: Update and fix definition files"

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

rigid3d_mucit.def.json

Fix Rigid3D Mucit definition

2018-04-20 14:52:52 +02:00

rigid3d_zero2.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

rigid3d_zero.def.json

Revert "WIP: Update and fix definition files"

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

rigid3d.def.json

Revert "WIP: Update and fix definition files"

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

rigidbot_big.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

rigidbot.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

robo_3d_r1.def.json

Revert "WIP: Update and fix definition files"

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

seemecnc_artemis.def.json

Added default material diameter to SeeMeCNC printer definitions

2018-03-11 10:27:57 -04:00

seemecnc_v32.def.json

Added default material diameter to SeeMeCNC printer definitions

2018-03-11 10:27:57 -04:00

tam.def.json

Revert "WIP: Update and fix definition files"

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

tevo_blackwidow.def.json

WIP: Fix material lookup problems and update definition files

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

tevo_tarantula.def.json

Add acceleration/jerk data for TEVO Tarantula

2018-03-09 09:30:32 +01:00

ubuild-3d_mr_bot_280.def.json

Set default layer height via preferred quality type

2018-03-12 16:03:42 +01:00

ultimaker2_extended_plus.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

ultimaker2_extended.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

ultimaker2_go.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

ultimaker2_plus.def.json

WIP: Fix material lookup problems and update definition files

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

ultimaker2.def.json

Add exclude materials for UMO, UM2, and UM2+

2018-04-23 12:51:06 +02:00

ultimaker3_extended.def.json

Use gzipped gcode by default for UM3

2018-03-16 16:08:49 +01:00

ultimaker3.def.json

CURA-5404 Change default retraction distance to 6.5mm for ultimaker3 and

2018-05-29 14:48:34 +02:00

ultimaker_original_dual.def.json

Add exclude materials for UMO, UM2, and UM2+

2018-04-23 12:51:06 +02:00

ultimaker_original_plus.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

ultimaker_original.def.json

Add exclude materials for UMO, UM2, and UM2+

2018-04-23 12:51:06 +02:00

ultimaker_s5.def.json

CURA-5404 Change default retraction distance to 6.5mm for ultimaker3 and

2018-05-29 14:48:34 +02:00

ultimaker.def.json

Exclude HIPS and PETG material for UM

2018-03-26 17:11:38 +02:00

uniqbot_one.def.json

Remove ID from definition files

2017-11-02 12:53:06 +01:00

vertex_delta_k8800.def.json

Removed ID + minor change

2018-01-18 08:34:10 +01:00

vertex_k8400_dual.def.json

Move platform model slightly further down

2018-05-04 13:30:28 +02:00

vertex_k8400.def.json

Move platform model slightly further down

2018-05-04 13:30:28 +02:00

zone3d_printer.def.json

Revert "WIP: Update and fix definition files"

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

zyyx_agile.def.json

Set preferred material to proPLA which has a tuned quality profile.

2018-03-31 13:51:38 +02:00