12129 Commits

Author SHA1 Message Date
Ghostkeeper
b453e0a4e7
Allow minimum layer time to be higher than the fan speed min/max threshold
Previously that wasn't possible because the division that calculated the slope of the fan speed ramping up towards the minimum layer time couldn't deal with negative values. Now it deals with that properly and in the limit the regular fan speed will be used.

Fixes #2328 and CURA-4272.
2017-12-04 11:27:37 +01:00
Andrew Donaldson
0d9f49413e Add Fedora to test for nvidia driver work around. 2017-12-04 21:16:30 +11:00
Jack Ha
44537c4ef4 Added sorting by brand to MaterialsModel.
Contributes to issue CURA-4243.
2017-12-04 11:11:57 +01:00
ChrisTerBeke
db2c3525c4 Sidebar view and controller scaffolding 2017-12-04 11:06:10 +01:00
Ghostkeeper
72c7d2bd76
Reconstruct ID for submaterials from unique base name
When you make the ID of the subprofile unique it doesn't get linked to the base profile any more since the '#2' gets put at the end.

Contributes to issue CURA-4243.
2017-12-04 11:04:28 +01:00
Ghostkeeper
bc28189ff5
Don't serialize the name of the metadata
It's being serialized in a different place.

Contributes to issue CURA-4243.
2017-12-04 10:55:30 +01:00
ChrisTerBeke
1934bdfb99 Add sidebar view object 2017-12-04 10:52:40 +01:00
ChrisTerBeke
d69e397716 Add new plugins to ignore 2017-12-04 10:31:21 +01:00
Diego Prado Gesto
288aba0ec4 CURA-4667 Fix simulation view render race. Change the place where the
layer data is reset.
2017-12-04 10:18:53 +01:00
Mark Burton
ad4a27db3a Call resetLayerData() before adding LayerDataDecorator to scene node rather than afterwards.
This ensures that the layer data is reset before the scene is rendered.
2017-12-04 10:18:21 +01:00
Diego Prado Gesto
53b3efb9b8 Merge branch 'smartavionics-mb-fix-simulation-view-race' 2017-12-04 09:50:58 +01:00
Diego Prado Gesto
c3d9c1b3d8 CURA-4667 Fix simulation view render race. Change the place where the
layer data is reset.
2017-12-04 09:49:03 +01:00
Andreea Scorojitu
d5c55ae7d3 Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1 2017-12-04 09:34:39 +01:00
Andreea Scorojitu
184bfc9dfd Update_ChangeLog_3.1_CURA-4656 2017-12-04 09:34:30 +01:00
Mark Burton
033a4615eb Call resetLayerData() before adding LayerDataDecorator to scene node rather than afterwards.
This ensures that the layer data is reset before the scene is rendered.
2017-12-01 17:47:08 +00:00
Diego Prado Gesto
585c3e4f06 CURA-4660 Fix some mismatches between quality profiles, AA0.25 variant
and UM3 definitions.
2017-12-01 16:45:23 +01:00
Thomas Karl Pietrowski
2d619fb491
Merge pull request #5 from Ultimaker/master
Updating master
2017-12-01 16:39:49 +01:00
ChrisTerBeke
a52889a601 Update 3D viewer build volume when relevant machine settings are changed - CURA-4659 2017-12-01 16:29:42 +01:00
Ghostkeeper
083a4a8024
Rewrite cloning of materials
The original was based on reading the original file back, but that won't work if the files are provided by an arbitrary container provider. Instead we'll actually make a copy of all the profiles that need to be copied. It's much faster as well.

Contributes to issue CURA-4243.
2017-12-01 16:19:58 +01:00
Ghostkeeper
17ede12573
Also set base_file metadata when deserialising just metadata
Contributes to issue CURA-4243.
2017-12-01 16:07:30 +01:00
Ghostkeeper
db19f2c2e9
Merge branch '3.1' 2017-12-01 15:43:15 +01:00
Ghostkeeper
1f6510a82f
Re-enable Russian and disable Finnish
Russian has been translated by Bothof now so it's complete again. Finnish has been officially dropped now so we'll disable that language.

Contributes to issue CURA-4601.
2017-12-01 15:40:36 +01:00
Ghostkeeper
af8176d309
Merge branch 'master' of github.com:Ultimaker/Cura 2017-12-01 15:37:11 +01:00
Ghostkeeper
f03615c8a7
Merge branch '3.1' 2017-12-01 15:36:58 +01:00
Ghostkeeper
1a9112d598
Add missing layer view translation
Luckily we already have some translations which were made for other contexts. I'm assuming that the translation here doesn't really depend on the context.

Contributes to issue CURA-4601.
2017-12-01 15:33:21 +01:00
ChrisTerBeke
867836bd76
Merge pull request #2773 from fieldOfView/fix_usb_target_temperatures
Show USB target temperatures, (estimated) time and jobname
2017-12-01 15:29:37 +01:00
Ghostkeeper
317effd8f3
Uncomment translations for Layer View
The layer view was renamed back from Simulation View to layer view after the string freeze.

Contributes to issue CURA-4601.
2017-12-01 15:24:09 +01:00
Ghostkeeper
e5966de99d
Merge branch '3.1' 2017-12-01 15:13:11 +01:00
ChrisTerBeke
af2b370921
Merge pull request #2857 from fieldOfView/fix_cluster_postprocessing
Allow postprocessing before sending data to the printer
2017-12-01 15:12:53 +01:00
ChrisTerBeke
c3ddd12e16
Merge pull request #2882 from fieldOfView/fix_sidebar_estimation_tooltips
Tweak layout and alignment of print time and cost estimation
2017-12-01 15:08:37 +01:00
Ghostkeeper
62185a8ef0
Add Traditional Chinese language option
Contributes to issue CURA-4370.
2017-12-01 15:06:03 +01:00
Ghostkeeper
ffc439852f
Merge branch '3.1' 2017-12-01 15:00:34 +01:00
Ghostkeeper
378ad076b4
Merge branch 'master' of github.com:Ultimaker/Cura 2017-12-01 15:00:25 +01:00
Ghostkeeper
335f790b4e
Merge branch '3.1' of github.com:Ultimaker/Cura into 3.1 2017-12-01 15:00:01 +01:00
Ghostkeeper
7068f6c28c
Fix whitespace at the end
Otherwise gettext will complain that one of them ends with \n but the other doesn't.

Contributes to issue CURA-4601.
2017-12-01 14:59:51 +01:00
Lipu Fei
a425a1c51b Fix legacy profile loading
CURA-4075
2017-12-01 14:57:59 +01:00
ChrisTerBeke
7cc953d8e7
Merge pull request #2880 from fieldOfView/fix_machinesettings_diameter_no_materials
Hide material diameter when the machine has no materials
2017-12-01 14:56:36 +01:00
Ghostkeeper
e3b7bbb6bd
Fix whitespace at the end
Otherwise gettext will complain that one of them ends with \n but the other doesn't.

Contributes to issue CURA-4601.
2017-12-01 14:43:41 +01:00
Ghostkeeper
2236e0016d
Merge branch '3.1' 2017-12-01 14:41:41 +01:00
Dinow
c5baabd8a3
Update cura.po for 3.1 2017-12-01 14:40:51 +01:00
Dinow
4c1024fcc2
Update fdmprinter for 3.1 2017-12-01 14:40:41 +01:00
Dinow
302543cad2
update from pot files 2017-12-01 14:40:27 +01:00
Dinow
fb9645d185
import from 3.0 2017-12-01 14:40:15 +01:00
Ghostkeeper
270eec791a
Merge branch 'dinowchang-translate-zh_TW' 2017-12-01 14:38:34 +01:00
Ghostkeeper
b429966ab6
Merge branch 'translate-zh_TW' of github.com:dinowchang/Cura into dinowchang-translate-zh_TW 2017-12-01 14:37:57 +01:00
Diego Prado Gesto
21d61ce21e Fix an error that makes Cura crash when introducing commas in the
textfields in the ImageReader panel. Now it's possible to use commas xor
dots for separating decimal values.
2017-12-01 14:26:53 +01:00
ChrisTerBeke
b99ad6c93a
Merge pull request #2864 from Ultimaker/thopiekar-Ultimaker-Cura-desktop
desktop.in: Ultimaker Cura everywhere!
2017-12-01 14:04:46 +01:00
Ghostkeeper
c039535ee3
Fix retraction window of PLA and Nylon of 0.25mm profiles
This was probably caused by having wrong default profiles.

We're checking the rest of the settings again now just to be sure, because this probably has more implications elsewhere too.
2017-12-01 13:57:10 +01:00
Andreea Scorojitu
0fe51589ac Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1 2017-12-01 13:29:05 +01:00
Andreea Scorojitu
5202c8584c Update_ChangeLog_3.1_CURA-4656 2017-12-01 13:26:38 +01:00