3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 18:57:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
8856 commits 302 branches 270 tags 773 MiB
Commit graph

8856 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
76a9a9a9ab
Erase changed hotends/materials after applying changes 
Otherwise we may only change one of the extruders next time, and it'll still have the other change in this dictionary from the previous time we are syncing from the printer.

Contributes to issue CURA-3788.
 2017-05-19 14:39:22 +02:00
Jaime van Kessel
81d03a1683 Fixed order of pva profiles 
CURA-3845
 2017-05-19 14:00:40 +02:00
Jaime van Kessel
336e411f00 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-19 13:54:55 +02:00
Jaime van Kessel
4b826b747b Added exception handling to XML parsing 
CURA-3843
 2017-05-19 13:54:31 +02:00
Lipu Fei
9ff7852055 Only use limit_to_extruder when the extruder exists 
CURA-3756
 2017-05-19 13:37:38 +02:00
Jaime van Kessel
75b3f08318 Removed unneeded logging 
THis caused a massive logging spam
 2017-05-19 13:09:41 +02:00
Ghostkeeper
bd361e500c
Don't keep a copy of currently connected printer 
This QML file was holding a copy of the currently connected printer, stored in connectingToPrinter. This copy got out of sync when you load a project file which had a different connected printer. Instead, ask the manager for the currently connected printer key every time you click the button.

Contributes to issue CURA-3839.
 2017-05-19 12:30:17 +02:00
Lipu Fei
5a6049ddea Change XmlMaterialUpgrader to use UNIX EOLs 
CURA-3756
 2017-05-19 11:06:01 +02:00
Lipu Fei
7089460861 Minor refactoring for XMLMaterial upgrade 
CURA-3756
 2017-05-19 11:05:16 +02:00
Jaime van Kessel
c43a71084c Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-19 10:40:09 +02:00
Jaime van Kessel
475455d473 Definition changes are now also upgraded 
CURA-3837
 2017-05-19 10:39:37 +02:00
Lipu Fei
593697e0ed Fix XML material upgrade 
CURA-3756
 2017-05-19 10:18:13 +02:00
Ghostkeeper
bccd4187a3
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-18 16:49:17 +02:00
Ghostkeeper
7cb8e549f4
Merge branch 'feature_mold_roof' 2017-05-18 16:47:51 +02:00
Jaime van Kessel
f2f83750c2 Type is now always added when deserializing profiles to g-code 
CURA-3829
 2017-05-18 16:42:11 +02:00
Arjen Hiemstra
7e4f983cd6 Fix support settings that need their inheritance value from different extruders 
Contributes to CURA-3738
 2017-05-18 15:34:50 +02:00
Lipu Fei
870d6fe76a Use position number to get extruders for overriding in project loading 
CURA-3756
 2017-05-18 14:34:37 +02:00
Arjen Hiemstra
89adc46142 Make limit_to_extruder update properly when value changes happen 
Contributes to CURA-3738
 2017-05-18 12:46:06 +02:00
Jaime van Kessel
b16913ec3d Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-18 10:49:43 +02:00
Jaime van Kessel
898da21a7b Added missing super call 
CURA-3832
 2017-05-18 10:49:05 +02:00
Lipu Fei
5ed89525fb selectedObjectExtruders should handle no extruder case 
CURA-3756
 2017-05-18 10:29:55 +02:00
Lipu Fei
cbdddd0b16 Ignore "quality" and "variant" containers in project loading 
CURA-3756
 2017-05-18 10:28:02 +02:00
Jaime van Kessel
29e8325c12 Only try to remove extruders if the machine has any 2017-05-18 09:56:13 +02:00
Lipu Fei
18dd8dc6cc Simplify ExtruderStack override code in project loading 
CURA-3756
 2017-05-17 17:10:55 +02:00
Lipu Fei
b2f0623ecf Do not add and register Extruders if they are already there 
CURA-3756
 2017-05-17 17:07:36 +02:00
Ghostkeeper
739fd2bbcb
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-17 16:33:37 +02:00
Ghostkeeper
bf432dee34
Merge branch 'fieldOfView-fix_create_material' 2017-05-17 16:33:22 +02:00
Ghostkeeper
e64e7daec5
Merge branch 'fix_create_material' of https://github.com/fieldOfView/Cura into fieldOfView-fix_create_material 2017-05-17 16:28:17 +02:00
Jaime van Kessel
ff2478ff51 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-17 16:25:02 +02:00
Jaime van Kessel
428d063044 Added missing variants for um2_extended if you have olson block 
CURA-3742
 2017-05-17 16:24:13 +02:00
Ghostkeeper
f65043ecc8
Add spaces around binary operators and after comma 
Just a little code style thing.

Contributes to issue CURA-3828.
 2017-05-17 16:17:48 +02:00
Lipu Fei
e1455a4551 Fix deserializing ExtruderStacks in project loading 
CURA-3756
 2017-05-17 15:57:13 +02:00
Lipu Fei
b027437ef3 Activate a new machine (if any) before removing a machine 
CURA-3756
 2017-05-17 15:57:12 +02:00
Lipu Fei
386e5db489 When removing a machine's extruders, also clean up _extruder_trains 
CURA-3756
 2017-05-17 15:57:12 +02:00
Lipu Fei
3b3d9c4dae Minor code refactoring in ExtruderManager 
CURA-3756
 2017-05-17 15:57:12 +02:00
Ghostkeeper
012be3c6c7
Merge branch 'fieldOfView-fix_machinesettings_negative_offsets' 2017-05-17 15:44:37 +02:00
Ghostkeeper
937207a0eb
Merge branch 'fix_machinesettings_negative_offsets' of https://github.com/fieldOfView/Cura into fieldOfView-fix_machinesettings_negative_offsets 2017-05-17 15:42:43 +02:00
Ghostkeeper
2ad7152994
Merge branch 'maukcc-Cura/master' 2017-05-17 15:36:30 +02:00
Ghostkeeper
236b1dc0ca
Merge branch 'Cura/master' of https://github.com/maukcc/Cura into maukcc-Cura/master 2017-05-17 15:35:05 +02:00
Ghostkeeper
28dc8091e4
Merge branch 'fieldOfView-feature_extend_zoomrange' 2017-05-17 15:31:37 +02:00
Ghostkeeper
7827222aa2
Merge branch 'feature_extend_zoomrange' of https://github.com/fieldOfView/Cura into fieldOfView-feature_extend_zoomrange 2017-05-17 15:27:18 +02:00
Arjen Hiemstra
be08fab97c Fix the addExtruder unit test 
Extruders now need to provide a "position" entry.

Contributes to CURA-3738
 2017-05-17 13:47:14 +02:00
Arjen Hiemstra
3b73979a2c Do not add an extruder if it has no position set 
Otherwise we get very weird values in the extruders dict

Contributes to CURA-3738
 2017-05-17 13:47:14 +02:00
Arjen Hiemstra
63e586ab5b Ensure the value of limit_to_extruder is an extruder before accessing it 
Contributes to CURA-3738
 2017-05-17 13:47:14 +02:00
Lipu Fei
d02d004986 Correct profile_translations in VersionUpgrade21to22 
CURA-3777
 2017-05-17 13:44:34 +02:00
Jaime van Kessel
e608252151 Fixed missing namechanges for global profiles 
CURA-3777
 2017-05-17 13:21:11 +02:00
Jaime van Kessel
5ddaa92944 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-17 12:59:36 +02:00
fieldOfView
7b393064aa Fix creating materials for 1.75mm machines that have machine/variant materials 
Instead of cloning the 2.85 mm generic PLA material and setting its diameter, we now clone the generic PLA with the same diameter as the current machine. This will also clone all the machine-specific settings included in that base file.
 2017-05-17 12:20:00 +02:00
Lipu Fei
e2e208261e Fix renaming quality_changes and definition containers in project loading 
CURA-3756
 2017-05-17 11:53:13 +02:00
fieldOfView
75519d754b Fix creating materials for 1.75mm machines 2017-05-17 11:49:13 +02:00