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

[cherry-pick] Fix invalid role name 

Cherry-pick of 001e608aa7

Conflicts (used version from master):
	docs/changelog.txt
develop
lethosor 2021-05-11 19:46:01 -04:00
parent 102f0437a4
commit 5d397ad0b0
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf.py
Unescape Escape View File

@ -209,7 +209,7 @@ extlinks = {
'bug': ('https://www.bay12games.com/dwarves/mantisbt/view.php?id=%s', 'bug': ('https://www.bay12games.com/dwarves/mantisbt/view.php?id=%s',
'Bug '), 'Bug '),
'source': ('https://github.com/DFHack/dfhack/tree/develop/%s', ''), 'source': ('https://github.com/DFHack/dfhack/tree/develop/%s', ''),
'source:scripts': ('https://github.com/DFHack/scripts/tree/master/%s', ''), 'source-scripts': ('https://github.com/DFHack/scripts/tree/master/%s', ''),
'issue': ('https://github.com/DFHack/dfhack/issues/%s', 'Issue '), 'issue': ('https://github.com/DFHack/dfhack/issues/%s', 'Issue '),
'commit': ('https://github.com/DFHack/dfhack/commit/%s', 'Commit '), 'commit': ('https://github.com/DFHack/dfhack/commit/%s', 'Commit '),
} }

2
docs/Core.rst
Unescape Escape View File

@ -492,7 +492,7 @@ the root DF folder.
.. admonition:: Tip .. admonition:: Tip
When developing scripts in the :source:scripts:`dfhack/scripts repo <>`, When developing scripts in the :source-scripts:`dfhack/scripts repo <>`,
it may be useful to add the path to your local copy of the repo with ``+``. it may be useful to add the path to your local copy of the repo with ``+``.
This will allow you to make changes in the repo and have them take effect This will allow you to make changes in the repo and have them take effect
immediately, without needing to re-install or copy scripts over manually. immediately, without needing to re-install or copy scripts over manually.

2
docs/Lua API.rst
Unescape Escape View File

@ -4377,7 +4377,7 @@ the extension omitted. For example:
Scripts can also be placed in other folders - by default, these include Scripts can also be placed in other folders - by default, these include
:file:`raw/scripts` and :file:`data/save/{region}/raw/scripts`, but additional :file:`raw/scripts` and :file:`data/save/{region}/raw/scripts`, but additional
folders can be added (for example, a copy of the folders can be added (for example, a copy of the
:source:scripts:`scripts repository <>` for local development). See :source-scripts:`scripts repository <>` for local development). See
`script-paths` for more information on how to configure this behavior. `script-paths` for more information on how to configure this behavior.
If the first line of the script is a one-line comment (starting with ``--``), If the first line of the script is a one-line comment (starting with ``--``),

2
docs/guides/quickfort-user-guide.rst
Unescape Escape View File

@ -1564,7 +1564,7 @@ Links
- :source:`Quickfort blueprints library <data/blueprints/library>` - :source:`Quickfort blueprints library <data/blueprints/library>`
- :forums:`Quickfort forum thread <176889>` - :forums:`Quickfort forum thread <176889>`
- :issue:`DFHack issue tracker <>` - :issue:`DFHack issue tracker <>`
- :source:scripts:`Quickfort source code <internal/quickfort>` - :source-scripts:`Quickfort source code <internal/quickfort>`
**Related tools:** **Related tools:**