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

2018-03-14 09:29:35 -04:00 · 2018-03-14 09:29:35 -04:00 · 02569b1dac
parent 40d3b9b782 7a333e312e
commit 02569b1dac
6 changed files with 7 additions and 7 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -135,8 +135,8 @@ if (NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhac
 endif()

 # set up versioning.
-set(DF_VERSION "0.44.06")
-set(DFHACK_RELEASE "alpha0")
+set(DF_VERSION "0.44.07")
+set(DFHACK_RELEASE "alpha1")
 set(DFHACK_PRERELEASE TRUE)

 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
--- a/library/lua/gui.lua
+++ b/library/lua/gui.lua
@ -105,7 +105,7 @@ local function parse_inset(inset)
        l = inset or 0
        t,r,b = l,l,l
    end
-    return l,r,t,b
+    return l,t,r,b
 end

 function inset_frame(rect, inset, gap)
--- a/library/xml
+++ b/library/xml
@ -1 +1 @@
-Subproject commit 2e97088b1b573ff8f1a6e73b3478838ec8c32b41
+Subproject commit dd558ca1ea4645f14a7e5b83329d4f59d8414496
--- a/plugins/isoworld
+++ b/plugins/isoworld
@ -1 +1 @@
-Subproject commit 3ff3f05da53077dd9e67c1eef672427a2bfd95ea
+Subproject commit fbbf9e46458e41707c27f2a4438452a579490db1
--- a/plugins/stonesense
+++ b/plugins/stonesense
@ -1 +1 @@
-Subproject commit 5482849c52dfac9f8200af3827d16bfb3fabb899
+Subproject commit 4c3728880a1b8d94046283be28d2078aac9fbe05
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 7935e1befd9d3009bf833829c4f5e0e8acb0c65b
+Subproject commit be21a2a52084e838e4b5eb1f296a03d5592389f8