Prepare release of 1.3.6rc2

CHANGELOG.md

@@ -1,5 +1,24 @@
 # OctoPrint Changelog
 
+## 1.3.6rc2 (2017-12-05)
+
+### Note for upgraders and plugin authors: Change in the bundling of JS assets can lead to issues in plugins
+
+A change to solve issues with plugins bundling JS assets that cause interference with other plugins (e.g. through the declaration of `"use strict"`) and in general to add better isolation and error handling might cause errors for some plugins that go beyond your run-off-the-mill view model and also implicitly declare new globals.
+
+If you happen to run into any such issues, you can switch back to the old way of bundling JS assets via the newly introduced "Settings > Feature > Enable legacy plugin asset bundling" toggle (check it, save the settings, restart the server). This is provided to allow for a minimally invasive adjustment period until affected plugins have been updated.
+
+You can find out more about the change, how to know if a plugin is even affected and what do about it [on the OctoBlog](http://octoprint.org/blog/2017/12/01/heads-up-plugin-authors/).
+
+### Bug fixes
+
+  * [#2262](https://github.com/foosel/OctoPrint/issues/2262) - Fixed a bug causing `Error:checksum mismatch, Last Line: ...` errors from the firmware to be handled incorrectly.
+  * [#2267](https://github.com/foosel/OctoPrint/issues/2267) - Fixed a bug causing the GCODE viewer to not get properly initialized due to a JS error on load if "Also show next layer" was selected.
+  * [#2268](https://github.com/foosel/OctoPrint/issues/2268) - Fixed a bug causing a display error with the temperature offsets. If one offset was changed, all others seemed to revert back to 0.
+  * Fixed ordering of plugin assets, should be alphabetical based on the plugin identifier.
+
+([Commits](https://github.com/foosel/OctoPrint/compare/1.3.6rc1...1.3.6rc2))
+
 ## 1.3.6rc1 (2017-12-01)
 
 ### Note for upgraders and plugin authors: Change in the bundling of JS assets can lead to issues in plugins

SUPPORTERS.md

@@ -38,14 +38,12 @@ thanks to everyone who contributed!
   * Marcus Ackermann
   * Mark Qvist
   * Mark Walker
-  * Masayoshi Mitsui
   * Michael Aumock
   * Miles Flavel
   * mitchell hirsch
   * Mohammed khorakiwala
   * Noe Ruiz
   * Patrick McGinnis
-  * Peter Grace
   * Peter Schmehl
   * PRINT3Dforum.com
   * Robert Gusek
@@ -61,4 +59,4 @@ thanks to everyone who contributed!
   * Timeshell.ca
   * Trent Shumay
 
-and 1151 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel)!
+and 1144 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel)!

translations/messages.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: OctoPrint 1.3.6.dev192+ge9d17f0f.dirty\n"
+"Project-Id-Version: OctoPrint 1.3.6rc2.dev10+g41eb9481\n"
 "Report-Msgid-Bugs-To: i18n@octoprint.org\n"
-"POT-Creation-Date: 2017-11-30 18:14+0100\n"
+"POT-Creation-Date: 2017-12-05 12:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -349,6 +349,17 @@ msgid ""
 msgstr ""
 
 #: src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2:9
+#: src/octoprint/templates/snippets/settings/server/serverPluginBlacklistDescription.jinja2:7
+#, python-format
+msgid ""
+"\n"
+"    By default, OctoPrint will use the blacklist hosted at "
+"<code>plugins.octoprint.org/blacklist.json</code> which you\n"
+"    can also take a look at in a more human readable format <a "
+"href=\"%(url)s\" target=\"_blank\">here</a>.\n"
+msgstr ""
+
+#: src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2:14
 msgid ""
 "\n"
 "    Please decide whether to allow fetch and use of this centralized "
@@ -357,15 +368,15 @@ msgid ""
 "Server right from within OctoPrint.\n"
 msgstr ""
 
-#: src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2:15
+#: src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2:20
 msgid "Disable Plugin Blacklist Processing"
 msgstr ""
 
-#: src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2:16
+#: src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2:21
 msgid "Enable Plugin Blacklist Processing"
 msgstr ""
 
-#: src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2:20
+#: src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2:25
 msgid ""
 "\n"
 "        Plugin blacklist processing is <strong class=\"text-"
@@ -373,7 +384,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2:23
+#: src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2:28
 msgid ""
 "\n"
 "        Plugin blacklist processing is <strong class=\"text-"