Merge branch 'Ultimaker:master' into master

This commit is contained in:
goofoo3d 2021-07-30 10:44:52 +08:00 committed by GitHub
commit 435a6f6170
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions

11
CITATION.cff Normal file
View File

@ -0,0 +1,11 @@
# YAML 1.2
---
authors:
cff-version: "1.1.0"
date-released: 2021-06-28
license: "LGPL-3.0"
message: "If you use this software, please cite it using these metadata."
repository-code: "https://github.com/ultimaker/cura/"
title: "Ultimaker Cura"
version: "4.10.0"
...

View File

@ -30,7 +30,6 @@ requests==2.22.0
sentry-sdk==0.13.5 sentry-sdk==0.13.5
six==1.12.0 six==1.12.0
trimesh==3.2.33 trimesh==3.2.33
urllib3==1.25.6
zeroconf==0.24.1 zeroconf==0.24.1
comtypes==1.1.7 comtypes==1.1.7
pywin32==300 pywin32==300