Merge branch 'developer' into revertLoadingscreenShit

2016-06-22 03:29:37 +02:00
parent 1da4dedcea 297f8a456c
commit 858ffc8fde
18 changed files with 62955 additions and 2 deletions
@@ -1,9 +1,9 @@
 {
  "worlds": [
-    "worlds/fire.json",
    "worlds/rock.json",
+    "worlds/fire.json",
    "worlds/ice.json",
    "worlds/small.json"
-    
+
  ]
 }