7343 commits

Author	SHA1	Message	Date
Ghostkeeper	31330d07f3	Update French translations ... Our French reseller took a look at our translations and made some improvements. Some are for the worse, so I'm making corrections. Contributes to issue CURA-4883.	2018-02-14 09:39:23 +01:00
Mark	b531c0550d	Change Math.floor to Math.round as a last try to fix garbled fonts ... CURA-4941	2018-02-14 09:28:47 +01:00
Ian Paschal	4d3f7d098f	Merge pull request #3299 from Ultimaker/feature_circular_prime_tower ... Circular prime tower functionality Looks good Diego!	2018-02-13 16:01:02 +01:00
Ghostkeeper	c167325b3d	Simplify translation of printer and variant ... The key-replacements are always in the same place regardless of translation. A translator can't put them before their translation any more now. But it greatly reduces the confusion among translators and produces fewer strings to translate. Contributes to issue CURA-4883.	2018-02-13 15:57:32 +01:00
Ghostkeeper	f91c990fed	Streamline usage of g-code (vs. GCode, Gcode, G-code, gcode, etc.) ... This makes it all the same. It is something that came up in our translation pass this time. Contributes to issue CURA-4883.	2018-02-13 15:50:59 +01:00
Ghostkeeper	a792fc59eb	Fix headers ... Some of these had already been bad for a while. Contributes to issue CURA-4883.	2018-02-13 15:25:46 +01:00
Ghostkeeper	0a52818bd2	Update Japanese translations ... Our Japanese reseller did a pass on our translations and came up with a few improvements. Contributes to issue CURA-4883.	2018-02-13 15:25:46 +01:00
Ghostkeeper	03b79268ff	Corrections to Italian translations ... Some mistakes that I found. Contributes to issue CURA-4883.	2018-02-13 15:25:46 +01:00
Ghostkeeper	31db802c35	Update Italian translations ... This is an improvement suggested by our Italian distributor. Contributes to issue CURA-4883.	2018-02-13 15:25:46 +01:00
Mark	12b2348309	Revert "Use QTQuick 2.2 to fix garbled fonts" ... This reverts commit 0d5bb952ef.	2018-02-13 14:37:05 +01:00
Diego Prado Gesto	18ef3cfc69	CURA-4320 Adjust prime tower settings' formulas for calculating values ... and maximum warning.	2018-02-13 13:16:32 +01:00
Ghostkeeper	b9205ac19e	Update headers for Brazillian and German translations ... So they say that they are for 3.2. Contributes to issue CURA-4883.	2018-02-13 13:03:17 +01:00
Ghostkeeper	312bcb45fa	Merge branch '3.2' of https://github.com/Patola/Cura into Patola-3.2	2018-02-13 13:00:08 +01:00
Mark	0d5bb952ef	Use QTQuick 2.2 to fix garbled fonts ... CURA-4941	2018-02-13 12:42:31 +01:00
Cláudio Sampaio (Patola)	3195055282	Updated pt_BR translation strings for 3.2	2018-02-13 08:35:13 -02:00
Diego Prado Gesto	9053282e8a	CURA-4947 The value of the diameter and density were not correctly ... stored in the properties dict.	2018-02-13 11:29:32 +01:00
Mark	466926fecd	Increased the version of QtQuick	2018-02-13 11:07:14 +01:00
Mark	7493fae667	Fix to make sure margins cant have partial values ... CURA-4941	2018-02-13 07:32:10 +01:00
Mark	7ea654df3d	Fix to make sure margins cant have partial values ... CURA-4941	2018-02-13 07:31:02 +01:00
Diego Prado Gesto	c6328968db	CURA-4320 Add circular prime tower setting and draw shadow according to ... it.	2018-02-12 14:56:26 +01:00
Ghostkeeper	714c0d09b7	Merge branch '3.2'	2018-02-12 13:43:09 +01:00
Ghostkeeper	d0fdf85eb1	Revert header and copyright information ... This was changed back by the translator. I think they just had an older template where the header wasn't yet updated. Contributes to issue CURA-4883.	2018-02-12 13:42:38 +01:00
Ghostkeeper	d72b115be4	Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2	2018-02-12 13:35:46 +01:00
Ellecross	8feaab85cd	New Spanish Translations	2018-02-12 13:34:55 +01:00
Ghostkeeper	b814a13985	Remove fuzzies and correct header ... Contributes to issue CURA-4883.	2018-02-12 13:28:54 +01:00
Ghostkeeper	fa2edc5fa0	Update German translations ... Checked by a reseller of Ultimaker's in the area. Contributes to issue CURA-4883.	2018-02-12 13:27:53 +01:00
Ghostkeeper	03b4213e92	Merge branch '3.2' ... Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...	2018-02-12 13:10:24 +01:00
Ghostkeeper	669e6994d5	Update Polish translations ... We got these from Andrzej. We'll check them now and update the header. Contributes to issue CURA-4883.	2018-02-12 13:07:17 +01:00
Ghostkeeper	b9df632d3f	Update Polish translations ... We got these from Andrzej. We'll check them now and update the header. Contributes to issue CURA-4883.	2018-02-12 13:06:26 +01:00
Ian Paschal	72788445ab	Added one more floor	2018-02-12 11:49:14 +01:00
Ghostkeeper	b44854d19d	Merge branch 'pouncingiguana-master'	2018-02-12 09:44:01 +01:00
Ghostkeeper	23d96b0ba1	Decimate Rostock platform ... I decimated using the Decimate filter in Blender set to 60%, so it should be about 60% smaller. Now it becomes 800-something kilobytes, which is below the guideline of 1MB. Contributes to issue CURA-4818.	2018-02-12 09:42:41 +01:00
krios-fabteam	9ea3117d3f	fixed start/end gcode by removing unuseful lines	2018-02-12 09:34:43 +01:00
Ghostkeeper	5c89ef1840	Merge branch 'master' of https://github.com/pouncingiguana/Cura	2018-02-12 09:24:44 +01:00
Mark	461da709ff	Checked all divisions (again..) and multiplications on rounding errors ... CURA-4941	2018-02-10 12:45:36 +01:00
fieldOfView	3f9d92ade0	Remove "Search Results" item ... It makes no sense to have it; instead none of the other menuitems are selected when search results are shown.	2018-02-09 20:22:46 +01:00
fieldOfView	61bbfcda3a	Add back "custom" option to the setting visibility page	2018-02-09 19:28:00 +01:00
fieldOfView	74fe281e1d	Sync currently selected preset between visibility-page and -menu	2018-02-09 18:54:04 +01:00
Ian Paschal	276be2342e	CURA-4940 Use aluminum instead of aluminium ... 🇺🇸	2018-02-09 15:07:14 +01:00
Mark	b52bf6decf	resolve conflict	2018-02-09 13:01:56 +01:00
Mark	8fca183a5e	Fix rounding errors for garbled text ... CURA-4941	2018-02-09 11:30:56 +01:00
fieldOfView	4c1002bf47	Move setting visibility resource type from Uranium to Cura	2018-02-09 09:31:13 +01:00
fieldOfView	f79e787f2c	Refactor SettingVisibilityProfiles to SettingVisibilityPresets ... This is closer to the current Cura intend	2018-02-09 09:01:39 +01:00
fieldOfView	080979caeb	Move setting visibility presets into a model ... Handling of "Custom" is still under consideration	2018-02-08 23:07:45 +01:00
uBuild-3D	1b17aee88f	Create ubuild-3d_mr_bot_280.def.json ... Machine definition of MrBot280 3D printer by www.ubuild-3d.com Thanks	2018-02-08 19:30:14 +02:00
Ian Paschal	fbf955f3a0	Updated Noto Sans in Cura About info	2018-02-08 17:24:41 +01:00
Ian Paschal	bc849805fb	CURA-4790 Change font to Noto Sans ... Included Noto Sans Display as well for experimentation.	2018-02-08 17:23:14 +01:00
fieldOfView	872efd16b2	Fix selecting presets from menu ... Switching back to Custom is not yet implemented, and the menu selection does not yet change if the preset is changed in the preferences	2018-02-08 17:13:59 +01:00
Ian Paschal	e7e476cb15	Revert "CURA-4790 Change font to Noto Sans" ... This reverts commit 977518e824.	2018-02-08 16:50:41 +01:00
fieldOfView	69d7bf4130	Merge branch 'master' into feature_setting_visibility_profiles	2018-02-08 16:06:48 +01:00