  Baltazár RadicsandGitHub
|
47f9aece38
|
Merge pull request #16 from Timmeey86/baltitenger
More efficient way of retrieving ConsumePower subclasses
|
2018-12-16 10:45:39 +01:00 |
|
|
Baltazár RadicsandGitHub
|
52f78ee4ed
|
Merge pull request #15 from Timmeey86/baltitenger
Baltitenger
|
2018-12-15 09:11:14 +01:00 |
|
|
Baltazár RadicsandGitHub
|
814146f227
|
Merge pull request #13 from Timmeey86/baltitenger
Merged master changes and fixed conflicts
|
2018-12-11 06:56:49 +01:00 |
|
|
Baltazár RadicsandGitHub
|
1b8933cd84
|
Merge pull request #12 from Timmeey86/baltitenger
More power changes
|
2018-12-07 19:42:27 +01:00 |
|
|
Baltazár RadicsandGitHub
|
c69eae486e
|
Merge pull request #11 from Timmeey86/baltitenger
Fixes requested by Anuke
|
2018-12-05 19:09:14 +01:00 |
|
|
Baltazár RadicsandGitHub
|
c2334ce80a
|
Merge pull request #10 from Timmeey86/baltitenger
Continued work on Power Generators
|
2018-12-03 18:46:06 +01:00 |
|
|
Baltazár RadicsandGitHub
|
42cf80106f
|
Merge pull request #9 from Timmeey86/baltitenger
Resolved more TODOs
|
2018-11-30 05:46:35 +01:00 |
|
|
Baltazár RadicsandGitHub
|
82d20efa8d
|
Merge pull request #8 from Timmeey86/baltitenger
Fixed test names / Continued work on generators
|
2018-11-29 08:47:11 +01:00 |
|
|
Baltazár RadicsandGitHub
|
630693d64e
|
Merge pull request #7 from Timmeey86/baltitenger
Adapted ItemLiquidGenerator to new power system
|
2018-11-28 17:14:19 +01:00 |
|
|
Baltazár RadicsandGitHub
|
c9480ef17d
|
Merge pull request #6 from Timmeey86/baltitenger
Merged most recent Anuken master into branch and fixed conflicts
|
2018-11-26 23:28:52 +01:00 |
|
|
Baltazár RadicsandGitHub
|
8d43046f13
|
Merge pull request #5 from Timmeey86/baltitenger
Fixed batteries / Added Tests / Fixed delta
|
2018-11-26 22:18:29 +01:00 |
|
|
Baltazár RadicsandGitHub
|
4a8299d9dc
|
Merge pull request #4 from Timmeey86/baltitenger
Baltitenger
|
2018-11-22 23:59:15 +01:00 |
|
|
Baltazár RadicsandGitHub
|
ebb763db03
|
Merge pull request #3 from Timmeey86/baltitenger
Implemented the new power system with Consumers
|
2018-11-21 23:42:47 +01:00 |
|
|
Baltazár RadicsandGitHub
|
12a62f4607
|
Merge pull request #2 from Timmeey86/baltitenger
Branch now compiles again (but won't work yet)
|
2018-11-20 22:39:47 +01:00 |
|
|
Baltazár RadicsandGitHub
|
c1bb05c0a4
|
Merge pull request #1 from Timmeey86/baltitenger
Fixed compiler errors/typos in PowerGraph
|
2018-11-19 22:17:06 +01:00 |
|
|
Baltazár Radics
|
8218cfc72c
|
cleaned up PowerGraph
|
2018-11-19 22:00:45 +01:00 |
|
|
Baltazár Radics
|
6ba8a6a600
|
Added support for buffered power consumers
|
2018-11-18 23:47:03 +01:00 |
|
|
Baltazár Radics
|
377fb2329c
|
Merge branch 'master' of github.com:Anuken/Mindustry
|
2018-11-18 23:26:10 +01:00 |
|
|
Baltazár Radics
|
285ee665ee
|
rewritten PowerGraph
|
2018-11-18 23:12:54 +01:00 |
|
|
Baltazár Radics
|
8091bec6bf
|
added buffered power consumer
|
2018-11-13 08:40:32 +01:00 |
|
|
Baltazár Radics
|
a894873d6b
|
reset my fork, started work on using power consumers
|
2018-11-11 17:34:32 +01:00 |
|
 Baltazár RadicsandAnuken
|
cb69eb7c0f
|
Simplified power logic (#261)
* Simplified power logic
* Made the requested changes
|
2018-10-22 22:47:44 -04:00 |
|