mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-08-11 12:07:38 +00:00
Merge branch 'main' into dev/bbl-network-upd
# Conflicts: # src/slic3r/GUI/SelectMachine.cpp
This commit is contained in:
@@ -862,6 +862,10 @@ PRINT_CONFIG_CLASS_DEFINE(
|
||||
((ConfigOptionFloatOrPercent, support_threshold_overlap))
|
||||
((ConfigOptionFloat, support_object_xy_distance))
|
||||
((ConfigOptionFloat, support_object_first_layer_gap))
|
||||
((ConfigOptionBool, support_ironing))
|
||||
((ConfigOptionEnum<InfillPattern>, support_ironing_pattern))
|
||||
((ConfigOptionPercent, support_ironing_flow))
|
||||
((ConfigOptionFloat, support_ironing_spacing))
|
||||
((ConfigOptionFloat, xy_hole_compensation))
|
||||
((ConfigOptionFloat, xy_contour_compensation))
|
||||
((ConfigOptionBool, flush_into_objects))
|
||||
@@ -1025,7 +1029,6 @@ PRINT_CONFIG_CLASS_DEFINE(
|
||||
((ConfigOptionBool, wipe_before_external_loop))
|
||||
((ConfigOptionEnum<WallInfillOrder>, wall_infill_order))
|
||||
((ConfigOptionBool, precise_outer_wall))
|
||||
((ConfigOptionBool, overhang_speed_classic))
|
||||
((ConfigOptionPercent, bridge_density))
|
||||
((ConfigOptionFloat, filter_out_gap_fill))
|
||||
((ConfigOptionFloatOrPercent, small_perimeter_speed))
|
||||
|
||||
Reference in New Issue
Block a user