mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-02 20:52:20 -07:00
Fix merge conflicts with master
This commit is contained in:
commit
94e89ad4ac
89 changed files with 1283 additions and 928 deletions
|
|
@ -1,13 +0,0 @@
|
|||
[general]
|
||||
name = 0.25mm TP extruder
|
||||
version = 4
|
||||
definition = hms434
|
||||
|
||||
[metadata]
|
||||
setting_version = 10
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
||||
[values]
|
||||
machine_nozzle_size = 0.25
|
||||
machine_nozzle_tip_outer_diameter = 1.05
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
[general]
|
||||
name = 0.6mm TP extruder
|
||||
version = 4
|
||||
definition = hms434
|
||||
|
||||
[metadata]
|
||||
setting_version = 10
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
||||
[values]
|
||||
machine_nozzle_size = 0.6
|
||||
machine_nozzle_tip_outer_diameter = 1.05
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
[general]
|
||||
name = 1.2mm TP extruder
|
||||
version = 4
|
||||
definition = hms434
|
||||
|
||||
[metadata]
|
||||
setting_version = 10
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
||||
[values]
|
||||
machine_nozzle_size = 1.2
|
||||
machine_nozzle_tip_outer_diameter = 1.3
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
[general]
|
||||
name = 1.5mm TP extruder
|
||||
version = 4
|
||||
definition = hms434
|
||||
|
||||
[metadata]
|
||||
setting_version = 10
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
||||
[values]
|
||||
machine_nozzle_size = 1.5
|
||||
machine_nozzle_tip_outer_diameter = 1.6
|
||||
Loading…
Add table
Add a link
Reference in a new issue