Commit graph

6996 commits

Author SHA1 Message Date
Jaime van Kessel
ddd4a46e76 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-19 12:42:21 +02:00
Jaime van Kessel
75c788c31a Moved check for top container setting function up in the code
Should improve performance a bit. CURA-2361
2016-09-19 12:40:05 +02:00
Jaime van Kessel
642b6b1ca3 Updated documentation
CURA-2361
2016-09-19 12:37:13 +02:00
Jaime van Kessel
66b22134ba Always hide progress message if connection is lost 2016-09-19 11:31:20 +02:00
Jaime van Kessel
27d017b29e Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-19 11:30:30 +02:00
Jaime van Kessel
e388b8126b No longer re-create zeroConf object, as this crashes
CURA-2393
2016-09-19 11:29:57 +02:00
fieldOfView
52b8901b66 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-19 11:23:57 +02:00
fieldOfView
538a35f81c Add "Repetier" as a GCode flavor option
The "UltiGCode" and "Reprap (Marlin/Sprinter)" options are not translated, to "Repetier" does not need translation either (?).

CURA-2304
2016-09-19 11:23:40 +02:00
fieldOfView
d980f6b792 Code style
CURA-2277/CURA-2276
2016-09-19 10:26:25 +02:00
Thomas Karl Pietrowski
8366cb8c9b CURA-1852: Removing TODO
Removed the TODO tag, but left a little comment about what is happening in the following section.
2016-09-19 09:50:09 +02:00
Ghostkeeper
1f8f7ea22d Merge pull request #1003 from Patola/master
Added kossel platform based on jrocholl (GPLv3)
2016-09-19 09:49:38 +02:00
fieldOfView
24cd26b37e Show mjpg stream instead of slideshow
CURA-2411
2016-09-19 08:40:29 +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
Ghostkeeper
d391639b48
Translate Fan Speed Full At Layer to one-based counting
All layer counts should increment by 1.

Contributes to issue CURA-2314.
2016-09-16 16:50:27 +02: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
Jaime van Kessel
c4d197ea8a Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-16 16:20:14 +02:00
Jaime van Kessel
7840f6a82e Increased time to 5 sec
CURA-2393
2016-09-16 16:19:20 +02:00
Ghostkeeper
fd181ca0c3
Fix display of extruder values for enums
It wasn't always a list of ints. For enums, it's a list of strings. We have several other types. Just use variant.

Contributes to issue CURA-2232.
2016-09-16 15:56:22 +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
Thomas Karl Pietrowski
755b2e61e4 CURA-1852: Sending material volumina per extruder 2016-09-16 15:16:34 +02:00
Thomas Karl Pietrowski
41248a5133 SliceInfo: Using HTTPS again
The problem seems to be related to our HTTP(S) server.
It is expected that the problem will be solved after the weekend.

Contributes to CURA-1445
2016-09-16 14:36:32 +02:00
Jaime van Kessel
6d2520ffbb _settingIsOverwritingInheritance now also checks if there is a non setting value before it
CURA-2361
2016-09-16 14:25:44 +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
7793cb16d1 Updated documentation
CURA-2361
2016-09-16 12:49:15 +02:00
Jaime van Kessel
615ec67b1b Enabled property is now taken into account for inheritance override
CURA-2361
2016-09-16 11:49:23 +02:00
Jaime van Kessel
9a7057ce65 Use recursive check to add categories to list
CURA-2361
2016-09-16 11:45:57 +02:00
Jaime van Kessel
b43a5a7e31 Change order of initialisation, so we don't overwrite list with empty data
CURA-2361
2016-09-16 11:28:12 +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
Jaime van Kessel
84997d8c4e Update README.md 2016-09-15 18:05:12 +02:00
Jaime van Kessel
d820587069 Addded the orientation plugin 2016-09-15 18:04:48 +02:00
nickthetait
1c07ac7029 Merge branch 'um-master' into gh-issue-980 2016-09-15 09:58:51 -06:00
fieldOfView
c50cae6d28 Fix showing additional components for UM3Ex
CURA-2276 and CURA-2277
2016-09-15 17:43:25 +02:00
fieldOfView
5024581e2e Fix events for added components
Not sharing the _context variable with the machine action fixes signals and events being sent to the additional components.

CURA-2277 and CURA-2276
2016-09-15 17:42:36 +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
692eb42aa7 When switching nozzle or material, drop mismatching quality changes. CURA-2248 2016-09-15 17:05:14 +02: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