nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development

Browse source 
Conflicts:
	StaticData/Translations/Master.txt
	Submodules/agg-sharp
This commit is contained in:
Gregory Diaz 2015-04-24 13:26:44 -07:00
commit ab9c737b81
10 changed files with 202 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

23
StaticData/SliceSettings/Layouts.txt
View file

@ -1,7 +1,7 @@
Simple
Print
Single
Print
Layers
layer_height
fill_density
Support Material
@ -185,16 +185,6 @@ Advanced
ooze_prevention
standby_temperature_delta
Advanced
Extrusion Width
extrusion_width
first_layer_extrusion_width
perimeter_extrusion_width
infill_extrusion_width
solid_infill_extrusion_width
top_infill_extrusion_width
support_material_extrusion_width
Flow
bridge_flow_ratio
Other
threads
resolution
@ -226,6 +216,17 @@ Advanced
Retraction On Tool Change
retract_restart_extra_toolchange
retract_restart_extra
Extrusion
Extrusion Width
extrusion_width
first_layer_extrusion_width
perimeter_extrusion_width
infill_extrusion_width
solid_infill_extrusion_width
top_infill_extrusion_width
support_material_extrusion_width
Flow
bridge_flow_ratio
Cooling
Enable
fan_always_on

26
StaticData/SliceSettings/Properties.json
View file

@ -37,9 +37,9 @@
{
"SlicerConfigName": "bottom_solid_layers",
"PresentationName": "Number of Solid Layers\\n on the Bottom:",
"HelpText": "How many layers will be solid filled on the bottom surfaces of the object.",
"DataEditType": "INT",
"ExtraSettings": ""
"HelpText": "How many layers, or the distance, that will be solid filled on the bottom surfaces of the object. Add mm to the end of the number to specify distance.",
"DataEditType": "INT_OR_MM",
"ExtraSettings": "count or mm"
},
{
"SlicerConfigName": "bridge_acceleration",
@ -291,7 +291,7 @@
"PresentationName": "Fill Density",
"HelpText": "The ratio of material to empty space ranged 0 to 1. Zero would be no infill; 1 is solid infill.",
"DataEditType": "DOUBLE_OR_PERCENT",
"ExtraSettings": "Ratio\n(0 to 1)",
"ExtraSettings": "% or Ratio",
"QuickMenuSettings": [{"MenuName" : "Light", "Value": "10%"},{"MenuName" : "Standard", "Value": "30%"},{"MenuName" : "Heavy", "Value": "90%"}]
},
{
@ -901,9 +901,9 @@
{
"SlicerConfigName": "support_material_interface_layers",
"PresentationName": "Interface Layers",
"HelpText": "The number of layers to print between the supports and the part.",
"DataEditType": "INT",
"ExtraSettings": "layers"
"HelpText": "The number of layers, or the distance, to print between the supports and the part. Add mm to the end of the number to specify distance.",
"DataEditType": "INT_OR_MM",
"ExtraSettings": "layers or mm"
},
{
"SlicerConfigName": "support_material_interface_spacing",
@ -958,9 +958,9 @@
{
"SlicerConfigName": "support_material_z_gap_layers",
"PresentationName": "Z Gap",
"HelpText": "The number of layers to skip in z. The gap between the support and the model.",
"DataEditType": "INT",
"ExtraSettings": "layers"
"HelpText": "The number of layers, or the distance, to skip between the support and the model. Add mm to the end of the number to specify distance.",
"DataEditType": "INT_OR_MM",
"ExtraSettings": "layers or mm"
},
{
"SlicerConfigName": "support_material",
@ -1035,9 +1035,9 @@
{
"SlicerConfigName": "top_solid_layers",
"PresentationName": "Number of Solid Layers\\n on the Top:",
"HelpText": "How many layers will be solid filled on the top surfaces of the object.",
"DataEditType": "INT",
"ExtraSettings": ""
"HelpText": "How many layers, or the distance, that will be solid filled on the top surfaces of the object. Add mm to the end of the number to specify distance.",
"DataEditType": "INT_OR_MM",
"ExtraSettings": "count or mm"
},
{
"SlicerConfigName": "travel_speed",