Merge branch 'develop' into automelt

CMakeLists.txt

@@ -189,8 +189,8 @@ if(NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl
 endif()
 
 # set up versioning.
-set(DF_VERSION "50.05")
-set(DFHACK_RELEASE "alpha3.1")
+set(DF_VERSION "50.07")
+set(DFHACK_RELEASE "alpha0")
 set(DFHACK_PRERELEASE TRUE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")

library/lua/gui/widgets.lua

@@ -1638,7 +1638,9 @@ end
 
 function List:postComputeFrame(body)
     self.page_size = math.max(1, math.floor(body.height / self.row_height))
-    self.page_top = math.max(1, math.min(#self.choices - self.page_size + 1))
+    if #self.choices - self.page_size < 0 then
+        self.page_top = 1
+    end
     update_list_scrollbar(self)
 end
 

library/xml

@@ -1 +1 @@
-Subproject commit 68f8bfa92b68ef9bc30da7f5a8ea5cf91f69ea16
+Subproject commit e3c3d6a755de05c36bb7f2ac873d6ccb70410589

scripts

@@ -1 +1 @@
-Subproject commit 112d69ed3e0efb22e3ec6a6c8e58ad3135b80351
+Subproject commit f969699a447fde05b0bd3397a8b1e2ce668bc54d