TGUI v4.0

This commit is contained in:
ShadowLarkens
2020-07-17 22:02:11 -07:00
parent 58d1e52311
commit 2992efb823
72 changed files with 2995 additions and 1275 deletions

9
tgui/.gitattributes vendored
View File

@@ -2,9 +2,18 @@
## Enforce text mode and LF line breaks
*.js text eol=lf
*.jsx text eol=lf
*.ts text eol=lf
*.tsx text eol=lf
*.css text eol=lf
*.scss text eol=lf
*.html text eol=lf
*.json text eol=lf
*.yml text eol=lf
*.md text eol=lf
*.bat text eol=lf
yarn.lock text eol=lf
bin/tgui text eol=lf
## Treat bundles as binary and ignore them during conflicts
*.bundle.* binary merge=tgui-merge-bundle