Merge branch 'master' into 1.13.2

This commit is contained in:
Leijurv
2019-09-30 17:52:47 -07:00
198 changed files with 10431 additions and 1334 deletions

2
.gitignore vendored
View File

@@ -16,6 +16,8 @@ classes/
# IntelliJ Files
.idea/
*.iml
*.ipr
*.iws
/logs/
# Copyright Files