Final fix of .gitmodules by fixing my local scripts

Remove mcad
2025-02-12 22:49:34 -05:00 · 2025-02-12 22:46:53 -05:00 · 2025-02-12 22:46:44 -05:00
9 changed files with 14 additions and 13 deletions
--- 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
@ -9,8 +13,5 @@
 [submodule "scad/MCAD"]
 	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
+	branch = master
 	ignore = dirty
--- a/app/data/cfg.json
+++ b/app/data/cfg.json
@ -1,5 +1,5 @@
 {
-  "version": "1.8.155",
+  "version": "1.8.157",
  "ext_port": 1111,
  "profiles": {
    "mcopy": {
--- a/app/package-lock.json
+++ b/app/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "mcopy-app",
-  "version": "1.8.155",
+  "version": "1.8.157",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
--- a/app/package.json
+++ b/app/package.json
@ -1,6 +1,6 @@
 {
  "name": "mcopy-app",
-  "version": "1.8.155",
+  "version": "1.8.157",
  "description": "GUI for the mcopy small gauge film optical printer platform",
  "main": "main.js",
  "scripts": {
--- a/data/cfg.json
+++ b/data/cfg.json
@ -1,5 +1,5 @@
 {
-  "version": "1.8.155",
+  "version": "1.8.157",
  "ext_port": 1111,
  "profiles": {
    "mcopy": {
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "mcopy",
-  "version": "1.8.155",
+  "version": "1.8.157",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "mcopy",
-      "version": "1.8.155",
+      "version": "1.8.157",
      "license": "MIT",
      "dependencies": {
        "alert": "file:app/lib/alert",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "mcopy",
-  "version": "1.8.155",
+  "version": "1.8.157",
  "description": "Small gauge film optical printer platform",
  "main": "build.js",
  "directories": {
--- a/processing/mcopy/cfg.json
+++ b/processing/mcopy/cfg.json
@ -1,5 +1,5 @@
 {
-  "version": "1.8.155",
+  "version": "1.8.157",
  "ext_port": 1111,
  "profiles": {
    "mcopy": {
--- a/scad/sprocketed_roller
+++ b/scad/sprocketed_roller
@ -1 +1 @@
-Subproject commit 20a8d0c5af82aa58307e05af2722720edda258b6
+Subproject commit e108b53ced5fd86dd283baaa6c911964d54ecf40
Author	SHA1	Message	Date
Matt McWilliams	344e367cd9	Final fix of .gitmodules by fixing my local scripts	2025-02-12 22:49:34 -05:00
Matt McWilliams	93b33f09e2	Remove mcad	2025-02-12 22:46:53 -05:00
Matt McWilliams	72e91a41fb	Remove mcad	2025-02-12 22:46:44 -05:00