Merge tag '1.10.0' into develop

1.10.0

VERSION

@@ -1 +1 @@
-1.9.1
+1.10.0

acp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-client",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "description": "",
   "main": "index.js",
   "scripts": {

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-client",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "description": "",
   "main": "index.js",
   "scripts": {

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 });

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)));
 }
 

ops/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-ops",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "description": "",
   "main": "index.js",
   "scripts": {

server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mnml"
-version = "1.9.1"
+version = "1.10.0"
 authors = ["ntr <ntr@smokestack.io>"]
 
 [dependencies]