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
6996 commits 302 branches 270 tags 773 MiB
Commit graph

6996 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tim Kuipers
7bba0eb930 JSON: feat: alternate_carve_order (CURA-2992) 2016-11-17 19:54:38 +01:00
Filip Goc
77cb5d8a5a Tweak Machine Name 
JellyBOX -> IMADE3D JellyBOX
 2016-11-17 13:28:17 -05:00
Jaime van Kessel
b1837896df Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-17 15:04:18 +01:00
Tim Kuipers
891eda203e JSOn fix: start each layer near switching bay (CURA-1112) 2016-11-17 14:57:46 +01:00
Jaime van Kessel
037e2571c7 Merge pull request #5 from thopiekar/thopiekar-adding-additional-warning-message 
Adding debug message when type != 'printer'
 2016-11-17 14:57:37 +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
Ghostkeeper
4da9b99ff8
Disable print sequence for all multi-extrusion machines 
Also for ORD and whatever else we have. It is now more inherent in the setting and it gives a better indication of why the setting is disabled when you hover the 'i' in the setting visibility screen.
 2016-11-17 12:43:14 +01:00
Jaime van Kessel
053ea6ad52 Bumped the used API version up by one 
CURA-1263
 2016-11-17 11:44:44 +01:00
Jaime van Kessel
92a4fd7239 Materials are now also handled in conflict resolvement 
CURA-1263
 2016-11-17 11:16:15 +01:00
Thomas Karl Pietrowski
808417b152 Renaming typeOfDevice -> type_of_device 2016-11-17 10:28:35 +01:00
Jaime van Kessel
9539774c0b Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-17 10:27:28 +01:00
Ghostkeeper
79e8fc210a
Remove commented code 
Contributes to issue CURA-2767.
 2016-11-17 10:24:19 +01:00
Ghostkeeper
d448ed7e08
Code style: Brackets on new line 
Contributes to issue CURA-2767.
 2016-11-17 09:59:14 +01:00
Ghostkeeper
41825231ad
Fix check for if nozzle offset exists 
Because an offset of 0 results in False as well.

Contributes to issue CURA-2625.
 2016-11-17 09:54:00 +01:00
Ghostkeeper
8879021d53
Make left build plate clips static disallowed areas 
It turns out that even though it far exceeds the tolerances, the build plate clips have such high variation that the left clips also hit the nozzle sometimes.

Contributes to issue CURA-2625.
 2016-11-17 09:48:29 +01:00
fieldOfView
3da5e9de4e Add a "clear filter" button 2016-11-16 23:21:20 +01:00
Thomas Karl Pietrowski
0f6c7a9405 Correcting warning 
.. also decoding the type of device and using it for the if clause, too.
 2016-11-16 21:50:11 +01:00
Thomas Karl Pietrowski
a52c62f6bb Adding debug message when type != 'printer' 
Just for the case we lose a device at this point.
 2016-11-16 21:45:25 +01:00
Filip Goc
f5bf94c44d move platform mesh down 0.3mm 
apparently, it was just a bit too high, which made the bulild plate
look foggy.
 2016-11-16 11:28:28 -05:00
Filip Goc
60577ea0d3 comment out ornamentals in starting gcode 
it worked before, but it’s better to be safe
 2016-11-16 11:27:27 -05:00
Jaime van Kessel
042141413a Fixed mergeSelected 
My previous fix was wrong; It only worked on what I wanted to fix (and broke the normal behavior). The current fix should fix both issues (merging works & merging groups works)

CURA-2932
 2016-11-16 17:22:06 +01:00
Ghostkeeper
ff14174724 Revert "JSON spelling fix: draft ==> draught (CURA-759)" 
This reverts commit 16828d98d4.
 2016-11-16 17:15:37 +01:00
Jaime van Kessel
a39d682476 Renamed Load workspace to open Workspace 
CURA-1263
 2016-11-16 16:07:18 +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
Tim Kuipers
7100c84136 JSON feat: cubic subdivision settings (CURA-2602) 2016-11-16 15:27:58 +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
Jack Ha
a68d96fb60 Per model settings panel is now closed when the tool gets disabled. CURA-2287 2016-11-16 09:42:04 +01:00
Tim Kuipers
97cbdb0b81 fix: nozzle cooldown speed modifier cannot be larger than the nozzle heatup speed (CURA-1932) 2016-11-15 17:56:34 +01:00
Jack Ha
3acddddc7c Solve populating Support Extruder Combobox at first time start, adjusted spacings. CURA-2767 2016-11-15 17:09:19 +01:00
Jack Ha
d34c79249b Changed recommended sidebar options, seems to work. CURA-2767 2016-11-15 16:40:04 +01:00
fieldOfView
1c92b9ee0e Don't update expandedCategories preference while filtering settings 2016-11-15 16:25:39 +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
Tim Kuipers
707b38431b JSON fix: double text in combing mode (CURA-2959) 2016-11-15 13:19:34 +01:00
Ghostkeeper
35a01435d5
Also rebuild when mesh extruder changes 
I do not want to add the rebuild() call to the update function itself since there may be other changes to the build volume before we should rebuild (such as raft).

Contributes to issue CURA-2625.
 2016-11-15 13:10:58 +01:00
Ghostkeeper
2492b03c4f
Update disallowed area when object's extruder is changed 
This calls _updateDisallowedAreas() but not rebuild(), so the change is not visible at this moment.

Contributes to issue CURA-2625.
 2016-11-15 13:10:58 +01:00
Ghostkeeper
60c8933906
Remove debug print 
Oops.

Contributes to issue CURA-2625.
 2016-11-15 13:10:58 +01:00
Ghostkeeper
f0766cbaf3
Update build volume when per-object settings change 
Requires some multi-levelled trickery to get the event listeners working. This also assumes that the per-object stack decorator is not deleted at any point unless the mesh is deleted (which is currently a correct assumption). If that ever changes though, the harm is just that the update function is still listening on the deleted decorator's stack.

Contributes to issue CURA-2625.
 2016-11-15 13:10:57 +01:00
Ghostkeeper
747ade2382
Remove now-useless variable 
I just realised that there were two if statements below each other with the same condition.

Contributes to issue CURA-2625.
 2016-11-15 13:10:57 +01:00
Ghostkeeper
9be02fb31f
Recalculate disallowed borders when adding or removing objects 
Because the new object may use an extruder that wasn't used so far, and if you remove an object it may remove the need for a certain extruder.

Contributes to issue CURA-2625.
 2016-11-15 13:10:57 +01:00
Jack Ha
6bb82eeefe Fix problem registering Actions.qml which resulted in empty menu items. 2016-11-15 11:42:08 +01:00
fieldOfView
7fafcef40b Allow making settings visible from the sidebar 2016-11-15 11:09:58 +01:00
Ghostkeeper
d8610d5e4a
Merge branch 'all_legacy_machines' 2016-11-15 10:14:52 +01:00
Victor Larchenko
b63f4e0bee T562: Text box expanded and all settings visible while filtering 
# Conflicts:
#	resources/qml/Settings/SettingView.qml
 2016-11-15 10:12:40 +01:00
fieldOfView
e450d10ddb Apply styling to filter field 2016-11-15 10:07:37 +01:00