Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Karl Pietrowski <thopiekar@googlemail.com>2016-11-17 23:10:29 +0300
committerThomas Karl Pietrowski <thopiekar@googlemail.com>2016-11-17 23:10:29 +0300
commitc48d064ecaaa17871453829a7220f696799a835d (patch)
treed477d8b2a701b16cd54111aa7af92f131f1a5f41 /README.md
parent273b996cc1dfaa3051cdc928c721fdb304875efc (diff)
parentbf670d325a8a0ed7a1106c99ec28e2404f22e6d1 (diff)
Merge remote-tracking branch 'UM3NPP/master' into UM3NPP_merge
Contributes to CURA-2862
Diffstat (limited to 'README.md')
-rw-r--r--README.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/README.md b/README.md
index e1f23bbe04..376bdd8547 100644
--- a/README.md
+++ b/README.md
@@ -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
----------------