GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-13 03:58:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,023 Commits 290 Branches 260 Tags
Commit Graph

1757 Commits

Author SHA1 Message Date
Jaime van Kessel
fcd4fb86f5 removed debug prints 
CURA-1263
 2016-11-15 15:12:04 +01:00
Jaime van Kessel
bbf5c73dae Quality_changes user option is now set correctly 
CURA-1263
 2016-11-15 15:11:32 +01:00
Jaime van Kessel
f0eb5e0da3 User can now select what strategy to use per conflict 
CURA-1263
 2016-11-15 15:10:10 +01:00
Jaime van Kessel
47d0e95e53 Loading single extrusion machine from file no longer gives exception 
CURA-1263
 2016-11-14 17:55:30 +01:00
Jaime van Kessel
bade9e1bff Resolve strategy is now always set 
CURA-1263
 2016-11-14 17:50:54 +01:00
Jaime van Kessel
8640b2b787 Saving an empty buildplate as a workspace is now possible 
CURA-1263
 2016-11-14 17:45:30 +01:00
Jaime van Kessel
1db2d06e06 Fixed "new" resolve if only the machine was double. 
CURA-1263
 2016-11-14 17:15:29 +01:00
Jaime van Kessel
3245c2fe32 Extruder stacks are no longer renamed when loading from workspace 
CURA-1263
 2016-11-14 17:08:43 +01:00
Jaime van Kessel
2e4b430cf8 User changes are now also updated correctly when resolving to new machine in workspace loading 
CURA-1263
 2016-11-14 17:04:58 +01:00
Jaime van Kessel
b8746aee30 Added hack so the new extruders are added to extruder manager 
CURA-1263
 2016-11-14 15:59:14 +01:00
Jaime van Kessel
c919883178 Extruder stacks now properly get global stack set as next 
CURA-1263
 2016-11-14 15:50:07 +01:00
Jaime van Kessel
4dc14a72ab Added conversion table for old to new ID's 
CURA-1263
 2016-11-14 15:32:08 +01:00
Jaime van Kessel
0d4f28b310 MachineStacks & user containers are now also renamed if so required 
CURA-1263
 2016-11-14 15:16:17 +01:00
Jaime van Kessel
990736b5c6 Implemented quality_changes resolve strategy 
This enables the creation of a new quality_changes profile if the user chose to do this

CURA-1263
 2016-11-14 14:51:10 +01:00
Jaime van Kessel
377752397f Made it possible for machine & quality changes to have different resolve strategies 
CURA-1263
 2016-11-14 13:48:49 +01:00
Jaime van Kessel
8ae0cfd848 Loading workspace now activates the machine and notifies everyone that it was changed 
CURA-1263
 2016-11-14 13:30:28 +01:00
Jaime van Kessel
d5229992df Override resolve strategy is now handled 
CURA-1263
 2016-11-14 12:37:26 +01:00
Jaime van Kessel
cbcc48ff33 Pre-read now checks for conflicts and asks the user what strategy for resolvement to use 
CURA-1263
 2016-11-11 17:17:23 +01:00
Jaime van Kessel
99e753d3be Added loading of preferences form workspace 
CURA-1263
 2016-11-11 13:31:36 +01:00
Jaime van Kessel
413d788c0c Fixed copypaste mistake 
CURA-1263
 2016-11-11 10:46:54 +01:00
Jaime van Kessel
4a2f07c363 Definitions & materials are now loaded from workspace 
CURA-1263
 2016-11-11 10:39:54 +01:00
Jaime van Kessel
b92ca508bb Stacks are now loaded from workspace file 
CURA-1263
 2016-11-10 15:42:20 +01:00
Jaime van Kessel
611572c324 Extruder stack is now saved (instead of the material being saved as the stack) 
CURA-1263
 2016-11-10 14:11:33 +01:00
Jaime van Kessel
1f21957cb4 Fixed issue with per-object settings in 3mf reader 
CURA-1263 and CURA-382
 2016-11-10 11:46:13 +01:00
Jaime van Kessel
d477630cce Updated documentation 
CURA-1263
 2016-11-10 11:34:12 +01:00
Jaime van Kessel
3ab283bfed Saving workspace now works when there are no meshes to save 
CURA-1263
 2016-11-10 11:29:47 +01:00
Jaime van Kessel
61d1199abf The entire machine is now saved to 3mf file when saving workspace 
CURA-1263
 2016-11-10 11:27:25 +01:00
Jaime van Kessel
54040d4c99 Moved 3mf writer here from Uranium 
CURA-1263
 2016-11-10 10:39:20 +01:00
Vincent Marchetti
9449d30d87 Modify reading of Coordinate/@point attribute to allow comma separators 2016-11-09 09:44:10 -05:00
Jaime van Kessel
304696c809 OutputDevices now take file_handler into account 
CURA-1263
 2016-11-09 14:03:57 +01:00
Jaime van Kessel
e30038435c Added pre-read check for 3mf Reader 
CURA-1263
 2016-11-08 17:36:41 +01:00
Jaime van Kessel
164f378dd4 Added supported Extensions to workspace reader 
CURA-1263
 2016-11-08 17:26:01 +01:00
Jaime van Kessel
efc9719ff0 Added stub workspace reader 
CURA-1263
 2016-11-08 10:00:00 +01:00
Jaime van Kessel
1610f50da0 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-07 13:15:14 +01:00
Jaime van Kessel
826c3edd50 Added per object setting retrieval for 3MF 
CURA-1263
 2016-11-07 13:14:45 +01:00
Tim Kuipers
e51f9ba678 fix: exclude command line settings from being viewed in the frontend (CURA-566) 2016-11-07 11:54:47 +01:00
Thomas Karl Pietrowski
8503492b4d USBPrinting: stk500v2 cleanups 
* Removing unneeded import of "os"
* Removing unused "e" from SerialException
* Adding #@UndefinedVariable tags for PyDev
* Making message in Logger.log more detailed for portList(). Might be confusing in the logs to see just a list of ports without knowing where it is from.

Contributes to CURA-1809
 2016-11-06 15:45:45 +01:00
Thomas Karl Pietrowski
f8a5ee8c9b USBPrinting: Removing superfluous empty lines 
Contributes to CURA-1809
 2016-11-06 15:45:33 +01:00
Jaime van Kessel
35a4fe60d0 Put the XML warning in the right spot 2016-11-04 17:12:20 +01:00
Jaime van Kessel
726b935b78 3mf reader now gives warning if it couldn't load cElementTree 2016-11-04 17:03:52 +01:00
Ghostkeeper
de2c6a7444
Merge branch '2.3' 2016-11-04 10:14:36 +01:00
Ghostkeeper
d7a6173407
Update change log with texts from marketing 
These are the texts that they came up with. And we corrected them. And they came up with factually wrong texts again. We corrected them again. Now we won't allow any changes any more. Pft.
 2016-11-04 10:08:54 +01:00
Jaime van Kessel
761efa1681 Unable to slice message now shows what settings are in error state 
CURA-2481
 2016-11-03 16:25:36 +01:00
Jaime van Kessel
c35b606807 Added a bunch more yielding, which should decrease the stutter in GUI 
contributes to CURA-2687
 2016-11-03 15:48:42 +01:00
Jaime van Kessel
e67f5bdd44 PerObject tool is now disabled when group or multiple objects are selected 
CURA-2287
 2016-11-03 15:33:18 +01:00
Jaime van Kessel
d2ead852dd Decreased severity of logging of socket error 
CURA-2809
 2016-11-03 15:04:09 +01:00
Jaime van Kessel
7eec074b0f Firmware flasher now uses logger instead of print 
CURA-1809
 2016-11-03 14:26:41 +01:00
Jaime van Kessel
fce75febef 3MF now handles loading of multiple nodes correctly 
Contributes to CURA-1263
 2016-11-03 13:31:51 +01:00
Jaime van Kessel
d8e4e11b86 3MF reader now handles object types 
CURA-382
 2016-11-02 17:27:22 +01:00
Simon Edwards
cadf2115ac Merge pull request #1058 from Ultimaker/cura-2730 
Changed MachineManager.isActiveStackValid to areStacksValid. CURA-2730
 2016-11-01 16:17:04 +01:00