Merge branch 'master' into unsector

This commit is contained in:
Anuken 2019-01-07 10:38:07 -05:00
commit 47f7507af3

1
.gitignore vendored
View File

@ -15,6 +15,7 @@ logs/
/core/assets-raw/sprites/generated/ /core/assets-raw/sprites/generated/
/core/assets-raw/sprites_out/ /core/assets-raw/sprites_out/
/annotations/build/ /annotations/build/
/annotations/out/
/net/build/ /net/build/
/tools/build/ /tools/build/
/tests/build/ /tests/build/