Merge branch 'development' into feature/msp_fields_update

# Conflicts: # totalRP3/core/impl/globals.lua # totalRP3/modules/register/characters/register_characteristics.lua # totalRP3/modules/register/characters/register_ui_characteristics.xml # totalRP3/modules/register/main/register_tooltip.lua # totalRP3/modules/register/msp/register_msp.lua
Ellypse · Feb 1, 2019 · eb1ac1d · eb1ac1d
2 parents 8426222 + 5e86b56
commit eb1ac1d
Show file tree

Hide file tree

Showing 215 changed files with 55,765 additions and 44,523 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -8,7 +8,7 @@ root = true
 # - UTF-8 encoding
 # - TABS!
 [*]
-end_of_line = crlf
+end_of_line = unset
 charset = utf-8
 indent_style = tab
 
@@ -18,4 +18,4 @@ end_of_line = lf
 # CurseForge's .pkgmeta file has to be indented with spaces
 [.pkgmeta]
 indent_style = space
-indent_size = 2
+indent_size = 2
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitmodules b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "totalRP3/libs/Ellyb"]
 	path = totalRP3/libs/Ellyb
 	url = https://github.com/Ellypse/Ellyb
-[submodule "Documents/Scripts/mature-dict"]
-	path = Documents/Scripts/mature-dict
+[submodule "Scripts/mature-dict"]
+	path = Scripts/mature-dict
 	url = https://github.com/Ellypse/List-of-Dirty-Naughty-Obscene-and-Otherwise-Bad-Words
 [submodule "totalRP3/libs/LibMSP"]
 	path = totalRP3/libs/LibMSP