master #3

Open
cacahuetes wants to merge 881 commits from liza/Questionable:master into cacahuetes-ShB-Healer
2 changed files with 3 additions and 1 deletions
Showing only changes of commit aa2ba3ca9a - Show all commits

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ bin/
/.idea /.idea
/.vs /.vs
*.user *.user
/.vscode

View File

@ -983,7 +983,8 @@
"Souleater", "Souleater",
"Fire III", "Fire III",
"Adloquium", "Adloquium",
"Water Cannon" "Water Cannon",
"Wasshoi"
] ]
} }
}, },