.gitmodules

@@ -2,10 +2,6 @@
 	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
@@ -13,5 +9,8 @@
 [submodule "scad/MCAD"]
 	path = scad/MCAD
 	url = https://github.com/openscad/MCAD.git
-	branch = master
+	ignore = dirty
+[submodule "scad/takeup"]
+	path = scad/takeup
+	url = https://git.sixteenmillimeter.com/modules/takeup.git
 	ignore = dirty

app/data/cfg.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.157",
+  "version": "1.8.155",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {

app/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mcopy-app",
-  "version": "1.8.157",
+  "version": "1.8.155",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcopy-app",
-  "version": "1.8.157",
+  "version": "1.8.155",
   "description": "GUI for the mcopy small gauge film optical printer platform",
   "main": "main.js",
   "scripts": {

data/cfg.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.157",
+  "version": "1.8.155",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "mcopy",
-  "version": "1.8.157",
+  "version": "1.8.155",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mcopy",
-      "version": "1.8.157",
+      "version": "1.8.155",
       "license": "MIT",
       "dependencies": {
         "alert": "file:app/lib/alert",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcopy",
-  "version": "1.8.157",
+  "version": "1.8.155",
   "description": "Small gauge film optical printer platform",
   "main": "build.js",
   "directories": {

processing/mcopy/cfg.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.157",
+  "version": "1.8.155",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {

scad/sprocketed_roller

@@ -1 +1 @@
-Subproject commit e108b53ced5fd86dd283baaa6c911964d54ecf40
+Subproject commit 20a8d0c5af82aa58307e05af2722720edda258b6