Skip to content

Commit

Permalink
Merge pull request #17 from Colack/main
Browse files Browse the repository at this point in the history
Update git files and submodules
  • Loading branch information
Colack authored Dec 1, 2024
2 parents b38044f + 489b19c commit ad5936c
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 124 deletions.
168 changes: 48 additions & 120 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
.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*
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .mailmap
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Jack Spencer <uniformkitten281@gmail.com> <colack@watermelonkatana.com>
Jack Spencer <colackcolack@proton.me> <colack@watermelonkatana.com>
DragonFireGames <dragonfire7z@outlook.com> <dragonfiregames@watermelonkatana.com>
LGM Productions <calendrgenius@gmail.com>
2 changes: 1 addition & 1 deletion Turbo
Submodule Turbo updated 1 files
+54 −49 README.md

0 comments on commit ad5936c

Please sign in to comment.