Merge branch 'main' into main

This commit is contained in:
Bernhard Koppensteiner
2024-05-12 20:45:12 +02:00
committed by GitHub
39 changed files with 137 additions and 87 deletions

View File

@@ -19,6 +19,7 @@
"Creality CR-6 Max 0.4 nozzle",
"Creality CR-6 Max 0.6 nozzle",
"Creality CR-6 Max 0.8 nozzle",
"Creality Sermoon V1 0.4 nozzle",
"Creality Ender-3 0.2 nozzle",
"Creality Ender-3 0.4 nozzle",
"Creality Ender-3 0.6 nozzle",

View File

@@ -29,6 +29,7 @@
"Creality CR-6 Max 0.4 nozzle",
"Creality CR-6 Max 0.6 nozzle",
"Creality CR-6 Max 0.8 nozzle",
"Creality Sermoon V1 0.4 nozzle",
"Creality Ender-3 0.2 nozzle",
"Creality Ender-3 0.4 nozzle",
"Creality Ender-3 0.6 nozzle",

View File

@@ -20,6 +20,7 @@
"Creality CR-6 Max 0.4 nozzle",
"Creality CR-6 Max 0.6 nozzle",
"Creality CR-6 Max 0.8 nozzle",
"Creality Sermoon V1 0.4 nozzle",
"Creality Ender-3 0.2 nozzle",
"Creality Ender-3 0.4 nozzle",
"Creality Ender-3 0.6 nozzle",

View File

@@ -16,6 +16,7 @@
"Creality K1 Max (0.4 nozzle)",
"Creality K1 Max (0.6 nozzle)",
"Creality K1 Max (0.8 nozzle)",
"Creality Sermoon V1 0.4 nozzle",
"Creality CR-10 SE 0.2 nozzle",
"Creality CR-10 SE 0.4 nozzle",
"Creality CR-10 SE 0.6 nozzle",

View File

@@ -60,11 +60,14 @@
"print_host_webui": "10.0.0.51",
"gcode_flavor": "marlin",
"thumbnails": [
"32x32",
"64x64",
"400x400"
],
"extruder_clearance_height_to_lid": "125",
"extruder_clearance_height_to_rod": "40",
"extruder_clearance_radius": "50",
"printable_height": "165",
"change_filament_gcode": "; S1 Pause For Filament change\nM125",
"nozzle_type": "undefine",
"nozzle_type": "brass",
"auxiliary_fan": "1"
}

View File

@@ -11,5 +11,5 @@
"Spiral Lift"
],
"hotend_model": "",
"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS;Creality Generic TPU"
}

View File

@@ -148,7 +148,7 @@ input
height: calc(100% - 6px);
display: flex;
align-items: center;
border-bottom: 6px solid #00AE42;
border-bottom: 6px solid #009688;
}
#Title div.TitleUnselected
@@ -205,4 +205,4 @@ input
.CFilament_EditBtn:hover
{
}
}