3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
19394 commits 344 branches 300 tags 764 MiB
Commit graph

1807 commits

Author SHA1 Message Date
Jaime van Kessel
22e0c80b3d Removed unneeded extra error check 
This caused an extra 1.5 second delay on changing machine configurations for dual extrusion machines.
 2018-02-08 10:27:54 +01:00
Lipu Fei
ffa4df6a06 Merge 3.2 into master 2018-02-07 13:20:24 +01:00
Jack Ha
3a88c1ee88 CURA-4923 fix handle setting function in material_diameter 2018-02-07 11:27:02 +01:00
Jack Ha
98f925d50c CURA-4924 now creating the extruder container with metadata extruder 2018-02-07 10:00:02 +01:00
Jack Ha
cb6b465ce7 CURA-4924 fix loading profiles with % in it 2018-02-07 09:55:22 +01:00
Lipu Fei
25713a6e64 Merge remote-tracking branch 'origin/3.2' 2018-02-01 11:23:20 +01:00
Diego Prado Gesto
701ac7f91e Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-01 09:05:32 +01:00
alekseisasin
e5c72cfdc5 Validate material profile 
CURA-4851
 2018-01-31 14:58:44 +01:00
Lipu Fei
3927c70625 Fix material_diameter handling in ExtruderStacks 
CURA-4898
 2018-01-31 13:32:45 +01:00
Diego Prado Gesto
81488e0bbc Merge branch '3.2' 2018-01-31 09:13:29 +01:00
Diego Prado Gesto
4cf07f5fe6 CURA-4868 Fix typo 2018-01-30 17:23:55 +01:00
Lipu Fei
759e596eb6 Fix add extruder function 
CURA-4868
 2018-01-30 12:19:16 +01:00
Lipu Fei
f1363fab73 Move newline format 
CURA-4863
 2018-01-29 16:33:52 +01:00
Lipu Fei
924f3972fd Create quality_changes for extruder stack if missing in profile importing 
CURA-4868
 2018-01-29 14:50:08 +01:00
Lipu Fei
34e6816f83 Fix container ID modification in profile importing 
CURA-4868
 2018-01-29 14:50:07 +01:00
Lipu Fei
507b967946 Minor fixes 
CURA-4868
 2018-01-29 14:50:07 +01:00
Lipu Fei
7dfc1a4aa7 Add encoding='utf-8' for text file reading 
CURA-4875

When encoding is not provided, the behaviour is system dependent and it
can break on OS X.
 2018-01-29 12:29:20 +01:00
Ghostkeeper
650ca4e5e8
Merge branch '3.2' 2018-01-29 10:25:29 +01:00
Lipu Fei
4a9fc4b7d4 Set imported containers to bedirty so they will get saved 
CURA-4875
 2018-01-26 14:17:18 +01:00
Diego Prado Gesto
38f1ad5db9 Merge branch '3.2' 2018-01-25 17:10:17 +01:00
Diego Prado Gesto
e38cf957bb CURA-4839 Avoid creating unique names for the extruder instance 
containers if the strategy is upgrade existing
 2018-01-24 16:04:11 +01:00
Jack Ha
994969634e Merge branch '3.2' 2018-01-23 16:17:50 +01:00
Jack Ha
def86defe6 CURA-4848 Global stack now does its infinite resolve prevention on per thread basis 2018-01-23 16:17:38 +01:00
Jack Ha
cde3799702 CURA-4848 removing the debugging list because it's not a threading issue 2018-01-23 14:46:44 +01:00
Jack Ha
b0d0b75662 Merge branch '3.2' 2018-01-23 14:25:11 +01:00
Jack Ha
07e6875199 CURA-4848 added logging for when the crash occurs 2018-01-23 14:24:00 +01:00
Lipu Fei
b14fdb1d0d Merge remote-tracking branch 'origin/3.2' 2018-01-23 11:20:49 +01:00
Lipu Fei
1c605a5108 Fix different strategies for machine and quality in project loading 
CURA-4839
 2018-01-23 10:58:43 +01:00
Jack Ha
92e99012d3 CURA-4785 now actually checking for extruder position, improved logs 2018-01-23 09:33:52 +01:00
Jack Ha
dc119d74bd CURA-4785 added logging for measuring time for validation check 2018-01-23 09:21:38 +01:00
ChrisTerBeke
2eef282b40 Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-22 17:18:19 +01:00
ChrisTerBeke
129f9cc16c Fixes for custom FMD printer material diameter upgrade and storage - CURA-4835 2018-01-22 17:18:09 +01:00
Jack Ha
204af1b6ed CURA-4785 fix slow cura for Custom FDM printer: now it's not checking for errors in unused extruders 2018-01-22 16:17:37 +01:00
ChrisTerBeke
e17fbb0db2 Remove copying 1st extruder value to all extruders as that breaks re-loading from files 2018-01-22 16:05:43 +01:00
Ghostkeeper
ec0fca30a4
Merge branch '3.2' 2018-01-22 12:48:54 +01:00
ChrisTerBeke
f589ce9570 Copy first extruder values when they are available when upgrading - CURA-4835 2018-01-22 11:25:23 +01:00
Lipu Fei
b92ebadfd0 Fix quality_changes for single-extrusion machines 
CURA-4839

- Add newly created quality_changes container to ContainerRegistry
- If an extruder is created by CuraContainerRegistry, in project
  loading, do not try to override extruder's quality changes.
 2018-01-19 15:05:05 +01:00
Lipu Fei
e7a19bcce5 Fix has_machine_quality value parsing 
CURA-4837
 2018-01-19 14:34:25 +01:00
Lipu Fei
79e79dd84c Only import profiles that match with the active machine 
CURA-4837
 2018-01-19 14:08:52 +01:00
Diego Prado Gesto
0fbcd2d2ec Merge branch '3.2' 2018-01-19 13:50:30 +01:00
ChrisTerBeke
d035ace40d Add method to set active extruder count to machine manager so other plugins can use it, add empty definitions container template 2018-01-19 13:32:25 +01:00
Lipu Fei
7c85db4a18 Fix material_diameter copy over for Extruders 
CURA-4835
 2018-01-19 12:30:56 +01:00
ChrisTerBeke
ce709bf24a Remove debug print - CURA-4829 2018-01-19 10:48:45 +01:00
ChrisTerBeke
8412e8535a Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-19 10:37:00 +01:00
ChrisTerBeke
e4a111dd2e Delay adding global stack when creating new machine until after extruder stacks are created - CURA-4828 2018-01-19 10:36:25 +01:00
Diego Prado Gesto
a6acf4a4af CURA-4829 Do not save the quality changes profile in the GCode if the 
containers are empty.
Change the message when trying to import a GCode as a profile, but not profile was stored.
 2018-01-19 10:34:04 +01:00
ChrisTerBeke
422d047317 Merge branch 'master' into feature_headless_docker 2018-01-17 17:02:04 +01:00
ChrisTerBeke
c1308de753 Merge branch '3.2' 2018-01-17 11:40:06 +01:00
Diego Prado Gesto
26371c9c3a CURA-4815 When creating the unique name for a machine, don't look at the 
definition instance container for the id, just look at the container
stack ids.
 2018-01-17 10:57:11 +01:00
Lipu Fei
cb0ac9b0c8
Merge pull request #3137 from Ultimaker/feature_multiple_BP 
Feature: Printers with different build plates
 2018-01-17 10:55:46 +01:00