3097 Commits

Author SHA1 Message Date
Diego Prado Gesto
67ca4d25cd CURA-4461 Deserialize materials with buildplates compatibility 2018-01-15 11:35:17 +01:00
Diego Prado Gesto
c3c44e9ac4 Compatibility with materials and buildplates 2018-01-12 16:01:48 +01:00
Diego Prado Gesto
de98a62dc8 CURA-4461 Read buildplate id from the printer and set the automatic
option
2018-01-11 13:03:35 +01:00
Diego Prado Gesto
becb0cf7b9 CURA-4461 Add dropdown menu in the UI for selecting the buildplate if
the printer has different buildplates.
2018-01-09 15:42:10 +01:00
Diego Prado Gesto
b11b2def3e Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-01-09 10:43:42 +01:00
Diego Prado Gesto
e3e6f301f9 CURA-4778 Add up to 8 different colors when loading a GCode, since we
support up to 8 extruders in CFP
2018-01-09 10:42:03 +01:00
ChrisTerBeke
6c0fb110fe Add post processing source files 2018-01-09 10:31:12 +01:00
ChrisTerBeke
9c9c46aade Remove submodule 2018-01-09 10:30:02 +01:00
ChrisTerBeke
1f2007554d Add post processing source files to main repo 2018-01-09 10:27:28 +01:00
Aleksei S
117c467829 Fix: Per mesh setting combobox did not save selected option
CURA-4760
2018-01-09 09:39:15 +01:00
Diego Prado Gesto
0722465fb9 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-01-09 09:17:51 +01:00
Diego Prado Gesto
4c8c4c78da CURA-4772 Create a CuraSceneNode instead of a SceneNode when reading a
GCode. Avoid creating an empty CuraSceneNode if the node is already an
instance of it.
2018-01-09 09:16:21 +01:00
Lipu Fei
c8cef9583e rename scene.gcode_list to gcode_dict
CURA-4741

With the multi build plate feature, scene.gcode_list is now a dict which
stores a list of gcode for a build plate, so it makes more sense to have
it renamed to "gcode_dict" because it's not a list.
2018-01-08 16:18:41 +01:00
Jack Ha
c1cb86a334 CURA-4525 remove initial 'Unable to slice' 2018-01-08 14:00:06 +01:00
Jack Ha
86eb9c73ba CURA-4525 do not send empty build plates gcode; direct calling slice when skipping empty build plate 2018-01-08 13:41:58 +01:00
Jack Ha
52b75b58e7 CURA-4525 allow for empty build plates between filled build plates 2018-01-08 13:25:39 +01:00
Aleksei S
784a17149f Don't show save to file if not possible to slice
CURA-4525
2018-01-05 15:20:42 +01:00
Aleksei S
5dad6cab2c If the model is:some per mesh settings or outside of the buildplate show message,
CURA-4525
2018-01-05 14:00:23 +01:00
Ghostkeeper
a8ad956c92
Erase gcode of build plates that are determined to be empty
You don't want to start a new slice, but you should still erase the g-code there.

Contributes to issue CURA-4525.
2018-01-05 13:34:39 +01:00
Ghostkeeper
fefb20deb7
Don't start slicing again if you can't slice
Contributes to issue CURA-4766.
2018-01-05 13:33:40 +01:00
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
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
Lipu Fei
7c4a122767 Fix container_index for MachineSettingsAction
CURA-4708
2018-01-03 17:04:40 +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
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
Lipu Fei
2cffb1759f Revert "Version upgrade for nozzle_size"
This reverts commit 54bc7dd348d77efa7f2dc3f420200df9864b8d37.

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

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
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
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
Jack Ha
c05e6b43ff Fixed platform physics. CURA-4525 2017-12-21 13:11:32 +01:00