3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'master' into CURA-8609_sync_materials_to_printer

Browse source 
Conflicts:
	cura/Machines/Models/MaterialManagementModel.py -> Both master and my branch added an __init__ function. I merged the two __init__s to do both things that need to be done.
This commit is contained in:
Ghostkeeper 2021-10-06 14:22:18 +02:00
commit b98da6b538
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
21 changed files with 4567 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/themes/cura-light/theme.json
View file

@ -627,7 +627,7 @@
"message_close": [1, 1],
"message_radius": [0.25, 0.25],
"message_action_button": [0, 2.5],
"message_image": [15.0, 5.0],
"message_image": [15.0, 10.0],
"message_type_icon": [2, 2],
"infill_button_margin": [0.5, 0.5],