Merge

2018-10-15 17:07:48 +02:00
parent 3324a541fc 8a46eded94
commit acd68f0e2d
12 changed files with 414 additions and 0 deletions
--- a/Client/index.js
+++ b/Client/index.js
@@ -10,7 +10,9 @@ require('./Save/main.js');
 require('./Save/save.js');

 require('./Gui/infobox.js');
+require('./Gui/playerlist.js');
 require('./Login/main.js');
+require('./Player/keys.js');
 require('./Save/main.js');

 require('./FactionManagement/main.js');