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

2183 commits

Author SHA1 Message Date
Prototik
fb6a30a06c Fix strange npe in facade item renderer 2014-08-29 15:27:01 +08:00
SpaceToad
79bba8834f Merge branch 'landmark' of git://github.com/Prototik/BuildCraft into 6.0.x 2014-08-13 23:00:37 +02:00
SpaceToad
6227fbc4b0 further protection against possible null icons 2014-08-13 22:58:42 +02:00
SpaceToad
9df8283987 added protection against exception raised 2014-08-13 22:56:26 +02:00
Prototik
69a09c9ac0 Remove landmark's levitation. It's broken physics. 2014-08-13 17:16:01 +07:00
tterrag1098
7351eb9a5f Add check for no null IIcons on facade registration 
Continuation of #1977
 2014-08-11 20:21:08 -04:00
ganymedes01
9e5e3c5f30 Fix builder/filler work not rendering if player is far away 
If the player is standing further than 64 blocks away (which is far enough for most blocks but not for the builder/filler since the area where they render can get quite big) tile entities aren't rendered.

This is fixed by overriding that method.
 2014-08-03 15:14:21 +01:00
SpaceToad
068bb6f5fa Merge branch '5.0.x' into 6.0.x 
Conflicts:
	common/buildcraft/BuildCraftCore.java
 2014-07-12 00:30:31 +02:00
SpaceToad
91a6d08e3c fixed version requirements 2014-07-12 00:24:45 +02:00
Andrew Dudney
f9e9c6cb26 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
Andrew Dudney
c55db01daf Removed deprecated functionality and moved to equivalent. 2014-07-11 10:50:37 -06:00
Andrew Dudney
23e8abe00a Changed from assetDir to runDir, removed excess glPushAttrib 2014-07-11 10:43:58 -06:00
SpaceToad
3e401acfbe Merge branch '6.0.x-1.7.10' of https://github.com/adudney/BuildCraft into 6.0.x 
Conflicts:
	build.gradle
 2014-07-11 08:53:39 +02:00
SpaceToad
1791c485af Merge branch '5.0.x' into 6.0.x 
Conflicts:
	build.gradle
	common/buildcraft/transport/BlockGenericPipe.java
	common/buildcraft/transport/render/PipeItemRenderer.java
 2014-07-11 08:49:38 +02:00
SpaceToad
4144188467 fixed rendering problems, merged from 6.0.x, close #1934 2014-07-11 08:43:49 +02:00
Andrew Dudney
f2f563fd39 Changed to tabs from spaces 2014-07-04 14:45:34 -06:00
Andrew Dudney
59d36f31d0 Changed style to reflect CheckStyle 2014-07-04 14:35:36 -06:00
Andrew Dudney
ca5bbc3f17 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
Parker Young
341ff4e972 Updated to 1.7.10 
This version isn't backwards compatiable because of changes in the CompressedStreamTools. I don't know if you want to push an update to the 5.0.x branch, but I thought I'd do it, just in case you did.
 2014-06-28 11:57:16 -04:00
Raul Tambre
10d0287df1 Fixed laser data not existing in some cases 2014-06-28 15:48:53 +03:00
Raul Tambre
78a06e5f35 Fixed ghost facades from pre-6.0.x 2014-06-23 11:41:27 +03:00
Raul Tambre
753e4693bc Prevent possible crash when rendering a marker 2014-06-16 21:23:33 +03:00
Raul Tambre
eac76e9c77 Replace .getAABBPool() and .getWorldVec3Pool() 2014-06-14 18:45:06 +03:00
SpaceToad
27f9e05512 fixed style 2014-06-11 01:39:40 +02:00
Dynious
aef8260877 Made sure Version IMC message is also sent after init phase 2014-06-10 16:27:12 +02:00
SpaceToad
7f5a993a07 minor tweaks in documentation 2014-06-08 12:50:18 +02:00
Dynious
b80c95ea03 Added Version Checker integration and fixed changelog grabbing 2014-06-08 11:17:34 +02:00
da3dsoul
576be235f7 Fix isFullFluidBlock -> fix Floodgates 
A recommit to 6.0.x instead of master
 2014-06-07 10:57:19 -04: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
10e7429847 Merge pull request #1854 from Prototik/tile-marker-crash 
Fix tile marker crash
 2014-05-29 11:31:45 +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
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
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
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
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
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