diff --git a/lang b/lang index d76b11e94..e26246bb7 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit d76b11e9406554cfbf32b8855417af2c9368732c +Subproject commit e26246bb7a97c065dbc9b60f6fe57d63aceb9257 diff --git a/src/main/resources/assets/forestry/blockstates/apiculture_bee.house.json b/src/main/resources/assets/forestry/blockstates/apiculture_bee.house.json deleted file mode 100644 index bc16cc83b..000000000 --- a/src/main/resources/assets/forestry/blockstates/apiculture_bee.house.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "face=north": { "model": "forestry:apiculture_bee.house" }, - "face=east": { "model": "forestry:apiculture_bee.house", "y": 90 }, - "face=south": { "model": "forestry:apiculture_bee.house", "y": 180 }, - "face=west": { "model": "forestry:apiculture_bee.house", "y": -90 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/apiculture_bee_house.json b/src/main/resources/assets/forestry/blockstates/apiculture_bee_house.json new file mode 100644 index 000000000..26cc3d59c --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/apiculture_bee_house.json @@ -0,0 +1,8 @@ +{ + "variants": { + "face=north": { "model": "forestry:apiculture_bee_house" }, + "face=east": { "model": "forestry:apiculture_bee_house", "y": 90 }, + "face=south": { "model": "forestry:apiculture_bee_house", "y": 180 }, + "face=west": { "model": "forestry:apiculture_bee_house", "y": -90 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/mail_stamp.collector.json b/src/main/resources/assets/forestry/blockstates/mail_stamp.collector.json deleted file mode 100644 index 06c7099f1..000000000 --- a/src/main/resources/assets/forestry/blockstates/mail_stamp.collector.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "face=north": { "model": "forestry:mail_stamp.collector" }, - "face=east": { "model": "forestry:mail_stamp.collector", "y": 90 }, - "face=south": { "model": "forestry:mail_stamp.collector", "y": 180 }, - "face=west": { "model": "forestry:mail_stamp.collector", "y": -90 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/mail_stamp_collector.json b/src/main/resources/assets/forestry/blockstates/mail_stamp_collector.json new file mode 100644 index 000000000..bba61e34a --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/mail_stamp_collector.json @@ -0,0 +1,8 @@ +{ + "variants": { + "face=north": { "model": "forestry:mail_stamp_collector" }, + "face=east": { "model": "forestry:mail_stamp_collector", "y": 90 }, + "face=south": { "model": "forestry:mail_stamp_collector", "y": 180 }, + "face=west": { "model": "forestry:mail_stamp_collector", "y": -90 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/mail_trade.station.json b/src/main/resources/assets/forestry/blockstates/mail_trade.station.json deleted file mode 100644 index 88cf17807..000000000 --- a/src/main/resources/assets/forestry/blockstates/mail_trade.station.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "face=north": { "model": "forestry:mail_trade.station" }, - "face=east": { "model": "forestry:mail_trade.station", "y": 90 }, - "face=south": { "model": "forestry:mail_trade.station", "y": 180 }, - "face=west": { "model": "forestry:mail_trade.station", "y": -90 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/mail_trade_station.json b/src/main/resources/assets/forestry/blockstates/mail_trade_station.json new file mode 100644 index 000000000..54a923be4 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/mail_trade_station.json @@ -0,0 +1,8 @@ +{ + "variants": { + "face=north": { "model": "forestry:mail_trade_station" }, + "face=east": { "model": "forestry:mail_trade_station", "y": 90 }, + "face=south": { "model": "forestry:mail_trade_station", "y": 180 }, + "face=west": { "model": "forestry:mail_trade_station", "y": -90 } + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture_bee.house.json b/src/main/resources/assets/forestry/models/block/apiculture_bee_house.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/apiculture_bee.house.json rename to src/main/resources/assets/forestry/models/block/apiculture_bee_house.json diff --git a/src/main/resources/assets/forestry/models/block/mail_stamp.collector.json b/src/main/resources/assets/forestry/models/block/mail_stamp_collector.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/mail_stamp.collector.json rename to src/main/resources/assets/forestry/models/block/mail_stamp_collector.json diff --git a/src/main/resources/assets/forestry/models/block/mail_trade.station.json b/src/main/resources/assets/forestry/models/block/mail_trade_station.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/mail_trade.station.json rename to src/main/resources/assets/forestry/models/block/mail_trade_station.json diff --git a/src/main/resources/assets/forestry/models/item/apicultureChest_api.chest.json b/src/main/resources/assets/forestry/models/item/apicultureChest_api_chest.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/apicultureChest_api.chest.json rename to src/main/resources/assets/forestry/models/item/apicultureChest_api_chest.json diff --git a/src/main/resources/assets/forestry/models/item/apiculture_bee.house.json b/src/main/resources/assets/forestry/models/item/apiculture_bee.house.json deleted file mode 100644 index 2c10ece09..000000000 --- a/src/main/resources/assets/forestry/models/item/apiculture_bee.house.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/apiculture_bee.house", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/apiculture_bee_house.json b/src/main/resources/assets/forestry/models/item/apiculture_bee_house.json index 2c10ece09..8470c9cfd 100644 --- a/src/main/resources/assets/forestry/models/item/apiculture_bee_house.json +++ b/src/main/resources/assets/forestry/models/item/apiculture_bee_house.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/apiculture_bee.house", + "parent": "forestry:block/apiculture_bee_house", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/arboriculture_arb.chest.json b/src/main/resources/assets/forestry/models/item/arboriculture_arb_chest.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/arboriculture_arb.chest.json rename to src/main/resources/assets/forestry/models/item/arboriculture_arb_chest.json diff --git a/src/main/resources/assets/forestry/models/item/lepidopterology_lepi.chest.json b/src/main/resources/assets/forestry/models/item/lepidopterology_lepi_chest.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/lepidopterology_lepi.chest.json rename to src/main/resources/assets/forestry/models/item/lepidopterology_lepi_chest.json diff --git a/src/main/resources/assets/forestry/models/item/mail_stamp.collector.json b/src/main/resources/assets/forestry/models/item/mail_stamp_collector.json similarity index 78% rename from src/main/resources/assets/forestry/models/item/mail_stamp.collector.json rename to src/main/resources/assets/forestry/models/item/mail_stamp_collector.json index 9781ee07a..6b0c63b13 100644 --- a/src/main/resources/assets/forestry/models/item/mail_stamp.collector.json +++ b/src/main/resources/assets/forestry/models/item/mail_stamp_collector.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/mail_stamp.collector", + "parent": "forestry:block/mail_stamp_collector", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/mail_trade.station.json b/src/main/resources/assets/forestry/models/item/mail_trade_station.json similarity index 79% rename from src/main/resources/assets/forestry/models/item/mail_trade.station.json rename to src/main/resources/assets/forestry/models/item/mail_trade_station.json index f1d956915..b888aed3e 100644 --- a/src/main/resources/assets/forestry/models/item/mail_trade.station.json +++ b/src/main/resources/assets/forestry/models/item/mail_trade_station.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/mail_trade.station", + "parent": "forestry:block/mail_trade_station", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ],