From 9c81817baafdf31a452e56c1e760ad9b4b3fa586 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 12 Mar 2016 17:16:17 -0800 Subject: [PATCH] Fix spelling of Sequoia assets --- .../arboriculture/genetics/TreeDefinition.java | 2 +- .../assets/forestry/blockstates/germlings.json | 2 +- .../models/block/germlings/sapling.treeSequioa.json | 6 ------ .../models/block/germlings/sapling.treeSequoia.json | 6 ++++++ .../models/item/germlings/sapling.treeSequioa.json | 6 ------ .../models/item/germlings/sapling.treeSequoia.json | 6 ++++++ ...ling.treeSequioa.png => sapling.treeSequoia.png} | Bin 7 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeSequioa.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeSequoia.json delete mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequioa.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequoia.json rename src/main/resources/assets/forestry/textures/blocks/germlings/{sapling.treeSequioa.png => sapling.treeSequoia.png} (100%) mode change 100755 => 100644 diff --git a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java index f5ea1d000..bd620271d 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java @@ -414,7 +414,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Spruce, Larch, 10); } }, - Sequioa(TreeBranchDefinition.SEQUOIA, "coastSequoia", "sempervirens", false, EnumLeafType.CONIFERS, new Color(0x418e71), new Color(0x569896), EnumWoodType.SEQUOIA) { + Sequoia(TreeBranchDefinition.SEQUOIA, "coastSequoia", "sempervirens", false, EnumLeafType.CONIFERS, new Color(0x418e71), new Color(0x569896), EnumWoodType.SEQUOIA) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenSequoia(tree); diff --git a/src/main/resources/assets/forestry/blockstates/germlings.json b/src/main/resources/assets/forestry/blockstates/germlings.json index 43b50cec1..0f4eeccc8 100644 --- a/src/main/resources/assets/forestry/blockstates/germlings.json +++ b/src/main/resources/assets/forestry/blockstates/germlings.json @@ -13,7 +13,7 @@ "tree=spruce": { "model": "forestry:germlings/sapling.treeSpruce" }, "tree=larch": { "model": "forestry:germlings/sapling.treeLarch" }, "tree=pine": { "model": "forestry:germlings/sapling.treePine" }, - "tree=sequioa": { "model": "forestry:germlings/sapling.treeSequioa" }, + "tree=sequoia": { "model": "forestry:germlings/sapling.treeSequoia" }, "tree=gigant": { "model": "forestry:germlings/sapling.treeGigant" }, "tree=jungle": { "model": "forestry:germlings/sapling.treeJungle" }, "tree=teak": { "model": "forestry:germlings/sapling.treeTeak" }, diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSequioa.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSequioa.json deleted file mode 100644 index e084746d8..000000000 --- a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSequioa.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "forestry:blocks/germlings/sapling.treeSequioa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSequoia.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSequoia.json new file mode 100644 index 000000000..823d4437b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSequoia.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeSequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequioa.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequioa.json deleted file mode 100644 index bf6b716c9..000000000 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequioa.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "forestry:blocks/germlings/sapling.treeSequioa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequoia.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequoia.json new file mode 100644 index 000000000..45c445973 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequoia.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeSequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeSequioa.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeSequoia.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeSequioa.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeSequoia.png