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

2820 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adrian Siekierka
944b4a3609 Merge pull request #2038 from smariot/6.0.x 
Fixed incorrect chunk positions in SpringPopulate and OilPopulate.
 2014-10-15 15:38:45 +02:00
Tyson Brown
a698f56719 Fixed incorrect chunk positions in SpringPopulate and OilPopulate. 2014-10-08 13:15:36 -04:00
SpaceToad
51f2e5a787 Merge pull request #2000 from Prototik/facade-renderer-npe 
Fix strange npe in facade item renderer
 2014-09-06 12:22:22 +02:00
SpaceToad
5ae55c2663 fixed previous commit 2014-09-02 21:27:28 +02:00
SpaceToad
1c23818474 prepare version 6.0.18 2014-09-02 21:22:58 +02:00
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
SpaceToad
cf2e67c071 Merge pull request #1967 from 61352151511/6.0.x 
Update en_US.lang
 2014-08-03 20:33:48 +02:00
SpaceToad
173f9ba466 Merge pull request #1969 from ganymedes01/patch-1 
Fix builder/filler not rendering if player is too far away
 2014-08-03 20:32:28 +02: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
Mitchell
0106f11648 Update en_US.lang 
Fix one more small grammar error
 2014-08-02 21:22:50 -03:00
SpaceToad
8968e951dd Merge pull request #1961 from 61352151511/6.0.x 
Update en_US.lang (Grammar)
 2014-08-01 00:35:45 +02:00
Mitchell
206f31848a Update en_US.lang 
Fix Grammar Mistakes
 2014-07-31 15:07:51 -03:00
SpaceToad
420fee4d34 added missing changelog 2014-07-29 08:54:22 +02: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
SpaceToad
6ac6ea4734 prepare release 6.0.17 for Minecraft 1.7.10 2014-07-11 23:57:44 +02:00
SpaceToad
cc084241b4 Merge pull request #1935 from adudney/6.0.x 
Fixes GL Errors and changes more deprecated functionality to equivalent
 2014-07-11 22:47:47 +02:00
Andrew Dudney
bdb5216b9f Merge branch '6.0.x' of github.com:BuildCraft/BuildCraft into 6.0.x 2014-07-11 14:39:54 -06:00
SpaceToad
ab4114dbe6 Merge branch '5.0.x' into 6.0.x 
Conflicts:
	common/buildcraft/BuildCraftEnergy.java
 2014-07-11 22:26:29 +02:00
SpaceToad
9e0079cbb3 Merge pull request #1936 from adudney/5.0.x 
5.0.x Forge deprecation fixes
 2014-07-11 22:23:06 +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
SpaceToad
368cdb234e Merge pull request #1919 from Parker8283/5.0.x 
Updated to 1.7.10
 2014-07-11 08:04:17 +02:00
Parker
08dd853bf5 Bumped to Forge 1179 2014-07-10 16:59:18 -04:00
Andrew Dudney
2935e7288f Reverted version change 2014-07-05 08:58:23 -06: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
SpaceToad
3dbd220631 Merge pull request #1918 from tambry/laserDataFix 
Fixed laser data not existing in some cases
 2014-06-28 15:46:19 +02:00
Raul Tambre
10d0287df1 Fixed laser data not existing in some cases 2014-06-28 15:48:53 +03:00
SpaceToad
286737b4ad Merge pull request #1905 from tambry/facadeLoadFix 
Fixed ghost facades from pre-6.0.x worlds
 2014-06-24 06:44:08 +02:00
Raul Tambre
78a06e5f35 Fixed ghost facades from pre-6.0.x 2014-06-23 11:41:27 +03:00
SpaceToad
4a97bf3c48 Merge pull request #1894 from tambry/MarkerCrashFix 
Prevent a possible crash when rendering a marker
 2014-06-17 21:41:25 +02:00
Raul Tambre
753e4693bc Prevent possible crash when rendering a marker 2014-06-16 21:23:33 +03:00
SpaceToad
e308a0a3e2 Merge pull request #1887 from tambry/PoolFixes 
Replace .getAABBPool() and .getWorldVec3Pool() for 1.7.10 compatibility
 2014-06-14 18:02:12 +02: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
SpaceToad
4931bc2954 Merge pull request #1872 from Dynious/6.0.x 
Made sure Version IMC message is also sent after init phase
 2014-06-11 01:36:12 +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