Commit graph

11305 commits

Author SHA1 Message Date
fieldOfView
bc9d31ccbc Allow postprocessing before sending data to the printer
Fixes https://github.com/Ultimaker/Cura/issues/2855
Also see 91e8ac6868
2017-11-26 21:44:09 +01:00
Diego Prado Gesto
bf1ecba641 Add the layer thickness back to the color options in Simulation View 2017-11-24 10:54:20 +01:00
Diego Prado Gesto
1e12258f10 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-24 10:52:51 +01:00
Diego Prado Gesto
c8c2129b7e CURA-4552 Minor changes 2017-11-24 10:51:34 +01:00
Ghostkeeper
9ecfd5510a
Clarify description for when bed temperature is 0
Fixes #2674.
2017-11-24 10:42:09 +01:00
Diego Prado Gesto
0b434978dd CURA-4561 Add tooltip also to the Cancel button. 2017-11-24 10:34:38 +01:00
ChrisTerBeke
46a575b84f Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-24 10:31:30 +01:00
ChrisTerBeke
7d1db1b165 Merge branch '3.1' 2017-11-24 10:31:22 +01:00
Lipu Fei
c7667b56e2 Multiple fixes for stacks
CURA-4617
2017-11-24 09:45:59 +01:00
Diego Prado Gesto
7bb82cf56f CURA-4605 Fix render issues when importing a GCode that has empty
layers. Also fix gaps between raft and the model.
2017-11-23 16:47:34 +01:00
Lipu Fei
6b3e130349 Fix edge cases with ultimaker2 and whatever other machines that may get affected
CURA-4617
2017-11-23 16:28:36 +01:00
Diego Prado Gesto
f0dca021d8 Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1 2017-11-23 15:42:02 +01:00
Diego Prado Gesto
2c6b2b869e CURA-4605 Fix render issues when there are empty layers.
Fix layer gap when raft is enabled.
2017-11-23 15:39:22 +01:00
Lipu Fei
ef37f0d8c7 Fix project loading to reset quality if it doesn't exist
CURA-4617
2017-11-23 15:35:33 +01:00
Jack Ha
6f708fef8f Merge branch 'master' of github.com:Ultimaker/Cura 2017-11-23 15:27:32 +01:00
Jack Ha
b6410ecf12 CURA-4561 prepare button upgrades 2017-11-23 15:27:22 +01:00
Ghostkeeper
e3cdcc04fd
Document IRC channels 2017-11-23 14:57:46 +01:00
Mark
49705492ce Merge branch '3.1' 2017-11-23 14:37:31 +01:00
Jack Ha
5703f954d4 CURA-4552 fix support for relative extrusion 2017-11-23 14:13:18 +01:00
Lipu Fei
033cc4fbc7 Fix quality update in project loading
CURA-4613
2017-11-23 14:12:41 +01:00
Lipu Fei
dad2dfda89 No need to set currentItem after a material is imported
CURA-4546
2017-11-23 14:08:10 +01:00
Lipu Fei
2397b68cd7 Optimize MaterialsModel update
CURA-4546
2017-11-23 14:07:40 +01:00
Lipu Fei
1db448d7d8 Use the correct quality container for global stacks loaded from project files
CURA-4613
2017-11-23 13:04:06 +01:00
Aleksei Sasin
859dae8873 Merge branch '3.1' of https://github.com/Ultimaker/cura into 3.1 2017-11-23 12:58:09 +01:00
Aleksei Sasin
1141368682 Hide icons if monitor view is selected CURA-4527 2017-11-23 12:54:53 +01:00
Lipu Fei
17f09ec21e Fix variant/material/quality handling in stacks
CURA-4613
2017-11-23 12:46:33 +01:00
Lipu Fei
3148027fbe Fix version upgrade for quality_changes
CURA-4613

Explained in the code comments.
2017-11-23 12:43:14 +01:00
Lipu Fei
18c7a5acf3 Pass optional file_name for deserialization
CURA-4613

Some upgrades depend on the file_name, so the file_name is needed in
this case.
2017-11-23 11:28:16 +01:00
Jack Ha
f09f73a586 Merge branch '3.1' 2017-11-23 10:49:42 +01:00
jack
1b76d08f01
Merge pull request #2835 from Ultimaker/simulation_view_minor_improvements
CURA-4609 Minor improvements in Simulation View
2017-11-23 10:49:08 +01:00
Mark
835a0fb5d3 Merge branch 'master' of github.com:Ultimaker/Cura 2017-11-23 10:39:00 +01:00
Mark
aee838c8c1 Merge branch '3.1' 2017-11-23 10:38:48 +01:00
Diego Prado Gesto
b97ed4c211 CURA-4609 Minor improvements in Simulation View:
Increase simulation speed.
Hide Layer Thickness option in color scheme.
Hide nozzle when switching layers.
Set the handles in front of the view.
Name changed back to "Layer View"
2017-11-23 09:59:34 +01:00
Mark
3477b902ab
Merge pull request #2834 from Ultimaker/CURA-4527_view_orientation
Cura 4527 view orientation
2017-11-23 09:56:26 +01:00
Lipu Fei
6b132a13de
Merge pull request #2786 from 0r31/discoeasy200_profile
Improve discoeasy200 profile
2017-11-23 00:25:07 +01:00
Diego Prado Gesto
2042cdf155 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-22 20:11:24 +01:00
Diego Prado Gesto
b776afaf3d CURA-4509 Changing layout of the print time information tooltip,
now in two lines per feature. This is for avoid trimming the labels
because they depend on the language.
2017-11-22 20:09:39 +01:00
Ghostkeeper
f3da1a25fc
Merge branch '3.1' 2017-11-22 17:13:16 +01:00
Ghostkeeper
105d7a5615
Return newly added single extruder
The workspace reader needs to use it to get the correct material.

Contributes to issue CURA-4604.
2017-11-22 17:12:53 +01:00
ChrisTerBeke
fe016e336d Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1 2017-11-22 16:22:34 +01:00
ChrisTerBeke
6c3eaca0fd fix loading user changes container for single extruder machine 2017-11-22 16:22:23 +01:00
Ghostkeeper
dc105c86a0
Ignore live scripting plug-ins 2017-11-22 16:16:35 +01:00
Jack Ha
3b5ed70113 CURA-4602 Fixed active custom profile selected check 2017-11-22 16:15:06 +01:00
Lipu Fei
a7a3ba9500 Always update the job name when a project file is loaded
CURA-4553
2017-11-22 13:10:09 +01:00
Ghostkeeper
97000d8538
Merge branch '3.1' 2017-11-22 12:45:33 +01:00
Ghostkeeper
3823cca936
Disable Russian translation since it's incomplete
The maintainer of this translation didn't want to continue spending time to keep his translation up-to-date.

Contributes to issue CURA-4601.
2017-11-22 12:45:21 +01:00
Ghostkeeper
dfe29fa482
Merge branch '3.1' 2017-11-22 12:41:57 +01:00
Ghostkeeper
ffa418660a
Update Korean translations for 3.1
This adds empty translations and updates the line numbers and such. The original Korean translations for 3.0 are still retained.

Contributes to issue CURA-4601.
2017-11-22 12:41:31 +01:00
Ghostkeeper
62113df3bd
Update Korean translations with 3.0 translations
These are so wrong that Cura won't start with these translations loaded. We're asking for corrections.

Contributes to issue CURA-4601.
2017-11-22 12:41:31 +01:00
Lipu Fei
9fab4070a6 Fix quality_changes upgrade from 2.7 to 3.1 2017-11-22 12:11:18 +01:00