Merge branch 'master' into avoid-crossing-perimeters

Conflicts: lib/Slic3r/GCode.pm
2012-10-24 11:49:31 +02:00 · 2012-10-24 11:49:31 +02:00 · 1627268fd4
commit 1627268fd4
parent 91e9f651b5 28b56ae840
35 changed files with 1544 additions and 1159 deletions
--- a/README.markdown
+++ b/README.markdown
@ -153,7 +153,9 @@ The author of the Silk icon set is Mark James.
        --first-layer-height Layer height for first layer (mm or %, default: 100%)
        --infill-every-layers
                            Infill every N layers (default: 1)
-      
+        --solid-infill-every-layers
+                            Force a solid layer every N layers (default: 0)
+    
      Print options:
        --perimeters        Number of perimeters/horizontal skins (range: 0+, default: 3)
        --solid-layers      Number of solid layers to do for top/bottom surfaces