3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
9841 commits 313 branches 275 tags 718 MiB
Commit graph

9841 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
2000ccd8da
Merge branch 'patch-3' of https://github.com/kemiq3d/Cura into kemiq3d-patch-3 2017-08-24 09:07:11 +02:00
Ghostkeeper
5bd575c1aa
Merge branch 'fix_readme_make_definition' of https://github.com/fieldOfView/Cura into fieldOfView-fix_readme_make_definition 2017-08-24 00:11:37 +02:00
Jaime van Kessel
b1160c2c37 Labels in layerview now correctly use font 
Fixes #2309
 2017-08-23 14:02:02 +02:00
Jaime van Kessel
d74d865ec8 Merge branch 'skin_preshrink' of github.com:Ultimaker/Cura 2017-08-23 13:34:21 +02:00
Lipu Fei
5564d80950 Merge branch '2.7' 2017-08-23 13:02:05 +02:00
Jaime van Kessel
904682945a Decreased the value of the u_z_bias, so the plate quad is drawn again. 
CURA-4150
 2017-08-23 12:48:19 +02:00
Lipu Fei
7a2493dd2f Use per-object stack instead of the active extruder 
CURA-4186
 2017-08-23 12:32:20 +02:00
fieldOfView
32a863d9dc Find a material with the correct diameter when adding a printer 2017-08-23 11:13:36 +02:00
Jaime van Kessel
ca1f7430c1 Merge branch 'fix_add_machine_material_diameter' of https://github.com/fieldOfView/Cura 2017-08-23 11:11:45 +02:00
Mark
2d0a4d443d Switch material and print core 
CURA-4147
 2017-08-23 10:54:46 +02:00
Ghostkeeper
b58fb0d05d
Merge branch '2.7' 2017-08-23 09:23:29 +02:00
Ghostkeeper
90860c67c2
Minor tweaks suggested by fieldOfView 
See the comments in this commit: c4d23437f2
 2017-08-23 09:23:04 +02:00
alekseisasin
9363f93467 Merge pull request #2224 from fieldOfView/fix_multiextruder_menus 
Fix multiextruder menus
 2017-08-23 09:08:48 +02:00
Lipu Fei
16764f4750 Create user containers for newly created custom FDM printer extruders 
CURA-4188

The newly created extruder stacks don't have user containers, so the
user changes cannot be saved. This fix makes sure that in the upgrade,
user containers will be created.
 2017-08-22 17:37:25 +02:00
Ghostkeeper
03311132f0
Merge branch 'feature_grid_lines' 2017-08-22 16:41:45 +02:00
Ghostkeeper
18b88065f4
Render build plate slightly lower than grid to prevent Z fighting 
Looks much better.

Contributes to issue CURA-4150.
 2017-08-22 16:40:11 +02:00
Lipu Fei
28670edf8e Align profile dropdown box correctly 
CURA-4147
 2017-08-22 16:11:15 +02:00
Lipu Fei
e17a88fe11 Merge branch '2.7' 2017-08-22 16:06:36 +02:00
alekseisasin
10b50244e0 Merge branch 'master' of github.com:Ultimaker/cura 2017-08-22 14:00:41 +02:00
alekseisasin
a0b7a2d165 Merge branch 'feature_grid_lines' 
CURA-4150
 2017-08-22 13:59:19 +02:00
Mark
64f6cd237f Rename Print tab to Monitor 
CURA-4106
 2017-08-22 13:58:01 +02:00
Lipu Fei
39ab740adb Adding binding for per-object settings to update stack ID 
CURA-4186

The stack ID to use for a setting in per-object settings is not updated
when it is set to limit to extruder.
 2017-08-22 13:35:51 +02:00
Lipu Fei
812e262f39 When deserialising a material, also update the material derived from it 
CURA-4204
 2017-08-22 11:29:35 +02:00
Jaime van Kessel
fd6ee6ee3c Merge branch 'pirate' of github.com:Ultimaker/Cura into 2.7 2017-08-22 10:53:51 +02:00
Lipu Fei
3d75342a11 Stop the loop if any extruder is found 
CURA-4188
 2017-08-22 10:51:14 +02:00
Lipu Fei
72575eaf37 Rename function to _acquireNextUniqueCustomFdmPrinterExtruderStackIdIndex() 
CURA-4188
 2017-08-22 10:44:22 +02:00
Lipu Fei
1332489391 Add comments for upgradeMachineStack() 
CURA-4188
 2017-08-22 10:42:33 +02:00
Ghostkeeper
ab0ab74fe8
Update Creality CR-10 definition 
Michael found these settings to work towards better time estimate and neglegible quality differences.
 2017-08-21 17:08:54 +02:00
Ghostkeeper
25c5c5a888
Add minor grid cells for circular build plates 
Same technique as the major grid cells.

Contributes to issue CURA-4150.
 2017-08-21 10:24:53 +02:00
Ghostkeeper
3b93a9d309
Add grid lines for circular build plates 
Some trigonometry is involved to find the correct lengths for the lines.

Contributes to issue CURA-4150.
 2017-08-21 10:21:25 +02:00
Ghostkeeper
d8dd9c0d3a
More efficient and elegant grid line creation 
Since the zero point is always in the centre, we can just re-use this loop to prevent code duplication and gain a minor speed increase.

Contributes to issue CURA-4150.
 2017-08-21 09:44:39 +02:00
Ghostkeeper
e7c5854694
Make grid size into global variables 
It doesn't need to be a preference, but it should be easy to modify in the code.

Contributes to issue CURA-4150.
 2017-08-21 09:24:31 +02:00
Ghostkeeper
db640c6f3d
Merge branch '2.7' 2017-08-21 00:58:15 +02:00
Ghostkeeper
df88772071
Add input checking for incorrect responses from printers 
We should not crash when getting invalid data. Just put a warning in the log there and ignore the message for the rest.
 2017-08-21 00:57:25 +02:00
Ghostkeeper
d793dc68ea
Add Creality CR-10 
This definition was provided to me via e-mail. The initial data was badly formatted, so I corrected it and verified back with Michael Wildermuth that the new profile worked. Apparently it works, so thank you Michael.
 2017-08-21 00:23:36 +02:00
fieldOfView
43c6801e58 Find a material with the correct diameter when adding a printer 2017-08-20 16:52:56 +02:00
Ghostkeeper
b917511528
Merge branch '2.7' 2017-08-18 16:58:21 +02:00
Ghostkeeper
b7493ae1a8
Also pull limit_to_extruder settings into per-object setting stack 
Only for settings that are limited by a setting on the stack.

Contributes to issue CURA-4186.
 2017-08-18 16:57:13 +02:00
Ghostkeeper
3c36c3427c
Cache top of stack for efficiency 
Otherwise you need to retrieve this container for every key again. Doesn't matter much, but a bit.

Contributes to issue CURA-4186.
 2017-08-18 15:36:15 +02:00
Ghostkeeper
4a788dfbdd
Reduce indentation by inverting input check 
Reads a bit easier.

Contributes to issue CURA-4186.
 2017-08-18 15:02:49 +02:00
Lipu Fei
24d3f8aab1 Put remove some zags settings as child settings 
CURA-3957
 2017-08-18 14:23:09 +02:00
Ghostkeeper
9241cfa5c6
Make tooltip backgrounds dark as well 
Looks very professional.

Contributes to issue CURA-3948.
 2017-08-18 14:19:53 +02:00
Lipu Fei
f0d5187896 Merge remote-tracking branch '2.7' 2017-08-18 13:43:00 +02:00
Lipu Fei
662e3b9cd1 Fix coding style 
CURA-4147
 2017-08-18 13:38:16 +02:00
Lipu Fei
67cfb064e6 Fix upgrading custom FDM printers from 2.5 
CURA-4188

Custom FDM printers in 2.5 don't have multi-extrusion support but they
do since 2.6. Upgrading from 2.5 to 2.6 will not create the missing
extruder stacks for the old custom FDM printers, which causes a crash.
This fix makes sure that all custom FDM printers will have 8 extruder
stacks during the upgrade so that Cura can still start normally and
those printers will still be usable.
 2017-08-18 13:06:46 +02:00
Jaime van Kessel
bab61b7f47 Merge branch 'master' of github.com:Ultimaker/Cura 2017-08-18 11:09:28 +02:00
Jaime van Kessel
1d9ac09053 No longer attempt to create monitorView if none was set 2017-08-18 11:09:02 +02:00
Ghostkeeper
64753f8c8b
Merge branch '2.7' 2017-08-18 10:42:14 +02:00
Ghostkeeper
9a00c07c3d
Also upgrade variants 
Variants can be customised as well, you know.
 2017-08-18 09:59:51 +02:00
Jaime van Kessel
145b6825db Fixes #2284 2017-08-18 09:45:28 +02:00