Merge remote-tracking branch 'UM3NPP/master' into UM3NPP_merge

Contributes to CURA-2862
This commit is contained in:
Thomas Karl Pietrowski 2016-11-17 21:10:29 +01:00
commit c48d064eca
10 changed files with 1889 additions and 4 deletions

View file

@ -1,3 +1,4 @@
<<<<<<< HEAD
Cura
====
@ -28,6 +29,8 @@ Dependencies
This will be needed at runtime to perform the actual slicing.
* [PySerial](https://github.com/pyserial/pyserial)
Only required for USB printing support.
* [python-zeroconf](https://github.com/jstasiak/python-zeroconf)
Only required to detect mDNS-enabled printers
Configuring Cura
----------------