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
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
Jaime van Kessel
69b8a06eca
Added documentation why gcode0 was defined to be the same as gcode1
2017-03-13 15:33:04 +01:00
Jaime van Kessel
3c9010fde4
Minor refactor to improve readability
...
CURA-3390
2017-03-13 15:29:25 +01:00
Ghostkeeper
94c607e785
Also tests whether the upgrade didn't remove any good settings
...
It shouldn't remove any settings that are not set for removing.
It's now also using the actual _removed_settings property to make sure that the test upgrades for the simple case of another removed setting.
Contributes to issue CURA-3479.
2017-03-13 14:08:56 +01:00
Ghostkeeper
ad0d0bbd96
Add test for removing settings from instance containers
...
Currently only the happy path. I plan to add tests whether the rest of the settings are still intact.
Contributes to issue CURA-3479.
2017-03-13 13:49:19 +01:00
Ghostkeeper
d866216f0c
Add tests for removed settings from preferences files
...
Contributes to issue CURA-3479.
2017-03-13 13:39:10 +01:00
Ghostkeeper
14faf1abad
Use correct naming scheme for functions
...
It needs to start with 'test_' for pytest. But otherwise it needs to follow our naming conventions for function names.
Contributes to issue CURA-3479.
2017-03-13 12:49:48 +01:00
Ghostkeeper
ce50a6ebf1
Add tests for cfg_version
...
These test if the output of cfg_version is as expected.
Contributes to issue CURA-3479.
2017-03-13 12:44:18 +01:00
Ghostkeeper
f15990e89c
Implement version upgrade from 2.4 to 2.5
...
The version upgrade currently only removes the setting start_layers_at_same_position.
Contributes to issue CURA-3479.
2017-03-13 12:42:25 +01:00
Ghostkeeper
74d6d879f7
Implement version upgrade from 2.4 to 2.5
...
The version upgrade currently only removes the setting start_layers_at_same_position.
Contributes to issue CURA-3479.
2017-03-10 16:58:58 +01:00
Jaime van Kessel
d93b137c95
No longer add nodes that don't have children or MeshData
...
CURA-3493
2017-03-10 15:48:29 +01:00
Jack Ha
fc8bd75ffe
Added changelog line for layerview slider.
2017-03-08 12:56:47 +01:00
Jack Ha
f47ec27014
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-07 16:44:41 +01:00
jack
07e6da71d4
Merge pull request #1501 from Ultimaker/layer_view3_layout
...
Layer view3 layout: Single Slider by fieldOfView
2017-03-07 16:44:29 +01:00
Jaime van Kessel
c06ffe6cae
Moved auth state changed check to first thing set auth checks
...
This should contribute to the windows authentication issues.
Most windows devices seemed to get all the auth state messages twice.
2017-03-07 11:55:29 +01:00
Jack Ha
afec26eb62
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-07 11:47:25 +01:00
Jaime van Kessel
6dcd3b44b6
Removed uneeded debug code
...
The method is always put, so no need to log it.
2017-03-07 11:44:40 +01:00
jack
3b1a15e1c4
Merge pull request #1495 from fieldOfView/feature_draggable_range_slider2
...
Use a single draggable range slider in Layerview
2017-03-07 11:43:17 +01:00
Jaime van Kessel
85d979cf50
Removed unneeded check from network printing.
...
We used to not have a printer_state so this check was needed.
2017-03-07 11:41:18 +01:00
Jaime van Kessel
059b31b25a
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-07 11:01:59 +01:00
Jaime van Kessel
414337dead
Fixed 3mf writing
...
The type hinting changes also changed the way we handle certain imports, which caused saving to fail.
CURA-3215
2017-03-07 11:01:03 +01:00
Jack Ha
73dff09443
Travel moves now have a width of 0.1. CURA-3321
2017-03-07 10:47:34 +01:00
Jack Ha
efbc624ea8
More defensive setExtruderOpacity, removed unnecessary part. CURA-3321
2017-03-07 10:40:59 +01:00
Jack Ha
c10dc2f07c
Set old permissions back. CURA-3321
2017-03-07 10:36:30 +01:00
Jack Ha
42d939b34e
Solved merge conflict. CURA-3321
2017-03-07 10:34:53 +01:00
