SpaceToad
|
e204fa275d
|
Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x
|
2014-05-29 11:30:18 +02:00 |
|
SpaceToad
|
a106b17da6
|
Merge pull request #1850 from Prototik/mjapi
Next impovements of MjAPI
|
2014-05-29 11:29:50 +02:00 |
|
SpaceToad
|
e7b680f29e
|
made progress for robot implementation, #1732
|
2014-05-29 11:28:34 +02:00 |
|
SpaceToad
|
a3c2854791
|
Merge pull request #1852 from Prototik/pump-drain-crash
Fix pump crash
|
2014-05-29 11:22:35 +02:00 |
|
Prototik
|
d3e3f8bf21
|
Add support for custom nbt-based serialize classes for @NetworkData
|
2014-05-28 14:16:40 +08:00 |
|
Prototik
|
173db45f4b
|
Fix tile marker crash
|
2014-05-27 16:18:22 +08:00 |
|
Prototik
|
9640255442
|
Next impovements of MjAPI
|
2014-05-27 16:12:58 +08:00 |
|
Prototik
|
f9748a5bfc
|
Fix pump crash
|
2014-05-27 11:52:44 +08:00 |
|
SpaceToad
|
e6ff3d7825
|
fixed style of previous check-in, #1732
|
2014-05-27 00:27:24 +02:00 |
|
SpaceToad
|
7acb8b4592
|
made progress with robot recipes and boards, #1732
|
2014-05-27 00:25:39 +02:00 |
|
SpaceToad
|
379ea6e278
|
fixed style and removed unused files
|
2014-05-26 23:00:01 +02:00 |
|
SpaceToad
|
5046cc445b
|
added missing icons, #1732
|
2014-05-26 09:35:10 +02:00 |
|
SpaceToad
|
34d285a448
|
started work on redstone boards, #1732
|
2014-05-26 09:34:28 +02:00 |
|
SpaceToad
|
e5e8e4da4b
|
Merge branch '6.0.x' into 6.1.x
|
2014-05-25 17:54:28 +02:00 |
|
SpaceToad
|
e8c1da1b75
|
Merge branch 'Prototik-mjapi-engines' into 6.1.x
|
2014-05-25 17:48:17 +02:00 |
|
SpaceToad
|
111ad6032e
|
Merge branch 'mjapi-engines' of https://github.com/Prototik/BuildCraft into Prototik-mjapi-engines
|
2014-05-25 17:48:03 +02:00 |
|
SpaceToad
|
972d39f678
|
fixed docking algorithms for robots, #1732
|
2014-05-25 17:47:36 +02:00 |
|
Prototik
|
0a4c84f558
|
Massive overhaul of energy system
|
2014-05-25 23:13:38 +08:00 |
|
SpaceToad
|
5060da651f
|
progress with robot AI and fixed pathfinding, #1732
|
2014-05-25 17:08:53 +02:00 |
|
SpaceToad
|
79ddf23192
|
migrated robot picker to the new path resolver, #1732
|
2014-05-25 16:28:20 +02:00 |
|
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 |
|