Merging changes made on Mason over those made on Illuminator

Only file really affected is buildings/rectangular.clk
This commit is contained in:
Simon Brooke 2021-06-08 23:32:58 +01:00
commit b9fe07042e
23 changed files with 468 additions and 26 deletions

12
.gitignore vendored
View file

@ -18,6 +18,8 @@ pom.xml.asc
.lein-failures
.nrepl-port
.cpcache/
.calva/
.idea/
*~
@ -25,4 +27,14 @@ pom.xml.asc
.settings/
.project
.lsp/sqlite.db
libbulletjme.so
liblwjgl64.so
libopenal64.so
.settings/
.classpath
.project