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

1771 Commits

Author SHA1 Message Date
Jaime van Kessel
9a03e8640b Added spacers to workspace dialog 
CURA-1263
 2016-12-02 13:39:39 +01:00
Jaime van Kessel
3345e918e8 Conflict resolvement boxes are now invisible if there is nothing to resolve 
CURA-1263
 2016-12-02 13:37:56 +01:00
Jaime van Kessel
c236f7d266 Total number of settings is now calculated for open project dialog 
CURA-1263
 2016-12-02 13:31:31 +01:00
Jaime van Kessel
04d268b1fb Machine name is now also displayed in open project dialog 
CURA-1263
 2016-12-02 13:27:39 +01:00
Jaime van Kessel
b3f1f6b4db Project load dialog now also gives information about the quality & quality changes 
CURA-1263
 2016-12-02 13:01:01 +01:00
Jaime van Kessel
6bb1b7ec80 Number of settings & mode are now displayed in open Project 
CURA-1263
 2016-12-02 11:54:28 +01:00
Jaime van Kessel
5119ee9a93 Use correct descriptor for project open 
CURA-1263
 2016-12-02 11:13:21 +01:00
Jaime van Kessel
e941d417f1 Added CuraVersion to 3mf metadata 2016-11-30 14:15:19 +01:00
Jaime van Kessel
61db5b42b7 Moved loading of meshdata in workspace to after machine has changed 
This fixes the issue where the location of the objects was not correct.
CURA-1263
 2016-11-30 12:57:10 +01:00
Jaime van Kessel
dcdfe612e7 Added more robust fault handling for preferences while loading workspace 
CURA-1263
 2016-11-30 12:04:30 +01:00
Jaime van Kessel
477ffe12aa Merge branch 'feature_polar' of https://github.com/fieldOfView/Cura 2016-11-30 09:13:05 +01:00
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
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