3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
18800 commits 340 branches 299 tags 734 MiB
Commit graph

4854 commits

Author SHA1 Message Date
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
fieldOfView
ed9943c732 Merge branch 'master' into feature_preheat_extruder 
# Conflicts:
#	plugins/USBPrinting/USBPrinterOutputController.py
#	plugins/USBPrinting/USBPrinterOutputDevice.py
 2018-01-27 16:35:55 +01:00
ChrisTerBeke
bd46515382
Make custom commands functional, fix UI layout, typos 2018-01-26 22:10:44 +01:00
ChrisTerBeke
4d19428f42
Merge branch 'master' into feature_custom_gcode_commands 
* master:
  CURA-4839 Avoid creating unique names for the extruder instance containers if the strategy is upgrade existing
 2018-01-26 21:07:05 +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
ChrisTerBeke
01b8bd60bd
Add type hinting 2018-01-25 22:47:02 +01:00
ChrisTerBeke
80b589344f
Add custom command methods to output device and controller 2018-01-25 22:40:30 +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
e3bffb0b1d Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-23 14:24:07 +01:00
Jack Ha
07e6875199 CURA-4848 added logging for when the crash occurs 2018-01-23 14:24:00 +01:00
Lipu Fei
710e3c1629 Revert "Simplify check for _outside_buildarea" 
This reverts commit 5c8d46b5c2.
 2018-01-23 12:39:15 +01:00
Lipu Fei
f45de9654b Revert "Remove unused import" 
This reverts commit cf556ccf8f.
 2018-01-23 12:39:07 +01:00
Lipu Fei
d3e85e6370 Revert "Do boundary checks on nodes for which the boundary check is unknown" 
This reverts commit 27e441ecd9.
 2018-01-23 12:38:59 +01:00
Ghostkeeper
f5e40c2281
Merge branch '3.2' 
Contributes to issue CURA-4797.
 2018-01-23 11:27:17 +01:00
Aleksei S
54dc63a596 Add missing changes 
CURA-3710
 2018-01-23 11:24:27 +01:00
Ghostkeeper
27e441ecd9
Do boundary checks on nodes for which the boundary check is unknown 
Just before deciding whether to drop down the node on the build plate.

Contributes to issue CURA-4797.
 2018-01-23 11:22:24 +01:00
Ghostkeeper
cf556ccf8f
Remove unused import 
Contributes to issue CURA-4797.
 2018-01-23 11:22:24 +01:00
Ghostkeeper
5c8d46b5c2
Simplify check for _outside_buildarea 
There is a getter function that has a default if the attribute doesn't exist.

Contributes to issue CURA-4797.
 2018-01-23 11:22:24 +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
ChrisTerBeke
53d097b138 Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-23 09:49:33 +01:00
ChrisTerBeke
6c9d7b5a2e Fixes for resetting print time information when removing all or last model, reduce signals being used for print time resetting - CURA-4852 2018-01-23 09:49:26 +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
956b793b6b Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-22 16:17:44 +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
Diego Prado Gesto
d8ae78d80c CURA-4821 Select the groups to be deleted also when clearing the scene 2018-01-22 16:12:11 +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
292556b4b3
Merge branch '3.2' 2018-01-22 15:38:23 +01:00
Simon Edwards
172b4e57a4 Fix problem with very slow gcode sending 
CURA-4850
 2018-01-22 15:08:54 +01:00
Diego Prado Gesto
20ab6265c8 CURA-4821 Delete also the GCode SceneNode when clearing the buildplate 2018-01-22 13:58:35 +01:00
Jack Ha
4c474c9619 Merge branch '3.2' 2018-01-22 12:58:16 +01:00
Jack Ha
1a8735ad33 Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-22 12:58:01 +01:00
Jack Ha
8d8fa0269a CURA-4821 loading gcode will now delete all existing models from all build plates and delete existing layer data to be processed 2018-01-22 12:57:50 +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
Jack Ha
ba29d64592 CURA-4821 Fix one at a time slicing for builtiplexer 2018-01-22 11:07:38 +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