Commit graph

12694 commits

Author SHA1 Message Date
fieldOfView
24159aaf66 Fix activating newly created materials 2017-05-11 14:08:15 +02:00
Jaime van Kessel
c5371842c2 Merge branch 'fix_per_model_settings_single_extrusion' of https://github.com/fieldOfView/Cura 2017-05-11 13:25:22 +02:00
fieldOfView
6fa83a9110 Fix selecting a material when an edit field has the focus 2017-05-11 13:22:14 +02:00
fieldOfView
5339055f9a Fix unlinking materials 2017-05-11 13:10:32 +02:00
fieldOfView
0d67d42300 Fix created materials being a linked to themselves 2017-05-11 12:53:53 +02:00
fieldOfView
e45f04f391 Merge branch 'master' into fix_material_uniqueness 2017-05-11 12:23:01 +02:00
Ghostkeeper
8ff3079b3e
Let CPE always use prime tower
Also 0.8mm.
2017-05-11 12:00:54 +02:00
Ghostkeeper
e3236bec4d
Make wording more consistent
Contributes to issue CURA-3732.
2017-05-11 11:22:18 +02:00
Jaime van Kessel
8e7637ae62 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-11 11:08:47 +02:00
Jaime van Kessel
e2b39e7e33 Fixed spacing of infill options
CURA-3732
2017-05-11 11:08:23 +02:00
fieldOfView
f23d969c23 Extend the zoomrange to cater for smaller and larger buildvolumes 2017-05-11 10:55:56 +02:00
Ghostkeeper
078fd16109
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-11 10:29:42 +02:00
Ghostkeeper
00aff6d2f2
Make feature labels more accurate for support
It's used a bit differently.

Contributes to issue CURA-3773.
2017-05-11 10:29:18 +02:00
Ghostkeeper
32ea311762
Merge branch 'time_estimate_per_feature' of https://github.com/14bitVoid/Cura into 14bitVoid-time_estimate_per_feature 2017-05-11 09:53:50 +02:00
Lipu Fei
9060bbf3b2 Update extruderCount when extrudersModel got changed
CURA-3755

The Timer delay is not reliable for updating the extruder Tabs.
So we now rely on the modelChanged signal of the ExtrudersModel
to do the update.
2017-05-11 09:47:37 +02:00
Mark
04611b06af Fix two spelling errors
TRI-1450
2017-05-10 20:14:03 +02:00
fieldOfView
93c5b382ba Fix selecting settings for Per Model Settings with single extrusion printers 2017-05-10 17:37:35 +02:00
Ghostkeeper
e187b96455
Add period after sentence
Contributes to issue CURA-3742.
2017-05-10 17:15:47 +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
Jaime van Kessel
fd340a1270 Empty containers now also trigger extruder model update 2017-05-10 16:25:23 +02:00
Jack Ha
79561f44b1 Fix project load, new non existing machine. CURA-3756 2017-05-10 16:16:57 +02:00
Jaime van Kessel
27d6bebf32 Adding a new printer now activates it again
CURA-3783
2017-05-10 16:12:01 +02:00
Jack Ha
502b6b6f08 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-10 15:37:31 +02:00
Jack Ha
d9f0e1fd4b WIP project loading - at least it mostly works again. CURA-3756 2017-05-10 15:37:22 +02:00
Ghostkeeper
d18e96972e
Rename TPU Normal Print to TPU Draft Print
The profile name is 'Draft' so this makes it easier to find. This also makes it consistent with the rest of the profile file names. It's good to do this before we need to make a version upgrade for it.
2017-05-10 15:28:19 +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
Jaime van Kessel
bfb76540d0 InstanceContainerchanged is now also on a timer.
This greatly reduces the signal storm resulting from changing quality / material in multi extrusion machines.

CURA-3780
2017-05-10 13:22:34 +02:00
Jaime van Kessel
7a4ca25193 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-10 13:17:15 +02:00
Jaime van Kessel
e313794b12 Fixed posponing of certain events
CURA-3780
2017-05-10 13:16:49 +02:00
Lipu Fei
77864f4237 WIP: Fix definition_changes handling in 3mf reader
CURA-3756
2017-05-10 13:07:45 +02:00
Lipu Fei
577fc0f082 Fix WorkspaceDialog to include resolve for definition_changes
CURA-3756
2017-05-10 13:07:45 +02:00
Ghostkeeper
6f355d9006
Make 3DMaker Starter visible again
For some reason it was made invisible in 4e3e466a11. It just works fine.
2017-05-10 12:01:59 +02:00
Jaime van Kessel
740346e0d8 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-10 11:57:17 +02:00
Ghostkeeper
2e3059600e
Convert ASCII STL files to binary STL
For some people (perhaps platform-dependent) reading ASCII STL files is giving problems.

It has smaller file size too, and nobody is going to read these STL files with a text editor anyway.
2017-05-10 11:55:24 +02:00
Jaime van Kessel
2375c832be Revert "ReplaceQuality changes only emits signals if there was a change"
This reverts commit 9a387f9ee2.
2017-05-10 11:50:17 +02:00
Ghostkeeper
1a96cdfdb7
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-10 11:40:24 +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
Jaime van Kessel
d9bddf65ef Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-10 10:59:46 +02:00
Jaime van Kessel
801c282c97 Only update ExtrudersModel when material changes
CURA-3780
2017-05-10 10:59:21 +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
b688178a2e Fix one part of project load - update existing. CURA-3756 2017-05-10 10:56:19 +02:00
Jaime van Kessel
42fc703516 Added a few profiling decorators to expensive methods 2017-05-10 10:45:07 +02:00
Jaime van Kessel
9a387f9ee2 ReplaceQuality changes only emits signals if there was a change
CURA-3780
2017-05-10 10:33:40 +02:00
Jaime van Kessel
3d429e44ae Updating extruders now also works with timer
CURA-3780
2017-05-10 09:59:19 +02:00
Jaime van Kessel
82d38490c4 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-10 09:50:02 +02:00
Jaime van Kessel
316f2bbdb5 Fixed switching g-code flavors with machineAction 2017-05-10 09:49:33 +02:00