diff --git a/src/main/resources/assets/forestry/models/item/wrench.json b/src/main/resources/assets/forestry/models/item/wrench.json index 4b36b1cc0..80a71790d 100644 --- a/src/main/resources/assets/forestry/models/item/wrench.json +++ b/src/main/resources/assets/forestry/models/item/wrench.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "item/handheld", "textures": { "layer0": "forestry:item/wrench" } diff --git a/src/main/resources/assets/forestry/textures/block/analyzer_pedestal.png b/src/main/resources/assets/forestry/textures/block/analyzer_pedestal.png index 7cfc6077c..a1da20a65 100644 Binary files a/src/main/resources/assets/forestry/textures/block/analyzer_pedestal.png and b/src/main/resources/assets/forestry/textures/block/analyzer_pedestal.png differ diff --git a/src/main/resources/assets/forestry/textures/block/analyzer_tower1.png b/src/main/resources/assets/forestry/textures/block/analyzer_tower1.png index dfd44cb88..c80b2b3ae 100644 Binary files a/src/main/resources/assets/forestry/textures/block/analyzer_tower1.png and b/src/main/resources/assets/forestry/textures/block/analyzer_tower1.png differ diff --git a/src/main/resources/assets/forestry/textures/block/analyzer_tower2.png b/src/main/resources/assets/forestry/textures/block/analyzer_tower2.png index d1da29812..71ac4aaca 100644 Binary files a/src/main/resources/assets/forestry/textures/block/analyzer_tower2.png and b/src/main/resources/assets/forestry/textures/block/analyzer_tower2.png differ diff --git a/src/main/resources/assets/forestry/textures/block/apiaristchest.png b/src/main/resources/assets/forestry/textures/block/apiaristchest.png index 22c9db4e1..a1c1101c2 100644 Binary files a/src/main/resources/assets/forestry/textures/block/apiaristchest.png and b/src/main/resources/assets/forestry/textures/block/apiaristchest.png differ diff --git a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.off.png b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.off.png index 1439dce99..514f799c4 100644 Binary files a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.off.png and b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.off.png differ diff --git a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.on.png b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.on.png index af06ff67b..f17e885ef 100644 Binary files a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.on.png and b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.on.png differ diff --git a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.on.png.mcmeta b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.on.png.mcmeta new file mode 100644 index 000000000..643ff6725 --- /dev/null +++ b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.on.png.mcmeta @@ -0,0 +1,15 @@ +{ + "animation": { + "frames": [ + { + "index": 0, + "time": 2 + }, + { + "index": 1, + "time": 2 + } + ], + "frametime": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.heater.off.png b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.heater.off.png index c904fb224..3166e58c2 100644 Binary files a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.heater.off.png and b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.heater.off.png differ diff --git a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.heater.on.png b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.heater.on.png index 1d01344f3..a34a840d2 100644 Binary files a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.heater.on.png and b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.heater.on.png differ diff --git a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.heater.on.png.mcmeta b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.heater.on.png.mcmeta new file mode 100644 index 000000000..0771cbef5 --- /dev/null +++ b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.heater.on.png.mcmeta @@ -0,0 +1,15 @@ +{ + "animation": { + "frames": [ + { + "index": 0, + "time": 10 + }, + { + "index": 1, + "time": 10 + } + ], + "frametime": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.swarmer.off.png b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.swarmer.off.png index d4dd285db..24cfea24f 100644 Binary files a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.swarmer.off.png and b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.swarmer.off.png differ diff --git a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.swarmer.on.png b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.swarmer.on.png index 538385ce3..d2252bdc1 100644 Binary files a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.swarmer.on.png and b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.swarmer.on.png differ diff --git a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.valve.png b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.valve.png index 05158b164..7008a65e8 100644 Binary files a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.valve.png and b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.valve.png differ diff --git a/src/main/resources/assets/forestry/textures/block/bee_combs.0.png b/src/main/resources/assets/forestry/textures/block/bee_combs.0.png index 46aa8de53..a74f0f19e 100644 Binary files a/src/main/resources/assets/forestry/textures/block/bee_combs.0.png and b/src/main/resources/assets/forestry/textures/block/bee_combs.0.png differ diff --git a/src/main/resources/assets/forestry/textures/block/bee_combs.1.png b/src/main/resources/assets/forestry/textures/block/bee_combs.1.png index 167c90fca..4314cb230 100644 Binary files a/src/main/resources/assets/forestry/textures/block/bee_combs.1.png and b/src/main/resources/assets/forestry/textures/block/bee_combs.1.png differ diff --git a/src/main/resources/assets/forestry/textures/block/beehives/desert.side.png b/src/main/resources/assets/forestry/textures/block/beehives/desert.side.png index 8ae20b1b7..0394e1a39 100644 Binary files a/src/main/resources/assets/forestry/textures/block/beehives/desert.side.png and b/src/main/resources/assets/forestry/textures/block/beehives/desert.side.png differ diff --git a/src/main/resources/assets/forestry/textures/block/beehives/desert.top.png b/src/main/resources/assets/forestry/textures/block/beehives/desert.top.png index 39e0f4329..1e9487284 100644 Binary files a/src/main/resources/assets/forestry/textures/block/beehives/desert.top.png and b/src/main/resources/assets/forestry/textures/block/beehives/desert.top.png differ diff --git a/src/main/resources/assets/forestry/textures/block/beehives/end.side.png b/src/main/resources/assets/forestry/textures/block/beehives/end.side.png index 4d77387f6..35177f96b 100644 Binary files a/src/main/resources/assets/forestry/textures/block/beehives/end.side.png and b/src/main/resources/assets/forestry/textures/block/beehives/end.side.png differ diff --git a/src/main/resources/assets/forestry/textures/block/beehives/end.top.png b/src/main/resources/assets/forestry/textures/block/beehives/end.top.png index bf3fabd44..cc1faee73 100644 Binary files a/src/main/resources/assets/forestry/textures/block/beehives/end.top.png and b/src/main/resources/assets/forestry/textures/block/beehives/end.top.png differ diff --git a/src/main/resources/assets/forestry/textures/block/beehives/forest.side.png b/src/main/resources/assets/forestry/textures/block/beehives/forest.side.png index f53d64291..1459545ed 100644 Binary files a/src/main/resources/assets/forestry/textures/block/beehives/forest.side.png and b/src/main/resources/assets/forestry/textures/block/beehives/forest.side.png differ diff --git a/src/main/resources/assets/forestry/textures/block/beehives/forest.top.png b/src/main/resources/assets/forestry/textures/block/beehives/forest.top.png index bddd28b73..41c7c7f9a 100644 Binary files a/src/main/resources/assets/forestry/textures/block/beehives/forest.top.png and b/src/main/resources/assets/forestry/textures/block/beehives/forest.top.png differ diff --git a/src/main/resources/assets/forestry/textures/block/beehives/jungle.side.png b/src/main/resources/assets/forestry/textures/block/beehives/jungle.side.png index e1ca0edb6..82cd5d528 100644 Binary files a/src/main/resources/assets/forestry/textures/block/beehives/jungle.side.png and b/src/main/resources/assets/forestry/textures/block/beehives/jungle.side.png differ diff --git a/src/main/resources/assets/forestry/textures/block/beehives/jungle.top.png b/src/main/resources/assets/forestry/textures/block/beehives/jungle.top.png index 4de797961..43c8b5963 100644 Binary files a/src/main/resources/assets/forestry/textures/block/beehives/jungle.top.png and b/src/main/resources/assets/forestry/textures/block/beehives/jungle.top.png differ diff --git a/src/main/resources/assets/forestry/textures/block/beehives/meadows.side.png b/src/main/resources/assets/forestry/textures/block/beehives/meadows.side.png index 55c290103..9558ec280 100644 Binary files a/src/main/resources/assets/forestry/textures/block/beehives/meadows.side.png and b/src/main/resources/assets/forestry/textures/block/beehives/meadows.side.png differ diff --git a/src/main/resources/assets/forestry/textures/block/beehives/meadows.top.png b/src/main/resources/assets/forestry/textures/block/beehives/meadows.top.png index 84bf01d31..936901ef3 100644 Binary files a/src/main/resources/assets/forestry/textures/block/beehives/meadows.top.png and b/src/main/resources/assets/forestry/textures/block/beehives/meadows.top.png differ diff --git a/src/main/resources/assets/forestry/textures/block/beehives/snow.side.png b/src/main/resources/assets/forestry/textures/block/beehives/snow.side.png index 26af3b461..3ae1bcbcc 100644 Binary files a/src/main/resources/assets/forestry/textures/block/beehives/snow.side.png and b/src/main/resources/assets/forestry/textures/block/beehives/snow.side.png differ diff --git a/src/main/resources/assets/forestry/textures/block/beehives/snow.top.png b/src/main/resources/assets/forestry/textures/block/beehives/snow.top.png index 16015b62f..e6ed6ad92 100644 Binary files a/src/main/resources/assets/forestry/textures/block/beehives/snow.top.png and b/src/main/resources/assets/forestry/textures/block/beehives/snow.top.png differ diff --git a/src/main/resources/assets/forestry/textures/block/beehives/swamp.side.png b/src/main/resources/assets/forestry/textures/block/beehives/swamp.side.png index 7596f40cb..0650220dc 100644 Binary files a/src/main/resources/assets/forestry/textures/block/beehives/swamp.side.png and b/src/main/resources/assets/forestry/textures/block/beehives/swamp.side.png differ diff --git a/src/main/resources/assets/forestry/textures/block/beehives/swamp.top.png b/src/main/resources/assets/forestry/textures/block/beehives/swamp.top.png index 234e4d413..b937dfe46 100644 Binary files a/src/main/resources/assets/forestry/textures/block/beehives/swamp.top.png and b/src/main/resources/assets/forestry/textures/block/beehives/swamp.top.png differ diff --git a/src/main/resources/assets/forestry/textures/block/lepichest.png b/src/main/resources/assets/forestry/textures/block/lepichest.png index ca3d73478..7d9b6e3e3 100644 Binary files a/src/main/resources/assets/forestry/textures/block/lepichest.png and b/src/main/resources/assets/forestry/textures/block/lepichest.png differ diff --git a/src/main/resources/assets/forestry/textures/block/storage/apatite.png b/src/main/resources/assets/forestry/textures/block/storage/apatite.png index 5cc306191..df34109cb 100644 Binary files a/src/main/resources/assets/forestry/textures/block/storage/apatite.png and b/src/main/resources/assets/forestry/textures/block/storage/apatite.png differ diff --git a/src/main/resources/assets/forestry/textures/block/storage/bronze.png b/src/main/resources/assets/forestry/textures/block/storage/bronze.png index f40353134..41ad773ec 100644 Binary files a/src/main/resources/assets/forestry/textures/block/storage/bronze.png and b/src/main/resources/assets/forestry/textures/block/storage/bronze.png differ diff --git a/src/main/resources/assets/forestry/textures/block/storage/copper.png b/src/main/resources/assets/forestry/textures/block/storage/copper.png index f625f4435..79bfc2bfe 100644 Binary files a/src/main/resources/assets/forestry/textures/block/storage/copper.png and b/src/main/resources/assets/forestry/textures/block/storage/copper.png differ diff --git a/src/main/resources/assets/forestry/textures/block/storage/tin.png b/src/main/resources/assets/forestry/textures/block/storage/tin.png index b50bf2e20..89cdcff61 100644 Binary files a/src/main/resources/assets/forestry/textures/block/storage/tin.png and b/src/main/resources/assets/forestry/textures/block/storage/tin.png differ diff --git a/src/main/resources/assets/forestry/textures/block/worktable.0.png b/src/main/resources/assets/forestry/textures/block/worktable.0.png index 0581a7c65..48700f972 100644 Binary files a/src/main/resources/assets/forestry/textures/block/worktable.0.png and b/src/main/resources/assets/forestry/textures/block/worktable.0.png differ diff --git a/src/main/resources/assets/forestry/textures/block/worktable.1.png b/src/main/resources/assets/forestry/textures/block/worktable.1.png index 1b0536a74..dfcfa90c1 100644 Binary files a/src/main/resources/assets/forestry/textures/block/worktable.1.png and b/src/main/resources/assets/forestry/textures/block/worktable.1.png differ diff --git a/src/main/resources/assets/forestry/textures/block/worktable.2.png b/src/main/resources/assets/forestry/textures/block/worktable.2.png index dbcb27216..ade83825b 100644 Binary files a/src/main/resources/assets/forestry/textures/block/worktable.2.png and b/src/main/resources/assets/forestry/textures/block/worktable.2.png differ diff --git a/src/main/resources/assets/forestry/textures/block/worktable.3.png b/src/main/resources/assets/forestry/textures/block/worktable.3.png index 8f6cf017b..91be379cd 100644 Binary files a/src/main/resources/assets/forestry/textures/block/worktable.3.png and b/src/main/resources/assets/forestry/textures/block/worktable.3.png differ diff --git a/src/main/resources/assets/forestry/textures/block/worktable.4.png b/src/main/resources/assets/forestry/textures/block/worktable.4.png index e2b4a3646..fa2fde4c0 100644 Binary files a/src/main/resources/assets/forestry/textures/block/worktable.4.png and b/src/main/resources/assets/forestry/textures/block/worktable.4.png differ diff --git a/src/main/resources/assets/forestry/textures/forestry/atlas/gui/analyzer/serum.png b/src/main/resources/assets/forestry/textures/forestry/atlas/gui/analyzer/serum.png index acafc2023..cf2d00fd7 100644 Binary files a/src/main/resources/assets/forestry/textures/forestry/atlas/gui/analyzer/serum.png and b/src/main/resources/assets/forestry/textures/forestry/atlas/gui/analyzer/serum.png differ diff --git a/src/main/resources/assets/forestry/textures/gui/analyzer_screen.png b/src/main/resources/assets/forestry/textures/gui/analyzer_screen.png index 5a462ca82..7e59f6259 100644 Binary files a/src/main/resources/assets/forestry/textures/gui/analyzer_screen.png and b/src/main/resources/assets/forestry/textures/gui/analyzer_screen.png differ diff --git a/src/main/resources/assets/forestry/textures/item/apatite.png b/src/main/resources/assets/forestry/textures/item/apatite.png index 84bb5fa1c..edca22c10 100644 Binary files a/src/main/resources/assets/forestry/textures/item/apatite.png and b/src/main/resources/assets/forestry/textures/item/apatite.png differ diff --git a/src/main/resources/assets/forestry/textures/item/apiarist_armor_1.png b/src/main/resources/assets/forestry/textures/item/apiarist_armor_1.png index 05ad92c9b..a18c75aec 100644 Binary files a/src/main/resources/assets/forestry/textures/item/apiarist_armor_1.png and b/src/main/resources/assets/forestry/textures/item/apiarist_armor_1.png differ diff --git a/src/main/resources/assets/forestry/textures/item/apiarist_armor_2.png b/src/main/resources/assets/forestry/textures/item/apiarist_armor_2.png index f3c3ac13e..0d390e83a 100644 Binary files a/src/main/resources/assets/forestry/textures/item/apiarist_armor_2.png and b/src/main/resources/assets/forestry/textures/item/apiarist_armor_2.png differ diff --git a/src/main/resources/assets/forestry/textures/item/apiarist_boots.png b/src/main/resources/assets/forestry/textures/item/apiarist_boots.png index 37febc7e8..515db2f17 100644 Binary files a/src/main/resources/assets/forestry/textures/item/apiarist_boots.png and b/src/main/resources/assets/forestry/textures/item/apiarist_boots.png differ diff --git a/src/main/resources/assets/forestry/textures/item/apiarist_chest.png b/src/main/resources/assets/forestry/textures/item/apiarist_chest.png index 0d787f579..7b4a9ae6a 100644 Binary files a/src/main/resources/assets/forestry/textures/item/apiarist_chest.png and b/src/main/resources/assets/forestry/textures/item/apiarist_chest.png differ diff --git a/src/main/resources/assets/forestry/textures/item/apiarist_helmet.png b/src/main/resources/assets/forestry/textures/item/apiarist_helmet.png index 236042ef9..e9ba1bb27 100644 Binary files a/src/main/resources/assets/forestry/textures/item/apiarist_helmet.png and b/src/main/resources/assets/forestry/textures/item/apiarist_helmet.png differ diff --git a/src/main/resources/assets/forestry/textures/item/apiarist_legs.png b/src/main/resources/assets/forestry/textures/item/apiarist_legs.png index 6e2aff16e..b8f978112 100644 Binary files a/src/main/resources/assets/forestry/textures/item/apiarist_legs.png and b/src/main/resources/assets/forestry/textures/item/apiarist_legs.png differ diff --git a/src/main/resources/assets/forestry/textures/item/bee_comb.png b/src/main/resources/assets/forestry/textures/item/bee_comb.png index cca769f20..4cb8d1c17 100644 Binary files a/src/main/resources/assets/forestry/textures/item/bee_comb.png and b/src/main/resources/assets/forestry/textures/item/bee_comb.png differ diff --git a/src/main/resources/assets/forestry/textures/item/bee_combs.0.png b/src/main/resources/assets/forestry/textures/item/bee_combs.0.png index 43ca34655..db1ea1f10 100644 Binary files a/src/main/resources/assets/forestry/textures/item/bee_combs.0.png and b/src/main/resources/assets/forestry/textures/item/bee_combs.0.png differ diff --git a/src/main/resources/assets/forestry/textures/item/bee_combs.1.png b/src/main/resources/assets/forestry/textures/item/bee_combs.1.png index f806dba47..8bd5f173f 100644 Binary files a/src/main/resources/assets/forestry/textures/item/bee_combs.1.png and b/src/main/resources/assets/forestry/textures/item/bee_combs.1.png differ diff --git a/src/main/resources/assets/forestry/textures/item/beealyzer.png b/src/main/resources/assets/forestry/textures/item/beealyzer.png index 06aae9fd8..caf9fb926 100644 Binary files a/src/main/resources/assets/forestry/textures/item/beealyzer.png and b/src/main/resources/assets/forestry/textures/item/beealyzer.png differ diff --git a/src/main/resources/assets/forestry/textures/item/bees/default/larvae.body.png b/src/main/resources/assets/forestry/textures/item/bees/default/larvae.body.png index 685be8a0c..f45ea776e 100644 Binary files a/src/main/resources/assets/forestry/textures/item/bees/default/larvae.body.png and b/src/main/resources/assets/forestry/textures/item/bees/default/larvae.body.png differ diff --git a/src/main/resources/assets/forestry/textures/item/bees/default/larvae.body2.png b/src/main/resources/assets/forestry/textures/item/bees/default/larvae.body2.png index 6bb49a439..58262aba6 100644 Binary files a/src/main/resources/assets/forestry/textures/item/bees/default/larvae.body2.png and b/src/main/resources/assets/forestry/textures/item/bees/default/larvae.body2.png differ diff --git a/src/main/resources/assets/forestry/textures/item/bees/default/larvae.outline.png b/src/main/resources/assets/forestry/textures/item/bees/default/larvae.outline.png index c9f2e046b..6657cea37 100644 Binary files a/src/main/resources/assets/forestry/textures/item/bees/default/larvae.outline.png and b/src/main/resources/assets/forestry/textures/item/bees/default/larvae.outline.png differ diff --git a/src/main/resources/assets/forestry/textures/item/beeswax.png b/src/main/resources/assets/forestry/textures/item/beeswax.png index 8e0141a5b..cbeef1461 100644 Binary files a/src/main/resources/assets/forestry/textures/item/beeswax.png and b/src/main/resources/assets/forestry/textures/item/beeswax.png differ diff --git a/src/main/resources/assets/forestry/textures/item/broken_bronze_pickaxe.png b/src/main/resources/assets/forestry/textures/item/broken_bronze_pickaxe.png index 7e22731ed..51a3c30c3 100644 Binary files a/src/main/resources/assets/forestry/textures/item/broken_bronze_pickaxe.png and b/src/main/resources/assets/forestry/textures/item/broken_bronze_pickaxe.png differ diff --git a/src/main/resources/assets/forestry/textures/item/broken_bronze_shovel.png b/src/main/resources/assets/forestry/textures/item/broken_bronze_shovel.png index 2a2fdf197..aa0b3431e 100644 Binary files a/src/main/resources/assets/forestry/textures/item/broken_bronze_shovel.png and b/src/main/resources/assets/forestry/textures/item/broken_bronze_shovel.png differ diff --git a/src/main/resources/assets/forestry/textures/item/bronze_pickaxe.png b/src/main/resources/assets/forestry/textures/item/bronze_pickaxe.png index 03edeec09..3ad43f5ae 100644 Binary files a/src/main/resources/assets/forestry/textures/item/bronze_pickaxe.png and b/src/main/resources/assets/forestry/textures/item/bronze_pickaxe.png differ diff --git a/src/main/resources/assets/forestry/textures/item/bronze_shovel.png b/src/main/resources/assets/forestry/textures/item/bronze_shovel.png index fb2c2145e..76b5059cd 100644 Binary files a/src/main/resources/assets/forestry/textures/item/bronze_shovel.png and b/src/main/resources/assets/forestry/textures/item/bronze_shovel.png differ diff --git a/src/main/resources/assets/forestry/textures/item/cart.apiary.png b/src/main/resources/assets/forestry/textures/item/cart.apiary.png index c851e824b..e6a27623e 100644 Binary files a/src/main/resources/assets/forestry/textures/item/cart.apiary.png and b/src/main/resources/assets/forestry/textures/item/cart.apiary.png differ diff --git a/src/main/resources/assets/forestry/textures/item/cart.beehouse.png b/src/main/resources/assets/forestry/textures/item/cart.beehouse.png index bf00e9b9d..fb06c52bf 100644 Binary files a/src/main/resources/assets/forestry/textures/item/cart.beehouse.png and b/src/main/resources/assets/forestry/textures/item/cart.beehouse.png differ diff --git a/src/main/resources/assets/forestry/textures/item/carton.png b/src/main/resources/assets/forestry/textures/item/carton.png index 59ba176ae..a9a3aef8d 100644 Binary files a/src/main/resources/assets/forestry/textures/item/carton.png and b/src/main/resources/assets/forestry/textures/item/carton.png differ diff --git a/src/main/resources/assets/forestry/textures/item/catalogue.png b/src/main/resources/assets/forestry/textures/item/catalogue.png index 913c84b5c..b09ade4e9 100644 Binary files a/src/main/resources/assets/forestry/textures/item/catalogue.png and b/src/main/resources/assets/forestry/textures/item/catalogue.png differ diff --git a/src/main/resources/assets/forestry/textures/item/caterpillar.body.png b/src/main/resources/assets/forestry/textures/item/caterpillar.body.png index b73f7fbce..ee031b2f9 100644 Binary files a/src/main/resources/assets/forestry/textures/item/caterpillar.body.png and b/src/main/resources/assets/forestry/textures/item/caterpillar.body.png differ diff --git a/src/main/resources/assets/forestry/textures/item/caterpillar.body.png.mcmeta b/src/main/resources/assets/forestry/textures/item/caterpillar.body.png.mcmeta index 967a5eb88..1d757fe6d 100644 --- a/src/main/resources/assets/forestry/textures/item/caterpillar.body.png.mcmeta +++ b/src/main/resources/assets/forestry/textures/item/caterpillar.body.png.mcmeta @@ -1 +1,39 @@ -{"animation":{"frametime":1,"frames":[{"index":0,"time":7},{"index":1,"time":3},{"index":0,"time":9},{"index":1,"time":2},{"index":0,"time":5},{"index":1,"time":2}]}} \ No newline at end of file +{ + "animation": { + "frames": [ + { + "index": 0, + "time": 32 + }, + { + "index": 1, + "time": 4 + }, + { + "index": 2, + "time": 4 + }, + { + "index": 3, + "time": 4 + }, + { + "index": 4, + "time": 4 + }, + { + "index": 5, + "time": 4 + }, + { + "index": 6, + "time": 4 + }, + { + "index": 7, + "time": 4 + } + ], + "frametime": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/textures/item/caterpillar.body2.png b/src/main/resources/assets/forestry/textures/item/caterpillar.body2.png index 04bbb4295..c8552c45f 100644 Binary files a/src/main/resources/assets/forestry/textures/item/caterpillar.body2.png and b/src/main/resources/assets/forestry/textures/item/caterpillar.body2.png differ diff --git a/src/main/resources/assets/forestry/textures/item/caterpillar.body2.png.mcmeta b/src/main/resources/assets/forestry/textures/item/caterpillar.body2.png.mcmeta index 967a5eb88..1d757fe6d 100644 --- a/src/main/resources/assets/forestry/textures/item/caterpillar.body2.png.mcmeta +++ b/src/main/resources/assets/forestry/textures/item/caterpillar.body2.png.mcmeta @@ -1 +1,39 @@ -{"animation":{"frametime":1,"frames":[{"index":0,"time":7},{"index":1,"time":3},{"index":0,"time":9},{"index":1,"time":2},{"index":0,"time":5},{"index":1,"time":2}]}} \ No newline at end of file +{ + "animation": { + "frames": [ + { + "index": 0, + "time": 32 + }, + { + "index": 1, + "time": 4 + }, + { + "index": 2, + "time": 4 + }, + { + "index": 3, + "time": 4 + }, + { + "index": 4, + "time": 4 + }, + { + "index": 5, + "time": 4 + }, + { + "index": 6, + "time": 4 + }, + { + "index": 7, + "time": 4 + } + ], + "frametime": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_early.png b/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_early.png index 55836b4c6..b674d3973 100644 Binary files a/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_early.png and b/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_early.png differ diff --git a/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_late.png b/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_late.png index bdad27930..e437a83c1 100644 Binary files a/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_late.png and b/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_late.png differ diff --git a/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_middle.png b/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_middle.png index 27b752364..4691dd970 100644 Binary files a/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_middle.png and b/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_middle.png differ diff --git a/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_silk_late.png b/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_silk_late.png index a944b356c..fc9451bcf 100644 Binary files a/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_silk_late.png and b/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_silk_late.png differ diff --git a/src/main/resources/assets/forestry/textures/item/crate-filled.png b/src/main/resources/assets/forestry/textures/item/crate-filled.png index 08cb41c64..c88cb7775 100644 Binary files a/src/main/resources/assets/forestry/textures/item/crate-filled.png and b/src/main/resources/assets/forestry/textures/item/crate-filled.png differ diff --git a/src/main/resources/assets/forestry/textures/item/crate.png b/src/main/resources/assets/forestry/textures/item/crate.png index f8d065af8..01872c148 100644 Binary files a/src/main/resources/assets/forestry/textures/item/crate.png and b/src/main/resources/assets/forestry/textures/item/crate.png differ diff --git a/src/main/resources/assets/forestry/textures/item/fertilizer_bio.png b/src/main/resources/assets/forestry/textures/item/fertilizer_bio.png index e559f69a5..20aff773c 100644 Binary files a/src/main/resources/assets/forestry/textures/item/fertilizer_bio.png and b/src/main/resources/assets/forestry/textures/item/fertilizer_bio.png differ diff --git a/src/main/resources/assets/forestry/textures/item/fertilizer_compound.png b/src/main/resources/assets/forestry/textures/item/fertilizer_compound.png index 269afc6de..39440351e 100644 Binary files a/src/main/resources/assets/forestry/textures/item/fertilizer_compound.png and b/src/main/resources/assets/forestry/textures/item/fertilizer_compound.png differ diff --git a/src/main/resources/assets/forestry/textures/item/foresters_manual.png b/src/main/resources/assets/forestry/textures/item/foresters_manual.png index 5b910a8fa..ac3ab89de 100644 Binary files a/src/main/resources/assets/forestry/textures/item/foresters_manual.png and b/src/main/resources/assets/forestry/textures/item/foresters_manual.png differ diff --git a/src/main/resources/assets/forestry/textures/item/frame_impregnated.png b/src/main/resources/assets/forestry/textures/item/frame_impregnated.png index a8faf501a..6224a9305 100644 Binary files a/src/main/resources/assets/forestry/textures/item/frame_impregnated.png and b/src/main/resources/assets/forestry/textures/item/frame_impregnated.png differ diff --git a/src/main/resources/assets/forestry/textures/item/frame_proven.png b/src/main/resources/assets/forestry/textures/item/frame_proven.png index a2a3e42ab..7e44dffd9 100644 Binary files a/src/main/resources/assets/forestry/textures/item/frame_proven.png and b/src/main/resources/assets/forestry/textures/item/frame_proven.png differ diff --git a/src/main/resources/assets/forestry/textures/item/frame_untreated.png b/src/main/resources/assets/forestry/textures/item/frame_untreated.png index 182cdd3b2..6cff26725 100644 Binary files a/src/main/resources/assets/forestry/textures/item/frame_untreated.png and b/src/main/resources/assets/forestry/textures/item/frame_untreated.png differ diff --git a/src/main/resources/assets/forestry/textures/item/fruits/cherry.png b/src/main/resources/assets/forestry/textures/item/fruits/cherry.png index 4ec426942..57876dedc 100644 Binary files a/src/main/resources/assets/forestry/textures/item/fruits/cherry.png and b/src/main/resources/assets/forestry/textures/item/fruits/cherry.png differ diff --git a/src/main/resources/assets/forestry/textures/item/gear_bronze.png b/src/main/resources/assets/forestry/textures/item/gear_bronze.png index 6bd1f26f8..16c0a360b 100644 Binary files a/src/main/resources/assets/forestry/textures/item/gear_bronze.png and b/src/main/resources/assets/forestry/textures/item/gear_bronze.png differ diff --git a/src/main/resources/assets/forestry/textures/item/gear_copper.png b/src/main/resources/assets/forestry/textures/item/gear_copper.png index f49499873..c588875be 100644 Binary files a/src/main/resources/assets/forestry/textures/item/gear_copper.png and b/src/main/resources/assets/forestry/textures/item/gear_copper.png differ diff --git a/src/main/resources/assets/forestry/textures/item/gear_tin.png b/src/main/resources/assets/forestry/textures/item/gear_tin.png index 2a340c245..3d402ccde 100644 Binary files a/src/main/resources/assets/forestry/textures/item/gear_tin.png and b/src/main/resources/assets/forestry/textures/item/gear_tin.png differ diff --git a/src/main/resources/assets/forestry/textures/item/imprinter.png b/src/main/resources/assets/forestry/textures/item/imprinter.png index 9b3d39e06..d4f204ba8 100644 Binary files a/src/main/resources/assets/forestry/textures/item/imprinter.png and b/src/main/resources/assets/forestry/textures/item/imprinter.png differ diff --git a/src/main/resources/assets/forestry/textures/item/ingot_bronze.png b/src/main/resources/assets/forestry/textures/item/ingot_bronze.png index f0dd13ee5..5d96d909f 100644 Binary files a/src/main/resources/assets/forestry/textures/item/ingot_bronze.png and b/src/main/resources/assets/forestry/textures/item/ingot_bronze.png differ diff --git a/src/main/resources/assets/forestry/textures/item/ingot_copper.png b/src/main/resources/assets/forestry/textures/item/ingot_copper.png index 980a3db09..512cd3c81 100644 Binary files a/src/main/resources/assets/forestry/textures/item/ingot_copper.png and b/src/main/resources/assets/forestry/textures/item/ingot_copper.png differ diff --git a/src/main/resources/assets/forestry/textures/item/ingot_tin.png b/src/main/resources/assets/forestry/textures/item/ingot_tin.png index 976bb8abc..f1ab0e485 100644 Binary files a/src/main/resources/assets/forestry/textures/item/ingot_tin.png and b/src/main/resources/assets/forestry/textures/item/ingot_tin.png differ diff --git a/src/main/resources/assets/forestry/textures/item/kit_pickaxe.png b/src/main/resources/assets/forestry/textures/item/kit_pickaxe.png index c12f53ac6..b8c48f060 100644 Binary files a/src/main/resources/assets/forestry/textures/item/kit_pickaxe.png and b/src/main/resources/assets/forestry/textures/item/kit_pickaxe.png differ diff --git a/src/main/resources/assets/forestry/textures/item/kit_shovel.png b/src/main/resources/assets/forestry/textures/item/kit_shovel.png index 2245f260d..2198194f5 100644 Binary files a/src/main/resources/assets/forestry/textures/item/kit_shovel.png and b/src/main/resources/assets/forestry/textures/item/kit_shovel.png differ diff --git a/src/main/resources/assets/forestry/textures/item/liquids/glass.bottle.png b/src/main/resources/assets/forestry/textures/item/liquids/glass.bottle.png index 6385ca066..92d75c269 100644 Binary files a/src/main/resources/assets/forestry/textures/item/liquids/glass.bottle.png and b/src/main/resources/assets/forestry/textures/item/liquids/glass.bottle.png differ diff --git a/src/main/resources/assets/forestry/textures/item/liquids/glass.contents.png b/src/main/resources/assets/forestry/textures/item/liquids/glass.contents.png index b1efba89a..4b4bfe88e 100644 Binary files a/src/main/resources/assets/forestry/textures/item/liquids/glass.contents.png and b/src/main/resources/assets/forestry/textures/item/liquids/glass.contents.png differ diff --git a/src/main/resources/assets/forestry/textures/item/liquids/jar.bottle.png b/src/main/resources/assets/forestry/textures/item/liquids/jar.bottle.png index fc19d9b55..1e088a77f 100644 Binary files a/src/main/resources/assets/forestry/textures/item/liquids/jar.bottle.png and b/src/main/resources/assets/forestry/textures/item/liquids/jar.bottle.png differ diff --git a/src/main/resources/assets/forestry/textures/item/liquids/jar.contents.png b/src/main/resources/assets/forestry/textures/item/liquids/jar.contents.png index c4b372f1c..45579f564 100644 Binary files a/src/main/resources/assets/forestry/textures/item/liquids/jar.contents.png and b/src/main/resources/assets/forestry/textures/item/liquids/jar.contents.png differ diff --git a/src/main/resources/assets/forestry/textures/item/mail/letter.0.emptied.png b/src/main/resources/assets/forestry/textures/item/mail/letter.0.emptied.png index d495e34f7..4fade92b4 100644 Binary files a/src/main/resources/assets/forestry/textures/item/mail/letter.0.emptied.png and b/src/main/resources/assets/forestry/textures/item/mail/letter.0.emptied.png differ diff --git a/src/main/resources/assets/forestry/textures/item/mail/letter.0.fresh.png b/src/main/resources/assets/forestry/textures/item/mail/letter.0.fresh.png index b0a0c26ed..cc8f05e7d 100644 Binary files a/src/main/resources/assets/forestry/textures/item/mail/letter.0.fresh.png and b/src/main/resources/assets/forestry/textures/item/mail/letter.0.fresh.png differ diff --git a/src/main/resources/assets/forestry/textures/item/mail/letter.0.opened.png b/src/main/resources/assets/forestry/textures/item/mail/letter.0.opened.png index f158fe50f..4fade92b4 100644 Binary files a/src/main/resources/assets/forestry/textures/item/mail/letter.0.opened.png and b/src/main/resources/assets/forestry/textures/item/mail/letter.0.opened.png differ diff --git a/src/main/resources/assets/forestry/textures/item/mail/letter.0.stamped.png b/src/main/resources/assets/forestry/textures/item/mail/letter.0.stamped.png index b0efdcc3d..3aa972ffa 100644 Binary files a/src/main/resources/assets/forestry/textures/item/mail/letter.0.stamped.png and b/src/main/resources/assets/forestry/textures/item/mail/letter.0.stamped.png differ diff --git a/src/main/resources/assets/forestry/textures/item/mulch.png b/src/main/resources/assets/forestry/textures/item/mulch.png index 514885e9c..9fedb8495 100644 Binary files a/src/main/resources/assets/forestry/textures/item/mulch.png and b/src/main/resources/assets/forestry/textures/item/mulch.png differ diff --git a/src/main/resources/assets/forestry/textures/item/normal_backpack.png b/src/main/resources/assets/forestry/textures/item/normal_backpack.png index e4c62ef9a..daf8d120b 100644 Binary files a/src/main/resources/assets/forestry/textures/item/normal_backpack.png and b/src/main/resources/assets/forestry/textures/item/normal_backpack.png differ diff --git a/src/main/resources/assets/forestry/textures/item/normal_backpack_outline.png b/src/main/resources/assets/forestry/textures/item/normal_backpack_outline.png index de8ec19e8..7f569c95d 100644 Binary files a/src/main/resources/assets/forestry/textures/item/normal_backpack_outline.png and b/src/main/resources/assets/forestry/textures/item/normal_backpack_outline.png differ diff --git a/src/main/resources/assets/forestry/textures/item/pipette.0.png b/src/main/resources/assets/forestry/textures/item/pipette.0.png index 29630f13c..75815663c 100644 Binary files a/src/main/resources/assets/forestry/textures/item/pipette.0.png and b/src/main/resources/assets/forestry/textures/item/pipette.0.png differ diff --git a/src/main/resources/assets/forestry/textures/item/pipette.1.png b/src/main/resources/assets/forestry/textures/item/pipette.1.png index 410a3325b..44640f76f 100644 Binary files a/src/main/resources/assets/forestry/textures/item/pipette.1.png and b/src/main/resources/assets/forestry/textures/item/pipette.1.png differ diff --git a/src/main/resources/assets/forestry/textures/item/pollen.0.png b/src/main/resources/assets/forestry/textures/item/pollen.0.png index d3540914f..4f8d3faba 100644 Binary files a/src/main/resources/assets/forestry/textures/item/pollen.0.png and b/src/main/resources/assets/forestry/textures/item/pollen.0.png differ diff --git a/src/main/resources/assets/forestry/textures/item/pollen.1.png b/src/main/resources/assets/forestry/textures/item/pollen.1.png index 834e35990..a240b4127 100644 Binary files a/src/main/resources/assets/forestry/textures/item/pollen.1.png and b/src/main/resources/assets/forestry/textures/item/pollen.1.png differ diff --git a/src/main/resources/assets/forestry/textures/item/portable_alyzer.png b/src/main/resources/assets/forestry/textures/item/portable_alyzer.png index 1f40569ec..1ec946e11 100644 Binary files a/src/main/resources/assets/forestry/textures/item/portable_alyzer.png and b/src/main/resources/assets/forestry/textures/item/portable_alyzer.png differ diff --git a/src/main/resources/assets/forestry/textures/item/propolis.0.png b/src/main/resources/assets/forestry/textures/item/propolis.0.png index c2fcd620a..a610e366a 100644 Binary files a/src/main/resources/assets/forestry/textures/item/propolis.0.png and b/src/main/resources/assets/forestry/textures/item/propolis.0.png differ diff --git a/src/main/resources/assets/forestry/textures/item/pulsating_dust.png b/src/main/resources/assets/forestry/textures/item/pulsating_dust.png index 053f6e442..4fa7fc5f5 100644 Binary files a/src/main/resources/assets/forestry/textures/item/pulsating_dust.png and b/src/main/resources/assets/forestry/textures/item/pulsating_dust.png differ diff --git a/src/main/resources/assets/forestry/textures/item/refractory_wax.png b/src/main/resources/assets/forestry/textures/item/refractory_wax.png index 07eb27adc..efafca2b0 100644 Binary files a/src/main/resources/assets/forestry/textures/item/refractory_wax.png and b/src/main/resources/assets/forestry/textures/item/refractory_wax.png differ diff --git a/src/main/resources/assets/forestry/textures/item/royal_jelly.png b/src/main/resources/assets/forestry/textures/item/royal_jelly.png index c66cad553..f13dbc280 100644 Binary files a/src/main/resources/assets/forestry/textures/item/royal_jelly.png and b/src/main/resources/assets/forestry/textures/item/royal_jelly.png differ diff --git a/src/main/resources/assets/forestry/textures/item/scoop.png b/src/main/resources/assets/forestry/textures/item/scoop.png index bc75dba8e..5220ba6d0 100644 Binary files a/src/main/resources/assets/forestry/textures/item/scoop.png and b/src/main/resources/assets/forestry/textures/item/scoop.png differ diff --git a/src/main/resources/assets/forestry/textures/item/smoker.png b/src/main/resources/assets/forestry/textures/item/smoker.png index c1cbfe017..954138eb5 100644 Binary files a/src/main/resources/assets/forestry/textures/item/smoker.png and b/src/main/resources/assets/forestry/textures/item/smoker.png differ diff --git a/src/main/resources/assets/forestry/textures/item/thermionic_tubes.0.png b/src/main/resources/assets/forestry/textures/item/thermionic_tubes.0.png index b3307ec87..f75a60b17 100644 Binary files a/src/main/resources/assets/forestry/textures/item/thermionic_tubes.0.png and b/src/main/resources/assets/forestry/textures/item/thermionic_tubes.0.png differ diff --git a/src/main/resources/assets/forestry/textures/item/wax_cast.png b/src/main/resources/assets/forestry/textures/item/wax_cast.png index 4bf6580c3..ed2756bd2 100644 Binary files a/src/main/resources/assets/forestry/textures/item/wax_cast.png and b/src/main/resources/assets/forestry/textures/item/wax_cast.png differ diff --git a/src/main/resources/assets/forestry/textures/item/wood_pulp.png b/src/main/resources/assets/forestry/textures/item/wood_pulp.png index 1c074c746..eba80c641 100644 Binary files a/src/main/resources/assets/forestry/textures/item/wood_pulp.png and b/src/main/resources/assets/forestry/textures/item/wood_pulp.png differ diff --git a/src/main/resources/assets/forestry/textures/item/woven_backpack.png b/src/main/resources/assets/forestry/textures/item/woven_backpack.png index e4c62ef9a..daf8d120b 100644 Binary files a/src/main/resources/assets/forestry/textures/item/woven_backpack.png and b/src/main/resources/assets/forestry/textures/item/woven_backpack.png differ diff --git a/src/main/resources/assets/forestry/textures/item/woven_backpack_outline.png b/src/main/resources/assets/forestry/textures/item/woven_backpack_outline.png index 512f580e6..ff2b623d8 100644 Binary files a/src/main/resources/assets/forestry/textures/item/woven_backpack_outline.png and b/src/main/resources/assets/forestry/textures/item/woven_backpack_outline.png differ diff --git a/src/main/resources/assets/forestry/textures/item/wrench.png b/src/main/resources/assets/forestry/textures/item/wrench.png index 2eb4e80e0..4e008ddd4 100644 Binary files a/src/main/resources/assets/forestry/textures/item/wrench.png and b/src/main/resources/assets/forestry/textures/item/wrench.png differ