Bump versions + fix language issues + add a method used for the bushes

progwml6 · Sep 10, 2016 · fd7ef27 · fd7ef27
1 parent 909a59c
commit fd7ef27
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 5 deletions.
diff --git a/build.properties b/build.properties
@@ -2,12 +2,12 @@ mod_version=4.0.0
 
 minecraft_version=1.10.2
 
-forge_version=12.18.1.2075
-mappings=snapshot_20160828
+forge_version=12.18.1.2076
+mappings=snapshot_20160902
 
-mantle_version=0.10.4.jenkins165
-tconstruct_version=2.4.0.jenkins330
+mantle_version=1.0.0.+
+tconstruct_version=2.4.1.+
 
 jei_version=3.9.0.246
 waila_version=1.7.0-B3
-mcmultipart_version=1.3.0_82
+mcmultipart_version=1.3.0_83
diff --git a/src/main/java/com/progwml6/natura/common/ClientProxy.java b/src/main/java/com/progwml6/natura/common/ClientProxy.java
@@ -6,6 +6,7 @@
 import com.progwml6.natura.library.Util;
 
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.Item;
@@ -118,4 +119,10 @@ public static ResourceLocation getItemLocation(Item item)
     {
         return Util.getItemLocation(item);
     }
+
+    @Override
+    public boolean fancyGraphicsEnabled()
+    {
+        return Minecraft.getMinecraft().gameSettings.fancyGraphics;
+    }
 }
diff --git a/src/main/java/com/progwml6/natura/common/CommonProxy.java b/src/main/java/com/progwml6/natura/common/CommonProxy.java
@@ -19,4 +19,9 @@ public void postInit()
     protected void registerModels()
     {
     }
+
+    public boolean fancyGraphicsEnabled()
+    {
+        return false;
+    }
 }
diff --git a/src/main/resources/assets/natura/lang/en_US.lang b/src/main/resources/assets/natura/lang/en_US.lang
@@ -126,6 +126,16 @@ tile.natura.overworld_slab2.hopseed.tooltip=Ascended Glitch
 tile.natura.overworld_slab2.redwood.name=Redwood Slab
 tile.natura.overworld_slab2.redwood.tooltip=Giant Sequoia
 
+tile.natura.overworld_stairs_maple.name=Maple Stairs
+tile.natura.overworld_stairs_silverbell.name=Silverbell Stairs
+tile.natura.overworld_stairs_amaranth.name=Amaranth Stairs
+tile.natura.overworld_stairs_tiger.name=Tiger Stairs
+tile.natura.overworld_stairs_willow.name=Willow Stairs
+tile.natura.overworld_stairs_eucalyptus.name=Eucalyptus Stairs
+tile.natura.overworld_stairs_hopseed.name=Hopseed Stairs
+tile.natura.overworld_stairs_sakura.name=Sakura Stairs
+tile.natura.overworld_stairs_redwood.name=Redwood Stairs
+
 tile.natura.nether_logs.ghostwood.name=Ghostwood
 tile.natura.nether_logs.ghostwood.tooltip=Nether Tree\nPale as a ghost
 tile.natura.nether_logs.darkwood.name=Darkwood
@@ -174,6 +184,11 @@ tile.natura.nether_slab.fusewood.tooltip=Nether Tree\nExplosive Personality
 tile.natura.nether_slab.darkwood.name=Darkwood Slab
 tile.natura.nether_slab.darkwood.tooltip=Nether Tree
 
+tile.natura.nether_stairs_ghostwood.name=Ghostwood Stairs
+tile.natura.nether_stairs_bloodwood.name=Blood Stairs
+tile.natura.nether_stairs_darkwood.name=Darkwood Stairs
+tile.natura.nether_stairs_fusewood.name=Fusewood Stairs
+
 tile.natura.nether_glass.soul.name=Soul Glass
 tile.natura.nether_glass.soul.tooltip=Ghostly
 tile.natura.nether_glass.heat.name=Heat Glass