10639 Commits

Author SHA1 Message Date
fieldOfView
8d72ba5fe7 Fix setting material of non-active extruder through menu 2017-08-08 11:32:34 +02:00
fieldOfView
975e7f04b4 Remove unused incorrect code
The property is called activeMaterialIds, but it returns the stack ids. The code is superceeded by allActiveMaterialIds.
2017-08-08 11:27:45 +02:00
Lipu Fei
4a34f141d1 Check if a material container is used by GUID
CURA-4129

isContainerUsed() is used to enable/disable the "Remove" button on the
Material Manager dialog. When a custom material is created, it creates
multiple containers, one for each extruder variant. In the dialog, it
only checks if the material for the currently active extruder is being
used or not. This causes a problem when 2 extruders are of different
types and one uses a custom material. Then, the "Remove" button will
not be correctly enabled/disable in the Material Manager dialog when
the other extruder is activated.
2017-08-07 13:17:47 +02:00
Ghostkeeper
80cbdd03bb
Merge branch '2.7' 2017-08-07 11:06:12 +02:00
Ghostkeeper
ac5c0d019b
Minor fixes to Polish translation
Contributes to issue CURA-4113.
2017-08-07 11:06:00 +02:00
Lipu Fei
09576241db Generate unique names for definition changes containers
CURA-4107
2017-08-07 10:59:24 +02:00
Lipu Fei
76e8090dbd Remove duplicated function createDefinitionChangesContainer()
CURA-4107
2017-08-07 10:59:24 +02:00
Ghostkeeper
e23e049c22
Update Polish translations for 2.7
These are the translation files exactly as I got them from Jagus85. Thanks!

Contributes to issue CURA-4113.
2017-08-07 10:58:46 +02:00
Lipu Fei
3bc7e9012d Use the right stack to retrieve infill values in Recommended mode
CURA-3932
2017-08-07 10:53:19 +02:00
Ghostkeeper
cf1309c650
Don't update next stack if there is no next stack
Not all extruder stacks have a next stack. Well currently every extruder stack should have a next stack, but the code is built around the possibility that there isn't a next stack elsewhere too.

Contributes to issue CURA-4121.
2017-08-07 09:47:53 +02:00
Ghostkeeper
584e1b6abb
Set the next stack before adding the user container
Since the user container may trigger a propertyChanged signal, which then requests the next stack.

Contributes to issue CURA-4121.
2017-08-07 09:45:16 +02:00
Lipu Fei
b274f63df0 Use the right stack to retrieve infill values in Recommended mode
CURA-3932
2017-08-04 14:19:14 +02:00
Lipu Fei
7cb8e675cf Remove redundant createDefinitionChangesContainer() in UMOUpgradeSelection 2017-08-04 11:14:56 +02:00
Ghostkeeper
c7c54f6d3a
Add test to ensure that UM3 and UM3E variants are kept the same
It's a bit chunky, but functional.
2017-08-04 00:50:42 +02:00
Lipu Fei
b4be6fcb9f Use Label for LayerView legend texts
CURA-3799
2017-08-03 16:18:58 +02:00
Ghostkeeper
9837537120
Merge branch '2.7' 2017-08-03 15:55:08 +02:00
Ghostkeeper
d85fd63795
Mention Neotko as the originator of Ironing
As promised.

Contributes to issue CURA-4114.
2017-08-03 15:53:32 +02:00
alekseisasin
c5cdf2e206 UM3 Initial layer speed is fixed 20
CURA-3377
2017-08-03 15:19:17 +02:00
alekseisasin
03c48ac39c Addded other printer "Kemiq Q2 Gamma & Beta" and material quality
CURA-4086
2017-08-03 15:05:45 +02:00
alekseisasin
543fda4656 Merge pull request #2136 from kemiq3d/master
Add Kemiq Q2 Beta and Kemiq Q2 Gama definitions, mesh and qualities
2017-08-03 15:04:35 +02:00
alekseisasin
2990333d1d
Updated the Change log (added 2.6.2 and 2.7.0)
CURA-4114
2017-08-03 14:00:55 +02:00
Lipu Fei
f5c1bd6abd Add unit "mm" for Support Chunk Size
CURA-3957
2017-08-03 13:55:52 +02:00
Lipu Fei
8029efdffb Rename skip-some-zags setting names
CURA-3957
2017-08-03 13:55:24 +02:00
alekseisasin
c4d23437f2 Updated the Change log (added 2.6.2 and 2.7.0)
CURA-4114
2017-08-03 13:19:49 +02:00
Lipu Fei
50960a3904 Merge branch 'master' into remove_some_zags 2017-08-03 13:10:39 +02:00
Lipu Fei
ddee562129
Fix typo in LayerView.qml
CURA-3799
2017-08-03 13:06:20 +02:00
alekseisasin
b984b99c30
Translated text overlaps GUI
CURA-3799
2017-08-03 13:05:53 +02:00
alekseisasin
3cbf0640a5 Added method to close the application (after clicking quit button) to prevent loss of custom material
CURA-3298
2017-08-03 11:57:27 +02:00
fieldOfView
92859697c5 Fix error about empty qml url 2017-08-03 10:57:47 +02:00
fieldOfView
4d88d56ebf Make sure camera image does not overlap topbar 2017-08-03 10:57:03 +02:00
fieldOfView
d6d4617356 Resize camera image to fit small windows if necessary 2017-08-03 10:56:21 +02:00
alekseisasin
2a5ac4c4da UM3 Initial layer speed is fixed 20
CURA-3377
2017-08-03 09:57:27 +02:00
Ghostkeeper
e5b52793b0
Merge branch '2.7' 2017-08-03 09:51:48 +02:00
Ghostkeeper
c010f3203c
Sync UM3 extended variants with UM3
They should always be the same.

Contributes to issue CURA-3377.
2017-08-03 09:31:00 +02:00
Ghostkeeper
e0b39800a2
Update translations with empty strings from new templates
These are generated using 'make i18n-update-po'.

Contributes to issue CURA-4113.
2017-08-02 17:26:52 +02:00
Ghostkeeper
f95c28c413
Update English translation
This translation is auto-generated. It is a transparent translation that just copies the developer English.

Contributes to issue CURA-4113.
2017-08-02 17:26:52 +02:00
Ghostkeeper
f892c82b7c
Update translation templates for Cura
These are generated using 'make extract-messages'

Contributes to issue CURA-4113.
2017-08-02 17:26:52 +02:00
Arjen Hiemstra
6db55cea64 Merge branch '2.7' 2017-08-02 16:50:35 +02:00
Arjen Hiemstra
103f880d0a Properly quote CMake arguments that may contain spaces on Windows 2017-08-02 16:43:42 +02:00
Arjen Hiemstra
7b3290213a Add missing " sign 2017-08-02 16:41:51 +02:00
Arjen Hiemstra
07ff4054e9 Fall back properly if the build env for a specific branch does not exist
Otherwise we will always need to create branches for
cura-build-environment. In addition, we can now create build-specific
branches if needed.
2017-08-02 16:38:39 +02:00
alekseisasin
153d1f2d0c Added method to close the application (after clicking quit button) to prevent loss of custom material
CURA-3298
2017-08-02 16:32:09 +02:00
Ghostkeeper
b43acf5b18
Revert "Revert "Revert "feat: Skin Reference wall settings (CURA-3990)"""
This reverts commit 0d4604bb0c4eab56864b87f1b40c1d86b83efae5.
2017-08-02 11:02:14 +02:00
Ghostkeeper
6e97b5003d
Revert "Revert "Revert "better description skin reference wall settings (CURA-3990)"""
This reverts commit f39fd47b6c7dc6cc8bd6598cd450505742ff5e01.
2017-08-02 11:02:02 +02:00
Ghostkeeper
8b77465127
Revert "fix: set default of bottom reference wall to legacy behavior (CURA-3990 CURA-4103)"
This reverts commit ce13e84bd03478bf2913eaa7e3ed97a04c8fd3c1.
2017-08-02 11:00:26 +02:00
Lipu Fei
3ffa274050 Fix typo in LayerView.qml
CURA-3799
2017-08-02 10:24:28 +02:00
Lipu Fei
f95bd1b47f Generate unique names for definition changes containers
CURA-4107
2017-08-02 08:58:19 +02:00
Lipu Fei
6e06837084 Remove duplicated function createDefinitionChangesContainer()
CURA-4107
2017-08-02 08:50:32 +02:00
Lipu Fei
05d7e15d4c Merge remote-tracking branch 'upstream/2.7' 2017-08-02 08:48:15 +02:00
alekseisasin
f381dd8c4d Merge branch 'master' of github.com:Ultimaker/cura 2017-08-01 15:55:49 +02:00