Jaime van Kessel
38a07d75c7
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-28 13:16:00 +02:00
Jaime van Kessel
db1fb8e692
Moved authentication request state change
2017-03-28 13:14:47 +02:00
Tim Kuipers
7a67ab4e66
Merge branch '2.5'
2017-03-28 12:55:18 +02:00
Jaime van Kessel
910ff7acea
No longer check printer state when no material lengths are known
...
This fixes issues with g-code from g-code reader not having material lengths set.
CURA-3604
2017-03-28 11:59:07 +02:00
Jaime van Kessel
f04d1efb8d
Removed file progress from removable output device, as writefile job now handles that itself
2017-03-24 16:32:39 +01:00
Jaime van Kessel
4b7b8600ec
Shortened the logging of the auth key. Turned out it was extremely long
2017-03-24 11:22:57 +01:00
Jaime van Kessel
8d2e824205
Added even more logging
2017-03-24 11:17:59 +01:00
Jaime van Kessel
adab4a1110
Added "blurred" auth key logging.
...
The getSafeaAuthKey prints a key of the same length, but only the last 5 chars are real. The rest is blurred out with *
THis is a bit like how most payment services hide your credit card number.
2017-03-24 11:04:08 +01:00
Jaime van Kessel
8023341090
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-23 15:15:08 +01:00
Lipu Fei
96e9780273
Fix typo in changelog 2.5.0
2017-03-23 08:53:57 +01:00
Lipu Fei
e35d276e25
Complete Changelog for 2.5.0
...
CURA-3467
2017-03-22 15:20:57 +01:00
Jack Ha
4eff58995d
Merge branch '2.5'
2017-03-22 13:24:32 +01:00
Lipu Fei
c6df3adddb
Update 2.5.0 BETA ChangeLog
...
CURA-3467
2017-03-22 10:26:01 +01:00
Jack Ha
6858db5e17
Merge branch '2.5'
2017-03-20 15:17:29 +01:00
Jack Ha
b8d8e4fac3
Updated changelog. CURA-3467
2017-03-20 15:17:18 +01:00
Jack Ha
48c6c523ec
Only 3mf nodes with mesh data are getting the sliceable object decorator. CURA-3559
2017-03-20 14:43:46 +01:00
Jack Ha
a56b7cd98d
Merge branch '2.5'
2017-03-20 13:42:11 +01:00
Jack Ha
b21a87b25b
Fix not slicing refreshing after deleting last object from loaded project file. CURA-3559
2017-03-20 13:41:47 +01:00
jack
42e7a0defa
Merge pull request #1535 from LipuFei/feature_CURA-3495_open_in_one
...
CURA-3495 Open project/models menu item
2017-03-20 10:59:40 +01:00
Jaime van Kessel
e620d8fd9a
Added extra logging to authentication loading to indicate difference between no auth at all or (some) loaded auth
2017-03-17 10:30:04 +01:00
Jaime van Kessel
fe826d16b8
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-17 10:23:10 +01:00
Jaime van Kessel
296152ed33
Added extra logging when authentication gets removed for network printer
2017-03-17 10:22:41 +01:00
Jack Ha
6194ffa27b
Removed comment. CURA-3390
2017-03-16 15:28:57 +01:00
Jack Ha
60c5112824
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-16 15:27:55 +01:00
Jack Ha
9b06983f3e
GCode reader: Better layerheight guess, refactoring, more robust, take extruder offset into account of multi extrusion. CURA-3390
2017-03-16 15:27:48 +01:00
Lipu Fei
e00c68344a
CURA-3495 open project/models in one dialog
2017-03-16 13:37:06 +01:00
Lipu Fei
b35a97c770
CURA-3495 preRead() takes flexible arguments
2017-03-16 13:37:06 +01:00
Jaime van Kessel
134425db90
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-16 11:27:54 +01:00
Jaime van Kessel
36bcd90e08
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-16 11:27:10 +01:00
Jaime van Kessel
a170624ff1
Disabled the 2.5 upgrader
2017-03-16 11:26:50 +01:00
Jack Ha
1dbec70738
Merge branch '2.5'
2017-03-15 14:37:29 +01:00
Jack Ha
72f8a349cf
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-15 14:37:13 +01:00
Jack Ha
6731d00ad7
Removed some lines from changelog.
2017-03-15 14:37:06 +01:00
Jack Ha
03d24db30d
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-15 14:30:11 +01:00
Jack Ha
f918a978b2
Fixed extruder per gcode layer. Created show_caution preference for gcode reader. CURA-3390
2017-03-15 14:29:59 +01:00
Jaime van Kessel
cb40ae45e8
Added contribution of the g-code plugin to the changelog
...
CURA-3467
2017-03-15 14:23:09 +01:00
Jaime van Kessel
956e69873e
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-15 13:55:43 +01:00
Jack Ha
bab1de604f
Less yields for G-code reader and faster. CURA-3390
2017-03-15 13:16:51 +01:00
Jack Ha
792332e2ec
Made G-code reader a lot faster. CURA-3390
2017-03-15 13:14:51 +01:00
Lipu Fei
18cf9e3172
CURA-3500 Make sure that material XMLs have utf-8 encoding
2017-03-15 11:47:33 +01:00
Jack Ha
fda00d4c9f
Added caution message for g-code reader. CURA-3390
2017-03-15 11:40:31 +01:00
Jack Ha
132b6aa9d7
Merge branch '2.5'
2017-03-15 09:10:49 +01:00
jack
056c9dd362
Merge pull request #1532 from Ultimaker/feature_version_upgrade_2.5_tests
...
Version Upgrade 2.4 to 2.5 tests
2017-03-14 16:05:36 +01:00
Jaime van Kessel
7993d9e95e
Added **kwargs option to request write
...
CURA-3496
2017-03-14 13:30:47 +01:00
Jack Ha
0a398738b7
Merge branch '2.5' into feature_version_upgrade_2.5
2017-03-14 11:18:14 +01:00
Jack Ha
b08249b3a0
Added changelogs. CURA-3467
2017-03-14 10:43:03 +01:00
Jaime van Kessel
1c7c5545b5
Comment checking now uses startswith
2017-03-13 15:52:42 +01:00
Jaime van Kessel
ae97e60ee4
Added logging if unknown feature type was encountered
2017-03-13 15:48:30 +01:00
Jaime van Kessel
b57c5af348
Added documentation
2017-03-13 15:45:59 +01:00
Jaime van Kessel
412b8bcb41
Moved check to inside if statement to prevent undeeded parsing
2017-03-13 15:34:30 +01:00
