mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-07-27 12:52:07 +00:00
Merge branch 'main' into zaa
This commit is contained in:
@@ -160,7 +160,7 @@ enum SupportMaterialPattern {
|
||||
};
|
||||
|
||||
enum SupportMaterialStyle {
|
||||
smsDefault, smsGrid, smsSnug, smsTreeSlim, smsTreeStrong, smsTreeHybrid, smsTreeOrganic,
|
||||
smsDefault, smsGrid, smsSnug, smsTreeOrganic, smsTreeSlim, smsTreeStrong, smsTreeHybrid,
|
||||
};
|
||||
|
||||
enum LongRectrationLevel
|
||||
@@ -1386,6 +1386,11 @@ PRINT_CONFIG_CLASS_DEFINE(
|
||||
((ConfigOptionInts, filament_cooling_moves))
|
||||
((ConfigOptionFloats, filament_cooling_initial_speed))
|
||||
((ConfigOptionFloats, filament_minimal_purge_on_wipe_tower))
|
||||
((ConfigOptionFloats, filament_tower_interface_pre_extrusion_dist))
|
||||
((ConfigOptionFloats, filament_tower_interface_pre_extrusion_length))
|
||||
((ConfigOptionFloats, filament_tower_ironing_area))
|
||||
((ConfigOptionFloats, filament_tower_interface_purge_volume))
|
||||
((ConfigOptionInts, filament_tower_interface_print_temp))
|
||||
((ConfigOptionFloats, filament_cooling_final_speed))
|
||||
((ConfigOptionStrings, filament_ramming_parameters))
|
||||
((ConfigOptionBools, filament_multitool_ramming))
|
||||
@@ -1515,6 +1520,8 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE(
|
||||
((ConfigOptionPercent, prime_tower_infill_gap))
|
||||
((ConfigOptionBool, prime_tower_skip_points))
|
||||
((ConfigOptionBool, prime_tower_flat_ironing))
|
||||
((ConfigOptionBool, enable_tower_interface_features))
|
||||
((ConfigOptionBool, enable_tower_interface_cooldown_during_tower))
|
||||
((ConfigOptionFloat, wipe_tower_bridging))
|
||||
((ConfigOptionPercent, wipe_tower_extra_flow))
|
||||
((ConfigOptionFloats, flush_volumes_matrix))
|
||||
|
||||
Reference in New Issue
Block a user