Commit Graph

2409 Commits

Author SHA1 Message Date
Timmeey86
4cb72c1998 Resolved some of the power-related TODOs 2018-11-29 00:38:53 +01:00
Timmeey86
12ccc10e83 Restored SolarGenerator and adapted to new power system. 2018-11-28 23:56:11 +01:00
Timmeey86
2972780bed Initial Efficiency is now zero. Blocks display efficiency. 2018-11-28 13:19:52 +01:00
Timmeey86
cf3d2c3def Fixed handling of item duration 2018-11-28 11:59:58 +01:00
Timmeey86
1f8751054c Tested/fixed delta calculations
Tests now use a fixed delta of 0.5 to make sure calculations work with deltas different from 1.0
2018-11-28 11:04:08 +01:00
Timmeey86
739219c57b Finished first draft of ItemLiquidGenerator through TDD 2018-11-27 22:28:41 +01:00
Timmeey86
f56e1933a6 Fixed occassional crashes of Power Tests and continued TDD 2018-11-27 21:27:35 +01:00
Timmeey86
a9517096f9 Merged current Anuke master into branch 2018-11-26 23:25:24 +01:00
Anuken
ef85d1d83e Merge remote-tracking branch 'origin/master' 2018-11-26 12:40:28 -05:00
Anuken
d03ceb2a23 Bugfixes / Sorter item memory 2018-11-26 12:40:24 -05:00
VizardAlpha
90198be1cb Updates bundle_fr_BE.properties (#358)
* Updates bundle_fr_BE.properties

* Updates bundle_fr_BE.properties

* Update bundle_fr_BE.properties

* Update bundle_fr_BE.properties

* Update bundle_fr_BE.properties
2018-11-26 12:34:01 -05:00
Timmeey86
f640494c1f PowerGraph now handles delta
Also power bars are displayed for non-buffered consumers as well
2018-11-26 10:26:49 +01:00
Timmeey86
77b9feb765 More Tests and fixes
- Batteries will now get charged with no consumers
- Fixed stat display of power generators
2018-11-26 09:24:08 +01:00
Timmeey86
99139dfcca Added unit tests for batteries...
...and fixed battery distribution until all tests passed
2018-11-26 08:58:16 +01:00
Anuken
a241f63ddc Merge remote-tracking branch 'origin/master' 2018-11-25 22:55:18 -05:00
Anuken
70507258ae Cleanup 2018-11-25 22:55:13 -05:00
beito
51a8144f49 Update Japanese translations (#357)
* Add new japanese translation

It translated on commit 66810c8.
so it don't apply changes from commit 17e0489.

* Update Japanese translation

Applies commit 7a51693. and small changes.

* Upadte Japanese translations

* Update Japanese

* Update Japanese

* Update Japanese translations

Improve and update for new changes

* Update Japanese

* Update Japanese translations
2018-11-25 22:54:46 -05:00
Anuken
54ad9ba243 Added fullscreen map screenshot 2018-11-25 20:43:45 -05:00
Anuken
a7f7a09418 Drone repair cleanup / Percentage-based repair 2018-11-25 16:34:31 -05:00
Anuken
44897fb371 Mobile chat fix / Turret balance / UI disable variable 2018-11-25 13:58:19 -05:00
Anuken
bb6a748167 Various bugfixes 2018-11-25 10:29:38 -05:00
Anuken
c321402414 Various bugfixes 2018-11-24 20:04:20 -05:00
Anuken
ec80fc9f3f Android build update 2018-11-24 19:39:35 -05:00
Anuken
6bfd57097f Cleanup of TODOs 2018-11-24 08:21:22 -05:00
Anuken
6f5df6a671 Added list of contributors to credits 2018-11-23 14:30:58 -05:00
Anuken
1baf3190cd Host dialog name selection 2018-11-23 13:35:16 -05:00
Anuken
66c29c49e5 Wave spawner moved / Bundle tweaks / Blank name 2018-11-23 13:32:17 -05:00
Anuken
e5d6740555 Additional tests, inventory fixes 2018-11-23 12:40:36 -05:00
Anuken
f0aa8d73ea Merge remote-tracking branch 'origin/master' 2018-11-23 09:23:48 -05:00
Anuken
8a0761cad8 Bugfixes 2018-11-23 09:23:42 -05:00
키에르
322d76b713 Update bundle_ko.properties (#354)
* Update bundle_ko.properties

* Update bundle_ko.properties
2018-11-23 08:41:55 -05:00
Anuken
4f56bf3c3e Consume icon fix / Liquid mixer fix 2018-11-23 08:32:56 -05:00
Anuken
24c72650fb Bundles update 2018-11-22 19:10:31 -05:00
Anuken
f5959c8829 Optional display section 2018-11-22 19:09:51 -05:00
Timmeey86
560d388df4 Added Tests, fixed detected bugs and updated JUnit 2018-11-22 23:30:49 +01:00
Anuken
7621ebed42 Merge remote-tracking branch 'origin/master' 2018-11-22 08:39:15 -05:00
Anuken
5447c71790 Removed junction item voiding 2018-11-22 08:39:05 -05:00
Anuken
c5241eaaf6 Encoding tests 2018-11-21 23:12:27 -05:00
Anuken
9266b55ddf Fixed charset issues 2018-11-21 23:05:33 -05:00
VizardAlpha
1bc1f66613 Updates bundle_fr_BE.properties (#351)
I had not seen the last line to translate.
2018-11-21 22:02:28 -05:00
Anuken
d498ac89f2 Mining bugfix 2018-11-21 21:13:30 -05:00
Timmeey86
920491ddb2 MassDriver now properly displays the power per shot 2018-11-21 23:38:28 +01:00
Timmeey86
761728ac43 Fixed the ConsumePower constructors which got mixed up at some point 2018-11-21 23:04:18 +01:00
Timmeey86
d8ddb9dc82 Merged the three ConsumePower classes into a single one 2018-11-21 22:55:53 +01:00
Timmeey86
405f153439 Reverted/Adapted blocks to new Consume interfaces 2018-11-21 21:54:43 +01:00
Timmeey86
f789a35901 Readded buffered and direct consumers as three classes 2018-11-21 20:07:05 +01:00
Anuken
51641cc704 Merge remote-tracking branch 'origin/master' 2018-11-21 11:00:58 -05:00
Anuken
729f5ed5e4 New version format / Updated bundles / ConnectPacket encoding fix 2018-11-21 11:00:50 -05:00
VizardAlpha
03ff33acaf Updates bundle_fr_BE.properties (#350) 2018-11-21 10:00:19 -05:00
Timmeey86
558c89cc30 Finished first unit test (equal power input and output) and fixed bugs detected by it 2018-11-21 00:04:26 +01:00