1857 Commits

Author	SHA1	Message	Date
Jack Ha	b8d8e4fac3	Updated changelog. CURA-3467	2017-03-20 15:17:18 +01:00
Jack Ha	48c6c523ec	Only 3mf nodes with mesh data are getting the sliceable object decorator. CURA-3559	2017-03-20 14:43:46 +01:00
Jack Ha	b21a87b25b	Fix not slicing refreshing after deleting last object from loaded project file. CURA-3559	2017-03-20 13:41:47 +01:00
Jaime van Kessel	36bcd90e08	Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5	2017-03-16 11:27:10 +01:00
Jaime van Kessel	a170624ff1	Disabled the 2.5 upgrader	2017-03-16 11:26:50 +01:00
Jack Ha	72f8a349cf	Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5	2017-03-15 14:37:13 +01:00
Jack Ha	6731d00ad7	Removed some lines from changelog.	2017-03-15 14:37:06 +01:00
Jaime van Kessel	cb40ae45e8	Added contribution of the g-code plugin to the changelog ... CURA-3467	2017-03-15 14:23:09 +01:00
Lipu Fei	18cf9e3172	CURA-3500 Make sure that material XMLs have utf-8 encoding	2017-03-15 11:47:33 +01:00
Jack Ha	0a398738b7	Merge branch '2.5' into feature_version_upgrade_2.5	2017-03-14 11:18:14 +01:00
Jack Ha	b08249b3a0	Added changelogs. CURA-3467	2017-03-14 10:43:03 +01:00
Ghostkeeper	74d6d879f7	Implement version upgrade from 2.4 to 2.5 ... The version upgrade currently only removes the setting start_layers_at_same_position. Contributes to issue CURA-3479.	2017-03-10 16:58:58 +01:00
Jaime van Kessel	d93b137c95	No longer add nodes that don't have children or MeshData ... CURA-3493	2017-03-10 15:48:29 +01:00
Jack Ha	fc8bd75ffe	Added changelog line for layerview slider.	2017-03-08 12:56:47 +01:00
Jack Ha	f47ec27014	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-07 16:44:41 +01:00
jack	07e6da71d4	Merge pull request #1501 from Ultimaker/layer_view3_layout ... Layer view3 layout: Single Slider by fieldOfView	2017-03-07 16:44:29 +01:00
Jaime van Kessel	c06ffe6cae	Moved auth state changed check to first thing set auth checks ... This should contribute to the windows authentication issues. Most windows devices seemed to get all the auth state messages twice.	2017-03-07 11:55:29 +01:00
Jack Ha	afec26eb62	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-07 11:47:25 +01:00
Jaime van Kessel	6dcd3b44b6	Removed uneeded debug code ... The method is always put, so no need to log it.	2017-03-07 11:44:40 +01:00
jack	3b1a15e1c4	Merge pull request #1495 from fieldOfView/feature_draggable_range_slider2 ... Use a single draggable range slider in Layerview	2017-03-07 11:43:17 +01:00
Jaime van Kessel	85d979cf50	Removed unneeded check from network printing. ... We used to not have a printer_state so this check was needed.	2017-03-07 11:41:18 +01:00
Jaime van Kessel	059b31b25a	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-07 11:01:59 +01:00
Jaime van Kessel	414337dead	Fixed 3mf writing ... The type hinting changes also changed the way we handle certain imports, which caused saving to fail. CURA-3215	2017-03-07 11:01:03 +01:00
Jack Ha	73dff09443	Travel moves now have a width of 0.1. CURA-3321	2017-03-07 10:47:34 +01:00
Jack Ha	efbc624ea8	More defensive setExtruderOpacity, removed unnecessary part. CURA-3321	2017-03-07 10:40:59 +01:00
Jack Ha	c10dc2f07c	Set old permissions back. CURA-3321	2017-03-07 10:36:30 +01:00
Jack Ha	42d939b34e	Solved merge conflict. CURA-3321	2017-03-07 10:34:53 +01:00
fieldOfView	34ac02f5bd	Use Pointing Rectangle for layer number indicator	2017-03-06 18:23:08 +01:00
fieldOfView	2b49484dc7	Hide the slider controls when there are no layers ... (and code cleanup)	2017-03-06 17:46:42 +01:00
fieldOfView	af265be900	Add up/down key navigation to layernum box	2017-03-06 17:27:37 +01:00
fieldOfView	d0c8b05314	Fix setting central value	2017-03-06 17:16:36 +01:00
Ghostkeeper	d1fada78e6	Merge branch '3mf_speedup'	2017-03-06 17:03:42 +01:00
fieldOfView	0fa32c3c16	Step by 10 layers with shift key down	2017-03-06 16:48:59 +01:00
fieldOfView	a6bc2b07f8	Fix setting lower value	2017-03-06 16:35:00 +01:00
Jaime van Kessel	04c2186b74	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-06 16:17:30 +01:00
fieldOfView	a664ee88b7	Fix setting upper value	2017-03-06 16:01:00 +01:00
Jaime van Kessel	356d4f9288	Heated bed timeout time now hides correctly if time ran out ... CURA-3360	2017-03-06 14:41:33 +01:00
fieldOfView	694da25bb7	Show proper values of the active handle of the slider	2017-03-06 14:35:36 +01:00
fieldOfView	a0df6bf542	Jerry-rig single slider to replace dual slider design	2017-03-06 14:33:48 +01:00
Tim Kuipers	87c8ff0e08	Merge branch 'mb-infill-line-angles' of https://github.com/smartavionics/Cura into smartavionics-mb-infill-line-angles	2017-03-06 14:31:57 +01:00
Jack Ha	b2e06bed37	Fix 'inverting slider' when switching between Layer view and a different view. CURA-3321	2017-03-06 14:03:42 +01:00
Jack Ha	1f61017946	Fix updateLegend function. CURA-3321	2017-03-06 13:20:14 +01:00
Jack Ha	1c40c94c44	Fix compatibility options. CURA-3321	2017-03-06 11:55:39 +01:00
Jaime van Kessel	433d45cdae	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-02 17:11:44 +01:00
Jaime van Kessel	bae7af1ea0	Dots in the ID no longer confuse workspace reader ... CURA-3450	2017-03-02 17:06:10 +01:00
Jack Ha	e89b1afa2c	Initial layer view color mode -> legend. CURA-3321	2017-03-02 16:55:54 +01:00
Jack Ha	bedb41b6d3	SliceInfo now only sends sliceable model hashes (layer data was also sent)	2017-03-02 16:44:40 +01:00
Jack Ha	1029fb4ddd	Not to trigger reslice happy anymore, only retrigger if necessary. Also using isSliceable instead of property check when inspecting root node. CURA-3413 CURA-3412	2017-03-02 16:38:31 +01:00
U-ULTIMAKER\j.ha	c54d5ce707	Fixed compatibility mode active extruder. CURA-3321	2017-03-02 13:15:29 +01:00
Jack Ha	bdd07bd160	Removed commented out stuff. CURA-3321	2017-03-01 14:54:12 +01:00