diff --git a/.gitmodules b/.gitmodules index 827185e..5ffcb00 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,6 +2,10 @@ path = scad/common url = https://git.sixteenmillimeter.com/modules/common.git ignore = dirty +[submodule "scad/takeup"] + path = scad/takeup + url = https://git.sixteenmillimeter.com/modules/takeup.git + ignore = dirty [submodule "scad/sprocketed_roller"] path = scad/sprocketed_roller url = https://git.sixteenmillimeter.com/modules/sprocketed_roller.git @@ -10,7 +14,4 @@ path = scad/MCAD url = https://github.com/openscad/MCAD.git ignore = dirty -[submodule "scad/takeup"] - path = scad/takeup - url = https://git.sixteenmillimeter.com/modules/takeup.git - ignore = dirty + branch = master diff --git a/app/data/cfg.json b/app/data/cfg.json index fd13341..8d9b113 100644 --- a/app/data/cfg.json +++ b/app/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.155", + "version": "1.8.156", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/app/package-lock.json b/app/package-lock.json index 64e6f8e..fcd5d06 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.155", + "version": "1.8.156", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/app/package.json b/app/package.json index 2d76c3d..e93e08e 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.155", + "version": "1.8.156", "description": "GUI for the mcopy small gauge film optical printer platform", "main": "main.js", "scripts": { diff --git a/data/cfg.json b/data/cfg.json index fd13341..8d9b113 100644 --- a/data/cfg.json +++ b/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.155", + "version": "1.8.156", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/package-lock.json b/package-lock.json index b5f0870..1ec790b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mcopy", - "version": "1.8.155", + "version": "1.8.156", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mcopy", - "version": "1.8.155", + "version": "1.8.156", "license": "MIT", "dependencies": { "alert": "file:app/lib/alert", diff --git a/package.json b/package.json index 6b05f59..4765a2c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mcopy", - "version": "1.8.155", + "version": "1.8.156", "description": "Small gauge film optical printer platform", "main": "build.js", "directories": { diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json index fd13341..8d9b113 100644 --- a/processing/mcopy/cfg.json +++ b/processing/mcopy/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.155", + "version": "1.8.156", "ext_port": 1111, "profiles": { "mcopy": {