Merge pull request #76 from tanjeffreyz/dev

Dev
tanjeffreyz · May 27, 2022 · d17376f · d17376f
2 parents b6871b0 + 38f827e
commit d17376f
Show file tree

Hide file tree

Showing 58 changed files with 622 additions and 1,369 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 __pycache__/
 assets/models/
 .idea/
-.keybinds
+.settings/
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "resources"]
+	path = resources
+	url = https://github.com/tanjeffreyz/auto-maple-resources.git
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/assets/ding.mp3 → assets/alerts/ding.mp3 b/assets/ding.mp3 → assets/alerts/ding.mp3
diff --git a/assets/alerts/rune_appeared.mp3 b/assets/alerts/rune_appeared.mp3
diff --git a/assets/alert.mp3 → assets/alerts/siren.mp3 b/assets/alert.mp3 → assets/alerts/siren.mp3
diff --git a/command_books/blaster.py b/command_books/blaster.py