Commit graph

4475 commits

Author SHA1 Message Date
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
Mark
f61efb8e20 resolve merge conflict 2018-04-17 10:39:35 +02:00
Lipu Fei
62521e93db Make sure that project writer runs on Qt thread
CURA-5229

 - Move @call_on_qt_thread to a separate module
 - Make sure that project writer runs on Qt thread because itself and the
   calls it makes can create new QObjects such as InstanceContainers, and
   this must happen on the Qt thread.
2018-04-16 15:32:12 +02:00
Lipu Fei
58e18ded18 Remove unneeded code
CURA-5202
2018-04-16 15:24:18 +02:00
Ian Paschal
85ebe741a8 CURA-5035 Don't show authors with 0 packages 2018-04-13 17:27:57 +02:00
Ian Paschal
523518020c CURA-5035 Better linking between Toolbox and CuraPluginManager 2018-04-13 16:25:01 +02:00
Ghostkeeper
133f6f43fe
Merge branch '3.3' 2018-04-13 16:14:23 +02:00
Ian Paschal
5d395f549a CURA-5035 Added already installed plugins 2018-04-12 17:22:50 +02:00
Diego Prado Gesto
f23491377f CURA-5197 Add Cura booting time to the logs. 2018-04-12 16:52:09 +02:00
Ghostkeeper
942afe2c3f
Merge branch '3.3' into feature_show_config_errors 2018-04-12 16:20:42 +02:00
Lipu Fei
7eba73adc5 Handle excluded_materials in getAvailableMaterials()
CURA-5223

Move the handling of excluded_materials into MaterialManager
getAvailableMaterials().
2018-04-12 16:12:07 +02:00
Lipu Fei
0f966115e6 WIP: Make CuraPackageManager aggregate PluginRegistry data
CURA-4644
2018-04-12 15:46:53 +02:00
Lipu Fei
6d2e49c228 Merge remote-tracking branch 'origin/3.3' 2018-04-12 14:04:29 +02:00
Lipu Fei
33949c3b71 Update build plate compatibility upon extruder enabled/disabled
CURA-5219
2018-04-12 14:02:56 +02:00
Lipu Fei
1c4c3a4a0b Fix quality changes that are based on no-long-available quality_type
CURA-5218
2018-04-12 13:58:20 +02:00
Lipu Fei
8d3c3c0e80 Fix the case that a quality_type is not available
CURA-5218
2018-04-12 13:58:20 +02:00
Lipu Fei
8a181ea395 Save curapackage into cache for delayed installation
CURA-4644

Do not rely on the originally provided curapackage file because they can be
gone after Cura restarts. Copy the curapackages into cache for delayed
installation.
2018-04-12 13:25:24 +02:00
Lipu Fei
406b64b331 Remove unneeded code
CURA-4644
2018-04-12 13:14:58 +02:00
Lipu Fei
596e0be7b6 CuraPackageManager handles packages and plugins
CURA-4644
2018-04-12 12:57:58 +02:00
Ian Paschal
94b15b0498 Merge branch 'CURA-4644-package-reader' into feature_material_marketplace 2018-04-11 11:08:18 +02:00
Lipu Fei
40eedbcf70 Add more info dialog
CURA-5204
2018-04-10 15:33:32 +02:00
Lipu Fei
56e80bb518 Merge branch '3.3' 2018-04-10 13:25:45 +02:00
Lipu Fei
4e625da168 Increase delay time for open file with double-clicking
CURA-5203
2018-04-10 13:23:23 +02:00
Lipu Fei
b55570f3fb Merge branch '3.3' 2018-04-10 13:13:38 +02:00
Lipu Fei
b314d2bbe2 Fix extruder nr handling for -1 Not Overriden
CURA-5213
2018-04-10 12:56:20 +02:00
Lipu Fei
107c10b860 Merge branch '3.3' 2018-04-10 11:41:13 +02:00
Lipu Fei
95f4515e93 Make it possible to skip project file check in readLocalFile()
CURA-5203
2018-04-10 11:40:47 +02:00
Lipu Fei
4615c756a7 More clear error handling for container deserialization
CURA-5045

 - If a container cannot be deserialized in project loading, it should fail
   right on the spot because even if it continues, it still won't work.
 - In other places, at least log deserialization errors if any of them show
   up.
2018-04-09 14:51:05 +02:00
Aleksei S
10ebabb7f6 Home head only by X- and Y axis, do extra bedHome (G28 Z)
CURA-4844
2018-04-09 13:13:52 +02:00
Aleksei S
c7b6bb8188 Merge branch '3.3' 2018-04-09 12:53:53 +02:00