Additional changes for the merge

This commit is contained in:
Kagami Sascha Rosylight 2023-03-25 08:13:30 +01:00
parent 3b524f32bf
commit efb5e1d1cc
27 changed files with 1048 additions and 11178 deletions

1
.gitignore vendored
View file

@ -55,6 +55,7 @@ api-docs.json
.DS_Store
/files
ormconfig.json
temp
# blender backups
*.blend1