Merge

2020-01-19 11:10:14 -05:00
parent f7c4ea3e58
commit c0844304a6
259 changed files with 7166 additions and 7198 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ config/
 changelog
 *.gif
 /core/assets/saves/
+/out/

 version.properties