mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-10-31 20:51:12 -06:00 
			
		
		
		
	fix some issues in profiles
This commit is contained in:
		
							parent
							
								
									5b97935562
								
							
						
					
					
						commit
						d85654b540
					
				
					 86 changed files with 107 additions and 522 deletions
				
			
		|  | @ -5,11 +5,11 @@ | |||
|     "description": "My configurations", | ||||
|     "machine_model_list": [ | ||||
|         { | ||||
|             "name": "MyKlipper", | ||||
|             "name": "Generaic Klipper Printer", | ||||
|             "sub_path": "machine/MyKlipper.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "MyMarlin", | ||||
|             "name": "Generic Marlin Printer", | ||||
|             "sub_path": "machine/MyMarlin.json" | ||||
|         } | ||||
|     ], | ||||
|  |  | |||
|  | @ -13,9 +13,7 @@ | |||
|         "12" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
| 
 | ||||
|       "MyKlipper 0.4 nozzle", | ||||
|       "MyMarlin 0.4 nozzle", | ||||
|       "OrcaArena 0.4 nozzle" | ||||
|       "MyMarlin 0.4 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -13,9 +13,7 @@ | |||
|         "12" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
| 
 | ||||
|       "MyKlipper 0.4 nozzle", | ||||
|       "MyMarlin 0.4 nozzle", | ||||
|       "OrcaArena 0.4 nozzle" | ||||
|       "MyMarlin 0.4 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -19,9 +19,7 @@ | |||
|         "8" | ||||
|     ], | ||||
| "compatible_printers": [ | ||||
| 
 | ||||
|       "MyKlipper 0.4 nozzle", | ||||
|       "MyMarlin 0.4 nozzle", | ||||
|       "OrcaArena 0.4 nozzle" | ||||
|       "MyMarlin 0.4 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -16,9 +16,7 @@ | |||
|         "12" | ||||
|     ], | ||||
| "compatible_printers": [ | ||||
| 
 | ||||
|       "MyKlipper 0.4 nozzle", | ||||
|       "MyMarlin 0.4 nozzle", | ||||
|       "OrcaArena 0.4 nozzle" | ||||
|       "MyMarlin 0.4 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -13,9 +13,7 @@ | |||
|         "0.94" | ||||
|     ], | ||||
| "compatible_printers": [ | ||||
| 
 | ||||
|       "MyKlipper 0.4 nozzle", | ||||
|       "MyMarlin 0.4 nozzle", | ||||
|       "OrcaArena 0.4 nozzle" | ||||
|       "MyMarlin 0.4 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -43,9 +43,7 @@ | |||
|         "; filament start gcode\n" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
| 
 | ||||
|       "MyKlipper 0.4 nozzle", | ||||
|       "MyMarlin 0.4 nozzle", | ||||
|       "OrcaArena 0.4 nozzle" | ||||
|       "MyMarlin 0.4 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -19,9 +19,7 @@ | |||
|         "7" | ||||
|     ], | ||||
| "compatible_printers": [ | ||||
| 
 | ||||
|       "MyKlipper 0.4 nozzle", | ||||
|       "MyMarlin 0.4 nozzle", | ||||
|       "OrcaArena 0.4 nozzle" | ||||
|       "MyMarlin 0.4 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -16,9 +16,7 @@ | |||
|         "8" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
| 
 | ||||
|       "MyKlipper 0.4 nozzle", | ||||
|       "MyMarlin 0.4 nozzle", | ||||
|       "OrcaArena 0.4 nozzle" | ||||
|       "MyMarlin 0.4 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -19,9 +19,7 @@ | |||
|         "10" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
| 
 | ||||
|       "MyKlipper 0.4 nozzle", | ||||
|       "MyMarlin 0.4 nozzle", | ||||
|       "OrcaArena 0.4 nozzle" | ||||
|       "MyMarlin 0.4 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -10,9 +10,7 @@ | |||
|         "3.2" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
| 
 | ||||
|       "MyKlipper 0.4 nozzle", | ||||
|       "MyMarlin 0.4 nozzle", | ||||
|       "OrcaArena 0.4 nozzle" | ||||
|       "MyMarlin 0.4 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -5,7 +5,7 @@ | |||
|   "from": "system", | ||||
|   "instantiation": "true", | ||||
|   "inherits": "fdm_klipper_common", | ||||
|   "printer_model": "MyKlipper", | ||||
|   "printer_model": "Generaic Klipper Printer", | ||||
|   "nozzle_diameter": [ | ||||
|     "0.4" | ||||
|   ], | ||||
|  |  | |||
|  | @ -1,6 +1,6 @@ | |||
| { | ||||
|     "type": "machine_model", | ||||
|     "name": "MyKlipper", | ||||
|     "name": "Generaic Klipper Printer", | ||||
|     "model_id": "my_klipper_01", | ||||
|     "nozzle_diameter": "0.4", | ||||
|     "machine_tech": "FFF", | ||||
|  |  | |||
|  | @ -5,7 +5,7 @@ | |||
|   "from": "system", | ||||
|   "instantiation": "true", | ||||
|   "inherits": "fdm_machine_common", | ||||
|   "printer_model": "MyMarlin", | ||||
|   "printer_model": "Generic Marlin Printer", | ||||
|   "gcode_flavor": "marlin", | ||||
|   "machine_end_gcode": "G1 E-1.0 F2100 ; retract\nG92 E0.0\nG1{if max_layer_z < max_print_height} Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} E-34.0 F720 ; move print head up & retract filament\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y105 F3000 ; park print head\nM84 ; disable motors", | ||||
|   "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting]\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nG28 ; home all\nG1 Y1.0 Z0.3 F1000 ; move print head up\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG92 E0.0\n; initial load\nG1 X205.0 E19 F1000\nG1 Y1.6\nG1 X5.0 E19 F1000\nG92 E0.0\n; intro line\nG1 Y2.0 Z0.2 F1000\nG1 X65.0 E9.0 F1000\nG1 X105.0 E12.5 F1000\nG92 E0.0", | ||||
|  |  | |||
|  | @ -1,6 +1,6 @@ | |||
| { | ||||
|     "type": "machine_model", | ||||
|     "name": "MyMarlin", | ||||
|     "name": "Generic Marlin Printer", | ||||
|     "model_id": "my_marlin_01", | ||||
|     "nozzle_diameter": "0.4", | ||||
|     "machine_tech": "FFF", | ||||
|  |  | |||
|  | @ -74,7 +74,7 @@ | |||
|     "0" | ||||
|   ], | ||||
|   "max_layer_height": [ | ||||
|     "0.28" | ||||
|     "0.32" | ||||
|   ], | ||||
|   "min_layer_height": [ | ||||
|     "0.08" | ||||
|  | @ -120,7 +120,6 @@ | |||
|   "silent_mode": "0", | ||||
|   "single_extruder_multi_material": "1", | ||||
|   "change_filament_gcode": "", | ||||
|   "machine_pause_gcode": "PAUSE", | ||||
|   "wipe": [ | ||||
|     "1" | ||||
|   ], | ||||
|  | @ -135,6 +134,7 @@ | |||
|   "machine_end_gcode": "PRINT_END", | ||||
|   "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", | ||||
|   "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", | ||||
|   "machine_pause_gcode": "PAUSE", | ||||
|   "scan_first_layer": "0", | ||||
|   "nozzle_type": "undefine", | ||||
|   "auxiliary_fan": "0" | ||||
|  |  | |||
|  | @ -112,5 +112,8 @@ | |||
|     ], | ||||
|     "default_print_profile": "", | ||||
|     "machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder \nG1 X110 Y110 Z2.0 F3000 ;Move Z Axis up", | ||||
|     "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end" | ||||
|     "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end", | ||||
|     "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", | ||||
|     "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", | ||||
|     "machine_pause_gcode": "M601" | ||||
| } | ||||
|  |  | |||
|  | @ -91,58 +91,10 @@ | |||
|             "name": "0.30mm Standard @Arena X1C 0.6 nozzle", | ||||
|             "sub_path": "process/0.30mm Standard @Arena X1C 0.6 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "0.30mm Standard @Arena X1 0.6 nozzle", | ||||
|             "sub_path": "process/0.30mm Standard @Arena X1 0.6 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "0.40mm Standard @Arena X1C 0.8 nozzle", | ||||
|             "sub_path": "process/0.40mm Standard @Arena X1C 0.8 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "0.40mm Standard @Arena X1 0.8 nozzle", | ||||
|             "sub_path": "process/0.40mm Standard @Arena X1 0.8 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"0.10mm Standard @Arena P1P 0.2 nozzle", | ||||
|             "sub_path":"process/0.10mm Standard @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"0.20mm Standard @Arena P1P", | ||||
|             "sub_path":"process/0.20mm Standard @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"0.30mm Standard @Arena P1P 0.6 nozzle", | ||||
|             "sub_path":"process/0.30mm Standard @Arena P1P 0.6 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"0.08mm Extra Fine @Arena P1P", | ||||
|             "sub_path":"process/0.08mm Extra Fine @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"0.12mm Fine @Arena P1P", | ||||
|             "sub_path":"process/0.12mm Fine @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"0.16mm Optimal @Arena P1P", | ||||
|             "sub_path":"process/0.16mm Optimal @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"0.20mm Strength @Arena P1P", | ||||
|             "sub_path":"process/0.20mm Strength @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"0.24mm Draft @Arena P1P", | ||||
|             "sub_path":"process/0.24mm Draft @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"0.28mm Extra Draft @Arena P1P", | ||||
|             "sub_path":"process/0.28mm Extra Draft @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"0.40mm Standard @Arena P1P 0.8 nozzle", | ||||
|             "sub_path":"process/0.40mm Standard @Arena P1P 0.8 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "fdm_process_bbl_0.06_nozzle_0.2", | ||||
|             "sub_path": "process/fdm_process_bbl_0.06_nozzle_0.2.json" | ||||
|  | @ -441,10 +393,6 @@ | |||
|             "name": "Generic PETG-CF @Arena X1C", | ||||
|             "sub_path": "filament/Generic PETG-CF @Arena X1C.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Generic PETG-CF @Arena P1P", | ||||
|             "sub_path": "filament/P1P/Generic PETG-CF @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PETG-CF @base", | ||||
|             "sub_path": "filament/Arena PETG-CF @base.json" | ||||
|  | @ -453,10 +401,6 @@ | |||
|             "name": "Arena PETG-CF @Arena X1C", | ||||
|             "sub_path": "filament/Arena PETG-CF @Arena X1C.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PETG-CF @Arena P1P", | ||||
|             "sub_path": "filament/P1P/Arena PETG-CF @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Generic PVA @0.2 nozzle", | ||||
|             "sub_path": "filament/Generic PVA @0.2 nozzle.json" | ||||
|  | @ -477,10 +421,6 @@ | |||
|             "name": "Arena TPU 95A @Arena X1C", | ||||
|             "sub_path": "filament/Arena TPU 95A @Arena X1C.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena TPU 95A @Arena X1", | ||||
|             "sub_path": "filament/Arena TPU 95A @Arena X1.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PLA Matte @Arena X1C", | ||||
|             "sub_path": "filament/Arena PLA Matte @Arena X1C.json" | ||||
|  | @ -493,10 +433,6 @@ | |||
|             "name": "Arena PLA Matte @Arena X1C 0.8 nozzle", | ||||
|             "sub_path": "filament/Arena PLA Matte @Arena X1C 0.8 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PLA Matte @Arena X1", | ||||
|             "sub_path": "filament/Arena PLA Matte @Arena X1.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PLA Basic @Arena X1C", | ||||
|             "sub_path": "filament/Arena PLA Basic @Arena X1C.json" | ||||
|  | @ -509,10 +445,6 @@ | |||
|             "name": "Arena PLA Basic @Arena X1C 0.8 nozzle", | ||||
|             "sub_path": "filament/Arena PLA Basic @Arena X1C 0.8 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PLA Basic @Arena X1", | ||||
|             "sub_path": "filament/Arena PLA Basic @Arena X1.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PLA Tough @Arena X1C", | ||||
|             "sub_path": "filament/Arena PLA Tough @Arena X1C.json" | ||||
|  | @ -521,30 +453,14 @@ | |||
|             "name": "Arena PLA Tough @Arena X1C 0.2 nozzle", | ||||
|             "sub_path": "filament/Arena PLA Tough @Arena X1C 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PLA Tough @Arena X1", | ||||
|             "sub_path": "filament/Arena PLA Tough @Arena X1.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PLA Marble @Arena X1", | ||||
|             "sub_path": "filament/Arena PLA Marble @Arena X1.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PLA Marble @Arena X1C", | ||||
|             "sub_path": "filament/Arena PLA Marble @Arena X1C.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PLA Sparkle @Arena X1", | ||||
|             "sub_path": "filament/Arena PLA Sparkle @Arena X1.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PLA Sparkle @Arena X1C", | ||||
|             "sub_path": "filament/Arena PLA Sparkle @Arena X1C.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PLA Silk @Arena X1", | ||||
|             "sub_path": "filament/Arena PLA Silk @Arena X1.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PLA Silk @Arena X1C 0.2 nozzle", | ||||
|             "sub_path": "filament/Arena PLA Silk @Arena X1C 0.2 nozzle.json" | ||||
|  | @ -553,14 +469,6 @@ | |||
|             "name": "Arena PLA Silk @Arena X1C", | ||||
|             "sub_path": "filament/Arena PLA Silk @Arena X1C.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PLA Silk @Arena P1P", | ||||
|             "sub_path": "filament/P1P/Arena PLA Silk @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PLA Silk @Arena P1P 0.2 nozzle", | ||||
|             "sub_path": "filament/P1P/Arena PLA Silk @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PETG Basic @Arena X1C", | ||||
|             "sub_path": "filament/Arena PETG Basic @Arena X1C.json" | ||||
|  | @ -593,10 +501,6 @@ | |||
|             "name": "Arena Support W @Arena X1C 0.2 nozzle", | ||||
|             "sub_path": "filament/Arena Support W @Arena X1C 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena Support W @Arena X1", | ||||
|             "sub_path": "filament/Arena Support W @Arena X1.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena Support G @Arena X1C", | ||||
|             "sub_path": "filament/Arena Support G @Arena X1C.json" | ||||
|  | @ -625,18 +529,10 @@ | |||
|             "name": "PolyLite PLA @Arena X1C", | ||||
|             "sub_path": "filament/PolyLite PLA @Arena X1C.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "PolyLite PLA @Arena X1", | ||||
|             "sub_path": "filament/PolyLite PLA @Arena X1.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "PolyTerra PLA @Arena X1C", | ||||
|             "sub_path": "filament/PolyTerra PLA @Arena X1C.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "PolyTerra PLA @Arena X1", | ||||
|             "sub_path": "filament/PolyTerra PLA @Arena X1.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "PolyTerra PLA @Arena X1C 0.2 nozzle", | ||||
|             "sub_path": "filament/PolyTerra PLA @Arena X1C 0.2 nozzle.json" | ||||
|  | @ -645,106 +541,6 @@ | |||
|             "name": "PolyLite PLA @Arena X1C 0.2 nozzle", | ||||
|             "sub_path": "filament/PolyLite PLA @Arena X1C 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena Support G @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Arena Support G @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena ABS @Arena P1P 0.2 nozzle", | ||||
|             "sub_path": "filament/P1P/Arena ABS @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena PLA Matte @Arena P1P 0.2 nozzle", | ||||
|             "sub_path":"filament/P1P/Arena PLA Matte @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena PLA Matte @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Arena PLA Matte @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena PLA Basic @Arena P1P 0.2 nozzle", | ||||
|             "sub_path":"filament/P1P/Arena PLA Basic @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena PLA Basic @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Arena PLA Basic @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena PLA Tough @Arena P1P 0.2 nozzle", | ||||
|             "sub_path":"filament/P1P/Arena PLA Tough @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena PLA Tough @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Arena PLA Tough @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena PLA Marble @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Arena PLA Marble @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena PLA Sparkle @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Arena PLA Sparkle @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena ABS @Arena P1P", | ||||
|             "sub_path": "filament/P1P/Arena ABS @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PC @Arena P1P", | ||||
|             "sub_path": "filament/P1P/Arena PC @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PC @Arena P1P 0.2 nozzle", | ||||
|             "sub_path": "filament/P1P/Arena PC @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena Support W @Arena P1P 0.2 nozzle", | ||||
|             "sub_path": "filament/P1P/Arena Support W @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena TPU 95A @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Arena TPU 95A @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena Support W @Arena P1P", | ||||
|             "sub_path": "filament/P1P/Arena Support W @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Generic PLA @Arena P1P 0.2 nozzle", | ||||
|             "sub_path":"filament/P1P/Generic PLA @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Generic PLA @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Generic PLA @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Generic PLA Silk @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Generic PLA Silk @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Generic ABS @Arena P1P 0.2 nozzle", | ||||
|             "sub_path": "filament/P1P/Generic ABS @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Generic ABS @Arena P1P", | ||||
|             "sub_path": "filament/P1P/Generic ABS @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Generic ASA @Arena P1P 0.2 nozzle", | ||||
|             "sub_path": "filament/P1P/Generic ASA @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Generic ASA @Arena P1P", | ||||
|             "sub_path": "filament/P1P/Generic ASA @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Generic PC @Arena P1P 0.2 nozzle", | ||||
|             "sub_path": "filament/P1P/Generic PC @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Generic PC @Arena P1P", | ||||
|             "sub_path": "filament/P1P/Generic PC @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Generic PETG @0.2 nozzle", | ||||
|             "sub_path":"filament/Generic PETG @0.2 nozzle.json" | ||||
|  | @ -753,10 +549,6 @@ | |||
|             "name":"Arena PLA Metal @Arena X1C 0.2 nozzle", | ||||
|             "sub_path":"filament/Arena PLA Metal @Arena X1C 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena PLA Metal @Arena X1", | ||||
|             "sub_path":"filament/Arena PLA Metal @Arena X1.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena PLA Metal @Arena X1C", | ||||
|             "sub_path":"filament/Arena PLA Metal @Arena X1C.json" | ||||
|  | @ -780,86 +572,6 @@ | |||
|         { | ||||
|             "name":"Arena PAHT-CF @Arena X1C", | ||||
|             "sub_path":"filament/Arena PAHT-CF @Arena X1C.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Generic PETG @Arena P1P", | ||||
|             "sub_path": "filament/P1P/Generic PETG @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Generic PVA @Arena P1P 0.2 nozzle", | ||||
|             "sub_path":"filament/P1P/Generic PVA @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Generic PVA @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Generic PVA @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Generic TPU @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Generic TPU @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"PolyLite PLA @Arena P1P 0.2 nozzle", | ||||
|             "sub_path":"filament/P1P/PolyLite PLA @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"PolyLite PLA @Arena P1P", | ||||
|             "sub_path":"filament/P1P/PolyLite PLA @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"PolyTerra PLA @Arena P1P 0.2 nozzle", | ||||
|             "sub_path":"filament/P1P/PolyTerra PLA @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"PolyTerra PLA @Arena P1P", | ||||
|             "sub_path":"filament/P1P/PolyTerra PLA @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena PA-CF @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Arena PA-CF @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Generic PA-CF @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Generic PA-CF @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Generic PA @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Generic PA @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Generic PETG @Arena P1P 0.2 nozzle", | ||||
|             "sub_path":"filament/P1P/Generic PETG @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena PAHT-CF @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Arena PAHT-CF @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena PLA Metal @Arena P1P 0.2 nozzle", | ||||
|             "sub_path":"filament/P1P/Arena PLA Metal @Arena P1P 0.2 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena PLA Metal @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Arena PLA Metal @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena PLA-CF @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Arena PLA-CF @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Generic PLA-CF @Arena P1P", | ||||
|             "sub_path":"filament/P1P/Generic PLA-CF @Arena P1P.json" | ||||
|         }, | ||||
|         { | ||||
|             "name":"Arena PLA-CF @Arena P1P 0.8 nozzle", | ||||
|             "sub_path":"filament/P1P/Arena PLA-CF @Arena P1P 0.8 nozzle.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PET-CF @Arena X1C", | ||||
|             "sub_path": "filament/Arena PET-CF @Arena X1C.json" | ||||
|         }, | ||||
|         { | ||||
|             "name": "Arena PET-CF @Arena P1P", | ||||
|             "sub_path": "filament/P1P/Arena PET-CF @Arena P1P.json" | ||||
|         } | ||||
|     ], | ||||
|     "machine_list": [ | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|         "2" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|       "Orca Arena X1 0.2 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -15,7 +15,6 @@ | |||
|         "10" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -10,8 +10,6 @@ | |||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -29,9 +29,6 @@ | |||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -8,9 +8,6 @@ | |||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  | @ -12,7 +12,6 @@ | |||
|         "260" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|       "Orca Arena X1 0.2 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|         "260" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|         "260" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -6,7 +6,6 @@ | |||
|     "instantiation": "true", | ||||
|     "inherits": "Arena PC @base", | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|       "Orca Arena X1 0.4 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -19,10 +19,7 @@ | |||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,8 +9,6 @@ | |||
|     "1" | ||||
|   ], | ||||
|   "compatible_printers": [ | ||||
|     "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|     "Orca Arena X1 0.2 nozzle", | ||||
|     "Orca Arena P1P 0.2 nozzle" | ||||
|     "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|   ] | ||||
| } | ||||
|  |  | |||
|  | @ -16,10 +16,6 @@ | |||
|   ], | ||||
|   "compatible_printers": [ | ||||
|     "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|     "Orca Arena X1 0.6 nozzle", | ||||
|     "Orca Arena P1P 0.6 nozzle", | ||||
|     "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|     "Orca Arena X1 0.8 nozzle", | ||||
|     "Orca Arena P1P 0.8 nozzle" | ||||
|     "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|   ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,8 +9,6 @@ | |||
|     "14" | ||||
|   ], | ||||
|   "compatible_printers": [ | ||||
|     "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|     "Orca Arena X1 0.4 nozzle", | ||||
|     "Orca Arena P1P 0.4 nozzle" | ||||
|     "Orca Arena X1 Carbon 0.4 nozzle" | ||||
|   ] | ||||
| } | ||||
|  |  | |||
|  | @ -7,10 +7,7 @@ | |||
|   "inherits": "Arena PETG-CF @base", | ||||
|   "compatible_printers": [ | ||||
|     "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|     "Orca Arena X1 0.4 nozzle", | ||||
|     "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|     "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|     "Orca Arena X1 0.6 nozzle", | ||||
|     "Orca Arena X1 0.8 nozzle" | ||||
|     "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|   ] | ||||
| } | ||||
|  |  | |||
|  | @ -12,8 +12,7 @@ | |||
|         "8" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|         "Orca Arena X1 0.4 nozzle", | ||||
|         "Orca Arena X1 0.6 nozzle", | ||||
|            | ||||
|         "Orca Arena X1 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|         "2" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|       "Orca Arena X1 0.2 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|         "23.2" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|       "Orca Arena X1 0.4 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,8 +9,6 @@ | |||
|         "8" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -12,8 +12,6 @@ | |||
|         "8" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|         "Orca Arena X1 0.4 nozzle", | ||||
|         "Orca Arena X1 0.6 nozzle", | ||||
|         "Orca Arena X1 0.8 nozzle" | ||||
|           "Orca Arena X1 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|         "2" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|       "Orca Arena X1 0.2 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -12,8 +12,6 @@ | |||
|         "8" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|         "Orca Arena X1 0.4 nozzle", | ||||
|         "Orca Arena X1 0.6 nozzle", | ||||
|         "Orca Arena X1 0.8 nozzle" | ||||
|           "Orca Arena X1 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|         "2" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|       "Orca Arena X1 0.2 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -12,8 +12,6 @@ | |||
|     "8" | ||||
|   ], | ||||
|   "compatible_printers": [ | ||||
|     "Orca Arena X1 0.4 nozzle", | ||||
|     "Orca Arena X1 0.6 nozzle", | ||||
|     "Orca Arena X1 0.8 nozzle" | ||||
|     "Orca Arena X1 0.4 nozzle" | ||||
|   ] | ||||
| } | ||||
|  | @ -9,7 +9,6 @@ | |||
|       "2" | ||||
|   ], | ||||
|   "compatible_printers": [ | ||||
|     "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|     "Orca Arena X1 0.2 nozzle" | ||||
|     "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|   ] | ||||
| } | ||||
|  | @ -9,8 +9,6 @@ | |||
|         "8" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|     "Orca Arena X1 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -12,8 +12,6 @@ | |||
|         "8" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|         "Orca Arena X1 0.4 nozzle", | ||||
|         "Orca Arena X1 0.6 nozzle", | ||||
|         "Orca Arena X1 0.8 nozzle" | ||||
|           "Orca Arena X1 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|         "2" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|       "Orca Arena X1 0.2 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -16,8 +16,6 @@ | |||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -15,7 +15,6 @@ | |||
|       "230" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|       "Orca Arena X1 0.4 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -8,9 +8,6 @@ | |||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -6,8 +6,6 @@ | |||
|     "instantiation": "true", | ||||
|     "inherits": "Arena Support W @base", | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|     "Orca Arena X1 0.8 nozzle" | ||||
|   ] | ||||
| } | ||||
|  |  | |||
|  | @ -15,7 +15,6 @@ | |||
|         "240" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|         "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|         "Orca Arena X1 0.2 nozzle" | ||||
|         "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|     ] | ||||
| } | ||||
|  | @ -9,8 +9,6 @@ | |||
|         "3.6" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|     "Orca Arena X1 0.8 nozzle" | ||||
|   ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|         "2" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|       "Orca Arena X1 0.2 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -7,10 +7,7 @@ | |||
|     "inherits": "Generic ABS @base", | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|         "2" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|       "Orca Arena X1 0.2 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -7,10 +7,7 @@ | |||
|     "inherits": "Generic ASA @base", | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -39,9 +39,6 @@ | |||
|     "compatible_printers": [ | ||||
|         "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|         "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|         "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|         "Orca Arena X1 0.4 nozzle", | ||||
|         "Orca Arena X1 0.6 nozzle", | ||||
|         "Orca Arena X1 0.8 nozzle" | ||||
|         "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -21,9 +21,6 @@ | |||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|         "1" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|       "Orca Arena X1 0.2 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -8,9 +8,6 @@ | |||
|   "compatible_printers": [ | ||||
|     "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|     "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|     "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|     "Orca Arena X1 0.4 nozzle", | ||||
|     "Orca Arena X1 0.6 nozzle", | ||||
|     "Orca Arena X1 0.8 nozzle" | ||||
|     "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|   ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|       "1" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|         "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|         "Orca Arena X1 0.2 nozzle" | ||||
|         "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -7,10 +7,7 @@ | |||
|   "inherits": "Generic PETG-CF @base", | ||||
|   "compatible_printers": [ | ||||
|     "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|     "Orca Arena X1 0.4 nozzle", | ||||
|     "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|     "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|     "Orca Arena X1 0.6 nozzle", | ||||
|     "Orca Arena X1 0.8 nozzle" | ||||
|     "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|   ] | ||||
| } | ||||
|  |  | |||
|  | @ -7,10 +7,7 @@ | |||
|     "inherits": "Generic PETG @base", | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -12,7 +12,6 @@ | |||
|       "; filament start gcode\n{if  (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|       "Orca Arena X1 0.2 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -13,10 +13,7 @@ | |||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -8,9 +8,6 @@ | |||
|     "compatible_printers": [ | ||||
|         "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|         "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|         "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|         "Orca Arena X1 0.4 nozzle", | ||||
|         "Orca Arena X1 0.6 nozzle", | ||||
|         "Orca Arena X1 0.8 nozzle" | ||||
|         "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|       ] | ||||
| } | ||||
|  |  | |||
|  | @ -7,10 +7,7 @@ | |||
|     "inherits": "Generic PLA @base", | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|         "0.5" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|       "Orca Arena X1 0.2 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -7,10 +7,7 @@ | |||
|     "inherits": "Generic PVA @base", | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -13,9 +13,6 @@ | |||
|       "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 0.4 nozzle", | ||||
|       "Orca Arena X1 0.6 nozzle", | ||||
|       "Orca Arena X1 0.8 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.4 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.6 nozzle", | ||||
|       "Orca Arena X1 Carbon 0.8 nozzle" | ||||
|  |  | |||
|  | @ -18,8 +18,6 @@ | |||
|       "2" | ||||
|   ], | ||||
|   "compatible_printers": [ | ||||
|     "Orca Arena P1P 0.4 nozzle", | ||||
|     "Orca Arena P1P 0.6 nozzle", | ||||
|     "Orca Arena P1P 0.8 nozzle" | ||||
|     "Orca Arena P1P 0.4 nozzle" | ||||
| ] | ||||
| } | ||||
|  |  | |||
|  | @ -6,8 +6,6 @@ | |||
|   "instantiation": "true", | ||||
|   "inherits": "Arena PETG-CF @base", | ||||
|   "compatible_printers": [ | ||||
|     "Orca Arena P1P 0.4 nozzle", | ||||
|     "Orca Arena P1P 0.6 nozzle", | ||||
|     "Orca Arena P1P 0.8 nozzle" | ||||
|     "Orca Arena P1P 0.4 nozzle" | ||||
|   ] | ||||
| } | ||||
|  |  | |||
|  | @ -24,8 +24,6 @@ | |||
|     "65" | ||||
|   ], | ||||
|   "compatible_printers": [ | ||||
|     "Orca Arena P1P 0.4 nozzle", | ||||
|     "Orca Arena P1P 0.6 nozzle", | ||||
|     "Orca Arena P1P 0.8 nozzle" | ||||
|     "Orca Arena P1P 0.4 nozzle" | ||||
|   ] | ||||
| } | ||||
|  | @ -19,8 +19,6 @@ | |||
|     "16" | ||||
|   ], | ||||
|   "compatible_printers": [ | ||||
|     "Orca Arena P1P 0.4 nozzle", | ||||
|     "Orca Arena P1P 0.6 nozzle", | ||||
|     "Orca Arena P1P 0.8 nozzle" | ||||
|     "Orca Arena P1P 0.4 nozzle" | ||||
| ]   | ||||
| } | ||||
|  |  | |||
|  | @ -6,8 +6,6 @@ | |||
|   "instantiation": "true", | ||||
|   "inherits": "Generic PETG-CF @base", | ||||
|   "compatible_printers": [ | ||||
|     "Orca Arena P1P 0.4 nozzle", | ||||
|     "Orca Arena P1P 0.6 nozzle", | ||||
|     "Orca Arena P1P 0.8 nozzle" | ||||
|     "Orca Arena P1P 0.4 nozzle" | ||||
|   ] | ||||
| } | ||||
|  |  | |||
|  | @ -18,8 +18,6 @@ | |||
|     "65" | ||||
|   ], | ||||
|   "compatible_printers": [ | ||||
|     "Orca Arena P1P 0.4 nozzle", | ||||
|     "Orca Arena P1P 0.6 nozzle", | ||||
|     "Orca Arena P1P 0.8 nozzle" | ||||
|     "Orca Arena P1P 0.4 nozzle" | ||||
|   ] | ||||
| } | ||||
|  |  | |||
|  | @ -12,8 +12,6 @@ | |||
|         "8" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|         "Orca Arena X1 0.4 nozzle", | ||||
|         "Orca Arena X1 0.6 nozzle", | ||||
|         "Orca Arena X1 0.8 nozzle" | ||||
|           "Orca Arena X1 0.8 nozzle" | ||||
|       ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|         "1" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|       "Orca Arena X1 0.2 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -12,8 +12,6 @@ | |||
|         "8" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|         "Orca Arena X1 0.4 nozzle", | ||||
|         "Orca Arena X1 0.6 nozzle", | ||||
|         "Orca Arena X1 0.8 nozzle" | ||||
|           "Orca Arena X1 0.8 nozzle" | ||||
|       ] | ||||
| } | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|         "1" | ||||
|     ], | ||||
|     "compatible_printers": [ | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle", | ||||
|       "Orca Arena X1 0.2 nozzle" | ||||
|       "Orca Arena X1 Carbon 0.2 nozzle" | ||||
|     ] | ||||
| } | ||||
|  |  | |||
|  | @ -62,6 +62,10 @@ function HandleModelList( pVal ) | |||
| 			let sVV=strVendor; | ||||
| 			if( sVV=="BBL" ) | ||||
| 				sVV="Bambu Lab"; | ||||
| 			if( sVV=="Custom") | ||||
| 				sVV="Custom Printer"; | ||||
| 			if( sVV=="Other") | ||||
| 				sVV="Orca colosseum"; | ||||
| 
 | ||||
| 			let HtmlNewVendor='<div class="OneVendorBlock" Vendor="'+strVendor+'">'+ | ||||
| '<div class="BlockBanner">'+ | ||||
|  | @ -129,12 +133,12 @@ function HandleModelList( pVal ) | |||
| 		} | ||||
| 	}	 | ||||
| 
 | ||||
| 	let AlreadySelect=$("input:checked"); | ||||
| 	let nSelect=AlreadySelect.length; | ||||
| 	if(nSelect==0) | ||||
| 	{ | ||||
| 		$("input[nozzel='0.4'][vendor='BBL']").prop("checked", true); | ||||
| 	} | ||||
| 	// let AlreadySelect=$("input:checked");
 | ||||
| 	// let nSelect=AlreadySelect.length;
 | ||||
| 	// if(nSelect==0)
 | ||||
| 	// {
 | ||||
| 	// 	$("input[nozzel='0.4'][vendor='Custom']").prop("checked", true);
 | ||||
| 	// }
 | ||||
| 	 | ||||
| 	TranslatePage(); | ||||
| } | ||||
|  |  | |||
|  | @ -62,6 +62,10 @@ function HandleModelList( pVal ) | |||
| 			let sVV=strVendor; | ||||
| 			if( sVV=="BBL" ) | ||||
| 				sVV="Bambu Lab";			 | ||||
| 			if( sVV=="Custom") | ||||
| 				sVV="Custom Printer"; | ||||
| 			if( sVV=="Other") | ||||
| 				sVV="Orca colosseum"; | ||||
| 
 | ||||
| 			let HtmlNewVendor='<div class="OneVendorBlock" Vendor="'+strVendor+'">'+ | ||||
| '<div class="BlockBanner">'+ | ||||
|  | @ -129,12 +133,12 @@ function HandleModelList( pVal ) | |||
| 		} | ||||
| 	}	 | ||||
| 
 | ||||
| 	let AlreadySelect=$("input:checked"); | ||||
| 	let nSelect=AlreadySelect.length; | ||||
| 	if(nSelect==0) | ||||
| 	{ | ||||
| 		$("input[nozzel='0.4'][vendor='BBL']").prop("checked", true); | ||||
| 	} | ||||
| 	// let AlreadySelect=$("input:checked");
 | ||||
| 	// let nSelect=AlreadySelect.length;
 | ||||
| 	// if(nSelect==0)
 | ||||
| 	// {
 | ||||
| 	// 	$("input[nozzel='0.4'][vendor='Custom']").prop("checked", true);
 | ||||
| 	// }
 | ||||
| 	 | ||||
| 	TranslatePage(); | ||||
| } | ||||
|  |  | |||
|  | @ -30,7 +30,7 @@ | |||
| 	 | ||||
| 	 | ||||
| 	 | ||||
| 	<div id="CheckArea"><input id="InstallCheck" onClick="SendInstallPluginCheck()" checked type="checkbox"><a tid="t69" class="trans TextS1">Install Bambu Network Plug-in. </a></div> | ||||
| 	<div id="CheckArea"><input id="InstallCheck" onClick="SendInstallPluginCheck()" type="checkbox"><a tid="t69" class="trans TextS1">Install Bambu Network Plug-in. </a></div> | ||||
| 	<div id="RestartText" tid="t70" class="trans" ></div> | ||||
| 	 | ||||
| </div> | ||||
|  |  | |||
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 172 KiB | 
| Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB | 
| Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB | 
|  | @ -42,10 +42,10 @@ static std::vector<std::string> s_project_options { | |||
| }; | ||||
| 
 | ||||
| //BBS: add BBL as default
 | ||||
| const char *PresetBundle::BBL_BUNDLE = "BBL"; | ||||
| const char *PresetBundle::BBL_DEFAULT_PRINTER_MODEL = "Bambu Lab X1 Carbon"; | ||||
| const char *PresetBundle::BBL_BUNDLE = "Custom"; | ||||
| const char *PresetBundle::BBL_DEFAULT_PRINTER_MODEL = ""; | ||||
| const char *PresetBundle::BBL_DEFAULT_PRINTER_VARIANT = "0.4"; | ||||
| const char *PresetBundle::BBL_DEFAULT_FILAMENT = "Generic PLA"; | ||||
| const char *PresetBundle::BBL_DEFAULT_FILAMENT = "My Generic PLA"; | ||||
| 
 | ||||
| PresetBundle::PresetBundle() | ||||
|     : prints(Preset::TYPE_PRINT, Preset::print_options(), static_cast<const PrintRegionConfig &>(FullPrintConfig::defaults())) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 SoftFever
						SoftFever