Lipu Fei
cff4dc8a0c
Use json.load() directly
2018-05-01 10:28:42 +02:00
Ian Paschal
01007946b4
CURA-5035 Separate API calls!
2018-04-30 16:42:11 +02:00
Diego Prado Gesto
d91dabb087
Merge branch 'master' of github.com:Ultimaker/Cura
2018-04-30 15:16:23 +02:00
Diego Prado Gesto
b582ac7526
CURA-5253 Initialize UI elements right after the qml files were loaded.
2018-04-30 15:09:52 +02:00
Lipu Fei
00dbf2c694
Change a logging line to an error
...
CURA-5301
2018-04-30 10:23:43 +02:00
Diego Prado Gesto
27b1e2cdd6
Fix format and add error message to log. Contributes to CURA-5301
2018-04-26 15:49:18 +02:00
Ian Paschal
679f87ebb3
CURA-5035 Don't show required plugins
...
Also renamed folder of UserAgreementPlugin to UserAgreement
2018-04-26 15:11:32 +02:00
Ian Paschal
332b7fb497
CURA-5035 Remove uncessary VersionTools
2018-04-26 13:17:00 +02:00
Lipu Fei
d393316a27
Merge pull request #3638 from fieldOfView/fix_variant_hardware_type_crash
...
Fix a crash when a variant has no hardware_type
2018-04-26 09:35:33 +02:00
Jack Ha
efdccb593f
Merge branch '3.3'
2018-04-25 16:35:20 +02:00
Lipu Fei
df1e15b1e5
Move the definition_changes fix to CuraContainerStack
...
CURA-5281
2018-04-25 16:12:47 +02:00
Ghostkeeper
4aec316b48
Prevent homing twice on printers that don't support X/Y specialisation
...
If the X Y is ignored and it just executes G28, it still executes it only once now.
2018-04-25 13:29:07 +02:00
Lipu Fei
ec9be7a103
Merge remote-tracking branch 'origin/3.3'
2018-04-25 12:55:21 +02:00
Lipu Fei
1d8c2bea98
Do not reset quality if the current custom quality is based on not supported
...
CURA-5285
2018-04-25 12:40:10 +02:00
Lipu Fei
c4994918c8
Make sure all stacks in a loaded machine have non-empty definition_changes container
...
CURA-5281
2018-04-25 11:16:02 +02:00
Diego Prado Gesto
3b499edac5
Add back the setAcceptsCommands function with a deprecated decorator.
2018-04-25 10:20:48 +02:00
Ghostkeeper
4fc29554ef
Don't process inheritance before there is an active global container
...
This could be called after an extruder was disabled by a broken configuration.
Fixes #3570 .
2018-04-25 09:59:25 +02:00
Ghostkeeper
1af56871e2
Don't crash if the number of extruders in setting doesn't match
...
...with the actual number of extruders. These could misalign with Custom FDM Printer or when any of the extruders was deleted because of a configuration format error.
Contributes to issue #3570 .
2018-04-25 09:58:10 +02:00
Ghostkeeper
47101cc1ca
Merge branch 'master' of github.com:Ultimaker/Cura
2018-04-23 14:14:12 +02:00
Ghostkeeper
5648bc82e7
Merge branch '3.3'
2018-04-23 14:07:46 +02:00
Diego Prado Gesto
5333ca5aa8
Merge pull request #3666 from Ultimaker/CURA-5204_send_anonymous_data
...
Show information dialogue on what usage data is sent
2018-04-23 13:32:22 +02:00
Lipu Fei
f62ce1966b
Fix material manager to use dict as a fallback
...
CURA-5266
2018-04-23 11:22:44 +02:00
Ian Paschal
54c32c52f6
CURA-5221 Added S5 ID code
2018-04-23 11:22:11 +02:00
Diego Prado Gesto
b8a26f3187
CURA-5218 Disable the Activate and Duplicate button in the management
...
page if the selected profile is not supported
2018-04-20 17:04:51 +02:00
Ghostkeeper
e13c3b1f13
Merge branch '3.3'
2018-04-20 15:34:06 +02:00
Diego Prado Gesto
626c424a02
CURA-5246 Just update the job name when it must be updated.
2018-04-20 15:00:40 +02:00
Ian Paschal
fbf73176d3
Use UM.Version instead of VersionTools
2018-04-20 11:25:39 +02:00
Diego Prado Gesto
4e53f219f0
Merge branch 'master' into CURA-5204_send_anonymous_data
2018-04-20 10:35:52 +02:00
Lipu Fei
53495604f8
Merge remote-tracking branch 'origin/feature_show_config_errors'
2018-04-19 15:38:29 +02:00
Lipu Fei
db5c18295b
Merge remote-tracking branch 'origin/3.3'
2018-04-19 09:20:22 +02:00
Lipu Fei
f24e1da934
Always update job name for gcode files
...
CURA-5246
2018-04-19 09:17:22 +02:00
fieldOfView
a52eaa98f1
When multiplying a parented node, multiply the parent instead (like groups)
2018-04-19 08:32:50 +02:00
fieldOfView
ea6d4d96f9
Exclude non-printing-meshes from bounding box of parents
...
Non-printing-meshes inside a group should not affect push apart or drop to build plate
2018-04-19 08:32:50 +02:00
Diego Prado Gesto
9a389bdcdd
Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3
2018-04-18 16:55:18 +02:00
Diego Prado Gesto
ee359571c0
CURA-5246 Start the timer for updating the platform activity also when
...
the node that changed is a GCode, that has layer data.
2018-04-18 16:53:33 +02:00
Lipu Fei
e7ec767cb7
Merge pull request #3545 from fieldOfView/fix_support_eraser_related
...
[3.3] Support Eraser related fixes
2018-04-18 15:14:44 +02:00
Lipu Fei
340916179a
Small typo fixes for preheat timeout
...
CURA-5227
2018-04-18 12:00:50 +02:00
Lipu Fei
dc52678c05
Merge pull request #3620 from fieldOfView/fix_preheat_end_during_print
...
[3.3] Prevent preheat timeout from occurring during a print
2018-04-18 11:59:54 +02:00
Lipu Fei
372419c223
Fix fallback quality setting
...
CURA-5218
2018-04-18 11:24:09 +02:00
Lipu Fei
650638fcdd
Fix setting default quality
...
CURA-5218
2018-04-18 11:20:43 +02:00
Lipu Fei
7326ee8c40
Fix typo
...
CURA-5218
2018-04-18 11:19:04 +02:00
Lipu Fei
bae1d2a59d
Switch to a default quality if the specified is not available
...
CURA-5218
2018-04-18 11:16:19 +02:00
Ghostkeeper
c49f912276
Merge branch '3.3'
2018-04-18 10:43:31 +02:00
Lipu Fei
1d4a70e839
Show all quality_changes on the quality management page
...
CURA-5218
2018-04-18 10:35:53 +02:00
Lipu Fei
83c728c89e
Update job name when pre-sliced flag changes
...
CURA-5246
2018-04-18 10:24:58 +02:00
Ian Paschal
7a0fe74989
CURA-5035 Added material authors + icons
2018-04-17 17:07:06 +02:00
Lipu Fei
35e7be1d41
Use pyqtSlot to show more info dialog
...
CURA-5204
2018-04-17 16:43:41 +02:00
Lipu Fei
7b20ce856e
Fix merge conflicts
2018-04-17 11:30:23 +02:00
Lipu Fei
c0db82e7a3
Merge remote-tracking branch 'origin/3.3'
2018-04-17 11:18:27 +02:00
Lipu Fei
0f5f059a7c
Add missing __init__.py
...
CURA-5242
2018-04-17 11:06:30 +02:00
