Skip to content

Commit fb647c9

Browse files
authored
Merge pull request #935 from L-Lawlite/1.21.1
1.21.1
2 parents f3a4751 + 96c7bc9 commit fb647c9

File tree

192 files changed

+3107
-966
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+3107
-966
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ run
2424
# Files from Forge MDK
2525
forge*changelog.txt
2626
server
27-
Minecraft
2827
changelog.txt
2928
CREDITS.txt
3029
/.apt_generated_tests/
30+
.cache/

src/main/resources/data/c/tags/fluid/biofuel.json renamed to src/generated/resources/data/c/tags/fluid/biofuel.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"replace": false,
32
"values": [
43
"createaddition:flowing_bioethanol",
54
"createaddition:bioethanol"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"values": []
3+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"values": []
3+
}

src/main/resources/data/c/tags/fluid/plantoil.json renamed to src/generated/resources/data/c/tags/fluid/plantoil.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"replace": false,
32
"values": [
43
"createaddition:flowing_seed_oil",
54
"createaddition:seed_oil"

src/main/resources/data/c/tags/item/blocks/electrum.json renamed to src/generated/resources/data/c/tags/item/blocks/electrum.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"replace": false,
32
"values": [
43
"createaddition:electrum_block"
54
]
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"values": [
3+
"#c:dusts/diamond",
4+
"#c:dusts/obsidian"
5+
]
6+
}

src/main/resources/data/c/tags/item/dusts/diamond.json renamed to src/generated/resources/data/c/tags/item/dusts/diamond.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"replace": false,
32
"values": [
43
"createaddition:diamond_grit"
54
]

src/main/resources/data/c/tags/item/dusts/obsidian.json renamed to src/generated/resources/data/c/tags/item/dusts/obsidian.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"replace": false,
32
"values": [
43
"create:powdered_obsidian"
54
]
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"replace": false,
32
"values": [
3+
"#c:fuels/bio"
44
]
55
}

0 commit comments

Comments
 (0)