From 4b4f971222a1d7c65679b416d4c3113b7a1c1483 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 25 Aug 2017 09:17:55 +0200 Subject: [PATCH] Make 'other' the default category This should make it a bit easier for others to create a new definition since there is less for them to 'have to know'. Previously they would be required to fill in as category Other, but now they can just leave the category out. --- resources/definitions/101Hero.def.json | 1 - resources/definitions/3dator.def.json | 1 - resources/definitions/abax_pri3.def.json | 1 - resources/definitions/abax_pri5.def.json | 1 - resources/definitions/abax_titan.def.json | 1 - resources/definitions/alya3dp.def.json | 1 - resources/definitions/bfb.def.json | 1 - resources/definitions/bq_hephestos.def.json | 1 - resources/definitions/bq_hephestos_2.def.json | 1 - resources/definitions/bq_hephestos_xl.def.json | 1 - resources/definitions/bq_witbox.def.json | 1 - resources/definitions/bq_witbox_2.def.json | 1 - resources/definitions/cartesio.def.json | 1 - resources/definitions/creality_cr10_beta.def.json | 1 - resources/definitions/creality_cr10s4_beta.def.json | 1 - resources/definitions/creality_cr10s5_beta.def.json | 1 - resources/definitions/dagoma_discoeasy200.def.json | 1 - resources/definitions/delta_go.def.json | 1 - resources/definitions/deltabot.def.json | 1 - resources/definitions/easyarts_ares.def.json | 1 - resources/definitions/fdmprinter.def.json | 2 +- resources/definitions/folgertech_FT-5.def.json | 1 - resources/definitions/grr_neo.def.json | 1 - resources/definitions/helloBEEprusa.def.json | 1 - resources/definitions/imade3d_jellybox.def.json | 1 - resources/definitions/innovo_inventor.def.json | 1 - resources/definitions/julia.def.json | 1 - resources/definitions/kemiq_q2_beta.def.json | 1 - resources/definitions/kemiq_q2_gama.def.json | 1 - resources/definitions/kossel_mini.def.json | 1 - resources/definitions/kossel_pro.def.json | 1 - resources/definitions/kupido.def.json | 1 - resources/definitions/m180.def.json | 1 - resources/definitions/makeR_pegasus.def.json | 1 - resources/definitions/makeR_prusa_tairona_i3.def.json | 1 - resources/definitions/makeit_pro_l.def.json | 1 - resources/definitions/makeit_pro_m.def.json | 1 - resources/definitions/maker_starter.def.json | 1 - resources/definitions/makerbotreplicator.def.json | 1 - resources/definitions/mankati_fullscale_xt_plus.def.json | 1 - resources/definitions/mendel90.def.json | 1 - resources/definitions/ord.def.json | 1 - resources/definitions/peopoly_moai.def.json | 1 - resources/definitions/printrbot_play.def.json | 1 - resources/definitions/printrbot_play_heated.def.json | 1 - resources/definitions/printrbot_simple.def.json | 1 - resources/definitions/printrbot_simple_extended.def.json | 1 - resources/definitions/prusa_i3.def.json | 1 - resources/definitions/prusa_i3_mk2.def.json | 1 - resources/definitions/prusa_i3_xl.def.json | 1 - resources/definitions/punchtec_connect_xl.def.json | 1 - resources/definitions/renkforce_rf100.def.json | 1 - resources/definitions/rigid3d.def.json | 1 - resources/definitions/rigid3d_3rdgen.def.json | 1 - resources/definitions/rigid3d_hobby.def.json | 1 - resources/definitions/rigid3d_zero.def.json | 1 - resources/definitions/rigid3d_zero2.def.json | 1 - resources/definitions/rigidbot.def.json | 1 - resources/definitions/rigidbot_big.def.json | 1 - resources/definitions/robo_3d_r1.def.json | 1 - resources/definitions/tam.def.json | 1 - resources/definitions/ultimaker.def.json | 1 + resources/definitions/ultimaker2.def.json | 1 - resources/definitions/ultimaker2_extended.def.json | 1 - resources/definitions/ultimaker2_extended_plus.def.json | 1 - resources/definitions/ultimaker2_go.def.json | 1 - resources/definitions/ultimaker2_plus.def.json | 1 - resources/definitions/ultimaker3.def.json | 1 - resources/definitions/ultimaker3_extended.def.json | 1 - resources/definitions/ultimaker_original.def.json | 1 - resources/definitions/ultimaker_original_dual.def.json | 1 - resources/definitions/ultimaker_original_plus.def.json | 1 - resources/definitions/uniqbot_one.def.json | 1 - resources/definitions/vertex_k8400.def.json | 1 - resources/definitions/vertex_k8400_dual.def.json | 1 - resources/definitions/zone3d_printer.def.json | 1 - 76 files changed, 2 insertions(+), 75 deletions(-) diff --git a/resources/definitions/101Hero.def.json b/resources/definitions/101Hero.def.json index c629cb3769..3d19aef626 100644 --- a/resources/definitions/101Hero.def.json +++ b/resources/definitions/101Hero.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "rikky", "manufacturer": "101Hero", - "category": "Other", "machine_extruder_trains": { "0": "fdmextruder" diff --git a/resources/definitions/3dator.def.json b/resources/definitions/3dator.def.json index fd67f3b797..b72a49a35b 100644 --- a/resources/definitions/3dator.def.json +++ b/resources/definitions/3dator.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "3Dator GmbH", "manufacturer": "3Dator GmbH", - "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "supports_usb_connection": true, diff --git a/resources/definitions/abax_pri3.def.json b/resources/definitions/abax_pri3.def.json index cf1f2b466d..fa826e6f94 100644 --- a/resources/definitions/abax_pri3.def.json +++ b/resources/definitions/abax_pri3.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "ABAX 3d Technologies", "manufacturer": "ABAX 3d Technologies", - "category": "Other", "file_formats": "text/x-gcode" }, "overrides": { diff --git a/resources/definitions/abax_pri5.def.json b/resources/definitions/abax_pri5.def.json index aa2a7eec22..b5588e5c96 100644 --- a/resources/definitions/abax_pri5.def.json +++ b/resources/definitions/abax_pri5.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "ABAX 3d Technologies", "manufacturer": "ABAX 3d Technologies", - "category": "Other", "file_formats": "text/x-gcode" }, "overrides": { diff --git a/resources/definitions/abax_titan.def.json b/resources/definitions/abax_titan.def.json index 75f1267b4f..53b768c93f 100644 --- a/resources/definitions/abax_titan.def.json +++ b/resources/definitions/abax_titan.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "ABAX 3d Technologies", "manufacturer": "ABAX 3d Technologies", - "category": "Other", "file_formats": "text/x-gcode" }, "overrides": { diff --git a/resources/definitions/alya3dp.def.json b/resources/definitions/alya3dp.def.json index 8d1eb6730c..5fa6630f51 100644 --- a/resources/definitions/alya3dp.def.json +++ b/resources/definitions/alya3dp.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "ALYA", "manufacturer": "ALYA", - "category": "Other", "file_formats": "text/x-gcode" }, diff --git a/resources/definitions/bfb.def.json b/resources/definitions/bfb.def.json index b685b3d94d..fddec169c5 100644 --- a/resources/definitions/bfb.def.json +++ b/resources/definitions/bfb.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "BFB", - "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] }, diff --git a/resources/definitions/bq_hephestos.def.json b/resources/definitions/bq_hephestos.def.json index 9a49ecc1ae..91eeecb500 100644 --- a/resources/definitions/bq_hephestos.def.json +++ b/resources/definitions/bq_hephestos.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "BQ", "manufacturer": "BQ", - "category": "Other", "file_formats": "text/x-gcode", "platform": "bq_hephestos_platform.stl", "platform_offset": [ 0, -82, 0] diff --git a/resources/definitions/bq_hephestos_2.def.json b/resources/definitions/bq_hephestos_2.def.json index 68f06e390f..272e547af0 100644 --- a/resources/definitions/bq_hephestos_2.def.json +++ b/resources/definitions/bq_hephestos_2.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "BQ", "manufacturer": "BQ", - "category": "Other", "platform": "bq_hephestos_2_platform.stl", "platform_offset": [6, 1320, 0 ], "file_formats": "text/x-gcode" diff --git a/resources/definitions/bq_hephestos_xl.def.json b/resources/definitions/bq_hephestos_xl.def.json index 504f94c0ed..a5a183b1e9 100644 --- a/resources/definitions/bq_hephestos_xl.def.json +++ b/resources/definitions/bq_hephestos_xl.def.json @@ -7,7 +7,6 @@ "visible": true, "manufacturer": "BQ", "author": "BQ", - "category": "Other", "file_formats": "text/x-code", "platform": "bq_hephestos_platform.stl", "platform_offset": [ 0, -82, 0] diff --git a/resources/definitions/bq_witbox.def.json b/resources/definitions/bq_witbox.def.json index 4dfa3c805f..ca14151e7a 100644 --- a/resources/definitions/bq_witbox.def.json +++ b/resources/definitions/bq_witbox.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "BQ", "manufacturer": "BQ", - "category": "Other", "file_formats": "text/x-gcode", "platform": "bq_witbox_platform.stl", "platform_offset": [ 0, -145, -38] diff --git a/resources/definitions/bq_witbox_2.def.json b/resources/definitions/bq_witbox_2.def.json index a3ef0925ba..f634d9c9c8 100644 --- a/resources/definitions/bq_witbox_2.def.json +++ b/resources/definitions/bq_witbox_2.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "BQ", "manufacturer": "BQ", - "category": "Other", "file_formats": "text/x-gcode", "platform": "bq_witbox_platform.stl", "platform_offset": [0, -145, -38] diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index e5253f3b75..45b0111209 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Scheepers", "manufacturer": "Cartesio bv", - "category": "Other", "file_formats": "text/x-gcode", "has_machine_quality": true, diff --git a/resources/definitions/creality_cr10_beta.def.json b/resources/definitions/creality_cr10_beta.def.json index f482a49e2f..3567370cfa 100644 --- a/resources/definitions/creality_cr10_beta.def.json +++ b/resources/definitions/creality_cr10_beta.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Michael Wildermuth", "manufacturer": "Creality3D", - "category": "Other", "file_formats": "text/x-gcode" }, "overrides": { diff --git a/resources/definitions/creality_cr10s4_beta.def.json b/resources/definitions/creality_cr10s4_beta.def.json index 2b700536ec..9eae48e2be 100644 --- a/resources/definitions/creality_cr10s4_beta.def.json +++ b/resources/definitions/creality_cr10s4_beta.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Michael Wildermuth", "manufacturer": "Creality3D", - "category": "Other", "file_formats": "text/x-gcode" }, "overrides": { diff --git a/resources/definitions/creality_cr10s5_beta.def.json b/resources/definitions/creality_cr10s5_beta.def.json index c68b83bbbc..594d40ab83 100644 --- a/resources/definitions/creality_cr10s5_beta.def.json +++ b/resources/definitions/creality_cr10s5_beta.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Michael Wildermuth", "manufacturer": "Creality3D", - "category": "Other", "file_formats": "text/x-gcode" }, "overrides": { diff --git a/resources/definitions/dagoma_discoeasy200.def.json b/resources/definitions/dagoma_discoeasy200.def.json index 718c5b0873..8f1a792bc0 100755 --- a/resources/definitions/dagoma_discoeasy200.def.json +++ b/resources/definitions/dagoma_discoeasy200.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Dagoma", "manufacturer": "Dagoma", - "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2.png", "platform": "discoeasy200.stl", diff --git a/resources/definitions/delta_go.def.json b/resources/definitions/delta_go.def.json index ccb659f973..ed8e2dc773 100644 --- a/resources/definitions/delta_go.def.json +++ b/resources/definitions/delta_go.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Deltaprintr", "manufacturer": "Deltaprintr", - "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0], "platform": "" diff --git a/resources/definitions/deltabot.def.json b/resources/definitions/deltabot.def.json index 1132f7e7bb..cee5ab1be1 100644 --- a/resources/definitions/deltabot.def.json +++ b/resources/definitions/deltabot.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "Danny Lu", - "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] }, diff --git a/resources/definitions/easyarts_ares.def.json b/resources/definitions/easyarts_ares.def.json index 12273ed9ce..8d3e5338b6 100644 --- a/resources/definitions/easyarts_ares.def.json +++ b/resources/definitions/easyarts_ares.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "nliaudat", "manufacturer": "EasyArts (discontinued)", - "category": "Other", "file_formats": "text/x-gcode" }, "overrides": { diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8474d38eb3..9ca3937123 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6,7 +6,7 @@ { "type": "machine", "author": "Ultimaker", - "category": "Ultimaker", + "category": "Other", "manufacturer": "Unknown", "setting_version": 1, "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g", diff --git a/resources/definitions/folgertech_FT-5.def.json b/resources/definitions/folgertech_FT-5.def.json index a7709e9395..71c6987a1a 100644 --- a/resources/definitions/folgertech_FT-5.def.json +++ b/resources/definitions/folgertech_FT-5.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "Jaime van Kessel & Paul Bussiere", "manufacturer": "Folger Tech", - "category": "Other", "file_formats": "text/x-gcode", "platform": "FT-5_build_plate.stl" }, diff --git a/resources/definitions/grr_neo.def.json b/resources/definitions/grr_neo.def.json index d09126f3e4..42c2e75319 100644 --- a/resources/definitions/grr_neo.def.json +++ b/resources/definitions/grr_neo.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Simon Cor", "manufacturer": "German RepRap", - "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker.png", "platform": "grr_neo_platform.stl" diff --git a/resources/definitions/helloBEEprusa.def.json b/resources/definitions/helloBEEprusa.def.json index 0fee04f2e9..660e182187 100755 --- a/resources/definitions/helloBEEprusa.def.json +++ b/resources/definitions/helloBEEprusa.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "BEEVERYCREATIVE", "manufacturer": "BEEVERYCREATIVE", - "category": "Other", "platform": "BEEVERYCREATIVE-helloBEEprusa.stl", "platform_offset": [-226, -75, -196], "file_formats": "text/x-gcode", diff --git a/resources/definitions/imade3d_jellybox.def.json b/resources/definitions/imade3d_jellybox.def.json index 86b34bfd5c..0c0f29c070 100644 --- a/resources/definitions/imade3d_jellybox.def.json +++ b/resources/definitions/imade3d_jellybox.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "IMADE3D", "manufacturer": "IMADE3D", - "category": "Other", "platform": "imade3d_jellybox_platform.stl", "platform_offset": [ 0, -0.3, 0], "file_formats": "text/x-gcode", diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index 4b169c5e31..5fc6c83ca2 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Adam Rumjahn", "manufacturer": "Innovo", - "category": "Other", "file_formats": "text/x-gcode", "platform": "inventor_platform.stl", "platform_offset": [-180, -0.25, 160] diff --git a/resources/definitions/julia.def.json b/resources/definitions/julia.def.json index a0eda65bb7..fe10473596 100644 --- a/resources/definitions/julia.def.json +++ b/resources/definitions/julia.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "Fracktal", - "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] }, diff --git a/resources/definitions/kemiq_q2_beta.def.json b/resources/definitions/kemiq_q2_beta.def.json index 911fc584a9..d5bb8a895e 100644 --- a/resources/definitions/kemiq_q2_beta.def.json +++ b/resources/definitions/kemiq_q2_beta.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "KEMIQ", "manufacturer": "KEMIQ", - "category": "Other", "file_formats": "text/x-gcode", "platform": "kemiq_q2.stl", "has_machine_quality": true, diff --git a/resources/definitions/kemiq_q2_gama.def.json b/resources/definitions/kemiq_q2_gama.def.json index 4f803ecdb8..1cb1b45c21 100644 --- a/resources/definitions/kemiq_q2_gama.def.json +++ b/resources/definitions/kemiq_q2_gama.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "KEMIQ", "manufacturer": "KEMIQ", - "category": "Other", "file_formats": "text/x-gcode", "platform": "kemiq_q2.stl", "has_machine_quality": true, diff --git a/resources/definitions/kossel_mini.def.json b/resources/definitions/kossel_mini.def.json index e0e4665570..d915c148a3 100644 --- a/resources/definitions/kossel_mini.def.json +++ b/resources/definitions/kossel_mini.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Claudio Sampaio (Patola)", "manufacturer": "Other", - "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "kossel_platform.stl", diff --git a/resources/definitions/kossel_pro.def.json b/resources/definitions/kossel_pro.def.json index c9dbd63a50..58f1c7f94e 100644 --- a/resources/definitions/kossel_pro.def.json +++ b/resources/definitions/kossel_pro.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Chris Petersen", "manufacturer": "OpenBeam", - "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "kossel_pro_build_platform.stl", diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index 97be1a0152..8dec63f6ec 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "Kupido", - "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] }, diff --git a/resources/definitions/m180.def.json b/resources/definitions/m180.def.json index 04859d87b9..1e8ac1767b 100644 --- a/resources/definitions/m180.def.json +++ b/resources/definitions/m180.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ruben Dulek", "manufacturer": "Malyan", - "category": "Other", "file_formats": "application/x3g" }, diff --git a/resources/definitions/makeR_pegasus.def.json b/resources/definitions/makeR_pegasus.def.json index 08f7702666..b164b2983f 100644 --- a/resources/definitions/makeR_pegasus.def.json +++ b/resources/definitions/makeR_pegasus.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "makeR", "manufacturer": "makeR", - "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "makeR_pegasus_platform.stl", diff --git a/resources/definitions/makeR_prusa_tairona_i3.def.json b/resources/definitions/makeR_prusa_tairona_i3.def.json index 612497d012..0e2320089f 100644 --- a/resources/definitions/makeR_prusa_tairona_i3.def.json +++ b/resources/definitions/makeR_prusa_tairona_i3.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "makeR", "manufacturer": "makeR", - "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "makeR_prusa_tairona_i3_platform.stl", diff --git a/resources/definitions/makeit_pro_l.def.json b/resources/definitions/makeit_pro_l.def.json index 30043cd906..36f7354b64 100644 --- a/resources/definitions/makeit_pro_l.def.json +++ b/resources/definitions/makeit_pro_l.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "NA", "manufacturer": "NA", - "category": "Other", "file_formats": "text/x-gcode", "has_materials": false, "supported_actions": [ "MachineSettingsAction", "UpgradeFirmware" ], diff --git a/resources/definitions/makeit_pro_m.def.json b/resources/definitions/makeit_pro_m.def.json index abaec4c81f..f45e0b6635 100644 --- a/resources/definitions/makeit_pro_m.def.json +++ b/resources/definitions/makeit_pro_m.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "NA", "manufacturer": "NA", - "category": "Other", "file_formats": "text/x-gcode", "has_materials": false, "supported_actions": [ "MachineSettingsAction", "UpgradeFirmware" ], diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json index e4c09c75f2..8358ba0064 100644 --- a/resources/definitions/maker_starter.def.json +++ b/resources/definitions/maker_starter.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "tvlgiao", "manufacturer": "3DMaker", - "category": "Other", "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj", "icon": "icon_ultimaker2.png", "platform": "makerstarter_platform.stl" diff --git a/resources/definitions/makerbotreplicator.def.json b/resources/definitions/makerbotreplicator.def.json index d762db67fc..7844976912 100644 --- a/resources/definitions/makerbotreplicator.def.json +++ b/resources/definitions/makerbotreplicator.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "MakerBot", - "category": "Other", "file_formats": "application/x3g", "platform_offset": [ 0, 0, 0] }, diff --git a/resources/definitions/mankati_fullscale_xt_plus.def.json b/resources/definitions/mankati_fullscale_xt_plus.def.json index c841859962..6c3115b1dc 100644 --- a/resources/definitions/mankati_fullscale_xt_plus.def.json +++ b/resources/definitions/mankati_fullscale_xt_plus.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "RBC", "manufacturer": "Mankati", - "category": "Other", "file_formats": "text/x-gcode", "platform": "mankati_fullscale_xt_plus_platform.stl" }, diff --git a/resources/definitions/mendel90.def.json b/resources/definitions/mendel90.def.json index fee035cdd9..60f3307758 100644 --- a/resources/definitions/mendel90.def.json +++ b/resources/definitions/mendel90.def.json @@ -7,7 +7,6 @@ { "visible": true, "author": "Bo Herrmannsen", - "category": "Other", "manufacturer": "Nophead", "file_formats": "text/x-gcode", "platform": "mendel90_platform.stl", diff --git a/resources/definitions/ord.def.json b/resources/definitions/ord.def.json index bedd8c3121..d9909c4f1f 100644 --- a/resources/definitions/ord.def.json +++ b/resources/definitions/ord.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "ORD Solutions", - "category": "Other", "file_formats": "text/x-gcode", "machine_extruder_trains": { diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index 4bbb033fb7..6b0e0ae547 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "fieldOfView", "manufacturer": "Peopoly", - "category": "Other", "file_formats": "text/x-gcode", "has_machine_quality": true, "has_materials": false diff --git a/resources/definitions/printrbot_play.def.json b/resources/definitions/printrbot_play.def.json index bce67364f8..452b5e131f 100644 --- a/resources/definitions/printrbot_play.def.json +++ b/resources/definitions/printrbot_play.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Chris Pearson", "manufacturer": "Printrbot", - "category": "Other", "file_formats": "text/x-gcode", "platform": "printrbot_play.stl" }, diff --git a/resources/definitions/printrbot_play_heated.def.json b/resources/definitions/printrbot_play_heated.def.json index 878a4f358f..02157a0913 100644 --- a/resources/definitions/printrbot_play_heated.def.json +++ b/resources/definitions/printrbot_play_heated.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Chris Pearson", "manufacturer": "Printrbot", - "category": "Other", "file_formats": "text/x-gcode", "platform": "" }, diff --git a/resources/definitions/printrbot_simple.def.json b/resources/definitions/printrbot_simple.def.json index b0ece54f8f..eba47c88ae 100644 --- a/resources/definitions/printrbot_simple.def.json +++ b/resources/definitions/printrbot_simple.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Calvindog717", "manufacturer": "PrintrBot", - "category": "Other", "platform": "printrbot_simple_metal_platform.stl", "platform_offset": [0, -3.45, 0], "file_formats": "text/x-gcode" diff --git a/resources/definitions/printrbot_simple_extended.def.json b/resources/definitions/printrbot_simple_extended.def.json index 4cf9cb477c..b08e0c7d5d 100644 --- a/resources/definitions/printrbot_simple_extended.def.json +++ b/resources/definitions/printrbot_simple_extended.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "samsector", "manufacturer": "PrintrBot", - "category": "Other", "platform": "printrbot_simple_metal_upgrade.stl", "platform_offset": [0, -0.3, 0], "file_formats": "text/x-gcode" diff --git a/resources/definitions/prusa_i3.def.json b/resources/definitions/prusa_i3.def.json index 307246dbc9..4f0f5b13d7 100644 --- a/resources/definitions/prusa_i3.def.json +++ b/resources/definitions/prusa_i3.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Quillford", "manufacturer": "Prusajr", - "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "prusai3_platform.stl" diff --git a/resources/definitions/prusa_i3_mk2.def.json b/resources/definitions/prusa_i3_mk2.def.json index 02af039867..d4425728d4 100644 --- a/resources/definitions/prusa_i3_mk2.def.json +++ b/resources/definitions/prusa_i3_mk2.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Apsu", "manufacturer": "Prusa Research", - "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "prusai3_platform.stl", diff --git a/resources/definitions/prusa_i3_xl.def.json b/resources/definitions/prusa_i3_xl.def.json index 9d792f8249..e49838c95f 100644 --- a/resources/definitions/prusa_i3_xl.def.json +++ b/resources/definitions/prusa_i3_xl.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "guigashm", "manufacturer": "Prusajr", - "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2.png", "platform": "prusai3_xl_platform.stl" diff --git a/resources/definitions/punchtec_connect_xl.def.json b/resources/definitions/punchtec_connect_xl.def.json index ce4245a04f..16ba59dcb7 100644 --- a/resources/definitions/punchtec_connect_xl.def.json +++ b/resources/definitions/punchtec_connect_xl.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "Punchtec", - "category": "Other", "file_formats": "text/x-gcode", "machine_extruder_trains": { diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json index caf9b11860..55e764800a 100644 --- a/resources/definitions/renkforce_rf100.def.json +++ b/resources/definitions/renkforce_rf100.def.json @@ -5,7 +5,6 @@ "inherits": "fdmprinter", "metadata": { "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", - "category": "Other", "file_formats": "text/x-gcode", "manufacturer": "Renkforce", "visible": true diff --git a/resources/definitions/rigid3d.def.json b/resources/definitions/rigid3d.def.json index b167646f6e..75e435f880 100644 --- a/resources/definitions/rigid3d.def.json +++ b/resources/definitions/rigid3d.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "Rigid3D", - "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] }, diff --git a/resources/definitions/rigid3d_3rdgen.def.json b/resources/definitions/rigid3d_3rdgen.def.json index e7c73ed54d..3191817ecd 100644 --- a/resources/definitions/rigid3d_3rdgen.def.json +++ b/resources/definitions/rigid3d_3rdgen.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "Rigid3D", - "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] }, diff --git a/resources/definitions/rigid3d_hobby.def.json b/resources/definitions/rigid3d_hobby.def.json index 09ba77f63c..02e3cc514c 100644 --- a/resources/definitions/rigid3d_hobby.def.json +++ b/resources/definitions/rigid3d_hobby.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "Rigid3D", - "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] }, diff --git a/resources/definitions/rigid3d_zero.def.json b/resources/definitions/rigid3d_zero.def.json index d5f8c1ef6a..7e99112621 100644 --- a/resources/definitions/rigid3d_zero.def.json +++ b/resources/definitions/rigid3d_zero.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "Rigid3D", - "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] }, diff --git a/resources/definitions/rigid3d_zero2.def.json b/resources/definitions/rigid3d_zero2.def.json index ddb98b0eb2..e2a77db895 100644 --- a/resources/definitions/rigid3d_zero2.def.json +++ b/resources/definitions/rigid3d_zero2.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Rigid3D", "manufacturer": "Rigid3D", - "category": "Other", "has_materials": false, "file_formats": "text/x-gcode", "platform": "rigid3d_zero2_platform.stl", diff --git a/resources/definitions/rigidbot.def.json b/resources/definitions/rigidbot.def.json index 1f63af8758..d183554947 100644 --- a/resources/definitions/rigidbot.def.json +++ b/resources/definitions/rigidbot.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "RBC", "manufacturer": "RigidBot", - "category": "Other", "file_formats": "text/x-gcode", "platform": "rigidbot_platform.stl" }, diff --git a/resources/definitions/rigidbot_big.def.json b/resources/definitions/rigidbot_big.def.json index 8ba52303dd..33c4fd3d27 100644 --- a/resources/definitions/rigidbot_big.def.json +++ b/resources/definitions/rigidbot_big.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "RBC", "manufacturer": "RigidBot", - "category": "Other", "file_formats": "text/x-gcode", "platform": "rigidbotbig_platform.stl" }, diff --git a/resources/definitions/robo_3d_r1.def.json b/resources/definitions/robo_3d_r1.def.json index b137b2054b..88b3fba01f 100644 --- a/resources/definitions/robo_3d_r1.def.json +++ b/resources/definitions/robo_3d_r1.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "Robo 3D", - "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] }, diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json index 87dba5f027..93ebe43ea6 100644 --- a/resources/definitions/tam.def.json +++ b/resources/definitions/tam.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "typeamachines", "manufacturer": "typeamachines", - "category": "Other", "file_formats": "text/x-gcode", "platform": "tam_series1.stl", "platform_offset": [-580.0, -6.23, 253.5], diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index adf0ec8054..b11a84164a 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -6,6 +6,7 @@ "metadata": { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", + "category": "Ultimaker", "visible": false }, "overrides": { diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index f1db386e0d..1931e5f8e3 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "category": "Ultimaker", "weight": 3, "file_formats": "text/x-gcode", "icon": "icon_ultimaker2.png", diff --git a/resources/definitions/ultimaker2_extended.def.json b/resources/definitions/ultimaker2_extended.def.json index 687369d559..b83f24ed3a 100644 --- a/resources/definitions/ultimaker2_extended.def.json +++ b/resources/definitions/ultimaker2_extended.def.json @@ -6,7 +6,6 @@ "metadata": { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "category": "Ultimaker", "weight": 3, "file_formats": "text/x-gcode", "icon": "icon_ultimaker2.png", diff --git a/resources/definitions/ultimaker2_extended_plus.def.json b/resources/definitions/ultimaker2_extended_plus.def.json index 15256064f3..525aaf5b72 100644 --- a/resources/definitions/ultimaker2_extended_plus.def.json +++ b/resources/definitions/ultimaker2_extended_plus.def.json @@ -6,7 +6,6 @@ "metadata": { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "category": "Ultimaker", "quality_definition": "ultimaker2_plus", "weight": 2, "file_formats": "text/x-gcode", diff --git a/resources/definitions/ultimaker2_go.def.json b/resources/definitions/ultimaker2_go.def.json index 0803a91571..abf10ef680 100644 --- a/resources/definitions/ultimaker2_go.def.json +++ b/resources/definitions/ultimaker2_go.def.json @@ -6,7 +6,6 @@ "metadata": { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "category": "Ultimaker", "weight": 3, "file_formats": "text/x-gcode", "icon": "icon_ultimaker2.png", diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index ef5420e77a..7214e6b7fe 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -6,7 +6,6 @@ "metadata": { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "category": "Ultimaker", "weight": 1, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index ba1caeddb5..6221fa6228 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -6,7 +6,6 @@ "metadata": { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "category": "Ultimaker", "visible": true, "file_formats": "text/x-gcode", "platform": "ultimaker3_platform.obj", diff --git a/resources/definitions/ultimaker3_extended.def.json b/resources/definitions/ultimaker3_extended.def.json index 7cf90a1a90..e47ccf4ba3 100644 --- a/resources/definitions/ultimaker3_extended.def.json +++ b/resources/definitions/ultimaker3_extended.def.json @@ -6,7 +6,6 @@ "metadata": { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "category": "Ultimaker", "quality_definition": "ultimaker3", "visible": true, "file_formats": "text/x-gcode", diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index 82f309cc13..ef2f5fae5c 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "category": "Ultimaker", "weight": 4, "file_formats": "text/x-gcode", "icon": "icon_ultimaker.png", diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index 38dd2f0a04..8745434360 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "category": "Ultimaker", "weight": 4, "file_formats": "text/x-gcode", "icon": "icon_ultimaker.png", diff --git a/resources/definitions/ultimaker_original_plus.def.json b/resources/definitions/ultimaker_original_plus.def.json index 013e8bd717..8e401d550c 100644 --- a/resources/definitions/ultimaker_original_plus.def.json +++ b/resources/definitions/ultimaker_original_plus.def.json @@ -6,7 +6,6 @@ "metadata": { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "category": "Ultimaker", "weight": 4, "file_formats": "text/x-gcode", "icon": "icon_ultimaker.png", diff --git a/resources/definitions/uniqbot_one.def.json b/resources/definitions/uniqbot_one.def.json index 7ec5f162ea..410f7e57a6 100644 --- a/resources/definitions/uniqbot_one.def.json +++ b/resources/definitions/uniqbot_one.def.json @@ -6,7 +6,6 @@ "metadata": { "author": "Unimatech", "manufacturer": "Unimatech", - "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2.png" }, diff --git a/resources/definitions/vertex_k8400.def.json b/resources/definitions/vertex_k8400.def.json index ac7ccd5e93..a23e1fc893 100644 --- a/resources/definitions/vertex_k8400.def.json +++ b/resources/definitions/vertex_k8400.def.json @@ -6,7 +6,6 @@ "metadata": { "visible": true, "manufacturer": "Velleman", - "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "Vertex_build_panel.stl", diff --git a/resources/definitions/vertex_k8400_dual.def.json b/resources/definitions/vertex_k8400_dual.def.json index f6b3d6cfbb..9e24bab5d3 100644 --- a/resources/definitions/vertex_k8400_dual.def.json +++ b/resources/definitions/vertex_k8400_dual.def.json @@ -6,7 +6,6 @@ "metadata": { "visible": true, "manufacturer": "Velleman", - "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "Vertex_build_panel.stl", diff --git a/resources/definitions/zone3d_printer.def.json b/resources/definitions/zone3d_printer.def.json index 1663ffdf2b..a1ed56c7ef 100644 --- a/resources/definitions/zone3d_printer.def.json +++ b/resources/definitions/zone3d_printer.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "Unknown", - "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] },