GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 09:38:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,717 Commits 294 Branches 267 Tags
Commit Graph

1608 Commits

Author SHA1 Message Date
Jaime van Kessel
e6d280ee47 Merge pull request #1196 from fieldOfView/fix_um3_postprocessing 
Allow postprocessing before sending data to the printer
 2016-11-30 09:12:06 +01:00
fieldOfView
91e8ac6868 Allow postprocessing before sending data to the printer 
From OutputDevice.py:
"output device subclasses are completely free to implement writing however they want, though you should emit writeStarted and related signals whenever certain events happen related to the write process."
 2016-11-29 17:20:10 +01:00
Simon Edwards
b9dd2ef6f9 Numpy magic to speed up the expansion of indices-to-vectors to just vectors. CURA-2548 
Sending models to engine that have indices is slow
 2016-11-29 15:16:55 +01:00
fieldOfView
86383b2be0 Get build plate shape options from the fdmprinter definition 2016-11-29 10:54:48 +01:00
Ghostkeeper
24c0b7c736 Merge branch 'fix_x3dimport' of https://github.com/vincentmarchetti/Cura into vincentmarchetti-fix_x3dimport 2016-11-29 10:50:36 +01:00
fieldOfView
dc33d96e8c Make build plate shapes translatable 2016-11-29 10:42:24 +01:00
fieldOfView
8651a9a902 Force update when changing origin 2016-11-29 00:17:56 +01:00
fieldOfView
b9280fef12 Allow setting build plate shape 2016-11-28 23:00:49 +01:00
Ghostkeeper
28c8dbec40 Merge branch 'feature_machine_settings_fixes' of https://github.com/fieldOfView/Cura into fieldOfView-feature_machine_settings_fixes 2016-11-28 12:40:35 +01:00
Arjen Hiemstra
554a8a2e6a Remove stray __init__.py file from plugins dir 
Since it completely breaks plugin loading as the plugin system thinks it
is a plugin it needs to load.

Fixes CURA-3041
 2016-11-28 10:21:12 +01:00
Jaime van Kessel
484c7df5bc Added a bunch of thread yields 
CURA-1263
 2016-11-25 16:25:24 +01:00
Jaime van Kessel
ef7004fb72 User changes are deserialized by workspacereader if there is no machine conflict 
CURA-1263
 2016-11-25 16:17:46 +01:00
Jaime van Kessel
ef4ad8d2ac Renamed um3networkprintingplugin to um3networkprinting 
CURA-2862
 2016-11-25 11:34:49 +01:00
Jaime van Kessel
3bdbb8d568 Merge branch 'UM3NPP_merge' of https://github.com/thopiekar/Cura 2016-11-25 11:31:23 +01:00
Thomas Karl Pietrowski
37e57e587a Merge remote-tracking branch 'UM3NetworkPrintingPlugin/master' into UM3NPP_merge 2016-11-24 21:40:07 +01:00
Jaime van Kessel
1d2d31c81b Update Usbprinter output request write 2016-11-24 16:03:56 +01:00
Jack Ha
b88ed76b7c Solve merge conflict PrinterOutputDevice. CURA-1263 2016-11-24 13:55:22 +01:00
Jack Ha
a8d5537487 Fix XmlMaterialProfile setProperty in correct container. Contributes to CURA-2861 2016-11-24 11:19:46 +01:00
fieldOfView
21bcb0e434 Create a definition_changes container instead of a second variant 2016-11-23 22:53:03 +01:00
fieldOfView
9e048aa6ad Get gcode flavor options from propertyprovider instead of hardcoding 2016-11-23 22:04:20 +01:00
fieldOfView
edf4589150 Use fixed width font and no wrapping in start/end gcode editor 2016-11-23 22:04:20 +01:00
fieldOfView
497b6f99a4 Fix finding existing variant by id 
ContainerStack.findContainer cannot find a container by id directly.
 2016-11-23 22:04:19 +01:00
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
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