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

2765 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
10e7429847 Merge pull request #1854 from Prototik/tile-marker-crash 
Fix tile marker crash
 2014-05-29 11:31:45 +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
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
ae43e9cdb9 Merge pull request #1848 from Prototik/energy-converter-crash 
Energy converter crash
 2014-05-25 12:47:43 +02:00
Prototik
990c5bec91 Fix potential NPE in TileEnergyConverter 2014-05-25 18:08:54 +08: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
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
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
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
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
dmillerw
8b92fcfa88 Added localization for phased facade 2014-05-15 19:37:20 -07:00
SpaceToad
7e2365de26 Merge branch '6.0.x' of github.com:BuildCraft/BuildCraft into 6.0.x 2014-05-15 22:23:23 +02:00
SpaceToad
4b475d9fef fixed crash when removing prematurely removing blueprint from library, close #1812 2014-05-15 22:22:49 +02:00
SpaceToad
7e3a1d23e7 Merge pull request #1810 from Prototik/energy-converter 
Make Converter block works with pipes
 2014-05-15 20:07:36 +02:00
SpaceToad
c44842ad10 fixed deployer sequence, close #1811 2014-05-15 20:05:36 +02:00
Prototik
3a02c63ea6 Make Converter block works with pipes 2014-05-15 14:21:05 +08:00
SpaceToad
2fddee9389 prepare 6.0.13 release 2014-05-13 21:26:19 +02:00
SpaceToad
bd846a59b7 fixed style errors 2014-05-13 21:17:42 +02:00
SpaceToad
fd6d98218e fixed previous check-in 2014-05-13 21:13:09 +02:00
SpaceToad
61cc4d5d61 updated Forge requirement 2014-05-13 21:12:26 +02:00
SpaceToad
02f7daf9a0 Fixed minor schematic registration. 
Enabled additional standalone schematics.
Close #1794.
 2014-05-13 21:03:19 +02:00
SpaceToad
7f6a0fec90 Fixed residual liquid in pumps, close #1790 
Fixed residual liquid in refineries, close #1791
 2014-05-13 20:47:00 +02:00
SpaceToad
424a976cd0 now uses Forge fake player, close #1786 2014-05-13 20:32:14 +02:00
SpaceToad
92adc79f21 added protection against exceptions, for #1786 2014-05-13 08:55:28 +02:00
SpaceToad
68205d0ca2 fixed handling of unbreakable blocks, #1789 2014-05-12 23:46:20 +02:00
SpaceToad
1f21a80d70 Merge branch 'M3gaFr3ak-patch-1' into 6.0.x 2014-05-12 23:19:00 +02:00
Leon LoeseR
08edcf1759 Fix drain method causing dupe glitches... 
...if using them mixed

Before the one accepting a FluidStack always returned null if the targeted tank was empty, but the one under it wasnt, the one w/ int doesnt have the problem.
 2014-05-12 20:22:17 +02:00
SpaceToad
b7e2a730df Merge pull request #1792 from Prototik/mjapi 
Remove unnecessary extends for ISidedBatteryProvider interface
 2014-05-12 12:27:10 +02:00
Prototik
3d120025e1 Remove unnecessary extends for ISidedBatteryProvider interface 2014-05-12 17:56:07 +08:00
SpaceToad
9dec031449 fixed spelling mistake 2014-05-11 19:53:18 +02:00
SpaceToad
af402df7f9 prepare 6.0.12 release 2014-05-11 18:47:48 +02:00
SpaceToad
34e0bf9637 Last changes to the Builder API, renaming to enfore consistency and 
improve maintainability.

Close #1785
 2014-05-11 18:42:24 +02:00