Merge upstream Changes #2

Open
KainTim wants to merge 9 commits from realBritakee/main into main
Showing only changes of commit a1f96f58e6 - Show all commits

4
.gitignore vendored
View File

@@ -38,7 +38,9 @@ bin/
/.nb-gradle/ /.nb-gradle/
# VS Code # VS Code
.vscode/ .vscode/*
!.vscode/java-formatter.xml
!.vscode/settings.json
# Mac OS # Mac OS
.DS_Store .DS_Store