Merge branch '4.2'

This commit is contained in:
Ghostkeeper 2019-07-10 13:02:26 +02:00
commit 99fbb3e5f1
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
2 changed files with 2 additions and 2 deletions

View file

@ -1,6 +1,6 @@
{
"version": 2,
"name": "Discov3ry Complete (Ultimaker 2+)",
"name": "Discov3ry Complete",
"inherits": "fdmprinter",
"metadata": {
"author": "Andrew Finkle, CTO",

View file

@ -1,6 +1,6 @@
{
"version": 2,
"name": "Type A Machines Series 1 2014",
"name": "Series 1 2014",
"inherits": "fdmprinter",
"metadata": {
"visible": true,