3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3.1'

Browse source
This commit is contained in:
Ghostkeeper 2017-11-20 15:37:39 +01:00
commit 2be79eeb62
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
2 changed files with 31 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/SimulationView/SimulationView.py
View file

@ -26,7 +26,7 @@ from UM.View.GL.OpenGLContext import OpenGLContext
from UM.View.View import View
from UM.i18n import i18nCatalog
from cura.ConvexHullNode import ConvexHullNode
from plugins.SimulationView.NozzleNode import NozzleNode
from . import NozzleNode
from . import SimulationPass, SimulationViewProxy
catalog = i18nCatalog("cura")

30
resources/definitions/fdmprinter.def.json
View file

@ -5589,6 +5589,36 @@
}
}
},
"flow_rate_max_extrusion_offset":
{
"label": "Flow rate compensation max extrusion offset",
"description": "The maximum distance in mm to compensate.",
"unit": "mm",
"type": "float",
"minimum_value": "0",
"maximum_value_warning": "10",
"default_value": 0,
"value": "0",
"enabled": true,
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"flow_rate_extrusion_offset_factor":
{
"label": "Flow rate compensation factor",
"description": "The multiplication factor for the flow rate -> distance translation.",
"unit": "%",
"type": "float",
"minimum_value": "0",
"maximum_value_warning": "100",
"default_value": 100,
"value": "100",
"enabled": true,
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"wireframe_enabled":
{
"label": "Wire Printing",