Merge remote-tracking branch 'upstream/develop' into buildingplan_refactor

docs/changelog.txt

@@ -33,7 +33,11 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+## New Plugins
+- `xlsxreader`: provides an API for Lua scripts to read Excel spreadsheets
+
 ## Fixes
+- `buildingplan`: fixed handling of buildings that require buckets
 - `getplants`: fixed a crash that could occur on some maps
 - `search`: fixed an issue causing item counts on the trade screen to display inconsistently when searching
 - `stockpiles`: fixed a crash when loading food stockpiles

library/lua/dfhack/buildings.lua

@@ -73,13 +73,13 @@ local building_inputs = {
         {
             item_type=df.item_type.SMALLGEM,
             quantity=3,
-            vector_id=df.job_item_vector_id.ANY_GENERIC35
+            vector_id=df.job_item_vector_id.SMALLGEM
         }
     },
     [df.building_type.Well] = {
         {
             item_type=df.item_type.BLOCKS,
-            vector_id=df.job_item_vector_id.ANY_GENERIC35
+            vector_id=df.job_item_vector_id.BLOCKS
         },
         {
             name='bucket',
@@ -116,7 +116,7 @@ local building_inputs = {
     [df.building_type.ScrewPump] = {
         {
             item_type=df.item_type.BLOCKS,
-            vector_id=df.job_item_vector_id.ANY_GENERIC35
+            vector_id=df.job_item_vector_id.BLOCKS
         },
         {
             name='screw',
@@ -140,10 +140,10 @@ local building_inputs = {
     [df.building_type.GrateWall] = { { item_type=df.item_type.GRATE, vector_id=df.job_item_vector_id.GRATE } },
     [df.building_type.GrateFloor] = { { item_type=df.item_type.GRATE, vector_id=df.job_item_vector_id.GRATE } },
     [df.building_type.BarsVertical] = {
-        { item_type=df.item_type.BAR, vector_id=df.job_item_vector_id.ANY_GENERIC35 }
+        { item_type=df.item_type.BAR, vector_id=df.job_item_vector_id.BAR }
     },
     [df.building_type.BarsFloor] = {
-        { item_type=df.item_type.BAR, vector_id=df.job_item_vector_id.ANY_GENERIC35 }
+        { item_type=df.item_type.BAR, vector_id=df.job_item_vector_id.BAR }
     },
     [df.building_type.GearAssembly] = {
         {
@@ -248,7 +248,7 @@ local workshop_inputs = {
     [df.workshop_type.Ashery] = {
         {
             item_type=df.item_type.BLOCKS,
-            vector_id=df.job_item_vector_id.ANY_GENERIC35
+            vector_id=df.job_item_vector_id.BLOCKS
         },
         {
             name='barrel',
@@ -514,4 +514,4 @@ function buildings.constructBuilding(info)
     )
 end
 
-return buildings
+return buildings

library/modules/Items.cpp

@@ -379,6 +379,7 @@ bool ItemTypeInfo::matches(const df::job_item &item, MaterialInfo *mat, bool ski
         break;
 
     case BUCKET:
+        OK(2,lye_milk_free);
     case FLASK:
         OK(1,milk);
         xmask1.bits.cookable = true;

scripts

@@ -1 +1 @@
-Subproject commit 436b98f6b2dd8a8a845e5eccaeaecd5024dc1b9f
+Subproject commit 0d7fbec48e959ba88c885975aecbb034fa5f5c57