Merge pull request #53 from NoobTaco/develop

Develop
NoobTaco · Sep 10, 2024 · 255cb94 · 255cb94
2 parents 4c4eefc + d210a03
commit 255cb94
Show file tree

Hide file tree

Showing 17 changed files with 782 additions and 825 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,9 +39,7 @@ luac.out
 *.x86_64
 *.hex
 
-<<<<<<< HEAD
 .vscode
-=======
-.vscode
-
->>>>>>> 1.4.2
+.editorconfig
+.pkgmeta
+.README.bbc