Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-13 aac0fb36d6b6762f8f28827be417b6dc97e7e34e

 .gitignore

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

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