Commit graph

3729 commits

Author SHA1 Message Date
MaukCC
f111fbc343 Update cartesio_0.25_pla_normal.inst.cfg 2017-05-08 16:21:17 +02:00
MaukCC
d0f14fb419 Update cartesio_0.25_pla_high.inst.cfg 2017-05-08 16:21:03 +02:00
MaukCC
3c2a94a452 Update cartesio_0.25_hips_high.inst.cfg 2017-05-08 16:19:27 +02:00
MaukCC
0fa2b9a0c6 Update cartesio_0.25_hips_normal.inst.cfg 2017-05-08 16:19:14 +02:00
MaukCC
bde649f786 Update cartesio_0.4_hips_high.inst.cfg 2017-05-08 16:19:00 +02:00
MaukCC
5628bf92f5 Update cartesio_0.4_hips_normal.inst.cfg 2017-05-08 16:18:46 +02:00
MaukCC
3d1576476f Update cartesio_0.8_hips_coarse.inst.cfg 2017-05-08 16:18:31 +02:00
MaukCC
7a67c401f9 Update cartesio_0.8_hips_extra_coarse.inst.cfg 2017-05-08 16:18:15 +02:00
MaukCC
e26ac05701 Update cartesio_0.8_hips_high.inst.cfg 2017-05-08 16:17:59 +02:00
MaukCC
e1c55ab4c0 Update cartesio_0.8_hips_normal.inst.cfg 2017-05-08 16:17:46 +02:00
MaukCC
c35d07b16c Update cartesio_0.4_arnitel2045_high.inst.cfg 2017-05-08 16:16:06 +02:00
MaukCC
d9cb8ba61e Update cartesio_0.4_arnitel2045_normal.inst.cfg 2017-05-08 16:15:43 +02:00
MaukCC
40b143e147 Update cartesio_0.8_abs_normal.inst.cfg 2017-05-08 16:14:50 +02:00
MaukCC
1474eadc00 Update cartesio_0.8_abs_high.inst.cfg 2017-05-08 16:14:36 +02:00
MaukCC
b3d783711c Update cartesio_0.8_abs_extra_coarse.inst.cfg 2017-05-08 16:14:23 +02:00
MaukCC
7e050ec6ce Update cartesio_0.8_abs_coarse.inst.cfg 2017-05-08 16:14:09 +02:00
MaukCC
76d76d7653 Update cartesio_0.4_abs_normal.inst.cfg 2017-05-08 16:13:51 +02:00
MaukCC
705203c9e3 Update cartesio_0.4_abs_high.inst.cfg 2017-05-08 16:13:37 +02:00
MaukCC
fed4d603be Update cartesio_0.25_abs_normal.inst.cfg 2017-05-08 16:13:23 +02:00
MaukCC
14fbd261fe Update cartesio_0.25_abs_high.inst.cfg 2017-05-08 16:13:10 +02:00
Ghostkeeper
70749ee0ec Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-08 15:51:50 +02:00
Mark
1449f785f7 Fix so that sliding the switch also changes the mode 2017-05-08 15:51:38 +02:00
Ghostkeeper
08857e3908
Rename Expand Upper/Lower Skins to Expand Top/Bottom Skins
Also in the description.

Contributes to issue CURA-3779.
2017-05-08 15:51:35 +02:00
Jaime van Kessel
bb0d534f4a Revert "Set machine_extruder_count in sync with defined extruders"
This reverts commit b69f337ddb.
2017-05-08 15:31:44 +02:00
Jaime van Kessel
ac39934336 Revert "Starting machineSettingAction no longer resets extruder count to 1"
This reverts commit 452a6a095c.
2017-05-08 15:30:39 +02:00
Jaime van Kessel
488752d4e3 Merge branch 'feature_add_alya3dp' of https://github.com/fieldOfView/Cura 2017-05-08 15:18:15 +02:00
Jaime van Kessel
293f1ac029 Merge branch 'feature_um2_olsson' of https://github.com/fieldOfView/Cura 2017-05-08 14:35:37 +02:00
Jaime van Kessel
452a6a095c Starting machineSettingAction no longer resets extruder count to 1 2017-05-08 14:25:13 +02:00
jack
7dfa46d351 Merge pull request #1713 from Ultimaker/feature_CURA-3634_optional_priming
CURA-3634: Make prime blob optional
2017-05-08 13:38:13 +02:00
Ghostkeeper
6f383d4cc4
Make extruder_nr settable per extruder
It is actually being set per extruder right now, since this is where the definition gets its extruder number from. If the setting is not settable per extruder, the ExtruderStack skips the setting entirely and defers to the global stack, which doesn't have the setting and so None is returned. This was giving errors.

Contributes to issue CURA-3772.
2017-05-08 13:35:28 +02:00
MaukCC
570b8767e0 Update cartesio.def.json 2017-05-08 13:27:01 +02:00
Lipu Fei
48862ed2b2 Change to "prime_blob_enable" and update description
CURA-3634
2017-05-08 13:13:33 +02:00
Lipu Fei
887a9d377a Use setting name "Prime Blob"
CURA-3634
2017-05-08 10:13:59 +02:00
Lipu Fei
319f5f73fe Rename "prime_enable" to "prime_poop_enable"
CURA-3634
2017-05-08 08:12:49 +02:00
Shaische
d0e4554b59 Update delta_go.def.json 2017-05-06 18:24:35 -04:00
Ghostkeeper
bd276a4d70
Convert Prusa i3 platform to binary STL
Smaller file size, and apparently there were some syntax errors in the original ASCII STL file as far as numpy-stl was concerned.
2017-05-05 14:56:45 +02:00
Ghostkeeper
c08eb043f0
Merge branch 'fix_float_number_line_width_um3' 2017-05-05 14:45:35 +02:00
Ghostkeeper
ce3b0d9fe4
Convert Kossel platform to binary STL
There were reportedly some errors in the file format. I've opened it and re-saved it in CloudCompare to fix these. And I also converted it to binary STL to reduce the file size somewhat.
2017-05-05 14:26:01 +02:00
Jack Ha
0b0011fc88 Multiply dialog now has focus on #, added shortcut Ctrl-M 2017-05-04 16:31:33 +02:00
MaukCC
7ee1498962 Update cartesio.def.json 2017-05-04 14:11:00 +02:00
MaukCC
3c4d3779b1 Update cartesio.def.json 2017-05-04 13:47:14 +02:00
Ghostkeeper
45a369e31b
Merge branch 'Sidebar-fix' 2017-05-04 13:00:03 +02:00
Lipu Fei
25be8d9abb Fix default Line Width float value representation for UM3 2017-05-04 12:55:37 +02:00
Ghostkeeper
c25e2b9b95
Revert "Include recommended/custom switch in theme"
This reverts commit a1f32b74e5. The fix was correct but we allow the honour for Randyxxl.
2017-05-04 12:53:05 +02:00
Mark Burton
53b7e1a8ca Add smooth_spiralized_contours setting to control smoothing of contours when spiralizing.
Smoothing the contours minimises the visibility of the z-seam and for most models is
probably a good idea. Where it is less good is when the model has a fine surface details
which will get mangled by the smoothing. So we should let the user decide whether they
want to smooth or not. The default is true as most of the time it's a good thing.

# Conflicts:
#	resources/definitions/fdmprinter.def.json
2017-05-04 09:02:38 +01:00
Ghostkeeper
a1f32b74e5
Include recommended/custom switch in theme
Otherwise it stays white.
2017-05-04 09:48:54 +02:00
Ghostkeeper
945486ade9
Merge branch 'cura_containerstack'
Contributes to issue CURA-3497.
2017-05-03 17:11:55 +02:00
Ghostkeeper
b69f337ddb
Set machine_extruder_count in sync with defined extruders
The registry checks if they are in sync and complains if they aren't. The extruder count is set back to default to 1 upon adding the machine.

Contributes to issue CURA-3497.
2017-05-03 17:01:08 +02:00
Ghostkeeper
1778751397
Fix travel speed override
Was a typo by the contributor of this definition.
2017-05-03 15:39:20 +02:00
Randall Wessel
687d326fae Changed color to transparancy and spaces instead of tabs 2017-05-03 15:34:56 +02:00