-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '1.21' of https://github.com/TeamMoegMC/Caupona.git into…
… 1.21
- Loading branch information
Showing
28 changed files
with
348 additions
and
14 deletions.
There are no files selected for viewing
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
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
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
13 changes: 13 additions & 0 deletions
13
src/main/resources/data/caupona/recipe/campfire_cooking/loaf.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,13 @@ | ||
| { | ||
| "type": "minecraft:campfire_cooking", | ||
| "category": "food", | ||
| "cookingtime": 200, | ||
| "experience": 0.35, | ||
| "ingredient": { | ||
| "item": "caupona:loaf_dough" | ||
| }, | ||
| "result": { | ||
| "id": "caupona:loaf", | ||
| "count": 1 | ||
| } | ||
| } |
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 |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ | |
| } | ||
| }, | ||
| "result": { | ||
| "id": "minecraft:raw_copper" | ||
| "id": "minecraft:raw_copper", | ||
| "count": 3 | ||
| } | ||
| } | ||
10 changes: 10 additions & 0 deletions
10
src/main/resources/data/caupona/recipe/crafting/bread_from_loaf.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,10 @@ | ||
| { | ||
| "type": "minecraft:crafting_shapeless", | ||
| "ingredients": [ | ||
| {"item": "caupona:loaf"} | ||
| ], | ||
| "result": { | ||
| "id": "minecraft:bread", | ||
| "count": 2 | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
src/main/resources/data/caupona/recipe/crafting/kitchen_rail.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,23 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "pattern": [ | ||
| "SIS", | ||
| "S S", | ||
| "P P" | ||
| ], | ||
| "key": { | ||
| "S": { | ||
| "item": "minecraft:stick" | ||
| }, | ||
| "I": { | ||
| "item": "minecraft:iron_bars" | ||
| }, | ||
| "P": { | ||
| "tag": "minecraft:planks" | ||
| } | ||
| }, | ||
| "result": { | ||
| "id": "caupona:kitchen_rail", | ||
| "count": 1 | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
src/main/resources/data/caupona/recipe/crafting/loaf_heap.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,16 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "pattern": [ | ||
| "LL", | ||
| "LL" | ||
| ], | ||
| "key": { | ||
| "L": { | ||
| "item": "caupona:loaf" | ||
| } | ||
| }, | ||
| "result": { | ||
| "id": "caupona:loaf_heap", | ||
| "count": 1 | ||
| } | ||
| } |
15 changes: 15 additions & 0 deletions
15
src/main/resources/data/caupona/recipe/crafting/loaf_heap_slab.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,15 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "pattern": [ | ||
| "BBB" | ||
| ], | ||
| "key": { | ||
| "B": { | ||
| "item": "caupona:loaf_heap" | ||
| } | ||
| }, | ||
| "result": { | ||
| "id": "caupona:loaf_heap_slab", | ||
| "count": 6 | ||
| } | ||
| } |
17 changes: 17 additions & 0 deletions
17
src/main/resources/data/caupona/recipe/crafting/loaf_heap_stairs.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,17 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "pattern": [ | ||
| "B ", | ||
| "BB ", | ||
| "BBB" | ||
| ], | ||
| "key": { | ||
| "B": { | ||
| "item": "caupona:loaf_heap" | ||
| } | ||
| }, | ||
| "result": { | ||
| "id": "caupona:loaf_heap_stairs", | ||
| "count": 4 | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
src/main/resources/data/caupona/recipe/crafting/loaf_heap_wall.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,16 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "pattern": [ | ||
| "BBB", | ||
| "BBB" | ||
| ], | ||
| "key": { | ||
| "B": { | ||
| "item": "caupona:loaf_heap" | ||
| } | ||
| }, | ||
| "result": { | ||
| "id": "caupona:loaf_heap_wall", | ||
| "count": 6 | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
src/main/resources/data/caupona/recipe/crafting/walnut_hanging_sign.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,20 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "pattern": [ | ||
| "C C", | ||
| "LLL", | ||
| "LLL" | ||
| ], | ||
| "key": { | ||
| "C": { | ||
| "item": "minecraft:chain" | ||
| }, | ||
| "L": { | ||
| "item": "caupona:stripped_walnut_log" | ||
| } | ||
| }, | ||
| "result": { | ||
| "id": "caupona:walnut_hanging_sign", | ||
| "count": 6 | ||
| } | ||
| } |
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 |
|---|---|---|
|
|
@@ -15,5 +15,6 @@ | |
| "output": { | ||
| "id": "minecraft:black_dye", | ||
| "count": 2 | ||
| } | ||
| }, | ||
| "time": 1200 | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -15,5 +15,6 @@ | |
| "output": { | ||
| "id": "minecraft:brown_dye", | ||
| "count": 4 | ||
| } | ||
| }, | ||
| "time": 1200 | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -19,5 +19,6 @@ | |
| "output": { | ||
| "id": "caupona:fig_sapling", | ||
| "count": 1 | ||
| } | ||
| }, | ||
| "time": 12000 | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -39,5 +39,6 @@ | |
| "output": { | ||
| "id": "minecraft:light_gray_concrete", | ||
| "count": 16 | ||
| } | ||
| }, | ||
| "time": 1200 | ||
| } | ||
Oops, something went wrong.