Danielv123
afb00ab3fb
Production chart partially added and hidden
2016-11-07 09:26:58 +01:00
Danielv123
b66df4d233
Merged branch master into dev
2016-10-28 16:19:16 +02:00
Daniel
1e6a46d8b3
Update README.md
2016-10-28 16:15:43 +02:00
Danielv123
dd0a216cb5
Merged dev into master
2016-10-28 16:01:14 +02:00
Danielv123
09d511d0c8
No longer displays all subpages by default, performance on tab inactive
2016-10-28 10:51:46 +02:00
Danielv123
85274220e7
Webpage now shows recently connected slaves, resolves #33
2016-10-28 09:51:42 +02:00
Danielv123
a90d78213a
Basic serverside slaveawareness
2016-10-27 22:41:25 +02:00
Danielv123
f6de6e026b
Decreased logging, automatic configuring of multiple instances
...
When creating a new instance, it will now generate a random port for the instance, RCON and an RCON password.
Current problems are that its not checking of the port is already taken by something else; if it is, the erver either won't start or RCON will fuck up.
2016-10-27 09:21:45 +02:00
Danielv123
64009a7e16
Valid JSON config file
2016-10-26 09:05:43 +02:00
Danielv123
656c05a30b
Changed default config
2016-10-26 08:57:50 +02:00
Danielv123
2234d41655
Housekeeping, more config settings
2016-10-24 09:31:30 +02:00
Danielv123
234e6eba4c
Merged branch instances into dev
2016-10-24 08:59:47 +02:00
Thomas Deal
0927bec070
client.js now launches it's own server instance
2016-10-23 17:38:57 -04:00
Danielv123
8fd13a7d04
Merged dev into master
2016-10-21 16:58:48 +02:00
Danielv123
12ca57af61
More icon exceptions
2016-10-21 16:00:40 +02:00
Danielv123
82f52c6e21
Item list sort after amount
2016-10-21 15:39:39 +02:00
Danielv123
8562bccd5f
Betterer icons
2016-10-21 11:14:04 +02:00
Danielv123
3ea2530dab
Moar icons :D
2016-10-21 11:04:48 +02:00
Danielv123
59ddb289a8
Removed jumping related to icons
2016-10-21 09:22:35 +02:00
Danielv123
6b6ffe5904
#8 Working on icons in masterGUI
2016-10-20 22:47:36 +02:00
Danielv123
3d38bba455
Merged origin/master into master
2016-10-20 22:45:59 +02:00
Danielv123
0133e36f8a
Merged dev into master
2016-10-20 22:45:47 +02:00
Danielv123
b30d9fa190
Merged branch master into dev
2016-10-20 19:34:12 +02:00
Thomas Deal
854ed8fdd0
Report fluids correctly in Inventory Combinator
2016-10-20 13:31:33 -04:00
Daniel
528165367c
Merge pull request #31 from Danielv123/dev
...
Resolves #30 adds inventory combinator
2016-10-20 13:27:07 +02:00
Danielv123
67fef2e543
Resolves #30
2016-10-20 13:25:52 +02:00
Danielv123
52b3e48eb8
Merged branch master into dev
2016-10-20 09:17:11 +02:00
Danielv123
cf93377625
Merged branch master into dev
2016-10-20 09:17:01 +02:00
Thomas Deal
67e5916790
Remove Lost bracket
2016-10-19 22:26:56 -04:00
Thomas Deal
cc65d8c3c2
Locale updates
2016-10-19 21:45:24 -04:00
Thomas Deal
bf2d16669d
Support setting world ID, and if set, output it on the Inventory Combinator, and include it in transmitted frames.
2016-10-19 21:42:09 -04:00
Thomas Deal
16ec26984a
Typo Fixes, Uncomment virtual signals.
2016-10-19 21:20:12 -04:00
Thomas Deal
67e192a78f
More consistent handling of creation/destruction of entities. Uses entity.unit_number instead of HashPosition. Rebuilds all tables on initial install and on mod version bump.
2016-10-19 20:41:10 -04:00
Thomas Deal
5e65fa5208
Add Inventory Combinator which reports the last inventory reported by the external code.
2016-10-19 20:11:54 -04:00
Thomas Deal
09feb085ef
Spelling fix
2016-10-19 16:54:54 -04:00
Thomas Deal
7b44e830f8
Write files only to the server by default, changeable via setFilePlayer()
2016-10-19 16:52:55 -04:00
Daniel
2013eb5449
Update README.md
2016-10-19 18:19:58 +02:00
Danielv123
f896e0dc74
Merged dev into master
2016-10-15 15:35:27 +02:00
Daniel
23e0aef34e
Merge pull request #29 from TheAIBot/master
...
Fixed bug where you couldn't make lubricant and sul acid.
closes #28
2016-10-15 15:17:00 +02:00
TheAIBot
5abaed00aa
fixed bug where you couldn't make lubricant and sul acid.
2016-10-15 08:43:45 +02:00
TheAIBot
3bea31cd45
Merge pull request #4 from Danielv123/dev
...
Dev
2016-10-14 16:43:14 +02:00
Danielv123
9d80769a12
MasterGUI basic production chart
...
Work on #8
2016-10-13 13:25:45 +02:00
Danielv123
6b35a3eb47
MasterGUI navigation added
2016-10-11 09:30:34 +02:00
TheAIBot
2c66b25162
Merge pull request #3 from Danielv123/master
...
update
2016-10-10 00:47:19 +02:00
TheAIBot
851fbe28e7
Merge remote-tracking branch 'refs/remotes/Danielv123/master'
2016-10-10 00:44:47 +02:00
Danielv123
4b3e5b0917
Merged dev into master
2016-10-09 22:28:53 +02:00
Danielv123
640a8d4d21
Removed argument to improve compat with older node versions
...
Resolves #25
2016-10-09 22:28:20 +02:00
Daniel
e5314f6ace
Merge pull request #24 from Danielv123/dev
...
Circuit network support, closes #22
2016-10-09 11:39:15 +02:00
Danielv123
511e31f24f
Merge branch 'master'
...
Conflicts:
README.md
2016-10-09 11:37:24 +02:00
Danielv123
8f426a1362
Updated readme
2016-10-09 11:02:50 +02:00
Danielv123