GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-20 01:29:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,957 Commits 291 Branches 260 Tags
Commit Graph

3142 Commits

Author SHA1 Message Date
Jaime van Kessel
6cf6d51fea Queued and printing amount now gets updated on state change 
CL-541
 2018-01-04 10:06:09 +01:00
Jaime van Kessel
9e055f0340 Added missing parameter 
CL-541
 2018-01-04 10:04:00 +01:00
Jaime van Kessel
42b50bf749 Fixed typo in function 
CL-541
 2018-01-03 17:14:52 +01:00
Jaime van Kessel
801875fb30 Merge branch 'network_rewrite' of github.com:Ultimaker/Cura into network_rewrite 2018-01-03 17:00:49 +01:00
Jaime van Kessel
487fca31dd Chopped up bunch of functions. 
As per review request. CL-541
 2018-01-03 16:59:05 +01:00
ChrisTerBeke
182e7de07d
Merge branch 'master' into network_rewrite 2018-01-03 14:17:48 +01:00
Ghostkeeper
1aebe32ba6
Fix winding order of left endpoint triangles 
Otherwise the left side is invisible due to backface culling.
 2018-01-02 16:16:52 +01:00
Lipu Fei
b246a102ed Fix MachineSettings dialog 
CURA-4708

- Move material diameter and nozzle size to extruder tabs
- Fix value bindings
 2018-01-02 12:40:43 +01:00
Lipu Fei
16dfc094eb Fix version upgrade 30 to 31 
CURA-4708

A merge mistake. No need to be there.
 2018-01-02 10:47:21 +01:00
Lipu Fei
70d5d4415f
Merge branch 'master' into CURA-4708_fix_definition_changes_extruder_stacks 2018-01-02 10:41:44 +01:00
Ghostkeeper
719bd5a707
Fix slicing non-printable meshes that fall outside of build volume 
Non-printable meshes don't care whether they are in the build volume or not.

Contributes to issue CURA-4734.
 2017-12-29 18:08:58 +01:00
Ghostkeeper
4b9ddc186a
Code style: Space after binary operator 
Contributes to issue CURA-4672.
 2017-12-28 14:28:12 +01:00
Aleksei S
d0a3575c0c Don't print the model if it is outside of the buildplate 
CURA-4734
 2017-12-22 14:48:45 +01:00
Jaime van Kessel
d6b0fcc92e Progress message is now also shown when still compressing g-code 
CL-541
 2017-12-22 13:50:55 +01:00
Jaime van Kessel
562b2454b8 Added missing notifications for Connect prints 
CL-541
 2017-12-22 13:48:51 +01:00
Lipu Fei
2cffb1759f Revert "Version upgrade for nozzle_size" 
This reverts commit 54bc7dd348d77efa7f2dc3f420200df9864b8d37.

CURA-4708
 2017-12-22 13:30:06 +01:00
Lipu Fei
26a136f7c5 Revert "Simplified upgrade funtion, typos, check extruder count" 
This reverts commit fd6d3e76a3754dae14f83a45d20685b4ddae6062.

CURA-4708
 2017-12-22 13:29:55 +01:00
ChrisTerBeke
b29047abd3 Small fixes for disable user data triggering preferences window 2017-12-22 11:38:56 +01:00
Jaime van Kessel
931c87716b Connection state changes now trigger a re-evaluation of the icon 
CL-541
 2017-12-22 11:31:48 +01:00
Aleksei S
c3954c40ac Merge branch 'master' of github.com:Ultimaker/cura 2017-12-21 16:25:54 +01:00
Aleksei S
447c6e7e23 Added Disable link style 
CURA-4630
 2017-12-21 16:25:13 +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
Lipu Fei
eaa27114c6 Fix ID changing in project loading 2017-12-21 12:43:50 +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