8156 commits

Author	SHA1	Message	Date
Aleksei Kvitinskii	c270b94ec1	added Z-Bolt printers	2019-02-05 19:57:19 +03:00
Jaime van Kessel	f2fbb4e989	Merge branch 'CURA-6174_fix_time_estimates_dark_theme' of github.com:Ultimaker/Cura into 4.0	2019-02-05 13:38:44 +01:00
Jaime van Kessel	91f90e7d40	Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0	2019-02-05 13:32:14 +01:00
Jaime van Kessel	b6f5dd8f94	Fix display of long names in sync configuration menu	2019-02-05 13:31:50 +01:00
Remco Burema	5c54cb740a	Fix dark-theme material-estimates-panel (and layout-issues). [CURA-6174]	2019-02-05 13:24:28 +01:00
Lipu Fei	4ea6e5d0df	Merge remote-tracking branch 'origin/4.0'	2019-02-05 11:40:50 +01:00
Remco Burema	8f5a34c592	Merge pull request #5181 from drzejkopf/patch-4 ... Let "retraction_combing" be overriden with "infill" as default value	2019-02-05 11:25:17 +01:00
Lipu Fei	cfdadbaffb	Merge pull request #5270 from Ultimaker/action_panel_per_stage ... Let each stage create its own action panel	2019-02-05 11:16:00 +01:00
Jaime van Kessel	d59889a4ab	Fix logo in about popup	2019-02-05 11:13:47 +01:00
Lipu Fei	7964465eb5	UM2+ do not support olsson block upgrade ... CURA-6133	2019-02-05 07:59:49 +01:00
Diego Prado Gesto	985e7b879c	Use preferred quality type instead of redefining the default value of the layer height ... Contributes to CURA-6136.	2019-02-04 19:34:38 +01:00
DragonJe	b32d296728	Update nwa3d_a5_normal.inst.cfg	2019-02-04 12:06:44 -06:00
DragonJe	4f035c556a	Update nwa3d_a5_fast.inst.cfg	2019-02-04 12:03:56 -06:00
DragonJe	9214988c7e	Update nwa3d_a5_best.inst.cfg	2019-02-04 11:59:36 -06:00
Ghostkeeper	ae5d548f02	Merge branch '4.0'	2019-02-04 16:19:14 +01:00
Ghostkeeper	7569ed9834	Another adjustment to account creation commercial text ... The marketing team wants to make this small adjustment too.	2019-02-04 16:18:54 +01:00
Ghostkeeper	185e9cc726	Fix font size of buildplate warning ... This was most likely copied from an old release but the font in question was deleted.	2019-02-04 15:24:59 +01:00
Ghostkeeper	61475a79cf	Fix font size of buildplate warning ... This was most likely copied from an old release but the font in question was deleted.	2019-02-04 15:23:57 +01:00
Ghostkeeper	a831cfa558	Configure whether preview shortcut is visible from ActionPanelWidget property ... This way it's more dynamic: You don't need to hardcode the plug-in name in the widget to see whether or not it's visible. Contributes to issue CURA-6086.	2019-02-04 15:19:09 +01:00
Ghostkeeper	5992e66ed6	Move action panel into each stage ... They can then decide if it needs to be there. For instance, the monitor stage doesn't want to have this panel. Also each stage can position it where they like, and in the near future I'll make a feature to let it decide whether or not to show the preview button. Contributes to issue CURA-6086.	2019-02-04 15:08:59 +01:00
Ghostkeeper	e7d2400199	Merge branch '4.0'	2019-02-04 13:06:32 +01:00
Ghostkeeper	7d871e5a18	Update text for pre-login screen ... This is a new text that we got from marketing.	2019-02-04 13:06:06 +01:00
Diego Prado Gesto	a09ae516f3	Fix indentation and typos	2019-02-04 09:06:49 +01:00
Diego Prado Gesto	6e976f0cc3	Merge branch 'CR-X' of https://github.com/steverc1572/Cura into steverc1572-CR-X	2019-02-04 08:50:22 +01:00
steverc1572	091416168e	Update cr-x_extruder_1.def.json	2019-02-01 20:42:41 -06:00
steverc1572	ae9075b6c1	Update cr-x_extruder_0.def.json	2019-02-01 20:42:19 -06:00
steverc1572	b32e2c75ad	Update creality cr-x.def.json ... Done the requested changes	2019-02-01 17:53:01 -06:00
Diego Prado Gesto	467b88296d	Merge branch 'CR-X' of https://github.com/steverc1572/Cura into steverc1572-CR-X	2019-02-01 17:54:35 +01:00
Lipu Fei	44f986d661	Fix combox style for support extruder in recommended ... CURA-6144	2019-02-01 13:31:23 +01:00
Jaime van Kessel	39e1dbd95f	Merge branch 'CURA-6169_dark_theme_messagebox' of github.com:Ultimaker/Cura into 4.0	2019-02-01 12:06:46 +01:00
Jaime van Kessel	4aaeb8c2d5	Merge branch 'CURA-6153_wrong_name_on_disconnect' of github.com:Ultimaker/Cura into 4.0	2019-02-01 11:54:35 +01:00
Remco Burema	203f699d0a	Override message-box bg-color in dark theme. [CURA-6169]	2019-02-01 11:24:50 +01:00
Lipu Fei	efa26c8323	Merge remote-tracking branch 'origin/4.0'	2019-02-01 11:08:33 +01:00
Lipu Fei	3dc29a8349	UM2+ do not support olsson block upgrade ... CURA-6133	2019-02-01 11:05:48 +01:00
Lipu Fei	60a4fb3151	Fix missing "group_name" renaming ... CURA-6153	2019-02-01 10:23:51 +01:00
Remco Burema	954fdb20ad	Rename 'connect_group_name' to 'group_name'. [CURA-6153]	2019-01-31 20:21:42 +01:00
Jaime van Kessel	eae8e80923	Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0	2019-01-31 17:14:28 +01:00
Jaime van Kessel	e6f722b29c	Move additional component loader into ActionPanelWidget	2019-01-31 17:13:32 +01:00
Simon Edwards	eeb23c4ba4	Merge pull request #5255 from Ultimaker/CL-1154_monitor_empty_states ... CL-1154 Monitor empty states	2019-01-31 16:44:25 +01:00
Lipu Fei	c73747ad44	Merge remote-tracking branch 'origin/4.0'	2019-01-31 14:22:59 +01:00
Ian Paschal	858e2f6b42	Add some theme dependencies ... Contributes to CL-1154	2019-01-31 10:49:33 +01:00
Lipu Fei	f0d9aa77c2	Make account button non-fixed-width ... CURA-6132	2019-01-31 09:43:33 +01:00
Lipu Fei	5a196423db	Merge remote-tracking branch 'origin/4.0'	2019-01-31 08:47:01 +01:00
Remco Burema	dcf9ce56e4	Merge pull request #5244 from Ultimaker/CURA-6115-improve-message-options ... Cura 6115 improve message options	2019-01-30 17:54:47 +01:00
Lipu Fei	8dd0f8d329	Remake: show initial if no avatar ... CURA-6132	2019-01-30 15:37:41 +01:00
Lipu Fei	de4db19234	Remake: account panel ... CURA-6132	2019-01-30 15:37:34 +01:00
Lipu Fei	784598d4a2	Remake: sign in page ... CURA-6132	2019-01-30 15:37:25 +01:00
Lipu Fei	6aebdade73	Remake: Change to "sign in" button ... CURA-6132	2019-01-30 15:37:20 +01:00
Jaime van Kessel	949a687a07	Add the logo again that I accidently deleted. ... Derp	2019-01-30 14:51:47 +01:00
Jaime van Kessel	969ed6409c	Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0	2019-01-30 13:37:34 +01:00