ChrisTerBeke
727da34bd3
Merge branch 'master' into feature_headless_docker
2017-12-22 14:21:36 +01:00
ChrisTerBeke
07ad74d7f9
Always construct scene and build platë node tree
2017-12-22 14:20:54 +01:00
Lipu Fei
0c28c61e05
Create new SettingInstances when moving user changes settings
...
CURA-4708
2017-12-22 14:09:13 +01:00
Lipu Fei
0cd392fbd2
Create new SettingInstance when moving extruder DC settings
...
CURA-4708
2017-12-22 14:08:22 +01:00
Lipu Fei
a7d51326c0
Move extruder-specific DC settings
...
CURA-4708
Read code comments.
2017-12-22 14:06:11 +01:00
Aleksei S
05acb2e00f
Prvent integer infinitive value after arranging all models
...
CURA-4672
2017-12-22 13:04:25 +01:00
ChrisTerBeke
4bc47585e6
Improvement in booting order
2017-12-22 12:27:45 +01:00
Lipu Fei
3fb3b5826f
Make sure user containers have unique IDs
...
CURA-4708
2017-12-22 12:26:30 +01:00
Lipu Fei
3f9f00673a
Fix addExtruderStackForSingleExtrusionMachine()
...
CURA-4708
- Create definition_changes container for the newly created
ExtruderStacks.
- Move extruder-specific definition_changes settings from the machine's
container to the extruder's container
2017-12-22 12:26:29 +01:00
Jaime van Kessel
eb27695d52
If a reserved job is moved to a printer that can do it, it' s correclty removed from the old printer
...
CL-541
2017-12-22 12:04:02 +01:00
Aleksei S
b454b43ae0
Merge branch 'master' of github.com:Ultimaker/cura
2017-12-22 12:02:18 +01:00
Aleksei S
f591822836
Set minimum distance between models
...
CURA-4672
2017-12-22 12:00:08 +01:00
ChrisTerBeke
1bfe296be7
Move all QML registrations together
2017-12-22 11:59:38 +01:00
ChrisTerBeke
5b43a32986
Extract UI boot from non-UI boot
2017-12-22 11:56:47 +01:00
ChrisTerBeke
3246480111
Merge branch 'master' into feature_headless_docker
2017-12-22 11:42:35 +01:00
ChrisTerBeke
f75d91071a
Remove invisible flag from allowed command line options to trigger non-gui mode
2017-12-22 11:39:58 +01:00
ChrisTerBeke
b29047abd3
Small fixes for disable user data triggering preferences window
2017-12-22 11:38:56 +01:00
Jaime van Kessel
52d25042eb
Machines now re-appear after timeout
...
CL-541
2017-12-22 11:29:13 +01:00
ChrisTerBeke
56435f12c0
Add additional debug logging in machine manager for changing stack setup
2017-12-21 17:12:39 +01:00
ChrisTerBeke
0e1cd99578
Add flag to ignore discard or keep dialog when changing print setup
2017-12-21 17:08:44 +01:00
Jack Ha
663ceab069
Undo emit transformationChanges (caused a crash), themed objects in objects list. CURA-4525
2017-12-21 16:53:43 +01:00
Aleksei S
c3954c40ac
Merge branch 'master' of github.com:Ultimaker/cura
2017-12-21 16:25:54 +01:00
Aleksei S
447c6e7e23
Added Disable link style
...
CURA-4630
2017-12-21 16:25:13 +01:00
Lipu Fei
4e90204620
Only push aways other objects if they are printing meshes
...
CURA-4705
2017-12-21 15:51:24 +01:00
Jack Ha
9ff15bf72d
Fixed not always updating objects list when changing build plate number by adding signals. CURA-4525
2017-12-21 15:42:23 +01:00
Jaime van Kessel
c6458358ba
Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite
2017-12-21 15:38:17 +01:00
Jack Ha
fda4badab1
Checked build plates in context menu now actually match the selected item's build plates; changed collapse arrow. CURA-4525
2017-12-21 15:08:46 +01:00
Jack Ha
0839125076
Fix platform physics not working across different build plates. CURA-4525
2017-12-21 13:31:19 +01:00
Jaime van Kessel
9754aa5397
Material & hotend updated callback is enabled for LegacyUM3 again
...
CL-541
2017-12-21 13:16:44 +01:00
Jack Ha
9f8eae006c
Fix push free. CURA-4525
2017-12-21 13:15:10 +01:00
Jack Ha
c05e6b43ff
Fixed platform physics. CURA-4525
2017-12-21 13:11:32 +01:00
Jack Ha
312bd137c2
Fix merge error, a variable got renamed. CURA-4525
2017-12-21 11:03:32 +01:00
Jack Ha
5152b2ae65
Solved merge conflicts. CURA-4525
2017-12-21 10:52:51 +01:00
Lipu Fei
0a0db39f02
deepcopy value from the stack
...
CURA-4705
2017-12-21 09:27:53 +01:00
Jaime van Kessel
041b1830fe
Re-added manual printer adding
...
CL-541
2017-12-20 16:30:40 +01:00
Jaime van Kessel
23330cd086
Camera feed is also stopped when NetworkCamera is destroyed
...
CL-541
2017-12-20 15:39:52 +01:00
Jaime van Kessel
95b1e8f68c
Ensured that multiple requests from the same camera are no longer possible
...
CL-541
2017-12-20 15:38:47 +01:00
Lipu Fei
588335c6db
Make sure only single-extrusion machines will be fixed
...
CURA-4713
2017-12-20 13:42:58 +01:00
Lipu Fei
1a6a6f74d5
Fix SettingOverrideDecorator for non printing meshes
...
CURA-4705
- Do not set a "secret" property in the SceneNode to indicate whether a
node is a non-printing-mesh because SceneNode will not copy that
property during a deepcopy. Store it in the SettingOverrideDecorator
and make it accessible through a decorator call
- Try to trigger an auto-slice AFTER the non-printing-meshes flag is
updated, not before.
2017-12-20 12:26:50 +01:00
Ghostkeeper
a860154831
Merge branch 'master' of github.com:Ultimaker/Cura
2017-12-20 10:20:30 +01:00
Diego Prado Gesto
8af52fb61b
CURA-4726 Creating unique name for the per object stack. Keep the prefix so it is easy to trace when debugging instead of just a number
2017-12-19 19:44:04 +01:00
Diego Prado Gesto
fc78402146
CURA-4726 Using a string for the per object stack id instead of the id
...
of the instance (that is an integer) because the new ContainerRegistry
searches by string
2017-12-19 17:26:30 +01:00
Ghostkeeper
05e232b498
Move LegacyProfileReader-specific logic into the plug-in itself
...
This had the documentation that it should edit the profiles returned by LegacyProfileReader. Instead, just return correct profiles from the reader...
Contributes to issue CURA-4715.
2017-12-19 17:16:32 +01:00
Ghostkeeper
c6a2b1b9c9
Ignore any additional stacks in imported profile
...
When you import a multi-extrusion file into a single-extrusion printer, don't crash but simply ignore the additional stacks.
Contributes to issue CURA-4715.
2017-12-19 17:08:51 +01:00
Ghostkeeper
c5e33e45a4
Fix setting definition if importing profile without printer-specific profiles
...
Fixes a crash.
2017-12-19 13:24:20 +01:00
Jaime van Kessel
bc8741ef08
Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite
2017-12-19 10:40:32 +01:00
Jack Ha
d6c6aa1c71
CURA-4715 fix updating custom profile
2017-12-18 17:03:18 +01:00
fieldOfView
77daad1f98
Also exit when the crash handler dialog is not created
2017-12-18 12:19:56 +01:00
fieldOfView
d839b62e42
Prevent CrashHandler creating a QWidget before QApplication is created
2017-12-18 12:18:22 +01:00
ChrisTerBeke
e3a996073e
Remove duplicate --headless argument as it is now in Uranium
2017-12-18 11:09:41 +01:00
