mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-14 19:56:01 +08:00
Merge branch 'main' into CURA-12313_conditional-Baxis-commands
This commit is contained in:
commit
a244e0efef
@ -154,7 +154,7 @@ if __name__ == "__main__":
|
||||
parser.add_argument("--app_name", required = True, type = str, help = "Filename of the .app that will be contained within the dmg/pkg")
|
||||
args = parser.parse_args()
|
||||
|
||||
cura_version = args.cura_conan_version.split("/")[-1]
|
||||
cura_version = args.cura_conan_version.replace("+","-") # + is not allowed for bundle identifier
|
||||
|
||||
app_name = f"{args.app_name}.app"
|
||||
|
||||
|
@ -4412,6 +4412,21 @@
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"retraction_combing_avoid_distance":
|
||||
{
|
||||
"label": "Inside Travel Avoid Distance",
|
||||
"description": "The distance between the nozzle and already printed outer walls when travelling inside a model.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"default_value": 0,
|
||||
"value": "machine_nozzle_size * 1.5",
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "machine_nozzle_size * 0.5",
|
||||
"maximum_value_warning": "machine_nozzle_size * 10",
|
||||
"enabled": "resolveOrValue('retraction_combing') != 'off'",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
"travel_retract_before_outer_wall":
|
||||
{
|
||||
"label": "Retract Before Outer Wall",
|
||||
|
Loading…
x
Reference in New Issue
Block a user