From d4e4901ae5ce8799f7898bd0bb09a92f271ec353 Mon Sep 17 00:00:00 2001 From: whoseyoung Date: Tue, 13 Dec 2022 14:46:24 +0800 Subject: [PATCH] fixed known bugs --- .../Geeetech_Base_Dual_Extruder.def.json | 117 ++++++++++++++++++ .../Geeetech_Base_Multi_Extruder.def.json | 117 ++++++++++++++++++ ...=> Geeetech_Base_Single_Extruder.def.json} | 18 +-- resources/definitions/geeetech_A10M.def.json | 19 ++- .../definitions/geeetech_A10Pro.def.json | 16 +-- resources/definitions/geeetech_A10T.def.json | 19 ++- resources/definitions/geeetech_A20.def.json | 14 +-- resources/definitions/geeetech_A20M.def.json | 19 ++- resources/definitions/geeetech_A20T.def.json | 19 ++- resources/definitions/geeetech_A30M.def.json | 19 ++- .../definitions/geeetech_A30Pro.def.json | 12 +- resources/definitions/geeetech_A30T.def.json | 19 ++- resources/definitions/geeetech_E180.def.json | 14 +-- .../geeetech_GiantArmD200.def.json | 14 +-- .../definitions/geeetech_I3ProB.def.json | 14 +-- .../definitions/geeetech_I3ProC.def.json | 19 ++- .../definitions/geeetech_I3ProW.def.json | 14 +-- .../definitions/geeetech_MeCreator.def.json | 14 +-- .../definitions/geeetech_MeCreator2.def.json | 14 +-- .../definitions/geeetech_MeDucer.def.json | 14 +-- resources/definitions/geeetech_Mizar.def.json | 14 +-- .../definitions/geeetech_MizarM.def.json | 17 +-- .../definitions/geeetech_MizarMax.def.json | 13 +- .../definitions/geeetech_MizarPro.def.json | 14 +-- .../definitions/geeetech_MizarS.def.json | 16 +-- .../definitions/geeetech_Thunder.def.json | 19 ++- .../Geeetech_Dual_Extruder_0.def.json | 2 +- .../Geeetech_Dual_Extruder_1.def.json | 2 +- .../Geeetech_Multi_Extruder_0.def.json | 2 +- .../Geeetech_Multi_Extruder_1.def.json | 2 +- .../Geeetech_Multi_Extruder_2.def.json | 2 +- ...json => Geeetech_Single_Extruder.def.json} | 2 +- .../geeetech_quality_0.2_ABS_super.inst.cfg} | 2 +- .../geeetech_quality_0.2_ABS_ultra.inst.cfg} | 2 +- .../geeetech_quality_0.2_PETG_super.inst.cfg} | 2 +- .../geeetech_quality_0.2_PETG_ultra.inst.cfg} | 2 +- .../geeetech_quality_0.2_PLA_super.inst.cfg} | 2 +- .../geeetech_quality_0.2_PLA_ultra.inst.cfg} | 2 +- ...eeetech_quality_0.3_ABS_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.3_ABS_low.inst.cfg} | 2 +- ...eeetech_quality_0.3_ABS_standard.inst.cfg} | 2 +- .../geeetech_quality_0.3_ABS_super.inst.cfg} | 2 +- ...eetech_quality_0.3_PETG_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.3_PETG_low.inst.cfg} | 2 +- ...eetech_quality_0.3_PETG_standard.inst.cfg} | 2 +- .../geeetech_quality_0.3_PETG_super.inst.cfg} | 2 +- ...eeetech_quality_0.3_PLA_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.3_PLA_low.inst.cfg} | 2 +- ...eeetech_quality_0.3_PLA_standard.inst.cfg} | 2 +- .../geeetech_quality_0.3_PLA_super.inst.cfg} | 2 +- ...eeetech_quality_0.3_TPU_adaptive.inst.cfg} | 2 +- ...eeetech_quality_0.3_TPU_standard.inst.cfg} | 2 +- .../geeetech_quality_0.3_TPU_super.inst.cfg} | 2 +- ...eeetech_quality_0.4_ABS_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.4_ABS_low.inst.cfg} | 2 +- ...eeetech_quality_0.4_ABS_standard.inst.cfg} | 2 +- .../geeetech_quality_0.4_ABS_super.inst.cfg} | 2 +- ...eetech_quality_0.4_PETG_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.4_PETG_low.inst.cfg} | 2 +- ...eetech_quality_0.4_PETG_standard.inst.cfg} | 2 +- .../geeetech_quality_0.4_PETG_super.inst.cfg} | 2 +- ...eeetech_quality_0.4_PLA_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.4_PLA_low.inst.cfg} | 2 +- ...eeetech_quality_0.4_PLA_standard.inst.cfg} | 2 +- .../geeetech_quality_0.4_PLA_super.inst.cfg} | 2 +- ...eeetech_quality_0.4_TPU_adaptive.inst.cfg} | 2 +- ...eeetech_quality_0.4_TPU_standard.inst.cfg} | 2 +- .../geeetech_quality_0.4_TPU_super.inst.cfg} | 2 +- ...eeetech_quality_0.5_ABS_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.5_ABS_low.inst.cfg} | 2 +- ...eeetech_quality_0.5_ABS_standard.inst.cfg} | 2 +- .../geeetech_quality_0.5_ABS_super.inst.cfg} | 2 +- ...eetech_quality_0.5_PETG_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.5_PETG_low.inst.cfg} | 2 +- ...eetech_quality_0.5_PETG_standard.inst.cfg} | 2 +- .../geeetech_quality_0.5_PETG_super.inst.cfg} | 2 +- ...eeetech_quality_0.5_PLA_adaptive.inst.cfg} | 2 +- .../geeetech_quality_0.5_PLA_low.inst.cfg} | 2 +- ...eeetech_quality_0.5_PLA_standard.inst.cfg} | 2 +- .../geeetech_quality_0.5_PLA_super.inst.cfg} | 2 +- ...eeetech_quality_0.5_TPU_adaptive.inst.cfg} | 2 +- ...eeetech_quality_0.5_TPU_standard.inst.cfg} | 2 +- .../geeetech_quality_0.5_TPU_super.inst.cfg} | 2 +- ...eeetech_quality_0.6_ABS_standard.inst.cfg} | 2 +- ...eetech_quality_0.6_PETG_standard.inst.cfg} | 2 +- .../geeetech_quality_0.6_PLA_draft.inst.cfg} | 2 +- .../geeetech_quality_0.6_PLA_low.inst.cfg} | 2 +- ...eeetech_quality_0.6_PLA_standard.inst.cfg} | 2 +- ...eeetech_quality_0.6_TPU_standard.inst.cfg} | 2 +- .../geeetech_quality_0.8_ABS_draft.inst.cfg} | 2 +- .../geeetech_quality_0.8_PETG_draft.inst.cfg} | 2 +- .../geeetech_quality_0.8_PLA_draft.inst.cfg} | 2 +- .../geeetech_quality_0.8_TPU_draft.inst.cfg} | 2 +- .../geeetech_quality_1.0_ABS_draft.inst.cfg} | 2 +- .../geeetech_quality_1.0_PETG_draft.inst.cfg} | 2 +- .../geeetech_quality_1.0_PLA_draft.inst.cfg} | 2 +- .../geeetech_quality_1.0_TPU_draft.inst.cfg} | 2 +- ...geeetech_quality_global_adaptive.inst.cfg} | 2 +- .../geeetech_quality_global_draft.inst.cfg} | 2 +- .../geeetech_quality_global_low.inst.cfg} | 2 +- ...geeetech_quality_global_standard.inst.cfg} | 2 +- .../geeetech_quality_global_super.inst.cfg} | 2 +- .../geeetech_quality_global_ultra.inst.cfg} | 2 +- .../geeetech_A10Pro_0.2.inst.cfg | 0 .../geeetech_A10Pro_0.3.inst.cfg | 0 .../geeetech_A10Pro_0.4.inst.cfg | 0 .../geeetech_A10Pro_0.5.inst.cfg | 0 .../geeetech_A10Pro_0.6.inst.cfg | 0 .../geeetech_A10Pro_0.8.inst.cfg | 0 .../geeetech_A10Pro_1.0.inst.cfg | 0 .../geeetech_A20_0.2.inst.cfg | 0 .../geeetech_A20_0.3.inst.cfg | 0 .../geeetech_A20_0.4.inst.cfg | 0 .../geeetech_A20_0.5.inst.cfg | 0 .../geeetech_A20_0.6.inst.cfg | 0 .../geeetech_A20_0.8.inst.cfg | 0 .../geeetech_A20_1.0.inst.cfg | 0 .../geeetech_A30Pro_0.2.inst.cfg | 0 .../geeetech_A30Pro_0.3.inst.cfg | 0 .../geeetech_A30Pro_0.4.inst.cfg | 0 .../geeetech_A30Pro_0.5.inst.cfg | 0 .../geeetech_A30Pro_0.6.inst.cfg | 0 .../geeetech_A30Pro_0.8.inst.cfg | 0 .../geeetech_A30Pro_1.0.inst.cfg | 0 .../geeetech_E180_0.2.inst.cfg | 0 .../geeetech_E180_0.3.inst.cfg | 0 .../geeetech_E180_0.4.inst.cfg | 0 .../geeetech_E180_0.5.inst.cfg | 0 .../geeetech_E180_0.6.inst.cfg | 0 .../geeetech_E180_0.8.inst.cfg | 0 .../geeetech_E180_1.0.inst.cfg | 0 .../geeetech_GiantArmD200_0.2.inst.cfg | 0 .../geeetech_GiantArmD200_0.3.inst.cfg | 0 .../geeetech_GiantArmD200_0.4.inst.cfg | 0 .../geeetech_GiantArmD200_0.5.inst.cfg | 0 .../geeetech_GiantArmD200_0.6.inst.cfg | 0 .../geeetech_GiantArmD200_0.8.inst.cfg | 0 .../geeetech_GiantArmD200_1.0.inst.cfg | 0 .../geeetech_I3ProB_0.2.inst.cfg | 0 .../geeetech_I3ProB_0.3.inst.cfg | 0 .../geeetech_I3ProB_0.4.inst.cfg | 0 .../geeetech_I3ProB_0.5.inst.cfg | 0 .../geeetech_I3ProB_0.6.inst.cfg | 0 .../geeetech_I3ProB_0.8.inst.cfg | 0 .../geeetech_I3ProB_1.0.inst.cfg | 0 .../geeetech_I3ProW_0.2.inst.cfg | 0 .../geeetech_I3ProW_0.3.inst.cfg | 0 .../geeetech_I3ProW_0.4.inst.cfg | 0 .../geeetech_I3ProW_0.5.inst.cfg | 0 .../geeetech_I3ProW_0.6.inst.cfg | 0 .../geeetech_I3ProW_0.8.inst.cfg | 0 .../geeetech_I3ProW_1.0.inst.cfg | 0 .../geeetech_MeCreator2_0.2.inst.cfg | 0 .../geeetech_MeCreator2_0.3.inst.cfg | 0 .../geeetech_MeCreator2_0.4.inst.cfg | 0 .../geeetech_MeCreator2_0.5.inst.cfg | 0 .../geeetech_MeCreator2_0.6.inst.cfg | 0 .../geeetech_MeCreator2_0.8.inst.cfg | 0 .../geeetech_MeCreator2_1.0.inst.cfg | 0 .../geeetech_MeCreator_0.2.inst.cfg | 0 .../geeetech_MeCreator_0.3.inst.cfg | 0 .../geeetech_MeCreator_0.4.inst.cfg | 0 .../geeetech_MeCreator_0.5.inst.cfg | 0 .../geeetech_MeCreator_0.6.inst.cfg | 0 .../geeetech_MeCreator_0.8.inst.cfg | 0 .../geeetech_MeCreator_1.0.inst.cfg | 0 .../geeetech_MeDucer_0.2.inst.cfg | 0 .../geeetech_MeDucer_0.3.inst.cfg | 0 .../geeetech_MeDucer_0.4.inst.cfg | 0 .../geeetech_MeDucer_0.5.inst.cfg | 0 .../geeetech_MeDucer_0.6.inst.cfg | 0 .../geeetech_MeDucer_0.8.inst.cfg | 0 .../geeetech_MeDucer_1.0.inst.cfg | 0 .../geeetech_MizarMax_0.2.inst.cfg | 0 .../geeetech_MizarMax_0.3.inst.cfg | 0 .../geeetech_MizarMax_0.4.inst.cfg | 0 .../geeetech_MizarMax_0.5.inst.cfg | 0 .../geeetech_MizarMax_0.6.inst.cfg | 0 .../geeetech_MizarMax_0.8.inst.cfg | 0 .../geeetech_MizarMax_1.0.inst.cfg | 0 .../geeetech_MizarPro_0.2.inst.cfg | 0 .../geeetech_MizarPro_0.3.inst.cfg | 0 .../geeetech_MizarPro_0.4.inst.cfg | 0 .../geeetech_MizarPro_0.5.inst.cfg | 0 .../geeetech_MizarPro_0.6.inst.cfg | 0 .../geeetech_MizarPro_0.8.inst.cfg | 0 .../geeetech_MizarPro_1.0.inst.cfg | 0 .../geeetech_MizarS_0.2.inst.cfg | 0 .../geeetech_MizarS_0.3.inst.cfg | 0 .../geeetech_MizarS_0.4.inst.cfg | 0 .../geeetech_MizarS_0.5.inst.cfg | 0 .../geeetech_MizarS_0.6.inst.cfg | 0 .../geeetech_MizarS_0.8.inst.cfg | 0 .../geeetech_MizarS_1.0.inst.cfg | 0 .../geeetech_Mizar_0.2.inst.cfg | 0 .../geeetech_Mizar_0.3.inst.cfg | 0 .../geeetech_Mizar_0.4.inst.cfg | 0 .../geeetech_Mizar_0.5.inst.cfg | 0 .../geeetech_Mizar_0.6.inst.cfg | 0 .../geeetech_Mizar_0.8.inst.cfg | 0 .../geeetech_Mizar_1.0.inst.cfg | 0 .../geeetech_Thunder_0.2.inst.cfg | 0 .../geeetech_Thunder_0.3.inst.cfg | 0 .../geeetech_Thunder_0.4.inst.cfg | 0 .../geeetech_Thunder_0.5.inst.cfg | 0 .../geeetech_Thunder_0.6.inst.cfg | 0 .../geeetech_Thunder_0.8.inst.cfg | 0 .../geeetech_Thunder_1.0.inst.cfg | 0 208 files changed, 454 insertions(+), 318 deletions(-) create mode 100644 resources/definitions/Geeetech_Base_Dual_Extruder.def.json create mode 100644 resources/definitions/Geeetech_Base_Multi_Extruder.def.json rename resources/definitions/{Geeetech_base.def.json => Geeetech_Base_Single_Extruder.def.json} (94%) rename resources/extruders/{Geeetech_base_extruder_0.def.json => Geeetech_Single_Extruder.def.json} (83%) rename resources/quality/geeetech/{base/Geeetech_base_0.2_ABS_super.inst.cfg => geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.2_ABS_ultra.inst.cfg => geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.2_PETG_super.inst.cfg => geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.2_PETG_ultra.inst.cfg => geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.2_PLA_super.inst.cfg => geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.2_PLA_ultra.inst.cfg => geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_ABS_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_ABS_low.inst.cfg => geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg} (81%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_ABS_standard.inst.cfg => geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_ABS_super.inst.cfg => geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_PETG_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_PETG_low.inst.cfg => geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_PETG_standard.inst.cfg => geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_PETG_super.inst.cfg => geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_PLA_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_PLA_low.inst.cfg => geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_PLA_standard.inst.cfg => geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_PLA_super.inst.cfg => geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_TPU_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_TPU_standard.inst.cfg => geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.3_TPU_super.inst.cfg => geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_ABS_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_ABS_low.inst.cfg => geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg} (81%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_ABS_standard.inst.cfg => geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_ABS_super.inst.cfg => geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_PETG_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_PETG_low.inst.cfg => geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_PETG_standard.inst.cfg => geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_PETG_super.inst.cfg => geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_PLA_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_PLA_low.inst.cfg => geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_PLA_standard.inst.cfg => geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_PLA_super.inst.cfg => geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_TPU_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_TPU_standard.inst.cfg => geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.4_TPU_super.inst.cfg => geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_ABS_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_ABS_low.inst.cfg => geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg} (81%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_ABS_standard.inst.cfg => geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_ABS_super.inst.cfg => geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_PETG_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_PETG_low.inst.cfg => geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_PETG_standard.inst.cfg => geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_PETG_super.inst.cfg => geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_PLA_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_PLA_low.inst.cfg => geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_PLA_standard.inst.cfg => geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_PLA_super.inst.cfg => geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_TPU_adaptive.inst.cfg => geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_TPU_standard.inst.cfg => geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.5_TPU_super.inst.cfg => geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.6_ABS_standard.inst.cfg => geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.6_PETG_standard.inst.cfg => geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.6_PLA_draft.inst.cfg => geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.6_PLA_low.inst.cfg => geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.6_PLA_standard.inst.cfg => geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.6_TPU_standard.inst.cfg => geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg} (80%) rename resources/quality/geeetech/{base/Geeetech_base_0.8_ABS_draft.inst.cfg => geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_0.8_PETG_draft.inst.cfg => geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_0.8_PLA_draft.inst.cfg => geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_0.8_TPU_draft.inst.cfg => geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_1.0_ABS_draft.inst.cfg => geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg} (82%) rename resources/quality/geeetech/{base/Geeetech_base_1.0_PETG_draft.inst.cfg => geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg} (85%) rename resources/quality/geeetech/{base/Geeetech_base_1.0_PLA_draft.inst.cfg => geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_1.0_TPU_draft.inst.cfg => geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg} (79%) rename resources/quality/geeetech/{base/Geeetech_base_global_adaptive.inst.cfg => geeetech_quality/geeetech_quality_global_adaptive.inst.cfg} (89%) rename resources/quality/geeetech/{base/Geeetech_base_global_draft.inst.cfg => geeetech_quality/geeetech_quality_global_draft.inst.cfg} (88%) rename resources/quality/geeetech/{base/Geeetech_base_global_low.inst.cfg => geeetech_quality/geeetech_quality_global_low.inst.cfg} (88%) rename resources/quality/geeetech/{base/Geeetech_base_global_standard.inst.cfg => geeetech_quality/geeetech_quality_global_standard.inst.cfg} (88%) rename resources/quality/geeetech/{base/Geeetech_base_global_super.inst.cfg => geeetech_quality/geeetech_quality_global_super.inst.cfg} (88%) rename resources/quality/geeetech/{base/Geeetech_base_global_ultra.inst.cfg => geeetech_quality/geeetech_quality_global_ultra.inst.cfg} (88%) rename resources/variants/{ => geeetech_variants}/geeetech_A10Pro_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A10Pro_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A10Pro_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A10Pro_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A10Pro_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A10Pro_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A10Pro_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A20_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A20_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A20_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A20_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A20_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A20_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A20_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A30Pro_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A30Pro_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A30Pro_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A30Pro_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A30Pro_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A30Pro_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_A30Pro_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_E180_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_E180_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_E180_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_E180_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_E180_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_E180_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_E180_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_GiantArmD200_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_GiantArmD200_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_GiantArmD200_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_GiantArmD200_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_GiantArmD200_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_GiantArmD200_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_GiantArmD200_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProB_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProB_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProB_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProB_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProB_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProB_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProB_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProW_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProW_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProW_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProW_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProW_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProW_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_I3ProW_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator2_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator2_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator2_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator2_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator2_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator2_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator2_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeCreator_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeDucer_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeDucer_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeDucer_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeDucer_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeDucer_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeDucer_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MeDucer_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarMax_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarMax_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarMax_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarMax_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarMax_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarMax_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarMax_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarPro_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarPro_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarPro_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarPro_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarPro_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarPro_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarPro_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarS_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarS_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarS_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarS_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarS_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarS_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_MizarS_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Mizar_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Mizar_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Mizar_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Mizar_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Mizar_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Mizar_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Mizar_1.0.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Thunder_0.2.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Thunder_0.3.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Thunder_0.4.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Thunder_0.5.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Thunder_0.6.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Thunder_0.8.inst.cfg (100%) rename resources/variants/{ => geeetech_variants}/geeetech_Thunder_1.0.inst.cfg (100%) diff --git a/resources/definitions/Geeetech_Base_Dual_Extruder.def.json b/resources/definitions/Geeetech_Base_Dual_Extruder.def.json new file mode 100644 index 0000000000..ddaeb46dbb --- /dev/null +++ b/resources/definitions/Geeetech_Base_Dual_Extruder.def.json @@ -0,0 +1,117 @@ +{ + "version": 2, + "name": "Geeetech Base Dual-Extruder Printer", + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "Teddy.Hu", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "first_start_actions": ["MachineSettingsAction"], + "has_materials": true, + "has_variants": false, + "has_machine_quality": true, + "variants_name": "Nozzle Size", + "preferred_variant_name": "0.4mm Nozzle", + "preferred_quality_type": "standard", + "preferred_material": "generic_pla", + "quality_definition": "Geeetech_Base_Single_Extruder", + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, + + "overrides":{ + "machine_name": { "default_value": "Geeetech Base Dual-Extruder Printer" }, + "machine_width": { "default_value": 350 }, + "machine_depth": { "default_value": 350 }, + "machine_height": {"default_value": 350 }, + "machine_head_with_fans_polygon": { "default_value": [[-40, 40], [40, 40], [40, -40], [-40, -40]] }, + "gantry_height": { "value": 40 }, + + "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, + "machine_heated_bed": { "default_value": true }, + "machine_extruder_count": { "default_value": 2 }, + + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 40 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 111 }, + "machine_max_acceleration_e": { "value": 1000 }, + "machine_acceleration": { "value": 500 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_max_jerk_e": { "value": 4.9 }, + + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + + "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" }, + "retraction_speed": { "value": 35 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, + "small_hole_max_size":{ "value": "5 if speed_infill>=150 else 0" }, + "cool_min_layer_time":{ "value": "1.3 if speed_infill>=200 else 5" }, + "material_print_temperature": { "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230", "maximum_value": "250" }, + "material_print_temperature_layer_0": { "value": "material_print_temperature + 5", "maximum_value_warning": 250 }, + "material_initial_print_temperature": { "value": "material_print_temperature - 5", "minimum_value_warning": "material_standby_temperature - 10" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_bed_temperature": { "maximum_value_warning": 110 }, + + "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" }, + "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" }, + "speed_layer_0": { "value":"50 if speed_infill <= 150 else 75","maximum_value_warning": "100" }, + "speed_print_layer_0": { "value": "25 if speed_infill <= 150 else 35","maximum_value_warning": "60" }, + "speed_travel_layer_0": { "value": "speed_layer_0","maximum_value_warning": "150" }, + "skirt_brim_speed": { "value":"speed_print_layer_0","maximum_value_warning": "60" }, + + "speed_support": { "value": "speed_print*0.5" }, + "speed_support_interface": { "value": "speed_support / 0.8" }, + "speed_support_roof": { "value": "speed_support_interface / 2" }, + "speed_support_bottom": { "value": "speed_support_roof" }, + + "wall_transition_filter_deviation":{ "value": 0.15 }, + "travel_avoid_supports": { "value": true }, + "retraction_hop": { "value": 0.5 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" }, + "retraction_combing_max_distance": { "value": 30 }, + "optimize_wall_printing_order": { "value": true }, + "z_seam_type": { "value": "'sharpest_corner'" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + + "support_use_towers": { "value": false }, + "support_pattern": { "value": "'zigzag'" }, + "support_wall_count": { "value": 0 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + + "support_interface_height": { "value": "layer_height * 3" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_skip_height": { "value": 0.2 }, + "support_interface_pattern": { "value": "zigzag" }, + + "minimum_support_area": { "value": 2 }, + "minimum_interface_area": { "value": 10 }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": { "value": "line_width * 2" }, + + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "skirt_gap": { "value": 6 }, + + "prime_tower_size": { "value": 30 }, + "prime_tower_min_volume": { "value": 85, "maximum_value_warning":150 }, + "prime_tower_brim_enable": { "value": true } + } +} diff --git a/resources/definitions/Geeetech_Base_Multi_Extruder.def.json b/resources/definitions/Geeetech_Base_Multi_Extruder.def.json new file mode 100644 index 0000000000..35fc613eef --- /dev/null +++ b/resources/definitions/Geeetech_Base_Multi_Extruder.def.json @@ -0,0 +1,117 @@ +{ + "version": 2, + "name": "Geeetech Base Multi-Extruder Printer", + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "Teddy.Hu", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "first_start_actions": ["MachineSettingsAction"], + "has_materials": true, + "has_variants": false, + "has_machine_quality": true, + "variants_name": "Nozzle Size", + "preferred_variant_name": "0.4mm Nozzle", + "preferred_quality_type": "standard", + "preferred_material": "generic_pla", + "quality_definition": "Geeetech_Base_Single_Extruder", + "machine_extruder_trains": { + "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" + } + }, + + "overrides":{ + "machine_name": { "default_value": "Geeetech Base Multi-Extruder Printer" }, + "machine_width": { "default_value": 350 }, + "machine_depth": { "default_value": 350 }, + "machine_height": {"default_value": 350 }, + "machine_head_with_fans_polygon": { "default_value": [[-40, 40], [40, 40], [40, -40], [-40, -40]] }, + "gantry_height": { "value": 40 }, + + "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, + "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, + "machine_heated_bed": { "default_value": true }, + "machine_extruder_count": { "default_value": 3 }, + + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 40 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 111 }, + "machine_max_acceleration_e": { "value": 1000 }, + "machine_acceleration": { "value": 500 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_max_jerk_e": { "value": 4.9 }, + + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + + "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" }, + "retraction_speed": { "value": 35 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, + "small_hole_max_size":{ "value": "5 if speed_infill>=150 else 0" }, + "cool_min_layer_time":{ "value": "1.3 if speed_infill>=200 else 5" }, + "material_print_temperature": { "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230", "maximum_value": "250" }, + "material_print_temperature_layer_0": { "value": "material_print_temperature + 5", "maximum_value_warning": 250 }, + "material_initial_print_temperature": { "value": "material_print_temperature - 5", "minimum_value_warning": "material_standby_temperature - 10" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_bed_temperature": { "maximum_value_warning": 110 }, + + "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" }, + "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" }, + "speed_layer_0": { "value":"50 if speed_infill <= 150 else 75","maximum_value_warning": "100" }, + "speed_print_layer_0": { "value": "25 if speed_infill <= 150 else 35","maximum_value_warning": "60" }, + "speed_travel_layer_0": { "value": "speed_layer_0","maximum_value_warning": "150" }, + "skirt_brim_speed": { "value":"speed_print_layer_0","maximum_value_warning": "60" }, + + "speed_support": { "value": "speed_print*0.5" }, + "speed_support_interface": { "value": "speed_support / 0.8" }, + "speed_support_roof": { "value": "speed_support_interface / 2" }, + "speed_support_bottom": { "value": "speed_support_roof" }, + + "wall_transition_filter_deviation":{ "value": 0.15 }, + "travel_avoid_supports": { "value": true }, + "retraction_hop": { "value": 0.5 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" }, + "retraction_combing_max_distance": { "value": 30 }, + "optimize_wall_printing_order": { "value": true }, + "z_seam_type": { "value": "'sharpest_corner'" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + + "support_use_towers": { "value": false }, + "support_pattern": { "value": "'zigzag'" }, + "support_wall_count": { "value": 0 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + + "support_interface_height": { "value": "layer_height * 3" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_skip_height": { "value": 0.2 }, + "support_interface_pattern": { "value": "zigzag" }, + + "minimum_support_area": { "value": 2 }, + "minimum_interface_area": { "value": 10 }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": { "value": "line_width * 2" }, + + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "skirt_gap": { "value": 6 }, + + "prime_tower_size": { "value": 30 }, + "prime_tower_min_volume": { "value": 85, "maximum_value_warning":150 }, + "prime_tower_brim_enable": { "value": true } + } +} diff --git a/resources/definitions/Geeetech_base.def.json b/resources/definitions/Geeetech_Base_Single_Extruder.def.json similarity index 94% rename from resources/definitions/Geeetech_base.def.json rename to resources/definitions/Geeetech_Base_Single_Extruder.def.json index bb30682803..ecefa15408 100644 --- a/resources/definitions/Geeetech_base.def.json +++ b/resources/definitions/Geeetech_Base_Single_Extruder.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Geeetech Base Printer", + "name": "Geeetech Base Single Extruder Printer", "inherits": "fdmprinter", "metadata": { "visible": false, @@ -9,16 +9,20 @@ "file_formats": "text/x-gcode", "first_start_actions": ["MachineSettingsAction"], "has_materials": true, - "has_variants": false, + "has_variants": true, "has_machine_quality": true, "variants_name": "Nozzle Size", "preferred_variant_name": "0.4mm Nozzle", "preferred_quality_type": "standard", - "preferred_material": "generic_pla" + "preferred_material": "generic_pla", + "quality_definition": "Geeetech_Base_Single_Extruder", + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" + } }, "overrides":{ - "machine_name": { "default_value": "Geeetech Base Printer" }, + "machine_name": { "default_value": "Geeetech Base Single Extruder Printer" }, "machine_width": { "default_value": 350 }, "machine_depth": { "default_value": 350 }, "machine_height": {"default_value": 350 }, @@ -103,10 +107,6 @@ "adhesion_type": { "value": "'skirt'" }, "brim_replaces_support": { "value": false }, - "skirt_gap": { "value": 6 }, - - "prime_tower_size": { "value": 30 }, - "prime_tower_min_volume": { "value": 85, "maximum_value_warning":150 }, - "prime_tower_brim_enable": { "value": true } + "skirt_gap": { "value": 6 } } } diff --git a/resources/definitions/geeetech_A10M.def.json b/resources/definitions/geeetech_A10M.def.json index 752db2dfa1..98ee8d7992 100644 --- a/resources/definitions/geeetech_A10M.def.json +++ b/resources/definitions/geeetech_A10M.def.json @@ -1,18 +1,14 @@ { "version": 2, "name": "Geeetech A10M", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Dual_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": false, - "has_machine_quality": true, + "visible": true, "preferred_material": "Geeetech_PLA_Cyan", - "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" - } - }, + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A10M" }, @@ -26,7 +22,6 @@ "prime_tower_position_y":{ "value": 160 }, "machine_start_gcode": { "default_value": ";Geeetech A10M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 2 } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_A10Pro.def.json b/resources/definitions/geeetech_A10Pro.def.json index eb9616bf64..b52e76cf98 100644 --- a/resources/definitions/geeetech_A10Pro.def.json +++ b/resources/definitions/geeetech_A10Pro.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech A10Pro", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" - } - }, + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A10Pro" }, diff --git a/resources/definitions/geeetech_A10T.def.json b/resources/definitions/geeetech_A10T.def.json index 8ce9b67bd7..ef08b7308f 100644 --- a/resources/definitions/geeetech_A10T.def.json +++ b/resources/definitions/geeetech_A10T.def.json @@ -1,18 +1,14 @@ { "version": 2, "name": "Geeetech A10T", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Multi_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": false, - "has_machine_quality": true, + "visible": true, "preferred_material": "Geeetech_PLA_Magenta", - "machine_extruder_trains": { - "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" - } - }, + "machine_extruder_trains": { + "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A10T" }, @@ -26,7 +22,6 @@ "prime_tower_position_y":{ "value": 160 }, "machine_start_gcode": { "default_value": ";Geeetech A10T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 3 } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_A20.def.json b/resources/definitions/geeetech_A20.def.json index 0d38988d16..ffab8249cd 100644 --- a/resources/definitions/geeetech_A20.def.json +++ b/resources/definitions/geeetech_A20.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech A20", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech A20" }, diff --git a/resources/definitions/geeetech_A20M.def.json b/resources/definitions/geeetech_A20M.def.json index f7770a87d0..24facca7f8 100644 --- a/resources/definitions/geeetech_A20M.def.json +++ b/resources/definitions/geeetech_A20M.def.json @@ -1,18 +1,14 @@ { "version": 2, "name": "Geeetech A20M", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Dual_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": false, - "has_machine_quality": true, + "visible": true, "preferred_material": "Geeetech_PLA_Yellow", - "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" - } - }, + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A20M" }, @@ -26,7 +22,6 @@ "prime_tower_position_y":{ "value": 190 }, "machine_start_gcode": { "default_value": ";Geeetech A20M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 2 } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_A20T.def.json b/resources/definitions/geeetech_A20T.def.json index 2771499554..a404e72f69 100644 --- a/resources/definitions/geeetech_A20T.def.json +++ b/resources/definitions/geeetech_A20T.def.json @@ -1,18 +1,14 @@ { "version": 2, "name": "Geeetech A20T", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Multi_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": false, - "has_machine_quality": true, + "visible": true, "preferred_material": "Geeetech_PLA_Red", - "machine_extruder_trains": { - "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" - } - }, + "machine_extruder_trains": { + "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A20T" }, @@ -26,7 +22,6 @@ "prime_tower_position_y":{ "value": 190 }, "machine_start_gcode": { "default_value": ";Geeetech A20T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 3 } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_A30M.def.json b/resources/definitions/geeetech_A30M.def.json index 225f3f5d59..ff7845b329 100644 --- a/resources/definitions/geeetech_A30M.def.json +++ b/resources/definitions/geeetech_A30M.def.json @@ -1,18 +1,14 @@ { "version": 2, "name": "Geeetech A30M", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Dual_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": false, - "has_machine_quality": true, + "visible": true, "preferred_material": "Geeetech_PLA_Green", - "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" - } - }, + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A30M" }, @@ -26,7 +22,6 @@ "prime_tower_position_y":{ "value": 260 }, "machine_start_gcode": { "default_value": ";Geeetech A30M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 2 } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_A30Pro.def.json b/resources/definitions/geeetech_A30Pro.def.json index ebf23a0eef..0b5c82c1e8 100644 --- a/resources/definitions/geeetech_A30Pro.def.json +++ b/resources/definitions/geeetech_A30Pro.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech A30Pro", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech A30Pro" }, diff --git a/resources/definitions/geeetech_A30T.def.json b/resources/definitions/geeetech_A30T.def.json index 7c44017a5f..186fc08e2a 100644 --- a/resources/definitions/geeetech_A30T.def.json +++ b/resources/definitions/geeetech_A30T.def.json @@ -1,18 +1,14 @@ { "version": 2, "name": "Geeetech A30T", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Multi_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": false, - "has_machine_quality": true, + "visible": true, "preferred_material": "Geeetech_PLA_Blue", - "machine_extruder_trains": { - "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" - } - }, + "machine_extruder_trains": { + "0": "Geeetech_Multi_Extruder_0", "1": "Geeetech_Multi_Extruder_1", "2": "Geeetech_Multi_Extruder_2" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech A30T" }, @@ -26,7 +22,6 @@ "prime_tower_position_y":{ "value": 260 }, "machine_start_gcode": { "default_value": ";Geeetech A30T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 3 } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_E180.def.json b/resources/definitions/geeetech_E180.def.json index d61086259b..a2839d7fed 100644 --- a/resources/definitions/geeetech_E180.def.json +++ b/resources/definitions/geeetech_E180.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech E180", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech E180" }, diff --git a/resources/definitions/geeetech_GiantArmD200.def.json b/resources/definitions/geeetech_GiantArmD200.def.json index 663b206ba7..027b8b8973 100644 --- a/resources/definitions/geeetech_GiantArmD200.def.json +++ b/resources/definitions/geeetech_GiantArmD200.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech GiantArmD200", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech GiantArmD200" }, diff --git a/resources/definitions/geeetech_I3ProB.def.json b/resources/definitions/geeetech_I3ProB.def.json index 399ec0df0a..1cc17f55ec 100644 --- a/resources/definitions/geeetech_I3ProB.def.json +++ b/resources/definitions/geeetech_I3ProB.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech I3ProB", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech I3ProB" }, diff --git a/resources/definitions/geeetech_I3ProC.def.json b/resources/definitions/geeetech_I3ProC.def.json index e4fdbff3ea..87d4b5391f 100644 --- a/resources/definitions/geeetech_I3ProC.def.json +++ b/resources/definitions/geeetech_I3ProC.def.json @@ -1,18 +1,14 @@ { "version": 2, "name": "Geeetech I3ProC", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Dual_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": false, - "has_machine_quality": true, + "visible": true, "preferred_material": "Geeetech_PLA_Black", - "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" - } - }, + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech I3ProC" }, @@ -27,7 +23,6 @@ "prime_tower_position_y":{ "value": 140 }, "machine_start_gcode": { "default_value": ";Geeetech I3ProC Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 2 } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_I3ProW.def.json b/resources/definitions/geeetech_I3ProW.def.json index acb0bb10ad..fdc6f866bb 100644 --- a/resources/definitions/geeetech_I3ProW.def.json +++ b/resources/definitions/geeetech_I3ProW.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech I3ProW", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech I3ProW" }, diff --git a/resources/definitions/geeetech_MeCreator.def.json b/resources/definitions/geeetech_MeCreator.def.json index 1f9ed2c6b9..c0d22e539c 100644 --- a/resources/definitions/geeetech_MeCreator.def.json +++ b/resources/definitions/geeetech_MeCreator.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech MeCreator", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech MeCreator" }, diff --git a/resources/definitions/geeetech_MeCreator2.def.json b/resources/definitions/geeetech_MeCreator2.def.json index 3a856ca67a..d9a5016093 100644 --- a/resources/definitions/geeetech_MeCreator2.def.json +++ b/resources/definitions/geeetech_MeCreator2.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech MeCreator2", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech MeCreator2" }, diff --git a/resources/definitions/geeetech_MeDucer.def.json b/resources/definitions/geeetech_MeDucer.def.json index ef17de75c3..879f0cbfcd 100644 --- a/resources/definitions/geeetech_MeDucer.def.json +++ b/resources/definitions/geeetech_MeDucer.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech MeDucer", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech MeDucer" }, diff --git a/resources/definitions/geeetech_Mizar.def.json b/resources/definitions/geeetech_Mizar.def.json index b9569c7649..ef7e4e17cd 100644 --- a/resources/definitions/geeetech_Mizar.def.json +++ b/resources/definitions/geeetech_Mizar.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech Mizar", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech Mizar" }, diff --git a/resources/definitions/geeetech_MizarM.def.json b/resources/definitions/geeetech_MizarM.def.json index 3a8f31bf9b..ac9c2e4bd0 100644 --- a/resources/definitions/geeetech_MizarM.def.json +++ b/resources/definitions/geeetech_MizarM.def.json @@ -1,18 +1,14 @@ { "version": 2, "name": "Geeetech MizarM", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Dual_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": false, - "has_machine_quality": true, + "visible": true, "preferred_material": "Geeetech_PLA_Magenta", - "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" - } - }, + "machine_extruder_trains": { + "0": "Geeetech_Dual_Extruder_0", "1": "Geeetech_Dual_Extruder_1" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech MizarM" }, @@ -27,7 +23,6 @@ "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarM: https://github.com/Geeetech3D/Mizar-M \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, - "machine_extruder_count": { "default_value": 2 }, "material_standby_temperature": {"value": 200 } } } diff --git a/resources/definitions/geeetech_MizarMax.def.json b/resources/definitions/geeetech_MizarMax.def.json index 4856ac5065..315318a6a7 100644 --- a/resources/definitions/geeetech_MizarMax.def.json +++ b/resources/definitions/geeetech_MizarMax.def.json @@ -1,14 +1,13 @@ { "version": 2, "name": "Geeetech MizarMax", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true - }, + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech MizarMax" }, diff --git a/resources/definitions/geeetech_MizarPro.def.json b/resources/definitions/geeetech_MizarPro.def.json index b91ef3e066..683552127a 100644 --- a/resources/definitions/geeetech_MizarPro.def.json +++ b/resources/definitions/geeetech_MizarPro.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech MizarPro", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" } - }, + }, "overrides": { "machine_name": { "default_value": "Geeetech MizarPro" }, diff --git a/resources/definitions/geeetech_MizarS.def.json b/resources/definitions/geeetech_MizarS.def.json index f2d026aeb8..ef4195413e 100644 --- a/resources/definitions/geeetech_MizarS.def.json +++ b/resources/definitions/geeetech_MizarS.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech MizarS", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" - } - }, + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech MizarS" }, diff --git a/resources/definitions/geeetech_Thunder.def.json b/resources/definitions/geeetech_Thunder.def.json index 141459dae8..0bb7383d5c 100644 --- a/resources/definitions/geeetech_Thunder.def.json +++ b/resources/definitions/geeetech_Thunder.def.json @@ -1,17 +1,13 @@ { "version": 2, "name": "Geeetech Thunder", - "inherits": "Geeetech_base", + "inherits": "Geeetech_Base_Single_Extruder", "metadata": { - "quality_definition": "Geeetech_base", - "visible": true, - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" - } - }, + "visible": true, + "machine_extruder_trains": { + "0": "Geeetech_Single_Extruder" + } + }, "overrides": { "machine_name": { "default_value": "Geeetech Thunder" }, @@ -47,8 +43,7 @@ "cool_fan_speed_max":{ "maximum_value": "151","value": "cool_fan_speed" }, "material_print_temperature": { "value": "200 if speed_infill <=150 else 205 if speed_infill <= 200 else 215 if speed_infill <= 260 else 220","maximum_value": "250" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature" }, - "material_initial_print_temperature": { "value": "material_print_temperature - 5" }, + "material_print_temperature_layer_0": { "value": "material_print_temperature","maximum_value_warning": 300 }, "material_flow_layer_0": { "value": 95 }, "speed_print": { "value":250, "maximum_value_warning": "300" }, diff --git a/resources/extruders/Geeetech_Dual_Extruder_0.def.json b/resources/extruders/Geeetech_Dual_Extruder_0.def.json index 643e764759..80c158541c 100644 --- a/resources/extruders/Geeetech_Dual_Extruder_0.def.json +++ b/resources/extruders/Geeetech_Dual_Extruder_0.def.json @@ -3,7 +3,7 @@ "name": "E0", "inherits": "fdmextruder", "metadata": { - "machine": "Geeetech_base", + "machine": "Geeetech_Base_Dual_Extruder", "position": "0" }, diff --git a/resources/extruders/Geeetech_Dual_Extruder_1.def.json b/resources/extruders/Geeetech_Dual_Extruder_1.def.json index e16bba320e..523a5012be 100644 --- a/resources/extruders/Geeetech_Dual_Extruder_1.def.json +++ b/resources/extruders/Geeetech_Dual_Extruder_1.def.json @@ -3,7 +3,7 @@ "name": "E1", "inherits": "fdmextruder", "metadata": { - "machine": "Geeetech_base", + "machine": "Geeetech_Base_Dual_Extruder", "position": "1" }, diff --git a/resources/extruders/Geeetech_Multi_Extruder_0.def.json b/resources/extruders/Geeetech_Multi_Extruder_0.def.json index b76d15a243..11d9c1863f 100644 --- a/resources/extruders/Geeetech_Multi_Extruder_0.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_0.def.json @@ -3,7 +3,7 @@ "name": "E0", "inherits": "fdmextruder", "metadata": { - "machine": "Geeetech_base", + "machine": "Geeetech_Base_Multi_Extruder", "position": "0" }, diff --git a/resources/extruders/Geeetech_Multi_Extruder_1.def.json b/resources/extruders/Geeetech_Multi_Extruder_1.def.json index bafd632c2d..bd8f0a2a50 100644 --- a/resources/extruders/Geeetech_Multi_Extruder_1.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_1.def.json @@ -3,7 +3,7 @@ "name": "E1", "inherits": "fdmextruder", "metadata": { - "machine": "Geeetech_base", + "machine": "Geeetech_Base_Multi_Extruder", "position": "1" }, diff --git a/resources/extruders/Geeetech_Multi_Extruder_2.def.json b/resources/extruders/Geeetech_Multi_Extruder_2.def.json index de8d8e7cf4..2dd7890602 100644 --- a/resources/extruders/Geeetech_Multi_Extruder_2.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_2.def.json @@ -3,7 +3,7 @@ "name": "E2", "inherits": "fdmextruder", "metadata": { - "machine": "Geeetech_base", + "machine": "Geeetech_Base_Multi_Extruder", "position": "2" }, diff --git a/resources/extruders/Geeetech_base_extruder_0.def.json b/resources/extruders/Geeetech_Single_Extruder.def.json similarity index 83% rename from resources/extruders/Geeetech_base_extruder_0.def.json rename to resources/extruders/Geeetech_Single_Extruder.def.json index 92ce300264..79477f3fa7 100644 --- a/resources/extruders/Geeetech_base_extruder_0.def.json +++ b/resources/extruders/Geeetech_Single_Extruder.def.json @@ -3,7 +3,7 @@ "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "Geeetech_base", + "machine": "Geeetech_Base_Single_Extruder", "position": "0" }, diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_ABS_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.2_ABS_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg index 01b80df9a8..23d68a1f19 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.2_ABS_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_ABS_ultra.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.2_ABS_ultra.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg index 7550335d32..b6a5db63e2 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Ultra Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_PETG_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.2_PETG_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg index b08ceb3356..db0c9bdcfa 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.2_PETG_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_PETG_ultra.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.2_PETG_ultra.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg index f4ec88b0d5..fd2669f02a 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Ultra Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_PLA_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.2_PLA_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg index 5f509567b6..0527d47d34 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.2_PLA_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.2_PLA_ultra.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.2_PLA_ultra.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg index 2de66cde6a..c9d5ffeced 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Ultra Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.3_ABS_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg index 0e8245c33f..d2e51f1123 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg similarity index 81% rename from resources/quality/geeetech/base/Geeetech_base_0.3_ABS_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg index 073be69795..ce1b00f4bf 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.3_ABS_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg index 39d893ac2e..bb44eab4b9 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.3_ABS_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg index 10796f5202..4c1f8631bf 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_ABS_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.3_PETG_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg index 6b72e53635..36ca672c2a 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.3_PETG_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg index cf35907ca2..95851f3b69 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.3_PETG_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg index bb678ce041..0352cbaa00 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.3_PETG_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg index ada5f7a390..2fdbe1ad66 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_PETG_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.3_PLA_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg index bf95f6a9a8..a7df86a624 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.3_PLA_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg index 3eee9d53f1..c39d03abac 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.3_PLA_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg index a11f13a986..ce024f494f 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.3_PLA_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg index 8db81a0c0e..13438f4b7d 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_PLA_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.3_TPU_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg index c7c06d090b..69488d9dbe 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.3_TPU_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg index a3ef7db048..d09a702a35 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.3_TPU_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg index dbf2ca78ba..b8bdc47ac4 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.3_TPU_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.4_ABS_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg index 6fc3222d99..08b6311697 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg similarity index 81% rename from resources/quality/geeetech/base/Geeetech_base_0.4_ABS_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg index f8b743a19a..cadd36431c 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.4_ABS_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg index 5a17bbca91..d380982a96 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.4_ABS_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg index aecdd7022b..145a600020 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_ABS_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.4_PETG_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg index 51765854d5..c6d1c8e846 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.4_PETG_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg index 62de9a4d69..bcf24a02f6 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.4_PETG_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg index 19ca63f536..3058020223 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.4_PETG_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg index d3fbf0e8f4..99bd835435 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_PETG_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.4_PLA_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg index 43bf6c9de6..29706a0afa 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.4_PLA_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg index 4f686cbe78..f73d8500ce 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.4_PLA_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg index d434d498a4..236ac49c26 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.4_PLA_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg index 2fcb4ff8e1..494b688365 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_PLA_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.4_TPU_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg index f03817c70a..19b76d25a4 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.4_TPU_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg index 3af1b80ed4..a138c2febb 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.4_TPU_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg index 4b27e8e13c..6fc524679d 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.4_TPU_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.5_ABS_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg index 92d3aa871e..7c85b80f12 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg similarity index 81% rename from resources/quality/geeetech/base/Geeetech_base_0.5_ABS_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg index 25c9737ea9..18847dde16 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.5_ABS_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg index f5f31773aa..2673fbc457 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.5_ABS_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg index bdbb44b782..dcac153cae 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_ABS_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.5_PETG_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg index a7edf563b0..6bcaadd27d 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.5_PETG_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg index e5030ebe4e..96e94064ca 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.5_PETG_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg index bfad08010a..74e1b40b2c 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.5_PETG_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg index 62cdd9091f..d9631f34c0 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_PETG_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.5_PLA_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg index 81e518d267..c234c8052d 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.5_PLA_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg index 3ee1663092..eb889c34db 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.5_PLA_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg index 9ecff4cde8..e52f6c4e30 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.5_PLA_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg index 1b0a6908da..a282aea68e 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_PLA_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.5_TPU_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg index 288e9511a4..00e0c97c9b 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.5_TPU_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg index fd22b36d3e..24dd29ef1e 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.5_TPU_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg index 28a4f0513f..e16ba9d3cc 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.5_TPU_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_ABS_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.6_ABS_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg index 9b4587f8c7..a8284fbadc 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.6_ABS_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_PETG_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.6_PETG_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg index a84ff6726a..288322cd80 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.6_PETG_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.6_PLA_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg index 10f291f23a..4ad555530e 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.6_PLA_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg index 2b54a3aab7..e3f82cf489 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.6_PLA_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg index 3da51149fb..dcac59be4d 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.6_PLA_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.6_TPU_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg similarity index 80% rename from resources/quality/geeetech/base/Geeetech_base_0.6_TPU_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg index b4cd165c86..5cf65de53b 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.6_TPU_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.8_ABS_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_0.8_ABS_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg index 2fe8a1cbc9..1befe8746d 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.8_ABS_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.8_PETG_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_0.8_PETG_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg index 1d12e5116d..1869e13f58 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.8_PETG_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.8_PLA_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.8_PLA_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg index 7029bc3b41..c2e0ae6af5 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.8_PLA_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_0.8_TPU_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_0.8_TPU_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg index 894a96bf0e..f5917efef8 100644 --- a/resources/quality/geeetech/base/Geeetech_base_0.8_TPU_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_1.0_ABS_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg similarity index 82% rename from resources/quality/geeetech/base/Geeetech_base_1.0_ABS_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg index c89a05de6b..050e3f4f61 100644 --- a/resources/quality/geeetech/base/Geeetech_base_1.0_ABS_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_1.0_PETG_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg similarity index 85% rename from resources/quality/geeetech/base/Geeetech_base_1.0_PETG_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg index 72c56b76ee..50b9f58b67 100644 --- a/resources/quality/geeetech/base/Geeetech_base_1.0_PETG_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_1.0_PLA_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_1.0_PLA_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg index 6208a26582..6df137e69f 100644 --- a/resources/quality/geeetech/base/Geeetech_base_1.0_PLA_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_1.0_TPU_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg similarity index 79% rename from resources/quality/geeetech/base/Geeetech_base_1.0_TPU_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg index 02b1566db0..992cc49a15 100644 --- a/resources/quality/geeetech/base/Geeetech_base_1.0_TPU_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_global_adaptive.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg similarity index 89% rename from resources/quality/geeetech/base/Geeetech_base_global_adaptive.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg index 3a5f42d1d5..d028674295 100644 --- a/resources/quality/geeetech/base/Geeetech_base_global_adaptive.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Dynamic Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_global_draft.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_draft.inst.cfg similarity index 88% rename from resources/quality/geeetech/base/Geeetech_base_global_draft.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_global_draft.inst.cfg index ec6a8f4e33..07ebd2ee1b 100644 --- a/resources/quality/geeetech/base/Geeetech_base_global_draft.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_global_low.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_low.inst.cfg similarity index 88% rename from resources/quality/geeetech/base/Geeetech_base_global_low.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_global_low.inst.cfg index 910a75b8c9..914683e719 100644 --- a/resources/quality/geeetech/base/Geeetech_base_global_low.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_low.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Low Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_global_standard.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_standard.inst.cfg similarity index 88% rename from resources/quality/geeetech/base/Geeetech_base_global_standard.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_global_standard.inst.cfg index b1e56d70c5..2f956a84cc 100644 --- a/resources/quality/geeetech/base/Geeetech_base_global_standard.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_global_super.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_super.inst.cfg similarity index 88% rename from resources/quality/geeetech/base/Geeetech_base_global_super.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_global_super.inst.cfg index 80be22c1bf..881986b6a5 100644 --- a/resources/quality/geeetech/base/Geeetech_base_global_super.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_super.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Super Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/quality/geeetech/base/Geeetech_base_global_ultra.inst.cfg b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_ultra.inst.cfg similarity index 88% rename from resources/quality/geeetech/base/Geeetech_base_global_ultra.inst.cfg rename to resources/quality/geeetech/geeetech_quality/geeetech_quality_global_ultra.inst.cfg index e8106f71a6..1741b76338 100644 --- a/resources/quality/geeetech/base/Geeetech_base_global_ultra.inst.cfg +++ b/resources/quality/geeetech/geeetech_quality/geeetech_quality_global_ultra.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Ultra Quality -definition = Geeetech_base +definition = Geeetech_Base_Single_Extruder [metadata] setting_version = 20 diff --git a/resources/variants/geeetech_A10Pro_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_A10Pro_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A10Pro_0.2.inst.cfg diff --git a/resources/variants/geeetech_A10Pro_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_A10Pro_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A10Pro_0.3.inst.cfg diff --git a/resources/variants/geeetech_A10Pro_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_A10Pro_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A10Pro_0.4.inst.cfg diff --git a/resources/variants/geeetech_A10Pro_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_A10Pro_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A10Pro_0.5.inst.cfg diff --git a/resources/variants/geeetech_A10Pro_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_A10Pro_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A10Pro_0.6.inst.cfg diff --git a/resources/variants/geeetech_A10Pro_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_A10Pro_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A10Pro_0.8.inst.cfg diff --git a/resources/variants/geeetech_A10Pro_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_A10Pro_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A10Pro_1.0.inst.cfg diff --git a/resources/variants/geeetech_A20_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_A20_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A20_0.2.inst.cfg diff --git a/resources/variants/geeetech_A20_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_A20_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A20_0.3.inst.cfg diff --git a/resources/variants/geeetech_A20_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_A20_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A20_0.4.inst.cfg diff --git a/resources/variants/geeetech_A20_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_A20_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A20_0.5.inst.cfg diff --git a/resources/variants/geeetech_A20_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_A20_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A20_0.6.inst.cfg diff --git a/resources/variants/geeetech_A20_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_A20_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A20_0.8.inst.cfg diff --git a/resources/variants/geeetech_A20_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_A20_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A20_1.0.inst.cfg diff --git a/resources/variants/geeetech_A30Pro_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_A30Pro_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A30Pro_0.2.inst.cfg diff --git a/resources/variants/geeetech_A30Pro_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_A30Pro_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A30Pro_0.3.inst.cfg diff --git a/resources/variants/geeetech_A30Pro_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_A30Pro_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A30Pro_0.4.inst.cfg diff --git a/resources/variants/geeetech_A30Pro_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_A30Pro_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A30Pro_0.5.inst.cfg diff --git a/resources/variants/geeetech_A30Pro_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_A30Pro_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A30Pro_0.6.inst.cfg diff --git a/resources/variants/geeetech_A30Pro_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_A30Pro_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A30Pro_0.8.inst.cfg diff --git a/resources/variants/geeetech_A30Pro_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_A30Pro_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_A30Pro_1.0.inst.cfg diff --git a/resources/variants/geeetech_E180_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_E180_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_E180_0.2.inst.cfg diff --git a/resources/variants/geeetech_E180_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_E180_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_E180_0.3.inst.cfg diff --git a/resources/variants/geeetech_E180_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_E180_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_E180_0.4.inst.cfg diff --git a/resources/variants/geeetech_E180_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_E180_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_E180_0.5.inst.cfg diff --git a/resources/variants/geeetech_E180_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_E180_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_E180_0.6.inst.cfg diff --git a/resources/variants/geeetech_E180_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_E180_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_E180_0.8.inst.cfg diff --git a/resources/variants/geeetech_E180_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_E180_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_E180_1.0.inst.cfg diff --git a/resources/variants/geeetech_GiantArmD200_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_GiantArmD200_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_GiantArmD200_0.2.inst.cfg diff --git a/resources/variants/geeetech_GiantArmD200_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_GiantArmD200_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_GiantArmD200_0.3.inst.cfg diff --git a/resources/variants/geeetech_GiantArmD200_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_GiantArmD200_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_GiantArmD200_0.4.inst.cfg diff --git a/resources/variants/geeetech_GiantArmD200_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_GiantArmD200_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_GiantArmD200_0.5.inst.cfg diff --git a/resources/variants/geeetech_GiantArmD200_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_GiantArmD200_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_GiantArmD200_0.6.inst.cfg diff --git a/resources/variants/geeetech_GiantArmD200_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_GiantArmD200_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_GiantArmD200_0.8.inst.cfg diff --git a/resources/variants/geeetech_GiantArmD200_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_GiantArmD200_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_GiantArmD200_1.0.inst.cfg diff --git a/resources/variants/geeetech_I3ProB_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProB_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProB_0.2.inst.cfg diff --git a/resources/variants/geeetech_I3ProB_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProB_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProB_0.3.inst.cfg diff --git a/resources/variants/geeetech_I3ProB_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProB_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProB_0.4.inst.cfg diff --git a/resources/variants/geeetech_I3ProB_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProB_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProB_0.5.inst.cfg diff --git a/resources/variants/geeetech_I3ProB_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProB_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProB_0.6.inst.cfg diff --git a/resources/variants/geeetech_I3ProB_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProB_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProB_0.8.inst.cfg diff --git a/resources/variants/geeetech_I3ProB_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProB_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProB_1.0.inst.cfg diff --git a/resources/variants/geeetech_I3ProW_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProW_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProW_0.2.inst.cfg diff --git a/resources/variants/geeetech_I3ProW_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProW_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProW_0.3.inst.cfg diff --git a/resources/variants/geeetech_I3ProW_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProW_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProW_0.4.inst.cfg diff --git a/resources/variants/geeetech_I3ProW_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProW_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProW_0.5.inst.cfg diff --git a/resources/variants/geeetech_I3ProW_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProW_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProW_0.6.inst.cfg diff --git a/resources/variants/geeetech_I3ProW_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProW_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProW_0.8.inst.cfg diff --git a/resources/variants/geeetech_I3ProW_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_I3ProW_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_I3ProW_1.0.inst.cfg diff --git a/resources/variants/geeetech_MeCreator2_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator2_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator2_0.2.inst.cfg diff --git a/resources/variants/geeetech_MeCreator2_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator2_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator2_0.3.inst.cfg diff --git a/resources/variants/geeetech_MeCreator2_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator2_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator2_0.4.inst.cfg diff --git a/resources/variants/geeetech_MeCreator2_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator2_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator2_0.5.inst.cfg diff --git a/resources/variants/geeetech_MeCreator2_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator2_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator2_0.6.inst.cfg diff --git a/resources/variants/geeetech_MeCreator2_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator2_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator2_0.8.inst.cfg diff --git a/resources/variants/geeetech_MeCreator2_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator2_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator2_1.0.inst.cfg diff --git a/resources/variants/geeetech_MeCreator_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator_0.2.inst.cfg diff --git a/resources/variants/geeetech_MeCreator_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator_0.3.inst.cfg diff --git a/resources/variants/geeetech_MeCreator_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator_0.4.inst.cfg diff --git a/resources/variants/geeetech_MeCreator_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator_0.5.inst.cfg diff --git a/resources/variants/geeetech_MeCreator_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator_0.6.inst.cfg diff --git a/resources/variants/geeetech_MeCreator_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator_0.8.inst.cfg diff --git a/resources/variants/geeetech_MeCreator_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeCreator_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeCreator_1.0.inst.cfg diff --git a/resources/variants/geeetech_MeDucer_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeDucer_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeDucer_0.2.inst.cfg diff --git a/resources/variants/geeetech_MeDucer_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeDucer_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeDucer_0.3.inst.cfg diff --git a/resources/variants/geeetech_MeDucer_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeDucer_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeDucer_0.4.inst.cfg diff --git a/resources/variants/geeetech_MeDucer_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeDucer_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeDucer_0.5.inst.cfg diff --git a/resources/variants/geeetech_MeDucer_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeDucer_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeDucer_0.6.inst.cfg diff --git a/resources/variants/geeetech_MeDucer_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeDucer_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeDucer_0.8.inst.cfg diff --git a/resources/variants/geeetech_MeDucer_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_MeDucer_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MeDucer_1.0.inst.cfg diff --git a/resources/variants/geeetech_MizarMax_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarMax_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarMax_0.2.inst.cfg diff --git a/resources/variants/geeetech_MizarMax_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarMax_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarMax_0.3.inst.cfg diff --git a/resources/variants/geeetech_MizarMax_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarMax_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarMax_0.4.inst.cfg diff --git a/resources/variants/geeetech_MizarMax_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarMax_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarMax_0.5.inst.cfg diff --git a/resources/variants/geeetech_MizarMax_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarMax_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarMax_0.6.inst.cfg diff --git a/resources/variants/geeetech_MizarMax_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarMax_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarMax_0.8.inst.cfg diff --git a/resources/variants/geeetech_MizarMax_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarMax_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarMax_1.0.inst.cfg diff --git a/resources/variants/geeetech_MizarPro_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarPro_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarPro_0.2.inst.cfg diff --git a/resources/variants/geeetech_MizarPro_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarPro_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarPro_0.3.inst.cfg diff --git a/resources/variants/geeetech_MizarPro_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarPro_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarPro_0.4.inst.cfg diff --git a/resources/variants/geeetech_MizarPro_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarPro_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarPro_0.5.inst.cfg diff --git a/resources/variants/geeetech_MizarPro_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarPro_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarPro_0.6.inst.cfg diff --git a/resources/variants/geeetech_MizarPro_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarPro_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarPro_0.8.inst.cfg diff --git a/resources/variants/geeetech_MizarPro_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarPro_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarPro_1.0.inst.cfg diff --git a/resources/variants/geeetech_MizarS_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarS_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarS_0.2.inst.cfg diff --git a/resources/variants/geeetech_MizarS_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarS_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarS_0.3.inst.cfg diff --git a/resources/variants/geeetech_MizarS_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarS_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarS_0.4.inst.cfg diff --git a/resources/variants/geeetech_MizarS_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarS_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarS_0.5.inst.cfg diff --git a/resources/variants/geeetech_MizarS_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarS_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarS_0.6.inst.cfg diff --git a/resources/variants/geeetech_MizarS_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarS_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarS_0.8.inst.cfg diff --git a/resources/variants/geeetech_MizarS_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_MizarS_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_MizarS_1.0.inst.cfg diff --git a/resources/variants/geeetech_Mizar_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_Mizar_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Mizar_0.2.inst.cfg diff --git a/resources/variants/geeetech_Mizar_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_Mizar_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Mizar_0.3.inst.cfg diff --git a/resources/variants/geeetech_Mizar_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_Mizar_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Mizar_0.4.inst.cfg diff --git a/resources/variants/geeetech_Mizar_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_Mizar_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Mizar_0.5.inst.cfg diff --git a/resources/variants/geeetech_Mizar_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_Mizar_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Mizar_0.6.inst.cfg diff --git a/resources/variants/geeetech_Mizar_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_Mizar_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Mizar_0.8.inst.cfg diff --git a/resources/variants/geeetech_Mizar_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_Mizar_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Mizar_1.0.inst.cfg diff --git a/resources/variants/geeetech_Thunder_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.2.inst.cfg similarity index 100% rename from resources/variants/geeetech_Thunder_0.2.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Thunder_0.2.inst.cfg diff --git a/resources/variants/geeetech_Thunder_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.3.inst.cfg similarity index 100% rename from resources/variants/geeetech_Thunder_0.3.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Thunder_0.3.inst.cfg diff --git a/resources/variants/geeetech_Thunder_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.4.inst.cfg similarity index 100% rename from resources/variants/geeetech_Thunder_0.4.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Thunder_0.4.inst.cfg diff --git a/resources/variants/geeetech_Thunder_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.5.inst.cfg similarity index 100% rename from resources/variants/geeetech_Thunder_0.5.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Thunder_0.5.inst.cfg diff --git a/resources/variants/geeetech_Thunder_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.6.inst.cfg similarity index 100% rename from resources/variants/geeetech_Thunder_0.6.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Thunder_0.6.inst.cfg diff --git a/resources/variants/geeetech_Thunder_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.8.inst.cfg similarity index 100% rename from resources/variants/geeetech_Thunder_0.8.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Thunder_0.8.inst.cfg diff --git a/resources/variants/geeetech_Thunder_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_1.0.inst.cfg similarity index 100% rename from resources/variants/geeetech_Thunder_1.0.inst.cfg rename to resources/variants/geeetech_variants/geeetech_Thunder_1.0.inst.cfg