8609 Commits

Author SHA1 Message Date
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
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
Lipu Fei
c60fefc927 Add non-existing instance containers when opening a project file
CURA-3756
2017-05-09 14:58:18 +02:00
Jaime van Kessel
340bea7011 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-09 14:45:58 +02:00
Jaime van Kessel
a2d32a6fc7 Added bigflame to gitignore 2017-05-09 14:45:39 +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
Jaime van Kessel
4a0d03344b Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-09 14:40:13 +02:00
Jaime van Kessel
19bc6bb710 All error checks now use the timer instead of re-checking multiple times.
This significantly speeds up all setting / container changes for multi extrusion machines

CURA-3780
2017-05-09 14:38:57 +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
6493bcd5b5 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-09 14:02:09 +02:00
Jaime van Kessel
40c9e45532 Send specific signals for container changes if we know the type
CURA-3780
2017-05-09 14:01:37 +02:00
Lipu Fei
5706a540d9 Only set global stack in addMachine() if there was none 2017-05-09 13:57:02 +02:00
jack
f5342fcd20 Merge pull request #1797 from Ultimaker/CURA-3756_fix_project_loading
CURA-3756 Fix project loading
2017-05-09 13:21:47 +02:00
Jaime van Kessel
bb2600cd17 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-09 13:19:05 +02:00
Jaime van Kessel
57e6c031aa UM2Go no longer shows olson block dialog
CURA-3742
2017-05-09 13:18:34 +02:00
Jack Ha
492d051ebc Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-09 13:15:39 +02:00
Lipu Fei
acde348c6d Use ConfigParser hack to replace connect_signals=False hack
CURA-3756
2017-05-09 13:07:42 +02:00
Jack Ha
0d76ce72b0 Add comments CURA-3756 2017-05-09 13:07:42 +02:00
Lipu Fei
711b493ebf Fix code style 2017-05-09 13:07:42 +02:00
Lipu Fei
3e6d4b9230 document why no signals connecting in project file pre-read
CURA-3756
2017-05-09 13:07:41 +02:00
Lipu Fei
9c747733c4 Project Reader: Use ".<ext>" for profile type detection
CURA-3756
2017-05-09 13:07:41 +02:00
Ghostkeeper
61f7b6aa68 Add spaces around binary operator
According to our code style.

Contributes to issue CURA-3756.
2017-05-09 13:07:41 +02:00
Lipu Fei
53141303d2 WIP: Fix project loading
CURA-3756
2017-05-09 13:07:41 +02:00
Jack Ha
209822d0fc Fix unit test. Related to CURA-3757 2017-05-09 12:59:16 +02:00
Lipu Fei
19ee790cd7 Remove device pixel ratio from DiscardOrKeepProfileChangesDialog 2017-05-09 12:05:01 +02:00
Lipu Fei
36dedabd11 Fix DPI issue with DiscardOrKeepProfileChangesDialog 2017-05-09 11:47:55 +02:00
Jaime van Kessel
7632b9df79 Removed unused connection 2017-05-09 10:27:50 +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
MaukCC
b00c8e8119 Update cartesio_0.25_pva_high.inst.cfg 2017-05-08 16:33:35 +02:00
MaukCC
29f4f6be8f Update cartesio_0.25_pva_normal.inst.cfg 2017-05-08 16:33:15 +02:00
MaukCC
d53cd72583 Update cartesio_0.4_pva_high.inst.cfg 2017-05-08 16:32:58 +02:00
MaukCC
72b4fd7a19 Update cartesio_0.4_pva_normal.inst.cfg 2017-05-08 16:32:43 +02:00
MaukCC
fa5ae88499 Update cartesio_0.8_pva_coarse.inst.cfg 2017-05-08 16:32:27 +02:00
MaukCC
8febaa081d Update cartesio_0.8_pva_extra_coarse.inst.cfg 2017-05-08 16:32:11 +02:00
MaukCC
5bb4f06eb5 Update cartesio_0.8_pva_high.inst.cfg 2017-05-08 16:31:54 +02:00
MaukCC
3080e79277 Update cartesio_0.8_pva_normal.inst.cfg 2017-05-08 16:31:39 +02:00
MaukCC
65b6564c15 Update cartesio_0.8_nylon_normal.inst.cfg 2017-05-08 16:30:54 +02:00
MaukCC
35cbb26466 Update cartesio_0.25_nylon_high.inst.cfg 2017-05-08 16:30:37 +02:00
MaukCC
d04466dfd5 Update cartesio_0.25_nylon_normal.inst.cfg 2017-05-08 16:30:20 +02:00