Merge branch 'general-devel' into h/door

This commit is contained in:
Lucas Nicodemus 2021-05-28 23:53:43 -07:00
commit ac5539947a

2
.gitmodules vendored
View file

@ -1,4 +1,4 @@
[submodule "TShockScaffoldAPI"]
[submodule "TerrariaServerAPI"]
path = TerrariaServerAPI
url = https://github.com/NyxStudios/TerrariaAPI-Server.git
ignore = dirty