init

2024-05-16 13:07:22 +07:00 · 2024-05-16 13:07:22 +07:00 · 525f75e39b
parent 408c015c94
commit 525f75e39b
2 changed files with 4 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Godot 4+ specific ignores
 .godot/
 android/
@ -18,6 +17,4 @@ export_presets.cfg
 # Mono-specific ignores
 .mono/
 data_*/
-mono_crash.*.json
-
->>>>>>> e5c889106df912758b47dc23ee0a39485278ae3a
+mono_crash.*.json
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -0,0 +1,3 @@
+{
+	"godotTools.editorPath.godot4": "c:\\Program Files\\Godot_v4.3-dev5_mono_win64\\Godot_v4.3-dev5_mono_win64.exe"
+}