12660 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ghostkeeper	3c32a1b0f3	Merge branch 'master' of github.com:Ultimaker/Cura	2018-02-13 15:51:14 +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
Ian Paschal	c0561bc525	CURA-4935 Can't disable sending anonymous slice data and checking updates ... This is the ~5 minute~ 3 second fix. I know it's not the more proper way to do it, but I've spent several hours on the more proper way to do it and it's causing huge amounts of headache (because, for example, the PluginBrowser installs plugins and the PluginRegistry removes them, and the PluginBrowser can't update the PluginsModel because the PluginsModel is intantiated in QML instead of in `PluginBrowser.py`, etc. etc. etc. I'm effectively doing a full refactor of this functionality while simultaneously avoiding moving any "install from remote URL" functionality into the PluginRegistry which is dumb. I'd prefer a simple, stable soution now instead of re-writing this all again. I'll make a proposal for a proper, organized refactor for Cookies & Cura.	2018-02-13 15:50:29 +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
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	7493fae667	Fix to make sure margins cant have partial values ... CURA-4941	2018-02-13 07:32:10 +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
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
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
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
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
Diego Prado Gesto	487608574a	CURA-4931 Avoid creating a snapshot when there is no model in the buildplate. Since the writeStarted signal is catched by all the Writers, the createSnapshot method is triggered, but there is no scenenode in the buildplate to take a picture of, so the process is skipped	2018-02-08 17:02:11 +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
Ian Paschal	977518e824	CURA-4790 Change font to Noto Sans ... Some weirdness still exists with pixel alignments and such. See JIRA for details.	2018-02-08 15:39:17 +01:00
Ghostkeeper	e157d8e045	Fix position of additional components ... This fixes the position when disabling auto-slice. The position of additional components was wrong, such as the post-processing button.	2018-02-08 15:02:52 +01:00
Jack Ha	8bb70d6cc2	CURA-4934 fix crash handler cleanup in some rare case	2018-02-08 14:19:47 +01:00
Jaime van Kessel	b36d3c759f	Codestyle & typing fixes	2018-02-08 11:40:23 +01:00
Jaime van Kessel	22e0c80b3d	Removed unneeded extra error check ... This caused an extra 1.5 second delay on changing machine configurations for dual extrusion machines.	2018-02-08 10:27:54 +01:00
Aleksei S	f655b0e033	Set Custom in visible setting preset ... CURA-3710	2018-02-07 16:22:13 +01:00
Jack Ha	1a44ad48a3	Merge branch 'master' of github.com:Ultimaker/Cura	2018-02-07 13:48:32 +01:00
Jack Ha	4782659569	CURA-4425 remove resolution optimization, it does not work as expected and leaves a cropped image	2018-02-07 13:48:23 +01:00
Ghostkeeper	7bbe42eb42	Remove unnecessary usage of value instead of default ... This is not really a formula.	2018-02-07 13:25:27 +01:00
Lipu Fei	ffa4df6a06	Merge 3.2 into master	2018-02-07 13:20:24 +01:00