Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2835 commits 1 branch 0 tags 19 MiB
Commit graph

2208 commits

Author SHA1 Message Date
Raul Tambre
742391e504 Fix oil and fuel opacity 2014-06-01 10:48:31 +03:00
SpaceToad
6150c5b09e Merge branch '6.0.x' into 6.1.x 2014-05-31 18:09:33 +02:00
SpaceToad
8bff372360 Merge branch '5.0.x' into 6.0.x 
Conflicts:
	common/buildcraft/BuildCraftBuilders.java
	common/buildcraft/BuildCraftCore.java
	common/buildcraft/BuildCraftEnergy.java
	common/buildcraft/BuildCraftFactory.java
	common/buildcraft/BuildCraftSilicon.java
	common/buildcraft/BuildCraftTransport.java
	common/buildcraft/builders/network/PacketHandlerBuilders.java
	common/buildcraft/core/network/PacketHandler.java
	common/buildcraft/core/network/PacketTileState.java
	common/buildcraft/factory/network/PacketHandlerFactory.java
	common/buildcraft/silicon/network/PacketHandlerSilicon.java
	common/buildcraft/transport/network/PacketHandlerTransport.java
 2014-05-31 18:09:23 +02:00
SpaceToad
d946f8d936 tentative fix for packet leaks, #1855 2014-05-31 15:26:43 +02:00
SpaceToad
e99f0a3c4b made progress with boards and parameters, #1732 2014-05-30 09:04:00 +02:00
SpaceToad
7b20cab4be fixed style 2014-05-29 22:00:42 +02:00
SpaceToad
3f925ae0e9 completed a first robot+board, #1732 2014-05-29 21:58:08 +02:00
SpaceToad
ce55fe5eb1 fixed redstone board writing, #1732 2014-05-29 15:07:18 +02:00
SpaceToad
d8d57e822f Merge branch '6.0.x' into 6.1.x 2014-05-29 14:17:29 +02:00
SpaceToad
b7a89c6cc8 Merge pull request #1856 from Prototik/inbt-serializable 
INBT serializable for @NetworkData
 2014-05-29 14:14:39 +02:00
SpaceToad
10e7429847 Merge pull request #1854 from Prototik/tile-marker-crash 
Fix tile marker crash
 2014-05-29 11:31:45 +02:00
SpaceToad
e7b680f29e made progress for robot implementation, #1732 2014-05-29 11:28:34 +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
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
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
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
Prototik
990c5bec91 Fix potential NPE in TileEnergyConverter 2014-05-25 18:08:54 +08: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
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
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
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
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
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
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
Prototik
6db270d407 Really advanced phased facades 2014-05-17 22:30:09 +08:00