Merge pull request #3461 from myk002/myk_stockpile_settings

[stockpiles] add moar presets

data/stockpiles/barrels.dfstock

@@ -0,0 +1,2 @@
+
+BARREL

docs/changelog.txt

@@ -40,6 +40,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Misc Improvements
 - `autonick`: additional nicknames based on burrowing animals, colours, gems and minerals added
+- `stockpiles`: added ``barrels``, ``organic``, ``artifacts``, and ``masterworks`` stockpile presets
 
 ## Documentation
 

docs/plugins/stockpiles.rst

@@ -143,6 +143,21 @@ item properties that you can match with filters. In addition, there are
 normally at least a few convenient pre-made settings files that manipulate
 interesting category subsets.
 
+Cross-category stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Settings files::
+
+    artifacts
+    masterworks
+
+Example command for a meltable weapons stockpile::
+
+    stockpiles import cat_weapons
+    stockpiles import -m disable cat_weapons -f other/
+    stockpiles import -m disable artifacts
+    stockpiles import -m disable masterworks
+
 Ammo stockpile adjustments
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -369,6 +384,7 @@ Subcategory prefixes::
 Settings files::
 
     pots
+    barrels
     bags
     buckets
     sand