diff --git a/live/Artillery/0.0.8.ini b/live/Artillery/0.0.8.ini index a8f778b..90bd3d7 100644 --- a/live/Artillery/0.0.8.ini +++ b/live/Artillery/0.0.8.ini @@ -327,7 +327,7 @@ printer_notes = PRINTER_VENDOR_Artillery inherits = *common_X4* printer_model = X4 Plus bed_shape = 0x0,300x0,300x300,0x300 -default_print_profile = ArtillerySlicer X4 Plus PETG/PLA/PLA+ @Artillery +default_print_profile = ArtillerySlicer X4 Plus PETG & PLA & PLA+ @Artillery machine_max_feedrate_e = 100,120 machine_max_feedrate_z = 13,12 machine_max_jerk_e = 10,2.5 @@ -340,7 +340,7 @@ end_gcode = G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 inherits = *common_X4* printer_model = X4 Pro bed_shape = 0x0,240x0,240x240,0x240 -default_print_profile = ArtillerySlicer X4 Pro PETG/PLA/PLA+ @Artillery +default_print_profile = ArtillerySlicer X4 Pro PETG & PLA & PLA+ @Artillery machine_max_feedrate_e = 120,120 machine_max_feedrate_z = 13,13 machine_max_jerk_e = 2.5,2.5 @@ -353,7 +353,7 @@ end_gcode = G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 inherits = *common_X4* printer_model = X4 Max bed_shape = 0x0,500x0,500x500,0x500 -default_print_profile = ArtillerySlicer X4 Max PETG/PLA/PLA+ @Artillery +default_print_profile = ArtillerySlicer X4 Max PETG & PLA & PLA+ @Artillery machine_max_feedrate_e = 100,120 machine_max_feedrate_z = 13,12 machine_max_jerk_e = 10,2.5 @@ -699,12 +699,12 @@ top_solid_infill_speed = 50 travel_speed = 250 compatible_printers_condition = printer_model=~/(X3).*/ and nozzle_diameter[0]==0.4 -[print:ArtillerySlicer X3 ABS/PETG/PLA_Silk @Artillery] +[print:ArtillerySlicer X3 ABS&PETG&PLA_Silk @Artillery] inherits = *common_x3* external_perimeter_speed = 50% infill_speed = 150 -[print:ArtillerySlicer X3 PLA/PLA_HS @Artillery] +[print:ArtillerySlicer X3 PLA&PLA_HS @Artillery] inherits = *common_x3* external_perimeter_speed = 50% infill_speed = 200 @@ -762,21 +762,21 @@ infill_speed = 100 solid_infill_speed = 200 top_solid_infill_speed = 200 -[print:ArtillerySlicer X4 Max PETG/PLA/PLA+ @Artillery] +[print:ArtillerySlicer X4 Max PETG & PLA & PLA+ @Artillery] inherits = *common_x4_max*; common_x4_ABS_PETG_PLA avoid_crossing_perimeters = 0 infill_speed = 150 solid_infill_speed = 100 top_solid_infill_speed = 100 -[print:ArtillerySlicer X4 Plus PETG/PLA/PLA+ @Artillery] +[print:ArtillerySlicer X4 Plus PETG & PLA & PLA+ @Artillery] inherits = *common_x4_plus*; common_x4_ABS_PETG_PLA avoid_crossing_perimeters = 0 infill_speed = 150 solid_infill_speed = 150 top_solid_infill_speed = 150 -[print:ArtillerySlicer X4 Pro PETG/PLA/PLA+ @Artillery] +[print:ArtillerySlicer X4 Pro PETG & PLA & PLA+ @Artillery] inherits = *common_x4_pro*; common_x4_ABS_PETG_PLA avoid_crossing_perimeters = 0 infill_speed = 300 @@ -1096,7 +1096,7 @@ extrusion_multiplier = 1.16 [filament:Artillery ABS @X3] inherits = *common_x3* bed_temperature = 100 -compatible_prints = ArtillerySlicer X3 ABS/PETG/PLA_Silk @Artillery +compatible_prints = ArtillerySlicer X3 ABS & PETG & PLA_Silk @Artillery filament_density = 1.04 filament_retract_length = 1 filament_retract_speed = 40 @@ -1108,7 +1108,7 @@ temperature = 250 [filament:Artillery PETG @X3] inherits = *common_x3* bed_temperature = 90 -compatible_prints = ArtillerySlicer X3 ABS/PETG/PLA_Silk @Artillery +compatible_prints = ArtillerySlicer X3 ABS & PETG & PLA_Silk @Artillery filament_density = 1.26 filament_retract_length = 1.1 filament_retract_speed = 40 @@ -1120,7 +1120,7 @@ temperature = 245 [filament:Artillery PLA @X3] inherits = *common_x3* bed_temperature = 60 -compatible_prints = ArtillerySlicer X3 PLA/PLA_HS @Artillery +compatible_prints = ArtillerySlicer X3 PLA & PLA_HS @Artillery filament_density = 1.2 filament_retract_length = 1 filament_retract_speed = 60 @@ -1132,7 +1132,7 @@ temperature = 210 [filament:Artillery PLA HS @X3] inherits = *common_x3* bed_temperature = 60 -compatible_prints = ArtillerySlicer X3 PLA/PLA_HS @Artillery +compatible_prints = ArtillerySlicer X3 PLA & PLA_HS @Artillery filament_density = 1.2 filament_retract_length = 1.2 filament_retract_speed = 60 @@ -1144,7 +1144,7 @@ temperature = 210 [filament:Artillery PLA Silk @X3] inherits = *common_x3* bed_temperature = 70 -compatible_prints = ArtillerySlicer X3 ABS/PETG/PLA_Silk @Artillery +compatible_prints = ArtillerySlicer X3 ABS & PETG & PLA_Silk @Artillery filament_density = 1.2 filament_retract_length = 1 filament_retract_speed = 40 @@ -1180,7 +1180,7 @@ temperature = 260 [filament:Artillery PETG @X4] inherits = *common_x4* bed_temperature = 90 -compatible_prints = ArtillerySlicer X4 Max PETG/PLA/PLA+ @Artillery; ArtillerySlicer X4 Plus PETG/PLA/PLA+ @Artillery; ArtillerySlicer X4 Pro PETG/PLA/PLA+ @Artillery +compatible_prints = ArtillerySlicer X4 Max PETG & PLA & PLA+ @Artillery; ArtillerySlicer X4 Plus PETG & PLA & PLA+ @Artillery; ArtillerySlicer X4 Pro PETG & PLA & PLA+ @Artillery filament_density = 1.26 filament_max_volumetric_speed = 20 filament_retract_length = 1.3 @@ -1191,7 +1191,7 @@ temperature = 250 [filament:Artillery PLA & PLA HS @X4] inherits = *common_x4* -compatible_prints = ArtillerySlicer X4 Max PETG/PLA/PLA+ @Artillery; ArtillerySlicer X4 Plus PETG/PLA/PLA+ @Artillery; ArtillerySlicer X4 Pro PETG/PLA/PLA+ @Artillery; ArtillerySlicer X4 Max PLA HS @Artillery; ArtillerySlicer X4 Plus PLA HS @Artillery; ArtillerySlicer X4 Pro PLA HS @Artillery +compatible_prints = ArtillerySlicer X4 Max PETG & PLA & PLA+ @Artillery; ArtillerySlicer X4 Plus PETG & PLA & PLA+ @Artillery; ArtillerySlicer X4 Pro PETG & PLA & PLA+ @Artillery; ArtillerySlicer X4 Max PLA HS @Artillery; ArtillerySlicer X4 Plus PLA HS @Artillery; ArtillerySlicer X4 Pro PLA HS @Artillery bed_temperature = 60 filament_density = 1.2 filament_max_volumetric_speed = 20 @@ -1204,7 +1204,7 @@ temperature = 210 [filament:Artillery PLA+ @X4] inherits = *common_x4* bed_temperature = 60 -compatible_prints = ArtillerySlicer X4 Max PETG/PLA/PLA+ @Artillery; ArtillerySlicer X4 Plus PETG/PLA/PLA+ @Artillery; ArtillerySlicer X4 Pro PETG/PLA/PLA+ @Artillery +compatible_prints = ArtillerySlicer X4 Max PETG & PLA & PLA+ @Artillery; ArtillerySlicer X4 Plus PETG & PLA & PLA+ @Artillery; ArtillerySlicer X4 Pro PETG & PLA & PLA+ @Artillery filament_density = 1.25 filament_max_volumetric_speed = 20 filament_retract_length = 1.3