907 Commits

Author SHA1 Message Date
Ghostkeeper
1ad9ba6c95
Remove lower warnings from Jerk settings
It's sometimes required to be extra careful, and the difference between 0 and 5 isn't that big that it would cause a great increase in print time.
2017-05-16 14:40:42 +02:00
Tim Kuipers
286c4665fc Resolve bed adhesion type to adhesion extruder (CURA-3738)"
The cause for this change is that TPU says we want to print with brim but CPE wants to print with raft.
In those cases the resolve function would choose the raft because that's safer.
However if the default extruder happens to be the TPU one you then get a raft made of TPU which is flexible.
That defeats the purpose of the raft, and causes the raft to warp, clog on the nozzle, destroy the world, etc. So there, I saved the world once more.
2017-05-16 13:28:33 +02:00
Tim Kuipers
b95712ef95 Revert "Resolve bed adhesion type via limit-to-extruder"
This reverts commit 396f4381dd13e34a144aa3c5d0a5a0569f6c9341.

The comit introduced an infinite recursion.

You cannot have both a limit_to_extruder and settable_per_extruder=false
2017-05-16 13:23:15 +02:00
Tim Kuipers
635b97a961 JSON description fix: warn users when not to use spiralize (CURA-3636) 2017-05-15 12:01:39 +02:00
Ghostkeeper
c61baf3355
Increase warning value for gradual infill steps
We set gradual infill steps to 5 if you choose Gradual Infill from recommended mode. This value was provided by the materials testers, so apparently it works fine and we shouldn't give a warning about that.

Contributes to issue CURA-3732.
2017-05-15 09:53:47 +02:00
Ghostkeeper
0cc4f90920
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-12 16:34:19 +02:00
Tim Kuipers
0d9514a5d0 Merge pull request #1821 from smartavionics/mb-smooth-spiralized-contours-not-per-model-or-extruder
Just like magic_spiralize, smooth_spiralized_contours should not be settable per model/extruder. (CURA-3771)
2017-05-12 14:53:18 +02:00
Ghostkeeper
ebd730a68d
Also add setting_version to fdmextruder
Since it obviously doesn't inherit from fdmprinter.

Contributes to issue CURA-3427.
2017-05-12 14:43:05 +02:00
Ghostkeeper
0f5814e52f
Add setting_version and check against it
This breaks all profiles since they have the wrong setting version, of course. Have to change that in every instance container now...

Contributes to issue CURA-3427.
2017-05-12 12:58:15 +02:00
Ghostkeeper
dab50f04b8
Merge branch 'mb-smooth-spiralized-contours-not-per-model-or-extruder' of https://github.com/smartavionics/Cura into smartavionics-mb-smooth-spiralized-contours-not-per-model-or-extruder 2017-05-12 11:56:52 +02:00
Jaime van Kessel
502e977c24 UM2E now has olson block upgrade selection as machine action
CURA-3742
2017-05-12 10:27:13 +02:00
Mark Burton
bf80e6efd5 Just like magic_spiralize, smooth_spiralized_contours should not be settable per model/extruder. 2017-05-12 09:10:21 +01:00
Ghostkeeper
396f4381dd
Resolve bed adhesion type via limit-to-extruder
The cause for this change is that TPU says we want to print with brim but CPE wants to print with raft. In those cases the resolve function would choose the raft because that's safer. However if the default extruder happens to be the TPU one you then get a raft made of TPU which is flexible. That defeats the purpose of the raft, and causes the raft to warp, clog on the nozzle, destroy the world, etc. So there, I saved the world once more.
2017-05-12 10:00:24 +02:00
Ghostkeeper
e7fc36587d
Remove Cubic Subdivision Radius setting
Just removes the definition. No version upgrade yet. That is next up.

Contributes to issue CURA-3427.
2017-05-11 14:27:56 +02:00
Tim Kuipers
4abcc8b3f1 JSON fix: magic_spiralize had child setting (CURA-3771)
it shouldn't have a child setting because that child is not the underlying setting used by the engine.
Parent settings are frontend-only settings which are merely used to let the user edit multiple leaf settings at once.
2017-05-10 16:31:53 +02:00
Jaime van Kessel
2b1ca54227 Reset all first start actions for UM2go
CURA-3742
2017-05-10 16:28:34 +02:00
Jaime van Kessel
9e58829aba Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-10 16:25:45 +02:00
Ghostkeeper
69eb981259
Remove nozzle offsets from printer definition
This setting is only defined in fdmextruder, so it can't be used here.
2017-05-10 14:02:38 +02:00
Jaime van Kessel
51c08d4f53 Merge branch 'feature_extra_gradual_infill_icon' of github.com:Ultimaker/Cura 2017-05-10 14:00:15 +02:00
Ghostkeeper
9bb6aadc66
Remove non-existing nozzle offset settings
They seem to be auto-generated or some sort.
2017-05-10 13:59:02 +02:00
Ghostkeeper
6f355d9006
Make 3DMaker Starter visible again
For some reason it was made invisible in 4e3e466a11e8c063cf64cc4426c19fa4a36276e3. It just works fine.
2017-05-10 12:01:59 +02:00
Ghostkeeper
8c9c20c8cb
Disable prime tower for UM3 ABS
It was already disabled for ABS 0.8mm.
2017-05-10 11:20:02 +02:00
Ghostkeeper
6d72f512a5
Set prime tower size by default to 20
This was found by the materials team to be a better value. All UM3 profiles have 20 now. I've left the third-party machines intact which override the prime tower size but those that didn't override the prime tower size have their prime tower size altered as well.
2017-05-10 10:57:37 +02:00
Jack Ha
b4b5061e0e Visibility for smooth spiralize. CURA-3771 2017-05-09 14:44:26 +02:00
jack
ef5d72a72a Merge pull request #1787 from smartavionics/mb-add-smooth-spiralized-contours-setting-for-master
Add smooth_spiralized_contours setting to control smoothing of contours when spiralizing.
2017-05-09 14:41:40 +02:00
Tim Kuipers
dfbd4107a4 Revert "Enable Support settings that are applicable to support meshes. CURA-2747"
This reverts commit a5033bae54c8061eece264f6e272c8924284b3aa.
2017-05-09 14:38:36 +02:00
Jaime van Kessel
57e6c031aa UM2Go no longer shows olson block dialog
CURA-3742
2017-05-09 13:18:34 +02:00
Jaime van Kessel
eb677f5625 Merge branch 'feature_cutting_mesh' of github.com:Ultimaker/Cura 2017-05-09 10:20:27 +02:00
Lipu Fei
2887819153 Only enable "prime_blob_enable" for UM3
CURA-3634
2017-05-09 10:14:43 +02:00
Ghostkeeper
17ad6a34ca
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-08 16:50:46 +02:00
Tim Kuipers
e6cf4a4538 JSON Prime Blob description wording (CURA-3634) 2017-05-08 16:46:09 +02:00
Ghostkeeper
24f8404aeb
Merge branch 'maukcc-master' 2017-05-08 16:45:02 +02:00
Ghostkeeper
70749ee0ec Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-08 15:51:50 +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 b69f337ddb50bb8e5dc39107f75d4112b14527d1.
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 452a6a095c0866a080e19d89a71e1857e011456f.
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
Mark
e3b17579e8 Merge branch 'feature_extra_gradual_infill_icon' of github.com:Ultimaker/Cura into feature_extra_gradual_infill_icon 2017-05-05 19:21:13 +02:00
Ghostkeeper
6b74b0d499
Set default gradual infill step height to 1.5mm
All of the profiles currently in Cura that set the gradual infill steps also set the step height (to 3 to 5 layer heights). I'd have chosen 4 layer heights as default based on that, but our material experts say that 1.5mm is about right for most models.

Contributes to issue CURA-3732.
2017-05-05 17:25:34 +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