GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-03 08:25:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,038 Commits 295 Branches 268 Tags
Commit Graph

3849 Commits

Author SHA1 Message Date
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
fieldOfView
57404deba6 Prevent scaling support eraser with scaled parent 2018-04-19 08:32:50 +02:00
fieldOfView
0e85802f9c Only respond to left mouse button 2018-04-19 08:32:50 +02:00
Lipu Fei
2ba7a6e462 Revert "Fix gcode.gz double extension problem on Mac" 
This reverts commit fa90fcf18e26871df030ddb8371cdc05f4d4b6cc.

CURA-5228
 2018-04-18 16:00:08 +02:00
Lipu Fei
9e7c417801 Revert "Fix gcode.gz double extension problem on Mac" 
This reverts commit fa90fcf18e26871df030ddb8371cdc05f4d4b6cc.

CURA-5228
 2018-04-18 15:59:28 +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
1fefc05698 Fix UM2 custom profile upgrade from 2.7 
CURA-5218
 2018-04-18 10:54:54 +02:00
Ghostkeeper
b8920b290f
Merge branch '3.3' 2018-04-18 09:47:06 +02:00
Lipu Fei
fa90fcf18e Fix gcode.gz double extension problem on Mac 
CURA-5228
 2018-04-17 15:03:17 +02:00
Ghostkeeper
e43e9ad117
Merge branch '3.3' 2018-04-17 13:56:46 +02:00
Diego Prado Gesto
94cad851a4 Use the correct filament diameter to calculate line width in the gcode 
parser.
 2018-04-17 13:39:22 +02:00
Diego Prado Gesto
2ebf6e8d51 CURA-5232 Renaming variable since it was on conflict with a new variable 
introduced in 4cabcb3632fe7a2c987e70197767a6a4bf88349b
 2018-04-17 13:07:15 +02:00
Ghostkeeper
d13fa3a6aa
Merge branch '3.3' 2018-04-17 11:40:29 +02:00
Diego Prado Gesto
819d1ac4e7 CURA-5202 Add modality to PluginBrowser window 2018-04-17 11:24:11 +02:00
Mark
f61efb8e20 resolve merge conflict 2018-04-17 10:39:35 +02:00
Mark
b78b6b2c01 Change default auto_slice setting to False 
CURA-5188
 2018-04-17 10:37:07 +02:00
Lipu Fei
c381f3707b Schedule model check for later if a machine change has not done yet 
CURA-5239
 2018-04-16 17:33:14 +02:00
Lipu Fei
e5d795cc0b Update model checker text 
CURA-5237
 2018-04-16 17:21:12 +02:00
Lipu Fei
4bb6962302 Rename model checker property to hasWarnings 
CURA-5237
 2018-04-16 17:20:40 +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
fieldOfView
d9034a6c85 Only respond to left mouse button 2018-04-15 12:08:49 +02:00
Lipu Fei
4b27d036bc
Merge pull request #3659 from Ultimaker/fix_gcode_line_width 
Adjust filament diameter to calculate line width in the gcode parser
 2018-04-13 10:38:47 +02:00
Ghostkeeper
1769a69792
Don't crash Cura when material file is wrongly formatted 
That was the whole point of this change. Instead degrade gracefully. It won't load the material file but give an error message saying that the material is corrupt. Then it won't be able to load the stack as well because the material doesn't exist, and give an error about the stack as well.

Contributes to issue CURA-5045.
 2018-04-12 16:56:05 +02:00
Ghostkeeper
e96c50a582
Fall back to FDMPrinter if definition can't be loaded 
Some of the settings will be different. But at least it won't crash.

Contributes to issue CURA-5045.
 2018-04-12 16:54:21 +02:00
Diego Prado Gesto
1a6a39da93 CURA-5197 Add log output with number of models in the buildplate after 
slice.
 2018-04-12 16:53:00 +02:00
Ghostkeeper
942afe2c3f
Merge branch '3.3' into feature_show_config_errors 2018-04-12 16:20:42 +02:00
Lipu Fei
6d2e49c228 Merge remote-tracking branch 'origin/3.3' 2018-04-12 14:04:29 +02:00
Mark Burton
e50be5cbe7 No! G90 does not command absolute extrusion, M82 does that. 2018-04-12 13:44:27 +02:00
Diego Prado Gesto
01c846dbd8
Merge pull request #3651 from smartavionics/mb-fix-gcode-reader-g90 
No! G90 does not command absolute extrusion, M82 does that.
 2018-04-12 13:40:32 +02:00
Diego Prado Gesto
2d30315ecf CURA-5220 Skip storing the settings in the GCode if they already are. 2018-04-12 11:49:38 +02:00
Mark Burton
b7b48927c2 Append a \n to each saved line of gcode otherwise the whole file ends up as one line! 2018-04-12 11:49:19 +02:00
Diego Prado Gesto
2df95b6e35
Merge pull request #3655 from smartavionics/mb-fix-gcode-reader-missing-newlines 
Append a \n to each saved line of gcode otherwise the whole file ends up as one line!
 2018-04-12 11:30:16 +02:00
Diego Prado Gesto
03ec123c3c Use the correct filament diameter to calculate line width in the gcode 
parser.
 2018-04-12 11:00:43 +02:00
Mark Burton
da1790fd37 Append a \n to each saved line of gcode otherwise the whole file ends up as one line! 2018-04-11 17:08:55 +01:00
Ghostkeeper
0f148dd2e2
Merge branch '3.3' 2018-04-11 13:31:59 +02:00
Ghostkeeper
7d806e7ae9
Fix rendering before the extruder number decoration is set 
If a render is triggered before this decorator is set it would crash. The rest of the code is robust against this being None, but here it would give a TypeError.
 2018-04-11 11:59:54 +02:00
Mark Burton
c4a9c38c33 No! G90 does not command absolute extrusion, M82 does that. 2018-04-11 09:12:22 +01:00
Lipu Fei
107c10b860 Merge branch '3.3' 2018-04-10 11:41:13 +02:00
Lipu Fei
95c6258d0f Handle plugin not found due to mixed plugin metadata 
CURA-5202

Plugin metadata that comes from the plugin server is also saved into
PluginRegistry's metadata collection, so it's all mixed. Plugins that
are just installed cannot be loaded immediately, and this causes an
error in checkCanUpgrade().
 2018-04-09 15:10:25 +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
fieldOfView
2def68edab Merge branch 'master' into fix_usb_rapid_commands 
# Conflicts:
#	cura/PrinterOutput/GenericOutputController.py
 2018-04-09 14:49:12 +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
Ghostkeeper
572721e20d
Catch ContainerFormatError when deserialising containers 
Only the deserialize() functions themselves may pass the ContainerFormatError on, because their callers will have to handle those errors anyway.

Contributes to issue CURA-5045.
 2018-04-06 13:26:16 +02:00
Lipu Fei
872a029f99 Merge remote-tracking branch 'origin/feature_benchmarking' 2018-04-06 10:47:00 +02:00
Lipu Fei
c47fe52ca5 Merge 3.3 into master 2018-04-06 10:39:38 +02:00
Lipu Fei
19937d1be0 Fix version comparison in plugin browser 
CURA-5202

It was comparing with itself so there's never a version upgrade.
 2018-04-06 10:34:55 +02:00
Diego Prado Gesto
877d700180 CURA-5197 Add log output with number of models in the buildplate after 
slice.
 2018-04-05 15:27:05 +02:00