-
-
Notifications
You must be signed in to change notification settings - Fork 349
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'version/main' into feature/update_forge_events
# Conflicts: # src/main/java/com/minecolonies/core/entity/ai/workers/AbstractEntityAIStructureWithWorkOrder.java
- Loading branch information
Showing
751 changed files
with
7,843 additions
and
1,954 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
...minecolonies/models/item/raw_noodles.json → ...s/minecolonies/models/item/apple_pie.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/raw_noodles" | ||
| "layer0": "minecolonies:item/food/apple_pie" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/baked_salmon.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/baked_salmon" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/borscht.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/borscht" | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/cheese_pizza.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/cheese_pizza" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/cheese_ravioli.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/cheese_ravioli" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/chicken_broth.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/chicken_broth" | ||
| } | ||
| } |
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/cooked_rice.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/cooked_rice" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/corn_chowder.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/corn_chowder" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/cornmeal.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/cornmeal" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/creamcheese.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/creamcheese" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/eggdrop_soup.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/eggdrop_soup" | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/fish_dinner.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/fish_dinner" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/fish_n_chips.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/fish_n_chips" | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/kebab.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/kebab" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/kimchi.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/kimchi" | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/meat_ravioli.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/meat_ravioli" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/mint_jelly.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/mint_jelly" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/mint_tea.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/mint_tea" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/mintchoco_cheesecake.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/mintchoco_cheesecake" | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/mushroom_pizza.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/mushroom_pizza" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/mutton_dinner.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/mutton_dinner" | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/pea_soup.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/pea_soup" | ||
| } | ||
| } |
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/pierogi.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/pierogi" | ||
| } | ||
| } |
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/plain_cheesecake.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/plain_cheesecake" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/polenta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/polenta" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/potato_soup.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/potato_soup" | ||
| } | ||
| } |
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/ramen.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/ramen" | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/schnitzel.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/schnitzel" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/soysauce.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/soysauce" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/spicy_eggplant.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/spicy_eggplant" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
...datagen/generated/minecolonies/assets/minecolonies/models/item/spicy_grilled_chicken.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/spicy_grilled_chicken" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/squash_soup.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/squash_soup" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/steak_dinner.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/steak_dinner" | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/tacos.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/tacos" | ||
| } | ||
| } |
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/tortillas.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/tortillas" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/veggie_quiche.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/veggie_quiche" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/veggie_ravioli.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/veggie_ravioli" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/veggie_soup.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/veggie_soup" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/yogurt.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/yogurt" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/datagen/generated/minecolonies/assets/minecolonies/models/item/yogurt_with_berries.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "minecolonies:item/food/yogurt_with_berries" | ||
| } | ||
| } |
35 changes: 35 additions & 0 deletions
35
...datagen/generated/minecolonies/data/minecolonies/advancements/recipes/food/apple_pie.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_apple": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "minecraft:apple" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "minecolonies:apple_pie" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_apple", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "minecolonies:apple_pie" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
35 changes: 35 additions & 0 deletions
35
...agen/generated/minecolonies/data/minecolonies/advancements/recipes/food/baked_salmon.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_garlic": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "minecolonies:garlic" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "minecolonies:baked_salmon" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_garlic", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "minecolonies:baked_salmon" | ||
| ] | ||
| }, | ||
| "sends_telemetry_event": false | ||
| } |
Oops, something went wrong.