3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
5762 commits 307 branches 272 tags 787 MiB
Commit graph

5762 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jaime van Kessel
c5d41aa9b0 Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-22 13:14:49 +01:00
Jaime van Kessel
f3bb45da50 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-22 13:13:57 +01:00
Jaime van Kessel
174990ba9d Set the depends_on property for resolve to value 
CURA-2900
 2016-11-22 13:13:30 +01:00
Tim Kuipers
c20a2a0a17 JSON language fix: clarify difference between Union Overlapping Volumes and Remove Mesh Intersection (CURA-2992) 2016-11-22 12:23:00 +01:00
Jack Ha
4a249dea62 Merge now works for all combinations of transforms. CURA-2932 2016-11-22 11:06:00 +01:00
Ghostkeeper
ad95d57f48
Merge branch 'feature_precool' 2016-11-21 17:35:32 +01:00
Tim Kuipers
baa481ed68 JSON fix: better description alternate_carve_order (CURA-2992) 2016-11-21 17:03:15 +01:00
Jack Ha
3c1194e847 Aligh zero positions of objects when merging, not center. CURA-2932 2016-11-21 13:54:53 +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
381589a927 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-21 13:42:48 +01:00
Jaime van Kessel
d09c2d2fa5 No longer cast ObjectId to int 
Fixes CURA-148
 2016-11-21 13:42:08 +01:00
Ghostkeeper
50609bfe7e
Make support line distance only give warning if actually less than line width 
Otherwise you get a warning with the default settings.
 2016-11-21 13:28:40 +01:00
Jaime van Kessel
aceff72c34 PerObject tool is now disabled when switching to a group as well 
CURA-2287
 2016-11-21 11:49:50 +01:00
Jaime van Kessel
1a2138de5a Moved warning to VersionUpgradeManager 
CURA-2883
 2016-11-21 11:21:20 +01:00
Jaime van Kessel
9057174691 Resolve is now updated from the base property 
The resolve doesn't update always update well for single extrusion machines, so the wrong value gets used.
There is however, no need for a resolve with a single extrusion machine, so we can disable the resolve for those alltogether.

CURA-2939
 2016-11-21 11:10:23 +01:00
Thomas Karl Pietrowski
6dc194d8de Revert "PrinterOutputDevice: Adding isConnectionState" 
1. Shouldn't go directly to upstream's master
2. GitHub still loves to kill the last line

This reverts commit bafaf16fcb.
 2016-11-20 15:09:20 +01:00
Thomas Karl Pietrowski
bafaf16fcb PrinterOutputDevice: Adding isConnectionState 
Adding isConnectionState here to make direct comparisons, whether the current state is the correct one.
Looks better than `self._connection_state == <my_connection_state>`  in my point of view.
 2016-11-20 14:59:35 +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
1b01455c36 Increased tolerance around prime area 
CURA-2934
 2016-11-18 16:15:53 +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
a9169a4d6b Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-18 15:19:33 +01:00
Jaime van Kessel
2a4a42a186 Merge branch 'feature_alternate_carving' of github.com:Ultimaker/Cura 2016-11-18 15:14:21 +01:00
Tim Kuipers
8dbe018a5b
JSON removal: removed the gap filling option 'skin' (CURA-2306) 2016-11-18 15:06:44 +01:00
Tim Kuipers
cc7b2a4901
JSON feat: perimeter_gaps as it was in e57ca0aa53 (CURA-2306) 2016-11-18 15:06:44 +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
312bd2a963 Resetting now simply resets everything to 0 if there is no bounding box 
For the current usage, this won't change anything, but it's more future proof

CURA-2925
 2016-11-18 13:28:14 +01:00
Jaime van Kessel
d2a50cada1 Only reset transformation/ position if there is a bounding box. 
If a node has no bounding box, it's because it has no data to change.

CURA-2925
 2016-11-18 12:56:07 +01:00
Jaime van Kessel
a71bb63318 Resetting transformation now works again for ungrouped nodes 
CURA-2925
 2016-11-18 12:50:51 +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
Jaime van Kessel
298710532b Merge branch 'feature_fan_speed_0' of github.com:Ultimaker/Cura 2016-11-18 10:44:09 +01:00
Jaime van Kessel
850fcac9c2 Build plate extruder now hides itself if the adhesion type is none 
CURA-759
 2016-11-18 10:41:07 +01:00
Jaime van Kessel
d0bae5acd7 Merge branch 'feature_bed_adhesion_none' of github.com:Ultimaker/Cura 2016-11-18 10:35:06 +01:00
Tim Kuipers
7bba0eb930 JSON: feat: alternate_carve_order (CURA-2992) 2016-11-17 19:54:38 +01: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
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
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
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
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