License & forestry updates (F32Organization#21)

+ added license file + renamed existing 1.10 textures to 1.12 naming scheme + added some textures + removed outdated textures
map788 · Mar 23, 2018 · f34d957 · f34d957
1 parent e4139f6
commit f34d957
Show file tree

Hide file tree

Showing 350 changed files with 23 additions and 52 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -0,0 +1,6 @@
+The work in this repository is licensed under the
+Creative Commons Attribution-NonCommercial-ShareAlike-4.0 International Public License
+
+For details please see https://creativecommons.org/licenses/by-nc-sa/4.0
+and https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode
+
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ Brandons Core | Not Implemented | brandonscore
 Careerbees | Not Implemented | careerbees
 Chest Transporter | Not Implemented | chesttransporter
 Chisel | Textures from 1.10 | chisel
-Chisels and Bits | Nor Implemented | chiselsandbits
+Chisels and Bits | Not Implemented | chiselsandbits
 CoFH Core | In Progress | cofh
 Comforts | Not Implemented | comforts
 Compacter | Not Implemented | compacter
@@ -57,7 +57,7 @@ Extra Utilities 2 | Textures from 1.10 | extrautils2 / minecraft
 Extreme Reactors | Textures from 1.10 | bigreactors
 Flat Colored Blocks | Not Implemented | flatcoloredblocks
 Flux Networks | Not Implemented | calculator / fluxnetworks / sonarcore
-Forestry | Textures from 1.10 | forestry
+Forestry | In Progress | forestry
 FTBLib | Not Implemented | ftbl
 FTBUtilities | Not Implemeted | ftbu
 Gadgetry Core | Not Implemented | gadgetrycore

diff --git a/TODO/forestry/textures/blocks/arboretum.png b/TODO/forestry/textures/blocks/arboretum.png
diff --git a/TODO/forestry/textures/blocks/arboretum_particle.png b/TODO/forestry/textures/blocks/arboretum_particle.png
diff --git a/TODO/forestry/textures/blocks/ash.png b/TODO/forestry/textures/blocks/ash.png
diff --git a/TODO/forestry/textures/blocks/ash_brick.png b/TODO/forestry/textures/blocks/ash_brick.png
diff --git a/TODO/forestry/textures/blocks/bee_combs.0.png b/TODO/forestry/textures/blocks/bee_combs.0.png
diff --git a/TODO/forestry/textures/blocks/bee_combs.1.png b/TODO/forestry/textures/blocks/bee_combs.1.png
diff --git a/TODO/forestry/textures/blocks/beeswax.png b/TODO/forestry/textures/blocks/beeswax.png
diff --git a/...restry/textures/blocks/candleStumpLit.png → ...stry/textures/blocks/candle_stump_lit.png b/...restry/textures/blocks/candleStumpLit.png → ...stry/textures/blocks/candle_stump_lit.png
diff --git a/...stry/textures/blocks/candleStumpUnlit.png → ...ry/textures/blocks/candle_stump_unlit.png b/...stry/textures/blocks/candleStumpUnlit.png → ...ry/textures/blocks/candle_stump_unlit.png
diff --git a/...forestry/textures/blocks/candleTipLit.png → ...restry/textures/blocks/candle_tip_lit.png b/...forestry/textures/blocks/candleTipLit.png → ...restry/textures/blocks/candle_tip_lit.png
diff --git a/...restry/textures/blocks/candleTipUnlit.png → ...stry/textures/blocks/candle_tip_unlit.png b/...restry/textures/blocks/candleTipUnlit.png → ...stry/textures/blocks/candle_tip_unlit.png
diff --git a/TODO/forestry/textures/blocks/charcoal.png b/TODO/forestry/textures/blocks/charcoal.png
diff --git a/TODO/forestry/textures/blocks/database_bottom.png b/TODO/forestry/textures/blocks/database_bottom.png
diff --git a/TODO/forestry/textures/blocks/database_side.png b/TODO/forestry/textures/blocks/database_side.png
diff --git a/TODO/forestry/textures/blocks/database_side_column.png b/TODO/forestry/textures/blocks/database_side_column.png
diff --git a/TODO/forestry/textures/blocks/database_top.png b/TODO/forestry/textures/blocks/database_top.png
diff --git a/TODO/forestry/textures/blocks/farm_crops.png b/TODO/forestry/textures/blocks/farm_crops.png
diff --git a/TODO/forestry/textures/blocks/farm_crops_particle.png b/TODO/forestry/textures/blocks/farm_crops_particle.png
diff --git a/TODO/forestry/textures/blocks/farm_ender.png b/TODO/forestry/textures/blocks/farm_ender.png
diff --git a/TODO/forestry/textures/blocks/farm_ender_particle.png b/TODO/forestry/textures/blocks/farm_ender_particle.png
diff --git a/TODO/forestry/textures/blocks/farm_gourd.png b/TODO/forestry/textures/blocks/farm_gourd.png
diff --git a/TODO/forestry/textures/blocks/farm_gourd_particle.png b/TODO/forestry/textures/blocks/farm_gourd_particle.png
diff --git a/TODO/forestry/textures/blocks/farm_mushroom.png b/TODO/forestry/textures/blocks/farm_mushroom.png
diff --git a/TODO/forestry/textures/blocks/farm_mushroom_particle.png b/TODO/forestry/textures/blocks/farm_mushroom_particle.png
diff --git a/TODO/forestry/textures/blocks/farm_nether.png b/TODO/forestry/textures/blocks/farm_nether.png
diff --git a/TODO/forestry/textures/blocks/farm_nether_particle.png b/TODO/forestry/textures/blocks/farm_nether_particle.png
diff --git a/TODO/forestry/textures/blocks/genetic_filter.png b/TODO/forestry/textures/blocks/genetic_filter.png
diff --git a/TODO/forestry/textures/blocks/genetic_filter_particle.png b/TODO/forestry/textures/blocks/genetic_filter_particle.png
diff --git a/...s/blocks/germlings/sapling.treeBaobab.png → .../blocks/germlings/sapling.tree_baobab.png b/...s/blocks/germlings/sapling.treeBaobab.png → .../blocks/germlings/sapling.tree_baobab.png
diff --git a/...blocks/germlings/sapling.treeCocobolo.png → ...locks/germlings/sapling.tree_cocobolo.png b/...blocks/germlings/sapling.treeCocobolo.png → ...locks/germlings/sapling.tree_cocobolo.png
diff --git a/...res/blocks/germlings/sapling.treeDate.png → ...es/blocks/germlings/sapling.tree_date.png b/...res/blocks/germlings/sapling.treeDate.png → ...es/blocks/germlings/sapling.tree_date.png
diff --git a/...s/blocks/germlings/sapling.treeGigant.png → .../blocks/germlings/sapling.tree_gigant.png b/...s/blocks/germlings/sapling.treeGigant.png → .../blocks/germlings/sapling.tree_gigant.png
diff --git a/...ures/blocks/germlings/sapling.treeIpe.png → ...res/blocks/germlings/sapling.tree_ipe.png b/...ures/blocks/germlings/sapling.treeIpe.png → ...res/blocks/germlings/sapling.tree_ipe.png
diff --git a/...es/blocks/germlings/sapling.treeLemon.png → ...s/blocks/germlings/sapling.tree_lemon.png b/...es/blocks/germlings/sapling.treeLemon.png → ...s/blocks/germlings/sapling.tree_lemon.png
diff --git a/...es/blocks/germlings/sapling.treeMahoe.png → ...s/blocks/germlings/sapling.tree_mahoe.png b/...es/blocks/germlings/sapling.treeMahoe.png → ...s/blocks/germlings/sapling.tree_mahoe.png
diff --git a/...es/blocks/germlings/sapling.treeMaple.png → ...s/blocks/germlings/sapling.tree_maple.png b/...es/blocks/germlings/sapling.treeMaple.png → ...s/blocks/germlings/sapling.tree_maple.png
diff --git a/...s/blocks/germlings/sapling.treePadauk.png → .../blocks/germlings/sapling.tree_padauk.png b/...s/blocks/germlings/sapling.treePadauk.png → .../blocks/germlings/sapling.tree_padauk.png
diff --git a/...s/blocks/germlings/sapling.treePapaya.png → .../blocks/germlings/sapling.tree_papaya.png b/...s/blocks/germlings/sapling.treePapaya.png → .../blocks/germlings/sapling.tree_papaya.png
diff --git a/...res/blocks/germlings/sapling.treePlum.png → ...es/blocks/germlings/sapling.tree_plum.png b/...res/blocks/germlings/sapling.treePlum.png → ...es/blocks/germlings/sapling.tree_plum.png
diff --git a/...s/blocks/germlings/sapling.treePoplar.png → .../blocks/germlings/sapling.tree_poplar.png b/...s/blocks/germlings/sapling.treePoplar.png → .../blocks/germlings/sapling.tree_poplar.png
diff --git a/...s/blocks/germlings/sapling.treeRubber.png → .../blocks/germlings/sapling.tree_rubber.png b/...s/blocks/germlings/sapling.treeRubber.png → .../blocks/germlings/sapling.tree_rubber.png
diff --git a/...locks/germlings/sapling.treeZebrawood.png → ...ocks/germlings/sapling.tree_zebrawood.png b/...locks/germlings/sapling.treeZebrawood.png → ...ocks/germlings/sapling.tree_zebrawood.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/border.png b/TODO/forestry/textures/blocks/greenhouse/border.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/border_top.png b/TODO/forestry/textures/blocks/greenhouse/border_top.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/border_top_center.png b/TODO/forestry/textures/blocks/greenhouse/border_top_center.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/butterfly_hatch.png b/TODO/forestry/textures/blocks/greenhouse/butterfly_hatch.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/climate_control.png b/TODO/forestry/textures/blocks/greenhouse/climate_control.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/control.png b/TODO/forestry/textures/blocks/greenhouse/control.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/dehumidifier.off.png b/TODO/forestry/textures/blocks/greenhouse/dehumidifier.off.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/dehumidifier.on.png b/TODO/forestry/textures/blocks/greenhouse/dehumidifier.on.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/dryer.png b/TODO/forestry/textures/blocks/greenhouse/dryer.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/fan.off.png b/TODO/forestry/textures/blocks/greenhouse/fan.off.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/fan.on.png b/TODO/forestry/textures/blocks/greenhouse/fan.on.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/gears.png b/TODO/forestry/textures/blocks/greenhouse/gears.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/greenhouse_screen_0.png b/TODO/forestry/textures/blocks/greenhouse/greenhouse_screen_0.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/greenhouse_screen_1.png b/TODO/forestry/textures/blocks/greenhouse/greenhouse_screen_1.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/hatch.png b/TODO/forestry/textures/blocks/greenhouse/hatch.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/hatch_input.png b/TODO/forestry/textures/blocks/greenhouse/hatch_input.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/hatch_output.png b/TODO/forestry/textures/blocks/greenhouse/hatch_output.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/heater.off.png b/TODO/forestry/textures/blocks/greenhouse/heater.off.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/heater.on.png b/TODO/forestry/textures/blocks/greenhouse/heater.on.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/humidifier.off.png b/TODO/forestry/textures/blocks/greenhouse/humidifier.off.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/humidifier.on.png b/TODO/forestry/textures/blocks/greenhouse/humidifier.on.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/hygroregulator.png b/TODO/forestry/textures/blocks/greenhouse/hygroregulator.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/top.png b/TODO/forestry/textures/blocks/greenhouse/top.png
diff --git a/TODO/forestry/textures/blocks/greenhouse/valve.png b/TODO/forestry/textures/blocks/greenhouse/valve.png
diff --git a/TODO/forestry/textures/blocks/loam.png b/TODO/forestry/textures/blocks/loam.png
diff --git a/TODO/forestry/textures/blocks/peat_bog.png b/TODO/forestry/textures/blocks/peat_bog.png
diff --git a/TODO/forestry/textures/blocks/peat_bog_particle.png b/TODO/forestry/textures/blocks/peat_bog_particle.png
diff --git a/TODO/forestry/textures/blocks/plantation.png b/TODO/forestry/textures/blocks/plantation.png
diff --git a/TODO/forestry/textures/blocks/plantation_particle.png b/TODO/forestry/textures/blocks/plantation_particle.png
diff --git a/TODO/forestry/textures/entity/bees/endBee.png b/TODO/forestry/textures/entity/bees/endBee.png
diff --git a/TODO/forestry/textures/entity/bees/honeyBee.png b/TODO/forestry/textures/entity/bees/honeyBee.png
diff --git a/TODO/forestry/textures/entity/bees/icyBee.png b/TODO/forestry/textures/entity/bees/icyBee.png
diff --git a/TODO/forestry/textures/entity/bees/sinisterBee.png b/TODO/forestry/textures/entity/bees/sinisterBee.png
diff --git a/TODO/forestry/textures/entity/bees/tropicalBee.png b/TODO/forestry/textures/entity/bees/tropicalBee.png
diff --git a/...extures/entity/butterflies/lepiAurora.png → ...xtures/entity/butterflies/lepi_aurora.png b/...extures/entity/butterflies/lepiAurora.png → ...xtures/entity/butterflies/lepi_aurora.png
diff --git a/...xtures/entity/butterflies/lepiBatesia.png → ...tures/entity/butterflies/lepi_batesia.png b/...xtures/entity/butterflies/lepiBatesia.png → ...tures/entity/butterflies/lepi_batesia.png
diff --git a/...s/entity/butterflies/lepiBlackSwallow.png → ...entity/butterflies/lepi_black_swallow.png b/...s/entity/butterflies/lepiBlackSwallow.png → ...entity/butterflies/lepi_black_swallow.png
diff --git a/...tures/entity/butterflies/lepiBlueDuke.png → ...res/entity/butterflies/lepi_blue_duke.png b/...tures/entity/butterflies/lepiBlueDuke.png → ...res/entity/butterflies/lepi_blue_duke.png
diff --git a/...tures/entity/butterflies/lepiBlueWing.png → ...res/entity/butterflies/lepi_blue_wing.png b/...tures/entity/butterflies/lepiBlueWing.png → ...res/entity/butterflies/lepi_blue_wing.png
diff --git a/...ures/entity/butterflies/lepiBrimstone.png → ...res/entity/butterflies/lepi_brimstone.png b/...ures/entity/butterflies/lepiBrimstone.png → ...res/entity/butterflies/lepi_brimstone.png
diff --git a/...s/entity/butterflies/lepiCabbageWhite.png → ...entity/butterflies/lepi_cabbage_white.png b/...s/entity/butterflies/lepiCabbageWhite.png → ...entity/butterflies/lepi_cabbage_white.png
diff --git a/.../entity/butterflies/lepiCitrusSwallow.png → ...ntity/butterflies/lepi_citrus_swallow.png b/.../entity/butterflies/lepiCitrusSwallow.png → ...ntity/butterflies/lepi_citrus_swallow.png
diff --git a/...textures/entity/butterflies/lepiComma.png → ...extures/entity/butterflies/lepi_comma.png b/...textures/entity/butterflies/lepiComma.png → ...extures/entity/butterflies/lepi_comma.png
diff --git a/.../entity/butterflies/lepiCSpeckledWood.png → ...ntity/butterflies/lepi_cspeckled_wood.png b/.../entity/butterflies/lepiCSpeckledWood.png → ...ntity/butterflies/lepi_cspeckled_wood.png
diff --git a/...ures/entity/butterflies/lepiDianaFrit.png → ...es/entity/butterflies/lepi_diana_frit.png b/...ures/entity/butterflies/lepiDianaFrit.png → ...es/entity/butterflies/lepi_diana_frit.png
diff --git a/...entity/butterflies/lepiEmeraldPeacock.png → ...tity/butterflies/lepi_emerald_peacock.png b/...entity/butterflies/lepiEmeraldPeacock.png → ...tity/butterflies/lepi_emerald_peacock.png
diff --git a/...ures/entity/butterflies/lepiGlasswing.png → ...res/entity/butterflies/lepi_glasswing.png b/...ures/entity/butterflies/lepiGlasswing.png → ...res/entity/butterflies/lepi_glasswing.png
diff --git a/...es/entity/butterflies/lepiGlassyTiger.png → .../entity/butterflies/lepi_glassy_tiger.png b/...es/entity/butterflies/lepiGlassyTiger.png → .../entity/butterflies/lepi_glassy_tiger.png
diff --git a/...es/entity/butterflies/lepiGozoraAzure.png → .../entity/butterflies/lepi_gozora_azure.png b/...es/entity/butterflies/lepiGozoraAzure.png → .../entity/butterflies/lepi_gozora_azure.png
diff --git a/...ures/entity/butterflies/lepiLLacewing.png → ...res/entity/butterflies/lepi_llacewing.png b/...ures/entity/butterflies/lepiLLacewing.png → ...res/entity/butterflies/lepi_llacewing.png
diff --git a/...ures/entity/butterflies/lepiMalachite.png → ...res/entity/butterflies/lepi_malachite.png b/...ures/entity/butterflies/lepiMalachite.png → ...res/entity/butterflies/lepi_malachite.png
diff --git a/...es/entity/butterflies/lepiMBlueMorpho.png → .../entity/butterflies/lepi_mblue_morpho.png b/...es/entity/butterflies/lepiMBlueMorpho.png → .../entity/butterflies/lepi_mblue_morpho.png
diff --git a/...xtures/entity/butterflies/lepiMonarch.png → ...tures/entity/butterflies/lepi_monarch.png b/...xtures/entity/butterflies/lepiMonarch.png → ...tures/entity/butterflies/lepi_monarch.png
diff --git a/.../entity/butterflies/lepiMSpeckledWood.png → ...ntity/butterflies/lepi_mspeckled_wood.png b/.../entity/butterflies/lepiMSpeckledWood.png → ...ntity/butterflies/lepi_mspeckled_wood.png
diff --git a/...entity/butterflies/lepiPalaenoSulphur.png → ...tity/butterflies/lepi_palaeno_sulphur.png b/...entity/butterflies/lepiPalaenoSulphur.png → ...tity/butterflies/lepi_palaeno_sulphur.png
diff --git a/...es/entity/butterflies/lepiPBlueMorpho.png → .../entity/butterflies/lepi_pblue_morpho.png b/...es/entity/butterflies/lepiPBlueMorpho.png → .../entity/butterflies/lepi_pblue_morpho.png
diff --git a/...res/entity/butterflies/lepiPostillion.png → ...es/entity/butterflies/lepi_postillion.png b/...res/entity/butterflies/lepiPostillion.png → ...es/entity/butterflies/lepi_postillion.png
diff --git a/...xtures/entity/butterflies/lepiPostman.png → ...tures/entity/butterflies/lepi_postman.png b/...xtures/entity/butterflies/lepiPostman.png → ...tures/entity/butterflies/lepi_postman.png
diff --git a/...es/entity/butterflies/lepiRBlueMorpho.png → ...entity/butterflies/lepi_r_blue_morpho.png b/...es/entity/butterflies/lepiRBlueMorpho.png → ...entity/butterflies/lepi_r_blue_morpho.png
diff --git a/...extures/entity/butterflies/lepiReseda.png → ...xtures/entity/butterflies/lepi_reseda.png b/...extures/entity/butterflies/lepiReseda.png → ...xtures/entity/butterflies/lepi_reseda.png
diff --git a/...s/entity/butterflies/lepiSpeckledWood.png → ...entity/butterflies/lepi_speckled_wood.png b/...s/entity/butterflies/lepiSpeckledWood.png → ...entity/butterflies/lepi_speckled_wood.png
diff --git a/...ures/entity/butterflies/lepiSpicebush.png → ...res/entity/butterflies/lepi_spicebush.png b/...ures/entity/butterflies/lepiSpicebush.png → ...res/entity/butterflies/lepi_spicebush.png
diff --git a/...es/entity/butterflies/lepiSpringAzure.png → .../entity/butterflies/lepi_spring_azure.png b/...es/entity/butterflies/lepiSpringAzure.png → .../entity/butterflies/lepi_spring_azure.png
diff --git a/...s/entity/butterflies/lepiThoasSwallow.png → ...entity/butterflies/lepi_thoas_swallow.png b/...s/entity/butterflies/lepiThoasSwallow.png → ...entity/butterflies/lepi_thoas_swallow.png
diff --git a/...s/entity/butterflies/lepiZebraSwallow.png → ...entity/butterflies/lepi_zebra_swallow.png b/...s/entity/butterflies/lepiZebraSwallow.png → ...entity/butterflies/lepi_zebra_swallow.png
diff --git a/...textures/entity/butterflies/mothAtlas.png → ...extures/entity/butterflies/moth_atlas.png b/...textures/entity/butterflies/mothAtlas.png → ...extures/entity/butterflies/moth_atlas.png
diff --git a/...res/entity/butterflies/mothBombyxMori.png → ...s/entity/butterflies/moth_bombyx_mori.png b/...res/entity/butterflies/mothBombyxMori.png → ...s/entity/butterflies/moth_bombyx_mori.png
diff --git a/...ures/entity/butterflies/mothBrimstone.png → ...res/entity/butterflies/moth_brimstone.png b/...ures/entity/butterflies/mothBrimstone.png → ...res/entity/butterflies/moth_brimstone.png
diff --git a/.../entity/butterflies/mothLatticedHeath.png → ...ntity/butterflies/moth_latticed_heath.png b/.../entity/butterflies/mothLatticedHeath.png → ...ntity/butterflies/moth_latticed_heath.png
diff --git a/TODO/forestry/textures/gui/analyzer/butterfly.png b/TODO/forestry/textures/gui/analyzer/butterfly.png
diff --git a/TODO/forestry/textures/gui/analyzer/caterpillar.png b/TODO/forestry/textures/gui/analyzer/caterpillar.png
diff --git a/TODO/forestry/textures/gui/analyzer/cocoon.png b/TODO/forestry/textures/gui/analyzer/cocoon.png
diff --git a/TODO/forestry/textures/gui/analyzer/flutter.png b/TODO/forestry/textures/gui/analyzer/flutter.png
diff --git a/TODO/forestry/textures/gui/analyzer/pollen.png b/TODO/forestry/textures/gui/analyzer/pollen.png
diff --git a/TODO/forestry/textures/gui/analyzer/sapling.png b/TODO/forestry/textures/gui/analyzer/sapling.png
diff --git a/TODO/forestry/textures/gui/analyzer/serum.png b/TODO/forestry/textures/gui/analyzer/serum.png
diff --git a/TODO/forestry/textures/gui/analyzer/tree.png b/TODO/forestry/textures/gui/analyzer/tree.png
diff --git a/...estry/textures/gui/camouflageSprayCan.png → ...try/textures/gui/camouflage_spray_can.png b/...estry/textures/gui/camouflageSprayCan.png → ...try/textures/gui/camouflage_spray_can.png
diff --git a/TODO/forestry/textures/gui/climatiser.png b/TODO/forestry/textures/gui/climatiser.png
diff --git a/TODO/forestry/textures/gui/database_inventory.png b/TODO/forestry/textures/gui/database_inventory.png
diff --git a/TODO/forestry/textures/gui/database_mutation_screen.png b/TODO/forestry/textures/gui/database_mutation_screen.png
diff --git a/...y/textures/gui/errors/circuitMismatch.png → .../textures/gui/errors/circuit_mismatch.png b/...y/textures/gui/errors/circuitMismatch.png → .../textures/gui/errors/circuit_mismatch.png
diff --git a/...ry/textures/gui/errors/forcedCooldown.png → ...y/textures/gui/errors/forced_cooldown.png b/...ry/textures/gui/errors/forcedCooldown.png → ...y/textures/gui/errors/forced_cooldown.png
diff --git a/...stry/textures/gui/errors/invalidBiome.png → ...try/textures/gui/errors/invalid_biome.png b/...stry/textures/gui/errors/invalidBiome.png → ...try/textures/gui/errors/invalid_biome.png
diff --git a/...orestry/textures/gui/errors/isRaining.png → ...restry/textures/gui/errors/is_raining.png b/...orestry/textures/gui/errors/isRaining.png → ...restry/textures/gui/errors/is_raining.png
diff --git a/...ry/textures/gui/errors/noCircuitBoard.png → .../textures/gui/errors/no_circuit_board.png b/...ry/textures/gui/errors/noCircuitBoard.png → .../textures/gui/errors/no_circuit_board.png
diff --git a/...y/textures/gui/errors/noCircuitLayout.png → ...textures/gui/errors/no_circuit_layout.png b/...y/textures/gui/errors/noCircuitLayout.png → ...textures/gui/errors/no_circuit_layout.png
diff --git a/...restry/textures/gui/errors/noDisposal.png → ...estry/textures/gui/errors/no_disposal.png b/...restry/textures/gui/errors/noDisposal.png → ...estry/textures/gui/errors/no_disposal.png
diff --git a/.../forestry/textures/gui/errors/noDrone.png → ...forestry/textures/gui/errors/no_drone.png b/.../forestry/textures/gui/errors/noDrone.png → ...forestry/textures/gui/errors/no_drone.png
diff --git a/...estry/textures/gui/errors/noEnergyNet.png → ...try/textures/gui/errors/no_energy_net.png b/...estry/textures/gui/errors/noEnergyNet.png → ...try/textures/gui/errors/no_energy_net.png
diff --git a/...restry/textures/gui/errors/noFarmland.png → ...estry/textures/gui/errors/no_farmland.png b/...restry/textures/gui/errors/noFarmland.png → ...estry/textures/gui/errors/no_farmland.png
diff --git a/...stry/textures/gui/errors/noFertilizer.png → ...try/textures/gui/errors/no_fertilizer.png b/...stry/textures/gui/errors/noFertilizer.png → ...try/textures/gui/errors/no_fertilizer.png
diff --git a/...forestry/textures/gui/errors/noFlower.png → ...orestry/textures/gui/errors/no_flower.png b/...forestry/textures/gui/errors/noFlower.png → ...orestry/textures/gui/errors/no_flower.png
diff --git a/TODO/forestry/textures/gui/errors/noFuel.png → .../forestry/textures/gui/errors/no_fuel.png b/TODO/forestry/textures/gui/errors/noFuel.png → .../forestry/textures/gui/errors/no_fuel.png
diff --git a/TODO/forestry/textures/gui/errors/noHeat.png → .../forestry/textures/gui/errors/no_heat.png b/TODO/forestry/textures/gui/errors/noHeat.png → .../forestry/textures/gui/errors/no_heat.png
diff --git a/.../forestry/textures/gui/errors/noHoney.png → ...forestry/textures/gui/errors/no_honey.png b/.../forestry/textures/gui/errors/noHoney.png → ...forestry/textures/gui/errors/no_honey.png
diff --git a/...forestry/textures/gui/errors/noLiquid.png → ...orestry/textures/gui/errors/no_liquid.png b/...forestry/textures/gui/errors/noLiquid.png → ...orestry/textures/gui/errors/no_liquid.png
diff --git a/.../forestry/textures/gui/errors/noPaper.png → ...forestry/textures/gui/errors/no_paper.png b/.../forestry/textures/gui/errors/noPaper.png → ...forestry/textures/gui/errors/no_paper.png
diff --git a/.../forestry/textures/gui/errors/noPower.png → ...forestry/textures/gui/errors/no_power.png b/.../forestry/textures/gui/errors/noPower.png → ...forestry/textures/gui/errors/no_power.png
diff --git a/.../forestry/textures/gui/errors/noQueen.png → ...forestry/textures/gui/errors/no_queen.png b/.../forestry/textures/gui/errors/noQueen.png → ...forestry/textures/gui/errors/no_queen.png
diff --git a/...forestry/textures/gui/errors/noRecipe.png → ...orestry/textures/gui/errors/no_recipe.png b/...forestry/textures/gui/errors/noRecipe.png → ...orestry/textures/gui/errors/no_recipe.png
diff --git a/...estry/textures/gui/errors/noRecipient.png → ...stry/textures/gui/errors/no_recipient.png b/...estry/textures/gui/errors/noRecipient.png → ...stry/textures/gui/errors/no_recipient.png
diff --git a/...restry/textures/gui/errors/noResource.png → ...estry/textures/gui/errors/no_resource.png b/...restry/textures/gui/errors/noResource.png → ...estry/textures/gui/errors/no_resource.png
diff --git a/TODO/forestry/textures/gui/errors/noSky.png → TODO/forestry/textures/gui/errors/no_sky.png b/TODO/forestry/textures/gui/errors/noSky.png → TODO/forestry/textures/gui/errors/no_sky.png
diff --git a/.../forestry/textures/gui/errors/noSpace.png → ...forestry/textures/gui/errors/no_space.png b/.../forestry/textures/gui/errors/noSpace.png → ...forestry/textures/gui/errors/no_space.png
diff --git a/...estry/textures/gui/errors/noSpaceTank.png → ...try/textures/gui/errors/no_space_tank.png b/...estry/textures/gui/errors/noSpaceTank.png → ...try/textures/gui/errors/no_space_tank.png
diff --git a/...restry/textures/gui/errors/noSpecimen.png → ...estry/textures/gui/errors/no_specimen.png b/...restry/textures/gui/errors/noSpecimen.png → ...estry/textures/gui/errors/no_specimen.png
diff --git a/...forestry/textures/gui/errors/noStamps.png → ...orestry/textures/gui/errors/no_stamps.png b/...forestry/textures/gui/errors/noStamps.png → ...orestry/textures/gui/errors/no_stamps.png
diff --git a/...y/textures/gui/errors/notAlphaNumeric.png → ...textures/gui/errors/not_alpha_numeric.png b/...y/textures/gui/errors/notAlphaNumeric.png → ...textures/gui/errors/not_alpha_numeric.png
diff --git a/TODO/forestry/textures/gui/errors/not_closed.png b/TODO/forestry/textures/gui/errors/not_closed.png
diff --git a/TODO/forestry/textures/gui/errors/notDay.png → .../forestry/textures/gui/errors/not_day.png b/TODO/forestry/textures/gui/errors/notDay.png → .../forestry/textures/gui/errors/not_day.png
diff --git a/...orestry/textures/gui/errors/notGloomy.png → ...restry/textures/gui/errors/not_gloomy.png b/...orestry/textures/gui/errors/notGloomy.png → ...restry/textures/gui/errors/not_gloomy.png
diff --git a/TODO/forestry/textures/gui/errors/not_loaded.png b/TODO/forestry/textures/gui/errors/not_loaded.png
diff --git a/...forestry/textures/gui/errors/notLucid.png → ...orestry/textures/gui/errors/not_lucid.png b/...forestry/textures/gui/errors/notLucid.png → ...orestry/textures/gui/errors/not_lucid.png
diff --git a/...forestry/textures/gui/errors/notNight.png → ...orestry/textures/gui/errors/not_night.png b/...forestry/textures/gui/errors/notNight.png → ...orestry/textures/gui/errors/not_night.png
diff --git a/...restry/textures/gui/errors/notRaining.png → ...estry/textures/gui/errors/not_raining.png b/...restry/textures/gui/errors/notRaining.png → ...estry/textures/gui/errors/not_raining.png
diff --git a/...orestry/textures/gui/errors/notUnique.png → ...restry/textures/gui/errors/not_unique.png b/...orestry/textures/gui/errors/notUnique.png → ...restry/textures/gui/errors/not_unique.png
diff --git a/.../forestry/textures/gui/errors/tooCold.png → ...forestry/textures/gui/errors/too_cold.png b/.../forestry/textures/gui/errors/tooCold.png → ...forestry/textures/gui/errors/too_cold.png
diff --git a/TODO/forestry/textures/gui/errors/tooHot.png → .../forestry/textures/gui/errors/too_hot.png b/TODO/forestry/textures/gui/errors/tooHot.png → .../forestry/textures/gui/errors/too_hot.png
diff --git a/...forestry/textures/gui/errors/tooHumid.png → ...orestry/textures/gui/errors/too_humid.png b/...forestry/textures/gui/errors/tooHumid.png → ...orestry/textures/gui/errors/too_humid.png
diff --git a/TODO/forestry/textures/gui/errors/too_large.png b/TODO/forestry/textures/gui/errors/too_large.png
diff --git a/...ry/textures/gui/errors/wrongStacksize.png → ...y/textures/gui/errors/wrong_stacksize.png b/...ry/textures/gui/errors/wrongStacksize.png → ...y/textures/gui/errors/wrong_stacksize.png
diff --git a/TODO/forestry/textures/gui/filter.png b/TODO/forestry/textures/gui/filter.png
diff --git a/TODO/forestry/textures/gui/filter_selection.png b/TODO/forestry/textures/gui/filter_selection.png
diff --git a/TODO/forestry/textures/gui/greenhouse.png b/TODO/forestry/textures/gui/greenhouse.png
diff --git a/TODO/forestry/textures/gui/greenhouse_butterfly_hatch.png b/TODO/forestry/textures/gui/greenhouse_butterfly_hatch.png
diff --git a/TODO/forestry/textures/gui/greenhouse_hygroregulator.png b/TODO/forestry/textures/gui/greenhouse_hygroregulator.png
diff --git a/TODO/forestry/textures/gui/jei/charcoal_pile_wall.png b/TODO/forestry/textures/gui/jei/charcoal_pile_wall.png
diff --git a/TODO/forestry/textures/gui/modifiers/rain.png b/TODO/forestry/textures/gui/modifiers/rain.png
diff --git a/TODO/forestry/textures/gui/planter.png b/TODO/forestry/textures/gui/planter.png
diff --git a/TODO/forestry/textures/gui/slots/bee.png b/TODO/forestry/textures/gui/slots/bee.png
diff --git a/TODO/forestry/textures/gui/slots/cocoon.png b/TODO/forestry/textures/gui/slots/cocoon.png
diff --git a/...orestry/textures/gui/triggers/hasMail.png → ...restry/textures/gui/triggers/has_mail.png b/...orestry/textures/gui/triggers/hasMail.png → ...restry/textures/gui/triggers/has_mail.png
diff --git a/...orestry/textures/gui/triggers/hasWork.png → ...restry/textures/gui/triggers/has_work.png b/...orestry/textures/gui/triggers/hasWork.png → ...restry/textures/gui/triggers/has_work.png
diff --git a/...y/textures/gui/triggers/lowFertilizer.png → .../textures/gui/triggers/low_fertilizer.png b/...y/textures/gui/triggers/lowFertilizer.png → .../textures/gui/triggers/low_fertilizer.png
diff --git a/...orestry/textures/gui/triggers/lowFuel.png → ...restry/textures/gui/triggers/low_fuel.png b/...orestry/textures/gui/triggers/lowFuel.png → ...restry/textures/gui/triggers/low_fuel.png
diff --git a/...ry/textures/gui/triggers/lowGermlings.png → ...y/textures/gui/triggers/low_germlings.png b/...ry/textures/gui/triggers/lowGermlings.png → ...y/textures/gui/triggers/low_germlings.png
diff --git a/...restry/textures/gui/triggers/lowInput.png → ...estry/textures/gui/triggers/low_input.png b/...restry/textures/gui/triggers/lowInput.png → ...estry/textures/gui/triggers/low_input.png
diff --git a/...estry/textures/gui/triggers/lowLiquid.png → ...stry/textures/gui/triggers/low_liquid.png b/...estry/textures/gui/triggers/lowLiquid.png → ...stry/textures/gui/triggers/low_liquid.png
diff --git a/...restry/textures/gui/triggers/lowPaper.png → ...estry/textures/gui/triggers/low_paper.png b/...restry/textures/gui/triggers/lowPaper.png → ...estry/textures/gui/triggers/low_paper.png
diff --git a/...ry/textures/gui/triggers/lowResources.png → ...y/textures/gui/triggers/low_resources.png b/...ry/textures/gui/triggers/lowResources.png → ...y/textures/gui/triggers/low_resources.png
diff --git a/...orestry/textures/gui/triggers/lowSoil.png → ...restry/textures/gui/triggers/low_soil.png b/...orestry/textures/gui/triggers/lowSoil.png → ...restry/textures/gui/triggers/low_soil.png
diff --git a/...estry/textures/gui/triggers/lowStamps.png → ...stry/textures/gui/triggers/low_stamps.png b/...estry/textures/gui/triggers/lowStamps.png → ...stry/textures/gui/triggers/low_stamps.png
diff --git a/...stry/textures/gui/triggers/mailBuffer.png → ...try/textures/gui/triggers/mail_buffer.png b/...stry/textures/gui/triggers/mailBuffer.png → ...try/textures/gui/triggers/mail_buffer.png
diff --git a/...ry/textures/gui/triggers/missingDrone.png → ...y/textures/gui/triggers/missing_drone.png b/...ry/textures/gui/triggers/missingDrone.png → ...y/textures/gui/triggers/missing_drone.png
diff --git a/...ry/textures/gui/triggers/missingQueen.png → ...y/textures/gui/triggers/missing_queen.png b/...ry/textures/gui/triggers/missingQueen.png → ...y/textures/gui/triggers/missing_queen.png
diff --git a/...restry/textures/gui/triggers/noFrames.png → ...estry/textures/gui/triggers/no_frames.png b/...restry/textures/gui/triggers/noFrames.png → ...estry/textures/gui/triggers/no_frames.png
diff --git a/TODO/forestry/textures/items/bee_comb.png b/TODO/forestry/textures/items/bee_comb.png
diff --git a/...textures/items/butterflies/lepiAurora.png → ...extures/items/butterflies/lepi_aurora.png b/...textures/items/butterflies/lepiAurora.png → ...extures/items/butterflies/lepi_aurora.png
diff --git a/...extures/items/butterflies/lepiBatesia.png → ...xtures/items/butterflies/lepi_batesia.png b/...extures/items/butterflies/lepiBatesia.png → ...xtures/items/butterflies/lepi_batesia.png
diff --git a/...es/items/butterflies/lepiBlackSwallow.png → .../items/butterflies/lepi_black_swallow.png b/...es/items/butterflies/lepiBlackSwallow.png → .../items/butterflies/lepi_black_swallow.png
diff --git a/...xtures/items/butterflies/lepiBlueDuke.png → ...ures/items/butterflies/lepi_blue_duke.png b/...xtures/items/butterflies/lepiBlueDuke.png → ...ures/items/butterflies/lepi_blue_duke.png
diff --git a/...xtures/items/butterflies/lepiBlueWing.png → ...ures/items/butterflies/lepi_blue_wing.png b/...xtures/items/butterflies/lepiBlueWing.png → ...ures/items/butterflies/lepi_blue_wing.png
diff --git a/...tures/items/butterflies/lepiBrimstone.png → ...ures/items/butterflies/lepi_brimstone.png b/...tures/items/butterflies/lepiBrimstone.png → ...ures/items/butterflies/lepi_brimstone.png
diff --git a/...es/items/butterflies/lepiCabbageWhite.png → .../items/butterflies/lepi_cabbage_white.png b/...es/items/butterflies/lepiCabbageWhite.png → .../items/butterflies/lepi_cabbage_white.png
diff --git a/...s/items/butterflies/lepiCitrusSwallow.png → ...items/butterflies/lepi_citrus_swallow.png b/...s/items/butterflies/lepiCitrusSwallow.png → ...items/butterflies/lepi_citrus_swallow.png
diff --git a/.../textures/items/butterflies/lepiComma.png → ...textures/items/butterflies/lepi_comma.png b/.../textures/items/butterflies/lepiComma.png → ...textures/items/butterflies/lepi_comma.png
diff --git a/...s/items/butterflies/lepiCSpeckledWood.png → ...items/butterflies/lepi_cspeckled_wood.png b/...s/items/butterflies/lepiCSpeckledWood.png → ...items/butterflies/lepi_cspeckled_wood.png
diff --git a/...tures/items/butterflies/lepiDianaFrit.png → ...res/items/butterflies/lepi_diana_frit.png b/...tures/items/butterflies/lepiDianaFrit.png → ...res/items/butterflies/lepi_diana_frit.png
diff --git a/.../items/butterflies/lepiEmeraldPeacock.png → ...tems/butterflies/lepi_emerald_peacock.png b/.../items/butterflies/lepiEmeraldPeacock.png → ...tems/butterflies/lepi_emerald_peacock.png
diff --git a/...tures/items/butterflies/lepiGlasswing.png → ...ures/items/butterflies/lepi_glasswing.png b/...tures/items/butterflies/lepiGlasswing.png → ...ures/items/butterflies/lepi_glasswing.png
diff --git a/...res/items/butterflies/lepiGlassyTiger.png → ...s/items/butterflies/lepi_glassy_tiger.png b/...res/items/butterflies/lepiGlassyTiger.png → ...s/items/butterflies/lepi_glassy_tiger.png
diff --git a/...res/items/butterflies/lepiGozoraAzure.png → ...s/items/butterflies/lepi_gozora_azure.png b/...res/items/butterflies/lepiGozoraAzure.png → ...s/items/butterflies/lepi_gozora_azure.png
diff --git a/...tures/items/butterflies/lepiLLacewing.png → ...ures/items/butterflies/lepi_llacewing.png b/...tures/items/butterflies/lepiLLacewing.png → ...ures/items/butterflies/lepi_llacewing.png
diff --git a/...tures/items/butterflies/lepiMalachite.png → ...ures/items/butterflies/lepi_malachite.png b/...tures/items/butterflies/lepiMalachite.png → ...ures/items/butterflies/lepi_malachite.png
diff --git a/...res/items/butterflies/lepiMBlueMorpho.png → ...s/items/butterflies/lepi_mblue_morpho.png b/...res/items/butterflies/lepiMBlueMorpho.png → ...s/items/butterflies/lepi_mblue_morpho.png
diff --git a/...extures/items/butterflies/lepiMonarch.png → ...xtures/items/butterflies/lepi_monarch.png b/...extures/items/butterflies/lepiMonarch.png → ...xtures/items/butterflies/lepi_monarch.png
diff --git a/...s/items/butterflies/lepiMSpeckledWood.png → ...items/butterflies/lepi_mspeckled_wood.png b/...s/items/butterflies/lepiMSpeckledWood.png → ...items/butterflies/lepi_mspeckled_wood.png
diff --git a/.../items/butterflies/lepiPalaenoSulphur.png → ...tems/butterflies/lepi_palaeno_sulphur.png b/.../items/butterflies/lepiPalaenoSulphur.png → ...tems/butterflies/lepi_palaeno_sulphur.png
diff --git a/...res/items/butterflies/lepiPBlueMorpho.png → ...s/items/butterflies/lepi_pblue_morpho.png b/...res/items/butterflies/lepiPBlueMorpho.png → ...s/items/butterflies/lepi_pblue_morpho.png
diff --git a/...ures/items/butterflies/lepiPostillion.png → ...res/items/butterflies/lepi_postillion.png b/...ures/items/butterflies/lepiPostillion.png → ...res/items/butterflies/lepi_postillion.png
diff --git a/...extures/items/butterflies/lepiPostman.png → ...xtures/items/butterflies/lepi_postman.png b/...extures/items/butterflies/lepiPostman.png → ...xtures/items/butterflies/lepi_postman.png
diff --git a/...res/items/butterflies/lepiRBlueMorpho.png → ...s/items/butterflies/lepi_rblue_morpho.png b/...res/items/butterflies/lepiRBlueMorpho.png → ...s/items/butterflies/lepi_rblue_morpho.png
diff --git a/...textures/items/butterflies/lepiReseda.png → ...extures/items/butterflies/lepi_reseda.png b/...textures/items/butterflies/lepiReseda.png → ...extures/items/butterflies/lepi_reseda.png
diff --git a/...es/items/butterflies/lepiSpeckledWood.png → .../items/butterflies/lepi_speckled_wood.png b/...es/items/butterflies/lepiSpeckledWood.png → .../items/butterflies/lepi_speckled_wood.png
diff --git a/...tures/items/butterflies/lepiSpicebush.png → ...ures/items/butterflies/lepi_spicebush.png b/...tures/items/butterflies/lepiSpicebush.png → ...ures/items/butterflies/lepi_spicebush.png
diff --git a/...res/items/butterflies/lepiSpringAzure.png → ...s/items/butterflies/lepi_spring_azure.png b/...res/items/butterflies/lepiSpringAzure.png → ...s/items/butterflies/lepi_spring_azure.png
diff --git a/...es/items/butterflies/lepiThoasSwallow.png → .../items/butterflies/lepi_thoas_swallow.png b/...es/items/butterflies/lepiThoasSwallow.png → .../items/butterflies/lepi_thoas_swallow.png
diff --git a/...es/items/butterflies/lepiZebraSwallow.png → .../items/butterflies/lepi_zebra_swallow.png b/...es/items/butterflies/lepiZebraSwallow.png → .../items/butterflies/lepi_zebra_swallow.png
diff --git a/.../textures/items/butterflies/mothAtlas.png → ...textures/items/butterflies/moth_atlas.png b/.../textures/items/butterflies/mothAtlas.png → ...textures/items/butterflies/moth_atlas.png
diff --git a/...ures/items/butterflies/mothBombyxMori.png → ...es/items/butterflies/moth_bombyx_mori.png b/...ures/items/butterflies/mothBombyxMori.png → ...es/items/butterflies/moth_bombyx_mori.png
diff --git a/...tures/items/butterflies/mothBrimstone.png → ...ures/items/butterflies/moth_brimstone.png b/...tures/items/butterflies/mothBrimstone.png → ...ures/items/butterflies/moth_brimstone.png
diff --git a/...s/items/butterflies/mothLatticedHeath.png → ...items/butterflies/moth_latticed_heath.png b/...s/items/butterflies/mothLatticedHeath.png → ...items/butterflies/moth_latticed_heath.png
diff --git a/TODO/forestry/textures/items/camouflageSprayCan.png b/TODO/forestry/textures/items/camouflageSprayCan.png
diff --git a/TODO/forestry/textures/items/camouflageSprayCanFilled.png b/TODO/forestry/textures/items/camouflageSprayCanFilled.png
diff --git a/TODO/forestry/textures/items/camouflage_spray_can.png b/TODO/forestry/textures/items/camouflage_spray_can.png
diff --git a/TODO/forestry/textures/items/camouflage_spray_can_filled.png b/TODO/forestry/textures/items/camouflage_spray_can_filled.png
diff --git a/...ry/textures/items/camouflagedPaneling.png → ...y/textures/items/camouflaged_paneling.png b/...ry/textures/items/camouflagedPaneling.png → ...y/textures/items/camouflaged_paneling.png
diff --git a/TODO/forestry/textures/items/caterpillar.body.png.mcmeta b/TODO/forestry/textures/items/caterpillar.body.png.mcmeta
@@ -1,25 +1 @@
-{
-  "animation": {
-    "frametime": 2,
-    "frames": [
-      {
-        "index": 0,
-        "time": 7
-      },
-      {
-        "index": 1,
-        "time": 3
-      },
-      {
-        "index": 0,
-        "time": 9
-      },
-      1,
-      {
-        "index": 0,
-        "time": 5
-      },
-      1
-    ]
-  }
-}
+{"animation":{"width":1,"height":2,"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}]}}
diff --git a/TODO/forestry/textures/items/caterpillar.body2.png.mcmeta b/TODO/forestry/textures/items/caterpillar.body2.png.mcmeta
@@ -1,25 +1 @@
-{
-  "animation": {
-    "frametime": 2,
-    "frames": [
-      {
-        "index": 0,
-        "time": 7
-      },
-      {
-        "index": 1,
-        "time": 3
-      },
-      {
-        "index": 0,
-        "time": 9
-      },
-      1,
-      {
-        "index": 0,
-        "time": 5
-      },
-      1
-    ]
-  }
-}
+{"animation":{"width":1,"height":2,"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}]}}
diff --git a/TODO/forestry/textures/items/greenhouse.door.png b/TODO/forestry/textures/items/greenhouse.door.png
diff --git a/TODO/forestry/textures/items/greenhouse_screen_0.png b/TODO/forestry/textures/items/greenhouse_screen_0.png
diff --git a/TODO/forestry/textures/items/greenhouse_screen_1.png b/TODO/forestry/textures/items/greenhouse_screen_1.png
diff --git a/TODO/forestry/textures/items/greenhouse_screen_2.png b/TODO/forestry/textures/items/greenhouse_screen_2.png
diff --git a/TODO/forestry/textures/items/greenhouse_screen_3.png b/TODO/forestry/textures/items/greenhouse_screen_3.png
diff --git a/...forestry/textures/items/iodineCapsule.png → ...orestry/textures/items/iodine_capsule.png b/...forestry/textures/items/iodineCapsule.png → ...orestry/textures/items/iodine_capsule.png
diff --git a/...orestry/textures/items/portableAlyzer.png → ...restry/textures/items/portable_alyzer.png b/...orestry/textures/items/portableAlyzer.png → ...restry/textures/items/portable_alyzer.png
diff --git a/assets/astralsorcery/textures/blocks/crystal.png b/assets/astralsorcery/textures/blocks/crystal.png
diff --git a/assets/astralsorcery/textures/items/aquamarine.png b/assets/astralsorcery/textures/items/aquamarine.png
diff --git a/assets/astralsorcery/textures/items/crystal_celestial.png b/assets/astralsorcery/textures/items/crystal_celestial.png
diff --git a/assets/astralsorcery/textures/items/crystal_rock.png b/assets/astralsorcery/textures/items/crystal_rock.png
diff --git a/assets/astralsorcery/textures/items/dust_dark.png b/assets/astralsorcery/textures/items/dust_dark.png
diff --git a/assets/astralsorcery/textures/items/dust_light.png b/assets/astralsorcery/textures/items/dust_light.png
diff --git a/assets/astralsorcery/textures/items/linktool.png b/assets/astralsorcery/textures/items/linktool.png
diff --git a/assets/astralsorcery/textures/items/looking_glass.png b/assets/astralsorcery/textures/items/looking_glass.png
diff --git a/assets/astralsorcery/textures/items/parchment.png b/assets/astralsorcery/textures/items/parchment.png
diff --git a/assets/astralsorcery/textures/items/reso_gem.png b/assets/astralsorcery/textures/items/reso_gem.png
diff --git a/assets/astralsorcery/textures/items/reso_gem.png.mcmeta b/assets/astralsorcery/textures/items/reso_gem.png.mcmeta
@@ -0,0 +1,13 @@
+{ 
+	"animation": {
+		"frametime": 2,
+		"frames": [
+			0,
+			1,
+			2,
+			3,
+			4,
+			5
+		]
+	}
+}
diff --git a/assets/astralsorcery/textures/items/resonator_starlight.png b/assets/astralsorcery/textures/items/resonator_starlight.png
diff --git a/assets/astralsorcery/textures/items/resonator_upgraded_acoustic_liquid.png b/assets/astralsorcery/textures/items/resonator_upgraded_acoustic_liquid.png
diff --git a/assets/astralsorcery/textures/items/resonator_upgraded_starlight.png b/assets/astralsorcery/textures/items/resonator_upgraded_starlight.png
diff --git a/assets/astralsorcery/textures/items/scroll_constellation.png b/assets/astralsorcery/textures/items/scroll_constellation.png
diff --git a/assets/astralsorcery/textures/items/scroll_constellation_overlay.png b/assets/astralsorcery/textures/items/scroll_constellation_overlay.png
diff --git a/assets/astralsorcery/textures/items/scroll_empty.png b/assets/astralsorcery/textures/items/scroll_empty.png
diff --git a/assets/astralsorcery/textures/items/scroll_expertise.png b/assets/astralsorcery/textures/items/scroll_expertise.png
diff --git a/assets/astralsorcery/textures/items/tome_astral.png b/assets/astralsorcery/textures/items/tome_astral.png
diff --git a/assets/astralsorcery/textures/items/wand_architecture.png b/assets/astralsorcery/textures/items/wand_architecture.png
diff --git a/assets/astralsorcery/textures/items/wand_exchange.png b/assets/astralsorcery/textures/items/wand_exchange.png
diff --git a/assets/astralsorcery/textures/items/wand_grapple.png b/assets/astralsorcery/textures/items/wand_grapple.png
diff --git a/assets/astralsorcery/textures/items/wand_illumination.png b/assets/astralsorcery/textures/items/wand_illumination.png
diff --git a/assets/astralsorcery/textures/items/wand_illumination_overlay.png b/assets/astralsorcery/textures/items/wand_illumination_overlay.png
diff --git a/assets/astralsorcery/textures/items/wand_resonance.png b/assets/astralsorcery/textures/items/wand_resonance.png
diff --git a/assets/astralsorcery/textures/items/wand_resonance_aevitas.png b/assets/astralsorcery/textures/items/wand_resonance_aevitas.png
diff --git a/assets/astralsorcery/textures/items/wand_resonance_armara.png b/assets/astralsorcery/textures/items/wand_resonance_armara.png
diff --git a/assets/astralsorcery/textures/items/wand_resonance_discidia.png b/assets/astralsorcery/textures/items/wand_resonance_discidia.png
diff --git a/assets/astralsorcery/textures/items/wand_resonance_evorsio.png b/assets/astralsorcery/textures/items/wand_resonance_evorsio.png
diff --git a/assets/astralsorcery/textures/items/wand_resonance_vicio.png b/assets/astralsorcery/textures/items/wand_resonance_vicio.png
diff --git a/...s/blocks/germlings/sapling.treeAcacia.png → .../blocks/germlings/sapling.tree_acacia.png b/...s/blocks/germlings/sapling.treeAcacia.png → .../blocks/germlings/sapling.tree_acacia.png
diff --git a/...es/blocks/germlings/sapling.treeBalsa.png → ...s/blocks/germlings/sapling.tree_balsa.png b/...es/blocks/germlings/sapling.treeBalsa.png → ...s/blocks/germlings/sapling.tree_balsa.png
diff --git a/...s/blocks/germlings/sapling.treeCherry.png → .../blocks/germlings/sapling.tree_cherry.png b/...s/blocks/germlings/sapling.treeCherry.png → .../blocks/germlings/sapling.tree_cherry.png
diff --git a/...blocks/germlings/sapling.treeChestnut.png → ...locks/germlings/sapling.tree_chestnut.png b/...blocks/germlings/sapling.treeChestnut.png → ...locks/germlings/sapling.tree_chestnut.png
diff --git a/...es/blocks/germlings/sapling.treeEbony.png → ...s/blocks/germlings/sapling.tree_ebony.png b/...es/blocks/germlings/sapling.treeEbony.png → ...s/blocks/germlings/sapling.tree_ebony.png
diff --git a/...es/blocks/germlings/sapling.treeKapok.png → ...s/blocks/germlings/sapling.tree_kapok.png b/...es/blocks/germlings/sapling.treeKapok.png → ...s/blocks/germlings/sapling.tree_kapok.png
diff --git a/...es/blocks/germlings/sapling.treeLarch.png → ...s/blocks/germlings/sapling.tree_larch.png b/...es/blocks/germlings/sapling.treeLarch.png → ...s/blocks/germlings/sapling.tree_larch.png
diff --git a/...res/blocks/germlings/sapling.treeLime.png → ...es/blocks/germlings/sapling.tree_lime.png b/...res/blocks/germlings/sapling.treeLime.png → ...es/blocks/germlings/sapling.tree_lime.png
diff --git a/...blocks/germlings/sapling.treeMahogony.png → ...locks/germlings/sapling.tree_mahogony.png b/...blocks/germlings/sapling.treeMahogony.png → ...locks/germlings/sapling.tree_mahogony.png
diff --git a/...res/blocks/germlings/sapling.treePine.png → ...es/blocks/germlings/sapling.tree_pine.png b/...res/blocks/germlings/sapling.treePine.png → ...es/blocks/germlings/sapling.tree_pine.png
diff --git a/.../blocks/germlings/sapling.treeSequoia.png → ...blocks/germlings/sapling.tree_sequoia.png b/.../blocks/germlings/sapling.treeSequoia.png → ...blocks/germlings/sapling.tree_sequoia.png
diff --git a/...s/blocks/germlings/sapling.treeSipiri.png → .../blocks/germlings/sapling.tree_sipiri.png b/...s/blocks/germlings/sapling.treeSipiri.png → .../blocks/germlings/sapling.tree_sipiri.png
diff --git a/...res/blocks/germlings/sapling.treeTeak.png → ...es/blocks/germlings/sapling.tree_teak.png b/...res/blocks/germlings/sapling.treeTeak.png → ...es/blocks/germlings/sapling.tree_teak.png
diff --git a/...s/blocks/germlings/sapling.treeWalnut.png → .../blocks/germlings/sapling.tree_walnut.png b/...s/blocks/germlings/sapling.treeWalnut.png → .../blocks/germlings/sapling.tree_walnut.png
diff --git a/...es/blocks/germlings/sapling.treeWenge.png → ...s/blocks/germlings/sapling.tree_wenge.png b/...es/blocks/germlings/sapling.treeWenge.png → ...s/blocks/germlings/sapling.tree_wenge.png
diff --git a/...s/blocks/germlings/sapling.treeWillow.png → .../blocks/germlings/sapling.tree_willow.png b/...s/blocks/germlings/sapling.treeWillow.png → .../blocks/germlings/sapling.tree_willow.png
diff --git a/assets/forestry/textures/blocks/leaves/tile]-103.png b/assets/forestry/textures/blocks/leaves/tile]-103.png
diff --git a/assets/forestry/textures/blocks/leaves/tile]-98.png b/assets/forestry/textures/blocks/leaves/tile]-98.png
diff --git a/assets/forestry/textures/blocks/lepichest.0.png b/assets/forestry/textures/blocks/lepichest.0.png
diff --git a/assets/forestry/textures/gui/backpackT2.png → assets/forestry/textures/gui/backpack_t2.png b/assets/forestry/textures/gui/backpackT2.png → assets/forestry/textures/gui/backpack_t2.png
diff --git a/assets/forestry/textures/gui/beealyzer2.png b/assets/forestry/textures/gui/beealyzer2.png
diff --git a/assets/forestry/textures/gui/centrifuge.png b/assets/forestry/textures/gui/centrifuge.png
diff --git a/assets/forestry/textures/gui/ledgerLeft.png → assets/forestry/textures/gui/ledger_left.png b/assets/forestry/textures/gui/ledgerLeft.png → assets/forestry/textures/gui/ledger_left.png
diff --git a/assets/forestry/textures/gui/squeezer.png b/assets/forestry/textures/gui/squeezer.png
diff --git a/...forestry/textures/items/apiaristBoots.png → ...orestry/textures/items/apiarist_boots.png b/...forestry/textures/items/apiaristBoots.png → ...orestry/textures/items/apiarist_boots.png
diff --git a/...forestry/textures/items/apiaristChest.png → ...orestry/textures/items/apiarist_chest.png b/...forestry/textures/items/apiaristChest.png → ...orestry/textures/items/apiarist_chest.png
diff --git a/...orestry/textures/items/apiaristHelmet.png → ...restry/textures/items/apiarist_helmet.png b/...orestry/textures/items/apiaristHelmet.png → ...restry/textures/items/apiarist_helmet.png
diff --git a/.../forestry/textures/items/apiaristLegs.png → ...forestry/textures/items/apiarist_legs.png b/.../forestry/textures/items/apiaristLegs.png → ...forestry/textures/items/apiarist_legs.png
diff --git a/...ts/forestry/textures/items/beeCombs.0.png → ...s/forestry/textures/items/bee_combs.0.png b/...ts/forestry/textures/items/beeCombs.0.png → ...s/forestry/textures/items/bee_combs.0.png