Mark
f61efb8e20
resolve merge conflict
2018-04-17 10:39:35 +02:00
Mark
b78b6b2c01
Change default auto_slice setting to False
...
CURA-5188
2018-04-17 10:37:07 +02:00
Lipu Fei
c381f3707b
Schedule model check for later if a machine change has not done yet
...
CURA-5239
2018-04-16 17:33:14 +02:00
Lipu Fei
e5d795cc0b
Update model checker text
...
CURA-5237
2018-04-16 17:21:12 +02:00
Lipu Fei
4bb6962302
Rename model checker property to hasWarnings
...
CURA-5237
2018-04-16 17:20:40 +02:00
DavidGergely
dd2d365884
Revert "PC top-bottom speed changed to function based"
...
This reverts commit cec7b8691d
.
2018-04-16 16:40:35 +02:00
DavidGergely
cec7b8691d
PC top-bottom speed changed to function based
...
PC top-bottom speed in all layer heights for the 0.4 mm printcore
changed to function based.
2018-04-16 16:39:34 +02:00
Lipu Fei
62521e93db
Make sure that project writer runs on Qt thread
...
CURA-5229
- Move @call_on_qt_thread to a separate module
- Make sure that project writer runs on Qt thread because itself and the
calls it makes can create new QObjects such as InstanceContainers, and
this must happen on the Qt thread.
2018-04-16 15:32:12 +02:00
Lipu Fei
58e18ded18
Remove unneeded code
...
CURA-5202
2018-04-16 15:24:18 +02:00
Ghostkeeper
455abb15bf
Consistently use capital letters for CLI settings too
...
They're not actually visible, but in case they are made visible by modifying the preferences file...
2018-04-16 12:36:17 +02:00
Ghostkeeper
133f6f43fe
Merge branch '3.3'
2018-04-13 16:14:23 +02:00
Ghostkeeper
db09272b1e
Corrections for Bothof translations
...
These are corrections for the mistakes that we found in Bothof's translations.
Thanks to Vandrasc and Ellecross.
Contributes to issue CURA-5166.
2018-04-13 16:13:17 +02:00
Ghostkeeper
479e260833
Correct formatting of string starting with \n
...
Gettext doesn't accept this, even though it's correct.
Contributes to issue CURA-5166.
2018-04-13 15:28:53 +02:00
Ghostkeeper
1488f965b7
Scale height of slider hover area with screenScaleFactor
...
This way it scales along with the high-resolution screen scaling for high-DPI screens.
2018-04-13 11:43:43 +02:00
Ghostkeeper
776234aaa2
Remove check for preset settings directory
...
This directory is not used any more.
See Uranium's pull request #333 .
2018-04-13 11:16:05 +02:00
Lipu Fei
4b27d036bc
Merge pull request #3659 from Ultimaker/fix_gcode_line_width
...
Adjust filament diameter to calculate line width in the gcode parser
2018-04-13 10:38:47 +02:00
Jaime van Kessel
5d1d426037
Merge branch 'master' of github.com:Ultimaker/Cura
2018-04-12 21:56:13 +02:00
Jaime van Kessel
dc935e2698
Added unit to adaptive layer height settings
2018-04-12 21:55:51 +02:00
Diego Prado Gesto
1a6a39da93
CURA-5197 Add log output with number of models in the buildplate after
...
slice.
2018-04-12 16:53:00 +02:00
Diego Prado Gesto
f23491377f
CURA-5197 Add Cura booting time to the logs.
2018-04-12 16:52:09 +02:00
Lipu Fei
7eba73adc5
Handle excluded_materials in getAvailableMaterials()
...
CURA-5223
Move the handling of excluded_materials into MaterialManager
getAvailableMaterials().
2018-04-12 16:12:07 +02:00
Diego Prado Gesto
e2d6e18ac9
Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3
2018-04-12 14:59:38 +02:00
Diego Prado Gesto
df521dcc93
Change description of a setting.
...
Contributes to CURA-5222.
2018-04-12 14:56:42 +02:00
Ghostkeeper
13f63a7051
Rename 'No Skin' to 'Not in Skin'
...
It's a bit more clear, as discussed in #3115 . To actually change the functionality requires a bit more effort for which I'll need to make a ticket.
2018-04-12 14:39:46 +02:00
Lipu Fei
6d2e49c228
Merge remote-tracking branch 'origin/3.3'
2018-04-12 14:04:29 +02:00
Lipu Fei
33949c3b71
Update build plate compatibility upon extruder enabled/disabled
...
CURA-5219
2018-04-12 14:02:56 +02:00
Lipu Fei
fdd7807769
Custom qualities are always checkable
...
CURA-5218
2018-04-12 13:58:20 +02:00
Lipu Fei
1c4c3a4a0b
Fix quality changes that are based on no-long-available quality_type
...
CURA-5218
2018-04-12 13:58:20 +02:00
Lipu Fei
8d3c3c0e80
Fix the case that a quality_type is not available
...
CURA-5218
2018-04-12 13:58:20 +02:00
Mark Burton
e50be5cbe7
No! G90 does not command absolute extrusion, M82 does that.
2018-04-12 13:44:27 +02:00
Diego Prado Gesto
01c846dbd8
Merge pull request #3651 from smartavionics/mb-fix-gcode-reader-g90
...
No! G90 does not command absolute extrusion, M82 does that.
2018-04-12 13:40:32 +02:00
Diego Prado Gesto
2d30315ecf
CURA-5220 Skip storing the settings in the GCode if they already are.
2018-04-12 11:49:38 +02:00
Mark Burton
b7b48927c2
Append a \n to each saved line of gcode otherwise the whole file ends up as one line!
2018-04-12 11:49:19 +02:00
Diego Prado Gesto
2df95b6e35
Merge pull request #3655 from smartavionics/mb-fix-gcode-reader-missing-newlines
...
Append a \n to each saved line of gcode otherwise the whole file ends up as one line!
2018-04-12 11:30:16 +02:00
Diego Prado Gesto
03ec123c3c
Use the correct filament diameter to calculate line width in the gcode
...
parser.
2018-04-12 11:00:43 +02:00
Mark Burton
da1790fd37
Append a \n to each saved line of gcode otherwise the whole file ends up as one line!
2018-04-11 17:08:55 +01:00
Ghostkeeper
1be6e29494
Merge branch '3.3'
2018-04-11 16:57:49 +02:00
Ghostkeeper
b101ddcf8d
Re-do shortening of Wechseldatentrager to Datentrager
...
The translation update undid my changes there. That was basically a manual merge. We need to change this again now.
Contributes to issue CURA-5166.
2018-04-11 14:57:45 +02:00
Ghostkeeper
36eef6603f
Update and fix .po file headers
...
Lots of things out of sync again.
Contributes to issue CURA-5166.
2018-04-11 14:54:31 +02:00
Ghostkeeper
884227336f
Update translations from Bothof
...
These are the new translation files that the translation bureau sent to us. I've renamed them to fit in our architecture but for the rest they are unaltered.
Contributes to issue CURA-5166.
2018-04-11 14:53:05 +02:00
Ghostkeeper
0f148dd2e2
Merge branch '3.3'
2018-04-11 13:31:59 +02:00
Ghostkeeper
7d806e7ae9
Fix rendering before the extruder number decoration is set
...
If a render is triggered before this decorator is set it would crash. The rest of the code is robust against this being None, but here it would give a TypeError.
2018-04-11 11:59:54 +02:00
Mark Burton
c4a9c38c33
No! G90 does not command absolute extrusion, M82 does that.
2018-04-11 09:12:22 +01:00
Lipu Fei
56e80bb518
Merge branch '3.3'
2018-04-10 13:25:45 +02:00
Lipu Fei
4e625da168
Increase delay time for open file with double-clicking
...
CURA-5203
2018-04-10 13:23:23 +02:00
Lipu Fei
b55570f3fb
Merge branch '3.3'
2018-04-10 13:13:38 +02:00
Lipu Fei
b314d2bbe2
Fix extruder nr handling for -1 Not Overriden
...
CURA-5213
2018-04-10 12:56:20 +02:00
Lipu Fei
107c10b860
Merge branch '3.3'
2018-04-10 11:41:13 +02:00
Lipu Fei
95f4515e93
Make it possible to skip project file check in readLocalFile()
...
CURA-5203
2018-04-10 11:40:47 +02:00
Lipu Fei
d32ddea678
Merge pull request #3601 from fieldOfView/fix_usb_rapid_commands
...
Fix sending commands in rapid succession over USB
2018-04-09 15:33:44 +02:00