GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 07:28:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,636 Commits 295 Branches 268 Tags
Commit Graph

7636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
MaukCC
35c0f3ca74 Update cartesio.def.json 2017-03-14 15:05:20 +01:00
MaukCC
37d7cd989b Create draft.inst.cfg 2017-03-14 15:03:52 +01:00
MaukCC
4620187fdc Update extra_coarse.inst.cfg 2017-03-14 15:03:05 +01:00
MaukCC
de2fd03057 Update coarse.inst.cfg 2017-03-14 15:02:49 +01:00
MaukCC
5428a29a28 Update cartesio.def.json 2017-03-14 14:44:56 +01:00
MaukCC
7acf26ebe7 Update normal.inst.cfg 2017-03-14 14:29:11 +01:00
MaukCC
3698e2fca6 Update low.inst.cfg 2017-03-14 14:28:57 +01:00
MaukCC
880f47044d Update high.inst.cfg 2017-03-14 14:28:38 +01:00
MaukCC
f7b495ce2a Update extra_coarse.inst.cfg 2017-03-14 14:28:22 +01:00
MaukCC
8b7d66608a Update coarse.inst.cfg 2017-03-14 14:28:09 +01:00
MaukCC
4c5e0614d8 Update coarse.inst.cfg 2017-03-14 14:00:58 +01:00
MaukCC
7ad6356256 Update extra_coarse.inst.cfg 2017-03-14 14:00:38 +01:00
MaukCC
302627639d Update high.inst.cfg 2017-03-14 13:59:53 +01:00
MaukCC
b5a188ef78 Update low.inst.cfg 2017-03-14 13:59:28 +01:00
MaukCC
e1a3f16da7 Update normal.inst.cfg 2017-03-14 13:59:03 +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
MaukCC
44269d4ede Update cartesio_0.25.inst.cfg 2017-03-14 12:21:09 +01:00
MaukCC
88fa6eeb2a Update cartesio_0.4.inst.cfg 2017-03-14 12:18:51 +01:00
MaukCC
803aaf57fb Update cartesio_0.8.inst.cfg 2017-03-14 12:17:30 +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