Commit graph

3427 commits

Author SHA1 Message Date
Diego Prado Gesto
47ba8b098c Apply to layers shadow shader the same changes than in the default layer
shader, so that the shadow layers are correctly shown in simulation view
2018-01-05 11:51:12 +01:00
Jack Ha
2dad18a9ba CURA-4761 allow for space for scrollbar in per object settings 2018-01-04 16:26:39 +01:00
Jaime van Kessel
d0ec7d10ce Printer discovery shows if a cluster is actually set up as a host
CL-541
2018-01-04 15:35:30 +01:00
Jaime van Kessel
c9b8b0333c Sending prints to a specific printer in the cluster is now possible again
CL-541
2018-01-04 14:56:42 +01:00
Jaime van Kessel
acde48108d Removed control item
CL-541
2018-01-04 13:31:54 +01:00
Jaime van Kessel
2e8ae5c590 Unsasigned jobs are now also removed from list
CL-541
2018-01-04 12:54:47 +01:00
Jack Ha
8854a28d56 CURA-4525 solved merge conflict 2018-01-04 10:24:30 +01:00
ChrisTerBeke
46827b9295 Fix tevo blackwidow json file 2018-01-04 10:14:55 +01:00
Jaime van Kessel
6cf6d51fea Queued and printing amount now gets updated on state change
CL-541
2018-01-04 10:06:09 +01:00
Jaime van Kessel
9e055f0340 Added missing parameter
CL-541
2018-01-04 10:04:00 +01:00
Jaime van Kessel
42b50bf749 Fixed typo in function
CL-541
2018-01-03 17:14:52 +01:00
Lipu Fei
7c4a122767 Fix container_index for MachineSettingsAction
CURA-4708
2018-01-03 17:04:40 +01:00
Jaime van Kessel
801875fb30 Merge branch 'network_rewrite' of github.com:Ultimaker/Cura into network_rewrite 2018-01-03 17:00:49 +01:00
Jaime van Kessel
487fca31dd Chopped up bunch of functions.
As per review request. CL-541
2018-01-03 16:59:05 +01:00
Lipu Fei
cbf6f55fd8 Fix perfered material search in auto-update
CURA-4708
2018-01-03 16:42:57 +01:00
ChrisTerBeke
80324900b0
Merge pull request #3068 from fieldOfView/feature_multiextruder_replacement_patterns
Multiextruder gcode snippet replacement patterns
2018-01-03 16:31:25 +01:00
Lipu Fei
47a12b4128 Prefer materials from the same brand in auto-update
CURA-4708
2018-01-03 16:29:19 +01:00
Lipu Fei
b181860f1c Fix afterOnEditingFinished()
CURA-4708
2018-01-03 16:29:18 +01:00
Jack Ha
62487e8ea2 CURA-4525 cleanups and change comment and added new-lines 2018-01-03 15:41:08 +01:00
ChrisTerBeke
08322d0a5e Move all decorators in the scene subfolder 2018-01-03 15:09:19 +01:00
ChrisTerBeke
182e7de07d
Merge branch 'master' into network_rewrite 2018-01-03 14:17:48 +01:00
Jack Ha
bfa33c721c CURA-4525 solved merge conflicts 2018-01-03 13:52:55 +01:00
Ghostkeeper
1aebe32ba6
Fix winding order of left endpoint triangles
Otherwise the left side is invisible due to backface culling.
2018-01-02 16:16:52 +01:00
Lipu Fei
b246a102ed Fix MachineSettings dialog
CURA-4708

- Move material diameter and nozzle size to extruder tabs
- Fix value bindings
2018-01-02 12:40:43 +01:00
Lipu Fei
16dfc094eb Fix version upgrade 30 to 31
CURA-4708

A merge mistake. No need to be there.
2018-01-02 10:47:21 +01:00
Lipu Fei
70d5d4415f
Merge branch 'master' into CURA-4708_fix_definition_changes_extruder_stacks 2018-01-02 10:41:44 +01:00
fieldOfView
308d220bf3 Add an "initial_extruder_nr" pattern 2017-12-31 12:30:00 +01:00
fieldOfView
7a0b49ca2f Allow specifying the extruder stack to use for each replacement pattern
The replacement pattern is (optionally) extended with an extruder_nr: {setting_key,extruder_nr}. The extruder_nr can either be a number (-1 for the global stack, 0 or higher for an extruder), or a setting keyword such as support_extruder_nr etc.

Contributes to #1296
2017-12-31 11:29:37 +01:00
Ghostkeeper
719bd5a707
Fix slicing non-printable meshes that fall outside of build volume
Non-printable meshes don't care whether they are in the build volume or not.

Contributes to issue CURA-4734.
2017-12-29 18:08:58 +01:00
Ghostkeeper
4b9ddc186a
Code style: Space after binary operator
Contributes to issue CURA-4672.
2017-12-28 14:28:12 +01:00
Aleksei S
d0a3575c0c Don't print the model if it is outside of the buildplate
CURA-4734
2017-12-22 14:48:45 +01:00
Jaime van Kessel
d6b0fcc92e Progress message is now also shown when still compressing g-code
CL-541
2017-12-22 13:50:55 +01:00
Jaime van Kessel
562b2454b8 Added missing notifications for Connect prints
CL-541
2017-12-22 13:48:51 +01:00
Lipu Fei
2cffb1759f Revert "Version upgrade for nozzle_size"
This reverts commit 54bc7dd348.

CURA-4708
2017-12-22 13:30:06 +01:00
Lipu Fei
26a136f7c5 Revert "Simplified upgrade funtion, typos, check extruder count"
This reverts commit fd6d3e76a3.

CURA-4708
2017-12-22 13:29:55 +01:00
ChrisTerBeke
b29047abd3 Small fixes for disable user data triggering preferences window 2017-12-22 11:38:56 +01:00
Jaime van Kessel
931c87716b Connection state changes now trigger a re-evaluation of the icon
CL-541
2017-12-22 11:31:48 +01:00
Aleksei S
c3954c40ac Merge branch 'master' of github.com:Ultimaker/cura 2017-12-21 16:25:54 +01:00
Aleksei S
447c6e7e23 Added Disable link style
CURA-4630
2017-12-21 16:25:13 +01:00
Jack Ha
2c831ceb05 For this version, send all build plates. No print view when multiple build plates. CURA-4525 2017-12-21 15:47:40 +01:00
Lipu Fei
df1d3bf569 Add fix and doc for Mac OpenGL crash
CURA-4726
2017-12-21 15:43:35 +01:00
Jaime van Kessel
c6458358ba Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-21 15:38:17 +01:00
alekseisasin
84a24a582c
Merge pull request #2865 from Ultimaker/feature_decline_slice_info
Add button to disable sending anonymous information
2017-12-21 15:30:49 +01:00
Jaime van Kessel
b1e9e3b8fa Prevent crash if disconnect already happend
CL-541
2017-12-21 15:14:50 +01:00
Jaime van Kessel
9754aa5397 Material & hotend updated callback is enabled for LegacyUM3 again
CL-541
2017-12-21 13:16:44 +01:00
Jack Ha
c05e6b43ff Fixed platform physics. CURA-4525 2017-12-21 13:11:32 +01:00
Lipu Fei
eaa27114c6 Fix ID changing in project loading 2017-12-21 12:43:50 +01:00
Jack Ha
a47107448e Moved objects menu to lower left and made it collapsible. CURA-4525 2017-12-21 11:39:37 +01:00
Jack Ha
5152b2ae65 Solved merge conflicts. CURA-4525 2017-12-21 10:52:51 +01:00
alekseisasin
d7146a90f5
Merge branch 'master' into feature_decline_slice_info 2017-12-21 10:24:35 +01:00