Merge

2019-08-30 16:39:40 -04:00
parent bbadf6795e 6d9a59c60b
commit 7aafa8b150
172 changed files with 6795 additions and 5599 deletions
@@ -19,6 +19,7 @@ logs/
 /tools/build/
 /tests/build/
 /server/build/
+changelog
 saves/
 core/assets/saves/
 /core/assets/saves/
@@ -37,6 +38,7 @@ packr-out/
 config/
 changelog
 *.gif
+/core/assets/saves/

 version.properties