MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'changelog-gen' into develop

develop
lethosor 2018-04-03 11:39:01 -04:00
parent 953673e45d 490946cc5e
commit 5f08ae339f
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/changelog.txt
Unescape Escape View File

@ -35,9 +35,16 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
======== making a new DFHack release! ======== ======== making a new DFHack release! ========
================================================================================ ================================================================================
# Future # Future
## Fixes
- `modtools/item-trigger`: fixed token format in help text
## Misc Improvements ## Misc Improvements
- Reorganized changelogs and improved changelog editing process - Reorganized changelogs and improved changelog editing process
- `modtools/item-trigger`: added support for multiple type/material/contaminant conditions
## Structures
-@ ``renderer``: fixed vtable addresses on 64-bit OS X
================================================================================ ================================================================================
# 0.44.09-alpha1 # 0.44.09-alpha1

2
docs/gen_changelog.py
Unescape Escape View File

@ -60,7 +60,7 @@ def parse_changelog():
if multiline: if multiline:
multiline += line multiline += line
elif '[[[' in line: elif '[[[' in line:
multiline = line multiline = line.replace('[[[', '')
if ']]]' in multiline: if ']]]' in multiline:
line = multiline.replace(']]]', '') line = multiline.replace(']]]', '')

2
library/xml

@ -1 +1 @@
Subproject commit 61a240140332b9e3dbafbd8b3f0455c3bdd617a3 Subproject commit d02e2063c52f685cd4b0d1bc28ba81f0c7b1e70a

2
scripts

@ -1 +1 @@
Subproject commit 4e3b9aa4e32e0b552c01f9a1e4a6eaa3af0cdb58 Subproject commit 7d7dd8a7498e975a19231435e7cb225025042a78