13581 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Ghostkeeper	6eeaab3c12	Add plug-in locations with different lib suffixes ... Or suffices if you want to go the Latin way. Fixes #3195.	2018-02-13 11:45:49 +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	488d310643	CURA-4320 Add the new setting to the tower's settings list so the ... buildvolume reacts to its changes.	2018-02-12 15:03:03 +01:00
Ian Paschal	2964bedc28	CURA-4891 ... Scan for 'ultimaker' in the name. If found, add 'UM' to abbreviation, and scan again for a number after 'ultimaker' (e.g. 'ultimaker3'). If found, add the number as well. If 'ultimaker' is not found, take either the first 4 letters of the name or first letter.	2018-02-12 14:58:55 +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
Ian Paschal	7273ecfee8	Merge branch 'master' of https://github.com/Ultimaker/Cura	2018-02-12 13:11:50 +01:00
Ian Paschal	f91ed67db0	Added wiki reference	2018-02-12 13:11:45 +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
Ghostkeeper	fb0eda72b9	Change tabs into spaces ... As per our code style.	2018-02-12 11:59:46 +01:00
Ghostkeeper	75265911d4	Add option to pause at layer ... Fixes #3172.	2018-02-12 11:59:22 +01:00
Ian Paschal	9b82d26344	Merge pull request #3279 from Ultimaker/fix_garbled_fonts_4 ... Checked all divisions (again..) and multiplications on rounding errors	2018-02-12 11:49:50 +01:00
Ian Paschal	72788445ab	Added one more floor	2018-02-12 11:49:14 +01:00
Ghostkeeper	afeea6e214	Don't interrupt loading scripts when one error occurs ... Instead of breaking the loading of the rest of the scripts, just don't load this particular one.	2018-02-12 11:23:43 +01:00
Ghostkeeper	b8fce75dac	Track index instead of finding it back later ... It has to iterate over all layers and do string comparison to find the index back. Instead we just keep track of the index so this should improve performance a bit.	2018-02-12 11:12:55 +01:00
Ghostkeeper	80b99e0323	Use double quotes instead of single quotes ... As per our code style. It doesn't say anything about single-character strings in particular.	2018-02-12 11:10:57 +01:00
Ghostkeeper	0e23fb15af	Don't skip the first layer	2018-02-12 11:07:15 +01:00
Ghostkeeper	cfdde8dd07	Simplify indentation of pause at height script ... Instead of making lots of nested if statements, use the if statements as an interruption check. This reduces the indentation a lot and makes it easier to read in my opinion. It also makes it easier to add stuff to these checks.	2018-02-12 11:06:17 +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
Ian Paschal	20c448a716	Merge pull request #3270 from Ultimaker/fix_garbled_fonts_part_3 ... Fix rounding errors for garbled text	2018-02-09 12:01:19 +01:00
Mark	8fca183a5e	Fix rounding errors for garbled text ... CURA-4941	2018-02-09 11:30:56 +01:00
Ghostkeeper	183792ae09	Change 'Tweak' into 'Change' and 'tw@' into 'ch@' ... Also in the resulting g-code. Contributes to issue CURA-4615.	2018-02-09 10:55:50 +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