Jack Ha
906ebe12e1
CURA-4400 fix disallowed areas by fixing the limit_to_extruder -1 value
2018-03-19 11:46:43 +01:00
fieldOfView
af637d5acc
Don't explode all nested groups when ungrouping groups of groups
2018-03-19 11:33:17 +01:00
Ghostkeeper
c1f9b455bb
Remove unnecessary import
...
This import is not used.
Contributes to issue CURA-5097.
2018-03-19 11:22:55 +01:00
Lipu Fei
d676b85289
Fix createMaterial() for non-2.85 diameter materials
...
CURA-5113
2018-03-19 11:09:07 +01:00
Jack Ha
8f6f56a5e6
Merge branch 'master' of github.com:Ultimaker/Cura
2018-03-19 10:56:49 +01:00
Jack Ha
bd775cf32e
CURA-4400 fix support_extruder_nr values in overhang angle and SliceInfo
2018-03-19 10:56:40 +01:00
Lipu Fei
7bf8e399ff
Should always reslice upon settings changed
...
CURA-5115
When we switch a model from "support mesh" for example to "normal",
there will be no setting values in the per-object settings container,
but we should still trigger a reslice because settings have been changed.
2018-03-19 09:45:31 +01:00
Lipu Fei
43ac565c20
Fix visibility preset initialization
...
CURA-5088
2018-03-16 15:45:17 +01:00
Lipu Fei
5ca4203940
Remove material types that have no fallbacks from fallback_materials_map
...
CURA-5098
2018-03-16 15:12:54 +01:00
Lipu Fei
2aaaf106b4
Fix update material in MachineManager
...
CURA-5098
2018-03-16 15:05:37 +01:00
Ian Paschal
19de9b263b
Merge pull request #3505 from fieldOfView/feature_support_eraser_ux
...
Further improvements of the Support Eraser
2018-03-16 14:59:29 +01:00
fieldOfView
83168886d6
Parent added meshes to the parent node instead of creating a group
...
This requires a small change in PlatformPhysics, or otherwise the added mesh would still drop down.
2018-03-16 13:22:43 +01:00
Lipu Fei
ee4a6dc704
Always show confirm dialog upon material diameter change
2018-03-16 13:21:51 +01:00
Ian Paschal
f8283352c4
Merge pull request #3492 from fieldOfView/feature_support_eraser_ux
...
Support Eraser improvements
2018-03-16 13:20:00 +01:00
Diego Prado Gesto
aa8d91faf6
Merge branch 'master' of github.com:Ultimaker/Cura
2018-03-16 10:58:56 +01:00
Diego Prado Gesto
06d028652d
CURA-4870 Change code style
2018-03-16 10:58:31 +01:00
Lipu Fei
a115956575
Do not show a material itself in its linked material list
2018-03-16 10:40:16 +01:00
fieldOfView
d1d1307e6e
Merge branch 'master' into feature_support_eraser_ux
2018-03-15 22:43:24 +01:00
Diego Prado Gesto
99d653cea5
CURA-4870 Don't allow to connect more than one instance to the same
...
group.
2018-03-15 20:01:47 +01:00
Lipu Fei
f14ddb8711
Fix reset to default quality
2018-03-15 17:09:13 +01:00
Lipu Fei
3bb0a481f1
Simplify default quality reset
2018-03-15 17:01:05 +01:00
ChrisTerBeke
d4d9a58d04
Fix merge conflicts, add can_send_raw_gcode ability, rename to sendRawCommand, small fixes
2018-03-15 16:51:25 +01:00
Lipu Fei
9de114c73a
Simplify discardOrKeepProfileChangesClosed()
2018-03-15 16:48:09 +01:00
ChrisTerBeke
5ee30e0c99
Merge branch 'master' into feature_custom_gcode_commands
2018-03-15 16:40:42 +01:00
alekseisasin
67261ccd4b
Merge pull request #3144 from fieldOfView/feature_preheat_extruder
...
Feature preheat extruder
2018-03-15 16:38:18 +01:00
Jack Ha
8af82cc3f4
CURA-4400 prevent disabling last enabled extruder
2018-03-15 15:54:44 +01:00
Lipu Fei
08f43f6b2e
Fix profile ordering in profile importing
...
CURA-5054
2018-03-15 15:27:47 +01:00
Diego Prado Gesto
b44f32ad1d
Merge branch 'master' of github.com:Ultimaker/Cura
2018-03-15 15:14:40 +01:00
Diego Prado Gesto
dcb68bb33e
CURA-4870 Move the checkCorrectGroupName to the machine manager, where
...
it must belong to.
2018-03-15 15:13:35 +01:00
Jack Ha
1dba5629f7
Merge branch 'master' of github.com:Ultimaker/Cura
2018-03-15 15:00:22 +01:00
Jack Ha
05cd937df3
CURA-4400 optional_extruders cannot be set to disabled extruders anymore
2018-03-15 15:00:13 +01:00
Diego Prado Gesto
1e9a1f2668
Merge branch 'master' of github.com:Ultimaker/Cura
2018-03-15 14:48:43 +01:00
Diego Prado Gesto
cbe929242e
CURA-4870 Update the names of the groups in the container stacks when
...
there is temporary name after upgrading from 3.2
2018-03-15 14:44:01 +01:00
Lipu Fei
8e39849aad
Refactor setting visibility preset
...
CURA-5088
2018-03-15 14:41:34 +01:00
Lipu Fei
83175b00c2
Change SettingVisibilityPresetsModel to non-singleton
...
CURA-5088
2018-03-15 14:41:34 +01:00
Lipu Fei
1f2602a2f4
Move SettingVisibilityPresetsModel to Machines.Models
...
CURA-5088
2018-03-15 14:41:34 +01:00
fieldOfView
584f98cb07
Fix code style
2018-03-15 11:27:48 +01:00
fieldOfView
2686090494
Merge branch 'master' into feature_preheat_extruder
2018-03-15 11:23:10 +01:00
fieldOfView
dbabf3bda9
Merge branch 'master' into feature_preheat_extruder
...
# Conflicts:
# cura/PrinterOutput/ExtruderOutputModel.py
# cura/PrinterOutput/PrinterOutputModel.py
2018-03-15 11:21:37 +01:00
fieldOfView
11be8f158f
Merge branch 'master' into feature_support_eraser_ux
2018-03-15 11:10:49 +01:00
Diego Prado Gesto
c21b19a910
Merge branch 'master' of github.com:Ultimaker/Cura
2018-03-15 11:04:10 +01:00
Diego Prado Gesto
15ff4045bf
CURA-4870 When removing a network connected printer, also remove all the
...
other machines that were (possibly) created in the background so that
there is no orphan containers.
2018-03-15 11:02:29 +01:00
Lipu Fei
496c8f2f79
Cleanup MachineManagementModel
2018-03-15 10:44:02 +01:00
fieldOfView
e4a416258b
Fix code-style and type hinting
2018-03-15 09:03:50 +01:00
Diego Prado Gesto
7c875c154f
Merge branch 'master' of github.com:Ultimaker/Cura
2018-03-14 16:56:52 +01:00
Diego Prado Gesto
2fdd51fc23
CURA-4870 Bind the network information with the output devices changed
...
signal.
2018-03-14 16:47:01 +01:00
Jack Ha
6909c9263a
CURA-4400 fix setting extruder number on a group printed with mixed extruders
2018-03-14 16:32:53 +01:00
Jack Ha
98b0559c9a
Merge branch 'master' into speedup
2018-03-14 16:14:14 +01:00
Jack Ha
e3dd7a449d
CURA-5090 speedups by using qtimers on updating mostly visual elements
2018-03-14 16:09:59 +01:00
Lipu Fei
241611546e
Fix quality details view
...
CURA-5054
2018-03-14 14:41:44 +01:00
