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

Fixes related to merge.

Browse source
This commit is contained in:
Kevin Pope 2014-03-27 19:22:39 -07:00
parent 199b3f7a39
commit 445f85b1f2
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
MatterControl.csproj
View file

@ -254,6 +254,10 @@
</ItemGroup>
<ItemGroup />
<ItemGroup>
<ProjectReference Include="..\agg-sharp\clipper_library\clipper_library.csproj">
<Project>{9B062971-A88E-4A3D-B3C9-12B78D15FA66}</Project>
<Name>clipper_library</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\Csg\Csg.csproj">
<Project>{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}</Project>
<Name>Csg</Name>
@ -338,9 +342,5 @@
<Project>{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}</Project>
<Name>Agg</Name>
</ProjectReference>
<ProjectReference Include="..\MatterSlice\clipper_library\clipper_library.csproj">
<Project>{9B062971-A88E-4A3D-B3C9-12B78D15FA66}</Project>
<Name>clipper_library</Name>
</ProjectReference>
</ItemGroup>
</Project>

1
StaticData/PrinterSettings/config.ini
View file

@ -11,6 +11,7 @@ bridge_speed = 60
brim_width = 0
build_height = 0
cancel_gcode =
center_part_on_bed = 1
complete_objects = 0
cool_extruder_lift = 0
cooling = 1

3
StaticData/SliceSettings/Layouts.txt
View file

@ -128,13 +128,10 @@ Advanced
Notes
notes
Output Options
<<<<<<< HEAD
=======
Center Print
center_part_on_bed
Wipe Shield
wipe_shield_distance
>>>>>>> e08d49595f6bbaa525105c5a4defd1ec3f36d56b
Sequential Printing
complete_objects
extruder_clearance_height

1
StaticData/SliceSettings/Properties.txt
View file

@ -11,6 +11,7 @@ bridge_speed|Bridges|POSITIVE_DOUBLE|mm/s|The speed to move when bridging betwee
brim_width|Brim Width|POSITIVE_DOUBLE|mm|The amount of brim that will be drawn around each object. This is useful to ensure that parts stay affixed to the bed.
build_height|Build Height|POSITIVE_DOUBLE|mm|The height of the printable area. If set to 0 the parts height will not be validated.
cancel_gcode|Cancel G-Code|MULTI_LINE_TEXT||This gcode will be inserted when the print is canceled.
center_part_on_bed|Center On Bed|CHECK_BOX||This will cause the print to be centered on the bed. Disable this if you know your models have been created where you want them to print.
complete_objects|Complete Individual Objects|CHECK_BOX||Each individual part is printed to completion then the extruder is lowered back to the bed and the next part is printed.
cool_extruder_lift|Enable Extruder Lift|CHECK_BOX||Moves the extruder up off the part to allow cooling.
cooling|Enable Auto Cooling|CHECK_BOX||Turns on and off all cooling settings (all settings below this one).