makermadecnc · zaneclaes · Nov 1, 2020 · Nov 5, 2020 · Nov 5, 2020 · Nov 14, 2020
diff --git a/.bowerrc b/.bowerrc
diff --git a/.dockerignore b/.dockerignore
@@ -10,3 +10,10 @@ windows-store
 src
 node_modules
 filesystem.img
+bin
+ci
+obj
+docs
+scripts
+WebApp/build
+WebApp/node_modules
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.gitattributes b/.gitattributes
@@ -5,4 +5,6 @@
 *.css text eol=lf
 *.js  text eol=lf
 *.jsx text eol=lf
+*.ts  text eol=lf
+*.tsx text eol=lf
 *.sh  text eol=lf
diff --git a/.gitignore b/.gitignore
@@ -1,19 +1,54 @@
+# [MAKER_BUILDER_GENERATED]
+/bin
+/hub.env
+
+# [MAKER_HUB_RUNTIME]
+/preferences.json
+/gcode
+*.log
+
+# [COMMON_RIDER]
+.idea/
+
+# [COMMON_YARN]
+/yarn.lock-e
+/yarn-error.log
+/node_modules
+
+# [COMMON_TYPESCRIPT]
+/tsconfig.tsbuildinfo
+
+# [COMMON_MAC]
 .DS_Store
-node_modules
-npm-debug.log
-package-lock.json
-/.eslintcache
-/.nyc_output
-/coverage
-/dist
-/output
-/releases
-windows-store
-filesystem.img
-/packer_cache
-/rpi
-bootstrap.log
-raspberry-pi.img
-.makerverse
-/commands
-/events
+
+#yarn-error.log
+#.idea
+#.DS_Store
+#node_modules
+#npm-debug.log
+#package-lock.json
+#preferences.json
+#logs/makerverse*
+#/.eslintcache
+#/.nyc_output
+#/coverage
+#/dist
+#/output
+#/releases
+#windows-store
+#filesystem.img
+#/packer_cache
+#/rpi
+#bootstrap.log
+#raspberry-pi.img
+#.makerverse
+#MakerverseServerTests/bin/**
+#/commands
+#/events
+#.makerverse-status
+#**/tsconfig.tsbuildinfo
+#WebApp/build
+#build
+#.env
+#hub.env
+#**/*.lock-e
diff --git a/.makerverse.default b/.makerverse.default
diff --git a/.makerverse.docker b/.makerverse.docker
diff --git a/.npmignore b/.npmignore
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+16.4
diff --git a/.stylintrc b/.stylintrc
diff --git a/.travis.yml b/.travis.yml
diff --git a/DesktopApp/.gitignore b/DesktopApp/.gitignore
@@ -0,0 +1,14 @@
+# [MAKER-NPM]
+/dist/
+/build/
+
+# [COMMON_YARN]
+/yarn.lock-e
+/yarn-error.log
+/node_modules
+
+# [COMMON_TYPESCRIPT]
+/tsconfig.tsbuildinfo
+
+# [COMMON_MAC]
+.DS_Store
diff --git a/electron-build/icon.icns → DesktopApp/assets/icon.icns b/electron-build/icon.icns → DesktopApp/assets/icon.icns
diff --git a/electron-build/icon.ico → DesktopApp/assets/icon.ico b/electron-build/icon.ico → DesktopApp/assets/icon.ico