Merge upstream

This commit is contained in:
Vincent Lee committed 2016-04-06 09:51:50 -05:00
commit 4ec22a0417
23 files changed
+209 -209

No files matched your search

+1
View File
@@ -55,3 +55,4 @@ gryphonn=11
loraanicus=10
samerater=8
coolcabbage16=13
eladkay=3
@@ -54,7 +54,6 @@ public interface IFloatingFlower {
return type == null ? GRASS : type;
}
@Override
public String toString() {
return this.typeName;
}
@@ -128,7 +128,7 @@ public final class BaubleRenderHandler implements LayerRenderer<EntityPlayer> {
int lightmapX = light % 65536;
int lightmapY = light / 65536;
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE); // todo 1.9
Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE);
GlStateManager.popMatrix();
if(renderedOne)
@@ -10,6 +10,7 @@
*/
package vazkii.botania.client.render.tile;
import java.awt.*;
import java.util.Random;
import net.minecraft.block.state.IBlockState;
@@ -468,7 +468,7 @@ entity.Botania.botania:fallingStar.name=Falling Star
achievement.botania:flowerPickup=Sky of Beginning
achievement.botania:flowerPickup.desc=Pick up a Mystical Flower from the world
achievement.botania:lexiconUse=A Realistical Logical Ideologist
achievement.botania:lexiconUse.desc=Open a Lexica Botania and have a look through the index
achievement.botania:lexiconUse.desc=Open a Lexica Botania and have a look through the _index
achievement.botania:daybloomPickup=Daybreak Arrival
achievement.botania:daybloomPickup.desc=Make a Daybloom in a Petal Apothecary
achievement.botania:manaPoolPickup=Vivid Wave
File diff suppressed because it is too large. Load diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 17 KiB