-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Renamed "Blooming Sculk" to "Blooming Sculk Stone".
Echo Saplings can now also be placed on Sculk Grime. Removed Blooming Stem from various log-related data. Misc. datagen tweaks.
- Loading branch information
1 parent
41ff0bd
commit adcf520
Showing
37 changed files
with
89 additions
and
80 deletions.
There are no files selected for viewing
6 changes: 3 additions & 3 deletions
6
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
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
4 changes: 2 additions & 2 deletions
4
src/generated/resources/.cache/2cdab8a05c139b60806a3879962e52a7f2933554
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/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
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
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.20.1 2023-11-04T19:02:03.1924776 Languages: en_us | ||
05b11a966f6d28508801c922a3bb0d249cc4b34c assets/deeperdarker/lang/en_us.json | ||
// 1.20.1 2023-11-06T13:28:26.6147954 Languages: en_us | ||
d0f2718edf354febe4e6d2c785da187d855d4b82 assets/deeperdarker/lang/en_us.json |
7 changes: 0 additions & 7 deletions
7
src/generated/resources/assets/deeperdarker/blockstates/blooming_sculk.json
This file was deleted.
Oops, something went wrong.
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/deeperdarker/blockstates/blooming_sculk_stone.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,7 @@ | ||
{ | ||
"variants": { | ||
"": { | ||
"model": "deeperdarker:block/blooming_sculk_stone" | ||
} | ||
} | ||
} |
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
3 changes: 0 additions & 3 deletions
3
src/generated/resources/assets/deeperdarker/models/item/blooming_sculk.json
This file was deleted.
Oops, something went wrong.
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/deeperdarker/models/item/blooming_sculk_stone.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,3 @@ | ||
{ | ||
"parent": "deeperdarker:block/blooming_sculk_stone" | ||
} |
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
8 changes: 8 additions & 0 deletions
8
src/generated/resources/data/deeperdarker/tags/blocks/echo_logs.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,8 @@ | ||
{ | ||
"values": [ | ||
"deeperdarker:echo_log", | ||
"deeperdarker:echo_wood", | ||
"deeperdarker:stripped_echo_log", | ||
"deeperdarker:stripped_echo_wood" | ||
] | ||
} |
1 change: 1 addition & 0 deletions
1
...a/deeperdarker/tags/blocks/echo_soil.json → ...r/tags/blocks/echo_sapling_placeable.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,7 @@ | ||
{ | ||
"values": [ | ||
"deeperdarker:echo_soil", | ||
"deeperdarker:sculk_grime", | ||
"minecraft:sculk" | ||
] | ||
} |
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
5 changes: 5 additions & 0 deletions
5
src/generated/resources/data/minecraft/tags/blocks/flower_pots.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,5 @@ | ||
{ | ||
"values": [ | ||
"deeperdarker:potted_echo_sapling" | ||
] | ||
} |
3 changes: 1 addition & 2 deletions
3
src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.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,5 @@ | ||
{ | ||
"values": [ | ||
"deeperdarker:echo_log", | ||
"deeperdarker:blooming_stem" | ||
"#deeperdarker:echo_logs" | ||
] | ||
} |
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
6 changes: 0 additions & 6 deletions
6
src/generated/resources/data/minecraft/tags/items/logs_that_burn.json
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.