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 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
bd25448021
Changes to make um2 upgrade work with new stack changes
...
CURA-3742
2017-05-08 15:03:39 +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
Jaime van Kessel
3f9a5fbcbb
Changed logging so it doesn't look like it's printing lists
2017-05-08 14:22:36 +02:00
Jaime van Kessel
8efbbbb3f3
Merge pull request #1809 from fieldOfView/fix_multiextruder_machinesettings
...
Fix multiextruder machinesettings
2017-05-08 14:08:01 +02:00
fieldOfView
3fbdaf6c17
Ignore values of extruders that are inactive for the current machine instance
...
extrudervalues() would include the values of extruders whose position >= machine_extruder_count. This can happen in machine definitions that have more extruders than machine_extruder_count, eg Custom FDM printer.
2017-05-08 13:43:09 +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
Ghostkeeper
a9813146c4
Evaluate global stack first
...
The global stack has 99% of all settings. So most of the times the setting definition we are looking for is here. This should make it a bit faster to find.
Contributes to issue CURA-3772.
2017-05-08 13:35:28 +02:00
Ghostkeeper
281a01dd1f
Remove unused variable
...
Contributes to issue CURA-3772.
2017-05-08 13:35:28 +02:00
Ghostkeeper
2137c30bd6
Also check extruders for definitions of error settings
...
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
fieldOfView
98b127851b
Fix setting number of extruders when hasVariants is set
2017-05-08 12:54:12 +02:00
Lipu Fei
a3d92d557d
GCodeProfileReader: make deserialization more robust
...
CURA-3770
2017-05-08 11:33:50 +02:00
Lipu Fei
3a5a28cc38
Use CuraStack.qualityChanges to get quality changes
...
CURA-3770
2017-05-08 11:33:50 +02:00
Jack Ha
4cf2394488
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-08 11:27:28 +02:00
Jack Ha
8680c6d79d
Changed addExtruder exception to a warning to let Custom FDM Printer work again. Removed unused imports. CURA-3757
2017-05-08 11:27:19 +02:00
Ghostkeeper
e19d5411c2
Expand log message when getting no definition when listing error settings
...
So that someone reading the log gets a clue where the error message occurs and why.
Contributes to issue CURA-3772.
2017-05-08 11:17:37 +02:00
Jack Ha
82663a727f
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-08 10:51:29 +02:00
Jack Ha
1fe142ad1f
Fix crashing Cura when switching multi extruder machine to single extruder machine while object selected. CURA-3776
2017-05-08 10:50:15 +02:00
Jaime van Kessel
8ba0ee126e
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-08 10:31:10 +02:00
Jaime van Kessel
63eceda75e
Added handling for if definition for error handling was not found
...
CURA-3772
2017-05-08 10:28:31 +02:00
Lipu Fei
887a9d377a
Use setting name "Prime Blob"
...
CURA-3634
2017-05-08 10:13:59 +02:00
Lipu Fei
a039f9552e
Trigger extruderTabsCount update when MachineSettings dialog shows
...
CURA-3755
2017-05-08 09:47:42 +02:00
Ghostkeeper
b1596b7811
Merge branch 'rmcolbert-master'
2017-05-08 09:45:37 +02:00
Jaime van Kessel
b14dfadeb4
Merge pull request #1802 from Shaische/patch-1
...
Update delta_go.def.json
2017-05-08 09:41:12 +02:00
Ghostkeeper
6f0b81d046
Merge branch 'master' of https://github.com/rmcolbert/Cura into rmcolbert-master
2017-05-08 09:38:56 +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
