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

Merge branch 'develop' of gh:dfhack/dfhack into develop

develop
lethosor 2018-03-14 09:29:35 -04:00
parent 40d3b9b782 7a333e312e
commit 02569b1dac
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
Unescape Escape View File

@ -135,8 +135,8 @@ if (NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhac
endif() endif()
# set up versioning. # set up versioning.
set(DF_VERSION "0.44.06") set(DF_VERSION "0.44.07")
set(DFHACK_RELEASE "alpha0") set(DFHACK_RELEASE "alpha1")
set(DFHACK_PRERELEASE TRUE) set(DFHACK_PRERELEASE TRUE)
set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")

2
library/lua/gui.lua
Unescape Escape View File

@ -105,7 +105,7 @@ local function parse_inset(inset)
l = inset or 0 l = inset or 0
t,r,b = l,l,l t,r,b = l,l,l
end end
return l,r,t,b return l,t,r,b
end end
function inset_frame(rect, inset, gap) function inset_frame(rect, inset, gap)

2
library/xml

@ -1 +1 @@
Subproject commit 2e97088b1b573ff8f1a6e73b3478838ec8c32b41 Subproject commit dd558ca1ea4645f14a7e5b83329d4f59d8414496

2
plugins/isoworld

@ -1 +1 @@
Subproject commit 3ff3f05da53077dd9e67c1eef672427a2bfd95ea Subproject commit fbbf9e46458e41707c27f2a4438452a579490db1

2
plugins/stonesense

@ -1 +1 @@
Subproject commit 5482849c52dfac9f8200af3827d16bfb3fabb899 Subproject commit 4c3728880a1b8d94046283be28d2078aac9fbe05

2
scripts

@ -1 +1 @@
Subproject commit 7935e1befd9d3009bf833829c4f5e0e8acb0c65b Subproject commit be21a2a52084e838e4b5eb1f296a03d5592389f8