Commit Graph

3040 Commits

Author SHA1 Message Date
Anuken
30b5dd63e4 Build tag fix 2018-11-23 10:21:47 -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
942eed402a uCore update 2018-11-22 23:38:59 -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
Baltazár Radics
4a8299d9dc Merge pull request #4 from Timmeey86/baltitenger
Baltitenger
2018-11-22 23:59:15 +01: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
7795a690ed Fixed fillitems command 2018-11-21 21:17:45 -05:00
Anuken
d498ac89f2 Mining bugfix 2018-11-21 21:13:30 -05:00
Timmeey86
7683e86d8b Added two unit tests for bounds checking 2018-11-21 23:57:24 +01:00
Baltazár Radics
ebb763db03 Merge pull request #3 from Timmeey86/baltitenger
Implemented the new power system with Consumers
2018-11-21 23:42:47 +01: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
2842018c2f Ignored robovm.properties 2018-11-21 11:01:16 -05: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
Anuken
46c6b2168c Added automatic build incrementing 2018-11-21 10:04:38 -05:00
Anuken
1f955904a4 Merge 2018-11-21 10:04:17 -05:00
VizardAlpha
03ff33acaf Updates bundle_fr_BE.properties (#350) 2018-11-21 10:00:19 -05:00
Anuken
46035e76cc Build increment 2018-11-21 09:59:56 -05:00
Anuken
7c073f76ae Added automatic build incrementing 2018-11-20 19:28:26 -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
Timmeey86
222d41c84a Added Test stub 2018-11-20 22:58:13 +01:00
Baltazár Radics
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
Timmeey86
f561768c67 Handled compiler errors by either resolving them or commenting & adding a TODO 2018-11-20 22:33:36 +01:00
Anuken
5ced5ce253 Fixed some bugs/crashes 2018-11-20 10:00:13 -05:00
Anuken
55781e911e Merge remote-tracking branch 'origin/master' 2018-11-20 00:26:18 -05:00
Anuken
ee3c4a4124 Mass driver buff 2018-11-20 00:26:14 -05:00
키에르
6815e56e57 Update bundle_ko.properties (#346) 2018-11-19 22:56:14 -05:00
Anuken
6c744443fb Item list value fix 2018-11-19 20:52:31 -05:00
Anuken
3c37047afb Misc bugfixes 2018-11-19 17:56:26 -05:00
Anuken
f31f09d77a Visual fix 2018-11-19 16:40:33 -05:00
Baltazár Radics
c1bb05c0a4 Merge pull request #1 from Timmeey86/baltitenger
Fixed compiler errors/typos in PowerGraph
2018-11-19 22:17:06 +01:00
Timmeey86
f5b8d8a60c Fixed compiler errors/typos in PowerGraph 2018-11-19 22:11:11 +01:00
Baltazár Radics
8218cfc72c cleaned up PowerGraph 2018-11-19 22:00:45 +01:00
Anuken
de508ee68f "Legacy" unlock loading v60 2018-11-19 15:08:18 -05:00
Anuken
a932111040 Removed ContentUnlockSet 2018-11-19 14:38:46 -05:00
Anuken
8c437eb815 New UI 2018-11-19 14:30:40 -05:00
Anuken
1ad4815983 Added all placement controls 2018-11-19 14:20:57 -05:00