Permalink
Browse files

Merge pull request #1 from alexrj/master

get update
  • Loading branch information...
2 parents 5b8ed73 + fde6e2e commit a184a8a45f5cb8acc9621e65713a614ad2eb9cf5 @jeffkyjin committed on GitHub Dec 4, 2016
Showing 1,899 changed files with 18,108 additions and 315,980 deletions.
@@ -0,0 +1,34 @@
+Did you encounter an issue with using Slic3r? Fear not! This guide will help you to write a good bug report in just a few, simple steps.
+
+There is a good chance that the issue, you have encountered, is already reported. Please check the [list of reported issues](https://github.com/alexrj/Slic3r/issues) before creating a new issue report. If you find an existing issue report, feel free to add further information to that report.
+
+If possible, please include the following information when [reporting an issue](https://github.com/alexrj/Slic3r/issues/new):
+* Slic3r version (See the about dialog for the version number. If running from git, please include the git commit ID from `git rev-parse HEAD` also.)
+* Operating system type + version
+* Steps to reproduce the issue, including:
+ * Command line parameters used, if any
+ * Slic3r configuration file (Use ``Export Config...`` from the ``File`` menu - please don't export a bundle)
+ * Expected result
+ * Actual result
+ * Any error messages
+* If the issue is related to G-code generation, please include the following:
+ * STL, OBJ or AMF input file (please make sure the input file is not broken, e.g. non-manifold, before reporting a bug)
+ * a screenshot of the G-code layer with the issue (e.g. using [Pronterface](https://github.com/kliment/Printrun) or preferably the internal preview tab in Slic3r).
+* If the issue is a request for a new feature, be ready to explain why you think it's needed.
+ * Doing more prepatory work on your end makes it more likely it'll get done. This includes the "how" it can be done in addition to the "what".
+ * Define the "What" as strictly as you can. Consider what might happen with different infills than simple rectilinear.
+
+Please make sure only to include one issue per report. If you encounter multiple, unrelated issues, please report them as such.
+
+Simon Tatham has written an excellent on article on [How to Report Bugs Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html) which is well worth reading, although it is not specific to Slic3r.
+
+Do you want to help fix issues in or add features to Slic3r? That's also very, very welcome :)
+
+* A good place to start if you can is to look over the [Pull Request or Bust](https://github.com/alexrj/Slic3r/milestones/Pull%20Request%20or%20Bust) milestone. This contains all of the things (mostly new feature requests) that there isn't time or resources to address at this time.
+ * Things that are probably fixable via scripts (usually marked as such) have the lowest bar to getting something that works, as you don't need to recompile Slic3r to test.
+* If you're starting on an issue, please say something in the related issues thread so that someone else doesn't start working on it too.
+* If there's nothing in the [Pull Request or Bust](https://github.com/alexrj/Slic3r/milestones/Pull%20Request%20or%20Bust) milestone that interests you, the next place to look is for issues that don't have a milestone. Lots of people commit ideas to Slic3r, and it's difficult to keep up and sort through them.
+* Before sending a pull request, please make sure that the changes you are submitting are contained in their own git branch, as PRs merge histories.
+ * Pull requests that contain unrelated changes will be rejected.
+ * A common workflow is to fork the master branch, create your new branch and do your work there. git-rebase and git-cherry-pick are also helpful for separating out unrelated changes.
+* If you are pushing Slic3r code changes that touch the main application, it is very much appreciated if you write some tests that check the functionality of the code. It's much easier to vet and merge in code that includes tests and doing so will likely speed things up.
@@ -0,0 +1,22 @@
+### Version
+_Version of Slic3r used goes here_
+
+_Use `About->About Slic3r` for release versions_
+
+_For -dev versions, use `git describe --tag` or get the hash value for the version you downloaded or `git rev-parse HEAD`_
+
+### Operating system type + version
+_What OS are you using, and state any version #s_
+
+### Behavior
+* _Describe the problem_
+* _Steps needed to reproduce the problem_
+ * _If this is a command-line slicing issue, include the options used_
+* _Expected Results_
+* _Actual Results_
+ * _Screenshots from __*Slic3r*__ preview are preferred_
+
+_Is this a new feature request?_
+
+#### STL/Config (.ZIP) where problem occurs
+_Upload a zipped copy of an STL and your config (`File -> Export Config`)_
View
@@ -1,3 +1,4 @@
+build
Build
Build.bat
MYMETA.json
@@ -8,3 +9,5 @@ xs/buildtmp
*.o
MANIFEST.bak
xs/MANIFEST.bak
+xs/assertlib*
+.init_bundle.ini
View
@@ -1,5 +1,5 @@
language: perl
-install: true
+install: export LDLOADLIBS=-lstdc++
script: perl ./Build.PL
perl:
- "5.14"
@@ -9,4 +9,14 @@ branches:
only:
- master
- stable
-
+sudo: false
+cache:
+ - apt
+addons:
+ apt:
+ sources:
+ - boost-latest
+ packages:
+ - libboost-thread1.55-dev
+ - libboost-system1.55-dev
+ - libboost-filesystem1.55-dev
View
@@ -7,14 +7,14 @@ use Config;
use File::Spec;
my %prereqs = qw(
+ Devel::CheckLib 0
Encode 0
Encode::Locale 1.05
ExtUtils::MakeMaker 6.80
ExtUtils::ParseXS 3.22
File::Basename 0
File::Spec 0
Getopt::Long 0
- Math::PlanePath 53
Module::Build::WithXSpp 0.14
Moo 1.003001
POSIX 0
@@ -49,6 +49,8 @@ if ($gui) {
Net::Bonjour 0
);
if ($^O eq 'MSWin32') {
+ $recommends{"Win32::TieRegistry"} = 0;
+
# we need an up-to-date Win32::API because older aren't thread-safe (GH #2517)
$prereqs{'Win32::API'} = 0.79;
}
@@ -109,11 +111,6 @@ EOF
# make sure our cpanm is updated (old ones don't support the ~ syntax)
system $cpanm, @cpanm_args, 'App::cpanminus';
- # install the Windows-compatible Math::Libm
- if ($^O eq 'MSWin32' && !eval "use Math::Libm; 1") {
- system $cpanm, @cpanm_args, 'https://github.com/alexrj/Math-Libm/tarball/master';
- }
-
my %modules = (%prereqs, %recommends);
foreach my $module (sort keys %modules) {
my $version = $modules{$module};
View
@@ -1,21 +0,0 @@
-Did you encounter an issue with using Slic3r? Fear not! This guide will help you to write a good bug report in just a few, simple steps.
-
-There is a good chance that the issue, you have encountered, is already reported. Please check the [list of reported issues](https://github.com/alexrj/Slic3r/issues) before creating a new issue report. If you find an existing issue report, feel free to add further information to that report.
-
-If possible, please include the following information when [reporting an issue](https://github.com/alexrj/Slic3r/issues/new):
-* Slic3r version (See the about dialog for the version number. If running from git, please include the git commit ID from `git rev-parse HEAD` also.)
-* Operating system type + version
-* Steps to reproduce the issue, including:
- * Command line parameters used, if any
- * Slic3r configuration file (Use ``Export Config...`` from the ``File`` menu - please don't export a bundle)
- * Expected result
- * Actual result
- * Any error messages
-* If the issue is related to G-code generation, please include the following:
- * STL, OBJ or AMF input file (please make sure the input file is not broken, e.g. non-manifold, before reporting a bug)
- * a screenshot of the G-code layer with the issue (e.g. using [Pronterface](https://github.com/kliment/Printrun))
-
-Please make sure only to include one issue per report. If you encounter multiple, unrelated issues, please report them as such.
-
-Simon Tatham has written an excellent on article on [How to Report Bugs Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html) which is well worth reading, although it is not specific to Slic3r.
-
View
@@ -2,8 +2,9 @@ _Q: Oh cool, a new RepRap slicer?_
A: Yes.
-Slic3r [![Build Status](https://travis-ci.org/alexrj/Slic3r.png?branch=master)](https://travis-ci.org/alexrj/Slic3r)
+Slic3r [![Build Status](https://travis-ci.org/alexrj/Slic3r.png?branch=master)](https://travis-ci.org/alexrj/Slic3r) [![Build status](https://ci.appveyor.com/api/projects/status/8iqmeat6cj158vo6?svg=true)](https://ci.appveyor.com/project/lordofhyphens/slic3r)
======
+Prebuilt Win32 builds https://bintray.com/lordofhyphens/Slic3r/slic3r_dev/view
Slic3r takes 3D models (STL, OBJ, AMF) and converts them into G-code instructions for
3D printers. It's compatible with any modern printer based on the RepRap toolchain,
@@ -52,25 +53,26 @@ Other major features are:
### How to install?
-You can just download a precompiled package from [slic3r.org](http://slic3r.org/);
+You can download a precompiled package from [slic3r.org](http://slic3r.org/);
it will run without the need for any dependency.
-If you want to compile the source yourself just do the following (checkout
-[slic3r.org](http://slic3r.org/download) for more details):
-
-```
-$ git clone https://github.com/alexrj/Slic3r.git
-$ cd Slic3r
-$ perl Build.PL --sudo
-$ perl Build.PL --sudo --gui
-$ ./slic3r.pl
-```
+If you want to compile the source yourself follow the instructions on one of these wiki pages:
+* [Linux](https://github.com/alexrj/Slic3r/wiki/Running-Slic3r-from-git-on-GNU-Linux)
+* [Windows](https://github.com/alexrj/Slic3r/wiki/Running-Slic3r-from-git-on-Windows)
+* [Mac OSX](https://github.com/alexrj/Slic3r/wiki/Running-Slic3r-from-git-on-OS-X)
### Can I help?
-Sure! Drop me a line at aar@cpan.org. You can also
-find me in #reprap and in #slic3r on FreeNode with the nickname _Sound_.
-Before sending patches and pull requests contact me to discuss your proposed
+Sure! You can do the following to find things that are available to help with:
+* [Pull Request Milestone](https://github.com/alexrj/Slic3r/milestone/31)
+ * Please comment in the related github issue that you are working on it so that other people know.
+* Items in the [TODO](https://github.com/alexrj/Slic3r/wiki/TODO) wiki page.
+ * Please comment in the related github issue that you are working on it so that other people know.
+* Drop me a line at aar@cpan.org.
+* You can also find me (rarely) in #reprap and in #slic3r on [FreeNode](http://webchat.freenode.net) with the nickname _Sound_. Another contributor, _LoH_, is also in both channels.
+* Add an [issue](https://github.com/alexrj/Slic3r/issues) to the github tracker if it isn't already present.
+
+Before sending patches and pull requests contact me (preferably through opening a github issue or commenting on an existing, related, issue) to discuss your proposed
changes: this way we'll ensure nobody wastes their time and no conflicts arise
in development.
@@ -132,7 +134,7 @@ The author of the Silk icon set is Mark James.
(default: 100,100)
--z-offset Additional height in mm to add to vertical coordinates
(+/-, default: 0)
- --gcode-flavor The type of G-code to generate (reprap/teacup/makerware/sailfish/mach3/machinekit/no-extrusion,
+ --gcode-flavor The type of G-code to generate (reprap/teacup/repetier/makerware/sailfish/mach3/machinekit/smoothie/no-extrusion,
default: reprap)
--use-relative-e-distances Enable this to get relative E values (default: no)
--use-firmware-retraction Enable firmware-controlled retraction using G10/G11 (default: no)
@@ -279,6 +281,8 @@ The author of the Silk icon set is Mark James.
--retract-before-travel
Only retract before travel moves of this length in mm (default: 2)
--retract-lift Lift Z by the given distance in mm when retracting (default: 0)
+ --retract-lift-above Only lift Z when above the specified height (default: 0)
+ --retract-lift-below Only lift Z when below the specified height (default: 0)
--retract-layer-change
Enforce a retraction before each Z move (default: no)
--wipe Wipe the nozzle while doing a retraction (default: no)
@@ -320,6 +324,9 @@ The author of the Silk icon set is Mark James.
--duplicate Number of items with auto-arrange (1+, default: 1)
--duplicate-grid Number of items with grid arrangement (default: 1,1)
--duplicate-distance Distance in mm between copies (default: 6)
+ --dont-arrange Don't arrange the objects on the build plate. The model coordinates
+ define the absolute positions on the build plate.
+ The option --print-center will be ignored.
--xy-size-compensation
Grow/shrink objects by the configured absolute distance (mm, default: 0)
Oops, something went wrong.

0 comments on commit a184a8a

Please sign in to comment.