GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 08:45:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.1' into main

Browse Source
This commit is contained in:
Ghostkeeper 2022-06-20 11:04:33 +02:00
commit dffb0fc744
No known key found for this signature in database
GPG Key ID: 68F39EA88EEED5FF
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/3MFReader/ThreeMFWorkspaceReader.py
View File

@ -1253,12 +1253,12 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
@staticmethod
def _parse_packages_metadata(archive: zipfile.ZipFile) -> List[Dict[str, str]]:
try:
package_metadata = json.loads(archive.open("Metadata/packages.json").read().decode("utf-8"))
package_metadata = json.loads(archive.open("Cura/packages.json").read().decode("utf-8"))
return package_metadata["packages"]
except KeyError:
Logger.warning("No package metadata was found in .3mf file.")
except Exception:
Logger.error("Failed to load packes metadata from .3mf file")
Logger.error("Failed to load packages metadata from .3mf file.")
return []

2
plugins/3MFWriter/ThreeMFWriter.py
View File

@ -41,7 +41,7 @@ catalog = i18nCatalog("cura")
THUMBNAIL_PATH = "Metadata/thumbnail.png"
MODEL_PATH = "3D/3dmodel.model"
PACKAGE_METADATA_PATH = "Metadata/packages.json"
PACKAGE_METADATA_PATH = "Cura/packages.json"
class ThreeMFWriter(MeshWriter):
def __init__(self):