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

Merge branch '5.0.x' into 6.0.x

Browse source 
Conflicts:
	common/buildcraft/BuildCraftEnergy.java
This commit is contained in:
SpaceToad 2014-07-11 22:26:29 +02:00
commit ab4114dbe6
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -29,7 +29,7 @@ archivesBaseName = "buildcraft" // the name that all artifacts will use as a bas
minecraft {
version = "1.7.10-10.13.0.1179" // McVersion-ForgeVersion this variable is later changed to contain only the MC version, while the apiVersion variable is used for the forge version. Yeah its stupid, and will be changed eentually.
assetDir = "run/assets" // the place for ForgeGradle to download the assets. The assets that the launcher gets and stuff
runDir = "run" // the directory for ForgeGradle to run Minecraft in
// replacing stuff in the source
replace '@VERSION@', project.version

8
common/buildcraft/BuildCraftEnergy.java
View file

@ -132,8 +132,8 @@ public class BuildCraftEnergy extends BuildCraftMod {
oilBiomeIDs,
BuildCraftCore.mainConfiguration
.get(Configuration.CATEGORY_GENERAL, "oil.increasedBiomeIDs",
new String[] {BiomeDictionary.Type.DESERT.toString(), BiomeGenBase.taiga.biomeName},
"IDs or Biome Types (e.g. DESERT,OCEAN) of biomes that should have increased oil generation rates."));
new String[] {BiomeDictionary.Type.SANDY.toString(), BiomeGenBase.taiga.biomeName},
"IDs or Biome Types (e.g. SANDY,OCEAN) of biomes that should have increased oil generation rates."));
setBiomeList(
excessiveOilBiomeIDs,
@ -141,12 +141,12 @@ public class BuildCraftEnergy extends BuildCraftMod {
.get(Configuration.CATEGORY_GENERAL,
"oil.excessiveBiomeIDs",
new String[] {},
"IDs or Biome Types (e.g. DESERT,OCEAN) of biomes that should have GREATLY increased oil generation rates."));
"IDs or Biome Types (e.g. SANDY,OCEAN) of biomes that should have GREATLY increased oil generation rates."));
setBiomeList(excludeOilBiomeIDs, BuildCraftCore.mainConfiguration
.get(Configuration.CATEGORY_GENERAL, "oil.excludeBiomeIDs",
new String[] {BiomeGenBase.sky.biomeName, BiomeGenBase.hell.biomeName},
"IDs or Biome Types (e.g. DESERT,OCEAN) of biomes that are excluded from generating oil."));
"IDs or Biome Types (e.g. SANDY,OCEAN) of biomes that are excluded from generating oil."));
double fuelOilMultiplier = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "fuel.oil.combustion", 1.0F, "adjust energy value of Oil in Combustion Engines").getDouble(1.0F);
double fuelFuelMultiplier = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "fuel.fuel.combustion", 1.0F, "adjust energy value of Fuel in Combustion Engines").getDouble(1.0F);

2
common/buildcraft/core/fluids/Tank.java
View file

@ -82,7 +82,7 @@ public class Tank extends FluidTank {
toolTip.clear();
int amount = 0;
if (getFluid() != null && getFluid().amount > 0) {
ToolTipLine fluidName = new ToolTipLine(getFluid().getFluid().getLocalizedName());
ToolTipLine fluidName = new ToolTipLine(getFluid().getFluid().getLocalizedName(getFluid()));
fluidName.setSpacing(2);
toolTip.add(fluidName);
amount = getFluid().amount;