From dc09465afe3bc4e4f1d9d02b64148cdd5c0681f1 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 11 Jun 2021 13:49:35 +0200 Subject: [PATCH 1/3] Standardise capitalisation of printer names Some contributors seem to have a shift key stuck here or there. Many 'stylised' capitalisations weren't reflected even on the manufacturer's websites, or were also stylising words like 'pro' and 'dual' or even actual chemical names like 'nylon'. Normalising the caps makes it more fair for everyone, since all of these are written in the same font. As discussed with the Cura team. --- resources/definitions/abax_pri3.def.json | 6 +++--- resources/definitions/abax_pri5.def.json | 6 +++--- resources/definitions/abax_titan.def.json | 6 +++--- resources/definitions/alya3dp.def.json | 4 ++-- resources/definitions/alyanx3dp.def.json | 4 ++-- resources/definitions/anet3d_a2_plus.def.json | 4 ++-- resources/definitions/anet3d_a8_plus.def.json | 4 ++-- resources/definitions/anet3d_et4_pro.def.json | 4 ++-- resources/definitions/bibo2_dual.def.json | 2 +- resources/definitions/biqu_b1.def.json | 2 +- resources/definitions/biqu_b1_abl.def.json | 2 +- resources/definitions/biqu_base.def.json | 2 +- resources/definitions/blv_mgn_cube_300.def.json | 2 +- resources/definitions/blv_mgn_cube_350.def.json | 2 +- resources/definitions/blv_mgn_cube_base.def.json | 2 +- resources/definitions/creality_base.def.json | 2 +- resources/definitions/deltacomb_dc20dual.def.json | 2 +- resources/definitions/deltacomb_dc20flux.def.json | 2 +- resources/definitions/deltacomb_dc21dual.def.json | 2 +- resources/definitions/deltacomb_dc21flux.def.json | 2 +- resources/definitions/deltacomb_dc30dual.def.json | 2 +- resources/definitions/deltacomb_dc30flux.def.json | 2 +- resources/definitions/fabtotum.def.json | 6 +++--- resources/definitions/flsun_q5.def.json | 4 ++-- resources/definitions/flsun_qq.def.json | 4 ++-- resources/definitions/flsun_qq_s.def.json | 4 ++-- resources/definitions/hellbot_magna_dual.def.json | 2 +- resources/definitions/helloBEEprusa.def.json | 6 +++--- resources/definitions/ideagen3D_sapphire_plus.def.json | 6 +++--- resources/definitions/imade3d_jellybox.def.json | 4 ++-- resources/definitions/imade3d_jellybox_2.def.json | 4 ++-- resources/definitions/imade3d_jellybox_root.def.json | 4 ++-- resources/definitions/inat_base.def.json | 6 +++--- resources/definitions/innovo_inventor.def.json | 2 +- resources/definitions/kemiq_q2_beta.def.json | 4 ++-- resources/definitions/kemiq_q2_gama.def.json | 4 ++-- resources/definitions/kupido.def.json | 4 ++-- resources/definitions/longer_base.def.json | 6 +++--- resources/definitions/longer_cube2.def.json | 2 +- resources/definitions/longer_lk1.def.json | 2 +- resources/definitions/longer_lk1plus.def.json | 2 +- resources/definitions/longer_lk1pro.def.json | 2 +- resources/definitions/longer_lk4.def.json | 2 +- resources/definitions/longer_lk4pro.def.json | 2 +- resources/definitions/longer_lk5.def.json | 2 +- resources/definitions/longer_lk5pro.def.json | 2 +- resources/definitions/makeR_pegasus.def.json | 6 +++--- resources/definitions/makeR_prusa_tairona_i3.def.json | 6 +++--- resources/definitions/makeit_pro_l.def.json | 4 ++-- resources/definitions/makeit_pro_m.def.json | 4 ++-- resources/definitions/makeit_pro_mx.def.json | 4 ++-- resources/definitions/mingda_base.def.json | 6 +++--- resources/definitions/mingda_d2.def.json | 2 +- resources/definitions/mingda_d3pro.def.json | 2 +- resources/definitions/mingda_d4pro.def.json | 2 +- resources/definitions/mingda_rock3.def.json | 2 +- resources/definitions/nwa3d_a31.def.json | 4 ++-- resources/definitions/nwa3d_a5.def.json | 4 ++-- resources/definitions/stereotech_start.def.json | 2 +- resources/definitions/stream20dual_mk2.def.json | 6 +++--- resources/definitions/stream20pro_mk2.def.json | 6 +++--- resources/definitions/stream30dual_mk2.def.json | 6 +++--- resources/definitions/stream30pro_mk2.def.json | 6 +++--- resources/definitions/stream30ultra.def.json | 6 +++--- resources/definitions/stream30ultrasc.def.json | 6 +++--- resources/definitions/syndaveraxi.def.json | 2 +- resources/definitions/syndaveraxi2.def.json | 2 +- resources/definitions/tam.def.json | 4 ++-- resources/definitions/tizyx_evy.def.json | 6 +++--- resources/definitions/tizyx_evy_dual.def.json | 6 +++--- resources/definitions/tizyx_k25.def.json | 6 +++--- resources/definitions/uni_200.def.json | 2 +- resources/definitions/uni_250.def.json | 2 +- resources/definitions/uni_300.def.json | 2 +- resources/definitions/uni_base.def.json | 4 ++-- resources/definitions/uni_mini.def.json | 2 +- resources/definitions/uni_print_3d.def.json | 2 +- resources/definitions/voron2_250.def.json | 2 +- resources/definitions/voron2_300.def.json | 2 +- resources/definitions/voron2_350.def.json | 2 +- resources/definitions/voron2_base.def.json | 4 ++-- resources/definitions/voron2_custom.def.json | 2 +- resources/definitions/zav_base.def.json | 4 ++-- resources/definitions/zav_big.def.json | 2 +- resources/definitions/zav_bigplus.def.json | 2 +- resources/definitions/zav_l.def.json | 2 +- resources/definitions/zav_max.def.json | 2 +- resources/definitions/zav_maxpro.def.json | 2 +- resources/definitions/zav_mini.def.json | 2 +- resources/definitions/zyyx_agile.def.json | 2 +- 90 files changed, 153 insertions(+), 153 deletions(-) diff --git a/resources/definitions/abax_pri3.def.json b/resources/definitions/abax_pri3.def.json index 8f0d1a97d8..914dc4d3e0 100644 --- a/resources/definitions/abax_pri3.def.json +++ b/resources/definitions/abax_pri3.def.json @@ -1,11 +1,11 @@ { - "name": "ABAX PRi3", + "name": "Abax PRi3", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "ABAX 3d Technologies", - "manufacturer": "ABAX 3d Technologies", + "author": "Abax 3D Technologies", + "manufacturer": "Abax 3D Technologies", "file_formats": "text/x-gcode", "machine_extruder_trains": { diff --git a/resources/definitions/abax_pri5.def.json b/resources/definitions/abax_pri5.def.json index 5730cc6e05..cb6566e08c 100644 --- a/resources/definitions/abax_pri5.def.json +++ b/resources/definitions/abax_pri5.def.json @@ -1,11 +1,11 @@ { - "name": "ABAX PRi5", + "name": "Abax PRi5", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "ABAX 3d Technologies", - "manufacturer": "ABAX 3d Technologies", + "author": "Abax 3D Technologies", + "manufacturer": "Abax 3D Technologies", "file_formats": "text/x-gcode", "machine_extruder_trains": { diff --git a/resources/definitions/abax_titan.def.json b/resources/definitions/abax_titan.def.json index dc5dd3b14f..0b22634e1f 100644 --- a/resources/definitions/abax_titan.def.json +++ b/resources/definitions/abax_titan.def.json @@ -1,11 +1,11 @@ { - "name": "ABAX Titan", + "name": "Abax Titan", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "ABAX 3d Technologies", - "manufacturer": "ABAX 3d Technologies", + "author": "Abax 3D Technologies", + "manufacturer": "Abax 3D Technologies", "file_formats": "text/x-gcode", "machine_extruder_trains": { diff --git a/resources/definitions/alya3dp.def.json b/resources/definitions/alya3dp.def.json index 4c220fb98b..f335285cfb 100644 --- a/resources/definitions/alya3dp.def.json +++ b/resources/definitions/alya3dp.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "ALYA", + "name": "Alya", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "ALYA", + "author": "Alya", "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", "platform": "alya_platform.3mf", diff --git a/resources/definitions/alyanx3dp.def.json b/resources/definitions/alyanx3dp.def.json index 627b251706..76ce87445b 100644 --- a/resources/definitions/alyanx3dp.def.json +++ b/resources/definitions/alyanx3dp.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "ALYA NX", + "name": "Alya NX", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "ALYA", + "author": "Alya", "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", "platform": "alya_nx_platform.3mf", diff --git a/resources/definitions/anet3d_a2_plus.def.json b/resources/definitions/anet3d_a2_plus.def.json index cad4492205..8c766577ac 100644 --- a/resources/definitions/anet3d_a2_plus.def.json +++ b/resources/definitions/anet3d_a2_plus.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Anet A2 PLUS", + "name": "Anet A2 Plus", "inherits": "anet3d", "metadata": { "visible": true, @@ -11,7 +11,7 @@ }, "overrides": { - "machine_name": { "default_value": "Anet A2 PLUS" }, + "machine_name": { "default_value": "Anet A2 Plus" }, "machine_width": { "default_value": 220 }, diff --git a/resources/definitions/anet3d_a8_plus.def.json b/resources/definitions/anet3d_a8_plus.def.json index 8e50f50663..baafd53710 100644 --- a/resources/definitions/anet3d_a8_plus.def.json +++ b/resources/definitions/anet3d_a8_plus.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Anet A8 PLUS", + "name": "Anet A8 Plus", "inherits": "anet3d", "metadata": { "visible": true, @@ -11,7 +11,7 @@ }, "overrides": { - "machine_name": { "default_value": "Anet A8 PLUS" }, + "machine_name": { "default_value": "Anet A8 Plus" }, "machine_width": { "default_value": 300 }, diff --git a/resources/definitions/anet3d_et4_pro.def.json b/resources/definitions/anet3d_et4_pro.def.json index 5a6b660044..47cd08f50f 100644 --- a/resources/definitions/anet3d_et4_pro.def.json +++ b/resources/definitions/anet3d_et4_pro.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Anet ET4 PRO", + "name": "Anet ET4 Pro", "inherits": "anet3d", "metadata": { "visible": true, @@ -11,7 +11,7 @@ }, "overrides": { - "machine_name": { "default_value": "Anet ET4 PRO" }, + "machine_name": { "default_value": "Anet ET4 Pro" }, "machine_width": { "default_value": 220 }, diff --git a/resources/definitions/bibo2_dual.def.json b/resources/definitions/bibo2_dual.def.json index 8c6dc4ec76..dad08603aa 100644 --- a/resources/definitions/bibo2_dual.def.json +++ b/resources/definitions/bibo2_dual.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "BIBO2 dual", + "name": "Bibo 2 dual", "inherits": "fdmprinter", "metadata": { "visible": true, diff --git a/resources/definitions/biqu_b1.def.json b/resources/definitions/biqu_b1.def.json index 1ed42367bd..d60e229152 100755 --- a/resources/definitions/biqu_b1.def.json +++ b/resources/definitions/biqu_b1.def.json @@ -1,5 +1,5 @@ { - "name": "BIQU B1", + "name": "Biqu B1", "version": 2, "inherits": "biqu_base", "metadata": { diff --git a/resources/definitions/biqu_b1_abl.def.json b/resources/definitions/biqu_b1_abl.def.json index e43d50deeb..11876ae80b 100755 --- a/resources/definitions/biqu_b1_abl.def.json +++ b/resources/definitions/biqu_b1_abl.def.json @@ -1,5 +1,5 @@ { - "name": "BIQU B1 ABL", + "name": "Biqu B1 ABL", "version": 2, "inherits": "biqu_base", "metadata": { diff --git a/resources/definitions/biqu_base.def.json b/resources/definitions/biqu_base.def.json index 6beaa3b7a8..af5c2465e2 100755 --- a/resources/definitions/biqu_base.def.json +++ b/resources/definitions/biqu_base.def.json @@ -5,7 +5,7 @@ "metadata": { "visible": false, "author": "Luke Harrison", - "manufacturer": "BIQU", + "manufacturer": "Biqu", "file_formats": "text/x-gcode", "first_start_actions": ["MachineSettingsAction"], diff --git a/resources/definitions/blv_mgn_cube_300.def.json b/resources/definitions/blv_mgn_cube_300.def.json index a83552d92a..c23eeb0598 100644 --- a/resources/definitions/blv_mgn_cube_300.def.json +++ b/resources/definitions/blv_mgn_cube_300.def.json @@ -1,5 +1,5 @@ { - "name": "BLV mgn Cube 300", + "name": "BLV MGN Cube 300", "version": 2, "inherits": "blv_mgn_cube_base", "metadata": { diff --git a/resources/definitions/blv_mgn_cube_350.def.json b/resources/definitions/blv_mgn_cube_350.def.json index 783ea6ddd6..d0c4dcd9e6 100644 --- a/resources/definitions/blv_mgn_cube_350.def.json +++ b/resources/definitions/blv_mgn_cube_350.def.json @@ -1,5 +1,5 @@ { - "name": "BLV mgn Cube 350", + "name": "BLV MGN Cube 350", "version": 2, "inherits": "blv_mgn_cube_base", "metadata": { diff --git a/resources/definitions/blv_mgn_cube_base.def.json b/resources/definitions/blv_mgn_cube_base.def.json index 47b7d12f97..c97bd97063 100644 --- a/resources/definitions/blv_mgn_cube_base.def.json +++ b/resources/definitions/blv_mgn_cube_base.def.json @@ -1,5 +1,5 @@ { - "name": "BLV mgn Cube Base", + "name": "BLV MGN Cube Base", "version": 2, "inherits": "anet3d", "metadata": { diff --git a/resources/definitions/creality_base.def.json b/resources/definitions/creality_base.def.json index 892a0f9276..ccf085bb11 100644 --- a/resources/definitions/creality_base.def.json +++ b/resources/definitions/creality_base.def.json @@ -1,5 +1,5 @@ { - "name": "Creawsome Base Printer", + "name": "Creality Base Printer", "version": 2, "inherits": "fdmprinter", "metadata": { diff --git a/resources/definitions/deltacomb_dc20dual.def.json b/resources/definitions/deltacomb_dc20dual.def.json index b2a21b4e7a..77b228fdc0 100644 --- a/resources/definitions/deltacomb_dc20dual.def.json +++ b/resources/definitions/deltacomb_dc20dual.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Deltacomb DC-20 DUAL", + "name": "Deltacomb DC-20 Dual", "inherits": "deltacomb_base", "metadata": { diff --git a/resources/definitions/deltacomb_dc20flux.def.json b/resources/definitions/deltacomb_dc20flux.def.json index fb55aee346..fa6fdb0ca7 100644 --- a/resources/definitions/deltacomb_dc20flux.def.json +++ b/resources/definitions/deltacomb_dc20flux.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Deltacomb DC-20 FLUX", + "name": "Deltacomb DC-20 Flux", "inherits": "deltacomb_base", "metadata": { diff --git a/resources/definitions/deltacomb_dc21dual.def.json b/resources/definitions/deltacomb_dc21dual.def.json index d173888f7a..97cc057944 100644 --- a/resources/definitions/deltacomb_dc21dual.def.json +++ b/resources/definitions/deltacomb_dc21dual.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Deltacomb DC-21 DUAL", + "name": "Deltacomb DC-21 Dual", "inherits": "deltacomb_base", "metadata": { diff --git a/resources/definitions/deltacomb_dc21flux.def.json b/resources/definitions/deltacomb_dc21flux.def.json index d004f2c6e0..f2b7941518 100644 --- a/resources/definitions/deltacomb_dc21flux.def.json +++ b/resources/definitions/deltacomb_dc21flux.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Deltacomb DC-21 FLUX", + "name": "Deltacomb DC-21 Flux", "inherits": "deltacomb_base", "metadata": { diff --git a/resources/definitions/deltacomb_dc30dual.def.json b/resources/definitions/deltacomb_dc30dual.def.json index 4ac2c185b7..97ad1bd102 100644 --- a/resources/definitions/deltacomb_dc30dual.def.json +++ b/resources/definitions/deltacomb_dc30dual.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Deltacomb DC-30 DUAL", + "name": "Deltacomb DC-30 Dual", "inherits": "deltacomb_base", "metadata": { diff --git a/resources/definitions/deltacomb_dc30flux.def.json b/resources/definitions/deltacomb_dc30flux.def.json index 7788018a15..6bf095701c 100644 --- a/resources/definitions/deltacomb_dc30flux.def.json +++ b/resources/definitions/deltacomb_dc30flux.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Deltacomb DC-30 FLUX", + "name": "Deltacomb DC-30 Flux", "inherits": "deltacomb_base", "metadata": { diff --git a/resources/definitions/fabtotum.def.json b/resources/definitions/fabtotum.def.json index 957dffaef9..1f2565803f 100644 --- a/resources/definitions/fabtotum.def.json +++ b/resources/definitions/fabtotum.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "FABtotum Personal Fabricator", + "name": "Fabtotum Personal Fabricator", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "FABtotum", - "manufacturer": "FABtotum", + "author": "Fabtotum", + "manufacturer": "Fabtotum", "file_formats": "text/x-gcode", "platform": "fabtotum_platform.3mf", "has_machine_quality": true, diff --git a/resources/definitions/flsun_q5.def.json b/resources/definitions/flsun_q5.def.json index 18d0d46842..db52b54eb6 100644 --- a/resources/definitions/flsun_q5.def.json +++ b/resources/definitions/flsun_q5.def.json @@ -1,10 +1,10 @@ { "version": 2, - "name": "FLSUN Q5", + "name": "Flsun Q5", "inherits": "fdmprinter", "metadata": { "visible": true, - "manufacturer": "FLSUN", + "manufacturer": "Flsun", "author": "Daniel Kreuzhofer", "file_formats": "text/x-gcode", "machine_extruder_trains": { diff --git a/resources/definitions/flsun_qq.def.json b/resources/definitions/flsun_qq.def.json index 02b3849c12..6c32fea5e3 100644 --- a/resources/definitions/flsun_qq.def.json +++ b/resources/definitions/flsun_qq.def.json @@ -1,10 +1,10 @@ { "version": 2, - "name": "FLSUN QQ", + "name": "Flsun QQ", "inherits": "fdmprinter", "metadata": { "visible": true, - "manufacturer": "FLSUN", + "manufacturer": "Flsun", "author": "Daniel Green", "file_formats": "text/x-gcode", "machine_extruder_trains": { diff --git a/resources/definitions/flsun_qq_s.def.json b/resources/definitions/flsun_qq_s.def.json index 241c399cf5..024531a28d 100644 --- a/resources/definitions/flsun_qq_s.def.json +++ b/resources/definitions/flsun_qq_s.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "FLSUN QQ-S", + "name": "Flsun QQ-S", "inherits": "fdmprinter", "metadata": { "visible": true, "author": "Cataldo URSO & Eddy Emck ", - "manufacturer": "FLSUN", + "manufacturer": "Flsun", "platform": "flsun_qq_s.3mf", "file_formats": "text/x-gcode", "has_materials": true, diff --git a/resources/definitions/hellbot_magna_dual.def.json b/resources/definitions/hellbot_magna_dual.def.json index 591901885d..feaee38419 100644 --- a/resources/definitions/hellbot_magna_dual.def.json +++ b/resources/definitions/hellbot_magna_dual.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Hellbot Magna DUAL", + "name": "Hellbot Magna Dual", "inherits": "fdmprinter", "metadata": { "visible": true, diff --git a/resources/definitions/helloBEEprusa.def.json b/resources/definitions/helloBEEprusa.def.json index 3ef938d7e3..ad1c9fd699 100644 --- a/resources/definitions/helloBEEprusa.def.json +++ b/resources/definitions/helloBEEprusa.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "Hello BEE Prusa", + "name": "Hello Bee Prusa", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "BEEVERYCREATIVE", - "manufacturer": "BEEVERYCREATIVE", + "author": "Beeverycreative", + "manufacturer": "Beeverycreative", "platform": "BEEVERYCREATIVE-helloBEEprusa.3mf", "platform_offset": [-226, -75, -196], "file_formats": "text/x-gcode", diff --git a/resources/definitions/ideagen3D_sapphire_plus.def.json b/resources/definitions/ideagen3D_sapphire_plus.def.json index 7d7e3601a8..55f471793a 100644 --- a/resources/definitions/ideagen3D_sapphire_plus.def.json +++ b/resources/definitions/ideagen3D_sapphire_plus.def.json @@ -1,12 +1,12 @@ { "version": 2, - "name": "ideagen3D Sapphire Plus", + "name": "Ideagen3D Sapphire Plus", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "ideagen3D", - "manufacturer": "ideagen3D", + "author": "Ideagen3D", + "manufacturer": "Ideagen3D", "file_formats": "text/x-gcode", "platform": "ideagen3D_sapphire_plus.3mf", "has_materials": true, diff --git a/resources/definitions/imade3d_jellybox.def.json b/resources/definitions/imade3d_jellybox.def.json index 9e481dbe0e..134ccc720c 100644 --- a/resources/definitions/imade3d_jellybox.def.json +++ b/resources/definitions/imade3d_jellybox.def.json @@ -1,10 +1,10 @@ { "version": 2, - "name": "IMADE3D JellyBOX Original", + "name": "Imade3D JellyBOX Original", "inherits": "imade3d_jellybox_root", "metadata": { "visible": true, - "author": "IMADE3D", + "author": "Imade3D", "platform": "imade3d_jellybox_platform.3mf", "platform_offset": [ 0, -0.3, 0], "preferred_variant_name": "0.4 mm", diff --git a/resources/definitions/imade3d_jellybox_2.def.json b/resources/definitions/imade3d_jellybox_2.def.json index 3cb035bdd1..1774da0b1c 100644 --- a/resources/definitions/imade3d_jellybox_2.def.json +++ b/resources/definitions/imade3d_jellybox_2.def.json @@ -1,10 +1,10 @@ { "version": 2, - "name": "IMADE3D JellyBOX 2", + "name": "Imade3D JellyBOX 2", "inherits": "imade3d_jellybox_root", "metadata": { "visible": true, - "author": "IMADE3D", + "author": "Imade3D", "platform": "imade3d_jellybox_2_platform.3mf", "platform_offset": [ 0, -10, 0], "preferred_variant_name": "0.4 mm", diff --git a/resources/definitions/imade3d_jellybox_root.def.json b/resources/definitions/imade3d_jellybox_root.def.json index f631fcb673..5de6d9dae1 100644 --- a/resources/definitions/imade3d_jellybox_root.def.json +++ b/resources/definitions/imade3d_jellybox_root.def.json @@ -3,8 +3,8 @@ "name": "imade3d_jellybox_root", "inherits": "fdmprinter", "metadata": { - "author": "IMADE3D", - "manufacturer": "IMADE3D", + "author": "Imade3D", + "manufacturer": "Imade3D", "visible": false, "file_formats": "text/x-gcode", "exclude_materials": [ diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json index 219411febc..974ae9ac5a 100644 --- a/resources/definitions/inat_base.def.json +++ b/resources/definitions/inat_base.def.json @@ -1,10 +1,10 @@ { - "name": "INAT Base description", + "name": "Inat Base description", "version": 2, "inherits": "fdmprinter", "metadata": { - "author": "INAT s.r.o.", - "manufacturer": "INAT s.r.o.", + "author": "Inat s.r.o.", + "manufacturer": "Inat s.r.o.", "file_formats": "text/x-gcode", "visible": false, "has_materials": true, diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index a38bf98a5a..e930b994c3 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Innovo INVENTOR", + "name": "Innovo Inventor", "inherits": "fdmprinter", "metadata": { "visible": true, diff --git a/resources/definitions/kemiq_q2_beta.def.json b/resources/definitions/kemiq_q2_beta.def.json index 8eb7954e69..8957e75a28 100644 --- a/resources/definitions/kemiq_q2_beta.def.json +++ b/resources/definitions/kemiq_q2_beta.def.json @@ -4,8 +4,8 @@ "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "KEMIQ", - "manufacturer": "KEMIQ", + "author": "Kemiq", + "manufacturer": "Kemiq", "file_formats": "text/x-gcode", "platform": "kemiq_q2.3mf", "has_machine_quality": true, diff --git a/resources/definitions/kemiq_q2_gama.def.json b/resources/definitions/kemiq_q2_gama.def.json index f30cce0311..6bb99125ef 100644 --- a/resources/definitions/kemiq_q2_gama.def.json +++ b/resources/definitions/kemiq_q2_gama.def.json @@ -4,8 +4,8 @@ "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "KEMIQ", - "manufacturer": "KEMIQ", + "author": "Kemiq", + "manufacturer": "Kemiq", "file_formats": "text/x-gcode", "platform": "kemiq_q2.3mf", "has_machine_quality": true, diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index bee92ac282..717c85f93b 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "KUPIDO", + "name": "Kupido", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "ALYA", + "author": "Kupido", "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0], diff --git a/resources/definitions/longer_base.def.json b/resources/definitions/longer_base.def.json index dbba39a537..d1638fda75 100644 --- a/resources/definitions/longer_base.def.json +++ b/resources/definitions/longer_base.def.json @@ -1,11 +1,11 @@ { - "name": "LONGER Base Printer", + "name": "Longer Base Printer", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": false, - "author": "LONGER", - "manufacturer": "LONGER", + "author": "Longer", + "manufacturer": "Longer", "file_formats": "text/x-gcode", "first_start_actions": ["MachineSettingsAction"], diff --git a/resources/definitions/longer_cube2.def.json b/resources/definitions/longer_cube2.def.json index 661c493e8c..7b4266041a 100644 --- a/resources/definitions/longer_cube2.def.json +++ b/resources/definitions/longer_cube2.def.json @@ -1,5 +1,5 @@ { - "name": "LONGER Cube2", + "name": "Longer Cube2", "version": 2, "inherits": "longer_base", "metadata": { diff --git a/resources/definitions/longer_lk1.def.json b/resources/definitions/longer_lk1.def.json index bfe4245891..b422a205e6 100644 --- a/resources/definitions/longer_lk1.def.json +++ b/resources/definitions/longer_lk1.def.json @@ -1,5 +1,5 @@ { - "name": "LONGER LK1", + "name": "Longer LK1", "version": 2, "inherits": "longer_base", "metadata": { diff --git a/resources/definitions/longer_lk1plus.def.json b/resources/definitions/longer_lk1plus.def.json index 83840faf87..da5d1a6f27 100644 --- a/resources/definitions/longer_lk1plus.def.json +++ b/resources/definitions/longer_lk1plus.def.json @@ -1,5 +1,5 @@ { - "name": "LONGER LK1 Plus", + "name": "Longer LK1 Plus", "version": 2, "inherits": "longer_base", "metadata": { diff --git a/resources/definitions/longer_lk1pro.def.json b/resources/definitions/longer_lk1pro.def.json index 58027f72a6..ee0a2e0ac7 100644 --- a/resources/definitions/longer_lk1pro.def.json +++ b/resources/definitions/longer_lk1pro.def.json @@ -1,5 +1,5 @@ { - "name": "LONGER LK1 Pro", + "name": "Longer LK1 Pro", "version": 2, "inherits": "longer_base", "metadata": { diff --git a/resources/definitions/longer_lk4.def.json b/resources/definitions/longer_lk4.def.json index c691f6ded7..92cc50f2b5 100644 --- a/resources/definitions/longer_lk4.def.json +++ b/resources/definitions/longer_lk4.def.json @@ -1,5 +1,5 @@ { - "name": "LONGER LK4", + "name": "Longer LK4", "version": 2, "inherits": "longer_base", "metadata": { diff --git a/resources/definitions/longer_lk4pro.def.json b/resources/definitions/longer_lk4pro.def.json index c3cca26941..6cd83b6048 100644 --- a/resources/definitions/longer_lk4pro.def.json +++ b/resources/definitions/longer_lk4pro.def.json @@ -1,5 +1,5 @@ { - "name": "LONGER LK4 Pro", + "name": "Longer LK4 Pro", "version": 2, "inherits": "longer_base", "metadata": { diff --git a/resources/definitions/longer_lk5.def.json b/resources/definitions/longer_lk5.def.json index f34219ccae..dc473489f1 100644 --- a/resources/definitions/longer_lk5.def.json +++ b/resources/definitions/longer_lk5.def.json @@ -1,5 +1,5 @@ { - "name": "LONGER LK5", + "name": "Longer LK5", "version": 2, "inherits": "longer_base", "metadata": { diff --git a/resources/definitions/longer_lk5pro.def.json b/resources/definitions/longer_lk5pro.def.json index 96ff7bcbe0..e16038d4b7 100644 --- a/resources/definitions/longer_lk5pro.def.json +++ b/resources/definitions/longer_lk5pro.def.json @@ -1,5 +1,5 @@ { - "name": "LONGER LK5 Pro", + "name": "Longer LK5 Pro", "version": 2, "inherits": "longer_base", "metadata": { diff --git a/resources/definitions/makeR_pegasus.def.json b/resources/definitions/makeR_pegasus.def.json index 5e3ab26a4f..a8fbf49875 100644 --- a/resources/definitions/makeR_pegasus.def.json +++ b/resources/definitions/makeR_pegasus.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "makeR Pegasus", + "name": "Maker Pegasus", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "makeR", - "manufacturer": "makeR", + "author": "Maker", + "manufacturer": "Maker", "file_formats": "text/x-gcode", "platform": "makeR_pegasus_platform.3mf", "platform_offset": [-200, -10, 200], diff --git a/resources/definitions/makeR_prusa_tairona_i3.def.json b/resources/definitions/makeR_prusa_tairona_i3.def.json index d722a96410..f56dc314a2 100644 --- a/resources/definitions/makeR_prusa_tairona_i3.def.json +++ b/resources/definitions/makeR_prusa_tairona_i3.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "makeR Prusa Tairona i3", + "name": "Maker Prusa Tairona i3", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "makeR", - "manufacturer": "makeR", + "author": "Maker", + "manufacturer": "Maker", "file_formats": "text/x-gcode", "platform": "makeR_prusa_tairona_i3_platform.3mf", "platform_offset": [-2, 0, 0], diff --git a/resources/definitions/makeit_pro_l.def.json b/resources/definitions/makeit_pro_l.def.json index 75479fd5cc..237a8ac09e 100644 --- a/resources/definitions/makeit_pro_l.def.json +++ b/resources/definitions/makeit_pro_l.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "MAKEiT Pro-L", + "name": "Makeit Pro-L", "inherits": "fdmprinter", "metadata": { "visible": true, "author": "unknown", - "manufacturer": "MAKEiT 3D", + "manufacturer": "Makeit 3D", "file_formats": "text/x-gcode", "has_materials": false, "machine_extruder_trains": diff --git a/resources/definitions/makeit_pro_m.def.json b/resources/definitions/makeit_pro_m.def.json index 812a4fe901..3eb0850555 100644 --- a/resources/definitions/makeit_pro_m.def.json +++ b/resources/definitions/makeit_pro_m.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "MAKEiT Pro-M", + "name": "Makeit Pro-M", "inherits": "fdmprinter", "metadata": { "visible": true, "author": "unknown", - "manufacturer": "MAKEiT 3D", + "manufacturer": "Makeit 3D", "file_formats": "text/x-gcode", "has_materials": false, "machine_extruder_trains": diff --git a/resources/definitions/makeit_pro_mx.def.json b/resources/definitions/makeit_pro_mx.def.json index 5f922dcd00..9322d2f510 100644 --- a/resources/definitions/makeit_pro_mx.def.json +++ b/resources/definitions/makeit_pro_mx.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "MAKEiT Pro-MX", + "name": "Makeit Pro-MX", "inherits": "fdmprinter", "metadata": { "visible": true, "author": "unknown", - "manufacturer": "MAKEiT 3D", + "manufacturer": "Makeit 3D", "file_formats": "text/x-gcode", "has_materials": false, "machine_extruder_trains": diff --git a/resources/definitions/mingda_base.def.json b/resources/definitions/mingda_base.def.json index a7daa76d97..1051e53c2a 100644 --- a/resources/definitions/mingda_base.def.json +++ b/resources/definitions/mingda_base.def.json @@ -1,11 +1,11 @@ { - "name": "MINGDA Base Printer", + "name": "Mingda Base Printer", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": false, - "author": "cataclism", - "manufacturer": "MINGDA", + "author": "Cataclism", + "manufacturer": "Mingda", "file_formats": "text/x-gcode", "first_start_actions": ["MachineSettingsAction"], diff --git a/resources/definitions/mingda_d2.def.json b/resources/definitions/mingda_d2.def.json index a20ff53db1..d6278705ad 100644 --- a/resources/definitions/mingda_d2.def.json +++ b/resources/definitions/mingda_d2.def.json @@ -1,5 +1,5 @@ { - "name": "MINGDA D2", + "name": "Mingda D2", "version": 2, "inherits": "mingda_base", "overrides": { diff --git a/resources/definitions/mingda_d3pro.def.json b/resources/definitions/mingda_d3pro.def.json index 63c9061fa2..682cd88d88 100644 --- a/resources/definitions/mingda_d3pro.def.json +++ b/resources/definitions/mingda_d3pro.def.json @@ -1,5 +1,5 @@ { - "name": "MINGDA D3/Pro", + "name": "Mingda D3/Pro", "version": 2, "inherits": "mingda_base", "overrides": { diff --git a/resources/definitions/mingda_d4pro.def.json b/resources/definitions/mingda_d4pro.def.json index 0cff777d2d..00d316c925 100644 --- a/resources/definitions/mingda_d4pro.def.json +++ b/resources/definitions/mingda_d4pro.def.json @@ -1,5 +1,5 @@ { - "name": "MINGDA D4 Pro", + "name": "Mingda D4 Pro", "version": 2, "inherits": "mingda_base", "overrides": { diff --git a/resources/definitions/mingda_rock3.def.json b/resources/definitions/mingda_rock3.def.json index 70254490b2..c470d6e7e5 100644 --- a/resources/definitions/mingda_rock3.def.json +++ b/resources/definitions/mingda_rock3.def.json @@ -1,5 +1,5 @@ { - "name": "MINGDA Rock3/Pro", + "name": "Mingda Rock3/Pro", "version": 2, "inherits": "mingda_base", "overrides": { diff --git a/resources/definitions/nwa3d_a31.def.json b/resources/definitions/nwa3d_a31.def.json index 1cfd02fe7f..fef44ac16b 100644 --- a/resources/definitions/nwa3d_a31.def.json +++ b/resources/definitions/nwa3d_a31.def.json @@ -1,11 +1,11 @@ { - "name": "NWA3D A31", + "name": "Nwa3D A31", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, "author": "DragonJe", - "manufacturer": "NWA 3D LLC", + "manufacturer": "Nwa 3D LLC", "file_formats": "text/x-gcode", "platform_offset": [0, 0, 0], "has_materials": true, diff --git a/resources/definitions/nwa3d_a5.def.json b/resources/definitions/nwa3d_a5.def.json index 1631860d47..8c6b53b81e 100644 --- a/resources/definitions/nwa3d_a5.def.json +++ b/resources/definitions/nwa3d_a5.def.json @@ -1,11 +1,11 @@ { - "name": "NWA3D A5", + "name": "Nwa3D A5", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, "author": "DragonJe", - "manufacturer": "NWA 3D LLC", + "manufacturer": "Nwa 3D LLC", "file_formats": "text/x-gcode", "platform_offset": [0, 0, 0], "has_materials": true, diff --git a/resources/definitions/stereotech_start.def.json b/resources/definitions/stereotech_start.def.json index ca03937007..f6733d2ec7 100644 --- a/resources/definitions/stereotech_start.def.json +++ b/resources/definitions/stereotech_start.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Stereotech START", + "name": "Stereotech Start", "inherits": "fdmprinter", "metadata": { "visible": true, diff --git a/resources/definitions/stream20dual_mk2.def.json b/resources/definitions/stream20dual_mk2.def.json index 4667410dad..2bb491a906 100644 --- a/resources/definitions/stream20dual_mk2.def.json +++ b/resources/definitions/stream20dual_mk2.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "VOLUMIC STREAM20DUAL MK2", + "name": "Volumic Stream20Dual MK2", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "VOLUMIC", - "manufacturer": "VOLUMIC", + "author": "Volumic", + "manufacturer": "Volumic", "file_formats": "text/x-gcode", "icon": "volumic-icon", "platform": "STREAM20PRO_platform.STL", diff --git a/resources/definitions/stream20pro_mk2.def.json b/resources/definitions/stream20pro_mk2.def.json index d4d1f38817..1da3c01d1f 100644 --- a/resources/definitions/stream20pro_mk2.def.json +++ b/resources/definitions/stream20pro_mk2.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "VOLUMIC STREAM20PRO MK2", + "name": "Volumic Stream20Pro MK2", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "VOLUMIC", - "manufacturer": "VOLUMIC", + "author": "Volumic", + "manufacturer": "Volumic", "file_formats": "text/x-gcode", "icon": "volumic-icon", "platform": "STREAM20PRO_platform.STL", diff --git a/resources/definitions/stream30dual_mk2.def.json b/resources/definitions/stream30dual_mk2.def.json index e822639871..4d16c978a9 100644 --- a/resources/definitions/stream30dual_mk2.def.json +++ b/resources/definitions/stream30dual_mk2.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "VOLUMIC STREAM30DUAL MK2", + "name": "Volumic Stream30Dual MK2", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "VOLUMIC", - "manufacturer": "VOLUMIC", + "author": "Volumic", + "manufacturer": "Volumic", "file_formats": "text/x-gcode", "icon": "volumic-icon", "platform": "STREAM30PRO_platform.STL", diff --git a/resources/definitions/stream30pro_mk2.def.json b/resources/definitions/stream30pro_mk2.def.json index 7ffcb25077..b313704dac 100644 --- a/resources/definitions/stream30pro_mk2.def.json +++ b/resources/definitions/stream30pro_mk2.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "VOLUMIC STREAM30PRO MK2", + "name": "Volumic Stream30Pro MK2", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "VOLUMIC", - "manufacturer": "VOLUMIC", + "author": "Volumic", + "manufacturer": "Volumic", "file_formats": "text/x-gcode", "icon": "volumic-icon", "platform": "STREAM30PRO_platform.STL", diff --git a/resources/definitions/stream30ultra.def.json b/resources/definitions/stream30ultra.def.json index 901d42c825..731e213447 100644 --- a/resources/definitions/stream30ultra.def.json +++ b/resources/definitions/stream30ultra.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "VOLUMIC STREAM30ULTRA", + "name": "Volumic Stream30Ultra", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "VOLUMIC", - "manufacturer": "VOLUMIC", + "author": "Volumic", + "manufacturer": "Volumic", "file_formats": "text/x-gcode", "icon": "volumic-icon", "platform": "STREAM30ULTRA_platform.STL", diff --git a/resources/definitions/stream30ultrasc.def.json b/resources/definitions/stream30ultrasc.def.json index c7a450d7e2..2f645a057b 100644 --- a/resources/definitions/stream30ultrasc.def.json +++ b/resources/definitions/stream30ultrasc.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "VOLUMIC STREAM30ULTRA SC", + "name": "Volumic Stream30Ultra SC", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "VOLUMIC", - "manufacturer": "VOLUMIC", + "author": "Volumic", + "manufacturer": "Volumic", "file_formats": "text/x-gcode", "icon": "volumic-icon", "platform": "STREAM30ULTRA_platform.STL", diff --git a/resources/definitions/syndaveraxi.def.json b/resources/definitions/syndaveraxi.def.json index 8d3f1ff72a..c5851e6c4c 100644 --- a/resources/definitions/syndaveraxi.def.json +++ b/resources/definitions/syndaveraxi.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "SyndaverAXI", + "name": "SyndaverAxi", "inherits": "fdmprinter", "metadata": { diff --git a/resources/definitions/syndaveraxi2.def.json b/resources/definitions/syndaveraxi2.def.json index b42ed9f1f5..cc4ec71fb1 100644 --- a/resources/definitions/syndaveraxi2.def.json +++ b/resources/definitions/syndaveraxi2.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "SyndaverAXI2", + "name": "SyndaverAxi2", "inherits": "fdmprinter", "metadata": { diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json index 2378cc0ae3..080a3125db 100644 --- a/resources/definitions/tam.def.json +++ b/resources/definitions/tam.def.json @@ -4,8 +4,8 @@ "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "typeamachines", - "manufacturer": "typeamachines", + "author": "TypeAMachines", + "manufacturer": "TypeAMachines", "file_formats": "text/x-gcode", "platform": "tam_series1.3mf", "platform_offset": [-580.0, -6.23, 253.5], diff --git a/resources/definitions/tizyx_evy.def.json b/resources/definitions/tizyx_evy.def.json index 8ed9a5aeff..7776007f41 100644 --- a/resources/definitions/tizyx_evy.def.json +++ b/resources/definitions/tizyx_evy.def.json @@ -1,11 +1,11 @@ { - "name": "TiZYX EVY", + "name": "Tizyx Evy", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "TiZYX", - "manufacturer": "TiZYX", + "author": "Tizyx", + "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "has_machine_quality": true, diff --git a/resources/definitions/tizyx_evy_dual.def.json b/resources/definitions/tizyx_evy_dual.def.json index 25ff2a3af8..3b6892682a 100644 --- a/resources/definitions/tizyx_evy_dual.def.json +++ b/resources/definitions/tizyx_evy_dual.def.json @@ -1,11 +1,11 @@ { - "name": "TiZYX EVY Dual", + "name": "Tizyx Evy Dual", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "TiZYX", - "manufacturer": "TiZYX", + "author": "Tizyx", + "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "has_machine_quality": true, diff --git a/resources/definitions/tizyx_k25.def.json b/resources/definitions/tizyx_k25.def.json index 5723fa514e..ccaa6fff0b 100644 --- a/resources/definitions/tizyx_k25.def.json +++ b/resources/definitions/tizyx_k25.def.json @@ -1,12 +1,12 @@ { "version": 2, - "name": "TiZYX K25", + "name": "Tizyx K25", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "TiZYX", - "manufacturer": "TiZYX", + "author": "Tizyx", + "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "platform": "tizyx_k25_platform.3mf", "platform_offset": [0, -4, 0], diff --git a/resources/definitions/uni_200.def.json b/resources/definitions/uni_200.def.json index 9fdb008213..f425a3d89f 100644 --- a/resources/definitions/uni_200.def.json +++ b/resources/definitions/uni_200.def.json @@ -1,5 +1,5 @@ { - "name": "UNI 200", + "name": "Uni 200", "version": 2, "inherits": "uni_base", "metadata": { diff --git a/resources/definitions/uni_250.def.json b/resources/definitions/uni_250.def.json index 65ceddf8c7..c6a5642439 100644 --- a/resources/definitions/uni_250.def.json +++ b/resources/definitions/uni_250.def.json @@ -1,5 +1,5 @@ { - "name": "UNI 250", + "name": "Uni 250", "version": 2, "inherits": "uni_base", "metadata": { diff --git a/resources/definitions/uni_300.def.json b/resources/definitions/uni_300.def.json index 11d1ed0591..52cfc769cf 100644 --- a/resources/definitions/uni_300.def.json +++ b/resources/definitions/uni_300.def.json @@ -1,5 +1,5 @@ { - "name": "UNI 300", + "name": "Uni 300", "version": 2, "inherits": "uni_base", "metadata": { diff --git a/resources/definitions/uni_base.def.json b/resources/definitions/uni_base.def.json index 6cdbc198a5..06ba86de2d 100644 --- a/resources/definitions/uni_base.def.json +++ b/resources/definitions/uni_base.def.json @@ -1,11 +1,11 @@ { - "name": "UNI Base Printer", + "name": "Uni Base Printer", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": false, "author": "Nail` Gimadeev (C)", - "manufacturer": "UNI 3D", + "manufacturer": "Uni 3D", "file_formats": "text/x-gcode", "first_start_actions": ["MachineSettingsAction"], "machine_extruder_trains": { diff --git a/resources/definitions/uni_mini.def.json b/resources/definitions/uni_mini.def.json index c2b67039ea..4da67907f9 100644 --- a/resources/definitions/uni_mini.def.json +++ b/resources/definitions/uni_mini.def.json @@ -1,5 +1,5 @@ { - "name": "UNI MINI", + "name": "Uni Mini", "version": 2, "inherits": "uni_base", "metadata": { diff --git a/resources/definitions/uni_print_3d.def.json b/resources/definitions/uni_print_3d.def.json index 0ad937e594..7d71d73540 100644 --- a/resources/definitions/uni_print_3d.def.json +++ b/resources/definitions/uni_print_3d.def.json @@ -1,5 +1,5 @@ { - "name": "UNI-PRINT-3D", + "name": "Uni-Print-3D", "version": 2, "inherits": "fdmprinter", "metadata": diff --git a/resources/definitions/voron2_250.def.json b/resources/definitions/voron2_250.def.json index 269bbfe459..a479576458 100644 --- a/resources/definitions/voron2_250.def.json +++ b/resources/definitions/voron2_250.def.json @@ -1,5 +1,5 @@ { - "name": "VORON2 250", + "name": "Voron2 250", "version": 2, "inherits": "voron2_base", "metadata": diff --git a/resources/definitions/voron2_300.def.json b/resources/definitions/voron2_300.def.json index 20698d54ff..943b841c4d 100644 --- a/resources/definitions/voron2_300.def.json +++ b/resources/definitions/voron2_300.def.json @@ -1,5 +1,5 @@ { - "name": "VORON2 300", + "name": "Voron2 300", "version": 2, "inherits": "voron2_base", "metadata": diff --git a/resources/definitions/voron2_350.def.json b/resources/definitions/voron2_350.def.json index 6af41118c4..36e5e9339c 100644 --- a/resources/definitions/voron2_350.def.json +++ b/resources/definitions/voron2_350.def.json @@ -1,5 +1,5 @@ { - "name": "VORON2 350", + "name": "Voron2 350", "version": 2, "inherits": "voron2_base", "metadata": diff --git a/resources/definitions/voron2_base.def.json b/resources/definitions/voron2_base.def.json index 7a9a6ee8aa..b6938ad991 100644 --- a/resources/definitions/voron2_base.def.json +++ b/resources/definitions/voron2_base.def.json @@ -1,12 +1,12 @@ { - "name": "VORON2 Base", + "name": "Voron2 Base", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": false, "author": "Fulg, Maglin, pizzle_Dizzle", - "manufacturer": "VORONDesign", + "manufacturer": "VoronDesign", "file_formats": "text/x-gcode", "first_start_actions": ["MachineSettingsAction"], "preferred_quality_type": "fast", diff --git a/resources/definitions/voron2_custom.def.json b/resources/definitions/voron2_custom.def.json index 2fc5c2305d..45612e0cba 100644 --- a/resources/definitions/voron2_custom.def.json +++ b/resources/definitions/voron2_custom.def.json @@ -1,5 +1,5 @@ { - "name": "VORON2 Custom", + "name": "Voron2 Custom", "version": 2, "inherits": "voron2_base", "metadata": diff --git a/resources/definitions/zav_base.def.json b/resources/definitions/zav_base.def.json index 9167d5574f..1ef9398987 100644 --- a/resources/definitions/zav_base.def.json +++ b/resources/definitions/zav_base.def.json @@ -1,11 +1,11 @@ { - "name": "ZAV Base Printer", + "name": "Zav Base Printer", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": false, "author": "Kirill Nikolaev, Kim Evgeniy (C)", - "manufacturer": "ZAV Co., Ltd.", + "manufacturer": "Zav Co., Ltd.", "file_formats": "text/x-gcode", "first_start_actions": ["MachineSettingsAction"], "machine_extruder_trains": { diff --git a/resources/definitions/zav_big.def.json b/resources/definitions/zav_big.def.json index dc68e1ad11..56d6f77111 100644 --- a/resources/definitions/zav_big.def.json +++ b/resources/definitions/zav_big.def.json @@ -1,5 +1,5 @@ { - "name": "ZAV BIG", + "name": "Zav Big", "version": 2, "inherits": "zav_base", "metadata": { diff --git a/resources/definitions/zav_bigplus.def.json b/resources/definitions/zav_bigplus.def.json index bbdf9ee264..a8b24ae323 100644 --- a/resources/definitions/zav_bigplus.def.json +++ b/resources/definitions/zav_bigplus.def.json @@ -1,5 +1,5 @@ { - "name": "ZAV Big+", + "name": "Zav Big+", "version": 2, "inherits": "zav_base", "metadata": { diff --git a/resources/definitions/zav_l.def.json b/resources/definitions/zav_l.def.json index 7da88aef85..604cb49ddb 100644 --- a/resources/definitions/zav_l.def.json +++ b/resources/definitions/zav_l.def.json @@ -1,5 +1,5 @@ { - "name": "ZAV L family printer", + "name": "Zav L Family Printer", "version": 2, "inherits": "zav_base", "metadata": { diff --git a/resources/definitions/zav_max.def.json b/resources/definitions/zav_max.def.json index f67266b0a5..3e5e987cc7 100644 --- a/resources/definitions/zav_max.def.json +++ b/resources/definitions/zav_max.def.json @@ -1,5 +1,5 @@ { - "name": "ZAV MAX", + "name": "Zav Max", "version": 2, "inherits": "zav_base", "metadata": { diff --git a/resources/definitions/zav_maxpro.def.json b/resources/definitions/zav_maxpro.def.json index 81cd43835f..97f8806f45 100644 --- a/resources/definitions/zav_maxpro.def.json +++ b/resources/definitions/zav_maxpro.def.json @@ -1,5 +1,5 @@ { - "name": "ZAV PRO", + "name": "Zav Pro", "version": 2, "inherits": "zav_base", "metadata": { diff --git a/resources/definitions/zav_mini.def.json b/resources/definitions/zav_mini.def.json index 2ceccddfda..8491ddd01c 100644 --- a/resources/definitions/zav_mini.def.json +++ b/resources/definitions/zav_mini.def.json @@ -1,5 +1,5 @@ { - "name": "ZAV mini", + "name": "Zav Mini", "version": 2, "inherits": "zav_base", "metadata": { diff --git a/resources/definitions/zyyx_agile.def.json b/resources/definitions/zyyx_agile.def.json index 2e4e086208..7294a1b10e 100644 --- a/resources/definitions/zyyx_agile.def.json +++ b/resources/definitions/zyyx_agile.def.json @@ -1,5 +1,5 @@ { - "name": "ZYYX Agile", + "name": "Zyyx Agile", "version": 2, "inherits": "fdmprinter", "metadata": { From 76da7768e8ccc42ea7362b20414baf677ddd327c Mon Sep 17 00:00:00 2001 From: Ewald Kleefstra Date: Wed, 7 Apr 2021 10:58:36 +0200 Subject: [PATCH 2/3] Added relative extrusion mode support for PauseAtHeight.py script --- plugins/PostProcessingPlugin/scripts/PauseAtHeight.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index 2a055b86ac..29714aedf1 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -507,7 +507,16 @@ class PauseAtHeight(Script): else: Logger.log("w", "No previous feedrate found in gcode, feedrate for next layer(s) might be incorrect") - prepend_gcode += self.putValue(M = 82) + " ; switch back to absolute E values\n" + extrusion_mode_string = "absolute" + extrusion_mode_numeric = 82 + + extruders = list(Application.getInstance().getGlobalContainerStack().extruders.values()) + relative_extrusion = extruders[0].getProperty("relative_extrusion", "value") + if relative_extrusion: + extrusion_mode_string = "relative" + extrusion_mode_numeric = 83 + + prepend_gcode += self.putValue(M = extrusion_mode_numeric) + " ; switch back to " + extrusion_mode_string + " E values\n" # reset extrude value to pre pause value prepend_gcode += self.putValue(G = 92, E = current_e) + "\n" From 94871a32e370993bb392f168e379b9bf53843d40 Mon Sep 17 00:00:00 2001 From: Ewald Kleefstra <31920433+ewaldkleefstra@users.noreply.github.com> Date: Mon, 7 Jun 2021 17:45:51 +0200 Subject: [PATCH 3/3] Update plugins/PostProcessingPlugin/scripts/PauseAtHeight.py Get extrusion mode from global container stack instead of first extruder Co-authored-by: Ghostkeeper --- plugins/PostProcessingPlugin/scripts/PauseAtHeight.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index 29714aedf1..a9e570e0cb 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -510,8 +510,7 @@ class PauseAtHeight(Script): extrusion_mode_string = "absolute" extrusion_mode_numeric = 82 - extruders = list(Application.getInstance().getGlobalContainerStack().extruders.values()) - relative_extrusion = extruders[0].getProperty("relative_extrusion", "value") + relative_extrusion = Application.getInstance().getGlobalContainerStack().getProperty("relative_extrusion", "value") if relative_extrusion: extrusion_mode_string = "relative" extrusion_mode_numeric = 83