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

7988 Commits

Author SHA1 Message Date
fieldOfView
78475d68b3 Fix creating variants 2016-11-23 22:04:18 +01:00
fieldOfView
c8cedb301a Use insertContainer instead of adding a parameter to addContainer 2016-11-23 22:04:18 +01:00
fieldOfView
5f147b6c78 Hide nozzle size setting for machines that use variants for nozzle sizes 2016-11-23 22:04:17 +01:00
fieldOfView
b6689870f5 Make Machine Settings compatible with machines that use variants (UM2+) 
For machines that use variants, a second variant container is added between the machine definition and the variant.
 2016-11-23 22:04:16 +01:00
fieldOfView
1325c31882 Remove hardcoded container index 2016-11-23 22:04:16 +01:00
Jaime van Kessel
fa174763cf The 3mf workspace reader no longer locks application if it is accedently called from main 
CURA-1263
 2016-11-22 14:57:44 +01:00
Jaime van Kessel
60d2d0d092 Workspace reader is now a lot more transactional; 
Instead of adding the instance containers on the go, we add them right before serializing the stack.
This enables us to remove them if the stack serialization goes wrong

CURA-1263
 2016-11-22 14:15:12 +01:00
Jaime van Kessel
8a67f44cf0 We now also write with the preferedSuffix 
CURA-1263
 2016-11-22 13:38:06 +01:00
Jaime van Kessel
e3eb75ab6e We now get material container by mimetype 
CURA-1263
 2016-11-22 13:37:11 +01:00
Jaime van Kessel
cba31d95ec Workspace reader now loads from prefered suffix 
CURA-1263
 2016-11-22 13:33:10 +01:00
Jaime van Kessel
42caf57993 Added "material" to default resolve strategies 
CURA-1263
 2016-11-22 13:31:58 +01:00
Simon Edwards
98a6568313 Merge branch 'master' into python_type_hinting 2016-11-22 11:15:04 +01:00
Simon Edwards
14afd9eab7 Heaps to changes to get the Cura code through the type checker (with minimal checking). 
CURA-2917
 2016-11-21 21:36:08 +01:00
Thomas Karl Pietrowski
a0ba393673 Merge remote-tracking branch 'upstream/master' into UM3NPP_merge 2016-11-21 14:44:19 +01:00
Thomas Karl Pietrowski
65add78401 Merge remote-tracking branch 'UM3NetworkPrintingPlugin/master' into UM3NPP_merge 2016-11-21 14:44:10 +01:00
Jaime van Kessel
aca8110edd Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-21 13:45:04 +01:00
Jaime van Kessel
1a2138de5a Moved warning to VersionUpgradeManager 
CURA-2883
 2016-11-21 11:21:20 +01:00
Jaime van Kessel
ac708d54b6 Importing invalid filetypes now gives proper error messages 
CURA-2883
 2016-11-18 16:46:54 +01:00
Jaime van Kessel
c1650125e9 The compatible setting is now serialized correctly 
CURA-2940
 2016-11-18 15:43:32 +01:00
Jaime van Kessel
782a02661c If prime tower or prime position has an invalid position, we now give a specifc error message to indicate this 
CURA-2481
 2016-11-18 14:24:32 +01:00
Jaime van Kessel
c007c1fc4c Fixed global error keys always overriding the extruder error keys 
CURA-2481
 2016-11-18 14:17:46 +01:00
Jaime van Kessel
2e1f4e3740 Serialize now uses base_file as well instead of only GUID to find containers to use 
CURA-2467
 2016-11-18 12:39:19 +01:00
Thomas Karl Pietrowski
dfd512b637 UM3NetworkPrintingPlugin: Moving plugin files 2016-11-17 21:12:28 +01:00
Jaime van Kessel
5482515157 Importing profiles from g-code made by Cura 2.3 is now possible again 
CURA-2943
 2016-11-17 13:15:25 +01:00
Jaime van Kessel
92a4fd7239 Materials are now also handled in conflict resolvement 
CURA-1263
 2016-11-17 11:16:15 +01:00
Jaime van Kessel
9f27e7861f Workspace reader now does a pre-check to see if it's a workspace in the first place 
CURA-1263
 2016-11-16 16:04:03 +01:00
Jaime van Kessel
42be3c7472 Conflict checker for machine now also checks if there is an actual difference 
CURA-1263
 2016-11-16 15:41:42 +01:00
Jaime van Kessel
053f0ca031 Replaced hack for setting extruders with more robust setter 
CURA-1263
 2016-11-16 14:54:48 +01:00
Jaime van Kessel
b175e6876f Added material conflict option 
This is still desabled by default due to some architecture issues (so this is temporarily left as it is)

CURA-1263
 2016-11-16 14:45:34 +01:00
Jaime van Kessel
b59be4c88b Moved result checking to the Dialog 
CURA-1263
 2016-11-16 13:15:15 +01:00
Jaime van Kessel
100e1f4f40 Conflict in quality changes is now handled less naive 
Instead of only checking ID, we also check values of the QC

CURA-1263
 2016-11-16 13:10:42 +01:00
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