Merge remote-tracking branch 'origin/master'

.gitignore

@@ -28,4 +28,4 @@ target/
 build/
 
 ### VS Code ###
-.vscode/
+# .vscode/

.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+  "configurations": [
+    {
+      "type": "java",
+      "name": "CodeLens (Launch) - ServerApplication",
+      "request": "launch",
+      "mainClass": "com.totopia.server.ServerApplication",
+      "projectName": "server"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,20 @@
+{
+  "editor.tabSize": 2,
+  "editor.insertSpaces": true,
+  "editor.formatOnSave": true,
+  "editor.formatOnPaste": true,
+  "editor.autoClosingBrackets": "languageDefined",
+  "editor.trimAutoWhitespace": true,
+  "files.trimTrailingWhitespace": true,
+  "files.trimFinalNewlines": true,
+  "git.ignoreLimitWarning": true,
+  "prettier.singleQuote": true,
+
+  "files.exclude": {
+    "**/.classpath": true,
+    "**/.project": true,
+    "**/.settings": true,
+    "**/.factorypath": true
+  },
+  "java.configuration.updateBuildConfiguration": "automatic"
+}