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

Merge branch 'develop' into Autonick-Updates

develop
UnFaventia 2023-06-06 12:16:28 +10:00 committed by GitHub
parent 2de77d3f57 b4a804ca0c
commit 48d29de917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
Unescape Escape View File

@ -192,7 +192,7 @@ endif()
# set up versioning. # set up versioning.
set(DF_VERSION "50.08") set(DF_VERSION "50.08")
set(DFHACK_RELEASE "r2") set(DFHACK_RELEASE "r3")
set(DFHACK_PRERELEASE FALSE) set(DFHACK_PRERELEASE FALSE)
set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")

6
docs/changelog.txt
Unescape Escape View File

@ -36,7 +36,6 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
## New Plugins ## New Plugins
## Fixes ## Fixes
- Fix crash for some players when they launch DF outside of the Steam client
## Misc Improvements ## Misc Improvements
- `Autonick`: additional nicknames based on burrowing animals, colours, gems and minerals added - `Autonick`: additional nicknames based on burrowing animals, colours, gems and minerals added
@ -51,6 +50,11 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
## Removed ## Removed
# 50.08-r3
## Fixes
- Fix crash for some players when they launch DF outside of the Steam client
# 50.08-r2 # 50.08-r2
## New Plugins ## New Plugins

2
library/xml

@ -1 +1 @@
Subproject commit 51fe3ca11f9587bc50ed09b768022cd9688250d8 Subproject commit 413f1c0371094a7933db0cd524ff9fad64fb0fe3

2
scripts

@ -1 +1 @@
Subproject commit 315c7afc20651ac0fe1700d720f71796190f198e Subproject commit c356aebcde32199fa7c1d32b65ed5c96d008c1f9