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

3075 Commits

Author SHA1 Message Date
Jack Ha
8854a28d56 CURA-4525 solved merge conflict 2018-01-04 10:24:30 +01:00
ChrisTerBeke
46827b9295 Fix tevo blackwidow json file 2018-01-04 10:14:55 +01:00
Lipu Fei
7c4a122767 Fix container_index for MachineSettingsAction 
CURA-4708
 2018-01-03 17:04:40 +01:00
Lipu Fei
cbf6f55fd8 Fix perfered material search in auto-update 
CURA-4708
 2018-01-03 16:42:57 +01:00
ChrisTerBeke
80324900b0
Merge pull request #3068 from fieldOfView/feature_multiextruder_replacement_patterns 
Multiextruder gcode snippet replacement patterns
 2018-01-03 16:31:25 +01:00
Lipu Fei
47a12b4128 Prefer materials from the same brand in auto-update 
CURA-4708
 2018-01-03 16:29:19 +01:00
Lipu Fei
b181860f1c Fix afterOnEditingFinished() 
CURA-4708
 2018-01-03 16:29:18 +01:00
Jack Ha
62487e8ea2 CURA-4525 cleanups and change comment and added new-lines 2018-01-03 15:41:08 +01:00
ChrisTerBeke
08322d0a5e Move all decorators in the scene subfolder 2018-01-03 15:09:19 +01:00
Jack Ha
bfa33c721c CURA-4525 solved merge conflicts 2018-01-03 13:52:55 +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
fieldOfView
308d220bf3 Add an "initial_extruder_nr" pattern 2017-12-31 12:30:00 +01:00
fieldOfView
7a0b49ca2f Allow specifying the extruder stack to use for each replacement pattern 
The replacement pattern is (optionally) extended with an extruder_nr: {setting_key,extruder_nr}. The extruder_nr can either be a number (-1 for the global stack, 0 or higher for an extruder), or a setting keyword such as support_extruder_nr etc.

Contributes to #1296
 2017-12-31 11:29:37 +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
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
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
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
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
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
Lipu Fei
107f6aff78 Fix SolidView to use isNonPrintingMesh decorator call 
CURA-4705
 2017-12-20 16:48:57 +01:00
Lipu Fei
ae86a838e0 Update extruder count model in MachineSettings dialog 
CURA-4722
 2017-12-20 16:23:39 +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
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
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
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
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