Merge branch 'main' into arm

localization/i18n/fr/OrcaSlicer_fr.po

@@ -6538,8 +6538,8 @@ msgstr "Importer la géométrie uniquement"
 msgid ""
 "This option can be changed later in preferences, under 'Load Behaviour'."
 msgstr ""
-"Cette option peut être modifiée ultérieurement dans les préférences, sous « "
-"Comportement du chargement »."
+"Cette option peut être modifiée ultérieurement dans les préférences, sous "
+"« Comportement du chargement »."
 
 msgid "Only one G-code file can be opened at the same time."
 msgstr "Un seul fichier G-code peut être ouvert à la fois."
@@ -7919,8 +7919,8 @@ msgstr ""
 msgid ""
 "When recording timelapse without toolhead, it is recommended to add a "
 "\"Timelapse Wipe Tower\" \n"
-"by right-click the empty position of build plate and choose \"Add Primitive"
-"\"->\"Timelapse Wipe Tower\"."
+"by right-click the empty position of build plate and choose \"Add "
+"Primitive\"->\"Timelapse Wipe Tower\"."
 msgstr ""
 "Lorsque vous enregistrez un timelapse sans tête d’outil, il est recommandé "
 "d’ajouter une \"Tour d’essuyage timelapse\".\n"
@@ -8175,9 +8175,9 @@ msgid ""
 "Bed temperature when cool plate is installed. Value 0 means the filament "
 "does not support to print on the Cool Plate"
 msgstr ""
-"Il s'agit de la température du plateau lorsque le plateau froid (\"Cool plate"
-"\") est installé. Une valeur à 0 signifie que ce filament ne peut pas être "
-"imprimé sur le plateau froid."
+"Il s'agit de la température du plateau lorsque le plateau froid (\"Cool "
+"plate\") est installé. Une valeur à 0 signifie que ce filament ne peut pas "
+"être imprimé sur le plateau froid."
 
 msgid "Textured Cool plate"
 msgstr "Plaque Cool plate texturée"
@@ -12497,10 +12497,10 @@ msgstr "Ventilateur à pleine vitesse à la couche"
 
 msgid ""
 "Fan speed will be ramped up linearly from zero at layer "
-"\"close_fan_the_first_x_layers\" to maximum at layer \"full_fan_speed_layer"
-"\". \"full_fan_speed_layer\" will be ignored if lower than "
-"\"close_fan_the_first_x_layers\", in which case the fan will be running at "
-"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
+"\"close_fan_the_first_x_layers\" to maximum at layer "
+"\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower "
+"than \"close_fan_the_first_x_layers\", in which case the fan will be running "
+"at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
 msgstr ""
 "La vitesse du ventilateur augmentera de manière linéaire à partir de zéro à "
 "la couche \"close_fan_the_first_x_layers\" jusqu’au maximum à la couche "
@@ -13029,7 +13029,7 @@ msgid "Inherits profile"
 msgstr "Hérite du profil"
 
 msgid "Name of parent profile"
-msgstr ""
+msgstr "Nom du profil parent"
 
 msgid "Interface shells"
 msgstr "Coque des interfaces"
@@ -14426,7 +14426,7 @@ msgstr ""
 "diamètre de la buse."
 
 msgid "Spiral starting flow ratio"
-msgstr ""
+msgstr "Rapport de débit de départ de la spirale"
 
 #, fuzzy, c-format, boost-format
 msgid ""
@@ -14442,7 +14442,7 @@ msgstr ""
 "spirale."
 
 msgid "Spiral finishing flow ratio"
-msgstr ""
+msgstr "Taux de débit de la finition en spirale"
 
 #, fuzzy, c-format, boost-format
 msgid ""
@@ -14601,8 +14601,8 @@ msgid ""
 "Use \"Even-odd\" for 3DLabPrint airplane models. Use \"Close holes\" to "
 "close all holes in the model."
 msgstr ""
-"Utilisez « Pair-impair » pour les modèles d'avion 3DLabPrint. Utilisez « "
-"Fermer les trous » pour fermer tous les trous du modèle."
+"Utilisez « Pair-impair » pour les modèles d'avion 3DLabPrint. Utilisez "
+"« Fermer les trous » pour fermer tous les trous du modèle."
 
 msgid "Regular"
 msgstr "Standard"
@@ -15019,6 +15019,8 @@ msgid ""
 "This setting specifies the count of support walls in the range of [0,2]. 0 "
 "means auto."
 msgstr ""
+"Ce paramètre spécifie le nombre de parois de support dans l’intervalle "
+"[0,2]. 0 signifie auto."
 
 msgid "Tree support with infill"
 msgstr "Support arborescent avec remplissage"
@@ -15035,8 +15037,8 @@ msgstr "Activer le contrôle de la température"
 
 msgid ""
 "Enable this option for automated chamber temperature control. This option "
-"activates the emitting of an M191 command before the \"machine_start_gcode"
-"\"\n"
+"activates the emitting of an M191 command before the "
+"\"machine_start_gcode\"\n"
 " which sets the chamber temperature and waits until it is reached. In "
 "addition, it emits an M141 command at the end of the print to turn off the "
 "chamber heater, if present. \n"
@@ -15479,8 +15481,8 @@ msgid ""
 "Wipe tower is only compatible with relative mode. It is recommended on most "
 "printers. Default is checked"
 msgstr ""
-"L’extrusion relative est recommandée lors de l’utilisation de l’option « "
-"label_objects ». Certains extrudeurs fonctionnent mieux avec cette option "
+"L’extrusion relative est recommandée lors de l’utilisation de l’option "
+"« label_objects ». Certains extrudeurs fonctionnent mieux avec cette option "
 "non verrouillée (mode d’extrusion absolu). La tour d’essuyage n’est "
 "compatible qu’avec le mode relatif. Il est recommandé sur la plupart des "
 "imprimantes. L’option par défaut est cochée"
@@ -15674,13 +15676,13 @@ msgid "Export STL"
 msgstr "Exporter STL"
 
 msgid "Export the objects as single STL."
-msgstr ""
+msgstr "Exporter les objets en tant que STL unique."
 
 msgid "Export multiple STLs"
-msgstr ""
+msgstr "Exporter plusieurs STL"
 
 msgid "Export the objects as multiple STLs to directory"
-msgstr ""
+msgstr "Exporter les objets sous forme de STLs multiples dans un répertoire"
 
 msgid "Slice"
 msgstr "Découper"
@@ -15699,12 +15701,13 @@ msgstr ""
 "Mettez à jour les valeurs de configuration 3mf à la version la plus récente."
 
 msgid "downward machines check"
-msgstr ""
+msgstr "contrôle des machines descendantes"
 
 msgid ""
 "check whether current machine downward compatible with the machines in the "
 "list"
 msgstr ""
+"vérifier si la machine actuelle est compatible avec les machines de la liste"
 
 msgid "Load default filaments"
 msgstr "Charger les filaments par défaut"
@@ -15836,10 +15839,10 @@ msgid "Skip some objects in this print"
 msgstr "Ignorer certains objets de cette impression"
 
 msgid "Clone Objects"
-msgstr ""
+msgstr "Cloner des objets"
 
 msgid "Clone objects in the load list"
-msgstr ""
+msgstr "Cloner des objets dans la liste de chargement"
 
 msgid "load uptodate process/machine settings when using uptodate"
 msgstr ""
@@ -15855,27 +15858,37 @@ msgstr ""
 
 msgid "load uptodate filament settings when using uptodate"
 msgstr ""
+"charger les réglages du filament actualisés lors de l’utilisation d’un "
+"filament actualisé"
 
 msgid ""
 "load uptodate filament settings from the specified file when using uptodate"
 msgstr ""
+"charger les paramètres de filament actualisés à partir du fichier spécifié "
+"lors de l’utilisation de l’actualisation"
 
 msgid ""
 "if enabled, check whether current machine downward compatible with the "
 "machines in the list"
 msgstr ""
+"si l’option est activée, vérifier si la machine actuelle est compatible avec "
+"les machines de la liste."
 
 msgid "downward machines settings"
-msgstr ""
+msgstr "réglages des machines descendantes"
 
 msgid "the machine settings list need to do downward checking"
 msgstr ""
+"la liste des paramètres de la machine doit faire l’objet d’une vérification "
+"descendante"
 
 msgid "Load assemble list"
-msgstr ""
+msgstr "Charger la liste d’assemblage"
 
 msgid "Load assemble object list from config file"
 msgstr ""
+"Chargement de la liste des objets assemblés à partir du fichier de "
+"configuration"
 
 msgid "Data directory"
 msgstr "Répertoire de données"
@@ -15906,10 +15919,12 @@ msgstr ""
 "avertissement, 3 :info, 4 :débogage, 5 :trace\n"
 
 msgid "Enable timeplapse for print"
-msgstr ""
+msgstr "Activer le timelapse pour l’impression"
 
 msgid "If enabled, this slicing will be considered using timelapse"
 msgstr ""
+"Si cette option est activée, cette découpe sera prise en charge en utilisant "
+"un timelapse"
 
 msgid "Load custom gcode"
 msgstr "Charger un G-code personnalisé"
@@ -15918,63 +15933,71 @@ msgid "Load custom gcode from json"
 msgstr "Charger un G-code personnalisé à partir de json"
 
 msgid "Load filament ids"
-msgstr ""
+msgstr "Chargement des identifiants de filaments"
 
 msgid "Load filament ids for each object"
-msgstr ""
+msgstr "Chargement des identifiants de filaments pour chaque objet"
 
 msgid "Allow multiple color on one plate"
-msgstr ""
+msgstr "Permettre l’utilisation de plusieurs couleurs sur une même plaque"
 
 msgid "If enabled, the arrange will allow multiple color on one plate"
 msgstr ""
+"Si cette option est activée, l’arrangement permettra d’utiliser plusieurs "
+"couleurs sur une même plaque."
 
 msgid "Allow rotatations when arrange"
-msgstr ""
+msgstr "Autoriser des rotations dans le cadre d’un réagencement"
 
 msgid "If enabled, the arrange will allow rotations when place object"
 msgstr ""
+"Si cette option est activée, l’arrangement autorisera les rotations lors du "
+"placement de l’objet."
 
 msgid "Avoid extrusion calibrate region when doing arrange"
-msgstr ""
+msgstr "Éviter la région d’étalonnage de l’extrusion lors de l’arrangement"
 
 msgid ""
 "If enabled, the arrange will avoid extrusion calibrate region when place "
 "object"
 msgstr ""
+"Si cette option est activée, l’arrangement évitera la région d’étalonnage de "
+"l’extrusion lorsqu’il placera l’objet."
 
 msgid "Skip modified gcodes in 3mf"
-msgstr ""
+msgstr "Ignorer les gcodes modifiés dans le 3mf"
 
 msgid "Skip the modified gcodes in 3mf from Printer or filament Presets"
 msgstr ""
+"Sauter les gcodes modifiés dans le 3mf à partir des préréglages de "
+"l’imprimante ou du filament"
 
 msgid "MakerLab name"
-msgstr ""
+msgstr "Nom dans MakerLab"
 
 msgid "MakerLab name to generate this 3mf"
-msgstr ""
+msgstr "Nom de MakerLab pour générer ce 3mf"
 
 msgid "MakerLab version"
-msgstr ""
+msgstr "Version de MakerLab"
 
 msgid "MakerLab version to generate this 3mf"
-msgstr ""
+msgstr "Version de MakerLab pour générer ce 3mf"
 
 msgid "metadata name list"
-msgstr ""
+msgstr "liste de noms de métadonnées"
 
 msgid "metadata name list added into 3mf"
-msgstr ""
+msgstr "liste de noms de métadonnées ajoutée dans le 3mf"
 
 msgid "metadata value list"
-msgstr ""
+msgstr "liste des valeurs des métadonnées"
 
 msgid "metadata value list added into 3mf"
-msgstr ""
+msgstr "liste des valeurs de métadonnées ajoutée au 3mf"
 
 msgid "Allow 3mf with newer version to be sliced"
-msgstr ""
+msgstr "Autoriser la découpe de 3mf avec une version plus récente"
 
 msgid "Current z-hop"
 msgstr "Saut en z actuel"
@@ -17396,8 +17419,8 @@ msgstr ""
 "Voulez-vous le réécrire ?"
 
 msgid ""
-"We would rename the presets as \"Vendor Type Serial @printer you selected"
-"\". \n"
+"We would rename the presets as \"Vendor Type Serial @printer you "
+"selected\". \n"
 "To add preset for more printers, Please go to printer selection"
 msgstr ""
 "Nous renommerions les préréglages en « Vendor Type Serial @printer you "
@@ -18380,42 +18403,44 @@ msgid "Head diameter"
 msgstr "Diamètre de la tête"
 
 msgid "Max angle"
-msgstr ""
+msgstr "Angle maximal"
 
 msgid "Detection radius"
-msgstr ""
+msgstr "Rayon de détection"
 
 msgid "Remove selected points"
 msgstr "Retirer les points sélectionnés"
 
 msgid "Remove all"
-msgstr ""
+msgstr "Supprimer tout"
 
 msgid "Auto-generate points"
 msgstr "Générer automatiquement les points"
 
 msgid "Add a brim ear"
-msgstr ""
+msgstr "Ajouter une bordure à oreilles"
 
 msgid "Delete a brim ear"
-msgstr ""
+msgstr "Supprimer une bordure à oreilles"
 
 msgid "Adjust section view"
-msgstr ""
+msgstr "Ajuster la vue de section"
 
 msgid ""
 "Warning: The brim type is not set to \"painted\",the brim ears will not take "
 "effect !"
 msgstr ""
+"Attention : Si le type de bord n’est pas réglé sur « peint », les bordures "
+"en oreilles ne seront pas prises en compte !"
 
 msgid "Set the brim type to \"painted\""
-msgstr ""
+msgstr "Régler le type de bordure sur « peint »"
 
 msgid " invalid brim ears"
-msgstr ""
+msgstr " bordure à oreilles invalide"
 
 msgid "Brim Ears"
-msgstr ""
+msgstr "Bordure à oreilles"
 
 msgid "Please select single object."
 msgstr "Please select single object."
@@ -19352,8 +19377,8 @@ msgstr ""
 #~ "modèle. Réglez le « seuil d’une paroi » dans les paramètres avancés ci-"
 #~ "dessous pour ajuster la sensibilité de ce qui est considéré comme une "
 #~ "surface supérieure. Le « seuil d’une paroi » n’est visible que si ce "
-#~ "paramètre est supérieur à la valeur par défaut de 0,5 ou si l’option « "
-#~ "surfaces supérieures à une paroi » est activée."
+#~ "paramètre est supérieur à la valeur par défaut de 0,5 ou si l’option "
+#~ "« surfaces supérieures à une paroi » est activée."
 
 #, c-format, boost-format
 #~ msgid ""
@@ -20240,8 +20265,8 @@ msgstr ""
 #~ "thickness (top+bottom solid layers)"
 #~ msgstr ""
 #~ "Ajoutez du remplissage solide à proximité des surfaces inclinées pour "
-#~ "garantir l'épaisseur verticale de la coque (couches solides supérieure"
-#~ "+inférieure)."
+#~ "garantir l'épaisseur verticale de la coque (couches solides "
+#~ "supérieure+inférieure)."
 
 #~ msgid "Further reduce solid infill on walls (beta)"
 #~ msgstr "Réduire davantage le remplissage solide des parois (expérimental)"

resources/profiles/BIQU/machine/BIQU B1.json

@@ -8,5 +8,5 @@
     "bed_model": "biqu_b1_buildplate_model.stl",
     "bed_texture": "biqu_b1_buildplate_texture.png",
     "hotend_model": "biqu_b1_hotend.stl",
-    "default_materials": "BIQU Generic PLA;BIQU Generic PETG;BIQU Generic ABS"
+    "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System"
 }

resources/profiles/BIQU/machine/BIQU BX.json

@@ -8,5 +8,5 @@
     "bed_model": "biqu_bx_buildplate_model.stl",
     "bed_texture": "biqu_bx_buildplate_texture.png",
     "hotend_model": "biqu_bx_hotend.stl",
-    "default_materials": "BIQU Generic PLA;BIQU Generic PETG;BIQU Generic ABS"
+    "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System"
 }

resources/profiles/BIQU/machine/BIQU Hurakan (0.4 nozzle).json

@@ -138,7 +138,7 @@
     "1"
   ],
   "default_filament_profile": [
-    "BIQU Generic PLA"
+    "Generic PLA @System"
   ],
   "bed_exclude_area": [
     "0x0"

resources/profiles/BIQU/machine/BIQU Hurakan.json

@@ -8,5 +8,5 @@
     "bed_model": "biqu_hurakan_buildplate_model.stl",
     "bed_texture": "biqu_hurakan_buildplate_texture.png",
     "hotend_model": "biqu_hurakan_hotend.stl",
-    "default_materials": "BIQU Generic PLA;BIQU Generic PETG;BIQU Generic ABS"
+    "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System"
 }

resources/profiles/BIQU/machine/fdm_biqu_common.json

@@ -124,7 +124,7 @@
     "1"
   ],
   "default_filament_profile": [
-    "BIQU Generic PLA"
+    "Generic PLA @System"
   ],
   "bed_exclude_area": [
     "0x0"

resources/profiles/BIQU/machine/fdm_klipper_common.json

@@ -125,7 +125,7 @@
     "1"
   ],
   "default_filament_profile": [
-    "BIQU Generic PLA"
+    "Generic PLA @System"
   ],
   "bed_exclude_area": [
     "0x0"

resources/profiles/Chuanying/machine/Chuanying X1.json

@@ -8,5 +8,5 @@
 	"bed_model": "chuanying_x1_buildplate_model.STL",
 	"bed_texture": "chuanying_x1_buildplate_texture.png",
 	"hotend_model": "chuanying_x1_hotend.STL",
-	"default_materials": "Flashforge Generic PETG;Flashforge Generic PLA"
+	"default_materials": "Chuanying Generic PETG;Chuanying Generic PLA"
 }

resources/profiles/Chuanying/machine/fdm_chuanying_common.json

@@ -124,7 +124,7 @@
     "1"
   ],
   "default_filament_profile": [
-    "Flashforge Generic PLA"
+    "Chuanying Generic PLA"
   ],
   "default_print_profile": "0.20mm Standard @Chuanying X1",
   "bed_exclude_area": [

resources/profiles/Chuanying/machine/fdm_klipper_common.json

@@ -125,7 +125,7 @@
     "1"
   ],
   "default_filament_profile": [
-    "Flashforge Generic ABS"
+    "Chuanying Generic ABS"
   ],
   "default_print_profile": "0.20mm Standard @Chuanying X1",
   "bed_exclude_area": [

resources/profiles/Chuanying/machine/fdm_x1_common.json

@@ -37,7 +37,7 @@
 	"single_extruder_multi_material": "0",
 	"change_filament_gcode": "",
 	"machine_pause_gcode": "M25",
-	"default_filament_profile": [ "Flashforge Generic PLA" ],
+	"default_filament_profile": [ "Chuanying Generic PLA" ],
 	"machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-0.2 F800\nG1 X110 Y-110 F6000\nG1 E2 F800\nG1 Y-110 X55 Z0.25 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG1 Y-110 X55 Z0.45 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG92 E0",
 	"machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nM104 S0 ; turn off temperature",
 	"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]",

resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3 Plus.json

@@ -105,7 +105,7 @@
     "machine_end_gcode": "end_print",
     "change_filament_gcode": "FILAMENT_CHANGE LAYER_NUM=[layer_num] NEXT_EXTRUDER=[next_extruder]",
     "default_filament_profile": [
-		"Co Print PLA"
+		"CoPrint Generic PLA"
 	],
     "extruder_clearance_radius": [
         "65"

resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle - Ender-3 V3.json

@@ -105,7 +105,7 @@
     "machine_end_gcode": "end_print",
     "change_filament_gcode": "FILAMENT_CHANGE LAYER_NUM=[layer_num] NEXT_EXTRUDER=[next_extruder]",
     "default_filament_profile": [
-		"Co Print PLA"
+		"CoPrint Generic PLA"
 	],
     "extruder_clearance_radius": [
         "65"

resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle fast.json

@@ -105,7 +105,7 @@
     "machine_end_gcode": "end_print",
     "change_filament_gcode": "FILAMENT_CHANGE LAYER_NUM=[layer_num] NEXT_EXTRUDER=[next_extruder]",
     "default_filament_profile": [
-		"Co Print PLA"
+		"CoPrint Generic PLA"
 	],
     "extruder_clearance_radius": [
         "65"

resources/profiles/Co Print/machine/Co Print ChromaSet 0.4 nozzle.json

@@ -105,7 +105,7 @@
     "machine_end_gcode": "end_print",
     "change_filament_gcode": "FILAMENT_CHANGE LAYER_NUM=[layer_num] NEXT_EXTRUDER=[next_extruder]",
     "default_filament_profile": [
-		"Co Print PLA"
+		"CoPrint Generic PLA"
 	],
     "extruder_clearance_radius": [
         "65"

resources/profiles/Co Print/machine/Co Print ChromaSet.json

@@ -8,5 +8,5 @@
     "bed_model": "",
     "bed_texture": "Co_Print_ChromaSet_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Co Print PLA"
+    "default_materials": "CoPrint Generic PLA"
 }

resources/profiles/Co Print/machine/fdm_coprint_common.json

@@ -100,7 +100,7 @@
 	"machine_start_gcode": "start_print  EXTRUDER=[initial_extruder] EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
     "machine_end_gcode": "end_print",
     "default_filament_profile": [
-		"Co Print PLA"
+		"CoPrint Generic PLA"
 	],
     "extruder_clearance_radius": [
         "65"

resources/profiles/Creality/filament/Creality Generic ABS @Hi-all.json

@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"setting_id": "GFSA04_CREALITY_00",
-	"name": "Creality Generic ABS @Hi",
+	"name": "Creality Generic ABS @Hi-all",
 	"from": "system",
 	"instantiation": "true",
 	"inherits": "Creality Generic ABS",

resources/profiles/Custom/machine/fdm_klipper_common.json

@@ -46,7 +46,7 @@
   "single_extruder_multi_material": "1",
   "change_filament_gcode": "",
   "wipe": ["1"],
-  "default_filament_profile": ["My Generic ABS"],
+  "default_filament_profile": ["Generic PLA @System"],
   "default_print_profile": "0.20mm Standard @MyKlipper",
   "bed_exclude_area": ["0x0"],
   "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n",

resources/profiles/Custom/machine/fdm_rrf_common.json

@@ -124,7 +124,7 @@
         "1"
     ],
     "default_filament_profile": [
-        "My Generic ABS"
+        "Generic PLA @System"
     ],
     "default_print_profile": "0.20mm Standard @MyRRF",
     "bed_exclude_area": [

resources/profiles/Custom/machine/fdm_toolchanger_common.json

@@ -7,7 +7,7 @@
     "gcode_flavor": "klipper",
     "single_extruder_multi_material": "0",
     "default_filament_profile": [
-        "My Generic PLA @MyToolChanger"
+        "Generic PLA @MyToolChanger"
     ],
     "default_print_profile": "0.20mm Standard @MyToolChanger",
     "max_layer_height": [

resources/profiles/DeltaMaker/machine/fdm_klipper_common.json

@@ -46,7 +46,7 @@
   "single_extruder_multi_material": "1",
   "change_filament_gcode": "",
   "wipe": ["1"],
-  "default_filament_profile": ["DeltaMaker PLA"],
+  "default_filament_profile": ["DeltaMaker Generic PLA"],
   "default_print_profile": "0.20mm Standard @DeltaMaker 2 0.35 nozzle",
   "bed_exclude_area": ["0x0"],
   "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM109 S[nozzle_temperature_initial_layer]\nSTART_PRINT EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n",

resources/profiles/Elegoo/machine/EC/Elegoo Centauri.json

@@ -8,5 +8,5 @@
   "bed_model": "elegoo_C_buildplate_model.stl",
   "bed_texture": "",
   "hotend_model": "",
-  "default_materials": "Elegoo ASA @0.2 nozzle;Elegoo ASA @EC;Elegoo PETG PRO @0.2 nozzle;Elegoo PETG PRO @EC;Elegoo PLA @0.2 nozzle;Elegoo PLA Matte @0.2 nozzle;Elegoo PLA Matte @EC;Elegoo PLA PRO @0.2 nozzle;Elegoo PLA PRO @EC;Elegoo PLA Silk @0.2 nozzle;Elegoo PLA Silk @EC;Elegoo PLA @EC;Elegoo PLA+ @0.2 nozzle;Elegoo PLA+ @EC;Elegoo RAPID PETG @0.2 nozzle;Elegoo RAPID PETG @EC;Elegoo RAPID PETG+ @0.2 nozzle;Elegoo RAPID PETG+ @EC;Elegoo RAPID PLA @0.2 nozzle;Elegoo RAPID PLA @EC;Elegoo RAPID PLA+ @0.2 nozzle;Elegoo RAPID PLA+ @EC;Elegoo TPU 95A @EC"
+  "default_materials": "Elegoo ASA @0.2 nozzle;Elegoo ASA @EC;Elegoo PETG PRO @0.2 nozzle;Elegoo PETG PRO @EC;Elegoo PLA @0.2 nozzle;Elegoo PLA Matte @0.2 nozzle;Elegoo PLA Matte @EC;Elegoo PLA PRO @0.2 nozzle;Elegoo PLA PRO @EC;Elegoo PLA Silk @0.2 nozzle;Elegoo PLA Silk @EC;Elegoo PLA @EC;Elegoo PLA+ @0.2 nozzle;Elegoo PLA+ @EC;Elegoo RAPID PETG @0.2 nozzle;Elegoo RAPID PETG @EC;Elegoo RAPID PETG+;;Elegoo RAPID PLA+ @EC;Elegoo RAPID PLA+ @0.2 nozzle;Elegoo RAPID PLA+ @EC;Elegoo TPU 95A @EC"
 }

resources/profiles/Elegoo/machine/ECC/Elegoo Centauri Carbon.json

@@ -8,5 +8,5 @@
   "bed_model": "elegoo_CC_buildplate_model.stl",
   "bed_texture": "",
   "hotend_model": "",
-  "default_materials": "Elegoo ASA @0.2 nozzle;Elegoo ASA @ECC;Elegoo PETG PRO @0.2 nozzle;Elegoo PETG PRO @ECC;Elegoo PLA @0.2 nozzle;Elegoo PLA Matte @0.2 nozzle;Elegoo PLA Matte @ECC;Elegoo PLA PRO @0.2 nozzle;Elegoo PLA PRO @ECC;Elegoo PLA Silk @0.2 nozzle;Elegoo PLA Silk @ECC;Elegoo PLA-CF @ECC;Elegoo PLA @ECC;Elegoo PLA+ @0.2 nozzle;Elegoo PLA+ @ECC;Elegoo RAPID PETG @0.2 nozzle;Elegoo RAPID PETG @ECC;Elegoo RAPID PETG+ @0.2 nozzle;Elegoo RAPID PETG+ @ECC;Elegoo RAPID PLA @0.2 nozzle;Elegoo RAPID PLA @ECC;Elegoo RAPID PLA+ @0.2 nozzle;Elegoo RAPID PLA+ @ECC;Elegoo TPU 95A @ECC"
+  "default_materials": "Elegoo ASA @0.2 nozzle;Elegoo ASA @ECC;Elegoo PETG PRO @0.2 nozzle;Elegoo PETG PRO @ECC;Elegoo PLA @0.2 nozzle;Elegoo PLA Matte @0.2 nozzle;Elegoo PLA Matte @ECC;Elegoo PLA PRO @0.2 nozzle;Elegoo PLA PRO @ECC;Elegoo PLA Silk @0.2 nozzle;Elegoo PLA Silk @ECC;Elegoo PLA-CF @ECC;Elegoo PLA @ECC;Elegoo PLA+ @0.2 nozzle;Elegoo PLA+ @ECC;Elegoo RAPID PETG @0.2 nozzle;Elegoo RAPID PETG @ECC;Elegoo RAPID PETG+;Elegoo RAPID PLA+ @0.2 nozzle;Elegoo RAPID PLA+ @ECC;Elegoo TPU 95A @ECC"
 }

resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json

@@ -51,7 +51,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Elegoo Generic PLA @0.2 nozzle"
+		"Elegoo Generic PLA"
 	],
 	"machine_start_gcode": ";ELEGOO NEPTUNE 4\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder\n",
 	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json

@@ -51,7 +51,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Elegoo Generic PLA @0.4 nozzle"
+		"Elegoo Generic PLA"
 	],
 	"machine_start_gcode": ";ELEGOO NEPTUNE 4\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder\n",
 	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json

@@ -51,7 +51,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Elegoo Generic PLA @0.6 nozzle"
+		"Elegoo Generic PLA"
 	],
 	"machine_start_gcode": ";ELEGOO NEPTUNE 4\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder\n",
 	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json

@@ -51,7 +51,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Elegoo Generic PLA @0.8 nozzle"
+		"Elegoo Generic PLA"
 	],
 	"machine_start_gcode": ";ELEGOO NEPTUNE 4\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder\n",
 	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.2 nozzle).json

@@ -78,7 +78,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Elegoo Generic PLA @0.2 nozzle"
+		"Elegoo Generic PLA"
 	],
 	"machine_start_gcode": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X165 Y0.5 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder",
 	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y400 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.4 nozzle).json

@@ -78,7 +78,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Elegoo Generic PLA @0.4 nozzle"
+		"Elegoo Generic PLA"
 	],
 	"machine_start_gcode": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X165 Y0.5 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder",
 	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y400 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.6 nozzle).json

@@ -78,7 +78,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Elegoo Generic PLA @0.6 nozzle"
+		"Elegoo Generic PLA"
 	],
 	"machine_start_gcode": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X165 Y0.5 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder",
 	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y400 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.8 nozzle).json

@@ -78,7 +78,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Elegoo Generic PLA @0.8 nozzle"
+		"Elegoo Generic PLA"
 	],
 	"machine_start_gcode": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X165 Y0.5 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder",
 	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y400 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json

@@ -9,5 +9,5 @@
     "bed_texture": "elegoo_neptune_max_buildplate_texture.png",
     "bed_exclude_area": ["0x0"],
     "hotend_model": "",
-	"default_materials": "Elegoo Generic PLA @0.2 nozzle;Elegoo Generic PETG @0.2 nozzle;Elegoo Generic ABS @0.2 nozzle;Elegoo Generic PLA @0.4 nozzle;Elegoo Generic PETG @0.4 nozzle;Elegoo Generic ABS @0.4 nozzle;Elegoo Generic PLA @0.6 nozzle;Elegoo Generic PETG @0.6 nozzle;Elegoo Generic ABS @0.6 nozzle;Elegoo Generic PLA @0.8 nozzle;Elegoo Generic PETG @0.8 nozzle;Elegoo Generic ABS @0.8 nozzle"
+	"default_materials": "Elegoo Generic PLA;Elegoo Generic PETG;Elegoo Generic ABS"
 }

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.2 nozzle).json

@@ -84,7 +84,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Elegoo Generic PLA @0.2 nozzle"
+		"Elegoo Generic PLA"
 	],
 	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X115 Y0.5 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder",
 	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.4 nozzle).json

@@ -84,7 +84,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Elegoo Generic PLA @0.4 nozzle"
+		"Elegoo Generic PLA"
 	],
 	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X115 Y0.5 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder",
 	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.6 nozzle).json

@@ -84,7 +84,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Elegoo Generic PLA @0.6 nozzle"
+		"Elegoo Generic PLA"
 	],
 	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X115 Y0.5 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder",
 	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.8 nozzle).json

@@ -84,7 +84,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Elegoo Generic PLA @0.8 nozzle"
+		"Elegoo Generic PLA"
 	],
 	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X115 Y0.5 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder",
 	"machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus.json

@@ -9,5 +9,6 @@
     "bed_texture": "elegoo_neptune4plus_buildplate_texture.png",
     "bed_exclude_area": ["0x0"],
     "hotend_model": "",
-	"default_materials": "Elegoo Generic PLA @0.2 nozzle;Elegoo Generic PETG @0.2 nozzle;Elegoo Generic ABS @0.2 nozzle;Elegoo Generic PLA @0.4 nozzle;Elegoo Generic PETG @0.4 nozzle;Elegoo Generic ABS @0.4 nozzle;Elegoo Generic PLA @0.6 nozzle;Elegoo Generic PETG @0.6 nozzle;Elegoo Generic ABS @0.6 nozzle;Elegoo Generic PLA @0.8 nozzle;Elegoo Generic PETG @0.8 nozzle;Elegoo Generic ABS @0.8 nozzle"
+	"default_materials": "Elegoo Generic PLA;Elegoo Generic PETG;Elegoo Generic ABS"
+
 }

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json

@@ -50,7 +50,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Elegoo Generic PLA @0.2 nozzle"
+		"Elegoo Generic PLA"
 	],
 	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder",
 	"machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json

@@ -50,7 +50,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Elegoo Generic PLA @0.4 nozzle"
+		"Elegoo Generic PLA"
 	],
 	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder",
 	"machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json

@@ -50,7 +50,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Elegoo Generic PLA @0.6 nozzle"
+		"Elegoo Generic PLA"
 	],
 	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder",
 	"machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json

@@ -110,7 +110,7 @@
   "change_filament_gcode": "M600",
   "machine_pause_gcode": "PAUSE",
   "default_filament_profile": [
-    "Elegoo Generic PLA @0.8 nozzle"
+    "Elegoo Generic PLA"
   ],
   "machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder",
   "machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro.json

@@ -8,5 +8,6 @@
     "bed_model": "elegoo_neptune4pro_buildplate_model.stl",
     "bed_texture": "elegoo_neptune4pro_buildplate_texture.png",
     "hotend_model": "",
-	"default_materials": "Elegoo Generic PLA @0.2 nozzle;Elegoo Generic PETG @0.2 nozzle;Elegoo Generic ABS @0.2 nozzle;Elegoo Generic PLA @0.4 nozzle;Elegoo Generic PETG @0.4 nozzle;Elegoo Generic ABS @0.4 nozzle;Elegoo Generic PLA @0.6 nozzle;Elegoo Generic PETG @0.6 nozzle;Elegoo Generic ABS @0.6 nozzle;Elegoo Generic PLA @0.8 nozzle;Elegoo Generic PETG @0.8 nozzle;Elegoo Generic ABS @0.8 nozzle"
+	"default_materials": "Elegoo Generic PLA;Elegoo Generic PETG;Elegoo Generic ABS"
+
 }

resources/profiles/Elegoo/machine/Elegoo Neptune 4.json

@@ -8,5 +8,6 @@
     "bed_model": "elegoo_neptune4_buildplate_model.stl",
     "bed_texture": "elegoo_neptune4_buildplate_texture.png",
     "hotend_model": "",
-	"default_materials": "Elegoo Generic PLA @0.2 nozzle;Elegoo Generic PETG @0.2 nozzle;Elegoo Generic ABS @0.2 nozzle;Elegoo Generic PLA @0.4 nozzle;Elegoo Generic PETG @0.4 nozzle;Elegoo Generic ABS @0.4 nozzle;Elegoo Generic PLA @0.6 nozzle;Elegoo Generic PETG @0.6 nozzle;Elegoo Generic ABS @0.6 nozzle;Elegoo Generic PLA @0.8 nozzle;Elegoo Generic PETG @0.8 nozzle;Elegoo Generic ABS @0.8 nozzle"
+	"default_materials": "Elegoo Generic PLA;Elegoo Generic PETG;Elegoo Generic ABS"
+
 }

resources/profiles/Elegoo/machine/Elegoo OrangeStorm Giga.json

@@ -8,5 +8,5 @@
     "machine_tech": "FFF",
     "family": "Elegoo",
     "hotend_model": "",
-    "default_materials": "Elegoo PLA @Elegoo Giga;Elegoo PETG PRO @Elegoo Giga;Elegoo ABS @Elegoo Giga;Elegoo PLA Silk"
+    "default_materials": "Elegoo PLA @Elegoo Giga;Elegoo PETG PRO @Elegoo Giga;Elegoo PLA Silk"
 }

resources/profiles/Eryone/machine/Thinker X400 0.4 nozzle.json

@@ -6,7 +6,7 @@
     "instantiation": "true",
     "printer_model": "Thinker X400",
     "default_print_profile": "0.20mm Standard @Thinker X400",
-    "default_filament_profile":"Eryone Generic PLA;Eryone Generic ABS;Eryone Generic ASA;Eryone Generic PETG;Eryone Generic Silk PLA;Eryone Generic TPU",
+    "default_filament_profile":"Generic PLA @System;Generic ABS @System;Generic ASA @System;Generic PETG @System;Generic PLA Silk @System;Generic TPU @System",
     "auxiliary_fan": "0",
     "bed_custom_model": "",
     "bed_custom_texture": "",

resources/profiles/Eryone/machine/Thinker X400.json

@@ -8,5 +8,5 @@
     "bed_model": "X400_bed.stl",
     "bed_texture": "Thinker_texture.png",
     "hotend_model": "",
-    "default_materials": "Eryone Generic PLA;Eryone Generic ABS;Eryone Generic ASA;Eryone Generic PETG;Eryone Generic Silk PLA;Eryone Generic TPU"
+    "default_materials": "Generic PLA @System;Generic ABS @System;Generic ASA @System;Generic PETG @System;Generic PLA Silk @System;Generic TPU @System"
 }

resources/profiles/FlyingBear/machine/S1/FlyingBear S1.json

@@ -8,5 +8,5 @@
     "bed_model": "FlyingBear S1-bed.stl",
     "bed_texture": "FlyingBear S1-texture.png",
     "hotend_model": "",
-    "default_materials": "FlyingBear Generic ABS;FlyingBear Generic PA-CF;FlyingBear Generic PC;FlyingBear Generic PETG;FlyingBear Generic PLA;InFlyingBearfiMech Generic TPU"
+    "default_materials": "FlyingBear Generic ABS;FlyingBear Generic PA-CF;FlyingBear Generic PC;FlyingBear Generic PETG;FlyingBear Generic PLA;FlyingBear Generic TPU"
 }

resources/profiles/FlyingBear/machine/fdm_machine_common.json

@@ -16,7 +16,7 @@
     "cooling_tube_length": "5",
     "cooling_tube_retraction": "91.5",
     "default_filament_profile": [
-        "FlyingBear PLA"
+        "FlyingBear Generic PLA"
     ],
     "default_print_profile": "0.20mm Standard @FlyingBear Reborn3",
     "deretraction_speed": [

resources/profiles/Folgertech/machine/Folgertech FT-5.json

@@ -8,5 +8,5 @@
     "bed_model": "Folgertech_FT5_buildplate_model.stl",
     "bed_texture": "Folgertech_FT5_buildplate_texture.png",
     "hotend_model": "hotend.stl",
-    "default_materials": "Folgertech Generic PLA;Folgertech Generic PETG;Folgertech Generic ABS;"
+    "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;"
 }

resources/profiles/Folgertech/machine/Folgertech FT-6.json

@@ -9,5 +9,5 @@
     "bed_texture": "Folgertech_FT6_buildplate_texture.png",
     "hotend_model": "hotend.stl",
 	"extruders_count": "2",
-    "default_materials": "Folgertech Generic PLA;Folgertech Generic PETG;Folgertech Generic ABS;Folgertech Generic TPU;"
+    "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System;"
 }

resources/profiles/Folgertech/machine/Folgertech i3.json

@@ -8,5 +8,5 @@
     "bed_model": "Folgertech_i3_buildplate_model.stl",
     "bed_texture": "Folgertech_i3_buildplate_texture.png",
     "hotend_model": "hotend.stl",
-    "default_materials": "Folgertech Generic PLA;Folgertech Generic PETG;Folgertech Generic ABS;"
+    "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;"
 }

resources/profiles/Folgertech/machine/fdm_folgertech_common.json

@@ -123,7 +123,7 @@
     "1"
   ],
   "default_filament_profile": [
-    "Generic PLA @folgertech"
+    "Generic PLA @System"
   ],
   "default_print_profile": "0.20mm Standard @FT 0.4 Nozzle",
   "bed_exclude_area": [

resources/profiles/Geeetech/machine/Geeetech A10 M 0.4 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A10 M",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.4",
   "default_print_profile": "0.20mm Standard @Geeetech common",

resources/profiles/Geeetech/machine/Geeetech A10 M.json

@@ -8,5 +8,5 @@
     "bed_model": "220x220.stl",
     "bed_texture": "Geeetech_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech"
+    "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System"
 }

resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.2 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A10 Pro",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.2",
   "default_print_profile": "0.10mm Standard @Geeetech common 0.2 nozzle",

resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.4 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A10 Pro",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.4",
   "default_print_profile": "0.20mm Standard @Geeetech common",

resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.6 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A10 Pro",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.6",
   "default_print_profile": "0.30mm Standard @Geeetech common 0.6 nozzle",

resources/profiles/Geeetech/machine/Geeetech A10 Pro 0.8 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A10 Pro",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.8",
   "default_print_profile": "0.40mm Standard @Geeetech common 0.8 nozzle",

resources/profiles/Geeetech/machine/Geeetech A10 Pro.json

@@ -8,5 +8,5 @@
     "bed_model": "220x220.stl",
     "bed_texture": "Geeetech_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech"
+    "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System"
 }

resources/profiles/Geeetech/machine/Geeetech A10 T 0.4 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A10 T",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.4",
   "default_print_profile": "0.20mm Standard @Geeetech common",

resources/profiles/Geeetech/machine/Geeetech A10 T.json

@@ -8,5 +8,5 @@
     "bed_model": "220x220.stl",
     "bed_texture": "Geeetech_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech"
+    "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System"
 }

resources/profiles/Geeetech/machine/Geeetech A20 0.2 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A20",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.2",
   "default_print_profile": "0.10mm Standard @Geeetech common 0.2 nozzle",

resources/profiles/Geeetech/machine/Geeetech A20 0.4 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A20",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.4",
   "default_print_profile": "0.20mm Standard @Geeetech common",

resources/profiles/Geeetech/machine/Geeetech A20 0.6 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A20",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.6",
   "default_print_profile": "0.30mm Standard @Geeetech common 0.6 nozzle",

resources/profiles/Geeetech/machine/Geeetech A20 0.8 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A20",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.8",
   "default_print_profile": "0.40mm Standard @Geeetech common 0.8 nozzle",

resources/profiles/Geeetech/machine/Geeetech A20 M 0.4 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A20 M",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.4",
   "default_print_profile": "0.20mm Standard @Geeetech common",

resources/profiles/Geeetech/machine/Geeetech A20 M.json

@@ -8,5 +8,5 @@
     "bed_model": "250x250.stl",
     "bed_texture": "Geeetech_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech"
+    "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System"
 }

resources/profiles/Geeetech/machine/Geeetech A20 T 0.4 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A20 T",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.4",
   "default_print_profile": "0.20mm Standard @Geeetech common",

resources/profiles/Geeetech/machine/Geeetech A20 T.json

@@ -8,5 +8,5 @@
     "bed_model": "250x250.stl",
     "bed_texture": "Geeetech_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech"
+    "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System"
 }

resources/profiles/Geeetech/machine/Geeetech A20.json

@@ -8,5 +8,5 @@
     "bed_model": "250x250.stl",
     "bed_texture": "Geeetech_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech"
+    "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System"
 }

resources/profiles/Geeetech/machine/Geeetech A30 M 0.4 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A30 M",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.4",
   "default_print_profile": "0.20mm Standard @Geeetech common",

resources/profiles/Geeetech/machine/Geeetech A30 M.json

@@ -8,5 +8,5 @@
     "bed_model": "320x320.stl",
     "bed_texture": "Geeetech_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech"
+    "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System"
 }

resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.2 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A30 Pro",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.2",
   "default_print_profile": "0.10mm Standard @Geeetech common 0.2 nozzle",

resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.4 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A30 Pro",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.4",
   "default_print_profile": "0.20mm Standard @Geeetech common",

resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.6 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A30 Pro",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.6",
   "default_print_profile": "0.30mm Standard @Geeetech common 0.6 nozzle",

resources/profiles/Geeetech/machine/Geeetech A30 Pro 0.8 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A30 Pro",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.8",
   "default_print_profile": "0.40mm Standard @Geeetech common 0.8 nozzle",

resources/profiles/Geeetech/machine/Geeetech A30 Pro.json

@@ -8,5 +8,5 @@
     "bed_model": "320x320.stl",
     "bed_texture": "Geeetech_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech"
+    "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System"
 }

resources/profiles/Geeetech/machine/Geeetech A30 T 0.4 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech A30 T",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.4",
   "default_print_profile": "0.20mm Standard @Geeetech common",

resources/profiles/Geeetech/machine/Geeetech A30 T.json

@@ -8,5 +8,5 @@
     "bed_model": "320x320.stl",
     "bed_texture": "Geeetech_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech"
+    "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System"
 }

resources/profiles/Geeetech/machine/Geeetech M1 0.2 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech M1",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.2",
   "default_print_profile": "0.10mm Standard @Geeetech M1 0.2 nozzle",

resources/profiles/Geeetech/machine/Geeetech M1 0.4 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech M1",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.4",
   "default_print_profile": "0.20mm Standard @Geeetech M1",

resources/profiles/Geeetech/machine/Geeetech M1 0.6 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech M1",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.6",
   "default_print_profile": "0.30mm Standard @Geeetech M1 0.6 nozzle",

resources/profiles/Geeetech/machine/Geeetech M1 0.8 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech M1",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.8",
   "default_print_profile": "0.44mm Draft @Geeetech M1 0.8 nozzle",

resources/profiles/Geeetech/machine/Geeetech M1.json

@@ -8,5 +8,5 @@
     "bed_model": "105x105.stl",
     "bed_texture": "Geeetech_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic TPU @Geeetech"
+    "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic TPU @System"
 }

resources/profiles/Geeetech/machine/Geeetech Mizar 0.2 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech Mizar",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.2",
   "default_print_profile": "0.10mm Standard @Geeetech common 0.2 nozzle",

resources/profiles/Geeetech/machine/Geeetech Mizar 0.4 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech Mizar",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.4",
   "default_print_profile": "0.20mm Standard @Geeetech common",

resources/profiles/Geeetech/machine/Geeetech Mizar 0.6 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech Mizar",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.6",
   "default_print_profile": "0.30mm Standard @Geeetech common 0.6 nozzle",

resources/profiles/Geeetech/machine/Geeetech Mizar 0.8 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech Mizar",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.8",
   "default_print_profile": "0.40mm Standard @Geeetech common 0.8 nozzle",

resources/profiles/Geeetech/machine/Geeetech Mizar M 0.4 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech Mizar M",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.4",
   "default_print_profile": "0.20mm Standard @Geeetech common",

resources/profiles/Geeetech/machine/Geeetech Mizar M.json

@@ -8,5 +8,5 @@
     "bed_model": "255x255.stl",
     "bed_texture": "Geeetech_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech"
+    "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System"
 }

resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.2 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech Mizar Max",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.2",
   "default_print_profile": "0.10mm Standard @Geeetech common 0.2 nozzle",

resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.4 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech Mizar Max",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.4",
   "default_print_profile": "0.20mm Standard @Geeetech common",

resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.6 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech Mizar Max",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.6",
   "default_print_profile": "0.30mm Standard @Geeetech common 0.6 nozzle",

resources/profiles/Geeetech/machine/Geeetech Mizar Max 0.8 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech Mizar Max",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.8",
   "default_print_profile": "0.40mm Standard @Geeetech common 0.8 nozzle",

resources/profiles/Geeetech/machine/Geeetech Mizar Max.json

@@ -8,5 +8,5 @@
     "bed_model": "320x320.stl",
     "bed_texture": "Geeetech_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic ABS @Geeetech;Generic TPU @Geeetech"
+    "default_materials": "Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System"
 }

resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.2 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech Mizar Pro",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.2",
   "default_print_profile": "0.10mm Standard @Geeetech common 0.2 nozzle",

resources/profiles/Geeetech/machine/Geeetech Mizar Pro 0.4 nozzle.json

@@ -7,7 +7,7 @@
   "inherits": "fdm_geeetech_common",
   "printer_model": "Geeetech Mizar Pro",
   "default_filament_profile": [
-    "Generic PLA @Geeetech"
+    "Generic PLA @System"
   ],
   "printer_variant": "0.4",
   "default_print_profile": "0.20mm Standard @Geeetech common",