Jaime van Kessel
e40b730457
Merge branch 'CURA-5693_handle_empty_variant_and_material' of github.com:Ultimaker/Cura into 4.0
2019-01-31 11:22:00 +01:00
Ian Paschal
389bdeb0c7
Expose configurations the same way as connectivity
...
Contributes to CL-1154
2019-01-31 10:50:14 +01:00
Lipu Fei
5a196423db
Merge remote-tracking branch 'origin/4.0'
2019-01-31 08:47:01 +01:00
Lipu Fei
4f6d53b009
Do not disable all extruders when syncing
...
CURA-5693
When syncing with a machine with no material/nozzle, do not disable all
extruders. leave the first one enabled.
2019-01-31 08:30:41 +01:00
Jaime van Kessel
87070aefce
Fixed typing issues for configuredConnectionTypes
...
CURA-6159
2019-01-30 17:17:46 +01:00
Ghostkeeper
a36aa3f17b
Merge branch '4.0'
2019-01-30 12:53:18 +01:00
Ghostkeeper
14300e745f
Use Doxygen-style comments for documentation
...
According to our style. Not just single line comments without anything else.
Contributes to issue CURA-6159.
2019-01-30 12:52:58 +01:00
Lipu Fei
b70e9c9080
Handle empty hotend and material in config syncing
...
CURA-5693
- Disable an extruder if the config states no material or nozzle for
it.
- Show a warning message if an used extruder gets disabled.
2019-01-29 13:06:38 +01:00
Ghostkeeper
232498980c
Merge branch '4.0'
...
Conflicts:
cura/GlobalStacksModel.py -> CuraContainerRegistry being used in stead of ContainerRegistry, but imports were reordered.
plugins/CuraDrive/src/DrivePluginExtension.py -> Typing being solved in two ways.
2019-01-28 16:45:45 +01:00
Ghostkeeper
9d8cf5ddde
Apply division by zero prevention to the denominator
...
Rather than the numerator, which could not cause a division by zero exception.
2019-01-28 16:40:45 +01:00
Jaime van Kessel
bc8a08bb44
Add documentation to the configuredConnectionTypes
2019-01-28 14:57:24 +01:00
Jaime van Kessel
3774fdbd02
Refactored the "connection_type" metadata entry so it can support multiple types.
...
After a lot of discussion and finding out what the hell was going on,
we figured out we made a pretty big derp by only setting a single connection_type
in the metadata of the machine. What it's actually doing is describing what connection types
have been configured (and not just randomly displaying whatever output device set the value last)
2019-01-28 14:29:41 +01:00
Ghostkeeper
12d3af8d93
Fix type error
...
The typing was added by Nallath just now but it is giving an error for me.
The private access is allowed here because we're implementing it in the same class, even though it is a different instance.
This fixes the type error a bit more strictly than what lfei just did at the same time as me.
2019-01-28 13:50:32 +01:00
Lipu Fei
54ce6a3676
Fix typing
2019-01-28 13:40:42 +01:00
Ghostkeeper
c5eb3b0e25
Allow floating point in bed temperature
...
This is consistent with the hotend temperature. Only we round it just before outputting it to g-code because the g-code doesn't support it.
This fixes a typing error that my IDE gave me.
2019-01-28 13:35:22 +01:00
Jaime van Kessel
ad5a6a4153
Added missing typing
2019-01-25 14:09:41 +01:00
Jaime van Kessel
67a63e7954
Add test for gcodeListDecorator
...
It's super simple, but hey, it's also easy to write.
2019-01-25 14:04:53 +01:00
Jaime van Kessel
76cfb19dfb
Removed unused function & added more typing
2019-01-25 13:52:41 +01:00
Jaime van Kessel
0fded58988
Add / fix typing
2019-01-25 13:35:24 +01:00
Lipu Fei
173f125d3e
Fix merge conflicts
2019-01-24 14:55:29 +01:00
Jaime van Kessel
aac82a0852
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-01-23 11:18:27 +01:00
Remco Burema
aae06fe0fa
Prevent calculations with brim width larger than build-plate. [CURA-6094]
2019-01-21 17:47:13 +01:00
Lipu Fei
c83f815838
Fix tests
2019-01-18 13:46:37 +01:00
fieldOfView
7b1e20c955
Fix typo
2019-01-18 12:21:19 +01:00
fieldOfView
056655e584
Merge branch 'master' into feature_curaversion_appname
...
# Conflicts:
# cura/CuraApplication.py
2019-01-18 12:12:36 +01:00
Jaime van Kessel
72a7cc59ce
Use sane default when CuraCloudApiVersion is not set
2019-01-17 16:14:57 +01:00
Jaime van Kessel
15563a756f
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-01-17 13:42:58 +01:00
Jaime van Kessel
a41cc9efbe
Merge branch 'CURA-6113_fix_master_version_upgrade' of github.com:Ultimaker/Cura
2019-01-17 13:12:41 +01:00
Lipu Fei
3b3baeac03
Remove hard-coded account URLs in QMLs
...
CURA-6117
2019-01-17 11:20:21 +01:00
Jaime van Kessel
24fbb1007d
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-01-16 17:39:43 +01:00
Jaime van Kessel
7c7f6a1f03
Ensure sane defaults for the ApplicationMetada when making builds
2019-01-16 15:28:16 +01:00
Ghostkeeper
1b7b302f42
Fix some typos
2019-01-15 17:31:51 +01:00
ChrisTerBeke
3d6710d5b6
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-15 13:08:54 +01:00
Lipu Fei
ea0a6827ff
Merge remote-tracking branch 'origin/4.0'
2019-01-15 12:22:46 +01:00
Jaime van Kessel
d4b47c75ab
Fix typo in multiply message
2019-01-15 11:15:37 +01:00
Daniel Schiavini
77c30c891f
Fix tests
2019-01-15 08:20:39 +01:00
Jaime van Kessel
090fdbf598
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-01-14 14:17:40 +01:00
ChrisTerBeke
f2922e2405
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-14 14:16:35 +01:00
Lipu Fei
b2dace2d48
Fix version upgrade
...
CURA-6113
2019-01-14 11:25:02 +01:00
Diego Prado Gesto
c6da824203
Merge branch '4.0'
2019-01-14 08:56:33 +01:00
fieldOfView
c6fa47e584
Mark PrinterOutputDevice without printer type as invalid
...
Since self._printer_type was defined as an empty string and the setter only accepts strings, it could never be None
2019-01-11 17:52:28 +01:00
ChrisTerBeke
e465bd771a
Use toolpath instead of mesh, some review fixes
2019-01-11 16:18:47 +01:00
ChrisTerBeke
d8b5f75e2a
Solve some review comments
2019-01-11 16:14:55 +01:00
ChrisTerBeke
36e49ee6bb
Make activeMachineIsGroup more robust
2019-01-11 16:08:46 +01:00
ChrisTerBeke
b78ac0664f
Fix return types from review
2019-01-11 16:07:08 +01:00
ChrisTerBeke
2e3398e349
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-11 15:10:44 +01:00
Jaime van Kessel
d4621ec504
Ensure that if no CuraCloudApiRoot is set that the default is used
...
CURA-6005
2019-01-11 13:20:14 +01:00
ChrisTerBeke
56f0a341bc
Fix merge conflicts
2019-01-10 15:17:53 +01:00
Remco Burema
980953b00c
Merge pull request #4960 from Ultimaker/CURA-6005_cura_drive_plugin
...
[4.0] CURA-6005 Added CuraDrive plugin to Cura build
2019-01-10 14:58:00 +01:00
Remco Burema
a042de128b
Tag CuraCloudAPIVersion-string-value as expression instead of literal. [CURA-6005]
2019-01-10 14:16:20 +01:00
