Merge branch 'development'

fiendish · May 24, 2017 · fbd6f94 · fbd6f94
2 parents d35b380 + f5afd12
commit fbd6f94
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/MUSHclient/AardwolfPackageChanges.txt b/MUSHclient/AardwolfPackageChanges.txt
@@ -1,5 +1,8 @@
 Aardwolf Client Package Major Changes List
 
+r1919 snapshot
+- bug fix: Bast had changed something in his eq miniwindow to match a change I had made at the same time as I was making a change to match what he had had before, which ended up breaking it again. Let's fix it here to save him more hassle.
+
 r1918 snapshot
 - bug fix: The fix in r1917 had an unintentional side effect of preventing the display of command inputs longer than the width of the window. They should show wrapped onto the next line, but were accidentally being hidden instead. This should be fixed.
 

diff --git a/MUSHclient/worlds/plugins/aardwolf_colors.lua b/MUSHclient/worlds/plugins/aardwolf_colors.lua
@@ -525,3 +525,5 @@ colour_conversion = {
    C = GetBoldColour(CYAN)    ,   -- 0xFFFF00
    W = GetBoldColour(WHITE)   ,   -- 0xFFFFFF
 }  -- end conversion table
+
+atletter_to_color_value = colour_conversion -- lol. https://github.com/endavis/bastmush/commit/6f8aec07449a55a65ccece05c1ab3a0139d70e54