Skip to content

Commit 9c9b5fd

Browse files
authored
Merge branch 'DFHack:develop' into orders-search
2 parents c474f75 + 67c591c commit 9c9b5fd

4 files changed

Lines changed: 43 additions & 6 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ cmake_policy(SET CMP0048 NEW)
66
cmake_policy(SET CMP0074 NEW)
77

88
# set up versioning.
9-
set(DF_VERSION "53.06")
10-
set(DFHACK_RELEASE "r2rc1")
11-
set(DFHACK_PRERELEASE TRUE)
9+
set(DF_VERSION "53.08")
10+
set(DFHACK_RELEASE "r1")
11+
set(DFHACK_PRERELEASE FALSE)
1212

1313
set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
1414
set(DFHACK_ABI_VERSION 2)

docs/changelog.txt

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,43 @@ Template for new versions:
5454

5555
# Future
5656

57+
## New Tools
58+
59+
## New Features
60+
61+
## Fixes
62+
63+
## Misc Improvements
64+
65+
## Documentation
66+
67+
## API
68+
69+
## Lua
70+
71+
## Removed
72+
73+
# 53.08-r1
74+
75+
## New Tools
76+
77+
## New Features
78+
- compatibility with DF 53.08
79+
80+
## Fixes
81+
82+
## Misc Improvements
83+
84+
## Documentation
85+
86+
## API
87+
88+
## Lua
89+
90+
## Removed
91+
92+
# 53.07-r1
93+
5794
## New Tools
5895
- ``edgescroll``: Introduced plugin to pan the view automatically when the mouse reaches the screen border.
5996
- `infinite-sky`: Re-enabled with compatibility with new siege map data.
@@ -68,8 +105,8 @@ Template for new versions:
68105

69106
## Misc Improvements
70107
- `createitem`: created items can now be placed onto/into tables, nests, bookcases, display cases, and altars
71-
- `keybinding`: keybinds may now include the super key, and are no longer limited to particular keys ranges of keys, allowing any recognized by SDL.
72108
- The ``fpause`` console command can now be used to force world generation to pause (as it did prior to version 50).
109+
- `keybinding`: keybinds may now include the super key, and are no longer limited to particular keys ranges of keys, allowing any recognized by SDL.
73110

74111
## Documentation
75112

scripts

0 commit comments

Comments
 (0)