Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Simon Brooke 2021-06-08 18:21:40 +01:00
commit 9e8d59c2d1
No known key found for this signature in database
GPG key ID: A7A4F18D1D4DF987
46 changed files with 515 additions and 154 deletions

5
.gitignore vendored
View file

@ -5,6 +5,7 @@ pom.xml.asc
*.log
*.stl
[0-9a-f]*-init.clj
/bin/
/lib/
/classes/
/target/
@ -31,3 +32,7 @@ libbulletjme.so
liblwjgl64.so
libopenal64.so
.settings/
.classpath
.project