GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 16:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,815 Commits 291 Branches 260 Tags
Commit Graph

18815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
c79ffab9fb
Merge branch '4.0' 2019-03-18 11:24:23 +01:00
Ghostkeeper
12b58feb51
Minor corrections to Brazilian translations 
Contributes to issue CURA-6257.
 2019-03-18 11:24:08 +01:00
Cláudio 'Patola' Sampaio
a286863e27
Update translation strings for Cura 4.0 2019-03-18 11:20:20 +01:00
Ghostkeeper
3e9ed0fbfa
Add translation hint for untranslatable Ultimaker Cloud brand 
So that the translators next time hopefully won't translate this.

Contributes to issue CURA-6257.
 2019-03-18 10:36:23 +01:00
Jaime van Kessel
d0e61f23f1 Add test for exporting container by means of the containerManager 2019-03-15 17:02:06 +01:00
Jaime van Kessel
fd237a9473 Add test that checks the validity of the namefilters 2019-03-15 16:34:17 +01:00
Jaime van Kessel
7bb35cdbf7 Add test cases for the ContainerManager 2019-03-15 16:17:28 +01:00
Jaime van Kessel
8518aba3a5 Adds tests for QualityManager 2019-03-15 14:51:35 +01:00
Jaime van Kessel
1138baa26f Added extra tests for materialManager 2019-03-15 13:57:22 +01:00
THeijmans
fdf65b43bc Update the speed values for the um2+ 
Some more wrong values were found, these should be fixed with this pull request
 2019-03-14 15:59:12 +01:00
Jaime van Kessel
f73dabdc3f Merge branch 'UM2plus-profile-speed-issues' of github.com:Ultimaker/Cura 2019-03-14 15:58:36 +01:00
THeijmans
83352e14e9 Update the speed values for the um2+ 
Some more wrong values were found, these should be fixed with this pull request
 2019-03-14 15:38:42 +01:00
Jaime van Kessel
bcf6a21bc8 Merge branch 'patch-3' of https://github.com/adecastilho/Cura 2019-03-14 14:50:34 +01:00
Ghostkeeper
0f8a30d37b
Add period to tooltip sentence 
A lot of translators got this wrong.

Contributes to issue CURA-6257.
 2019-03-14 14:30:57 +01:00
Jaime van Kessel
8b3290fb1e Prevent the deletion of materials that are still active 2019-03-14 10:50:53 +01:00
Jaime van Kessel
31a8421fd4 Remove : from display script as it breaks on some machines 2019-03-13 17:06:47 +01:00
Jaime van Kessel
0c57aa5054 Merge branch 'fix_usb_print_postprocessing' of github.com:Ultimaker/Cura 2019-03-13 16:44:12 +01:00
Ghostkeeper
8e81847fa7
Use periods instead of ellipses 
Because some printers don't accept non-ANSI characters and will stop printing when they encounter one.
 2019-03-13 15:43:58 +01:00
Jaime van Kessel
0fbfe9e6c9 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-13 15:42:21 +01:00
Jaime van Kessel
208e5d3616 Fixed incorrect version numbers 2019-03-13 15:34:33 +01:00
Ghostkeeper
cfa02c39ec
Don't allow translating 'Ultimaker Cloud' 
It is a marketing name and shouldn't be translated then.

Contributes to issue CURA-6257.
 2019-03-13 14:29:07 +01:00
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
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
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