SkyratBot
98baf80ecf
[MIRROR] Exit on DreamMaker warnings in CI Windows build + Tools reset ( #7784 )
...
* Exit on DreamMaker warnings in CI Windows build
* a
* AAAAAAAAAAAAAAAAA
* AAAAAA
* F
* a
* Update .github/gbp.toml
* Update .github/gbp.toml
* Update .github/gbp.toml
* Update .github/gbp.toml
Co-authored-by: mokulus <36231852+mokulus@users.noreply.github.com >
Co-authored-by: Gandalf <jzo123@hotmail.com >
2021-09-01 16:41:46 +01:00
Gandalf
c437a34fe0
TGUI hardset ( #5252 )
...
* FFFF
* AAA
* FUCK WE MISSED THIS PR
* Update interface.dm
2021-04-27 17:13:22 +01:00
SkyratBot
1f70a0142e
tgui: ESLint and VSCode settings improvements ( #4354 )
...
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com >
2021-03-24 12:58:58 +00:00
SkyratBot
c487c73f39
[MIRROR] Grep for space indentation ( #1969 )
...
* Grep for space indentation
* aa
* Update species.dm
* Update species.dm
* Update maps.dm
* Update examine.dm
Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com >
Co-authored-by: Azarak <azarak10@gmail.com >
2020-12-01 12:26:41 +01:00
jdawg1290
62676e72a8
Force LF line endings with gitattributes and convert repo ( #52266 )
...
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com >
2020-07-16 03:02:40 +03:00
Tad Hardesty
2106e3a1b2
Add a Python script to fix DMI conflicts
...
It hooks into git as a merge driver and automatically runs with merges.
It prints a log of what it did, and if any specific states are
conflicted it indicates them and does not mark the merge as successful.
The conflicting icon can then be opened in DreamMaker and the
conflicting states resolved there.
2018-05-21 15:37:52 -07:00
Francis Devine
1cc7f13e5f
Merge remote-tracking branch 'upstream/master' into ihateuall
...
Conflicts:
.gitattributes
2015-12-17 15:41:08 +13:00
Francis Devine
fde15613d4
attributes revert
2015-12-17 15:33:33 +13:00
Francis Devine
386ff29636
Slight modification to git attributes
2015-12-17 15:19:34 +13:00
oranges
3e46ad2d2d
Adjust attributes file slightly
2015-12-17 14:12:37 +13:00
oranges
2d2d00462e
Binary dmi and dmm
2015-12-16 10:41:28 +13:00
oranges
8d282b7fea
Added git attributes
2015-12-16 10:40:48 +13:00
Tkdrg
553ce69257
Adds the dmitool icon merger from baystation12
...
Credits to GinjaNinja32@bay12 for developing dmitool and
PsiOmegaDelta@bay12 for some of these scripts. Thanks also to
neersighted for reminding me that we need this.
Basically this is like the map merger, except for icons. You can install
a hook using the instructions in the dmitool folder, and it should
automatically merge your DMIs for you. This means you can solve icon
conflicts effortlessly most of the time.
2015-11-28 03:47:26 -03:00
Mloc-Argent
002cd976d6
repo: make changelog easier to merge
...
The changelog now uses union merges to reduce conflicts.
Changed the EOL in changelog.html to CRLF to help even more.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-06-12 18:30:08 +01:00
Mloc-Hibernia
28973b79e2
removes the crlf bits from .gitattributes
...
that shouldn't have been merged.
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
2014-03-25 09:11:47 +00:00
Mloc-Hibernia
70524cb214
Re-adds the crlf-forcing .gitattributes settings
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
2014-03-24 08:53:40 +00:00
Razharas
3ea1e4cf39
Trying to fix EOFs
...
Jesus lord please let it work
2014-02-05 19:01:21 +04:00
Mloc-Argent
a677ae8377
Adds crlf default to .gitattributes for most text file types we use.
...
Massive green/red is to the best of my knowledge caused by files being nearly entirely LF.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-02-04 15:14:39 +00:00
cib
4b4a607ee8
Added the .gitattributes
...
Likely won't make a difference though, even with that you need to manually edit its contents into your .git directory.
2013-04-02 07:46:49 +02:00
