Merge branch 'master-upstream' into merge-upstream

ss220club · Oct 25, 2024 · 931bce3 · 931bce3
2 parents 8122f0f + da2ad3f
commit 931bce3
Show file tree

Hide file tree

Showing 205 changed files with 2,199 additions and 1,237 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -54,6 +54,13 @@
 				"-trusted"
 			],
 			"preLaunchTask": "Build All (low memory mode)"
+		},
+		{
+			"type": "opendream",
+			"request": "launch",
+			"name": "Launch OpenDream (requires extension, 64 bit rustg, and an SS14 account)",
+			"preLaunchTask": "OpenDream: compile ${command:CurrentDME}",
+			"json_path": "${workspaceFolder}/${command:CurrentJson}"
 		}
 	]
 }