Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

CHANGELOG.md

@@ -2,6 +2,22 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.5.6] - 2019-10-17
+We've updated the UI during the vbox / buy phase to give a better indication of valid actions.
+
+### Changed
+ - Borders for skill combo's represent the base colours.
+    - Heal (GG) has a green border, Siphon (BG) has an alternating blue / green border etc.
+    - Borders are shown for items in inventory and as equipped skills during both phases.
+
+ - Improvements to making item combo's
+     - If you select an item in your inventory it will now highlight other items that are valid for combining.
+     - This includes items that can be bought and in your inventory.
+
+ - Improved the indicator for where to click for equipping and buying items where its valid.
+    - Now slowly flashes between black and grey, previously changed the border once.
+
+
 ## [1.5.5] - 2019-10-15
 ### Changed
 * Purge