Sync to 2.4.1-beta1
This commit is contained in:
parent
ebb9041041
commit
5c616c5931
92 changed files with 920 additions and 45290 deletions
|
@ -112,10 +112,7 @@ public:
|
|||
TYPE_FILAMENT,
|
||||
TYPE_SLA_MATERIAL,
|
||||
TYPE_PRINTER,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
TYPE_COUNT,
|
||||
>>>>>>> master
|
||||
// This type is here to support PresetConfigSubstitutions for physical printers, however it does not belong to the Preset class,
|
||||
// PhysicalPrinter class is used instead.
|
||||
TYPE_PHYSICAL_PRINTER,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue