GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,694 Commits 295 Branches 268 Tags
Commit Graph

12694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
2f61c4436f
Merge branch 'master' of https://github.com/pouncingiguana/Cura into pouncingiguana-master 2018-01-23 16:37:43 +01:00
Ian Paschal
dcb1ac5deb Plugin browswer updates 
- Partial refactor
- Preparation for merge with plugins in preferences
 2018-01-23 16:20:19 +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
Ghostkeeper
f88df7e5cd
Remove overzealous log entry 
This was in the happy path and gets executed for every material profile in every material file, which is hundreds of times. Better not.

Found during development of CURA-4797.
 2018-01-23 15:45:12 +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
e561217415 Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-23 14:25:05 +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 5c8d46b5c2ff27ff32bfc8e27451d3f8764accf8.
 2018-01-23 12:39:15 +01:00
Lipu Fei
f45de9654b Revert "Remove unused import" 
This reverts commit cf556ccf8ff7116af0014ffc91c019b26cf4f364.
 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 27e441ecd9642530b5b8f8fe949cff152d54dcba.
 2018-01-23 12:38:59 +01:00
Lipu Fei
3ec4cc6a0b Revert "Rename Enable Travel Optimization to Infill Travel Optimization" 
This reverts commit a31d65786b0c8a0a62c1a3637db914d88bbcc6b4.
 2018-01-23 12:38:51 +01:00
Diego Prado Gesto
7a84712fc9 CURA-4854 Revert some changes in 619a8cc that make that issue not working 2018-01-23 12:13:26 +01:00
Jack Ha
1efc92ddbe CURA-4853 evaluate layer view compatibility mode in init, therefore not binding some signals and fixing the bug 2018-01-23 11:46:59 +01:00
Ghostkeeper
f5e40c2281
Merge branch '3.2' 
Contributes to issue CURA-4797.
 2018-01-23 11:27:17 +01:00
Ghostkeeper
a31d65786b
Rename Enable Travel Optimization to Infill Travel Optimization 
Because it's now no longer in the Infill category this is unclear.
 2018-01-23 11:24:43 +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
Aleksei S
8fe6e82459 Added Setting visibility preset 
CURA-3710
 2018-01-23 11:14:57 +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
Lipu Fei
c0bce6ffd4 Move Jenkins timeout into parallel_nodes block 2018-01-23 10:26:39 +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
Lipu Fei
3fb9877a30 Add call_on_qt_thread to fix project loading crashing on rendering 
CURA-4839

See comments...
 2018-01-22 17:22:27 +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
46c154ef98 Merge branch '3.2' 2018-01-22 16: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
Jaime van Kessel
1f8d7dfacb Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-22 15:48:07 +01:00
Jaime van Kessel
dcfab2f923 Failed state in printjobs is now handled correctly 2018-01-22 15:47:37 +01:00
Diego Prado Gesto
26d77778c1 Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-22 15:40:59 +01:00
Ghostkeeper
292556b4b3
Merge branch '3.2' 2018-01-22 15:38:23 +01:00
Ghostkeeper
50ccf101d8
Don't write Octoprint keys to workspace projects 
They should not be shared since they are private keys, so let's protect the user from accidentally sharing it via a project file.
 2018-01-22 15:37:51 +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
619a8ccce5 CURA-4839 Fix single extrusing for overrite the extruder stack. 2018-01-22 15:04:24 +01:00
Ian Paschal
f27dc4473e Possible to remove plugins 
Note that this required adding an `uninstallPlugin()` method to the `PluginRegistry` class of Uranium.
 2018-01-22 14:25:34 +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
Diego Prado Gesto
e2bc14cc58 Change layer thickness colormap to parula-like (https://es.mathworks.com/help/matlab/ref/parula.html) 2018-01-22 13:41:37 +01:00
Diego Prado Gesto
20da35ec5c Check when the containers are empty instead of None. Contributes to CURA-4845 2018-01-22 13:12:22 +01:00
Diego Prado Gesto
5c8a47275e CURA-4845 Revert changes when accessing the quality changes at the time 
of creating the global ProfileTab in the preferences.
 2018-01-22 13:08:30 +01:00