Merge branch 'master' into subbodies

This commit is contained in:
Jeena 2015-08-02 16:06:57 +02:00
commit 0b8d885d48
7 changed files with 56 additions and 30 deletions

View file

@ -215,7 +215,7 @@
{
"height":0,
"id":10,
"name":"RubeDoll",
"name":"Small Cleaver",
"properties":
{

View file

@ -80,7 +80,7 @@
{
"height":0,
"id":25,
"name":"Rube",
"name":"Television",
"properties":
{