SpaceToad 068bb6f5fa Merge branch '5.0.x' into 6.0.x ... Conflicts: common/buildcraft/BuildCraftCore.java		2014-07-12 00:30:31 +02:00
..
builders	Changed all deprecated functionality to it's equivalent, updated to 1.7.10-10.13.0.1160	2014-07-04 14:30:19 -06:00
core	Changed build.gradle to use RunDir, changed deprecated fluid localized name functionality, changed deprecated biome type desert to sandy.	2014-07-11 14:12:02 -06:00
energy	Removed deprecated functionality and moved to equivalent.	2014-07-11 10:50:37 -06:00
factory	Changed to tabs from spaces	2014-07-04 14:45:34 -06:00
silicon	Changed to tabs from spaces	2014-07-04 14:45:34 -06:00
transport	Removed deprecated functionality and moved to equivalent.	2014-07-11 10:50:37 -06:00
BuildCraftBuilders.java	tentative fix for packet leaks, #1855	2014-05-31 15:26:43 +02:00
BuildCraftCore.java	Merge branch '5.0.x' into 6.0.x	2014-07-12 00:30:31 +02:00
BuildCraftEnergy.java	Changed build.gradle to use RunDir, changed deprecated fluid localized name functionality, changed deprecated biome type desert to sandy.	2014-07-11 14:12:02 -06:00
BuildCraftFactory.java	Merge branch '5.0.x' into 6.0.x	2014-05-31 18:09:23 +02:00
BuildCraftMod.java	added protection against exceptions, for #1786	2014-05-13 08:55:28 +02:00
BuildCraftSilicon.java	Merge branch '5.0.x' into 6.0.x	2014-05-31 18:09:23 +02:00
BuildCraftTransport.java	Merge branch '5.0.x' into 6.0.x	2014-05-31 18:09:23 +02:00