10275 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ghostkeeper	45673a3586	Fixes to Dutch translations ... Some consistency fixes and several places where they misunderstood the meaning of a text. Contributes to issue CURA-4113.	2017-08-14 17:30:14 +02:00
Ghostkeeper	92f5a4c392	Update Dutch translations ... There's several mistakes in these translations. I'm fixing those in the next commit to keep it separate. Contributes to issue CURA-4113.	2017-08-14 17:30:14 +02:00
Ghostkeeper	673e281e4d	Fix XML tags in Turkish translation ... Bad, BAD translator! Contributes to issue CURA-4113.	2017-08-14 17:30:14 +02:00
Ghostkeeper	7682ffad08	Update Turkish translations ... Some of these are plain wrong. We'll fix those in the next commit. Contributes to issue CURA-4113.	2017-08-14 17:30:14 +02:00
Ghostkeeper	fa49c7a939	Update Japanese translations ... These are the new texts for 2.7. Contributes to issue CURA-4113.	2017-08-14 17:30:14 +02:00
Tim Kuipers	1d5cc92e47	Merge branch 'remove_some_zags'	2017-08-14 16:11:44 +02:00
Tim Kuipers	317de1c75d	update support_skip_zag_per_mm default value (CURA-3957)	2017-08-14 15:58:03 +02:00
Tim Kuipers	c2ac731324	update support_skip_zag_per_mm description and default value (CURA-3957)	2017-08-14 15:49:16 +02:00
Lipu Fei	67f820af04	Pass tray_icon_name to QtApplication ... CURA-4032	2017-08-14 15:26:17 +02:00
alekseisasin	bc4b1d9c4d	Merge remote-tracking branch 'origin/2.7'	2017-08-14 15:11:33 +02:00
alekseisasin	e88f74fe5a	Merge branch 'master' of github.com:Ultimaker/cura	2017-08-14 15:07:59 +02:00
Ghostkeeper	6349f1b5e6	Add context for 'Browse plugins' translated text ... So that the translator knows what sort of text this is. It's the menu item in the application menu. Contributes to issue CURA-4113.	2017-08-14 14:55:50 +02:00
Ghostkeeper	3316f3aa13	Add warning contexts to not translate XML tags ... This went wrong a few times with previous translations. Let's hope that this prevents it from happening again. Contributes to issue CURA-4113.	2017-08-14 14:06:20 +02:00
alekseisasin	160f21cdac	Merge branch 'feature_move_printing_time'	2017-08-14 13:55:18 +02:00
Ghostkeeper	7ab6a551c1	Clarify that XML material tags don't get translated ... Some of the translators got this wrong last time. Let's see how good they read this next time... Contributes to issue CURA-4113.	2017-08-14 13:54:11 +02:00
Lipu Fei	dce575f661	Remove wall_extruder_nr from ExtruderManager.getUsedExtruderStacks ... CURA-4145	2017-08-14 13:39:56 +02:00
Lipu Fei	2a695517f7	Remove wall_extruder_nr from fdmprinter ... CURA-4145 - Remove "wall_extruder_nr" - Remove all "limit_to_extruder" for all parent wall settings - Change settings that used to depend on the wall extruder to get value from the inner wall extruder	2017-08-14 13:21:26 +02:00
alekseisasin	a4ddd28e8f	Removed gap between material length and it's measuring unit ... feature_move_printing_time	2017-08-14 13:09:31 +02:00
Ghostkeeper	5866b759a8	Move material estimate properties to sidebar as well ... That's where they are used after all. Contributes to issue CURA-4149.	2017-08-14 12:06:03 +02:00
Ghostkeeper	5423228e02	Revert "Revert "Add settings for skipping some zags"" ... This reverts commit cc26d52af32d7917735387b10f89dc3bebbde281.	2017-08-14 11:09:14 +02:00
Ghostkeeper	f1322d1656	Merge branch '2.7'	2017-08-14 11:09:03 +02:00
Ghostkeeper	cc26d52af3	Revert "Add settings for skipping some zags" ... This reverts commit a0e59dd6aa88da5d2e73c5611421c7924e6209f9.	2017-08-14 11:08:28 +02:00
Ghostkeeper	019b5852ab	Merge branch '2.7'	2017-08-14 11:02:48 +02:00
Ghostkeeper	70a0a6ef1c	Fix infill before walls check ... This could be dependent on either the inner or the outer wall, depending on how many walls you have. However usually it will be the inner wall. Contributes to issue CURA-4145.	2017-08-14 11:02:32 +02:00
Ghostkeeper	6a4329c1a0	Align progress bar and save button better ... So that they don't overlap with the now larger fonts and such. Contributes to issue CURA-4149.	2017-08-14 10:36:39 +02:00
Ghostkeeper	addf6429e5	Adjust font sizes of time/material estimates ... Emphasize the time estimate. Contributes to issue CURA-4149.	2017-08-14 09:45:12 +02:00
Ghostkeeper	bff00d41d0	Add description for print time ... It looks a bit weird right below the print time but we'll discuss that later. Contributes to issue CURA-4149.	2017-08-14 09:42:46 +02:00
Ghostkeeper	454293f926	Remove superfluous rectangles ... There's only one item in there. It makes no sense to group them by rows and that only makes the bindings more complicated. Contributes to issue CURA-4149.	2017-08-14 09:38:40 +02:00
Ghostkeeper	e514a9f474	Fix some binding loops ... Contributes to issue CURA-4149.	2017-08-14 09:34:52 +02:00
Ghostkeeper	c4305c7b1e	Rearrange and align time/material estimates ... They look correct now but the log says there is a binding loop in here. We'll fix that next. Contributes to issue CURA-4149.	2017-08-14 09:23:56 +02:00
Ghostkeeper	fb3a0b701c	Remove superfluous item ... This item was just transparently being the same size as its parent, no ID or nothing. We can just remove it. Contributes to issue CURA-4149.	2017-08-14 09:12:21 +02:00
Ghostkeeper	0430a274d9	Make slicing status text smaller ... Makes more room for the time/material estimates. Contributes to issue CURA-4149.	2017-08-14 09:10:35 +02:00
Ghostkeeper	067449192a	Move time/material estimates code to sidebar ... It sort of works but is aligned all wrong right now. Contributes to issue CURA-4149.	2017-08-14 09:04:26 +02:00
Lipu Fei	bb1316fc88	Check if a material is being used based on base_file ... CURA-4129	2017-08-14 08:48:07 +02:00
Thomas Karl Pietrowski	599009f176	PluginBrowser: Send also OS and architecture ... Orientated a bit on the way how browsers are sending their strings. No idea, whether there is a standard on this or not. Needs to be discussed I guess..	2017-08-13 19:31:39 +02:00
probonopd	6e3e310528	Remove WirelessPrinting Plugin ... WirelessPrinting now uses a subset of the OctoPrint protocol because this is supported by Cura by default now	2017-08-11 23:29:08 +02:00
Ghostkeeper	d9e1154cc3	Merge branch '2.7'	2017-08-11 16:57:34 +02:00
Ghostkeeper	0b19b20c24	Fix language metadata ... For some reason PoEdit seems to automatically put this back every time. Maybe it's time to switch to a different standard. Contributes to issue CURA-4113.	2017-08-11 16:57:14 +02:00
Ghostkeeper	9243444c0e	Merge branch 'halfakop-2.7' into 2.7	2017-08-11 16:55:51 +02:00
Ghostkeeper	23aeb7efa8	Merge branch '2.7' of https://github.com/halfakop/Cura into halfakop-2.7	2017-08-11 16:55:29 +02:00
Ghostkeeper	0528a03363	Merge branch '2.7'	2017-08-11 16:23:58 +02:00
Ghostkeeper	5416504fcb	Update Korean translations ... These files are directly copied from the translator. They seem to be perfect though so I don't see a reason to modify them further (apart from the fact that I don't know any Korean; the format is correct though). Contributes to issue CURA-4113.	2017-08-11 16:19:49 +02:00
Ghostkeeper	4728f31996	Merge branch '2.7'	2017-08-11 12:38:49 +02:00
Ghostkeeper	824849a878	Make manufacturer for base fdm- definitions unknown ... They are always overwritten, but if it isn't overwritten we don't know the manufacturer for the printer. Contributes to issue CURA-4159.	2017-08-11 12:38:34 +02:00
Lipu Fei	3e870d2e40	Always update raft thickness and extra z clearance before rebuilding the build volume ... CURA-4154	2017-08-11 12:27:45 +02:00
KEMIQ 3D	f3af7655d1	Update kemiq_q2_gama_pla_low.inst.cfg ... Removed extra empty files at the end of the file and changed adhesion_type	2017-08-11 13:10:47 +03:00
KEMIQ 3D	d71afa6ef6	Update kemiq_q2_gama_pla_draft.inst.cfg ... Changed build adhesion type value	2017-08-11 13:08:32 +03:00
KEMIQ 3D	6b88b12605	Update kemiq_q2_gama_pla_draft.inst.cfg ... Removed extra empty files at the end of the file	2017-08-11 13:02:15 +03:00
KEMIQ 3D	7a9d3ba41e	Update kemiq_q2_beta_pla_extra_fine ... Removed extra empty lines at the end of the file	2017-08-11 12:58:44 +03:00
KEMIQ 3D	68c0b28f98	Update kemiq_q2_beta_pla_fine.inst.cfg ... Removed extra empty lines at the end of the file	2017-08-11 12:56:51 +03:00