diff --git a/build.gradle b/build.gradle index 187515a..7126a9c 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { apply plugin: 'forge' -version = "1.0.8" +version = "1.0.9" group= "org.rbh.tfcadditions" archivesBaseName = "[1.7.10]TFC-Additions" diff --git a/src/main/java/org/rbh/tfcadditions/Reference/Names.java b/src/main/java/org/rbh/tfcadditions/Reference/Names.java index 7fcab8c..695f6f8 100644 --- a/src/main/java/org/rbh/tfcadditions/Reference/Names.java +++ b/src/main/java/org/rbh/tfcadditions/Reference/Names.java @@ -1,6 +1,5 @@ package org.rbh.tfcadditions.Reference; -import com.dunk.tfc.api.Enums.EnumFuelMaterial; /** * Created by raymondbh on 15.07.2015. @@ -8,7 +7,7 @@ public class Names { public static final String[] STONE_IGIN = new String[]{"Granite", "Diorite", "Gabbro"}; - public static final String[] STONE_SED = new String[]{"Shale", "Claystone", "Rock Salt", "Limestone", "Conglomerate", + public static final String[] STONE_SED = new String[]{"Shale", "Claystone", "Rock Salt", "Limestone", "Sandstone", "Dolomite", "Chert", "Chalk"}; public static final String[] STONE_IGEX = new String[]{"Rhyolite", "Basalt", "Andesite", "Dacite"}; public static final String[] STONE_MM = new String[]{"Quartzite", "Slate", "Phyllite", "Schist", "Gneiss", "Marble"}; diff --git a/src/main/java/org/rbh/tfcadditions/Reference/Reference.java b/src/main/java/org/rbh/tfcadditions/Reference/Reference.java index 47515d1..abd2004 100644 --- a/src/main/java/org/rbh/tfcadditions/Reference/Reference.java +++ b/src/main/java/org/rbh/tfcadditions/Reference/Reference.java @@ -9,7 +9,7 @@ public class Reference { public static final int VersionMajor = 1; public static final int VersionMinor = 0; - public static final int VersionRevision = 8; + public static final int VersionRevision = 9; public static final String ModVersion = VersionMajor + "." + VersionMinor + "." + VersionRevision; //public static final String TFCVersion = "@TFCVERSION@"; diff --git a/src/main/resources/assets/tfcadditions/lang/en_US.lang b/src/main/resources/assets/tfcadditions/lang/en_US.lang index 7953718..7c08a1a 100644 --- a/src/main/resources/assets/tfcadditions/lang/en_US.lang +++ b/src/main/resources/assets/tfcadditions/lang/en_US.lang @@ -44,7 +44,7 @@ tile.IgInRockDentSmall.Granite.name=Granite with small Outline tile.SedRockDent.Chalk.name=Chalk with Outline tile.SedRockDent.Chert.name=Chert with Outline tile.SedRockDent.Claystone.name=Claystone with Outline -tile.SedRockDent.Conglomerate.name=Conglomerate with Outline +tile.SedRockDent.Sandstone.name=Sandstone with Outline tile.SedRockDent.Dolomite.name=Dolomite with Outline tile.SedRockDent.Limestone.name=Limestone with Outline tile.SedRockDent.Rock Salt.name=Rock Salt with Outline @@ -53,7 +53,7 @@ tile.SedRockDent.Shale.name=Shale with Outline tile.SedRockDentSmall.Chalk.name=Chalk with small Outline tile.SedRockDentSmall.Chert.name=Chert with small Outline tile.SedRockDentSmall.Claystone.name=Claystone with small Outline -tile.SedRockDentSmall.Conglomerate.name=Conglomerate with small Outline +tile.SedRockDentSmall.Sandstone.name=Sandstone with small Outline tile.SedRockDentSmall.Dolomite.name=Dolomite with small Outline tile.SedRockDentSmall.Limestone.name=Limestone with small Outline tile.SedRockDentSmall.Rock Salt.name=Rock Salt with small Outline diff --git a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Dolomite/Dolomite Dent-ctm.png b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Dolomite/Dolomite Dent-ctm.png index 52e923b..699cf65 100644 Binary files a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Dolomite/Dolomite Dent-ctm.png and b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Dolomite/Dolomite Dent-ctm.png differ diff --git a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Dolomite/Dolomite Dent.png b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Dolomite/Dolomite Dent.png index 2f6d199..f211094 100644 Binary files a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Dolomite/Dolomite Dent.png and b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Dolomite/Dolomite Dent.png differ diff --git a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Dolomite/Dolomite DentSmall-ctm.png b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Dolomite/Dolomite DentSmall-ctm.png index a45a16a..d265bd2 100644 Binary files a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Dolomite/Dolomite DentSmall-ctm.png and b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Dolomite/Dolomite DentSmall-ctm.png differ diff --git a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Dolomite/Dolomite DentSmall.png b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Dolomite/Dolomite DentSmall.png index f5081cc..ea8c2a2 100644 Binary files a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Dolomite/Dolomite DentSmall.png and b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Dolomite/Dolomite DentSmall.png differ diff --git a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Conglomerate/Conglomerate Dent-ctm.png b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Sandstone/Sandstone Dent-ctm.png similarity index 100% rename from src/main/resources/assets/tfcadditions/textures/blocks/rocks/Conglomerate/Conglomerate Dent-ctm.png rename to src/main/resources/assets/tfcadditions/textures/blocks/rocks/Sandstone/Sandstone Dent-ctm.png diff --git a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Conglomerate/Conglomerate Dent.png b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Sandstone/Sandstone Dent.png similarity index 100% rename from src/main/resources/assets/tfcadditions/textures/blocks/rocks/Conglomerate/Conglomerate Dent.png rename to src/main/resources/assets/tfcadditions/textures/blocks/rocks/Sandstone/Sandstone Dent.png diff --git a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Conglomerate/Conglomerate DentSmall-ctm.png b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Sandstone/Sandstone DentSmall-ctm.png similarity index 100% rename from src/main/resources/assets/tfcadditions/textures/blocks/rocks/Conglomerate/Conglomerate DentSmall-ctm.png rename to src/main/resources/assets/tfcadditions/textures/blocks/rocks/Sandstone/Sandstone DentSmall-ctm.png diff --git a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Conglomerate/Conglomerate DentSmall.png b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Sandstone/Sandstone DentSmall.png similarity index 100% rename from src/main/resources/assets/tfcadditions/textures/blocks/rocks/Conglomerate/Conglomerate DentSmall.png rename to src/main/resources/assets/tfcadditions/textures/blocks/rocks/Sandstone/Sandstone DentSmall.png diff --git a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Slate/Slate Dent-ctm.png b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Slate/Slate Dent-ctm.png index 699cf65..52e923b 100644 Binary files a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Slate/Slate Dent-ctm.png and b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Slate/Slate Dent-ctm.png differ diff --git a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Slate/Slate Dent.png b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Slate/Slate Dent.png index f211094..2f6d199 100644 Binary files a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Slate/Slate Dent.png and b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Slate/Slate Dent.png differ diff --git a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Slate/Slate DentSmall-ctm.png b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Slate/Slate DentSmall-ctm.png index d265bd2..a45a16a 100644 Binary files a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Slate/Slate DentSmall-ctm.png and b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Slate/Slate DentSmall-ctm.png differ diff --git a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Slate/Slate DentSmall.png b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Slate/Slate DentSmall.png index ea8c2a2..f5081cc 100644 Binary files a/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Slate/Slate DentSmall.png and b/src/main/resources/assets/tfcadditions/textures/blocks/rocks/Slate/Slate DentSmall.png differ