diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2021-10-24 13:04:36 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-24 13:04:36 -0300 |
| commit | b2747aa8b4186034d6621e8e3eccc44d14ec27a7 (patch) | |
| tree | d2f3616c1e75f7a2781043269e41521f6bb76e23 /tools/ZAPDConfigs | |
| parent | dcf44596d2c335c1ad82ea50f7e7d934e6bc1e52 (diff) | |
Subrepos updates (#360)
* git subrepo pull tools/asm-differ --force
subrepo:
subdir: "tools/asm-differ"
merged: "d218cdf0"
upstream:
origin: "https://github.com/simonlindholm/asm-differ.git"
branch: "main"
commit: "d218cdf0"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull tools/graphovl --force
subrepo:
subdir: "tools/graphovl"
merged: "f5fe93d7"
upstream:
origin: "https://github.com/AngheloAlf/graphovl.git"
branch: "master"
commit: "f5fe93d7"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull tools/ZAPD --force
subrepo:
subdir: "tools/ZAPD"
merged: "e7a8a48c"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "e7a8a48c"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull tools/graphovl --force
subrepo:
subdir: "tools/graphovl"
merged: "d14ea084"
upstream:
origin: "https://github.com/AngheloAlf/graphovl.git"
branch: "master"
commit: "d14ea084"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull tools/ZAPD --force
subrepo:
subdir: "tools/ZAPD"
merged: "e243634e"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "e243634e"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull tools/decomp-permuter --force
subrepo:
subdir: "tools/decomp-permuter"
merged: "d1294dfa0"
upstream:
origin: "https://github.com/simonlindholm/decomp-permuter.git"
branch: "main"
commit: "d1294dfa0"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull tools/graphovl --force
subrepo:
subdir: "tools/graphovl"
merged: "f5fe93d75"
upstream:
origin: "https://github.com/AngheloAlf/graphovl.git"
branch: "master"
commit: "f5fe93d75"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull tools/ZAPD --force
subrepo:
subdir: "tools/ZAPD"
merged: "d0cd6b397"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "d0cd6b397"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* add ExternalXMLFolder config
* git subrepo pull --force tools/decomp-permuter
subrepo:
subdir: "tools/decomp-permuter"
merged: "a20bac942"
upstream:
origin: "https://github.com/simonlindholm/decomp-permuter.git"
branch: "main"
commit: "a20bac942"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "4f7b8393e"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "4f7b8393e"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull --force tools/asm-differ
subrepo:
subdir: "tools/asm-differ"
merged: "f30d43ace"
upstream:
origin: "https://github.com/simonlindholm/asm-differ.git"
branch: "main"
commit: "f30d43ace"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* Remove Segment="128"
Diffstat (limited to 'tools/ZAPDConfigs')
| -rw-r--r-- | tools/ZAPDConfigs/MM/Config.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/ZAPDConfigs/MM/Config.xml b/tools/ZAPDConfigs/MM/Config.xml index 2817cf591..657040010 100644 --- a/tools/ZAPDConfigs/MM/Config.xml +++ b/tools/ZAPDConfigs/MM/Config.xml @@ -2,4 +2,12 @@ <SymbolMap File="SymbolMap_MM.txt"/> <ActorList File="ActorList_MM.txt"/> <ObjectList File="ObjectList_MM.txt"/> + + <ExternalXMLFolder Path="assets/xml/"/> + <!-- + !TODO: uncomment this line when the gameplay_keep XML is merged + --> + <!-- + <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/> + --> </Root> |