Jack Ha
e43be1ba7e
Merge branch 'master' of github.com:Ultimaker/Cura
2016-11-29 09:06:31 +01:00
fieldOfView
31ca80d407
Create disallowed areas for polar printers
2016-11-28 23:00:53 +01:00
fieldOfView
70bc8d8889
Fix z-fighting
2016-11-28 23:00:52 +01:00
fieldOfView
2c5a4de264
Draw circular build plate for polar printers
2016-11-28 23:00:52 +01:00
Jack Ha
e888603dd5
Cura startup with setting errors now also results in Unable to slice.
2016-11-28 14:31:28 +01:00
Ghostkeeper
87587ffd40
Fix reloading meshes
...
Not tested with 3MF, but for normal cases this should hotfix it.
2016-11-28 14:11:44 +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
Tim Kuipers
2c1028e137
JSON feat: z seam position (CURA-1461)
2016-11-25 16:28:45 +01:00
Jaime van Kessel
bde1e05273
Changing an instanceContainer now re-checks the error state of the stacks
...
CURA-2861
2016-11-25 14:54:32 +01:00
Jaime van Kessel
361aee3e3c
Resolve value is now correctly displayed in profilesPage
...
CURA-2844
2016-11-25 13:29:46 +01:00
Jaime van Kessel
7a4deb725a
Clarified switching message
...
CURA-2898
2016-11-25 11:43:56 +01:00
Jaime van Kessel
823993caaf
ALways add prime areas
...
CURA-2625
2016-11-24 17:56:17 +01:00
Jack Ha
b88ed76b7c
Solve merge conflict PrinterOutputDevice. CURA-1263
2016-11-24 13:55:22 +01:00
fieldOfView
21bcb0e434
Create a definition_changes container instead of a second variant
2016-11-23 22:53:03 +01:00
Jaime van Kessel
8c35c8fbc3
Inheritance manager no longer sees settings as setting if they use enum value
2016-11-23 17:27:27 +01:00
Jaime van Kessel
c00775c488
Bounding box will no longer sing first part of batman theme
...
CURA-2963
2016-11-23 16:36:09 +01:00
Jaime van Kessel
b6df2b90dd
Merge branch 'master' of github.com:Ultimaker/Cura
2016-11-23 14:06:17 +01:00
Jaime van Kessel
a8887406ac
ValidationState checking in MachineManager now properly takes functions into account
...
CURA-2840
2016-11-23 14:05:33 +01:00
Jack Ha
06ed55b0ef
Merge branch 'master' of github.com:Ultimaker/Cura
2016-11-23 13:33:27 +01:00
Jack Ha
c3320bb1a4
Change settings to settings/overrides in selected messages. CURA-2898
2016-11-23 13:33:12 +01:00
Jaime van Kessel
e77d7f1f20
PrinterOutput now keeps track of camera state
...
CURA-2411
2016-11-23 13:22:02 +01:00
Jaime van Kessel
c1dda7505c
Inheritance manager now also checks for inheritance if enabled property changed
...
CURA-2860
2016-11-23 12:47:54 +01:00
Jack Ha
124e2b47ea
Fix display issue layer view reset positions, center point in select all. CURA-2925 CURA-3012
2016-11-23 11:56:27 +01:00
Jaime van Kessel
e17eda9a33
Removed debug prints
...
CURA-2860
2016-11-22 15:25:54 +01:00
Jaime van Kessel
75e067cab7
No longer select last_entry that isn't in the list
...
CURA-2860
2016-11-22 15:24:01 +01:00
Jack Ha
aa718fc013
Merge branch 'master' into feature_config_dir_lock
2016-11-22 14:46:00 +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
Simon Edwards
5884509af1
More type checking fixes after the merge.
...
CURA-2917
2016-11-22 11:51:18 +01:00
Simon Edwards
98a6568313
Merge branch 'master' into python_type_hinting
2016-11-22 11:15:04 +01:00
Jack Ha
4a249dea62
Merge now works for all combinations of transforms. CURA-2932
2016-11-22 11:06:00 +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
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
aceff72c34
PerObject tool is now disabled when switching to a group as well
...
CURA-2287
2016-11-21 11:49:50 +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
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
d0bae5acd7
Merge branch 'feature_bed_adhesion_none' of github.com:Ultimaker/Cura
2016-11-18 10:35:06 +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
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
Jaime van Kessel
053f0ca031
Replaced hack for setting extruders with more robust setter
...
CURA-1263
2016-11-16 14:54:48 +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
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