Artur 5b7d9a9008 Merge conflict fix

2020-05-13 12:37:18 +03:00

..

appveyor

…

ColonCatcher

…

CreditsTool

…

dmifonts

…

dmitool

…

HitboxExpander

…

hooks

https://github.com/tgstation/tgstation/pull/49330/ and https://github.com/tgstation/tgstation/pull/49982/

2020-04-23 14:19:50 +03:00

HumanScissors

…

MapAtmosFixer

…

mapmerge2

bumping up mapmerge requirements.txt

2020-05-01 21:08:50 +02:00

midi2piano

…

minibot

…

Redirector

Standardises all files from CRLF to LF

2020-01-12 14:28:01 +00:00

Runtime Condenser

…

Spriting Resources

…

SQLAlertEmail

…

SS13SmoothingCutter

…

tgs4_scripts

Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM.

2020-02-11 15:23:03 +01:00

travis

https://github.com/tgstation/tgstation/pull/49330/ and https://github.com/tgstation/tgstation/pull/49982/

2020-04-23 14:19:50 +03:00

UnquotedListAssociations

…

UnstandardnessTestForDM

…

Upload tgstation.rsc to external FTP

…

WebhookProcessor

Update github_webhook_processor.php

2020-04-09 09:13:25 -05:00

deploy.sh

…

DM Line counter.exe

…

expand_filedir_paths.py

…

json_verifier.py

i wonder if chmod permissions are retained after resetting a branch.

2019-11-27 22:43:15 +01:00

linux_build.py

…

makeChangelog.bat

…

ss13_genchangelog.py

newlines.

2019-06-13 22:54:41 +02:00

TGUICompiler.php

…