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

18849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
7e1f47dc03 Merge branch 'master' of github.com:Ultimaker/Cura 2019-03-13 14:19:02 +01:00
Jaime van Kessel
986581c18a Improve logging if extruder cant be found while creating extruder stack 2019-03-13 14:18:25 +01:00
Ghostkeeper
04f11e4abf
Make translation a bit easier to get grammatically correct 
We should not append translations to each other. That doesn't work in different languages.

Contributes to issue CURA-6257.
 2019-03-13 14:13:49 +01:00
Jaime van Kessel
31c57d0113
Merge pull request #5374 from ValentinPitre/add_tizyx_evy_dual_profile 
Add TiZYX Evy Dual Extruder 3D printer
 2019-03-13 14:12:15 +01:00
Ghostkeeper
be13e5d14e
Change credit for Mariusz 
On his request.

Contributes to issue CURA-6257.
 2019-03-13 13:57:21 +01:00
Ghostkeeper
d873648dab
Update headers of translation files 
This reflects the new revision times and the new authors.

Contributes to issue CURA-6257.
 2019-03-13 13:40:23 +01:00
Jaime van Kessel
72eb90c7c1 Fix the insert & timelapse script so that you can use both at the same time 
CURA-5713
 2019-03-13 13:28:10 +01:00
Simon Edwards
e376404e5c
Merge pull request #5419 from Ultimaker/CL-1282_handle_empty_string_and_none_material_ids 
CL-1282 Handle "" and None as hot-end and material IDs
 2019-03-13 13:23:54 +01:00
Ghostkeeper
6a4d3e4e83
Submit translations by Bothof 
These are the translations that we bought from Bothof. They are not yet checked, their headers are not updated, etc.

Contributes to issue CURA-6257.
 2019-03-12 17:26:20 +01:00
Ghostkeeper
2d00abb1bd
Submit Traditional Chinese translations by Zhang 
These are the translation files that he sent me. They are not yet checked, their headers are not updated, etc.

Contributes to issue CURA-6257.
 2019-03-12 17:25:42 +01:00
Ghostkeeper
d791046305
Submit translations by Mariusz 
These are the translation files that he sent me. They are not yet checked, their headers are not updated, etc.

Contributes to issue CURA-6257.
 2019-03-12 17:24:54 +01:00
Jaime van Kessel
4756e8b7bc Added simple init test for material manager 2019-03-12 10:00:01 +01:00
THeijmans
e33ec5c324 Fixing the UM2+ speeds 
Fixing the very high print speeds in UM2+ profiles
 2019-03-11 17:35:23 +01:00
Simon Edwards
c07b0cdd00
Merge pull request #5418 from Ultimaker/CL-1281_improve_idle_printer_empty_queue 
CL-1281 Make sure to show printers even if queue is empty
 2019-03-11 17:20:39 +01:00
Ian Paschal
6392ab8d05 Handle "" and None as hot-end and material IDs 
Contributes to CL-1282
 2019-03-11 16:30:04 +01:00
Simon Edwards
3489a5c64e
Merge pull request #5397 from Ultimaker/CL-1272_prevent_multiple_cloud_pop-ups 
Prevent multiple cloud-flow pop-ups
 2019-03-11 15:37:00 +01:00
THeijmans
02fc942ac8 Fixing the UM2+ speeds 
Fixing the very high print speeds in UM2+ profiles
 2019-03-11 14:42:10 +01:00
Ian Paschal
ec203da1cd Make sure to show printers even if queue is empty 
Contributes to CL-1281
 2019-03-11 13:54:49 +01:00
Ghostkeeper
2d9910d3f0
Fix post-processing scripts when printing via USB 
The g-code writer processes the post-processing scripts properly, so get the g-code from that plug-in.
 2019-03-11 11:59:23 +01:00
Ghostkeeper
f9b91df034
Update setting_version to 7 
For these profiles it was somehow outdated.
 2019-03-11 11:52:42 +01:00
Ghostkeeper
2b8a2d0c20
Reduce print output during happy path of automated tests 
It should really just not print anything except what pytest prints, so you can easily see what tests have failed and what have not.
 2019-03-11 11:10:09 +01:00
Jaime van Kessel
e9d4eb741a Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-11 10:52:14 +01:00
Jaime van Kessel
50999a075e Fix stupid mistake (signals need an emit, not a direct call) 
CURA-6278
 2019-03-11 10:46:41 +01:00
Jaime van Kessel
0616601250 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-11 10:39:23 +01:00
ValentinPitre
da044daaeb
Remove 2.85 diameter filaments from "exclude_materials" 2019-03-10 15:26:18 +01:00
Diego Prado Gesto
8c41bc86d2
Merge pull request #5259 from fieldOfView/fix_travel_speed 
Add {travel_speed} as an alias to {speed_travel}
 2019-03-08 17:26:18 +01:00
Diego Prado Gesto
f47bc21204 Merge branch 'BluefireXD-4.0' 2019-03-08 17:02:10 +01:00
Diego Prado Gesto
0286c701fd Change setting_version to be the same as in current master 
Also change the profiles to act as global profiles and fix indentation.

Contributes to CURA-6080.
 2019-03-08 17:00:17 +01:00
Diego Prado Gesto
c62bfc8ece Merge branch '4.0' of https://github.com/BluefireXD/Cura into BluefireXD-4.0 2019-03-08 16:48:56 +01:00
Diego Prado Gesto
757224c187 Merge branch 'wporter82-master' 2019-03-08 15:47:37 +01:00
Diego Prado Gesto
9396628170 Make suggested changes to post processing scripts 
Contributes to CURA-5713.
 2019-03-08 15:46:21 +01:00
Diego Prado Gesto
b913dd9702 Merge branch 'master' of https://github.com/wporter82/Cura into wporter82-master 2019-03-08 15:37:41 +01:00
Diego Prado Gesto
d53c8b1162 Change text to singular mode 
It makes more sense.
 2019-03-08 15:27:17 +01:00
Ghostkeeper
e53eb70cad
Add tests for validating metadata before loading 
Contributes to issue CURA-6270.
 2019-03-08 14:07:10 +01:00
Ghostkeeper
3c779b58de
Specialise _isMetadataValid for Cura to check setting_version 
Because we need to reject loading metadata for containers whose setting_version is incorrect.

Contributes to issue CURA-6270.
 2019-03-08 13:34:16 +01:00
Ghostkeeper
20fc26b8ba
Correct setting version for definition files 
Otherwise the container provider actually rejects loading it completely.

Contributes to issue CURA-6270.
 2019-03-08 13:32:36 +01:00
Diego Prado Gesto
55e27f6e21
Merge pull request #5402 from lucik/patch-1 
monitor does not show "Build Plate"
 2019-03-08 11:46:52 +01:00
Andrew
70e640be22
Change regexp for greater compatibility 
Change regexp in bed_temperature_matches  and extruder_temperature_matches for greater compatibility with different printers.
 2019-03-08 11:25:49 +06:00
kaleidoscopeit
7f3abbd717 Deltacomb 3D - Updated profile 2019-03-07 17:17:02 +01:00
kaleidoscopeit
473e8efac0 Deltacomb 3D - Updated profile 2019-03-07 17:06:49 +01:00
Amanda de Castilho
82466785ad
Update and rename UsePrevProbeMeasure.py to UsePreviousProbeMeasurements.py 
Applied suggested changes
 2019-03-06 12:54:57 -08:00
Diego Prado Gesto
a0888ccc0c
Update plugins/PostProcessingPlugin/scripts/UsePrevProbeMeasure.py 
Co-Authored-By: adecastilho <familydecastilho@gmail.com>
 2019-03-06 12:33:36 -08:00
Diego Prado Gesto
6e011352af
Update plugins/PostProcessingPlugin/scripts/UsePrevProbeMeasure.py 
Co-Authored-By: adecastilho <familydecastilho@gmail.com>
 2019-03-06 12:33:25 -08:00
Diego Prado Gesto
8a45a4e06f
Update plugins/PostProcessingPlugin/scripts/UsePrevProbeMeasure.py 
Co-Authored-By: adecastilho <familydecastilho@gmail.com>
 2019-03-06 12:33:09 -08:00
Diego Prado Gesto
8f2a2f3ae9
Update plugins/PostProcessingPlugin/scripts/UsePrevProbeMeasure.py 
Co-Authored-By: adecastilho <familydecastilho@gmail.com>
 2019-03-06 12:30:14 -08:00
Ghostkeeper
1d25f52df6
Merge branch '4.0' 2019-03-06 15:23:55 +01:00
Ghostkeeper
d72a8581bf
Merge branch 'CURA-6252_Fix_crash_single_extrusion_upgrade_and_project' into 4.0 2019-03-06 15:23:33 +01:00
ValentinPitre
f4a20b35a6
Update tizyx_evy_dual.def.json 2019-03-06 14:43:07 +01:00
Ghostkeeper
380d8ce0c2
Merge branch 'afinkle-master' 2019-03-06 14:23:15 +01:00
Andrew
e56a97bfa2
monitor does not show "Build Plate" 
bed_temperature_matches : error in temperature search expression
 2019-03-06 17:28:22 +06:00