3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-10 15:27:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 19
3568 commits 330 branches 295 tags 714 MiB
Commit graph

737 commits

Author SHA1 Message Date
Jack Ha
c76a1043b0 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 11:05:00 +02:00
Jack Ha
464fe11123 Fixed profile file case-sensitivity. 
CURA-1720
 2016-07-07 11:04:34 +02:00
Jaime van Kessel
a3618c243d Added deepcopy function 
CURA-1578
 2016-07-06 16:38:35 +02:00
Jaime van Kessel
b3a6fafd97 Set default extruder index to -1 (so global is default) 2016-07-06 14:30:34 +02:00
Jaime van Kessel
a5ba68bae3 Ensure that the display matches with the backend active extruder data 2016-07-06 14:09:08 +02:00
Jaime van Kessel
bf53baccee Merge branch 'feature_material_hotend_change' of github.com:Ultimaker/Cura 2016-07-06 13:39:07 +02:00
Jaime van Kessel
b3adf8a271 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-04 17:11:50 +02:00
Jaime van Kessel
318182495a We now recieve material estimation per extruder 
CURA-1687
 2016-07-04 17:11:03 +02:00
fieldOfView
dd249206ac Fix codestyle 
CURA-491
 2016-07-04 16:33:32 +02:00
fieldOfView
bff23598c6 Fix simple mode infill to work with multiple extruders 
CURA-1778
 2016-07-04 16:23:07 +02:00
fieldOfView
3d86ffd575 Fix switching materials/nozzles in Cura when the materials/nozzles in the printer change 
CURA-491
 2016-07-04 15:14:36 +02:00
fieldOfView
24c5a39962 Fix logic and typo for material container filtering 
CURA-491
 2016-07-04 13:43:13 +02:00
fieldOfView
a1a7518317 Switch materials/nozzle when the printer signals a material/nozzle change 
CURA-491
 2016-07-04 11:49:27 +02:00
fieldOfView
0c23c26ac9 Code style 
CURA-1676
 2016-07-03 16:01:57 +02:00
Aldo Hoeben
41e30f4424 Merge pull request #844 from thopiekar/master-CURA-1676 
[CURA-1676] SplashScreen: Using system-default fontfamily
 2016-07-03 15:55:24 +02:00
Thomas Karl Pietrowski
a38606da4a SplashScreen: Using system-default fontfamily 
Contributes to CURA-1676
 2016-07-03 15:00:26 +02:00
fieldOfView
087ebc0768 Automatically show the Print Monitor when starting a print 
CURA-1036
 2016-07-01 15:06:49 +02:00
Jaime van Kessel
b06e61727c ZOffset decorator is now correctly copied 
CURA-1504
 2016-07-01 11:39:47 +02:00
fieldOfView
fea534509e Fix two "critical errors" on startup 
CuraMachineManager.isGlobalStackValid would return None on startup, which qml does not like.

CURA-1585
 2016-07-01 10:12:11 +02:00
fieldOfView
a7939c6f3d Fix empty material/quality profiles when switching variants 
CURA-1278
 2016-06-30 18:53:50 +02:00
Simon Edwards
551dc7d757 Fixes for the problem where duplicated objects were broken, missing hull 'shadows' or would fly off the build plate. 
Contributes to CURA-1504 Improve performance/simplicity by using Convex Hulls in Scene Graph
 2016-06-30 09:35:41 +02:00
Simon Edwards
47de254f97 Fixed up the 3MF reader to use the changed MeshBuilder and MeshData. 
CURA-1633 OverflowError: cannot convert float infinity to integer (loading larger models)
 2016-06-28 11:43:02 +02:00
Jaime van Kessel
0a3f64ef51 Switching stack now removes focus from all elements 
Fixes CURA-1778
 2016-06-28 10:55:20 +02:00
Aldo Hoeben
d1b1741d67 Merge pull request #822 from Ultimaker/feature_print_monitoring 
Print monitor
 2016-06-28 08:13:50 +02:00
fieldOfView
629feec3d3 Remove hack 
i18nCatalog was being abused to do text replacement on HTML
 2016-06-25 09:45:27 +02:00
fieldOfView
d0f100c03c Show relevant message on splash screen during startup 2016-06-25 09:45:11 +02:00
fieldOfView
2ee745e1f9 Remove hack 
i18nCatalog was being abused to do text replacement on HTML
 2016-06-25 09:40:22 +02:00
fieldOfView
a4eee2dce6 Show relevant message on splash screen during startup 2016-06-25 09:38:10 +02:00
Jaime van Kessel
7d9777bc89 Actually return ID of quality container (as implied by pyqtslot sig) 2016-06-24 16:55:18 +02:00
Jaime van Kessel
696f904f3e isGlobalStack valid no longer remains false after it has been invalid once 2016-06-24 15:59:31 +02:00
Jaime van Kessel
727c34b535 HasUser settings now returns False when no container stack is found 2016-06-24 15:45:11 +02:00
fieldOfView
55af0af755 Merge branch 'master' into feature_print_monitoring 
# Conflicts:
#	resources/qml/Cura.qml
 2016-06-24 14:55:12 +02:00
fieldOfView
e8743abe68 Set a sensible minimum width for the window 2016-06-23 18:44:06 +02:00
Jaime van Kessel
d0aa33f57f Added jobName property 
CURA-1036
 2016-06-23 17:05:45 +02:00
Jaime van Kessel
0b02a5f12b Machine actions are now when selected (instead of active) machine change 
CURA-1385
 2016-06-23 16:38:04 +02:00
fieldOfView
6d9eb4028e Merge branch 'master' into feature_print_monitoring 
# Conflicts:
#	cura/CuraApplication.py
 2016-06-23 15:53:53 +02:00
Aldo Hoeben
488740c60d Merge pull request #819 from Ultimaker/MachineActions 
Machine actions
 2016-06-23 12:59:03 +02:00
Jaime van Kessel
35a8e7ca94 Added missing decorator 
CURA-1385
 2016-06-23 11:41:13 +02:00
Jaime van Kessel
d499d59d97 Restored accidental delete 2016-06-23 11:19:54 +02:00
Jaime van Kessel
45dca3f878 Refactoring (Renaming variables so they are more clear & update documentation) 2016-06-23 11:09:55 +02:00
fieldOfView
a6bb0c804a Fix minor codereview issues 
CURA-333
 2016-06-22 17:19:14 +02:00
Jaime van Kessel
1e40d98fd7 Merge pull request #817 from Ultimaker/feature_multi_materialsnozzles 
Multiextrusion support for materials and nozzles
 2016-06-22 17:05:17 +02:00
Simon Edwards
65a8cf1c45 'One at a time' printing was broken due to a regression in the convex hull decorator. 
Contributes to CURA-1504
 2016-06-22 16:51:56 +02:00
Jaime van Kessel
cbbb204718 Merge branch 'master' of github.com:Ultimaker/Cura into feature_multi_materialsnozzles 2016-06-22 16:32:37 +02:00
Simon Edwards
631ef8e678 Reimplement the "no convex hull when using a tool" functionality. 
Contributes to CURA-1504
 2016-06-22 15:06:03 +02:00
Simon Edwards
9641a25f31 Fixed up the convex hull 'shadow' creation and deletion after the merge. 
Contributes to CURA-1504
 2016-06-22 14:48:15 +02:00
Jaime van Kessel
dcafb7d83a Removed Execute, as it's no longer used 
CURA-1385
 2016-06-22 13:10:10 +02:00
Jaime van Kessel
e1828a7689 Removed stray debug print 
CURA-1385
 2016-06-22 12:59:35 +02:00
Jaime van Kessel
8cfc0737ac First run actions are now properly handled 
CURA-1385
 2016-06-22 11:49:35 +02:00
fieldOfView
6adc4ef284 Revert "Change spelling of "colour" to "color" for consistency" 
This reverts commit 963a2092ef.

I still say we should use "colour" for consistency, but that change should not be part of this branch.

CURA-333
 2016-06-22 10:19:44 +02:00