diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..23f1d1f
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,22 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+ij_any_keep_line_breaks = true
+
+[{*.yml,*.yaml}]
+indent_size = 2
+
+[*.json]
+indent_size = 2
+ij_json_array_wrapping = normal
+ij_json_object_wrapping = normal
+ij_json_keep_blank_lines_in_code = 1
+
+[*.bat]
+end_of_line = crlf
diff --git a/src/main/resources/assets/joy/lang/.editorconfig b/src/main/resources/assets/joy/lang/.editorconfig
new file mode 100644
index 0000000..75d267f
--- /dev/null
+++ b/src/main/resources/assets/joy/lang/.editorconfig
@@ -0,0 +1,2 @@
+[*.json]
+ij_json_property_alignment = do_not_align
diff --git a/src/main/resources/assets/joy/lang/en_us.json b/src/main/resources/assets/joy/lang/en_us.json
index 3c49d56..71d3dee 100644
--- a/src/main/resources/assets/joy/lang/en_us.json
+++ b/src/main/resources/assets/joy/lang/en_us.json
@@ -160,4 +160,4 @@
 
   "tag.item.joy.plushies": "Plushies",
   "tag.item.joy.sharks": "Shark Plushies"
-}
\ No newline at end of file
+}