Commit graph

3004 commits

Author SHA1 Message Date
SpaceToad
ae43e9cdb9 Merge pull request #1848 from Prototik/energy-converter-crash
Energy converter crash
2014-05-25 12:47:43 +02:00
SpaceToad
45db58473e added test for robot pathfinding, for #1732 2014-05-25 12:36:05 +02:00
SpaceToad
58f342287a fixed test name 2014-05-25 12:18:04 +02:00
SpaceToad
ce757bc37f completed basic test, for #1486 2014-05-25 12:11:56 +02:00
Prototik
990c5bec91 Fix potential NPE in TileEnergyConverter 2014-05-25 18:08:54 +08:00
SpaceToad
5a40c529cd progress in implementation of tests, #1486 2014-05-25 11:58:50 +02:00
SpaceToad
f0af7f3b06 implemented checks and cycle-dependent actions, #1846 2014-05-25 01:42:50 +02:00
SpaceToad
3f46097772 fixed style 2014-05-24 21:15:47 +02:00
SpaceToad
e9b84c7121 made progress for implementation of testing framework, #1846 2014-05-24 21:05:23 +02:00
SpaceToad
c23a5573f4 Merge branch '6.1.x' into 6.1.x-pathfinding 2014-05-24 13:37:44 +02:00
SpaceToad
6280266024 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-05-24 13:37:27 +02:00
SpaceToad
4eb19a49b5 Merge branch '6.0.x' into 6.1.x
Conflicts:
	common/buildcraft/transport/render/FacadeItemRenderer.java
2014-05-24 13:36:45 +02:00
SpaceToad
fd5806d499 started to work on tester item 2014-05-24 13:35:40 +02:00
SpaceToad
8039dacff8 started to work on tester item 2014-05-24 13:35:22 +02:00
SpaceToad
ee1d7aeebc Merge pull request #1833 from Prototik/tank-drain
Fix canFill/canDrain in tanks
2014-05-24 00:26:54 +02:00
SpaceToad
8f8529d408 added handling of blueprints without unique ids, close #1842 2014-05-24 00:15:39 +02:00
SpaceToad
6f1294ab27 Merge pull request #1831 from Prototik/npe-item-facade
Fix possible NPE in FacadeItemRenderer
2014-05-23 23:44:07 +02:00
SpaceToad
9ec77056cc Merge pull request #1835 from viliml/patch-1
Update EntityRobotPicker.java
2014-05-23 17:31:05 +02:00
viliml
82e804cd13 Update EntityRobotPicker.java
Prevents a crash if the pipe a robot is docked onto is broken.
2014-05-21 14:10:52 +02:00
Prototik
aa24a99d95 Fix canFill/canDrain in tanks 2014-05-21 13:29:17 +08:00
Prototik
5c4141970b Fix possible NPE in FacadeItemRenderer 2014-05-19 15:58:18 +08:00
SpaceToad
625b21719d Merge branch '6.0.x' into 6.1.x 2014-05-18 21:39:02 +02:00
SpaceToad
5be1d6031e fixed version number 2014-05-18 21:31:13 +02:00
SpaceToad
6c4dbb4297 prepare hotfix 6.0.15 2014-05-18 21:29:59 +02:00
SpaceToad
527cc7d6d4 do not send power where power is received, close #1827 2014-05-18 21:23:24 +02:00
SpaceToad
2eb8e868f2 tentative fix for #1826 2014-05-18 18:44:53 +02:00
SpaceToad
0f543e5228 progress in path finding algorithm 2014-05-18 18:04:29 +02:00
SpaceToad
48fe5076a3 fixed initial gate activation status 2014-05-18 17:23:46 +02:00
SpaceToad
2b532f7f66 Merge branch 'Prototik-transparent-facades' into 6.1.x 2014-05-18 17:07:44 +02:00
SpaceToad
77708e8bff Merge branch 'transparent-facades' of https://github.com/Prototik/BuildCraft into Prototik-transparent-facades 2014-05-18 17:04:52 +02:00
SpaceToad
a68ffafc1c Merge branch '6.1.x' into 6.1.x-pathfinding 2014-05-18 17:00:43 +02:00
SpaceToad
13c8562fa1 Merge branch '6.0.x' into 6.1.x 2014-05-18 16:57:07 +02:00
SpaceToad
b63fb22db4 prepare 6.0.14 release 2014-05-18 16:00:46 +02:00
SpaceToad
89f71c515b Added to wood pipes the ability to interact with all BC energy APIs.
Close #1824
2014-05-18 15:55:19 +02:00
SpaceToad
9e4519ccf1 Fix potential exceptions, close #1815 2014-05-18 15:43:59 +02:00
SpaceToad
e2a85c1607 Intrusive rewrite of some power transmission mechanisms.
The new algorithm should be better at balancing power consumption between
sources.
For #1746
2014-05-18 15:31:56 +02:00
SpaceToad
9c0fdc61dc Merge pull request #1822 from Prototik/npe
Fix possible NPE
2014-05-18 12:27:38 +02:00
Prototik
bb3bf76bb4 Fix possible NPE and crashes 2014-05-18 17:02:24 +08:00
Prototik
3cfa2c5e14 Support for transparent facades 2014-05-18 16:38:52 +08:00
SpaceToad
631bdc0da9 Merge branch 'Prototik-advanced-phased-facades' into 6.1.x 2014-05-17 17:10:15 +02:00
Prototik
6db270d407 Really advanced phased facades 2014-05-17 22:30:09 +08:00
SpaceToad
04967c7c00 Merge branch '6.0.x' into 6.1.x 2014-05-17 14:17:50 +02:00
SpaceToad
30fbe3b614 fixed partial action state issues, close #1817 2014-05-17 14:17:29 +02:00
SpaceToad
5c0acc7b23 initiated a test framework 2014-05-17 13:31:18 +02:00
SpaceToad
fe1cbb3c63 fixes in the pathfinding system 2014-05-17 13:31:06 +02:00
SpaceToad
bd8f0e7235 Merge pull request #1813 from dmillerw/6.0.x
Various fixes for phased facades
2014-05-17 10:48:00 +02:00
dmillerw
8a4b398285 Fixed checkstyle failure 2014-05-15 19:49:13 -07:00
dmillerw
0399c2c501 Fixed bad formatting 2014-05-15 19:41:13 -07:00
dmillerw
10efb94617 Removed debug item from creative menu 2014-05-15 19:38:03 -07:00
dmillerw
656baa987f Fixed phased facade having incorrect meta value 2014-05-15 19:37:43 -07:00