diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2021-06-16 19:04:54 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2021-06-16 19:04:54 +0300 |
| commit | 611208368ca5ab40d91453a7084938429bce7dab (patch) | |
| tree | d4e5df410abe5ada3fbdbde919ca8e5115006192 /resources/definitions/mingda_base.def.json | |
| parent | d788bab150657c54f9a6cd238c52a4352237e813 (diff) | |
| parent | 92ff9ac31367dece80c40700e4cbf585e19dd421 (diff) | |
Merge branch 'master' into libArachne_rebased
Conflicts:
cura/CuraApplication.py: Setting version
fdmprinter and fdmextruder: Setting version
intents, qualities and variants: Setting version
Changelog: 4.9.1 was added, should be below Arachne changes
Diffstat (limited to 'resources/definitions/mingda_base.def.json')
| -rw-r--r-- | resources/definitions/mingda_base.def.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/resources/definitions/mingda_base.def.json b/resources/definitions/mingda_base.def.json index 4fc1fd3bbb..5dd9eeed7a 100644 --- a/resources/definitions/mingda_base.def.json +++ b/resources/definitions/mingda_base.def.json @@ -1,11 +1,11 @@ { - "name": "MINGDA Base Printer", + "name": "Mingda Base Printer", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": false, - "author": "cataclism", - "manufacturer": "MINGDA", + "author": "Cataclism", + "manufacturer": "Mingda", "file_formats": "text/x-gcode", "first_start_actions": ["MachineSettingsAction"], |