From 0c22250740986a702cdf3d9d19db51ca423ce1bd Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Sat, 25 Aug 2012 16:30:11 +0200
Subject: New option to disable retraction when moving between infill paths
 inside the same island. #29

---
 slic3r.pl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'slic3r.pl')

diff --git a/slic3r.pl b/slic3r.pl
index 0f9baa58c..2e9c87072 100755
--- a/slic3r.pl
+++ b/slic3r.pl
@@ -213,6 +213,9 @@ $j
     --layer-gcode       Load layer-change G-code from the supplied file (default: nothing).
     --extra-perimeters  Add more perimeters when needed (default: yes)
     --randomize-start   Randomize starting point across layers (default: yes)
+    --only-retract-when-crossing-perimeters
+                        Disable retraction when travelling between infill paths inside the same island.
+                        (default: no)
     --solid-infill-below-area
                         Force solid infill when a region has a smaller area than this threshold
                         (mm^2, default: $config->{solid_infill_below_area})
-- 
cgit v1.2.3


From fe6c8fabdb11f275dbf9edc6b32fdc846b10fc7c Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Sat, 25 Aug 2012 19:06:14 +0200
Subject: Make Josef Prusa and Petr Ledvinka happy while we figure out how to
 handle localized Windows file paths

---
 slic3r.pl | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'slic3r.pl')

diff --git a/slic3r.pl b/slic3r.pl
index 2e9c87072..cc0af0a60 100755
--- a/slic3r.pl
+++ b/slic3r.pl
@@ -27,6 +27,7 @@ my %cli_options = ();
         'save=s'                => \$opt{save},
         'load=s@'               => \$opt{load},
         'ignore-nonexistent-config' => \$opt{ignore_nonexistent_config},
+        'datadir=s'             => \$opt{datadir},
         'export-svg'            => \$opt{export_svg},
         'merge|m'               => \$opt{merge},
     );
@@ -71,6 +72,10 @@ if ($opt{save}) {
 my $gui;
 if (!@ARGV && !$opt{save} && eval "require Slic3r::GUI; 1") {
     $gui = Slic3r::GUI->new;
+    {
+        no warnings 'once';
+        $Slic3r::GUI::datadir = $opt{datadir} if $opt{datadir};
+    }
     $gui->{skeinpanel}->load_config_file($_) for @{$opt{load}};
     $gui->{skeinpanel}->load_config($cli_config);
     $gui->MainLoop;
-- 
cgit v1.2.3


From f90520ed0666533842ca2512d8dd52fb70327250 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Wed, 29 Aug 2012 16:49:38 +0200
Subject: Refactoring: new Slic3r::Model class to represent files

---
 slic3r.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'slic3r.pl')

diff --git a/slic3r.pl b/slic3r.pl
index cc0af0a60..234ce5c24 100755
--- a/slic3r.pl
+++ b/slic3r.pl
@@ -88,9 +88,9 @@ if (@ARGV) {  # slicing from command line
     
     while (my $input_file = shift @ARGV) {
         my $print = Slic3r::Print->new(config => $config);
-        $print->add_object_from_file($input_file);
+        $print->add_objects_from_file($input_file);
         if ($opt{merge}) {
-            $print->add_object_from_file($_) for splice @ARGV, 0;
+            $print->add_objects_from_file($_) for splice @ARGV, 0;
         }
         $print->duplicate;
         $print->arrange_objects if @{$print->objects} > 1;
-- 
cgit v1.2.3


From 12b38ce69424a1ddf871bf17279cca4bd3e01c99 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Wed, 12 Sep 2012 15:40:57 +0200
Subject: Bugfix: --datadir was ignored. #651

---
 slic3r.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'slic3r.pl')

diff --git a/slic3r.pl b/slic3r.pl
index 234ce5c24..e5c63b99e 100755
--- a/slic3r.pl
+++ b/slic3r.pl
@@ -71,11 +71,11 @@ if ($opt{save}) {
 # launch GUI
 my $gui;
 if (!@ARGV && !$opt{save} && eval "require Slic3r::GUI; 1") {
-    $gui = Slic3r::GUI->new;
     {
         no warnings 'once';
         $Slic3r::GUI::datadir = $opt{datadir} if $opt{datadir};
     }
+    $gui = Slic3r::GUI->new;
     $gui->{skeinpanel}->load_config_file($_) for @{$opt{load}};
     $gui->{skeinpanel}->load_config($cli_config);
     $gui->MainLoop;
-- 
cgit v1.2.3