1389 Commits

Author SHA1 Message Date
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
14bitVoid
c5bc370822 First layer line width 2017-05-06 23:20:19 +02: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
Tim Kuipers
15367a68d7 WARNING: TO BE REMOVED! impossible settings limit_to_extruder: overlap percentage
CURA-3740

These settings inherently have to do with multiple features and
so we should find a value function which depends on
settings from the extruder trains corresponding to those features (wall, skin, infill).

However, we haven't found those functions yet and we have to do research.

Once we have found the formula these settings shouldn't depend on a single extruder any more
and so we should remove the limit_to_extruder.
2017-05-04 17:45:50 +02:00
Tim Kuipers
8d6862be50 JSON infill/skin value function (CURA-3740)
value function is an initial try to get a better value function based on both feature types of walls and skin/infill
2017-05-04 17:45:03 +02:00
Tim Kuipers
17e9e2ae53 JSON limit_to_extruder becomes enabled (CURA-3740)
Settings which govern the order of features shouldn't depend on any feature,
because the order is overruled by the extruder order.
2017-05-04 17:38:16 +02:00
Tim Kuipers
27a8b59c80 WARNING: TO BE REMOVED! impossible settings limit_to_extruder
CURA-3740

These settings inherently have to do with multiple features and
so we should find a value function which depends on
settings from the extruder trains corresponding to those features (wall, skin, infill).

However, we haven't found those functions yet and we have to do research.

Once we have found the formula these settings shouldn't depend on a single extruder any more
and so we should remove the limit_to_extruder.
2017-05-04 17:34:41 +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
Lipu Fei
25be8d9abb Fix default Line Width float value representation for UM3 2017-05-04 12:55:37 +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
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
Jack Ha
a5033bae54 Enable Support settings that are applicable to support meshes. CURA-2747 2017-05-03 13:40:33 +02:00
Tim Kuipers
2ad8434c27 JSON difficult settings limit_to_extruder (CURA-3740) 2017-05-03 11:23:14 +02:00
Tim Kuipers
034f93debc JSON remaining settings limit_to_extruder (CURA-3740) 2017-05-02 18:04:00 +02:00
Tim Kuipers
11d6434b75 JSON speed settings limit_to_extruder (CURA-3740) 2017-05-02 17:53:06 +02:00
Tim Kuipers
e63d9743de JSON shell settings limit_to_extruder (CURA-3740) 2017-05-02 17:46:58 +02:00
Jack Ha
5d15d6e792 Merge branch 'master' into feature_multiextruder_machinesettings 2017-05-02 17:26:27 +02:00
Tim Kuipers
4130308437 JSON infill settings limit_to_extruder (CURA-3740) 2017-05-02 17:26:06 +02:00
Tim Kuipers
202129dc47 JSON resolution settings limit_to_extruder (CURA-3740) 2017-05-02 17:18:02 +02:00
Tim Kuipers
6744bf192d JSON feat: extruder_nr per feature type (CURA-3740) 2017-05-02 16:51:55 +02:00
Tim Kuipers
c69000da75 Merge branch 'feature_support_stair_width' 2017-05-02 13:22:19 +02:00
fieldOfView
4dea518c72 Add Upgraded Parts action for UM2 to add support for Olsson block
This adds a set of variants that just set the nozzle diameter and nozzle tip diameter. These variants are not used until the machine action sets the has_variants metadata entry.
2017-04-30 12:38:46 +02:00
fieldOfView
d12e323853 Add definition for Alya 3d printer
See https://github.com/Ultimaker/Cura/issues/1759
2017-04-30 10:53:23 +02:00
Ghostkeeper
6e5f7ac28a
Merge branch 'feature_support_top_bottom_speed'
Contributes to issue CURA-3491.
2017-04-25 16:46:30 +02:00
Lipu Fei
268a9c9bac Add priming_enabled option into fdm_printer
CURA-3634
2017-04-25 16:07:32 +02:00
Ghostkeeper
15593de404
Fix extruder number dependency of support roof pattern
It was depending on support bottom extruder.

Contributes to issue CURA-3491.
2017-04-24 17:31:07 +02:00
Ghostkeeper
2eae1cdf22
Move support roof settings above support bottom settings
This was deemed the most logical ordering.

Contributes to issue CURA-3491.
2017-04-24 14:28:10 +02:00
fieldOfView
4d12ab1296 Merge branch 'master' into feature_multiextruder_machinesettings 2017-04-21 19:31:44 +02:00
MaukCC
6ecd780bea Update cartesio.def.json 2017-04-20 14:47:43 +02:00
MaukCC
10233b2c02 Update cartesio.def.json 2017-04-20 11:53:05 +02:00
MaukCC
47aa044f7c Update cartesio.def.json 2017-04-20 11:33:36 +02:00