Commit graph

2336 commits

Author SHA1 Message Date
Jaime van Kessel
a52417f420 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-20 13:59:29 +02:00
Jaime van Kessel
9ba78dec54 After deletion of material the slection is refreshed
CURA-2388
2016-09-20 13:58:44 +02:00
Tim Kuipers
1eabf85eb0 JSON fix: accidental comma 2016-09-20 13:43:02 +02:00
Tim Kuipers
6c6c1c25fd Merge branch 'outer_inset_first' of https://github.com/totalretribution/Cura into totalretribution-outer_inset_first 2016-09-20 13:35:10 +02:00
Ghostkeeper
0b0e6ed118
Hide infill settings if infill density is 0
Mostly to test, but this relation was missing anyway.

Contributes to issue CURA-2361.
2016-09-19 16:52:36 +02:00
Jaime van Kessel
f4cfe75ab1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-19 15:33:30 +02:00
Jaime van Kessel
fa97295481 Using wall_thickness of 0 now results in wall_line_count of 0 2016-09-19 15:28:13 +02:00
fieldOfView
e4cfbc8fdf Only update camera source if the camera view is showing 2016-09-19 14:34:35 +02:00
Tim Kuipers
14cd1395eb JSON fix: gcode favlour became an enum (CURA-2304) 2016-09-19 13:41:23 +02:00
Patola
73facab8a8 Add Kossel Mini printer definition
Added Kossel Mini Printer definition. It is the first delta printer working on Cura; I tested it before uploading this .def.json file and its accompanying .stl file. Works but there is some mysterious padding at the sides of the "square" (?) heated bed that disallow the part but these are not areas I configured. I approximated the round shape of the bed with 8 polygons for disallowed areas. However the square checkerboard pattern appears on top of it and it is kind of annoying, hope someone would fix this.
2016-09-16 15:51:21 -03:00
Patola
2826c3ff7a shifted platform 52mm down
Shifted platform 52mm down so that its top is at Z=0
2016-09-16 15:46:41 -03:00
Patola
61c1b87b53 Added kossel platform based on jrocholl (GPLv3)
Added a stl file for the kossel heatbed. Created from jrocholl's original STL files for kossel plastic parts (all GPLv3) and the public domain geometry from the mk_visual_calc repository.
2016-09-16 12:57:20 -03:00
TotalRetribution
ea093cfca7 Changed outer_inset_first description to use the word Walls instead of Inset. Shrunk length of Label name further. 2016-09-16 15:47:40 +01:00
Ghostkeeper
628aa70e12
Make Regular Fan Speed At Layer one-based
This coincides with the layer view, which starts counting layers at 1, not 0.

Contributes to issue CURA-2314.
2016-09-16 16:45:34 +02:00
TotalRetribution
5c75b5f370 Removed Print from outer_inset_first Label name. 2016-09-16 15:44:25 +01:00
TotalRetribution
6e041af2b1 Fixed some Grammer mistakes and changed settable_per_mesh to true. 2016-09-16 15:40:45 +01:00
Ghostkeeper
b9d7c02175
Requirement change: Layer numbers must count from 1
We now send layer numbers one higher than before, also to the back-end, and the back-end must interpret the layer number differently.

Contributes to issue CURA-2314.
2016-09-16 16:20:52 +02:00
Ghostkeeper
c461482765
Use any for boolean-or over list instead of max
Max also works because it first casts every boolean to an int and then casts the result back to boolean, but any is neater.

Contributes to issue CURA-2232.
2016-09-16 15:56:22 +02:00
Jaime van Kessel
482ea83284 Hiding a setting forces settingInheritance manager to re-evaluate
CURA-2361
2016-09-16 15:32:16 +02:00
Jaime van Kessel
4f547fff8d Category setting icon now becomes invible if clicked
CURA-2361
2016-09-16 13:58:26 +02:00
Jaime van Kessel
132ed1d258 Pressing inheritance button for category now makes all inherited children visible
CURA-2361
2016-09-16 13:10:14 +02:00
Jaime van Kessel
e3d78c17ea SettingItem now uses settingInheritanceManager for visibility check
CURA-2361
2016-09-16 11:22:50 +02:00
Jaime van Kessel
e282e35b9c Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-16 11:19:19 +02:00
Jaime van Kessel
5d84490d70 SettingInheritance manager now has a complete list of all settings that have inheritance overridden
CURA-2361
2016-09-16 11:18:20 +02:00
Ghostkeeper
c7b5a0afb3
Improve inheritance of fan speed at height
It compensates for the '- layer_height_0' by adding +1 back after the division. Also use floor, since I find that more intuitive since the break points come up at exactly the slice heights instead of at 0.25, 0.35, 0.45, etc.

Contributes to issue CURA-2314.
2016-09-16 11:09:18 +02:00
TotalRetribution
54e8f34311 Moved outer_inset_first setting in fdmprinter.def.json to the shell category just above Alternate Extra Wall as per BagelOrb suggestion. 2016-09-16 09:57:39 +01:00
Jaime van Kessel
50f7c41ae4 Added SettingsInheritanceManager
CURA-2361
2016-09-16 09:38:52 +02:00
nickthetait
4ffcabd856 Standardize formatting of fdmprinter definition
Used custom settings in JSON Editor Plugin for Eclipse and afterwards removed some extra whitespace changes that are not desired
Fixes github #980
2016-09-15 09:11:46 -06:00
Jack Ha
effddcbc5e Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-15 15:30:16 +02:00
Jack Ha
5c553d7bcd Fix custom profile visibility for different variants, materials and machines. CURA-2248 2016-09-15 15:29:57 +02:00
TotalRetribution
76075c53cf Added setting outer_inset_first to experimental category in fdmprinter.def.json 2016-09-15 14:04:26 +01:00
fieldOfView
7ab7b2f561 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-15 14:44:55 +02:00
fieldOfView
04ce21d48e Only show additional components info for the currently active printer
CURA-2276
2016-09-15 14:44:40 +02:00
Arjen Hiemstra
d0ad654108 Re-enable selectMultiple for the open file dialog
Fixes CURA-2198
2016-09-15 13:40:25 +02:00
fieldOfView
0af26cc4a7 Prevent qml warning when no printer is connected 2016-09-15 13:15:19 +02:00
fieldOfView
790ad4a09e Show simple extruder names in Printers menu 2016-09-15 10:20:25 +02:00
fieldOfView
cf7a6730d1 Add a menuitem to load the nozzle/material loaded on the printer
CURA-2276
2016-09-14 17:39:49 +02:00
fieldOfView
a47ffb2288 Remove commented out code 2016-09-14 14:57:26 +02:00
fieldOfView
549766e5f6 Fix layout of buttons on profile page
CURA-2368
2016-09-14 14:15:34 +02:00
fieldOfView
ab50ac0d89 Don't show possibly incorrect materials in print monitor 2016-09-14 13:59:00 +02:00
Jaime van Kessel
8b71364ee8 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-14 11:44:41 +02:00
Jaime van Kessel
e12acb8110 We now remove all material containers instead of the active machine variant
CURA-2210
2016-09-14 11:44:08 +02:00
Ghostkeeper
0c760d04d3
Update translation template
A string freeze is in effect now.

Contributes to issue CURA-570.
2016-09-14 11:23:51 +02:00
Tim Kuipers
479f9ea6d2 refactor: global_inherits_stack ==> limit_to_extruder (CURA-2308) 2016-09-14 10:46:57 +02:00
fieldOfView
e43dbcd0b7 Code style
CURA-2235
2016-09-14 09:37:53 +02:00
fieldOfView
6334f74fc6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-14 08:52:05 +02:00
fieldOfView
21e413ca4f Hide extruder, nozzle & material selection in Print Monitor 2016-09-14 08:19:57 +02:00
fieldOfView
e422eb6ee5 Fix sidebar height when switching to UM2
When switching from a multiextrusion printer to the UM2, sometimes too much whitespace would be left for the sidebar header
2016-09-14 08:15:43 +02:00
Jaime van Kessel
4d84584f59 Simplified statement as per review
CURA-2271
2016-09-13 17:31:15 +02:00
Tim Kuipers
ad91c71c2b Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-13 16:45:45 +02:00