 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
|
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 |
|
|
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
|
a2d970fad6
|
Use the many option for signals instead
|
2016-10-07 23:59:15 +02:00 |
|
|
Danielv123
|
87cfe1bc46
|
Sending signals over Clusterio now works
Closes #19
|
2016-10-07 20:29:35 +02:00 |
|
|
Danielv123
|
a3aafd8b1d
|
JS part of signals kinda finished but it aint working
|
2016-10-07 17:54:23 +02:00 |
|
|
Danielv123
|
20c591bf71
|
Removed DB from repo
|
2016-10-06 17:49:16 +02:00 |
|
|
Danielv123
|
b123d485d2
|
Slave sending combinator signals finished
So working on #22.
|
2016-10-06 17:47:03 +02:00 |
|
|
Daniel
|
dfa8b573df
|
Closes #21
|
2016-10-03 21:07:58 +02:00 |
|
|
Daniel
|
3fde2be222
|
Solved #21
|
2016-10-03 21:06:31 +02:00 |
|
|
Danielv123
|
9011665a80
|
Merged branch master into dev
|
2016-10-02 11:41:45 +02:00 |
|
|
Daniel
|
134c8e4d92
|
Merge pull request #20 from Danielv123/dev
The end of all desync problems and chat spamming
|
2016-10-02 10:21:56 +02:00 |
|
|
Danielv123
|
9b14da470e
|
Use silent-command to avoid spamming chat. Thanks HanziQ!
|
2016-10-02 10:20:05 +02:00 |
|
|
Thomas Deal
|
f9d6d9e001
|
Add Transmit/Receive Combinators. Transmit combinators are Deciders which also output into txbuffer.txt. Receive Combinators are Constants which replay frames received from external sources via remote calls to receiveFrame and recieveMany.
|
2016-10-01 21:20:18 -04:00 |
|
|
Daniel
|
4f8ad5eec6
|
Merge pull request #18 from Danielv123/dev
MP desync issues fixed, prerealease 1
|
2016-10-01 23:35:36 +02:00 |
|
|
Danielv123
|
6d12bac32a
|
Merged branch master into dev
|
2016-10-01 19:03:02 +02:00 |
|
|
TheAIBot
|
090910aeef
|
Merge remote-tracking branch 'refs/remotes/Danielv123/master'
|
2016-10-01 02:46:06 +02:00 |
|
|
TheAIBot
|
7e67ae5068
|
fixed up the last things about the output tank
|
2016-10-01 02:44:45 +02:00 |
|
|
TheAIBot
|
9ca013590d
|
fixed merge error
|
2016-10-01 02:27:08 +02:00 |
|
|
TheAIBot
|
72cef84df5
|
Merge remote-tracking branch 'refs/remotes/origin/json-parser'
# Conflicts:
# clusterio_0.0.2/control.lua
|
2016-10-01 02:26:29 +02:00 |
|
|
TheAIBot
|
d22b7e3de4
|
multiplayer fixed
|
2016-10-01 02:26:08 +02:00 |
|
|
Danielv123
|
5670bdb77a
|
Working on adding charts to master GUI
|
2016-09-30 23:23:01 +02:00 |
|