forked from Aurorastation/Aurora.3
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #20 from skull132/support/dreamboys
Fixes everything and merges master
- Loading branch information
Showing
3,947 changed files
with
520,274 additions
and
477,596 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
[*] | ||
indent_style = space | ||
indent_size = 2 | ||
charset = utf-8 | ||
trim_trailing_whitespace = true | ||
insert_final_newline = true | ||
|
||
[*.dm] | ||
indent_style = tab | ||
indent_size = 4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,60 @@ | ||
# dmm map merger hook | ||
# needs additional setup, see tools/mapmerge/install.txt | ||
*.dmm merge=merge-dmm eol=crlf | ||
|
||
# dmi icon merger hook | ||
# needs additional setup, see tools/dmitool/merging.txt | ||
*.dmi merge=merge-dmi | ||
|
||
# force changelog merging to use union | ||
html/changelog.html merge=union | ||
# dmm map merger hook | ||
# needs additional setup, see tools/mapmerge/install.txt | ||
*.dmm merge=merge-dmm eol=crlf | ||
|
||
# dmi icon merger hook | ||
# needs additional setup, see tools/dmitool/merging.txt | ||
*.dmi merge=merge-dmi | ||
|
||
# force changelog merging to use union | ||
html/changelog.html merge=union | ||
|
||
# Enforce Line Endings | ||
* text=auto | ||
|
||
*.ai binary | ||
*.dmi binary | ||
*.exe binary | ||
*.fla binary | ||
*.gif binary | ||
*.jar binary | ||
*.jpg binary | ||
*.mid binary | ||
*.ogg binary | ||
*.pdb binary | ||
*.png binary | ||
*.psd binary | ||
*.s3m binary | ||
*.sav binary | ||
*.so binary | ||
*.svg binary | ||
*.wav binary | ||
*.xcf binary | ||
*.xlsx binary | ||
|
||
*.awk text | ||
*.bat text | ||
*.conf text | ||
*.cpp text | ||
*.cs text | ||
*.css text | ||
*.dm text | ||
*.dmf text | ||
*.dmm text | ||
*.gitkeep text | ||
*.hook text | ||
*.html text | ||
*.java text | ||
*.js text | ||
*.json text | ||
*.log text | ||
*.map text | ||
*.md text | ||
*.php text | ||
*.py text | ||
*.scss text | ||
*.sh text | ||
*.sql text | ||
*.tmpl text | ||
*.txt text | ||
*.vue text |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,19 @@ | ||
#ignore misc BYOND files | ||
Thumbs.db | ||
*.log | ||
*.rsc | ||
*.int | ||
*.dmb | ||
*.lk | ||
*.backup | ||
*.before | ||
data/ | ||
cfg/ | ||
build_log.txt | ||
|
||
__pycache__/ | ||
*.py[cod] | ||
*$py.class | ||
/.atom-build.json | ||
.vscode/ | ||
#ignore misc BYOND files | ||
Thumbs.db | ||
*.log | ||
*.rsc | ||
*.int | ||
*.dmb | ||
*.lk | ||
*.backup | ||
*.before | ||
data/ | ||
cfg/ | ||
build_log.txt | ||
|
||
__pycache__/ | ||
*.py[cod] | ||
*$py.class | ||
/.atom-build.json | ||
.vscode/ | ||
.vs/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Oops, something went wrong.