Merge remote-tracking branch 'myk002/myk_deprecate_fortplan' into develop

Conflicts:
	docs/changelog.txt

docs/Plugins.rst

@@ -52,7 +52,7 @@ Options (If only region and name are given, export all):
 :place:     Export stockpile commands to "<name>-place.csv"
 :query:     Export query commands to "<name>-query.csv"
 
-Goes very well with `fortplan`, for re-importing.
+Goes very well with `quickfort`, for re-importing.
 
 .. _remotefortressreader:
 
@@ -2355,8 +2355,12 @@ fortplan
 ========
 Usage: ``fortplan [filename]``
 
+**Fortplan is deprecated.** Please use DFHack's more powerful `quickfort`
+command instead. You can use your existing .csv files. Just move them to the
+``blueprints`` folder in your DF installation, and instead of ``fortplan file.csv`` run ``quickfort run file.csv``.
+
 Designates furniture for building according to a ``.csv`` file with
-quickfort-style syntax. Companion to `digfort`.
+quickfort-style syntax.
 
 The first line of the file must contain the following::
 

docs/changelog.txt

@@ -37,6 +37,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `quickfort`: Dreamfort blueprint set improvements: `significant <http://www.bay12forums.com/smf/index.php?topic=176889.msg8239017#msg8239017>`_ refinements across the entire blueprint set. Dreamfort is now much faster, much more efficient, and much easier to use. The `checklist <https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=1459509569>`__ now includes a mini-walkthrough for quick reference. The spreadsheet now also includes `embark profile suggestions <https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=149144025>`__
 - `quickfort`: added aliases for configuring masterwork and artifact core quality for all stockpile categories that have them; made it possible to take from multiple stockpiles in the ``quantumstop`` alias
 
+## Documentation
+- `fortplan`: fortplan has been replaced by `quickfort`. add deprecation warnings to command output and documentation.
+
 # 0.47.05-beta1
 
 ## Fixes

plugins/fortplan.cpp

@@ -1,3 +1,8 @@
+/*
+ * Fortplan is deprecated. All functionality has moved to the DFHack quickfort
+ * script. Fortplan will be removed in a future DFHack release.
+ */
+
 #include <fstream>
 #include <vector>
 
@@ -194,8 +199,12 @@ std::vector<std::vector<std::string>> tokenizeFile(std::string filename) {
 }
 
 command_result fortplan(color_ostream &out, vector<string> & params) {
-
     auto & con = out;
+    con.print("Fortplan is deprecated. Please move your blueprints to the"
+    " 'blueprints' folder (under your DF installation directory) and use"
+    " DFHack's quickfort command instead:\n  quickfort run example.csv\n"
+    " Fortplan will be removed in a future DFHack release.\n");
+
     std::vector<std::vector<std::string>> layout(128, std::vector<std::string>(128));
     if (params.size()) {
         coord32_t cursor;