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

Merge branch '5.10' into CURA-12386_G-Code-replacement-fails-with-single-line-code

Browse Source
This commit is contained in:
Erwan MATHIEU 2025-02-27 09:23:03 +01:00 committed by GitHub
commit a666116119
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conanfile.py
View File

@ -219,6 +219,9 @@ class CuraConan(ConanFile):
@staticmethod @staticmethod
def _get_license_from_repository(sources_url, version, license_file_name = None): def _get_license_from_repository(sources_url, version, license_file_name = None):
if sources_url.startswith("https://github.com/Ultimaker/") and "private" in sources_url:
return None
git_url = sources_url git_url = sources_url
if git_url.endswith('/'): if git_url.endswith('/'):
git_url = git_url[:-1] git_url = git_url[:-1]

2
resources/definitions/fdmextruder.def.json
View File

@ -7,7 +7,7 @@
"author": "Ultimaker", "author": "Ultimaker",
"manufacturer": "Unknown", "manufacturer": "Unknown",
"position": "0", "position": "0",
"setting_version": 24, "setting_version": 25,
"type": "extruder" "type": "extruder"
}, },
"settings": "settings":

2
resources/definitions/fdmprinter.def.json
View File

@ -6,7 +6,7 @@
"type": "machine", "type": "machine",
"author": "Unknown", "author": "Unknown",
"manufacturer": "Unknown", "manufacturer": "Unknown",
"setting_version": 24, "setting_version": 25,
"file_formats": "text/x-gcode;model/stl;application/x-wavefront-obj;application/x3g", "file_formats": "text/x-gcode;model/stl;application/x-wavefront-obj;application/x3g",
"visible": false, "visible": false,
"has_materials": true, "has_materials": true,