Jaime van Kessel
fa66f2c117
Merge pull request #2481 from krisrok/master
...
refine abort sequence
2017-09-27 16:18:13 +02:00
Diego Prado Gesto
4b3e83f876
Not allowing to modify the number of extruders in multiextruder printers, except Custom FDM printers - CURA-4359
2017-09-27 15:55:34 +02:00
Ghostkeeper
d417bfc7cc
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0
2017-09-27 14:20:38 +02:00
Ghostkeeper
d8c1546be3
Revert making the camera image black while it doesn't react
...
This was giving segfaults sometimes on my computer. I suspect it's because the camera image could have been written to by both this Python code and by the camera itself, giving it a sort of data race or maybe that the image was discarded by the camera while it's being written to by Python. In any case, this should make it more stable.
Contributes to issue CURA-4376.
2017-09-27 14:20:20 +02:00
Jaime van Kessel
2dee054003
Merge branch 'fix_screen_scale_factor' of https://github.com/fieldOfView/Cura into 3.0
2017-09-27 12:57:42 +02:00
fieldOfView
72bf073101
Fix LayerView layer box width
2017-09-27 11:43:14 +02:00
Simon Edwards
85efd9249c
Add in all of the changes for Cura Connect
...
CURA-4376
2017-09-27 10:29:48 +02:00
Jaime van Kessel
cd11c6832d
Added user agent header to firmware update
2017-09-27 09:37:38 +02:00
Jaime van Kessel
28aadc1b05
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0
2017-09-26 11:36:20 +02:00
Jaime van Kessel
826773ae42
Added a lot more logging to debug the not-authenticated issue
2017-09-26 11:20:14 +02:00
fieldOfView
7394a0c6ef
Fix typo
2017-09-26 11:05:46 +02:00
Ghostkeeper
2fbcfe65ea
Only write the information we need to workspaces
...
This way we can be sure that no sensitive information enters the workspaces even if some future developer or a plug-in puts it there.
Contributes to issue CURA-4371.
2017-09-26 09:56:49 +02:00
Thomas Karl Pietrowski
fc8cbedc82
Sorting imports and removing superfluous import
...
.. Logger has been imported twice..
2017-09-26 09:39:18 +02:00
Jaime van Kessel
583b776c6c
Fixed error spam on progress sliced layer run
...
CURA-4349
2017-09-26 09:30:49 +02:00
krisrok
6641415a38
refine abort sequence
...
homing the head with "G28" does not work on my printer for some reason. "G28 X" and "G28 Y" however do.
this fix should not break behaviour on other printers as "G28" is just a shortcut.
2017-09-25 23:43:45 +02:00
fieldOfView
c5fd0e6c80
Use screenScaleFactor to consistently adapt sizes to display pixel ratio
2017-09-25 22:07:12 +02:00
alekseisasin
d7ed8244ae
In project loading dialog the CANCLE button did not work
...
CURA-4345
2017-09-25 14:32:02 +02:00
ChrisTerBeke
11241642b3
CURA-4354 fixed plugin injected tool icon path finding, example in PerObjectSettingsTool
2017-09-22 16:15:38 +02:00
Ghostkeeper
12ccc8abe0
Merge branch '3.0'
2017-09-22 09:55:05 +02:00
ChrisTerBeke
21ea99d9f2
CURA-4269 small code improvement for z-offset in project loading
2017-09-22 09:34:24 +02:00
ChrisTerBeke
e7e24caf97
CURA-4269 small code improvement for z-offset in project loading
2017-09-22 09:31:11 +02:00
alekseisasin
7c462f5703
After loading a model from a project Y position is ignored
...
CURA-4269
2017-09-21 17:36:12 +02:00
ChrisTerBeke
ddfb5f0b48
fix conflict after revert
2017-09-21 15:09:04 +02:00
Ghostkeeper
11060e010b
Clarify message title
...
The title should add something to the message, such as a summary.
2017-09-21 12:52:07 +02:00
Jaime van Kessel
b434fdb875
Layerview scrollbar now has fixed size.
...
Instead of using the size of the other items. This worked when the bar was still part of the larger view, but since it's now
below the item it broke it.
CURA-4342
2017-09-20 13:35:13 +02:00
Jaime van Kessel
ade1c039ea
Print information not being set won't cause crash anymore
2017-09-20 11:03:20 +02:00
Jaime van Kessel
ddacdf523e
Fixed some small issues when certain qml objects were null
...
CURA-4349
2017-09-20 09:48:00 +02:00
Jaime van Kessel
c4f5c970e5
Removed uneeded logging
2017-09-19 16:39:51 +02:00
Jaime van Kessel
e5f3d45385
When project loading needs to create a new machine, also create a new definition changes
...
CURA-4345
2017-09-19 14:02:01 +02:00
ChrisTerBeke
b7671f3da7
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-09-18 17:24:05 +02:00
ChrisTerBeke
e18b24add2
CURA-4269 use z offset decorator to keep project file positions below bed
2017-09-18 17:24:00 +02:00
Ghostkeeper
0060909117
Use named arguments for i18n string
...
Otherwise the i18n system can't figure out which %s belongs to which parameter.
Contributes to issue CURA-4341.
2017-09-18 17:13:01 +02:00
Ghostkeeper
3150420160
Fix i18n with replaced texts
...
Also added a description for the translator.
Contributes to issue CURA-4341.
2017-09-18 17:01:15 +02:00
ChrisTerBeke
b386bda2c8
more fixes for reverting 11ebdf730389eca66bafc37be7c6a741c5641f46
2017-09-18 15:38:31 +02:00
ChrisTerBeke
3db04c918f
fixes for reverting 11ebdf730389eca66bafc37be7c6a741c5641f46
2017-09-18 15:37:17 +02:00
Jaime van Kessel
e5629f26de
Merge branch 'master' of github.com:Ultimaker/Cura
2017-09-18 15:31:12 +02:00
Jaime van Kessel
a3b6ced5e5
Changed titles of unable to slice messages
...
This makes it a bit clearer what is going on and what the "source" of the message is.
CURA-4332
2017-09-18 15:30:40 +02:00
Diego Prado Gesto
e8553e8e69
Fixed double messages and rearrange some code - CURA-4224
2017-09-18 11:47:23 +02:00
ChrisTerBeke
4ca5987ca8
CURA-4269 added a flag to determine wether auto drop should be executed or not
2017-09-18 10:50:52 +02:00
Diego Prado Gesto
255eb2f377
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-09-15 16:05:28 +02:00
Diego Prado Gesto
f139bbe3f1
Fixed some missed references to the previous variables - CURA-4232
2017-09-15 16:05:24 +02:00
Ghostkeeper
e092b908a0
Add message content for WriteRequestFailedErrors
...
The content of the exception is directly put inside a message, so we should give the exception a message.
2017-09-15 11:06:32 +02:00
Ghostkeeper
6083989777
Merge branch 'master' of github.com:Ultimaker/Cura
2017-09-15 09:32:15 +02:00
alekseisasin
aa0ade2e74
Merge branch 'master' of github.com:Ultimaker/cura
2017-09-14 18:05:28 +02:00
alekseisasin
98ab571483
Removed 14bitVoid code accord to a new LGPL license
...
CURA-4232
2017-09-14 18:03:31 +02:00
Ghostkeeper
bf96be3ab2
Improve titles for slice failure messages a bit
...
The previous ones were very vague.
2017-09-14 16:40:20 +02:00
ChrisTerBeke
11ebdf7303
CURA-4269 disable auto-drop for first time loaded models from project files
2017-09-14 16:06:51 +02:00
Lipu Fei
3812a478cf
Only use lowercase for string comparison
...
CURA-4224
2017-09-14 12:50:55 +02:00
Lipu Fei
ccebadee10
Merge branch 'master'
2017-09-14 12:48:07 +02:00
ChrisTerBeke
c5c6ed8b2b
CURA-4318 fix colors and layouts for dark design
2017-09-14 09:59:13 +02:00
