Jaime van Kessel
0f00895a97
Code cleanup
...
CURA-3858
2017-06-29 14:57:19 +02:00
Jaime van Kessel
abae2cc28c
Moved SliceInfoJob to it's own file
...
CURA-3858
2017-06-29 14:54:49 +02:00
Ghostkeeper
c7120dddda
Don't allow changing the default printing temperature per mesh
...
The printing temperature is not settable per mesh. The default printing temperature shouldn't be either.
2017-06-29 14:16:02 +02:00
Ghostkeeper
53e35daf02
Merge branch 'master' of github.com:Ultimaker/Cura
2017-06-29 13:45:02 +02:00
Jaime van Kessel
a89e626dfa
Merge branch 'master' of github.com:Ultimaker/Cura
2017-06-29 10:16:14 +02:00
Jaime van Kessel
13f3477288
Fixed crash when adding a single extrusion printer
...
CURA-3980
2017-06-29 10:15:29 +02:00
Ghostkeeper
ab384ba8ec
Rename and invert moving disallowed areas metadata property
...
It's more easy semantically to invert this, to prevent the double negatives.
Contributes to issue CURA-3663.
2017-06-28 17:16:27 +02:00
Ghostkeeper
16564b3194
Merge branch 'master' of github.com:Ultimaker/Cura
2017-06-28 15:54:27 +02:00
Jaime van Kessel
e9d2434c41
Simplify text generaton for download button
...
CURA-3856
2017-06-28 15:35:13 +02:00
Jaime van Kessel
4a5b1d0760
Merge branch 'feature_xy_offset_layer_0' of https://github.com/fieldOfView/Cura
2017-06-28 15:16:18 +02:00
Ghostkeeper
ede4780835
Merge branch 'master' of github.com:Ultimaker/Cura
2017-06-28 14:27:12 +02:00
Jaime van Kessel
f791017091
Revert "Added the no-nozzle offset for all polygons"
...
This reverts commit 45eb301f9b3e32f36b4fcfe2777bc3f9f177949d.
2017-06-28 14:20:12 +02:00
Jaime van Kessel
e391d5c753
Merge branch 'master' of github.com:Ultimaker/Cura
2017-06-28 13:56:45 +02:00
Jaime van Kessel
45eb301f9b
Added the no-nozzle offset for all polygons
...
CURA-3663
2017-06-28 13:55:45 +02:00
Ghostkeeper
cd4bffb380
Set author to Ultimaker B.V. instead of Ultimaker
...
To be consistent with the rest of the plug-ins and with the material files.
Contributes to issue CURA-3857.
2017-06-28 13:50:37 +02:00
PCDotFan
57503439dd
Merge remote-tracking branch 'Ultimaker/master'
2017-06-28 18:32:14 +08:00
Ghostkeeper
2a593e316b
Close camera upon disconnecting instead of relying on Uranium to do that
...
Uranium shouldn't know about no camera.
2017-06-28 11:51:12 +02:00
fieldOfView
20b2a3dc81
Improve description for xy_offset_layer_0
2017-06-28 11:48:16 +02:00
fieldOfView
39cb68bd30
Update convex hull to account for first layer horizontal expansion
2017-06-28 11:41:51 +02:00
Jaime van Kessel
b7165ad41d
Merge branch '2.6' of github.com:Ultimaker/Cura
2017-06-28 10:56:43 +02:00
MaukCC
8313246c1c
Merge pull request #6 from Ultimaker/master
...
Update
2017-06-28 10:11:44 +02:00
Ghostkeeper
fb1d7bc223
Fix direction of Y-offset in disallowed areas
...
The front end has inverted Y with respect to the g-code. The prime position was correctly inverted but the nozzle offset wasn't.
2017-06-28 09:23:14 +02:00
PCDotFan
ef6945b14a
Merge remote-tracking branch 'Ultimaker/master'
2017-06-28 00:12:53 +08:00
PCDotFan
4d981810dd
update fpmprinter.def.json.po
2017-06-28 00:12:50 +08:00
Ghostkeeper
ebdcd46062
Rename other quality profiles to old not-supported names
...
The Superdraft quality was sometimes still active in users' old configuration as well.
Contributes to issue CURA-3973.
2017-06-27 16:41:58 +02:00
Ghostkeeper
21624d7761
Merge branch '2.6'
2017-06-27 16:25:55 +02:00
Ghostkeeper
f30d150ead
Rename CPE+ and PC draft prints to Not Supported
...
It's a hack. But it prevents having to write an upgrade script for this.
Contributes to issue CURA-3973.
2017-06-27 16:13:47 +02:00
Jaime van Kessel
4370e3a13c
Added zoom to mouse preference
...
https://github.com/Ultimaker/Cura/issues/1572
2017-06-27 15:41:17 +02:00
Ghostkeeper
b2b9b1bede
Fix checking if container stack exists
...
It was checking a container stack ID against the definition containers, which doesn't match.
Contributes to issue CURA-3973.
2017-06-27 15:14:26 +02:00
Ghostkeeper
df2ec7bd73
Don't try to activate a machine that we don't have a definition for
...
Contributes to issue CURA-3973.
2017-06-27 14:02:35 +02:00
Ghostkeeper
8d3095c3b3
Merge branch '2.6'
2017-06-27 13:37:41 +02:00
Ghostkeeper
c66740d8e4
Increase warning value for Number of Slower Layers further
...
Because it was still giving a warning for the 0.4mm layer height profile.
Contributes to issue CURA-3960.
2017-06-27 13:23:30 +02:00
Ghostkeeper
5f5eb0b2a8
Merge branch '2.6'
2017-06-27 11:01:42 +02:00
Ghostkeeper
cb4e58c6f7
Increase the maximum warning for speed_slowdown_layers
...
Also round the resolved value, because the result needs to be an integer.
Contributes to issue CURA-3960.
2017-06-27 11:01:21 +02:00
Lipu Fei
9b20c7e69c
Merge remote-tracking branch 'upstream/2.6'
2017-06-27 10:32:31 +02:00
Lipu Fei
d30c598977
Fix code style
...
CURA-3930
2017-06-27 10:13:54 +02:00
Tim Kuipers
66f23aa2e1
fix: copy global settings into extruder msessage for SE (CURA-3930)
2017-06-27 10:12:06 +02:00
Jaime van Kessel
b9c71a34eb
Merge branch '2.6' of github.com:Ultimaker/Cura
2017-06-27 10:10:59 +02:00
Ghostkeeper
ca7992875a
Add 'Not Supported' profile for Polypropylene 0.25mm
...
Previously we also called the ID 'Not Supported' but we decided against that for new profiles, since that would mean that if the profile ever becomes supported we'd have to do a rename of the user's file names in their settings via a version upgrade. So now the ID is as if it's supported but the user-visible name still says that it's Not Supported and the profile still becomes orange.
Contributes to issue CURA-3960.
2017-06-27 09:32:17 +02:00
Ghostkeeper
264e09bdaf
Update Japanese translations
...
These have not been tested or even opened yet at this point, but by the time I've pushed the commit they will be. This should fix the missing translation and inconsistent wording.
Contributes to issue CURA-3950.
2017-06-27 08:47:22 +02:00
Ghostkeeper
a8da2407c7
Fix link to pp instead of polypropylene
...
The material profile was renamed but that wasn't put through here.
Contributes to issue CURA-3960.
2017-06-27 08:44:28 +02:00
PCDotFan
17a7bd7ae9
Add 简体中文 to GeneralPage.qml
2017-06-27 10:29:21 +08:00
PCDotFan
7e222ed16a
update fdmextruder.def.json translation
2017-06-27 10:23:47 +08:00
PCDotFan
d476a8eace
update chinese translation
2017-06-26 23:43:11 +08:00
PCDotFan
742d400975
Merge remote-tracking branch 'Ultimaker/master'
2017-06-26 23:38:25 +08:00
Ghostkeeper
ee0918f1d0
Merge branch '2.6'
2017-06-26 17:23:57 +02:00
Ghostkeeper
36cc21d31b
Rename Polypropylene to PP
...
They changed their mind.
Contributes to issue CURA-3960.
2017-06-26 17:20:59 +02:00
Jaime van Kessel
4ceb9f95cc
Fixed weights of a few profiles
...
CURA-3845
2017-06-26 16:43:12 +02:00
Jaime van Kessel
b58abc91b3
Fixed names of 2 pp profiles
...
CURA-3960
2017-06-26 16:42:58 +02:00
Tim Kuipers
d31cacb69a
Merge branch 'feature_prime_tower_purge'
2017-06-26 16:32:49 +02:00
