Merge branch 'developer' into FireWorld

# Conflicts: # worlds/worlds.json
2016-06-22 02:57:01 +02:00
parent f6d7695405 82acf0d9fc
commit ec76b4e754
24 changed files with 7451 additions and 15 deletions
@@ -2,6 +2,8 @@
  "worlds": [
    "worlds/fire.json",
    "worlds/rock.json",
+    "worlds/ice.json",
    "worlds/small.json"
+    
  ]
 }