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
a647369735
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-15 13:17:12 +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
Jaime van Kessel
e2045b2805
Starting Cura when no machines added but with a model no longer causes exceptions
2017-03-15 10:00:11 +01:00
Jaime van Kessel
6cc0bd893f
Save as now defaults to 3mf
...
CURA-3496
2017-03-15 09:57:50 +01:00
Jaime van Kessel
48cba91b16
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-15 09:27:08 +01:00
Ghostkeeper
2564ac24f9
Merge branch 'probonopd-patch-3'
2017-03-15 09:26:12 +01:00
Jaime van Kessel
138c3db26f
Preferred mimetype is now used when saving to local or removable drive
...
CURA-3496
2017-03-15 09:23:47 +01:00
Ghostkeeper
c52649a91f
Merge branch 'patch-3' of https://github.com/probonopd/Cura into probonopd-patch-3
2017-03-15 09:13:33 +01:00
Jack Ha
132b6aa9d7
Merge branch '2.5'
2017-03-15 09:10:49 +01:00
probonopd
9dbb7fcc15
Update as per discussion in https://github.com/Ultimaker/Cura/pull/1350
2017-03-14 18:31:58 +01:00
Ghostkeeper
e443993ff2
Fix finding Python and Uranium
...
Otherwise all tests fail that require UM.
2017-03-14 17:25:31 +01:00
Arjen Hiemstra
1d008bdfc2
Allow empty JUnit results so a test failure does not become a build fail
2017-03-14 17:15:18 +01:00
Arjen Hiemstra
6a28368beb
Add a Jenkinsfile so Cura will be tested on CI
2017-03-14 17:00:22 +01:00
jack
284e620da2
Merge pull request #1531 from Ultimaker/feature_version_upgrade_2.5
...
Version Upgrade 2.4 to 2.5
2017-03-14 16:05:43 +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
Jack Ha
50c978a05b
Fixed cura tests.
2017-03-14 16:05:09 +01:00
Jaime van Kessel
7993d9e95e
Added **kwargs option to request write
...
CURA-3496
2017-03-14 13:30:47 +01:00
Jack Ha
62de4f9ec6
Updated version of superdraft and verydraft. CURA-3479
2017-03-14 13:09:07 +01:00
Lipu Fei
97b943736b
Use translation for text in keep/discard profile dialog
2017-03-14 11:59:51 +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
357f99f77a
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-14 10:43:13 +01:00
Jack Ha
b08249b3a0
Added changelogs. CURA-3467
2017-03-14 10:43:03 +01:00
Jaime van Kessel
ea3acd6c35
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-14 10:00:32 +01:00
Jaime van Kessel
c0cdddd098
Cura no longer crashes when NaN is recieved for printtime from engine
...
CURA-3516
2017-03-14 09:59:55 +01:00
Jaime van Kessel
746d8053f7
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-14 09:43:51 +01:00
Ghostkeeper
7a30b29458
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-13 17:24:17 +01:00
Ghostkeeper
9b7f054d32
Merge branch '2.5'
2017-03-13 17:23:59 +01:00
Jack Ha
32d5fbe557
Fixed choosing a quality that is compatible with multiple extruders as fallback. CURA-3510
2017-03-13 17:17:56 +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
Jack Ha
d7e35fa480
Added global qualities for Superdraft and Verydraft. CURA-3510
2017-03-13 14:32:45 +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
Jaime van Kessel
6167dc2350
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-13 13:31:53 +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
cbfbc70fa3
Upgrade built-in instance containers
...
These are now upgraded to version 3, meaning that they will have to increase their version numbers and remove any start_layers_at_same_position settings they define. None of these profiles define any start_layers_at_same_position so it's just the version number then.
Contributes to issue CURA-3479.
2017-03-13 12:42:25 +01:00
Ghostkeeper
b29ccdc659
Add Uranium to PYTHONPATH for testing
...
This 'assumes' you have Uranium as a sister-directory next to Cura. This is how it's always been. We should probably change that to a CMake variable some day.
2017-03-13 12:41:59 +01:00
