Merge remote-tracking branch 'origin/master'

Crunchy

2024-06-04 ea7654c0cdb21ec7e8f854df6d0a7367b5e5d6ac

 .gitignore

@@ -19,7 +19,7 @@
*.iml
*.ipr
*.log
*.jar
#*.jar

### NetBeans ###
/nbproject/private/