GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 15:56:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into CURA-12313_conditional-Baxis-commands

Browse Source
This commit is contained in:
Erwan MATHIEU 2025-01-22 10:16:54 +01:00 committed by GitHub
commit a244e0efef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/MacOS/build_macos.py
View File

@ -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") 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() 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" app_name = f"{args.app_name}.app"

15
resources/definitions/fdmprinter.def.json
View File

@ -4412,6 +4412,21 @@
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "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": "travel_retract_before_outer_wall":
{ {
"label": "Retract Before Outer Wall", "label": "Retract Before Outer Wall",