generated from NeoForgeMDKs/MDK-1.21-NeoGradle
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main'
- Loading branch information
Showing
36 changed files
with
830 additions
and
87 deletions.
There are no files selected for viewing
5 changes: 5 additions & 0 deletions
5
src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
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,5 @@ | ||
// 1.21.1 2024-09-29T09:20:10.1575481 Registries | ||
d3949aab832fc1b72c2512c35586c2682dea4d4d data/nautec/worldgen/configured_feature/prismarine_sand_beach.json | ||
e9f0c0ce377bc6f731c3b36673e845152a53327d data/nautec/worldgen/configured_feature/prismarine_sand_ocean.json | ||
61beaaac7a98b48f9100d5a9ea42e62226e2222d data/nautec/worldgen/placed_feature/prismarine_sand_beach.json | ||
21d49b85293b9e51f7fa1053674456997be8ebb2 data/nautec/worldgen/placed_feature/prismarine_sand_ocean.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
4 changes: 2 additions & 2 deletions
4
src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
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,2 +1,2 @@ | ||
// 1.21.1 2024-09-29T03:21:41.790165073 Languages: en_us | ||
56c2d57484bd05cadfedafdf710162fe3282cf0c assets/nautec/lang/en_us.json | ||
// 1.21.1 2024-09-29T11:46:44.5605123 Languages: en_us | ||
91c6589fa90a72ca33838d000724025553316a4f assets/nautec/lang/en_us.json |
8 changes: 6 additions & 2 deletions
8
src/generated/resources/.cache/eb748cc26e43de416ad491bd48ccca24d169a651
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,9 +1,13 @@ | ||
// 1.21.1 2024-09-29T03:21:41.786782575 Books: nautec | ||
// 1.21.1 2024-09-29T11:52:01.6465265 Books: nautec | ||
6d944fd1b3f4f8d8baf18317dbdea1e50476ed05 data/nautec/modonomicon/books/nautec_guide/book.json | ||
ea5fe754ad19a1903e7a9d19f39e3b1488e59cfe data/nautec/modonomicon/books/nautec_guide/categories/getting_started.json | ||
840e237eb35798d6695b2c42abbeead5128626f3 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/diving_gear.json | ||
33d4b677fbd132b7845a456bfd7982547349c587 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/etching.json | ||
3025c1f954bcbae17b5500c8814af26ccda6cf0a data/nautec/modonomicon/books/nautec_guide/entries/getting_started/introduction.json | ||
331ded6d67b46405edf0f82e7a74e5160530c1ca data/nautec/modonomicon/books/nautec_guide/entries/getting_started/item_transformation.json | ||
836ca05eab6d177f97c092588df2c03e27021d66 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/laser_manipulation.json | ||
7c1359fceaa3b513a15df94a5eb6811d624a1ad4 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/laser_power.json | ||
4587f6a0b818015ee60e5ab7c98a879612fbbb14 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/monocle.json | ||
307bdce415e37b7c8f8298389c0978afdb36815c data/nautec/modonomicon/books/nautec_guide/entries/getting_started/mixer.json | ||
45e26701a17f09bdc7b1cb6883e95df5488f6d54 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/monocle.json | ||
208abc52b3b1a594abae2333834da891aef78ac1 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/structures.json | ||
f8a4b84b6a937e6fbc1566d38f1bb6aa2642174d data/nautec/modonomicon/books/nautec_guide/entries/getting_started/utilities.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
32 changes: 32 additions & 0 deletions
32
...generated/resources/data/minecraft/advancement/recipes/misc/cast_iron_ingot_blasting.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,32 @@ | ||
{ | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_item": { | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": "minecraft:iron_ingot" | ||
} | ||
] | ||
}, | ||
"trigger": "minecraft:inventory_changed" | ||
}, | ||
"has_the_recipe": { | ||
"conditions": { | ||
"recipe": "minecraft:cast_iron_ingot_blasting" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_the_recipe", | ||
"has_item" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"minecraft:cast_iron_ingot_blasting" | ||
] | ||
} | ||
} |
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/generated/resources/data/minecraft/recipe/cast_iron_ingot_blasting.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:blasting", | ||
"category": "misc", | ||
"cookingtime": 10, | ||
"experience": 2.0, | ||
"ingredient": { | ||
"tag": "c:ingots/iron" | ||
}, | ||
"result": { | ||
"count": 1, | ||
"id": "nautec:cast_iron_ingot" | ||
} | ||
} |
File renamed without changes.
32 changes: 32 additions & 0 deletions
32
src/generated/resources/data/nautec/advancement/recipes/misc/etching_acid_bucket.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,32 @@ | ||
{ | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_item": { | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": "nautec:brown_polymer" | ||
} | ||
] | ||
}, | ||
"trigger": "minecraft:inventory_changed" | ||
}, | ||
"has_the_recipe": { | ||
"conditions": { | ||
"recipe": "nautec:etching_acid_bucket" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_the_recipe", | ||
"has_item" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"nautec:etching_acid_bucket" | ||
] | ||
} | ||
} |
47 changes: 47 additions & 0 deletions
47
...resources/data/nautec/modonomicon/books/nautec_guide/entries/getting_started/etching.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,47 @@ | ||
{ | ||
"background_u_index": 0, | ||
"background_v_index": 0, | ||
"category": "getting_started", | ||
"description": "book.nautec.nautec_guide.getting_started.etching.description", | ||
"hide_while_locked": false, | ||
"icon": { | ||
"item": "nautec:rusty_crate" | ||
}, | ||
"name": "book.nautec.nautec_guide.getting_started.etching.name", | ||
"pages": [ | ||
{ | ||
"type": "modonomicon:text", | ||
"anchor": "", | ||
"condition": { | ||
"type": "modonomicon:none" | ||
}, | ||
"show_title_separator": true, | ||
"text": "book.nautec.nautec_guide.getting_started.etching.etching.text", | ||
"title": "book.nautec.nautec_guide.getting_started.etching.etching.title", | ||
"use_markdown_in_title": false | ||
}, | ||
{ | ||
"type": "modonomicon:crafting_recipe", | ||
"anchor": "", | ||
"condition": { | ||
"type": "modonomicon:none" | ||
}, | ||
"recipe_id_1": "nautec:etching_acid_bucket", | ||
"text": "", | ||
"title1": "Etching Acid Recipe", | ||
"title2": "" | ||
} | ||
], | ||
"parents": [ | ||
{ | ||
"draw_arrow": true, | ||
"entry": "getting_started/structures", | ||
"line_enabled": true, | ||
"line_reversed": false | ||
} | ||
], | ||
"show_when_any_parent_unlocked": false, | ||
"sort_number": 8, | ||
"x": 2, | ||
"y": 2 | ||
} |
Oops, something went wrong.