Commit Graph

18 Commits

Author SHA1 Message Date
Drathek 7c8bb85de3 Whitespace Standardization [MDB IGNORE] (#15748)
* Update settings

* Whitespace changes

* Comment out merger hooks in gitattributes

Corrupt maps would have to be resolved in repo before hooks could be updated

* Revert "Whitespace changes"

This reverts commit afbdd1d844.

* Whitespace again minus example

* Gitignore example changelog

* Restore changelog merge setting

* Keep older dmi hook attribute until hooks can be updated

* update vscode settings too

* Renormalize remaining

* Revert "Gitignore example changelog"

This reverts commit de22ad375d.

* Attempt to normalize example.yml (and another file I guess)

* Try again
2024-02-20 11:28:51 +01:00
ItsSelis e36e73c03e git related changes from #12863 2022-06-25 19:26:49 +02:00
GinjaNinja32 2248b23c4e dmimerge should be executable 2015-12-10 11:42:47 +00:00
GinjaNinja32 76656a0cf1 Recompile dmitool.jar under Java 7 instead of Java 8 2015-08-05 21:39:59 +01:00
mwerezak 0527e4b05f Adds dmitool import iconstate splicing
Adds the ability to splice in specific directions and/or frames when
importing icon states with dmitool.
2015-06-13 12:19:42 -04:00
mwerezak 1cbfff09d7 Adds python wrapper for dmitool 2015-06-12 00:06:58 -04:00
mwerezak c38d88c06a Updates dmitool to be able to insert specific directions
Adds a direction option to the import command, that causes the imported
icon state is overwrites the specified direction, if nodup is set.
Otherwise, the direction is overwritten on a copy.
2015-06-12 00:01:41 -04:00
Chinsky 3ddd0b480f Merge pull request #8061 from Baystation12/master
master -> wiz
2015-02-06 10:41:12 +03:00
GinjaNinja32 f4435503cc Linux versions of PsiOmegaDelta's git_merge_installer scripts 2015-02-04 10:12:11 +00:00
PsiOmega 0673c9179b Git Merge Installers
There are now two basic bat scripts in dmitool and mapmerge which painlessly inserts the necessary lines for the commit tools to work into .git/config.
2015-02-03 22:02:50 +01:00
GinjaNinja32 aeff099189 Fixes compiled jar being compiled under Java 8 2015-02-03 14:50:39 +00:00
= 73da1156a2 Various improvements; options, version, info
Adds options to PNG importing so that any valid DMI file can be entirely built from PNG files and DMITool.
Adds version string and "version" command
Adds info command to get a list of states easily (the only way previously was to print the descriptor with "dmitool -vvvv verify $file" and parse with e.g. grep/sed)
2015-01-07 17:26:21 +00:00
GinjaNinja32 c49f0f2f89 Add importing PNG files as icon_states 2014-12-02 23:32:05 +00:00
GinjaNinja32 b7032cafca Update help text, guard against illegal values 2014-11-30 20:15:43 +00:00
GinjaNinja32 9018892947 Update DMI state extraction 2014-11-30 20:05:10 +00:00
GinjaNinja32 627626c49d Automatic DMI merge stuff 2014-11-26 21:28:40 +00:00
GinjaNinja32 a17cb4c7d2 Slightly more sensible defaults for diff output with +q 2014-11-26 20:58:30 +00:00
GinjaNinja32 d9a6b5ad11 DMI tool initial commit 2014-11-26 20:32:24 +00:00