3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
15466 commits 313 branches 275 tags 719 MiB
Commit graph

15466 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lipu Fei
939484bc91 Fix adding materials in UFP 
CURA-5555

 - Store materials in virtual path "/Materials"
 - Correct material relationship type
 - Add origin for material relationship
 - Use MaterialManager instead of ContainerRegistry to get materials
 - Other minor changes
 2018-08-29 17:25:36 +02:00
Aleksei S
423f1210b0 Catch erros and open the write stream only if the material cointaner is found 
CURA-5555
 2018-08-27 11:10:41 +02:00
Aleksei S
ea935024cf Add materil xml file to UFP file 
CURA-5555
 2018-08-24 13:02:06 +02:00
Ghostkeeper
49e3c23d14
Brackets on new line 
As per our code style.
 2018-08-22 16:53:27 +02:00
alekseisasin
0d293ddced
Merge pull request #4251 from Ultimaker/CURA-5645_no_write_gcode_to_recent_files 
CURA-5645 Do not add saved gcodes to recent files list
 2018-08-22 16:28:58 +02:00
alekseisasin
ff38ee2bed
Merge pull request #4245 from Ultimaker/CURA-5649_hide_gcodegz_in_save_dialog 
CURA-5649 Do not show gcode.gz as an option in save file dialog
 2018-08-22 14:12:08 +02:00
Lipu Fei
29180740de Fix missed names 2018-08-22 13:36:17 +02:00
Lipu Fei
94ce9205c3 Remove pytest cache 2018-08-22 13:30:59 +02:00
Lipu Fei
af64d91587 Fix stack handling in project loading 
CURA-5663
 2018-08-21 16:07:17 +02:00
Cherubim
f35005c8ba
Brackets on new line 
As per our code style.
 2018-08-21 14:24:07 +02:00
Lipu Fei
10e474ad27 Add draft shield distance into the prime tower position fomulas 
CURA-5644
 2018-08-21 13:38:56 +02:00
Aleksei S
4635c8117d Add changed_settings(retraction_combing) to Version Upgrade Cura3.4 
CURA-5505
 2018-08-21 11:49:13 +02:00
Remco Burema
ca25638c07 .ufp should also not show up in recent files since it's a gcode format 2018-08-21 11:01:35 +02:00
Lipu Fei
1468ac1d59 Check if dict has key before accessing in BuildVolume 2018-08-20 13:20:52 +02:00
alekseisasin
4b5cc59508
Merge pull request #4144 from smartavionics/mb-add-combing-mode-within-infill 
Added the "Within Infill" combing option that functions identically to the original "Not in Skin" option.
 2018-08-20 12:50:41 +02:00
Lipu Fei
edc4e2824d
Merge pull request #4237 from Ultimaker/fix_unit_tests 
Fix unit tests
 2018-08-20 10:32:38 +02:00
Ghostkeeper
6740c2bee9
Fix offset of initial layer height 
It would detect the height of the raft by looking at what the first Z coordinate is that it encounters on layer 0. This Z coordinate also includes the initial layer height though. If you pause lower than the initial layer height (but higher than 0), you'd expect to pause in the initial layer.
 2018-08-17 11:24:39 +02:00
Ghostkeeper
9f190590b1
Only change camera range if camera range is valid 
This was a debugging test to see if this fixed an issue. It turned out to not be the issue in question, but this is still a defensive coding thing that would be good to have.
 2018-08-17 10:56:46 +02:00
Ghostkeeper
284f90f3ff
Fix camera position before adding a printer 
Don't use the diagonal size then, because that returns 0.
 2018-08-17 10:56:46 +02:00
Lipu Fei
1079a9be2c Do not add saved gcodes to recent files list 2018-08-17 10:53:30 +02:00
Lipu Fei
013032279d Better handling of no quality group in CuraStackBuilder 2018-08-17 10:00:28 +02:00
Ghostkeeper
31e283110f
Check first if preferred quality exists 
Fixes #3784.
 2018-08-17 09:31:33 +02:00
Lipu Fei
f42dc24d95 Do not show gcode.gz as an option in save file dialog 
CURA-5649
 2018-08-16 15:16:32 +02:00
Jack Ha
376b6a53c9 Capital Letters In Setting Name. CURA-5623 2018-08-16 13:47:32 +02:00
Jack Ha
f1c8eda532 Merge branch 'master' of github.com:Ultimaker/Cura 2018-08-16 13:45:51 +02:00
Jack Ha
44eb372cb8 Merge branch 'patch-1' 2018-08-16 13:45:33 +02:00
Jack Ha
6c1d380602 Renamed snap_distance to minimum_polygon_circumference and changed the description a bit. CURA-5623 2018-08-16 13:45:27 +02:00
Jaime van Kessel
7a4c9adc3f
Merge pull request #4238 from Ultimaker/CL-980_gcode_preview_not_visible_with_um3 
Send UFP to Ultimakers provided the firmware version is sufficient.
 2018-08-16 13:11:08 +02:00
Simon Edwards
e1e9c60016 Send UFP to Ultimakers provided the firmware version is sufficient. 
CL-980
 2018-08-15 13:56:51 +02:00
Diego Prado Gesto
3d9c7f7eb5
Merge pull request #4216 from Ultimaker/feature_adjust_zoom_to_printer_size 
Adjust maximum zoom to printer size
 2018-08-15 13:19:46 +02:00
Lipu Fei
c20274e356 Move constant instance containers to a separate file 
This way we separate the class/type definitions and the actual
constants.
 2018-08-15 11:04:09 +02:00
Ghostkeeper
f1a7b23a5c
Adjust default position of camera based on diagonal size 2018-08-15 09:52:39 +02:00
Ghostkeeper
da39e842f1
Move getting diagonal size out to separate function 2018-08-15 09:25:24 +02:00
Diego Prado Gesto
3a7fff42b5 Fix code style. 
Contributes to CURA-5628.
 2018-08-15 09:14:37 +02:00
Diego Prado Gesto
ebb0317276 Merge branch 'master' into fix_unit_tests 2018-08-14 17:23:23 +02:00
Diego Prado Gesto
230dac1b9f
Merge pull request #4236 from Ultimaker/UM3extended_variant_fix 
Fix UM3extended 0.25 variant file
 2018-08-14 17:17:50 +02:00
Diego Prado Gesto
77c5a94db2 Fix some test in the CuraContainerRegistry. 
Delete a test that needs a ContainerProvider. We need to discuss if we
want to add it back, depending if we are still keeping the providers.

Contributes to CURA-5628.
 2018-08-14 17:14:30 +02:00
Diego Prado Gesto
b85950b128 Fix tests in the ExtruderStack. 
Contributes to CURA-5628.
 2018-08-14 15:40:11 +02:00
Diego Prado Gesto
e1fd9b03a4 Remove all dependencies of the CuraContainerStack with the 
ContainerRegistry.

That will be very helpful for creating unit tests. Also this is not
needed because the next stack is always set in the machine or extruder
manager when switching printers.

Contributes to CURA-5628.
 2018-08-14 15:35:00 +02:00
Diego Prado Gesto
ce9782b3af Initialize the empty_container in CuraApplication. 
Contributes to CURA-5628.
 2018-08-14 15:32:04 +02:00
DavidGergely
05bfee8158 Fix UM3extended 0.25 variant file 
Set ultimaker3_extended_aa0.25.inst.cfg to be the same as the ultimaker3_aa0.25.inst.cfg.
 2018-08-14 15:26:52 +02:00
Diego Prado Gesto
1364370ede Fix global stack tests. 
Contributes to CURA-5628.
 2018-08-14 13:49:37 +02:00
Diego Prado Gesto
c8af4f45ce Decouple the creation of the stack containers from the process that add 
them to the container registry, that is done in CuraApplication.

That allow us to have access to the empty containers and so we can unit
test easily without mocking up stuff.

Contributes to CURA-5628.
 2018-08-14 13:25:56 +02:00
Lipu Fei
746644e6ed Merge branch 'master' of github.com:Ultimaker/Cura 2018-08-14 12:02:23 +02:00
Lipu Fei
5869644b0b Fix typo 2018-08-14 12:02:11 +02:00
Diego Prado Gesto
db7f1242cd Fix some unit tests. 
Add fixtures to the conftest file and clean-up the code a bit.

Contributes to CURA-5628
 2018-08-14 10:41:38 +02:00
Diego Prado Gesto
be021b8fac Merge branch 'master' of github.com:Ultimaker/Cura 2018-08-13 17:04:52 +02:00
Diego Prado Gesto
848e99a4ba Don't show the hint message when the buildplate selector is shown. 
Contributes to CURA-5570.
 2018-08-13 17:04:13 +02:00
Ian Paschal
f91254c7c0 Fix typo in comment 2018-08-13 15:27:01 +02:00
Ghostkeeper
6ffe0a9083
Fix indent and typo 2018-08-13 14:47:51 +02:00