3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 22:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'master' into layer_view3_cleanup

Browse source
This commit is contained in:
Jack Ha 2017-01-02 09:25:19 +01:00
commit b79f0c6d08
65 changed files with 53072 additions and 48974 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -254,7 +254,7 @@ class StartSliceJob(Job):
for key, value in settings.items(): #Add all submessages for each individual setting.
setting_message = self._slice_message.getMessage("global_settings").addRepeatedMessage("settings")
setting_message.name = key
if key == "machine_start_gcode" or key == "machine_end_gcode": #If it's a g-code message, use special formatting.
if key == "machine_start_gcode" or key == "machine_end_gcode" or key == "machine_extruder_start_code" or key == "machine_extruder_end_code": #If it's a g-code message, use special formatting.
setting_message.value = self._expandGcodeTokens(key, value, settings)
else:
setting_message.value = str(value).encode("utf-8")