Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '6.0.x' into 6.1.x

Browse source 
Conflicts:
	buildcraft_resources/assets/buildcraft/lang/en_US.lang
This commit is contained in:
SpaceToad 2014-08-05 08:57:14 +02:00
commit a2871a566a
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
buildcraft_resources/assets/buildcraft/lang/en_US.lang
View file

@ -250,7 +250,7 @@ tile.spring.oil.name=Oil Spring
tile.spring.water.name=Water Spring tile.spring.water.name=Water Spring
tile.tankBlock.name=Tank tile.tankBlock.name=Tank
tile.energyConverter.name=Energy Converter tile.energyConverter.name=Energy Converter
tile.energyConverter.tooltip=Convert BC energy between old and new power API|Added for compatibility with other mods|while they not migrated to new power API.|Could be removed in the future. tile.energyConverter.tooltip=Convert BC energy between old and new power API|Added for compatibility with other mods|while they are not migrated to the new power API.|Could be removed in the future.
tile.zonePlan.name=Zone Planner tile.zonePlan.name=Zone Planner
tile.architect.rotate=Rotate: On tile.architect.rotate=Rotate: On
@ -300,9 +300,9 @@ achievement.woodenGearAchievement.desc=Craft a wooden gear
achievement.stoneGearAchievement=Hard as a rock achievement.stoneGearAchievement=Hard as a rock
achievement.stoneGearAchievement.desc=Upgrade a wooden gear to a stone gear achievement.stoneGearAchievement.desc=Upgrade a wooden gear to a stone gear
achievement.ironGearAchievement=Is it stainless? achievement.ironGearAchievement=Is it stainless?
achievement.ironGearAchievement.desc=Upgrade a stone gear to a iron gear achievement.ironGearAchievement.desc=Upgrade a stone gear to an iron gear
achievement.goldGearAchievement=No, it isn't made of honey achievement.goldGearAchievement=No, it isn't made of honey
achievement.goldGearAchievement.desc=Upgrade a iron gear to a gold gear achievement.goldGearAchievement.desc=Upgrade an iron gear to a gold gear
achievement.diamondGearAchievement=Shiny! achievement.diamondGearAchievement=Shiny!
achievement.diamondGearAchievement.desc=Upgrade a gold gear to a diamond gear achievement.diamondGearAchievement.desc=Upgrade a gold gear to a diamond gear
achievement.wrenchAchievement=Just hit it! achievement.wrenchAchievement=Just hit it!

9
buildcraft_resources/changelog/6.0.17 Executable file
View file

@ -0,0 +1,9 @@
#1935 finished port to 1.7.10 [adudney]
#1918 fixed laser data not existing in some cases [tambry]
#1905 fixed ghost facades from pre-6.0.x worlds [tambry]
#1894 prevent a possible crash when rendering a marker [tambry]
#1893 parameterization and cleanup! [tambry]
#1887 Replace .getAABBPool() and .getWorldVec3Pool() for 1.7.10 compatibility [tambry]
#1872 made sure Version IMC message is also sent after init phase enhancement [Dynious]
#1871 added Version Checker integration and fixed changelog grabbing feature [Dynious]
#1870 fix Floodgates [da3dsous]

5
common/buildcraft/builders/TileAbstractBuilder.java
View file

@ -153,4 +153,9 @@ public abstract class TileAbstractBuilder extends TileBuildCraft implements ITil
mjPrev = mjStored; mjPrev = mjStored;
mjUnchangedCycles = 0; mjUnchangedCycles = 0;
} }
@Override
public double getMaxRenderDistanceSquared() {
return Double.MAX_VALUE;
}
} }