From 980f03abf61ddff793d907b5a9b15a84f26356c6 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Fri, 29 Nov 2019 13:06:01 +1000
Subject: [PATCH 1/2] v1.10.0

---
 VERSION             | 2 +-
 acp/package.json    | 2 +-
 client/package.json | 2 +-
 ops/package.json    | 2 +-
 server/Cargo.toml   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index ee672d89..ed21137e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.9.1
\ No newline at end of file
+1.10.0
\ No newline at end of file
diff --git a/acp/package.json b/acp/package.json
index ca3b6f27..7a6a5902 100644
--- a/acp/package.json
+++ b/acp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mnml-client",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/client/package.json b/client/package.json
index b5585de2..4cbd135c 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mnml-client",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/ops/package.json b/ops/package.json
index a3094609..63b2a82e 100644
--- a/ops/package.json
+++ b/ops/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mnml-ops",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/server/Cargo.toml b/server/Cargo.toml
index b666e932..fb7f73c9 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mnml"
-version = "1.9.1"
+version = "1.10.0"
 authors = ["ntr <ntr@smokestack.io>"]
 
 [dependencies]

From 39987d0c9d5380ccb02fdce2f55c882442a9901f Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Fri, 29 Nov 2019 13:49:48 +1000
Subject: [PATCH 2/2] fix esc actions

---
 client/src/actions.jsx  | 2 +-
 client/src/keyboard.jsx | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/src/actions.jsx b/client/src/actions.jsx
index f6745548..e426f70b 100644
--- a/client/src/actions.jsx
+++ b/client/src/actions.jsx
@@ -49,7 +49,7 @@ export const setTeamSelect = value => ({ type: 'SET_TEAM_SELECT', value: Array.f
 export const setTutorial = value => ({ type: 'SET_TUTORIAL', value });
 export const setTutorialGame = value => ({ type: 'SET_TUTORIAL_GAME', value });
 
-export const setVboxSelected = value => ({ type: 'SET_VBOX_SELECTED', value: Object.create(value) });
+export const setVboxSelected = value => ({ type: 'SET_VBOX_SELECTED', value: value });
 export const setVboxCombiner = value => ({ type: 'SET_VBOX_COMBINER', value });
 export const setVboxHighlight = value => ({ type: 'SET_VBOX_HIGHLIGHT', value });
 export const setVboxInfo = value => ({ type: 'SET_VBOX_INFO', value });
diff --git a/client/src/keyboard.jsx b/client/src/keyboard.jsx
index cca738f9..d9cc79ca 100644
--- a/client/src/keyboard.jsx
+++ b/client/src/keyboard.jsx
@@ -11,6 +11,8 @@ function setupKeys(store) {
     key('esc', () => store.dispatch(actions.setItemUnequip([])));
     key('esc', () => store.dispatch(actions.setVboxSelected({ storeSelect: [], stashSelect: [] })));
     key('esc', () => store.dispatch(actions.setVboxHighlight(null)));
+    key('esc', () => store.dispatch(actions.setVboxCombiner(null)));
+    key('esc', () => store.dispatch(actions.setVboxInfo(null)));
     key('esc', () => store.dispatch(actions.setMtxActive(null)));
 }