Commit Graph
134 Commits
Author SHA1 Message Date
Danielv123 c33ca4abec Client.js now transmits IP needed to connect to slaves 2016-12-27 11:15:53 +01:00
Danielv123 26a9c4f1ef Fixed virtual signals 2016-12-27 11:14:53 +01:00
Danielv123 a10fa69def Inventory combinator can now transmit all virtuals 2016-12-27 10:47:02 +01:00
Danielv123 a70342fd82 Added unixtime signal to inventory combinator 2016-12-26 23:25:59 +01:00
Daniel 7c1caebccc Finalized readme 2016-12-22 17:01:47 +01:00
Danielv123 b3ee475a6c Missing , 2016-12-22 16:57:41 +01:00
Danielv123 c9d5803e26 Update to support 0.14.10+ 2016-12-22 16:53:12 +01:00
Danielv123 ceff284ba5 Changed slashes to fix linux support 2016-12-22 16:40:49 +01:00
Danielv123 de1a51610d Merged dev into master 2016-12-22 16:23:59 +01:00
Daniel ace440dbef Removed .exe to allow launching on linuxes 2016-12-22 16:21:14 +01:00
Daniel af92716c77 Ubuntu install instructions added 2016-12-22 16:09:20 +01:00
Danielv123 aac101bad7 prettify 2016-12-21 14:40:43 +01:00
Danielv123 cb77717650 Starting instances now require "start" as second param, instance 3rd 2016-12-21 14:33:34 +01:00
Danielv123 ba05b14e6f Maintainability, avoid bugs when not exiting after special commands 2016-12-21 14:16:29 +01:00
Danielv123 a896b032aa Added list and delete commands to client.js for managing instances
client.js list
client.js delete [instance]
also adde --help to show usage
2016-12-21 14:08:21 +01:00
Danielv123 964bc76b53 Merged branch master into dev 2016-12-21 11:08:32 +01:00
Danielv123 1c5bb9e8ab Consistent styling 2016-12-19 13:23:53 +01:00
Danielv123 187c05640f Argument 2016-12-19 13:21:36 +01:00
Daniel de95872773 Licensed as MIT, resolves #39 2016-12-02 23:16:22 +01:00
Danielv123 eb786ff146 Slave display now only shows connected slaves, autoupdates, trangartime
Added hidden option to show dates in trangartime y-ymd-ymd-y instead of ISO 6801

Ctrl+shift+i
g.trangarTime = true
2016-11-07 13:33:15 +01:00
Danielv123 37fdbb68d1 Remove currently non functioning graph from nav, start on storage page 2016-11-07 11:14:25 +01:00
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