Merge branch '3.7'

This commit is contained in:
Dylan K. Taylor 2019-04-13 14:27:14 +01:00
commit 6428ca2a42

1
.gitignore vendored
View File

@ -14,6 +14,7 @@ server.properties
/plugin_list.yml
memory_dumps/*
resource_packs/
server.lock
# Common IDEs
.idea/