Skip to content

Commit 1a1d665

Browse files
committed
Merge branch '1.20' of https://github.com/TeamMoegMC/FrostedHeart into 1.20
2 parents 1f33592 + 9b8431d commit 1a1d665

File tree

103 files changed

+3083
-997
lines changed

Some content is hidden

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

103 files changed

+3083
-997
lines changed

src/generated/resources/assets/frostedheart/lang/en_ud.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"block.frostedheart.copper_gravel": "ןǝʌɐɹ⅁ ɹǝddoƆ",
3636
"block.frostedheart.copper_sludge": "ǝbpnןS ɹǝddoƆ",
3737
"block.frostedheart.copper_sludge_block": "ʞɔoןᗺ ǝbpnןS ɹǝddoƆ",
38+
"block.frostedheart.creative_heater": "ɹǝʇɐǝH ǝʌıʇɐǝɹƆ",
3839
"block.frostedheart.debug_heater": "ɹǝʇɐǝH bnqǝᗡ",
3940
"block.frostedheart.deepslate_halite_ore": "ǝɹO ǝʇıןɐH ǝʇɐןsdǝǝᗡ",
4041
"block.frostedheart.deepslate_lead_ore": "ǝɹO pɐǝꞀ ǝʇɐןsdǝǝᗡ",

src/generated/resources/assets/frostedheart/lang/en_us.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"block.frostedheart.copper_gravel": "Copper Gravel",
3636
"block.frostedheart.copper_sludge": "Copper Sludge",
3737
"block.frostedheart.copper_sludge_block": "Copper Sludge Block",
38+
"block.frostedheart.creative_heater": "Creative Heater",
3839
"block.frostedheart.debug_heater": "Debug Heater",
3940
"block.frostedheart.deepslate_halite_ore": "Deepslate Halite Ore",
4041
"block.frostedheart.deepslate_lead_ore": "Deepslate Lead Ore",

src/generated/resources/data/frostedheart/tags/blocks/machines/metal.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"frostedheart:relic_chest",
44
"frostedheart:heat_incubator",
55
"frostedheart:debug_heater",
6+
"frostedheart:creative_heater",
67
"frostedheart:charger",
78
"frostedheart:oil_burner",
89
"frostedheart:gas_vent",
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+
}
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+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"values": []
3+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"minecraft:copper_ingot"
4+
]
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"minecraft:iron_ingot"
4+
]
5+
}

0 commit comments

Comments
 (0)