Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Avocado spelling #409

Open
wants to merge 2 commits into
base: master-MC1.12
Choose a base branch
from
Open

Fixed Avocado spelling #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1309d20
Changing avacado to avocado
nhyty Feb 1, 2018
6d73684
Missed the texture
nhyty Feb 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions extratrees/src/main/java/binnie/extratrees/genetics/AlleleETFruitDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,10 @@ protected void addProducts() {
addProduct(Food.CASHEW.get(1), 1.0f);
}
},
Avacado("avacado", 10, 10272370, 2170640, FruitSprite.PEAR, JUNGLE){
Avocado("avocado", 10, 10272370, 2170640, FruitSprite.PEAR, JUNGLE){
@Override
protected void addProducts() {
addProduct(Food.AVACADO.get(1), 1.0f);
addProduct(Food.AVOCADO.get(1), 1.0f);
}
},
Nutmeg("nutmeg", 9, 14861101, 11305813, FruitSprite.TINY, JUNGLE){
Expand Down
4 changes: 2 additions & 2 deletions extratrees/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1836,15 +1836,15 @@ protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder species) {
species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"));
}
},
Avacado("persea", "americana", EnumLeafType.JUNGLE, new Color(0x96A375), new Color(0x96A375), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)) {
Avocado("persea", "americana", EnumLeafType.JUNGLE, new Color(0x96A375), new Color(0x96A375), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)) {
@Override
public WorldGenerator getWorldGenerator(ITreeGenData tree) {
return new WorldGenLazy.Tree(tree);
}

@Override
protected void setAlleles(AlleleTemplate template) {
template.set(EnumTreeChromosome.FRUITS, AlleleETFruitDefinition.Avacado.getAllele());
template.set(EnumTreeChromosome.FRUITS, AlleleETFruitDefinition.Avocado.getAllele());
template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele());
template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele());
}
Expand Down
2 changes: 1 addition & 1 deletion extratrees/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public static void init() {
new ExtraTreeMutation(getVanilla("Teak"), ETTreeDefinition.Rosewood.getSpecies(), ETTreeDefinition.Cinnamon.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Balsa"), ETTreeDefinition.Brazilnut.getSpecies(), ETTreeDefinition.Coconut.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Teak"), getVanilla("Oak"), ETTreeDefinition.Cashew.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Wenge"), getVanilla("Oak"), ETTreeDefinition.Avacado.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Wenge"), getVanilla("Oak"), ETTreeDefinition.Avocado.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Teak"), ETTreeDefinition.Clove.getSpecies(), ETTreeDefinition.Nutmeg.getSpecies(), 10);
new ExtraTreeMutation(getVanilla("Teak"), ETTreeDefinition.Clove.getSpecies(), ETTreeDefinition.Allspice.getSpecies(), 10);
new ExtraTreeMutation(ETTreeDefinition.Allspice.getSpecies(), ETTreeDefinition.Clove.getSpecies(), ETTreeDefinition.StarAnise.getSpecies(), 10);
Expand Down
2 changes: 1 addition & 1 deletion extratrees/src/main/java/binnie/extratrees/items/Food.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ protected void registerOreDictEntries() {
GOLDEN_RASPBERRY(2),
COCONUT(2),
CASHEW(0),
AVACADO(2),
AVOCADO(2),
NUTMEG(0),
ALLSPICE(0),
CHILLI(2),
Expand Down
2 changes: 1 addition & 1 deletion extratrees/src/main/java/binnie/extratrees/modules/ModuleCore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public void doInit() {
Food.CLOVE.addOil(10, 25, 2);
Food.COCONUT.addOil(20, 300, 25);
Food.CASHEW.addJuice(10, 150, 15);
Food.AVACADO.addJuice(10, 300, 15);
Food.AVOCADO.addJuice(10, 300, 15);
Food.NUTMEG.addOil(20, 50, 10);
Food.ALLSPICE.addOil(20, 50, 10);
Food.CHILLI.addJuice(10, 100, 10);
Expand Down
2 changes: 1 addition & 1 deletion extratrees/src/main/resources/assets/extratrees/blockstates/germlings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"tree=cinnamon": { "model": "extratrees:saplings/tree_default" },
"tree=coconut": { "model": "extratrees:saplings/tree_default" },
"tree=cashew": { "model": "extratrees:saplings/tree_default" },
"tree=avacado": { "model": "extratrees:saplings/tree_default" },
"tree=avocado": { "model": "extratrees:saplings/tree_default" },
"tree=nutmeg": { "model": "extratrees:saplings/tree_default" },
"tree=allspice": { "model": "extratrees:saplings/tree_default" },
"tree=chilli": { "model": "extratrees:saplings/tree_default" },
Expand Down
4 changes: 2 additions & 2 deletions extratrees/src/main/resources/assets/extratrees/lang/en_GB.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ extratrees.species.floweringcrabapple.name=Flowering Crab Apple
extratrees.species.prairiecrabapple.name=Prairie Crab Apple
extratrees.species.manderin.name=Mandarin
extratrees.species.osange_orange.name=Osage-Orange
extratrees.species.avacado.name=Avocado
extratrees.species.avocado.name=Avocado

extratrees.item.food.crabapple=Crab Apple
extratrees.item.food.buddha_hand=Buddha’s Hand
extratrees.item.food.manderin=Mandarin
extratrees.item.food.avacado=Avocado
extratrees.item.food.avocado=Avocado
6 changes: 3 additions & 3 deletions extratrees/src/main/resources/assets/extratrees/lang/en_US.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ extratrees.species.goldenraspberry.name=Golden Raspberry
extratrees.species.cinnamon.name=Cinnamon
extratrees.species.coconut.name=Coconut
extratrees.species.cashew.name=Cashew
extratrees.species.avacado.name=Avacado
extratrees.species.avocado.name=Avocado
extratrees.species.nutmeg.name=Nutmeg
extratrees.species.allspice.name=Allspice
extratrees.species.chilli.name=Chilli Pepper
Expand Down Expand Up @@ -433,7 +433,7 @@ extratrees.fruits.platain=Platain
extratrees.fruits.coffee=Coffee
extratrees.fruits.coconut=Coconut
extratrees.fruits.cashew=Cashew
extratrees.fruits.avacado=Avacado
extratrees.fruits.avocado=Avocado
extratrees.fruits.nutmeg=Nutmeg
extratrees.fruits.allspice=Allspice
extratrees.fruits.chilli=Chilli
Expand Down Expand Up @@ -549,7 +549,7 @@ extratrees.item.food.gooseberry=Gooseberry
extratrees.item.food.golden_raspberry=Golden Raspberry
extratrees.item.food.coconut=Coconut
extratrees.item.food.cashew=Cashew
extratrees.item.food.avacado=Avacado
extratrees.item.food.avocado=Avocado
extratrees.item.food.nutmeg=Nutmeg
extratrees.item.food.allspice=Allspice
extratrees.item.food.chilli=Chilli
Expand Down
6 changes: 3 additions & 3 deletions extratrees/src/main/resources/assets/extratrees/lang/ru_RU.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ extratrees.species.goldenraspberry.name=Золотая малина
extratrees.species.cinnamon.name=Корица
extratrees.species.coconut.name=Кокос
extratrees.species.cashew.name=Кешью
extratrees.species.avacado.name=Авокадо
extratrees.species.avocado.name=Авокадо
extratrees.species.nutmeg.name=Мускатный орех
extratrees.species.allspice.name=Ямайский перец
extratrees.species.chilli.name=Перец чили
Expand Down Expand Up @@ -433,7 +433,7 @@ extratrees.fruits.platain=Подорожник
extratrees.fruits.coffee=Кофе
extratrees.fruits.coconut=Кокос
extratrees.fruits.cashew=Кешью
extratrees.fruits.avacado=Авокадо
extratrees.fruits.avocado=Авокадо
extratrees.fruits.nutmeg=Мускатный орех
extratrees.fruits.allspice=Ямайский перец
extratrees.fruits.chilli=Чили
Expand Down Expand Up @@ -549,7 +549,7 @@ extratrees.item.food.gooseberry=Крыжовник
extratrees.item.food.golden_raspberry=Золотая малина
extratrees.item.food.coconut=Кокос
extratrees.item.food.cashew=Кешью
extratrees.item.food.avacado=Авокадо
extratrees.item.food.avocado=Авокадо
extratrees.item.food.nutmeg=Мускатный орех
extratrees.item.food.allspice=Ямайский перец
extratrees.item.food.chilli=Чили
Expand Down
6 changes: 3 additions & 3 deletions extratrees/src/main/resources/assets/extratrees/lang/zh_CN.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ extratrees.species.goldenraspberry.name=金树莓
extratrees.species.cinnamon.name=肉桂
extratrees.species.coconut.name=椰子
extratrees.species.cashew.name=腰果
extratrees.species.avacado.name=鳄梨
extratrees.species.avocado.name=鳄梨
extratrees.species.nutmeg.name=肉豆蔻
extratrees.species.allspice.name=多香果
extratrees.species.chilli.name=辣椒
Expand Down Expand Up @@ -433,7 +433,7 @@ extratrees.fruits.platain=芭蕉
extratrees.fruits.coffee=咖啡
extratrees.fruits.coconut=椰子
extratrees.fruits.cashew=腰果
extratrees.fruits.avacado=鳄梨
extratrees.fruits.avocado=鳄梨
extratrees.fruits.nutmeg=肉豆蔻
extratrees.fruits.allspice=多香果
extratrees.fruits.chilli=辣椒
Expand Down Expand Up @@ -549,7 +549,7 @@ extratrees.item.food.gooseberry=鹅莓
extratrees.item.food.golden_raspberry=金树莓
extratrees.item.food.coconut=椰子
extratrees.item.food.cashew=腰果
extratrees.item.food.avacado=鳄梨
extratrees.item.food.avocado=鳄梨
extratrees.item.food.nutmeg=肉豆蔻
extratrees.item.food.allspice=多香果
extratrees.item.food.chilli=辣椒
Expand Down
2 changes: 1 addition & 1 deletion ...extratrees/models/item/foods/avacado.json → ...extratrees/models/item/foods/avocado.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "extratrees:items/food/avacado"
"layer0": "extratrees:items/food/avocado"
}
}
0 ...xtratrees/textures/items/food/avacado.png → ...xtratrees/textures/items/food/avocado.png
View file
Open in desktop
File renamed without changes