GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 09:38:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,033 Commits 294 Branches 267 Tags
Commit Graph

3488 Commits

Author SHA1 Message Date
Jack Ha
2c831ceb05 For this version, send all build plates. No print view when multiple build plates. CURA-4525 2017-12-21 15:47:40 +01:00
Lipu Fei
df1d3bf569 Add fix and doc for Mac OpenGL crash 
CURA-4726
 2017-12-21 15:43:35 +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
alekseisasin
84a24a582c
Merge pull request #2865 from Ultimaker/feature_decline_slice_info 
Add button to disable sending anonymous information
 2017-12-21 15:30:49 +01:00
Jaime van Kessel
b1e9e3b8fa Prevent crash if disconnect already happend 
CL-541
 2017-12-21 15:14:50 +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
c05e6b43ff Fixed platform physics. CURA-4525 2017-12-21 13:11:32 +01:00
Lipu Fei
eaa27114c6 Fix ID changing in project loading 2017-12-21 12:43:50 +01:00
Jack Ha
a47107448e Moved objects menu to lower left and made it collapsible. CURA-4525 2017-12-21 11:39:37 +01:00
Jack Ha
5152b2ae65 Solved merge conflicts. CURA-4525 2017-12-21 10:52:51 +01:00
alekseisasin
d7146a90f5
Merge branch 'master' into feature_decline_slice_info 2017-12-21 10:24:35 +01:00
Jaime van Kessel
e576c1a9f7 Ensure that an update of icon also happens on output device change 
CL-541
 2017-12-21 10:01:29 +01:00
Jaime van Kessel
4796e00574 Fixed removing of manual printer 
CL-541
 2017-12-20 16:57:49 +01:00
Lipu Fei
107f6aff78 Fix SolidView to use isNonPrintingMesh decorator call 
CURA-4705
 2017-12-20 16:48:57 +01:00
Jaime van Kessel
041b1830fe Re-added manual printer adding 
CL-541
 2017-12-20 16:30:40 +01:00
Lipu Fei
ae86a838e0 Update extruder count model in MachineSettings dialog 
CURA-4722
 2017-12-20 16:23:39 +01:00
Jaime van Kessel
d66e9493ca When not looking at camera, it will now actually be disabled 
CL-541
 2017-12-20 15:54:05 +01:00
Lipu Fei
6d06d18407 Fix Extruder tabs in MachineSettings dialog 
CURA-4722

The extruder field views should be bound to the actual extruder, not the
active extruder.
 2017-12-20 13:58:02 +01:00
Lipu Fei
49ee2a543e Fix code style 2017-12-20 13:57:48 +01:00
Lipu Fei
196bffd3ad Only try to get a new unique name when it already exists 
CURA-4704
 2017-12-20 13:20:24 +01:00
Lipu Fei
4f28dec884 Fix typo 2017-12-20 13:19:48 +01:00
Lipu Fei
61dd1c98fd Fix cases with no per-object settings stack 
CURA-4705
 2017-12-20 13:16:29 +01:00
Lipu Fei
b2ac2e0fc7 Trust the stack values more than the decorator 
CURA-4705

A SceneNode and its decorators can be deepcopied. However, the data in
some decorators will only be updated when a per-object settings stack
triggers a property changed event. That event cannot copied. So, it can
happen that a deepcopied SceneNode has inconsistent data in some of its
decorators than what's in the per-object settings stack.
 2017-12-20 12:26:50 +01:00
Ghostkeeper
8734460aff
Use unique name too if importing multiple legacy profiles 
Otherwise all of them get the same name and they don't match global/extruder stacks together properly any more.

Contributes to issue CURA-4715.
 2017-12-19 17:36:20 +01:00
Ghostkeeper
d9bc561d73
Set the extruder metadata to its ID 
Not the actual extruder!

Contributes to issue CURA-4715.
 2017-12-19 17:28:05 +01:00
Jaime van Kessel
37461a7934 Made sendMaterialProfiles protected 
CL-541
 2017-12-19 17:24: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
039c85677a
Also return a global profile 
Since we always have an extruder now, also for single-extrusion printers, we need to return both a global profile and an extruder profile.

Contributes to issue CURA-4713.
 2017-12-19 16:40:03 +01:00
Jaime van Kessel
79add4ffd8 Added typing 
CL-541
 2017-12-19 16:15:48 +01:00
Ghostkeeper
569715492c
Correct ID if importing multiple legacy profiles 
They have to be made unique.

Contributes to issue CURA-4715.
 2017-12-19 16:05:42 +01:00
Jaime van Kessel
b4c83814d9 Clean up unused imports 
CL-541
 2017-12-19 16:03:48 +01:00
Jaime van Kessel
32cbd27b70 Fixed the firmware update for USB print 
CL-541
 2017-12-19 15:59:21 +01:00
Aleksei S
3eef50dfb7 Merge branch 'master' of github.com:Ultimaker/cura 2017-12-19 13:19:19 +01:00
Aleksei S
fd6d3e76a3 Simplified upgrade funtion, typos, check extruder count 
CURA-4708
 2017-12-19 13:17:53 +01:00
ChrisTerBeke
b3758be12e Fix selecting cura connect printer preference 2017-12-19 11:55:08 +01:00
Jaime van Kessel
a35f665201 Fixed crash if the firmware was in the list, but not found. 
CL-541
 2017-12-19 10:45:38 +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
Ghostkeeper
8f66db6565
Remove overzealeous log message 
This message appears on every machine in every material, which is far too much.
 2017-12-18 13:29:10 +01:00
Diego Prado Gesto
4a211c6ac6 CURA-4495 Change property name and add default values 2017-12-18 11:58:34 +01:00
Aleksei S
3a5b96b0e9 Merge branch 'master' of github.com:Ultimaker/cura 2017-12-15 18:14:06 +01:00
Aleksei S
54bc7dd348 Version upgrade for nozzle_size 
CURA-4708
 2017-12-15 18:13:29 +01:00
ChrisTerBeke
421d93baa3 Fix potential crash on missing index in extruder dict 2017-12-15 16:30:38 +01:00
Jaime van Kessel
1ae881caee USB device is first added and then trying to connect. 
This is to ensure that USB printers work without autodetect
 2017-12-15 16:03:58 +01:00
Jaime van Kessel
bd4797404d Changed showMonitorStage to setActiveStage 
CL-541
 2017-12-15 15:46:15 +01:00
Jaime van Kessel
35d3690b89 Disable UMO checkup action 2017-12-15 15:19:59 +01:00
Jaime van Kessel
0ac48817b2 Added abort, start & pause 
USL-541
 2017-12-15 15:00:10 +01:00
Jaime van Kessel
6bdce54e1d Enable progress bar for USB printing 
CL-541
 2017-12-15 14:47:06 +01:00
Jaime van Kessel
a6deddb6ae Added controller for USB printer 
CL-541
 2017-12-15 14:30:01 +01:00
ChrisTerBeke
57651e837f Fix setting the right extruder temperatures in start and end gcode 2017-12-15 14:17:18 +01:00
Jaime van Kessel
e2845a224c No longer start print if it's already started 
CL-541
 2017-12-15 14:01:58 +01:00