diff --git a/.gitignore b/.gitignore index 4e7337de..318dbdf6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,135 +1,63 @@ -# Logs -logs +*.iml +*.ipr +*.iws +*.lcov *.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* -.pnpm-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids *.pid -*.seed *.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +*.seed +*.tgz +*.tsbuildinfo +.cache +.cache/ +.docusaurus +.dynamodb/ +.env +.env.development.local +.env.local +.env.production.local +.env.test.local +.eslintcache +.fusebox/ .grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration +.idea/ .lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory +.next +.node_repl_history .npm - -# Optional eslint cache -.eslintcache - -# Optional stylelint cache -.stylelintcache - -# Microbundle cache +.nuxt +.nyc_output +.parcel-cache +.pnp.* +.pnpm-debug.log* .rpt2_cache/ .rts2_cache_cjs/ .rts2_cache_es/ .rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variable files -.env -.env.development.local -.env.test.local -.env.production.local -.env.local - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# vuepress v2.x temp and cache directory -.temp - -# Docusaurus cache and generated files -.docusaurus - -# Serverless directories .serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file +.stylelintcache +.temp .tern-port - -# Stores VSCode versions used for testing VSCode extensions .vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged +.vuepress/dist +.yarn-integrity .yarn/build-state.yml +.yarn/cache .yarn/install-state.gz -.pnp.* - -# Intellij project files (Colack uses Webstorm LMFAO) -.idea/ -*.iml -*.ipr -*.iws \ No newline at end of file +.yarn/unplugged +bower_components +build/Release +coverage +dist +jspm_packages/ +lerna-debug.log* +lib-cov +logs +node_modules/ +npm-debug.log* +out +pids +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json +web_modules/ +yarn-debug.log* +yarn-error.log* \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 435c2b06..af95ad34 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "Turbo"] path = Turbo url = https://github.com/WatermelonKatanaDevs/TurboWarp.git -[submodule "Scripts"] - path = Scripts +[submodule "shell-scripts"] + path = shell-scripts url = https://github.com/WatermelonKatanaDevs/Shell-Scripts.git diff --git a/.mailmap b/.mailmap index 9f12288e..a2ebed9f 100644 --- a/.mailmap +++ b/.mailmap @@ -1,3 +1,3 @@ -Jack Spencer +Jack Spencer DragonFireGames LGM Productions diff --git a/Turbo b/Turbo index 678b323b..7cb5aeb3 160000 --- a/Turbo +++ b/Turbo @@ -1 +1 @@ -Subproject commit 678b323bc55d13e97c028c1006fd63fef80b32b5 +Subproject commit 7cb5aeb3716d70a832abbbe3c7fe711a6a8ed15f diff --git a/Scripts b/shell-scripts similarity index 100% rename from Scripts rename to shell-scripts