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
This commit is contained in:
Gregory Diaz 2015-04-30 09:38:41 -07:00
commit 88cbb22e19
15 changed files with 540 additions and 429 deletions
Download patch file Download diff file Expand all files Collapse all files

4
StaticData/PrinterSettings/RoBo 3D/R1/config.ini
View file

@ -3,7 +3,7 @@ bed_shape = rectangular
bed_size = 228,254
bed_temperature = 90
bottom_clip_amount = 0
bottom_solid_layers = 3
bottom_solid_layers = 1mm
bridge_acceleration = 0
bridge_fan_speed = 100
bridge_flow_ratio = 1
@ -134,7 +134,7 @@ threads = 2
toolchange_gcode =
top_infill_extrusion_width = 0
top_solid_infill_speed = 50
top_solid_layers = 3
top_solid_layers = 1mm
travel_speed = 150
use_firmware_retraction = 0
use_relative_e_distances = 0

8
StaticData/PrinterSettings/config.ini
View file

@ -3,7 +3,7 @@ bed_shape = rectangular
bed_size = 200,200
bed_temperature = 70
bottom_clip_amount = 0
bottom_solid_layers = 3
bottom_solid_layers = 1mm
bridge_acceleration = 0
bridge_fan_speed = 100
bridge_flow_ratio = 1
@ -128,7 +128,7 @@ support_material_extruder = 1
support_material_extrusion_width = 0
support_material_infill_angle = 45
support_material_interface_extruder = 1
support_material_interface_layers = 3
support_material_interface_layers = .9mm
support_material_interface_spacing = 0
support_material_pattern = honeycomb
support_material_spacing = 2.5
@ -136,7 +136,7 @@ support_material_speed = 60
support_material_threshold = 0
support_material_xy_distance = 0.7
support_material_z_distance = 0.15
support_material_z_gap_layers = 1
support_material_z_gap_layers = .3mm
support_type = LINES
temperature = 200
thin_walls = 1
@ -144,7 +144,7 @@ threads = 2
toolchange_gcode =
top_infill_extrusion_width = 0
top_solid_infill_speed = 50
top_solid_layers = 3
top_solid_layers = 1mm
travel_speed = 130
use_firmware_retraction = 0
use_relative_e_distances = 0

5
StaticData/SliceSettings/Layouts.txt
View file

@ -35,6 +35,8 @@ Intermediate
support_material_interface_layers
support_material_z_gap_layers
support_material_create_internal_support
Support Options
support_material_spacing
Extruders
support_material_extruder
Filament
@ -53,9 +55,9 @@ Intermediate
retract_length
retract_speed
retract_lift
wipe
Retraction On Tool Change
retract_restart_extra_toolchange
retract_restart_extra
Cooling
Fan Speed
min_fan_speed
@ -215,7 +217,6 @@ Advanced
wipe
Retraction On Tool Change
retract_restart_extra_toolchange
retract_restart_extra
Extrusion
Extrusion Width
extrusion_width

13
StaticData/SliceSettings/Properties.json
View file

@ -36,7 +36,7 @@
},
{
"SlicerConfigName": "bottom_solid_layers",
"PresentationName": "Number of Solid Layers\\n on the Bottom:",
"PresentationName": "Bottom Solid Layers:",
"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"
@ -701,13 +701,6 @@
"DataEditType": "DOUBLE",
"ExtraSettings": "mm"
},
{
"SlicerConfigName": "retract_restart_extra",
"PresentationName": "Extra Length On Restart",
"HelpText": "The amount of extra extrusion that will occur when an extruder is selected.",
"DataEditType": "POSITIVE_DOUBLE",
"ExtraSettings": "mm"
},
{
"SlicerConfigName": "retract_speed",
"PresentationName": "Speed",
@ -1034,7 +1027,7 @@
},
{
"SlicerConfigName": "top_solid_layers",
"PresentationName": "Number of Solid Layers\\n on the Top:",
"PresentationName": "Top Solid Layers:",
"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"
@ -1070,7 +1063,7 @@
{
"SlicerConfigName": "wipe",
"PresentationName": "Wipe Before Retract",
"HelpText": "This will cause the extruder to move while retracting to minimize blobs.",
"HelpText": "This will cause the extruder to try to wipe itself after retracting to minimize strings.",
"DataEditType": "CHECK_BOX",
"ExtraSettings": ""
},

15
StaticData/Translations/Master.txt
View file

@ -3185,15 +3185,12 @@ Translated:The number of layers, or the distance, to skip between the support an
English: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.
Translated: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.
English:The temperature the extruder will be when extruder wipes.
Translated:The temperature the extruder will be when extruder wipes.
English:Top Solid Layers:
Translated:Top Solid Layers:
English:The temperature the bed temperature will be set to when part is to be removed.
Translated:The temperature the bed temperature will be set to when part is to be removed.
English:Bottom Solid Layers:
Translated:Bottom Solid Layers:
English:Extruder Wipe Temperature
Translated:Extruder Wipe Temperature
English:Bed Remove Part Temperature
Translated:Bed Remove Part Temperature
English:This will cause the extruder to try to wipe itself after retracting to minimize strings.
Translated:This will cause the extruder to try to wipe itself after retracting to minimize strings.