can initialise Assemblages from json lists and dicts

1 files changed, 11 insertions, 12 deletions

diff --git a/src/main.rs b/src/main.rs
index 97f5bac..b1d30bb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,17 +4,17 @@ use std::thread::sleep;
 use std::time::Duration;
 use std::path::Path;
 
-pub mod server;
-pub mod gameserver;
-pub mod room;
-pub mod util;
-pub mod controls;
-pub mod assemblages;
-pub mod components;
-pub mod resources;
-pub mod systems;
-pub mod worldmessages;
-pub mod pos;
+mod server;
+mod gameserver;
+mod room;
+mod util;
+mod controls;
+mod assemblages;
+mod components;
+mod resources;
+mod systems;
+mod worldmessages;
+mod pos;
 
 use self::gameserver::GameServer;
 use self::server::unixserver::UnixServer;
@@ -42,7 +42,6 @@ fn main() {
 	
 	let mut room = gen_room(50, 40);
 	
-	
 	loop {
 		let actions = gameserver.update();