Ghostkeeper 02b925388a

Merge branch 'updateTiZYX' of https://github.com/TiZYX/Cura into TiZYX-updateTiZYX ...

Conflicts:
	resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_coarse.inst.cfg -> Deleted in branch, but modified for setting version
	resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_draft.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_draft.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_draft.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/variants/tizyx_evy_dual_direct_drive.inst.cfg -> Modified in branch for new settings, in master for settings version

2019-07-02 17:35:07 +02:00

..

3dator.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

101Hero.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

abax_pri3.def.json

…

abax_pri5.def.json

…

abax_titan.def.json

…

alfawise_u20.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

alfawise_u30.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

alya3dp.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

alyanx3dp.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

anet_a6.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:38:36 +02:00

anycubic_4max.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

anycubic_chiron.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

anycubic_i3_mega.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

bfb.def.json

…

bibo2_dual.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

bq_hephestos_2.def.json

…

bq_hephestos_xl.def.json

…

bq_hephestos.def.json

…

bq_witbox_2.def.json

…

bq_witbox.def.json

…

builder_premium_large.def.json

Show prime blob by default

2019-06-06 12:31:06 +02:00

builder_premium_medium.def.json

Show prime blob by default

2019-06-06 12:31:06 +02:00

builder_premium_small.def.json

Show prime blob by default

2019-06-06 12:31:06 +02:00

cartesio.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

cocoon_create_modelmaker.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

creality_cr10.def.json

Reduce jerk for Creality printers

2019-05-20 14:30:29 +02:00

creality_cr10s4.def.json

…

creality_cr10s5.def.json

…

creality_cr10s.def.json

…

creality_cr-x.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

creality_ender3.def.json

Merge branch '4.1'

2019-05-20 14:30:47 +02:00

creatable_d3.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

cubicon_3dp_110f.def.json

Add check for platform mesh & texture

2019-02-15 14:42:50 +01:00

cubicon_3dp_210f.def.json

Add check for platform mesh & texture

2019-02-15 14:42:50 +01:00

cubicon_3dp_310f.def.json

Add check for platform mesh & texture

2019-02-15 14:42:50 +01:00

cubicon_common.def.json

4904 cubicon device (#4963)

2019-01-22 16:44:04 +01:00

custom.def.json

…

dagoma_discoeasy200.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

dagoma_magis.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

dagoma_neva.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

delta_go.def.json

Add check for platform mesh & texture

2019-02-15 14:42:50 +01:00

deltabot.def.json

…

deltacomb.def.json

Deltacomb 3D - Updated profile

2019-03-07 17:06:49 +01:00

easyarts_ares.def.json

…

erzay3d.def.json

Fixed the value of "retraction_amount"

2019-06-21 11:53:06 +03:00

fabtotum.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

fdmextruder.def.json

Increment setting_version to 8

2019-06-12 09:09:41 +02:00

fdmprinter.def.json

Merge branch 'feat_line_spacings' of https://github.com/BagelOrb/Cura

2019-07-01 17:19:26 +02:00

felixtec4dual.def.json

Fix indentation and remove spaces

2019-02-24 19:01:13 +01:00

flsun_qq_s.def.json

Update flsun_qq_s.def.json

2019-06-24 13:22:18 +02:00

flsun_qq.def.json

Merge branch 'master' of github.com:radfahrer/Cura

2019-02-26 07:25:42 -08:00

folgertech_FT-5.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

geeetech_a30.def.json

Fix setting_version

2019-06-24 13:21:04 +02:00

gmax15plus_dual.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

gmax15plus.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

grr_neo.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

helloBEEprusa.def.json

…

hms434.def.json

Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master

2019-06-20 09:18:16 +02:00

imade3d_jellybox.def.json

…

innovo_inventor.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

jgaurora_a1.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

jgaurora_a5.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

jgaurora_jgmaker_magic.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

jgaurora_z_603s.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

julia.def.json

…

kemiq_q2_beta.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

kemiq_q2_gama.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

kossel_mini.def.json

…

kossel_pro.def.json

…

kupido.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

makeit_pro_l.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

makeit_pro_m.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

makeR_pegasus.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

makeR_prusa_tairona_i3.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

maker_starter.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

makerbotreplicator.def.json

…

malyan_m180.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

malyan_m200.def.json

…

mankati_fullscale_xt_plus.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

Mark2_for_Ultimaker2.def.json

Fix Mark2 appearing at the bottom of machine list

2019-05-14 10:38:27 +02:00

mendel90.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

monoprice_select_mini_v1.def.json

…

monoprice_select_mini_v2.def.json

…

monoprice_ultimate.def.json

Add Monoprice Ultimate based on Wanhao D6

2018-12-16 19:57:43 +00:00

nwa3d_a5.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

ord.def.json

…

peopoly_moai.def.json

Change setting value defaults for maximum resolution to use deviation

2019-04-16 11:36:07 +02:00

printrbot_play_heated.def.json

Add check for platform mesh & texture

2019-02-15 14:42:50 +01:00

printrbot_play.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

printrbot_simple_extended.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

printrbot_simple_makers_kit.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

printrbot_simple.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

prusa_i3_mk2.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

prusa_i3_xl.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

prusa_i3.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

punchtec_connect_xl.def.json

…

raise3D_N2_dual.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

raise3D_N2_plus_dual.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

raise3D_N2_plus_single.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

raise3D_N2_single.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

renkforce_rf100.def.json

Set default infill density for tree support to 0% in profiles

2019-04-29 12:06:54 +02:00

rigid3d_3rdgen.def.json

…

rigid3d_hobby.def.json

…

rigid3d_mucit.def.json

…

rigid3d_zero2.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

rigid3d_zero.def.json

…

rigid3d.def.json

…

rigidbot_big.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

rigidbot.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

robo_3d_r1.def.json

…

seemecnc_artemis.def.json

…

seemecnc_v32.def.json

…

stereotech_start.def.json

add START and STE320 profiles

2019-04-25 15:42:59 +04:00

stereotech_ste320.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:38:36 +02:00

structur3d_discov3ry1_complete_um2plus.def.json

Do not allow the use of "weight" for third party printers

2019-05-13 13:49:00 +02:00

tam.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

tevo_blackwidow.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

tevo_tarantula.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

tevo_tornado.def.json

Reduce travel jerk/acceleration and reduce print jerk slightly

2019-06-14 11:50:58 +02:00

tizyx_evy_dual.def.json

update profiles, qualities, variants... of TiZYX printers

2019-06-28 08:21:59 -07:00

tizyx_evy.def.json

update profiles, qualities, variants... of TiZYX printers

2019-06-28 08:21:59 -07:00

tizyx_k25.def.json

update profiles, qualities, variants... of TiZYX printers

2019-06-28 08:21:59 -07:00

ubuild-3d_mr_bot_280.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

ultimaker2_extended_plus.def.json

…

ultimaker2_extended.def.json

Merge branch 'feature_add_printer_layout' of https://github.com/fieldOfView/Cura

2018-10-31 14:23:42 +01:00

ultimaker2_go.def.json

Merge branch 'feature_add_printer_layout' of https://github.com/fieldOfView/Cura

2018-10-31 14:23:42 +01:00

ultimaker2_plus.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

ultimaker2.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

ultimaker3_extended.def.json

Update the list of check urls for UM3 Extended

2019-03-25 11:59:28 +01:00

ultimaker3.def.json

Fix resolve/value/warning definition for enable prime blob. [CURA-6414]

2019-06-14 11:39:48 +02:00

ultimaker_original_dual.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

ultimaker_original_plus.def.json

WIP: Remove UMOCheckup MachineAction

2019-03-19 15:47:49 +01:00

ultimaker_original.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

ultimaker_s5.def.json

Show prime blob by default

2019-06-06 12:31:06 +02:00

ultimaker.def.json

Don't show Silicone for UM printers that are incompatible with it anyway

2019-03-05 15:36:31 +01:00

uni_print_3d.def.json

Added test for definition container

2018-11-23 17:01:05 +01:00

uniqbot_one.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

vertex_delta_k8800.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

vertex_k8400_dual.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

vertex_k8400.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

wanhao_d4s.def.json

Updated to reference speed_travel macro

2018-11-02 09:39:12 -04:00

wanhao_d6_plus.def.json

Updated to reference speed_travel macro

2018-11-02 09:39:12 -04:00

wanhao_d6.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

wanhao_d9.def.json

Replace travel_speed with speed_travel

2019-03-05 17:43:00 +01:00

wanhao_duplicator5S.def.json

Updated to reference speed_travel macro

2018-11-02 09:39:12 -04:00

wanhao_duplicator5Smini.def.json

Updated to reference speed_travel macro

2018-11-02 09:39:12 -04:00

wanhao_i3.def.json

Updated to reference speed_travel macro

2018-11-02 09:39:12 -04:00

wanhao_i3mini.def.json

Updated to reference speed_travel macro

2018-11-02 09:39:12 -04:00

wanhao_i3plus.def.json

Updated to reference speed_travel macro

2018-11-02 09:39:12 -04:00

winbo_dragonl4.def.json

Show prime blob by default

2019-06-06 12:31:06 +02:00

winbo_mini2.def.json

Show prime blob by default

2019-06-06 12:31:06 +02:00

winbo_superhelper105.def.json

Show prime blob by default

2019-06-06 12:31:06 +02:00

winbo_superhelper155.def.json

…

z-bolt_classic.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

z-bolt_plus.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00

zone3d_printer.def.json

…

zyyx_agile.def.json

Overwrite gantry height value instead of default_value

2019-05-13 09:30:32 +02:00