From 03a96edb4405b202b994da2109a895cb773eee41 Mon Sep 17 00:00:00 2001 From: wiiv Date: Mon, 28 Aug 2017 02:58:29 +0100 Subject: [PATCH] More asset changes for the art update. --- .../botania/client/lib/LibResources.java | 32 +++---- .../client/model/ModelCrystalCube.java | 51 ---------- .../botania/client/model/ModelHourglass.java | 88 +++++++++--------- .../corporea/TileCorporeaCrystalCube.java | 2 +- ....json => corporea_crystal_cube_glass.json} | 0 ...ube_cube.json => corporeacrystalcube.json} | 2 +- .../blockstates/corporeacrystalcube.json | 16 ++-- .../botania/blockstates/manadetector.json | 2 +- .../assets/botania/blockstates/opencrate.json | 24 ++--- .../assets/botania/models/block/cocoon.json | 16 ++-- ...e.json => corporea_crystal_cube_base.json} | 0 .../block/corporea_crystal_cube_glass.json | 20 ++++ .../botania/models/block/corporea_funnel.json | 6 +- .../models/block/corporea_interceptor.json | 6 +- .../models/block/corporea_retainer.json | 6 +- .../assets/botania/models/block/crate.json | 16 ++++ .../models/block/crystalcube_cube.json | 20 ---- .../models/block/islands/island_grass.json | 4 +- .../botania/models/block/mana_detector.json | 2 +- ...ered.json => mana_detector_activated.json} | 2 +- .../botania/models/block/turntable.json | 6 +- ...honiumblock1.png => cacophonium_block.png} | Bin ...umblock0.png => cacophonium_block_top.png} | Bin .../{model => blocks}/cocoon_bottom.png | Bin .../{model => blocks}/cocoon_east.png | Bin .../{model => blocks}/cocoon_north.png | Bin .../{model => blocks}/cocoon_south.png | Bin .../textures/{model => blocks}/cocoon_top.png | Bin .../{model => blocks}/cocoon_west.png | Bin ...ase.png => corporea_crystal_cube_base.png} | Bin ...th.png => corporea_crystal_cube_cloth.png} | Bin ...be.png => corporea_crystal_cube_glass.png} | Bin ...eafunnel1.png => corporea_funnel_side.png} | Bin ...el0.png => corporea_funnel_top_bottom.png} | Bin ...tor1.png => corporea_interceptor_side.png} | Bin ...ng => corporea_interceptor_top_bottom.png} | Bin ...etainer.png => corporea_retainer_side.png} | Bin .../blocks/corporea_retainer_top_bottom.png | Bin 0 -> 907 bytes .../botania/textures/blocks/crate_crafty.png | Bin 0 -> 15632 bytes .../textures/blocks/crate_crafty_bottom.png | Bin 0 -> 15075 bytes .../blocks/crate_crafty_pattern_0.png | Bin 0 -> 15357 bytes .../blocks/crate_crafty_pattern_1.png | Bin 0 -> 15399 bytes .../blocks/crate_crafty_pattern_2.png | Bin 0 -> 15830 bytes .../blocks/crate_crafty_pattern_3.png | Bin 0 -> 15383 bytes .../blocks/crate_crafty_pattern_4.png | Bin 0 -> 15397 bytes .../blocks/crate_crafty_pattern_5.png | Bin 0 -> 15394 bytes .../blocks/crate_crafty_pattern_6.png | Bin 0 -> 15415 bytes .../blocks/crate_crafty_pattern_7.png | Bin 0 -> 15857 bytes .../blocks/crate_crafty_pattern_8.png | Bin 0 -> 15862 bytes .../botania/textures/blocks/crate_open.png | Bin 0 -> 15411 bytes .../textures/blocks/crate_open_bottom.png | Bin 0 -> 14951 bytes .../botania/textures/blocks/custombrick0.png | Bin 755 -> 0 bytes .../botania/textures/blocks/custombrick1.png | Bin 732 -> 0 bytes .../botania/textures/blocks/custombrick2.png | Bin 694 -> 0 bytes .../botania/textures/blocks/custombrick3.png | Bin 798 -> 0 bytes .../botania/textures/blocks/daybloom.png | Bin 1263 -> 0 bytes .../botania/textures/blocks/daybloomdecor.png | Bin 376 -> 0 bytes .../botania/textures/blocks/daybloomprime.png | Bin 419 -> 0 bytes .../botania/textures/blocks/dirtpath.png | Bin 779 -> 0 bytes .../{islandside.png => island_side.png} | Bin .../blocks/{islandtop.png => island_top.png} | Bin .../botania/textures/blocks/mana_detector.png | Bin 0 -> 16578 bytes .../blocks/mana_detector_activated.png | Bin 0 -> 17112 bytes .../textures/blocks/mana_fluxfield.png | Bin 15525 -> 16411 bytes .../botania/textures/blocks/manadetector0.png | Bin 978 -> 0 bytes .../botania/textures/blocks/manadetector1.png | Bin 968 -> 0 bytes .../botania/textures/blocks/nightshade.png | Bin 371 -> 0 bytes .../textures/blocks/nightshadedecor.png | Bin 376 -> 0 bytes .../textures/blocks/nightshadeprime.png | Bin 420 -> 0 bytes .../botania/textures/blocks/ocpattern0.png | Bin 863 -> 0 bytes .../botania/textures/blocks/ocpattern1.png | Bin 873 -> 0 bytes .../botania/textures/blocks/ocpattern2.png | Bin 869 -> 0 bytes .../botania/textures/blocks/ocpattern3.png | Bin 869 -> 0 bytes .../botania/textures/blocks/ocpattern4.png | Bin 877 -> 0 bytes .../botania/textures/blocks/ocpattern5.png | Bin 877 -> 0 bytes .../botania/textures/blocks/ocpattern6.png | Bin 888 -> 0 bytes .../botania/textures/blocks/ocpattern7.png | Bin 887 -> 0 bytes .../botania/textures/blocks/ocpattern8.png | Bin 888 -> 0 bytes .../botania/textures/blocks/opencrate0.png | Bin 632 -> 0 bytes .../botania/textures/blocks/opencrate1.png | Bin 596 -> 0 bytes .../botania/textures/blocks/opencrate2.png | Bin 895 -> 0 bytes .../botania/textures/blocks/opencrate3.png | Bin 730 -> 0 bytes .../textures/blocks/spark_tinkerer_0.png | Bin 16704 -> 17088 bytes ...{turntable1.png => spreader_turntable.png} | Bin ...ntable0.png => spreader_turntable_top.png} | Bin .../botania/textures/blocks/storage5.png | Bin 0 -> 19379 bytes ...lementium_new.png => armor_elementium.png} | Bin ...invisiblearmor.png => armor_invisible.png} | Bin ...{manasteel_new.png => armor_manasteel.png} | Bin ...{manaweave_new.png => armor_manaweave.png} | Bin ...oliday.png => armor_manaweave_holiday.png} | Bin ...errasteel_new.png => armor_terrasteel.png} | Bin .../{knockbackbelt.png => belt_knockback.png} | Bin .../model/{speedupbelt.png => belt_speed.png} | Bin .../model/{travelbelt.png => belt_travel.png} | Bin ...ertravelbelt.png => belt_travel_super.png} | Bin .../{corporeaindex.png => corporea_index.png} | Bin .../botania/textures/model/hourglass.png | Bin 692 -> 16860 bytes .../model/spreader_gaia_halloween.png | Bin 21820 -> 21788 bytes .../model/{pinkwither.png => wither_pink.png} | Bin 100 files changed, 143 insertions(+), 178 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/model/ModelCrystalCube.java rename src/main/resources/assets/botania/armatures/block/{crystalcube_cube.json => corporea_crystal_cube_glass.json} (100%) rename src/main/resources/assets/botania/asms/block/{crystalcube_cube.json => corporeacrystalcube.json} (60%) rename src/main/resources/assets/botania/models/block/{crystalcube_base.json => corporea_crystal_cube_base.json} (100%) create mode 100644 src/main/resources/assets/botania/models/block/corporea_crystal_cube_glass.json create mode 100644 src/main/resources/assets/botania/models/block/crate.json delete mode 100644 src/main/resources/assets/botania/models/block/crystalcube_cube.json rename src/main/resources/assets/botania/models/block/{mana_detector_powered.json => mana_detector_activated.json} (54%) rename src/main/resources/assets/botania/textures/blocks/{cacophoniumblock1.png => cacophonium_block.png} (100%) rename src/main/resources/assets/botania/textures/blocks/{cacophoniumblock0.png => cacophonium_block_top.png} (100%) rename src/main/resources/assets/botania/textures/{model => blocks}/cocoon_bottom.png (100%) rename src/main/resources/assets/botania/textures/{model => blocks}/cocoon_east.png (100%) rename src/main/resources/assets/botania/textures/{model => blocks}/cocoon_north.png (100%) rename src/main/resources/assets/botania/textures/{model => blocks}/cocoon_south.png (100%) rename src/main/resources/assets/botania/textures/{model => blocks}/cocoon_top.png (100%) rename src/main/resources/assets/botania/textures/{model => blocks}/cocoon_west.png (100%) rename src/main/resources/assets/botania/textures/blocks/{crystalcube_base.png => corporea_crystal_cube_base.png} (100%) rename src/main/resources/assets/botania/textures/blocks/{crystalcube_cloth.png => corporea_crystal_cube_cloth.png} (100%) rename src/main/resources/assets/botania/textures/blocks/{crystalcube_cube.png => corporea_crystal_cube_glass.png} (100%) rename src/main/resources/assets/botania/textures/blocks/{corporeafunnel1.png => corporea_funnel_side.png} (100%) rename src/main/resources/assets/botania/textures/blocks/{corporeafunnel0.png => corporea_funnel_top_bottom.png} (100%) rename src/main/resources/assets/botania/textures/blocks/{corporeainterceptor1.png => corporea_interceptor_side.png} (100%) rename src/main/resources/assets/botania/textures/blocks/{corporeainterceptor0.png => corporea_interceptor_top_bottom.png} (100%) rename src/main/resources/assets/botania/textures/blocks/{corporearetainer.png => corporea_retainer_side.png} (100%) create mode 100644 src/main/resources/assets/botania/textures/blocks/corporea_retainer_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/blocks/crate_crafty.png create mode 100644 src/main/resources/assets/botania/textures/blocks/crate_crafty_bottom.png create mode 100644 src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_0.png create mode 100644 src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_1.png create mode 100644 src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_2.png create mode 100644 src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_3.png create mode 100644 src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_4.png create mode 100644 src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_5.png create mode 100644 src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_6.png create mode 100644 src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_7.png create mode 100644 src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_8.png create mode 100644 src/main/resources/assets/botania/textures/blocks/crate_open.png create mode 100644 src/main/resources/assets/botania/textures/blocks/crate_open_bottom.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/custombrick0.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/custombrick1.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/custombrick2.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/custombrick3.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/daybloom.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/daybloomdecor.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/daybloomprime.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/dirtpath.png rename src/main/resources/assets/botania/textures/blocks/{islandside.png => island_side.png} (100%) rename src/main/resources/assets/botania/textures/blocks/{islandtop.png => island_top.png} (100%) create mode 100644 src/main/resources/assets/botania/textures/blocks/mana_detector.png create mode 100644 src/main/resources/assets/botania/textures/blocks/mana_detector_activated.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/manadetector0.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/manadetector1.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/nightshade.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/nightshadedecor.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/nightshadeprime.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/ocpattern0.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/ocpattern1.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/ocpattern2.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/ocpattern3.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/ocpattern4.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/ocpattern5.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/ocpattern6.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/ocpattern7.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/ocpattern8.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/opencrate0.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/opencrate1.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/opencrate2.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/opencrate3.png rename src/main/resources/assets/botania/textures/blocks/{turntable1.png => spreader_turntable.png} (100%) rename src/main/resources/assets/botania/textures/blocks/{turntable0.png => spreader_turntable_top.png} (100%) create mode 100644 src/main/resources/assets/botania/textures/blocks/storage5.png rename src/main/resources/assets/botania/textures/model/{elementium_new.png => armor_elementium.png} (100%) rename src/main/resources/assets/botania/textures/model/{invisiblearmor.png => armor_invisible.png} (100%) rename src/main/resources/assets/botania/textures/model/{manasteel_new.png => armor_manasteel.png} (100%) rename src/main/resources/assets/botania/textures/model/{manaweave_new.png => armor_manaweave.png} (100%) rename src/main/resources/assets/botania/textures/model/{manaweavenewholiday.png => armor_manaweave_holiday.png} (100%) rename src/main/resources/assets/botania/textures/model/{terrasteel_new.png => armor_terrasteel.png} (100%) rename src/main/resources/assets/botania/textures/model/{knockbackbelt.png => belt_knockback.png} (100%) rename src/main/resources/assets/botania/textures/model/{speedupbelt.png => belt_speed.png} (100%) rename src/main/resources/assets/botania/textures/model/{travelbelt.png => belt_travel.png} (100%) rename src/main/resources/assets/botania/textures/model/{supertravelbelt.png => belt_travel_super.png} (100%) rename src/main/resources/assets/botania/textures/model/{corporeaindex.png => corporea_index.png} (100%) rename src/main/resources/assets/botania/textures/model/{pinkwither.png => wither_pink.png} (100%) diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 3fa8e974e..a9aac8492 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -76,46 +76,44 @@ public final class LibResources { public static final String MODEL_PYLON_MANA = PREFIX_MODEL + "pylon_mana.png"; public static final String MODEL_PYLON_NATURA = PREFIX_MODEL + "pylon_natura.png"; public static final String MODEL_PYLON_GAIA = PREFIX_MODEL + "pylon_gaia.png"; - public static final String MODEL_LEXICA_DEFAULT = PREFIX_MODEL + "lexica_default.png"; - public static final String MODEL_LEXICA_ELVEN = PREFIX_MODEL + "lexica_elven.png"; + public static final String MODEL_LEXICA_DEFAULT = PREFIX_MODEL + "lexicon_default.png"; + public static final String MODEL_LEXICA_ELVEN = PREFIX_MODEL + "lexicon_elven.png"; public static final String MODEL_MANASTEEL_0 = PREFIX_MODEL + "manasteel_0.png"; public static final String MODEL_MANASTEEL_1 = PREFIX_MODEL + "manasteel_1.png"; public static final String MODEL_MANASTEEL_2 = PREFIX_MODEL + "manasteel_2.png"; - public static final String MODEL_MANASTEEL_NEW = PREFIX_MODEL + "manasteel_new.png"; + public static final String MODEL_MANASTEEL_NEW = PREFIX_MODEL + "armor_manasteel.png"; public static final String MODEL_TERRASTEEL_0 = PREFIX_MODEL + "terrasteel_0.png"; public static final String MODEL_TERRASTEEL_1 = PREFIX_MODEL + "terrasteel_1.png"; public static final String MODEL_TERRASTEEL_2 = PREFIX_MODEL + "terrasteel_2.png"; - public static final String MODEL_TERRASTEEL_NEW = PREFIX_MODEL + "terrasteel_new.png"; + public static final String MODEL_TERRASTEEL_NEW = PREFIX_MODEL + "armor_terrasteel.png"; public static final String MODEL_ELEMENTIUM_0 = PREFIX_MODEL + "elementium_0.png"; public static final String MODEL_ELEMENTIUM_1 = PREFIX_MODEL + "elementium_1.png"; public static final String MODEL_ELEMENTIUM_2 = PREFIX_MODEL + "elementium_2.png"; - public static final String MODEL_ELEMENTIUM_NEW = PREFIX_MODEL + "elementium_new.png"; + public static final String MODEL_ELEMENTIUM_NEW = PREFIX_MODEL + "armor_elementium.png"; public static final String MODEL_MANAWEAVE_0 = PREFIX_MODEL + "manaweave_0.png"; public static final String MODEL_MANAWEAVE_1 = PREFIX_MODEL + "manaweave_1.png"; - public static final String MODEL_MANAWEAVE_NEW = PREFIX_MODEL + "manaweave_new.png"; - public static final String MODEL_MANAWEAVE_NEW_HOLIDAY = PREFIX_MODEL + "manaweave_new_holiday.png"; + public static final String MODEL_MANAWEAVE_NEW = PREFIX_MODEL + "armor_manaweave.png"; + public static final String MODEL_MANAWEAVE_NEW_HOLIDAY = PREFIX_MODEL + "armor_manaweave_holiday.png"; public static final String MODEL_PIXIE = PREFIX_MODEL + "pixie.png"; public static final String MODEL_PIXIE_HALLOWEEN = PREFIX_MODEL + "pixie_halloween.png"; public static final String MODEL_TINY_POTATO = PREFIX_MODEL + "tiny_potato.png"; public static final String MODEL_TINY_POTATO_GS = PREFIX_MODEL + "tiny_potato_gray.png"; public static final String MODEL_TINY_POTATO_HALLOWEEN = PREFIX_MODEL + "tiny_potato_halloween.png"; - public static final String MODEL_BREWERY = PREFIX_MODEL + "brewery.png"; - public static final String MODEL_TRAVEL_BELT = PREFIX_MODEL + "travelBelt.png"; - public static final String MODEL_SUPER_TRAVEL_BELT = PREFIX_MODEL + "superTravelBelt.png"; - public static final String MODEL_SPEED_UP_BELT = PREFIX_MODEL + "speedUpBelt.png"; - public static final String MODEL_KNOCKBACK_BELT = PREFIX_MODEL + "knockbackBelt.png"; + public static final String MODEL_TRAVEL_BELT = PREFIX_MODEL + "belt_travel.png"; + public static final String MODEL_SUPER_TRAVEL_BELT = PREFIX_MODEL + "belt_travel_super.png"; + public static final String MODEL_SPEED_UP_BELT = PREFIX_MODEL + "belt_speed.png"; + public static final String MODEL_KNOCKBACK_BELT = PREFIX_MODEL + "belt_knockback.png"; public static final String MODEL_HOLY_CLOAK = PREFIX_MODEL + "cloak_holy.png"; public static final String MODEL_UNHOLY_CLOAK = PREFIX_MODEL + "cloak_unholy.png"; public static final String MODEL_BALANCE_CLOAK = PREFIX_MODEL + "cloak_balance.png"; public static final String MODEL_HOLY_CLOAK_GLOW = PREFIX_MODEL + "cloak_holy_glow.png"; public static final String MODEL_UNHOLY_CLOAK_GLOW = PREFIX_MODEL + "cloak_unholy_glow.png"; public static final String MODEL_BALANCE_CLOAK_GLOW = PREFIX_MODEL + "cloak_balance_glow.png"; - public static final String MODEL_CORPOREA_INDEX = PREFIX_MODEL + "corporeaIndex.png"; - public static final String MODEL_INVISIBLE_ARMOR = PREFIX_MODEL + "invisibleArmor.png"; - public static final String MODEL_PINK_WITHER = PREFIX_MODEL + "pinkWither.png"; - public static final String MODEL_CRYSTAL_CUBE = PREFIX_MODEL + "crystalCube.png"; + public static final String MODEL_CORPOREA_INDEX = PREFIX_MODEL + "corporea_index.png"; + public static final String MODEL_INVISIBLE_ARMOR = PREFIX_MODEL + "armor_invisible.png"; + public static final String MODEL_PINK_WITHER = PREFIX_MODEL + "wither_pink.png"; + public static final String MODEL_BREWERY = PREFIX_MODEL + "brewery.png"; public static final String MODEL_HOURGLASS = PREFIX_MODEL + "hourglass.png"; - public static final String MODEL_COCOON = PREFIX_MODEL + "cocoon.png"; public static final String MODEL_BELLOWS = PREFIX_MODEL + "bellows.png"; public static final String MODEL_TERU_TERU_BOZU = PREFIX_MODEL + "teruTeruBozu.png"; public static final String MODEL_TERU_TERU_BOZU_HALLOWEEN = PREFIX_MODEL + "teruTeruBozu_halloween.png"; diff --git a/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java b/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java deleted file mode 100644 index ad9e1df7c..000000000 --- a/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [? (GMT)] - */ -package vazkii.botania.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -public class ModelCrystalCube extends ModelBase { - public final ModelRenderer cube; - public final ModelRenderer base1; - public final ModelRenderer base2; - - public ModelCrystalCube() { - textureWidth = 48; - textureHeight = 32; - cube = new ModelRenderer(this, 0, 0); - cube.setRotationPoint(0.0F, 12.0F, 0.0F); - cube.addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8, 0.0F); - base1 = new ModelRenderer(this, 22, 0); - base1.setRotationPoint(0.0F, 16.0F, 0.0F); - base1.addBox(-3.0F, 7.0F, -3.0F, 6, 1, 6, 0.0F); - base2 = new ModelRenderer(this, 0, 16); - base2.setRotationPoint(0.0F, 0.0F, 0.0F); - base2.addBox(-5.0F, 3.0F, -5.0F, 10, 4, 10, 0.0F); - base1.addChild(base2); - } - - public void renderBase() { - float f5 = 1F / 16F; - base1.render(f5); - } - - public void renderCube() { - float f5 = 1F / 16F; - cube.render(f5); - } - - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } -} diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index 58e9c79d5..dbf5386c6 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -19,38 +19,42 @@ import java.awt.Color; public class ModelHourglass extends ModelBase { - public final ModelRenderer ring; - public final ModelRenderer base1; - public final ModelRenderer base2; - public final ModelRenderer glass1; - public final ModelRenderer sand1; - public final ModelRenderer glass2; - public final ModelRenderer sand2; + public ModelRenderer top; + public ModelRenderer glassT; + public ModelRenderer ring; + public ModelRenderer glassB; + public ModelRenderer bottom; + + public ModelRenderer sandT; + public ModelRenderer sandB; public ModelHourglass() { - textureWidth = 48; - textureHeight = 24; - sand2 = new ModelRenderer(this, 24, 0); - sand2.setRotationPoint(0.0F, 0.0F, 0.0F); - sand2.addBox(0F, 0F, 0F, 5, 5, 5, 0.0F); // -2.5F, 1.0F, -2.5F - sand1 = new ModelRenderer(this, 24, 0); - sand1.setRotationPoint(0.0F, 0.0F, 0.0F); - sand1.addBox(0F, 0F, 0F, 5, 5, 5, 0.0F); // -2.5F, -6.0F, -2.5F - glass1 = new ModelRenderer(this, 0, 0); - glass1.setRotationPoint(0.0F, 0.0F, 0.0F); - glass1.addBox(-3.0F, -6.501F, -3.0F, 6, 6, 6, 0.0F); - base2 = new ModelRenderer(this, 0, 12); - base2.setRotationPoint(0.0F, 0.0F, 0.0F); - base2.addBox(-3.5F, 6.502F, -3.5F, 7, 1, 7, 0.0F); - base1 = new ModelRenderer(this, 0, 12); - base1.setRotationPoint(0.0F, 0.0F, 0.0F); - base1.addBox(-3.5F, -7.502F, -3.5F, 7, 1, 7, 0.0F); - ring = new ModelRenderer(this, 28, 12); - ring.setRotationPoint(0.0F, 15.5F, 0.0F); - ring.addBox(-2.0F, -16F, -2.0F, 4, 1, 4, 0.0F); - glass2 = new ModelRenderer(this, 0, 0); - glass2.setRotationPoint(0.0F, 0.0F, 0.0F); - glass2.addBox(-3.0F, 0.501F, -3.0F, 6, 6, 6, 0.0F); + + textureWidth = 64; + textureHeight = 32; + + top = new ModelRenderer(this, 20, 0); + top.setRotationPoint(0.0F, 0.0F, 0.0F); + top.addBox(-3.0F, -6.5F, -3.0F, 6, 1, 6, 0.0F); + glassT = new ModelRenderer(this, 0, 0); + glassT.setRotationPoint(0.0F, 0.0F, 0.0F); + glassT.addBox(-2.5F, -5.5F, -2.5F, 5, 5, 5, 0.0F); + ring = new ModelRenderer(this, 0, 20); + ring.setRotationPoint(0.0F, 0.0F, 0.0F); + ring.addBox(-1.5F, -0.5F, -1.5F, 3, 1, 3, 0.0F); + glassB = new ModelRenderer(this, 0, 10); + glassB.setRotationPoint(0.0F, 0.0F, 0.0F); + glassB.addBox(-2.5F, 0.5F, -2.5F, 5, 5, 5, 0.0F); + bottom = new ModelRenderer(this, 20, 7); + bottom.setRotationPoint(0.0F, 0.0F, 0.0F); + bottom.addBox(-3.0F, 5.5F, -3.0F, 6, 1, 6, 0.0F); + + sandT = new ModelRenderer(this, 20, 14); + sandT.setRotationPoint(0.0F, 0.0F, 0.0F); + sandT.addBox(0.0F, 0.0F, 0.0F, 4, 4, 4, 0.0F); // -2.0F, -5.0F, -2.0F + sandB = new ModelRenderer(this, 20, 14); + sandB.setRotationPoint(0.0F, 0.0F, 0.0F); + sandB.addBox(0.0F, 0.0F, 0.0F, 4, 4, 4, 0.0F); // -2.0F, 1.0F, -2.05F } public void render(float fract1, float fract2, boolean flip, int color) { @@ -62,8 +66,8 @@ public class ModelHourglass extends ModelBase { float f = 1F / 16F; ring.render(f); - base1.render(f); - base2.render(f); + top.render(f); + bottom.render(f); Color c = new Color(color); GL11.glColor3ub((byte) c.getRed(), (byte) c.getGreen(), (byte) c.getBlue()); @@ -74,38 +78,34 @@ public class ModelHourglass extends ModelBase { if(fract1 > 0) { GlStateManager.pushMatrix(); if(flip) - GlStateManager.translate(-2.5F * f, 1.0F * f, -2.5F * f); + GlStateManager.translate(-2.0F * f, 1.0F * f, -2.0F * f); else { GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-2.5F * f, -6.0F * f, -2.5F * f); + GlStateManager.translate(-2.0F * f, -5.0F * f, -2.0F * f); } - GlStateManager.scale(1F, fract1, 1F); - sand1.render(f); + sandT.render(f); GlStateManager.popMatrix(); } if(fract2 > 0) { GlStateManager.pushMatrix(); if(flip) - GlStateManager.translate(-2.5F * f, -6.0F * f, -2.5F * f); + GlStateManager.translate(-2.0F * f, -5.0F * f, -2.0F * f); else { GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-2.5F * f, 1.0F * f, -2.5F * f); + GlStateManager.translate(-2.0F * f, 1.0F * f, -2.0F * f); } - - GlStateManager.scale(1F, fract2, 1F); - - sand2.render(f); + sandB.render(f); GlStateManager.popMatrix(); } GL11.glPopAttrib(); GL11.glColor3ub((byte) 255, (byte) 255, (byte) 255); - glass1.render(f); - glass2.render(f); + glassT.render(f); + glassB.render(f); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index c7d7d414c..d6dba98d0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -46,7 +46,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor public TileCorporeaCrystalCube() { if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { - asm = ModelLoaderRegistry.loadASM(new ResourceLocation("botania", "asms/block/crystalcube_cube.json"), ImmutableMap.of()); + asm = ModelLoaderRegistry.loadASM(new ResourceLocation("botania", "asms/block/corporeacrystalcube.json"), ImmutableMap.of()); } else { asm = null; } diff --git a/src/main/resources/assets/botania/armatures/block/crystalcube_cube.json b/src/main/resources/assets/botania/armatures/block/corporea_crystal_cube_glass.json similarity index 100% rename from src/main/resources/assets/botania/armatures/block/crystalcube_cube.json rename to src/main/resources/assets/botania/armatures/block/corporea_crystal_cube_glass.json diff --git a/src/main/resources/assets/botania/asms/block/crystalcube_cube.json b/src/main/resources/assets/botania/asms/block/corporeacrystalcube.json similarity index 60% rename from src/main/resources/assets/botania/asms/block/crystalcube_cube.json rename to src/main/resources/assets/botania/asms/block/corporeacrystalcube.json index 969465469..6620c4f00 100644 --- a/src/main/resources/assets/botania/asms/block/crystalcube_cube.json +++ b/src/main/resources/assets/botania/asms/block/corporeacrystalcube.json @@ -3,7 +3,7 @@ "world_to_cycle": [ "/", 4 ] }, "clips": { - "moving": [ "apply", "botania:block/crystalcube_cube@moving", "#world_to_cycle" ] + "moving": [ "apply", "botania:block/corporea_crystal_cube_glass@moving", "#world_to_cycle" ] }, "states": [ "moving" ], "transitions": {}, diff --git a/src/main/resources/assets/botania/blockstates/corporeacrystalcube.json b/src/main/resources/assets/botania/blockstates/corporeacrystalcube.json index 16f37dc90..8f918bf35 100644 --- a/src/main/resources/assets/botania/blockstates/corporeacrystalcube.json +++ b/src/main/resources/assets/botania/blockstates/corporeacrystalcube.json @@ -2,27 +2,27 @@ "forge_marker": 1, "defaults": { "textures": { - "cloth": "botania:blocks/crystalcube_cloth", - "base": "botania:blocks/crystalcube_base", - "cube": "botania:blocks/crystalcube_cube", - "particle": "botania:blocks/storage2" + "cloth": "botania:blocks/corporea_crystal_cube_cloth", + "base": "botania:blocks/corporea_crystal_cube_base", + "glass": "botania:blocks/corporea_crystal_cube_glass", + "particle": "botania:blocks/corporea_crystal_cube_base" } }, "variants": { "static": { "true": { - "model": "botania:crystalcube_base" + "model": "botania:corporea_crystal_cube_base" }, "false": { - "model": "botania:crystalcube_cube" + "model": "botania:corporea_crystal_cube_glass" } }, "inventory": [{ - "model": "botania:crystalcube_base", + "model": "botania:corporea_crystal_cube_base", "transform": "forge:default-block", "submodel": { "cube": { - "model": "botania:crystalcube_cube", + "model": "botania:corporea_crystal_cube_glass", "transform": { "translation": [ 0, 0.5, 0 ] } diff --git a/src/main/resources/assets/botania/blockstates/manadetector.json b/src/main/resources/assets/botania/blockstates/manadetector.json index ade96b44f..250e84383 100644 --- a/src/main/resources/assets/botania/blockstates/manadetector.json +++ b/src/main/resources/assets/botania/blockstates/manadetector.json @@ -1,6 +1,6 @@ { "variants": { "powered=false": { "model": "botania:mana_detector" }, - "powered=true": { "model": "botania:mana_detector_powered" } + "powered=true": { "model": "botania:mana_detector_activated" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/opencrate.json b/src/main/resources/assets/botania/blockstates/opencrate.json index 4583f474c..0027f2451 100644 --- a/src/main/resources/assets/botania/blockstates/opencrate.json +++ b/src/main/resources/assets/botania/blockstates/opencrate.json @@ -1,25 +1,25 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:orientable_vertical", + "model": "botania:crate", "transform": "forge:default-block" }, "variants": { "pattern": { "none": {}, - "crafty_1_1": { "textures": { "side": "botania:blocks/ocpattern0" } }, - "crafty_2_2": { "textures": { "side": "botania:blocks/ocpattern1" } }, - "crafty_1_2": { "textures": { "side": "botania:blocks/ocpattern2" } }, - "crafty_2_1": { "textures": { "side": "botania:blocks/ocpattern3" } }, - "crafty_1_3": { "textures": { "side": "botania:blocks/ocpattern4" } }, - "crafty_3_1": { "textures": { "side": "botania:blocks/ocpattern5" } }, - "crafty_2_3": { "textures": { "side": "botania:blocks/ocpattern6" } }, - "crafty_3_2": { "textures": { "side": "botania:blocks/ocpattern7" } }, - "crafty_donut": { "textures": { "side": "botania:blocks/ocpattern8" } } + "crafty_1_1": { "textures": { "side": "botania:blocks/crate_crafty_pattern_0" } }, + "crafty_2_2": { "textures": { "side": "botania:blocks/crate_crafty_pattern_1" } }, + "crafty_1_2": { "textures": { "side": "botania:blocks/crate_crafty_pattern_2" } }, + "crafty_2_1": { "textures": { "side": "botania:blocks/crate_crafty_pattern_3" } }, + "crafty_1_3": { "textures": { "side": "botania:blocks/crate_crafty_pattern_4" } }, + "crafty_3_1": { "textures": { "side": "botania:blocks/crate_crafty_pattern_5" } }, + "crafty_2_3": { "textures": { "side": "botania:blocks/crate_crafty_pattern_6" } }, + "crafty_3_2": { "textures": { "side": "botania:blocks/crate_crafty_pattern_7" } }, + "crafty_donut": { "textures": { "side": "botania:blocks/crate_crafty_pattern_8" } } }, "variant": { - "open": { "x": 180, "textures": { "front": "botania:blocks/opencrate1", "side": "botania:blocks/opencrate0" } }, - "crafty": { "x": 180, "textures": { "front": "botania:blocks/opencrate3", "side": "botania:blocks/opencrate2" } } + "open": { "textures": { "bottom": "botania:blocks/crate_open_bottom", "side": "botania:blocks/crate_open", "particle": "botania:blocks/crate_open" } }, + "crafty": { "textures": { "bottom": "botania:blocks/crate_crafty_bottom", "side": "botania:blocks/crate_crafty", "particle": "botania:blocks/crate_crafty" } } } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cocoon.json b/src/main/resources/assets/botania/models/block/cocoon.json index 1f13c87b4..2d6e993ed 100644 --- a/src/main/resources/assets/botania/models/block/cocoon.json +++ b/src/main/resources/assets/botania/models/block/cocoon.json @@ -1,13 +1,13 @@ { "parent": "minecraft:block/block", "textures": { - "bottom": "botania:model/cocoon_bottom", - "top": "botania:model/cocoon_top", - "north": "botania:model/cocoon_north", - "south": "botania:model/cocoon_south", - "west": "botania:model/cocoon_west", - "east": "botania:model/cocoon_east", - "particle": "botania:model/cocoon_east" + "bottom": "botania:blocks/cocoon_bottom", + "top": "botania:blocks/cocoon_top", + "north": "botania:blocks/cocoon_north", + "south": "botania:blocks/cocoon_south", + "west": "botania:blocks/cocoon_west", + "east": "botania:blocks/cocoon_east", + "particle": "botania:blocks/cocoon_east" }, "elements": [ { @@ -20,7 +20,7 @@ "south": { "texture": "#south", "uv": [ 3.0, 1.0, 13.0, 15.0 ] }, "east": { "texture": "#east", "uv": [ 3.0, 1.0, 13.0, 15.0 ] }, "up": { "texture": "#top", "uv": [ 3.0, 3.0, 13.0, 13.0 ] }, - "down": { "texture": "#bottom", "uv": [ 3.0, 3.0, 13.0, 13.0 ], "cullface": "down" } + "down": { "texture": "#bottom", "uv": [ 3.0, 3.0, 13.0, 13.0 ]} } } ] diff --git a/src/main/resources/assets/botania/models/block/crystalcube_base.json b/src/main/resources/assets/botania/models/block/corporea_crystal_cube_base.json similarity index 100% rename from src/main/resources/assets/botania/models/block/crystalcube_base.json rename to src/main/resources/assets/botania/models/block/corporea_crystal_cube_base.json diff --git a/src/main/resources/assets/botania/models/block/corporea_crystal_cube_glass.json b/src/main/resources/assets/botania/models/block/corporea_crystal_cube_glass.json new file mode 100644 index 000000000..000a6e805 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/corporea_crystal_cube_glass.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#glass" + }, + "elements": [ + { + "name": "glass", + "from": [ 4, 4, 4 ], + "to": [ 12, 12, 12 ], + "faces": { + "down": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] }, + "up": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] }, + "north": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] }, + "south": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] }, + "west": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] }, + "east": { "texture": "#glass", "uv": [ 4, 4, 12, 12 ] } + } + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/corporea_funnel.json b/src/main/resources/assets/botania/models/block/corporea_funnel.json index 6444c4010..0e710354a 100644 --- a/src/main/resources/assets/botania/models/block/corporea_funnel.json +++ b/src/main/resources/assets/botania/models/block/corporea_funnel.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/corporeafunnel0", - "top": "botania:blocks/corporeafunnel0", - "side": "botania:blocks/corporeafunnel1" + "bottom": "botania:blocks/corporea_funnel_top_bottom", + "top": "botania:blocks/corporea_funnel_top_bottom", + "side": "botania:blocks/corporea_funnel_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/corporea_interceptor.json b/src/main/resources/assets/botania/models/block/corporea_interceptor.json index 08fa3fc95..7c1c27a40 100644 --- a/src/main/resources/assets/botania/models/block/corporea_interceptor.json +++ b/src/main/resources/assets/botania/models/block/corporea_interceptor.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/corporeainterceptor0", - "top": "botania:blocks/corporeainterceptor0", - "side": "botania:blocks/corporeainterceptor1" + "bottom": "botania:blocks/corporea_interceptor_top_bottom", + "top": "botania:blocks/corporea_interceptor_top_bottom", + "side": "botania:blocks/corporea_interceptor_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/corporea_retainer.json b/src/main/resources/assets/botania/models/block/corporea_retainer.json index ad0bef12e..881bbd41c 100644 --- a/src/main/resources/assets/botania/models/block/corporea_retainer.json +++ b/src/main/resources/assets/botania/models/block/corporea_retainer.json @@ -1,6 +1,8 @@ { - "parent": "minecraft:block/cube_all", + "parent": "minecraft:block/cube_bottom_top", "textures": { - "all": "botania:blocks/corporearetainer" + "bottom": "botania:blocks/corporea_retainer_top_bottom", + "top": "botania:blocks/corporea_retainer_top_bottom", + "side": "botania:blocks/corporea_retainer_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crate.json b/src/main/resources/assets/botania/models/block/crate.json new file mode 100644 index 000000000..880b2cf21 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/crate.json @@ -0,0 +1,16 @@ +{ + "parent": "minecraft:block/block", + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "texture": "#bottom", "cullface": "down" }, + "up": { "texture": "#side", "cullface": "up" }, + "north": { "texture": "#side", "cullface": "north" }, + "south": { "texture": "#side", "cullface": "south" }, + "west": { "texture": "#side", "cullface": "west" }, + "east": { "texture": "#side", "cullface": "east" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crystalcube_cube.json b/src/main/resources/assets/botania/models/block/crystalcube_cube.json deleted file mode 100644 index 6170d379c..000000000 --- a/src/main/resources/assets/botania/models/block/crystalcube_cube.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "textures": { - "particle": "#cube" - }, - "elements": [ - { - "name": "Cube", - "from": [ 4, 4, 4 ], - "to": [ 12, 12, 12 ], - "faces": { - "down": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] }, - "up": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] }, - "north": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] }, - "south": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] }, - "west": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] }, - "east": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] } - } - } - ] -} diff --git a/src/main/resources/assets/botania/models/block/islands/island_grass.json b/src/main/resources/assets/botania/models/block/islands/island_grass.json index 55fd69aaf..29045eda8 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_grass.json +++ b/src/main/resources/assets/botania/models/block/islands/island_grass.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/miniisland", "textures": { - "top": "botania:blocks/islandtop", - "side": "botania:blocks/islandside" + "top": "botania:blocks/island_top", + "side": "botania:blocks/island_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_detector.json b/src/main/resources/assets/botania/models/block/mana_detector.json index 01b5e2d76..9d247dcfb 100644 --- a/src/main/resources/assets/botania/models/block/mana_detector.json +++ b/src/main/resources/assets/botania/models/block/mana_detector.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/manadetector0" + "all": "botania:blocks/mana_detector" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_detector_powered.json b/src/main/resources/assets/botania/models/block/mana_detector_activated.json similarity index 54% rename from src/main/resources/assets/botania/models/block/mana_detector_powered.json rename to src/main/resources/assets/botania/models/block/mana_detector_activated.json index 2b69bb7d1..3c7e60f68 100644 --- a/src/main/resources/assets/botania/models/block/mana_detector_powered.json +++ b/src/main/resources/assets/botania/models/block/mana_detector_activated.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/manadetector1" + "all": "botania:blocks/mana_detector_activated" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/turntable.json b/src/main/resources/assets/botania/models/block/turntable.json index 9fbef02b7..636e11069 100644 --- a/src/main/resources/assets/botania/models/block/turntable.json +++ b/src/main/resources/assets/botania/models/block/turntable.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/turntable1", - "top": "botania:blocks/turntable0", - "side": "botania:blocks/turntable1" + "bottom": "botania:blocks/spreader_turntable", + "top": "botania:blocks/spreader_turntable_top", + "side": "botania:blocks/spreader_turntable" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/blocks/cacophoniumblock1.png b/src/main/resources/assets/botania/textures/blocks/cacophonium_block.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/cacophoniumblock1.png rename to src/main/resources/assets/botania/textures/blocks/cacophonium_block.png diff --git a/src/main/resources/assets/botania/textures/blocks/cacophoniumblock0.png b/src/main/resources/assets/botania/textures/blocks/cacophonium_block_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/cacophoniumblock0.png rename to src/main/resources/assets/botania/textures/blocks/cacophonium_block_top.png diff --git a/src/main/resources/assets/botania/textures/model/cocoon_bottom.png b/src/main/resources/assets/botania/textures/blocks/cocoon_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/cocoon_bottom.png rename to src/main/resources/assets/botania/textures/blocks/cocoon_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/cocoon_east.png b/src/main/resources/assets/botania/textures/blocks/cocoon_east.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/cocoon_east.png rename to src/main/resources/assets/botania/textures/blocks/cocoon_east.png diff --git a/src/main/resources/assets/botania/textures/model/cocoon_north.png b/src/main/resources/assets/botania/textures/blocks/cocoon_north.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/cocoon_north.png rename to src/main/resources/assets/botania/textures/blocks/cocoon_north.png diff --git a/src/main/resources/assets/botania/textures/model/cocoon_south.png b/src/main/resources/assets/botania/textures/blocks/cocoon_south.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/cocoon_south.png rename to src/main/resources/assets/botania/textures/blocks/cocoon_south.png diff --git a/src/main/resources/assets/botania/textures/model/cocoon_top.png b/src/main/resources/assets/botania/textures/blocks/cocoon_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/cocoon_top.png rename to src/main/resources/assets/botania/textures/blocks/cocoon_top.png diff --git a/src/main/resources/assets/botania/textures/model/cocoon_west.png b/src/main/resources/assets/botania/textures/blocks/cocoon_west.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/cocoon_west.png rename to src/main/resources/assets/botania/textures/blocks/cocoon_west.png diff --git a/src/main/resources/assets/botania/textures/blocks/crystalcube_base.png b/src/main/resources/assets/botania/textures/blocks/corporea_crystal_cube_base.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/crystalcube_base.png rename to src/main/resources/assets/botania/textures/blocks/corporea_crystal_cube_base.png diff --git a/src/main/resources/assets/botania/textures/blocks/crystalcube_cloth.png b/src/main/resources/assets/botania/textures/blocks/corporea_crystal_cube_cloth.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/crystalcube_cloth.png rename to src/main/resources/assets/botania/textures/blocks/corporea_crystal_cube_cloth.png diff --git a/src/main/resources/assets/botania/textures/blocks/crystalcube_cube.png b/src/main/resources/assets/botania/textures/blocks/corporea_crystal_cube_glass.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/crystalcube_cube.png rename to src/main/resources/assets/botania/textures/blocks/corporea_crystal_cube_glass.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporeafunnel1.png b/src/main/resources/assets/botania/textures/blocks/corporea_funnel_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/corporeafunnel1.png rename to src/main/resources/assets/botania/textures/blocks/corporea_funnel_side.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporeafunnel0.png b/src/main/resources/assets/botania/textures/blocks/corporea_funnel_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/corporeafunnel0.png rename to src/main/resources/assets/botania/textures/blocks/corporea_funnel_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporeainterceptor1.png b/src/main/resources/assets/botania/textures/blocks/corporea_interceptor_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/corporeainterceptor1.png rename to src/main/resources/assets/botania/textures/blocks/corporea_interceptor_side.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporeainterceptor0.png b/src/main/resources/assets/botania/textures/blocks/corporea_interceptor_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/corporeainterceptor0.png rename to src/main/resources/assets/botania/textures/blocks/corporea_interceptor_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporearetainer.png b/src/main/resources/assets/botania/textures/blocks/corporea_retainer_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/corporearetainer.png rename to src/main/resources/assets/botania/textures/blocks/corporea_retainer_side.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporea_retainer_top_bottom.png b/src/main/resources/assets/botania/textures/blocks/corporea_retainer_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..76d5e528821fc8049a3fd4bfe89e29ec0d8127c7 GIT binary patch literal 907 zcmV;619bd}P)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ<5lKWrRCwAX$JL19}YB`%1G&ht^k|m^Bi8k~Eni?>H zBltr=R00$XQQ$`qbP!Mz6_C6D-topc)Y@9Pwe`?LZ}rqu^7YX7_CALji(l_B^N0sOaPA6`8m8Tv|%}FG< zdW#Da3|*vmfU$46+s)NszV4wuo)oz^!s)N(d=qkal#2XNabBosOX$ECq4MHRGxwR8 z;PFos6oy95&~b{QowFjB#_2ghc$B=&o$AXt9_MTe6K6@B;o22G+87u*$G|xG`JwJE zs!Nk1iD~vVvnD%K)XDA!GL{9Rs{2R_~uc+&s3-aa;c5}0~0r!W?3ZRKD*DKc=A zqBf59Q=cH?tw3drvfVT`a&Cy+4S}|PqB()yi*yWdJ4Nxqq{zcbnmX8973vwFxtv5X zhn|~f<>HuCOJXKpSfHzq6NP^NaR&Ec~^|7@!B@*5sYd_Hqp~Pu! zCW*csXlbWzkeoB@>EXhuf0Xo)xihq7yAxB6ggNGO2D~ hN^|jJ?b}ZJZvZ~J+(L5NWK;kE002ovPDHLkV1mQdrf>iN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty.png new file mode 100644 index 0000000000000000000000000000000000000000..a4d986f2559677bf94573bf80c5632219a0fd743 GIT binary patch literal 15632 zcmeI3Yj6|S701^klQ=F9x46dPQ53l~7%c7TZEa*xW0}|(Ir5|U5lXyTt?Z2@tt_pP z>^2<&1_CX4U}BPilG=$wGn1r4QlPDyVd4-Q!oz7iCd3{fai9M>((ZiH97M9YDwY1(QU1m%$_(>q(WOz#AcRE~N(w`*_ z=#t>KFpNtjfhl}#mNZ*PC@D8vBsrXik!a*v8BJ()5}jVI(CBn(U4}$SC^R^s!c~M! zsUp<`sa8rtFR3vB{4#iKcCy&CB9snTS<)Jwcau2o^ZDdHm7Mcb;|jfAj}uB%xwKjp?1 zasrPPWTV3|?s|_SurwQuGY-bdxOgv!Q^bsO*Kj=Nt>Gp~8Fo*a7}UgU4(E=!UZ*o= zYA>I=4j>32jTz}JZE!PqG2`XxJv5WM4qQrVtgGi)d!#tylmySDYiIoIBw>Ol7#7$H z!3r6`wURj=hT=I-DaSdC!ChtK##IOcc);!G6@q zh)kJ6S4!wfrJhu2ml6t+AfiNqGa(H#XJhRR<200-QbI|pwIrd5)`*%3Yk>Z-Q9Lyz zmFT%qIyRcLa~>zf8(Ak+&ERfVwE>R|M$HWGDl&(2a2~KM#;7vjv4*3f0y~Y&cX@fr zMKk#(BN&jgtc|qVZ8j^R)5`1`hL&X#YD%W3wTz4*l$kc2f@WwX6@X|qM~6?4HgR;l z&@CZp8<3{8lwGT#fwaPEmFcuG^NxNdaczyCLI+%LHc123r;%95j96x z{lA+chRlRid8`-g&xWXd3wCedEGuE^#*dCU9BklBa#J2JBXnGrbgbpVhgkTG5@G_K zOH#COni*-KAsCwhA2%9VRyZ;g#!f8Y)F=n_qrxZ8;j3X>sD=tk1!hey;^pkTkMc0t z)nHFdrPqV1H1z2j=Uw1bE>J;WHE( z?S?}u(4o<8I5ZOZ6Bo-Hm7#3Va8#7=pBX&ROTg_NW7KLiDvbe$hv5hd>t`J0CKjB$ zUg11ZXhSiuBW7U5WPwqRP++iBQ8!|N9t@6x+dOcGiHC17C$wky6#F)RM6T%DRE4y} zBoGj^DdIx&fxIFv2ngB~aiRG@UJ(}r1Z|4A(0m}ThzkOOHbq=$K9E<$1pz^uA}%x^ z$SdN4fS^qg7n%>`6>&j8(58qB%?I*|xF8^CQ^bYl19?SU5D>H};zIL*ydo|L2-*~J zq4_{w5f=mmZHlEHpiL1Mnh)d^aX~=P zrics82l9%zARuT{#D(Sqc|}|h5VR@cLi2&VA}$CB+7xl2`9NL~7X$=tin!2xAg_oE z0)jS?xDp}{Z89$Kq^1u%l6j(OUn_W=Q$ptzn=!2MM;Nw#BZhrF3cf$buzCW+u2f+d z`82I}@tuj-M|JU?&$OJ*FRDzhtZZJrZR3_%`#&v9yz6JT_5Ls7 z@gK;gO+Q|lzi%M7Jh|)nmov9bKPYRyJ#>h>cISAR>7~9S_4At&{r7&QQmajg_nay2 z+SFB5kZ(EPrfcqM*>M0rfArGuKiZY)uWPbXcD$M4d0d}X{mT6d7N#mUzxv0D72Vy~ z9~zxceWxt#$zQehUTxdiId8tCedo$9e!;HSi7MZXtH(-iF1;{+*N9#A!t~#K((t5% z+&Gl!@O5B@N6U}2eD9H!Ey>CEb*^8V-e4GAe>7!HH(2OMkEi6pv*fR5VlRD0uR3}1 z!`gyV4;Q*WegE!(fq^|8{IkbZy~lbe_Y>+%@}K@txp}yGHb^_oJ@Uo;t%=bx!dI=D0b_~1bQ zlFHhqa~E&EIJE4yxBHH~Us=1enE%sRlO0PR{ag0p_DsF9^Ul7fU+sHr^v(*&Uw(dR zkGcBt{*1M8){DIf^M0}EW}jxynwF=p+|^h7!av`MThrY-cpC$CSyZ^)a{cjyz1<^M g=I-uWa`;{>u5R(JuW1u_ni<3La|=yxEU((|FRCwa#{d8T literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_bottom.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..c204e772130850b0ab7a8b382b4dfa6c48b71ce6 GIT binary patch literal 15075 zcmeI3e{dA#8OJw)B4!F?sE$-CE*C_E-0kjN?v7h8hsj;+9h1ZKxDJV0$E^CW#sAmRI5yPEeXfODdiKYJzajP9-?LRn*C5u|<-r zP3QL>Fp-i_ZJKWn(!qpRj7t7aRh-v3H_Ugo@-D$N+f(LFu^>TQ)HyO0kI5RFsy3zb zvLH5^DHEBN=&jYJ8lxcD7;GTDiYk(Ji^I&*4kzh!Ss1(1S>>!Gtu$k&Xd7jt%~l&* zMYB~_GW#)k%0T2+g$Nt+J(Mj6{;D=bbv?mSR5F>gByAQ&ZJ`*K%SF*v%4#(Og<0#6 zbuML=wTeuV!8|@u<5el4ONvYydAVk#U9UEoj6%6j_P*kYTp?M@vI7*U6qleF3r!U> z34G3zXjfzDp$R-C#>BWN>l*MeMSY2=qAOZd8KGpZd&I(EPJ+Q)?V{t2$BUNM^ty!r zK^AFIrxxx=h*U__ly;RD>lT7rsVH{$x)jMz&X7z-&xm6eQ_=`FqbFlaFNMquxxu}% zURC6DMGY%T%#&GV4TA_tuQ$D_$m#PXSx}PN{cftzlArH!1+QYP!wK-X)3eEv33v+<|BXBzRm9oHED38Fi z5k-x2x<`t0Eh3eWTijH>5mM$>73)=EiVB7$dTeg0STp2GuQWCwYdRP+_;zErWK#=YGc{x% zmil2;0w*08gEYqIzix>lX@-^ZOBz_89niW3t2cd?%@f;(whng0r1Y7T;8aaCc3ib- zaLeTmvD_JDc+xwU<#^*X^YF%oFaQr}%?~T*%-W>?cLFo{A^XTRl2K8<*@nubN~=ar zqA3wQ$*E#Z3s@6hWv^$l4z(4gcT>jcACrboM5cA<{0y$x;q&P>4mB361u!lyJqL`N z8rGJtoY6NLa~f+;>s<~Sd??2F&068^LTl5_t#EgtHShePEa@I=wpu|mnZFgYHS+G2z6wQnW=*Qou_9q(+VCI zz;g2ML41~SIDkceOb#s$+r#uyh85iG#CU>e96<3b{W z1sE4h0~upnNJOvzK*kss5)mxGxL_K{7~?`Bf&~~COamEXTu4N)0ONvbAY+UR zi3k>8Trdq}jBz0m!2*m6rh$wxE+isYfN{YzkTJ%EL<9>kE|>-~#<-A(U;)Mj(?G@; z7ZMRHz_?%<$Qa{7B7y}N7fb^g-xOC_{?$KG2JibN!Ha#P4s;ps5|X?>6eNhwdkJDm z7eQRR0j>iC(M}V@hYJXTT~82qDBX|$=^=tBbp?Di;nYcC)h^|)58n3H;$uCJ_HVjv z=CVM^Z|X{JEvadK@<~h21EwnzyyB8&-&$7kgJ)!M%x2SQZ<#q%x`v#pcE2`t{~J3f zE*i5BY+QVP|M}C`Pd|G34doc6ut8Wt1w?rKqH}&@Zt7G!H+LfC> zKeHlv>eSKr;(vU1_D^0tcy8OzSG$+jloKno?~SQ>@RjzH!pyo??5~9?AA9`e{^SZ^ z*|PEW$=iST{+kvMFPb$~X_{Ox7$N=Dv#8* zK5w5r;SYx=P2Rb4_xw}AYrohqy#x&E#H7A;tGjOyH%+F z?fTW_-6tk(UVZe^i=$bVEhS&zHFMoMp-{~g~kz)_L#@}*f%n|2|JLH$DI{f!P9iG#+^^q;%8EvmW z(zE}qJ@zGfe_-jQg=<|?PL!VQ+j@8BqG!80N3~3O=awtI^0r{xuKK>Ve}DGnd(57b l13dsoS7+BDdEJds#Pffv7#O!CAQ`Wr2I}VecGNC->VMl=zWe|H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_0.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_0.png new file mode 100644 index 0000000000000000000000000000000000000000..bda2aa5b23785f78086233410fac91ee09e49bbd GIT binary patch literal 15357 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_2.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_2.png new file mode 100644 index 0000000000000000000000000000000000000000..ff391056017f7700e012b37078281160c2fe4338 GIT binary patch literal 15830 zcmeI3Yj6|S6@b?i5-@>b%0O^nKo#NPz-m`-YmsD(jbnQ(9>R56E3|7% zc7XC2k}@r13?U(u0j7y3HKc*YBo1YWgJaiqO#{SjlR_r6WN=DS90P z+GM7Gc4wsBbI(2J-20t-&+ebQZN;*uC!{}-j$zn@!h$>}xKEOQV;=$kvj!i~;5N=* zP%dKF#7_B_wtK@6!IzXtWsYKs5xg3j6lTy^5 z0?%?Yp;m>vNVPU~jvP=`=2)T16#|^fs4?LTX)>$K7LC?uHXFCvlyg zGLV!(r;1)`dpdZs23R-c%*&641CmW$BT0UWAcDc5CaBj4foei)u~-OFN9c4o=z)t3 zK8X(DK5=%$Nz6|kCo%!vFY$s;CHtjaLY-t&tK~rPD>^T)KOV>@M%e+1M2PkiS`A60 zGGdvyjlVA72@j2B2+qTKIiDl~J8eoke~lmsVvR6D$hdmMz#u0MM?7}Q@p`=}LyOYV zdVnB`G^M3j(%|O^CnpMZ0ft*z52i9Z)$AqSok-3QPqJpjv2!7Q1T$F^F$*t+NQSIn zu2gP-qa`6wA_yLPWRl5c zLrh8%NL6^_E}^T3w#F15-VTzYVR@EfOtjl%WK6hQ>vG{{lfi|%^ja2VLC4TK3u!UA z+*U%~uD~cU64_I@b!d#_37|$OC*I+p3VotPg9#Mog~!8#@fa;x92kllr&+xPw^$4$ zZqagXT*nyQq(NuNqO)A#)iBgNF|w%ZSoElCd8!6imdUJTSlngK(&GlL!Hm1;EDP?| znN6(GWa5AnbDd;9%=PjB4@x%eN$L}$`QL;{;bvH<0$$E-0|Z{q#wu>@(AGq5!^PE4 z2SiRT9X55WcEqbO=o-JQ;SxmAj9ixOjJ&fs)=CU%O$-Y*k(sRn!IVTxA7>rgY;ed>Jy7=?GAhyNCd5b64FmxhPiNB?UY zQWV$!Um9fKk?2ef?W^WkI}uyJv4)4sTqK`EcUG(*4Bv@X`MpYkT?|$f9o{`!D>1As z5joPoOx}&2x^RDsi3As+mH(rr$!gfN9BrDchD{Tet9`s=*F~d2%}G}B%RlmFS_QsS zIlIYd)Elh?+zeZ+;6t3JERP3oCQ+^@T2s^pR-`m6AIUID5jBjYD(Q1`UL5m75G#^N-;DUglMFkg{52RIaK|s)= zf(y+D(ki$hAZSs+h2{fk6{k7t z`_{?7yyvYi9($~4_OS)pSNd0o{+^thzj*w)L#l!Y2R4`0*q&;fG-_s`rl84r$o6{C zlU1)R8P$CBAJmDSxr_9R2Hn-&xo_ugzJBxGz;o@l?`^nv`=0)M_X|t?>pIDdbH29Y z8@x@|=vi3ioU8ReU)XzN{ek1Xt;J`^jDb+?c;@RDuU`6F>6*d*4(o)A^M0nrtj%Lz z`^l3#dgqoF?acb^?wyB)_AdJDhkH+0d;b)C>(}CS`;PKctqVW4c559S1MhieUY>mD z%dZY+Z#a`p+&=nz&)DUeGg>?R4cpFljQV1J=cG|-Yy~rZlihymm%pj`fq(z~B_}KA z{atG5Tw6SC>8H=1Iz3&#?pD{ApHXdk&nqxn*U>g(WNZ?VkSri>t-Mp`xZKV>CDVg4tE$H{qk(ZdXp; z;hE7i*mKSP>bnCk9V8u>TF?Bd_=V=Xqc=WNi(mWfo9}l|ee=lYtk~Sc>W(jdw2GXz z&rTNSV_EL4hQ4Rp*KS$XCT{9D-Q1Y*#;cDUtUNL~|6Jx6>;n0_WBnH%y;wCq?Src) zKY9JQx^M40)r(G>p2(Uq|D)oUI|nkiR!;isp1D`%(}N#Qo!mIPn>Kr=U9PMB(S;3%&Q-i})HdhNoi>}bZrsK{ z_g!pxY8(E6)^Xqd>AW4xn|Jno()E$1tG9jrKlgPQ3Z2^nqxt<`OdT`kU>aS1`R#IN z(dR#`xU}WKEbX+%?ze4U+;Z1&eo=cLSHEH6 z^328@Z1LGEAFmU(RZcp4V}0e-S^hs>AH0ZRY1t)4|62LrHCDKES>9Vqsy6=z!g{5M literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_3.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_3.png new file mode 100644 index 0000000000000000000000000000000000000000..376d6c3406e6018545b74828f582bbab0fc292c4 GIT binary patch literal 15383 zcmeI3e^3)=8pl^lJ;drz2es33LyV)~K-l~szqTQW1SEPv1e`*LdTf$SSV*!l8%m&7 zom0>1ozznGgjU;v$W+=B&#AR%{eh)&cN9C8J4CcprrddI>FIfGk5bCLn}qy$3GcKw z{d0FF**x#_KHukkKhOKV*?)Fde%`9NF^|V!7&cd*t1AHaSnd-&3w$R$m>|JzwllYc z#jtsu+-JuA(P^wcUa-}j&nIe#iC30LW!)0QT zR7RwUi8QIee+jiQ;Frc_wh#rn9Dh1sr3=g5ZYP1`)z#Ih)v{E^WyK|GwHg;oaj8@U zdWhH>hnw_>9PARG$fS;rVofgE>82TnfYT+7OqDxbDC80aF8{pj&Ojmu>t_cj;vUk8 zOH##nq#&~?5aX~akbhXm^#RHJmHo6>^y zs1%7+B8jp{tR|#tLZ(O-O9-(zM8ww<(l9V)+ENpyA(a=2rG#8TNWwHidcqoD|CmWP z`GZtK`-bS4O@xJU*-5vSwv$#0cRH*ZJlGi0Gq9?NEXKyTz_2K-OoK;iju@q5OjX>n z&UBb478HXGDH14^cjK-kt>LYc4jZinMM*W&X2PT(Eeg3wA+kt}Mv+pHW)vA^5;LfR z)I>_vVzt6((cs*61wp})a7y0R@EoBNK#hmV`*SctMWRtd# zK9e+mOo|9HQ&Q#9Ty1M0@LV+tsg2>S!PkI>{y<*=L!L{#Tgul8o_fFo7an-xnzGvhd*P@25uDLasS0WF zNgyC-lgEYT19^E|5D>J<<3jU+ygV)l2-@Uvq4_{w9v1`zZSuI#d>}863j%^Rd0c2d zke9~=0YRHQE;Jv=%j1H8piLeZnh)gVaX~=PCXWlv2lDc`ARuUy$A#ttd3jtA5VXnT zLi2&VJT3?b+T?Me`9NMC7X$=t^0?4^ATN�)jSqTxdR!m&XMGL7O}-G#|*zK|s(Zj|w8`T_^MSlPE(i$PpyhT_PhRu6c)QDDj~Fko2iQViR=4Z}t!!2LFcRf#d|P8o&~ z2Qh3BQ~%2kb1-b?5xp+6$TMJj`QyqPIdNSXPwSVA{I;*8tF8aB#sjL@Q>V{$?(E!| zqTN3H$%cW#IXm`FwB|QvU0$q?Dy_Zu#-)~hdlP<^*wL|9HM>7H<~Prb3{)OJvOlM7 z{k*ybzZ*U@c<&!)M>pRZdp>8Z?0EFNuWu(lG%%uAbh)Sf%+-fitk$3TbXm7_(`VLy z|0k;J%Gz1qz4OQ2C%!eleR}*Z^J>H4rlGOz>!P-{#*uL^b#A;iyjnlM>vVzZ>o)w_ z9HRK;)fPf@s{eSUKM|!XWJ&-SGwnizJF%$+(74@#D_F3&W~co z-z%x;?R}&r5AuE-D_ml(*;p_{SL= z=@Z#Ugx?z3&g(Z!drGgQQ{etB)V=olCS& zB<#eM?K_ex=YH08?7j7xmOt&Dx#+*2Urx6zZr^e9nw4YX!qOQZ+)cfzWUtR!7E!gOR)=*YZYV}fF0Y0rX&z7%b#wdu-*H&@*6 zFze$J*8MYTMjc&0ufBfeQTduVi%Jf^vV47U#pW3+RPhCDn{Ma$l9(@NFV(K)$f z>i_k+4e!?3uN&k~Z`nSwyyGkDE1rt@t$o{W747d_c=O;g=G40{eEwLncBtyaxy<`_ zA4kliY-q)D$TBT#b2Wcg< z-g>9C@{5OmK4`Z$U#if&^y2L=zmQ7gyISK82{1wbwU*JIltY5ohsNH&K43Y2{qN)0 YlZ(^kio|0>+^f6#>^$A?SC;+ie}?ZZg8%>k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_4.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_4.png new file mode 100644 index 0000000000000000000000000000000000000000..448396a8d1fb72bc48d67443bd2503d8c7d8cc5f GIT binary patch literal 15397 zcmeI3e^gWF8ON_orp+19T36c6*%)gJmE_+1PHsaG2m+1(<%flyL(9$04ctSL8*(oY zD0FsR*IBh%sXbb1>x#I}wYJtx?L26;PO4qY8E%eEE1g=bJ*$*Cf1s=Ey-7&IOL$Ma z(?9P$Bsb6dywCS}-_P^DFZZ9jva~oqNp`mk!?2{n0$Ull-zt7)e;<6`b7`Ccw_AJ# z)jWnJ9~M6|HY`s55r&z*WGkwKDti%0a~>7t424~s22nuiQ_FTEvgo+iu2duYO~pl6B=BjQGy;y zzSS#G0i~B;7!sM#u`xXDXMF<8dF7%m<=~oxOoc*B6uH9l^7tZ&ynL7)poj-3AFfsr zc)TDd9f|QZ`Q5>xIcc16Gakk(@E}edH_lhj2^?R~O_MU>o;ES4iQOK_9e2DQPu$eJ zkk@|wX^7RH;sz`CNvnWQ9orX4#IV5bQaJ)yARQV3PZ z0_IBQ`WZ^#{1qJMwuV+&=>$S~Zfj1{a$qmnQw z)y4|KOlr)e*07jRlLQeX66y(Q*f}TbYMrE^(N_=}Qm+Spu^KTwVGXcb8~($EXJy};PIN{M%g&JNnF<1UYg-S zG5DAwfl>uGZVpv9xpl(fX04zoDktkCX#?dl=xKw}rFJ-!MuX0wbZFI1Pz4Q5Y0QM# z;BZ-Ral3+`=txARVC&=@u@gXzP%OONP8NE3fdUgKv<1h*g7Ii|goZF0wMq&MK&hs5 zI;F$OP+&=bc9TIMr_>9TPr9y2Q_dBb#!^^qHXfZBoRM znUbo26>HlHffuV$&NNPLjn+1JxcVqR&xl7yrefmkh@8ftYvi&7k06qw#ben@i#wZf zTJTA&(P6=1?EhQ9kbX?~^f_AU887N&2uTHdO)tW8E}@0;Gud@u&wP_ZE2KI(43 z-Ee3$veL^6R!uk?)EpBf{tF46Z{^@=hp`&;dad4q!_9C+DH~wiRW=r!Z@joF)rN2k z?1&p!JzZdoBODkiV9aw#a7%?+!BY=-;KCzMTvK*iWG{S|KcX}GE>$5dDG3AwZA!S% zd?2rc3j%^RC0uAekXOP50YRG*E;Jv=E8&8GpiK!Enh)faa6v%Ori2U42l7g|ARuT{ z!iDAoc_myB5VR@bLi2&V5-tb`+LUmi`9NL?7X$=tO1RK`Ag_cA0)jRrTxdR!SHcAW zL7NgTG#|(-;evpmO$is859F0_K|s)^gbU3F@=CZMAZSyKwb$K1O#nLxX^qcuY?N%f;J^wXg-iv!UX|An-VTGAIK}=f`Fh+BraL> z9Y)3rUR-PeZzyhlVci+#m&sd(+8(=@!&(SYE&9@P1v2J|$^1FY$+m zt<`D2952b9`^MTkZpgP@TQ@7$w)NWC1-oqth6nB~m3_ElSC{)8?JjLgb94Kk^QD0s zLh||ck=~(8U(fIE*!$SbXJ-AN^R_RWyMB_Y8u(=7d-9&GpLjc&yY`Q0A8-Cer?zP6 zfA{Wua_8uISL4-7xXGB6fBfn#-LtWh^h0Tim1pOiTUI!yZ*Q6Z=H+C$H;S?IS8o?dj^@XDOI+X~w)r;Z(^S?i2X zuOHLA+I}VdIb~JNAC7=5N1gvp`09gS1#+7zo)hj zJaj034>x+{#>n&RM_&x+PwaR!qq54=D_dfkU(Wy5mjC{5QcjgG`^$!_>t(NymtM}< z@pe+TduOrxWQqQfhWV%VmAu4SJ{!H*y*d5Pswb{(+`fJ=Vczj`ulClQF&%lfq_xKF zDYuMuDf-ikI`92!TK>9Wv-hD=?Cx7%tWN$7pP=fJ^>rWo6{c6CF&@+60>ql=o zHs05;;`d{H_ua@|`|Ev=zuvZH=ris=57xMbU866&mO2xgxmoq5G4=Dr8TO&`7cS19 e^|f_81zYSQyWX&EIxW7)TbNgD+mTcIv;P6(hbWH# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_5.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_5.png new file mode 100644 index 0000000000000000000000000000000000000000..76a7bdeda1597eaf5de6ec94210bc0253ad470bf GIT binary patch literal 15394 zcmeI3e{d6J8pju|c1o*-dPO}f8Y5siNOm_r+r9j-H0?DvgqF6BEpW7(&8FRHl1;PQ zChY+BD&mP2loqs9Da=?&1C;5Nfw zR4HIs`n%F++SWzs_hMMi5LaFyRydYY4DVIbF5bziLta1VjbSEh$WJqMtf+9ZHJs0^ z96oeJso-2@<)eBB;qd3PwOmnifGulYR?alnF}W_K)skuoQ9!`UinJo+_4ouTWLAcC zDezlr#+8b27qQN)%##u-DjX$>d_KS`^lF2OAq+-^F;`9MjYgeuu|h+TdYsVWT0*7K zQaXatX%x{*X-NgYOaYghDzz0x(*et@tQAE+h2z0sP#x5&`9KX$=H}+&ga+4WRG^1S zX!414NaYhAjEIcs*jRxHaDI{FeF{mJcJd9PS*er~#jfbQy#81spAcmSDB>a7kCSQw zpDf75#A5sn0Z({nE(T{kte5qP0*E6gjq}&?A}`ePQ>2W!r%ViL;&8-rPdZ+&chb~? zSkMR%M3GJ!DU>()S-g}L_=W((7BqsXJUH3xMa~^B&NwB>Gv(OX5I04b^7F&1N|F62=X3EvVWA0!L*n(0tFbm(WG!Gl8dXG& ziZqrJxs)cC(i#>KBt;MjB9WeuhJ$x;?xt}X8htsTq4au6Lndk@^n^9Q{&CSF{ex5z z`zGkP7|P8DytHWHymSqV`+YSgJl>elGq$RzeBQ$cz_3`0)`U;iJZY4TXBwnso#$g% z0Te?>C=w`Dc;haiYsR;ZIXs*N6h-agTohxV-3C2lP`OE`Q)M*hoGPc5bb%^p7+RA{ z@tOqAc|(BW7)z; zJDYWx@Nup2VZmYC|69O_enR-vIfAvU4|Os`q{6+X77=*27^DMiUJckYKjhGgsE!YV z6u^RY*%t0s%pr zGA=Y9$SdQ5fS^qo7n%>`m2p8p(58$F%?I+zxF8^CQ^tkn19@d!5D>H}<3jU+yfQ8b z2-=i!q4_{w85aZuZOXXNd?2rk3j%^RWn5@JkXOb90YRHGE;Jv=E8~KIpiLPUnh)fa zaX~=Pri=^C2lC3eARuT{#)aksd1YJ>5VR@dLi2&VGA;-R+LUpj`9NM77X$=t%DB*c zAg_!I0)jSWTxdR!SH=YaL7OrzG#|(-N^2)d%AZQbb zD>eQOBkKb%E(XCHis{NvyTIFx3Z|&kfnm+_F|6fr4Et^r+^=9*1A$>*Rbv?S0*2kq zZ>joAA%;!gZ@1-@hd%YRpQ_7xB%1$|*Kibv$<_=KNmU^aa11H*5X;D_0kEU48%R`&}>1 zo!Rxw!vC1p-v4=b_w`%r+D87mJmbZzf#T#h&UyD$bzS_|D`_nqTN)2Jwy`%3pZeP+ z`v*PUx8G=7JD0h2u^8KY0eq?%T8cc)^>xk9OWGzOra@ z`^EeEX7%j7@_mK=;Kn_fmCMghud=RdRVDS!TJ!H4Gw93)^N7_rCsd=j!g-j^^zgHm5C_&TPxTJjWCR+kbVc@sCfmt`dTS{OMKCaVNi-*|pTr zl`}j0gKdkSx=1d0D8;|DU3|79rSnYh;(t^()Tg%$fBx3V6E|mLfBxdx?JMU~Lz^=` zOKZPjO)74}6=ydre{1Dn-8qMT#pt=dJxReGL+4+efvqThtmn0PeOSNlJAr>bXVdE! z(hjK&2ebP|cODl~2j$?Msz{ciihrUv?V#>3xlSiS#xcU{tn&h8_1 zzS+lgmACb_RT*+psjI_Z@A^u=ZkzQZbB-&}oLan)%EKP^`;XtOOA}jLb`Kvoa;U%l d;Ct4eVI?z9rSI{{tUXC3FA) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_6.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_6.png new file mode 100644 index 0000000000000000000000000000000000000000..2a986340d7eb68b38979c2f9a8d2c7fb5189a36b GIT binary patch literal 15415 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_7.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_7.png new file mode 100644 index 0000000000000000000000000000000000000000..b5c1a8a659e0e13078438598a638e486f5bea8bc GIT binary patch literal 15857 zcmeI3Yj6|S6@WKTh-)5p0)Yl6gDM_l2c%uCUfx9#0ShpxMU0Vyc{F&nyOMV-X@z!e z%eXa!XA(N3!Gys)N)n)+CILc21AzoWpry1p1Y9y{LPBus5WuZ@I0FO-y(`I)Wal(ij2_0#q zO$2QsHStU9NC!{0Fz2OfMnN}$#RIs@v5pSeU(u!hJCn!q9~joagx-59y+Ny zC^HdVP#O_)(&5L+OKeyO$$}WvD1I4_SRvcBS|w2D6`xli)EOu!#n}Ohc!UYz20ekN zGUC`yn@~mA9~~OU;=G>^@IhGuc7~L8p)yexr82RHke%ut1B0BnT%EB~jyDiU8CsGj zRRRQYq$w>WcXf!zi+D+_2($d8N-&iXsb((=-b8Y`cv3Vyj-8JPJ(ww)m|1iw#4=<9 zbEWgbJR^%?w|*7e=Fgh=70Tc~_N$!#?RUdhG`ety^1L~f(SHN=D^ zUMU@RZAb0stj3^g=VgnQAev#7vg}}$oy~JLyi03hSg@JUJ%RUzAm%^GyyqBIWqc4- z8Dg%Yy?S;ciC(#i3G)+tV9(r3(TaKPY6iPcy)OWx=_&e@v_EAbz=a!>|F~(g8aADUHceK;rU}d9pddTQcr>Uv$x3GRdGQ;(4vY9%?Hw| zxF8^CQN@Mk18G%U5D>Je;zIL*v??wL2wGHeq4_{s6&C~qEvmTCd?2lg3j%@`Ra|I3 zkXFS70YQr@E;JuVtKx!yphXoInh&H^aX~=PqKXU62hyszARuT_#f9brX;oYh5VWY` zLi2&NDlP~JT2yhN`9N9~7X$cJYL5nIbG#^N-;(~yn zMHLsC52RIbK|s)=iVMvL(yF*1AZQVZD?M@gln;U0MpTdT=gP!{!&cFl@mn z3|q7W!*1RM_X`+SL15U$QgEbo9fl1RSI_(7WDM(dWU6z5JMt-4ce4DE;=wBp{=NPk zV@+FYWmD_A%r~DHvHPWUL+4E#K3BUY``JSu-!HsUc=e;ZlQa8$xGx5C5AwUwi%bs*_)w)h)hbUw-V_ z%KeS?P1oeATUdUMu;(*w*7CMn$2V^L>d!!TD=X_KSquF`HrKWr@Z*iA+JE^$cCYtm zJWo8I-@LaVylv!j?A#pco2x%-?Q4IdzOHHGf)-Q8_;;USpSnDDrRl`{g1V4RUpM9E z(u=!p+}wHa%gsmUlpN-kHVj@hi`l#P@j!6Z{K1~IXE1X6u4Rw64KH>7e0OGUM(wL7 z%QEGC?&jRlztZ{-zg+w3hudDCSu#8LqR`m#hw`zyJ=l#eza2Ja=*(lgM>k4a*W7r^ z=-#@f#b|GtpSkRjJ%eTp_;$hz`>uX+HmkJX^gpdX@ItZldgO^0AL^sO-1x6?pG++6 zcj&#(s?xS(PDwlP?l%wDe;oPC7Q)r++dPMQZS7Zsu(fOF%zb+Qa<-p-?rgrL`LViV zORZazDo}GI?VlO5&KlWv9bOw-vxQx3FdDN!}3pz7?^jep!Y{*rnD_z zXWsX|r9Zj-=Iy!-qt4%{IlJ1szM%ZTzUq}1yn~Jo8GORI_Q;i=PQ=qf1$FY8%XgLy zxwP^cH(R=X`_dcuhrKWVWB-^l_Ul^gT%@3J`-6}6&v@VrTUXjPe&Bb%Xy4eDv$MUa zfX$j*{W-llF#dGe_UeU~=AD{*F6YpkgMo9u%fV)6)Hb{}@@?#>>1K^@L++|w&Ft)< z8N;XBzFVn1kyB7N@^to;Uw=gfrx#+wGS?RCH;mf$&(q8Ld~xI4xV}pc-F^FkY+tRs z_M@&Et; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_8.png b/src/main/resources/assets/botania/textures/blocks/crate_crafty_pattern_8.png new file mode 100644 index 0000000000000000000000000000000000000000..911d8d5f1f96eb37621b8599023b994c7b9ed776 GIT binary patch literal 15862 zcmeI3dsGzH8Ner6IY<*j5{w3oE^Fn0VRs(;VyDY0EIvqG<)wl&)!Erun6SIE*%@R} z40%XAF-L7Qro>oILVPqf+C~~`#6~n$nx@83HO7_-KBCnoQlEsTiM_K6>~dM|p-s-| zKQrg-%Op<&wj#pMzYAbbG!C#7#X0sV5D4e1+V1`Dl z@=8oV;}xfbob>t0=0w)d`y^iQs${>6L#U84)M`0U|JA!MkFP(FSL|g6DB=Oehm%?Y zk7nd#`)zy`es^$bP8R3foQLyDBCsQ)+WE=^Nf66~Awu@6hYSpIVz>9lj=EltCu(R> znz;-h=tUaUQY@_Uad&5F{jqWvL<8}JPM%< zS-@Uto1bGO!Cxo{Zfoe2<@O;|*=)g6rAk@Ed!0h1m};uBrh(C_^DZ(FQ$D86tf|%!GY_`f)N6Gb}HW zb0hpXS=uG|J&a`KJxnQw`@E$VJUkdNv;S1lHo-0U!Lm53&Vol9j%t-Huod#L&h)aJ z2$CU2BnhM{Sh!hC>A=xGg`2m6q-dSIlV**K%V=PY8W-tsXiP@EL*vkqPLKtPWhgUY zHac7uTrO8&6kdt!DL6VXM&t%iE0hy&x6?UZQDVRbaC zJ*hD>Mx!R3A}I$$kQ}FX22aC4^YF@gUH3)rbuDj|U=1W?G@CUPnQqc>4!uERHtQT3 z%EU1`GsziA2i4~~!hDeH`FY{nfir;p};6C#S6L80dGa&D_2@NzZ^xF-gVhI1Qi zu0F;ua&qg)Q1|tY{%#DW_FtA@3!)iTZp&6yu51nf9xxhS7Hq~3PT=qmg#1UC4;`bj zjPs&8L&#Nd*3eEw!6j8PelD{V)XZ?2R>GuVCfx&VxV)#v8FMIuCI*|$r>@apJ) zO+%FC`u|IV3_KK_En~c;oYRW;9pJu!;bktA&w-WI*ANC*qD8*1(x8gLiDH7)Lt5}b zW8ui5`9*Ryx+{Y7%|-%TI4OVknntQ&(_*w~q#8C2TQ2bOk`=VM;6kC{2rK#KAG$LY zfag@sYBU&h1`7@k!xp)GfO8jR^We@T%Kd~i_S(RTsD{Nu8Ad324MVAlc%lq8!_X*r zUImZJc>lBVpg!5(#lFiw;T?UKULjvf5C{lbRB)mBKw1SC1OzQAxX^qct%3^zf)*8A zXg-iu!36<9iwZ6@A4sdq1<^yRJTo4en zsNh2LfwT%P2nbqKaH07?S_Kyb1T8AK(0m}Rf(rtI78P7*K9E+y1pz^e3NADsNUPw2 zfS^SM7n%>GRd7K-(4vA1%?HvdxF8^CQNe}g18Egp5D>Je;6n3(v?+Hb9kC6stxRzc4NJ%7 z{bE-3_iiOw3*(xm{UCQ0cj~m=*sN>RRW4gr{i!oHa7KG+OILkYbqBe)b@fbN^*-#>Bj(nGV8o{NuF9ZxKYy?G6L<4Qwq zOV8!f#I-S*&9ciPB*UMwlufBRn=YFEyU ziK$b+X-^xQ%9*!cPk1)vf_uvkJ6;{U-!{H&yP@zwrr8?`I1zJaix+xXeSd2N5L9?^2{j}(ZL-qd+x+s}G#Z~Eoj z_7O$+FRGVpFA*q)cE8n*u=)H&AfKWyIIZ0>lZ%!^@pA7SD!d$`st(htxn>% z-&LkhT$QKahAo{C^U5dHH^2G$hD#IH-$^=}LG9|f`O#yp&Gv~Uxm)Veoy7WM zOTL_P_Vy9_lyF9MeDk73!rM*njBfeSsh5i~UXNebdZK+=+tT!Ho%MMQS5vptwSMm5?f3mY}u_&xqt$)?~RWtrxR#m~TCm(os{>hD>W&!6l4}bnZ zE4i@x$Un{f?^mrgBeAt(@V|fPpFc%@GdpMIyzJdsOP~1<*Q2!J literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/crate_open.png b/src/main/resources/assets/botania/textures/blocks/crate_open.png new file mode 100644 index 0000000000000000000000000000000000000000..2d77e173e81ddcd871a37603289db79e224fd1c5 GIT binary patch literal 15411 zcmeI3eQXow9mgLKFq*VkUkG%dw#JkV+Me(HZr^OvEDm$JISq+hOg9AQyT{Hg_TANY z#!kAohN3R*P*E$Su5F4sZEB^V0;?uPA}W(u1{!aBVW?2LQl^!`rlo9B)s6yt&UWm} z6X#L3b=p6VCHwC8e4pRY!B4cLSBR&ThOhnXmt06oUTvK6em-e@!DZYo*~UtDrx1VP?@0+ zx>vqE4+TTbCsZ{XsjRZ@Nrblc_VTK-ty(WDl3LVPhgdwNKHqgW7!?c{LF>`aZ~?~Y zPjErr73AH%dpRf1aTb$GPs}5(N^*K&iigXa;9R^XfNZQDmY%o=svk)(gju;*`&xV? zkx#4noM1%coRER6res2Fz0uOMwyOAcHLK>)WxK+^pop+D8bJ*X zS(bQ75G2m)b2A+DiHytZ2{3|BbTS^%89<6ZAf?k~i1D~JeVTPt6$@syRIMds9Tdc1 zN^toZf6(J*+-VQT1X9q;2x$>|ePSRL^rR-OE$P#&AI!^WrxUW4KIYZ`yF)avnKo2R z*3tSLu&i6OddquRFMM=r>!gsC%X^Y0z7r_tftA+CvbL@EB==Bna3#hL4{OM6{~WunN4&xZ4`w(Y|EfEF`HVixK2&O z?L(}&`)B3-i5=`=Lhlm36xP+!GjpP*!*6k#V9@MOd6X09@yQ!8t7 zLzrHPA@lEuM^%hglu)i7XNaBFRv)?2KWSEDwovXL^l|9JI?dl|s#V5QH;_}UGM-w` zd`OXvh^smp)@;c#|1&EadM|psgAt$C>-L6Nycy5vmP;_3jLK-|)y@6H>8s}8Lc_!j zGbLJtYGP%oEDvJk8mzRU$2|0e$<`h*rUZ>Mx?)~*5DW-8q`1g@FqPuM zfRICqi_8a8DJ~2MIi$GAd@z;b!hn!Nii^w#Qzafdk;uW&rr-0a&6wyJ>ta0CP@sM%xmlGtzTy z>LTZj+twU9J#zYC=GNHPN0%S}nfAAOiS{LHb@$G&lLVY>CrmzRPU zem-{L#O3y-iywb#@A~DPJNCRWcl)ldteDgJ1emw?(ImL*J9k{!rDVRnXXn^p<~CdZ z`A4>$AKA7p+VR?*cVC?U@(b?Op|9Hx*{bTbr&tEoAY`p)6qrG>eTaP}rZA0tRXI3t1p4ZpX+w;^H7r)uM?!BF_gofnU zUn8TxPQSOP`M$Y_e(i)^)cl)KIpX9?U1E;!Px_;`HSAUyi y0v8k7-p-D$=<8qFJoGP8YWxZS literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/crate_open_bottom.png b/src/main/resources/assets/botania/textures/blocks/crate_open_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..d67d797bb2ea349636774d2852a37a3cbfc3fad8 GIT binary patch literal 14951 zcmeI3eQXnD9LH}4ft445NHDw}WhgkiySDW0=*r6qY=lB(Q?>wu+ugJ6puH=-8|@Hz zH&J;NL?Iw(q98_I6bXiR1p*-h6^Ov11V)r-L?HMA3c=^vu6@>ZJYe|qY0}^G{TC zdO^C>=cfylFraODc9X!`9kj!hXSO*UgB&l=7S?QISSw>?O%^LRh~)-Z=)}k9F~G@({lo~DHXw(ZOKZ*MahLVM3HNg&2WTJeCG3T*NCX*;6J)xR#AT~5n zU_bx_fvl;}XU^ygRV$jJRx2%(Om??e7|w~$m#m#}yuo0`(yBIMCPa`xn$fA2)P?{v z9;ix9SO6nt!dvN=>FzbDGBr6(GU+`njvYj$7HoP?+!k93@fmW%d*uqkfY+38iJ}BN z@m1z;L`WAD#8wqOV1guzN<uQ)@d?3N>~?XadB3AE^Fpk z7D*CUrseP{qEuPiB!|UT!df`1le0L`9EdVK2i!j*ukjC+1=S*XM1iYR!a-j1NI|{| zFd@0h&7>L;WpY(<1xi2(!(joB)y-sTMqII##udq`#>)aI@_JxHo+OD}h0Q9uSUYcW z0H@jH6b7*-zCy5>tTv~`Z04PIEANUy^!ZSGv(#QisL^*zBDMI4sS$g#)Z@YuJn8rV zqR~hHs3kI_X;!LGQsMfnMb<4`y|J^b7|dwe+Sn10VrNo_534}marwr^EtfpRl4q3e ziS1mD7xdH2Bj_6fh;F7yYid|YXTm1^-wBN8N9--vh*SglK^rQbDyC{ViKW{u{kiinPzRN%5ibaoo+3Auodl2x2Bvg$&%)=B&ww~BQE{qjUNle@F4+s>^7U# z=4R5H(;a>(3Ie5G3GQE2UzKKi!js;S(OA}!5$Q-6<5PwFJCDs|ycIqyz~>Yu`JmEt zl9LcO7fJ&g6I@tCsDR)?X<%c53yTO95L_q? zY)o)r5upNt3#EaLABfA4di4*;@O{4se6ep*uXj$vmjY>_aJ-MAX7#72c?&7(&V6|O zg`#R$iu!dbMR98=s++QM%F&S&m9@XfJFFyHKWWu>^3&$_BbHyQ`%V5}>!Mc7>{fHX zx<8j%zIvW<=*06gE4v(X=UlkfusLVXfpZ5w`{~xPy;Ny#Psi267oC;QW#`zIt?Osl zdFY<0(PkOQQob7AB_t~mE}x--*XFcdcI)--^A8xy2bZ7YPGoIg;l1&t ze8lVTJgwElW7oOzNPVBPH`?yYT{?PX!=3ws=O`VvZ@oM9<>P;@?9{ocOICTeU9~%U z+};%i_5NP3p1FSb__ZOky9@uSH7m0>%1=#L6bQ%Ts`)gs=EiXs1@)Q8b1D^On()$XvA3Ww&7D3{09v% Bb#VXy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick0.png b/src/main/resources/assets/botania/textures/blocks/custombrick0.png deleted file mode 100644 index 593c214e469ef5e3bb25704e115986772b60430d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 755 zcmV(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;c}YY;RCwAnlhJM*MHEEOz1=;tyR*qUu`Lk`@qmCQ^2{&rSA1k%kPrk}!hto$ z_U_KiPIuqFJUFQ@s5(_8zr26%W35D0vKboSR2rihjTgN#V>b*~YwU9-x5jl!d>luj zxpOFm`(52_hUth|M|WOcw$=#K^HV9%|*f?|G$)r^KmNwyO>RZH@b!$*QbW z`F6A6jVie{;=4^pu9e9uQ?0C1A^@ux`FmNo>^iopI53)VGNaN^5!{{l+vAZ61o`;-i?rdY^ zttwAu#7{XBR5{d2r^;59H!<>GDP&+WBe%vwYwTiV%9*E9P#P43eW?u^530 zhzP@G#nKwTJ|Fq%>WcmO%+wlVt?X7SW_NyEui5m0__Qq4)<`jOw=5vSTnd8-PdOvO znaoHE)t#I(@A{q(kB(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;Vo5|nRCwA%liO}2MG!^dTeY~Vg(W}AjBsi{$;-%2?=@SHHI1Yt-33# zl83RD_<@Lw6X`zv{)<&>ta~MR$DEZedP;4yW~3-MZaVjgf96azqc!7gD}-q;Xl-;c zpta!z9B|hM=B&I-ndF7LKJq$kEQbOxq=;dJUN6&p9i9sl}QJS$GO3}valu5zgPU!*;_%QZ_;Ds&- zyWSjMrc5*Aen@;6J6`9VJ_XE-qc+CmnQ|d`VcH8pYeU})Id=i)AbQWb7os?py^xFI zMJTm`MS?gadfv7JSq|lt0tPI*a_%C*LGqsGDT9NfHu~h5b|sfesm8n)hUjs>{ru4| z!vR?<4u@fAGolxqbEF^$(9Ce}P}f5lyFmEqyL%po#Jm@#e2}~+dSS{3f4ofm`uzj7 z8DsK1T{pTQ0Q~THqK}^N*Xzu45X6BQ-1VTXkxPSj*XV_(>qf1O%li)I{GMP)H#9*U z)!_NM(I?N40>KNlHi|aJ6ezWE7RP$rx)28f5WTSM%Ht{V@tc8C8*5g?IZj<z@?jk>aJF*^%Ok4TNSnCbvm;!2z+8R?XIAG3&E_$>Xxl~@Jj5tT=qG#+PT8*d6 zf*H(a49Vl1qYJ{h>%lp`ylq4gvMPP_EV~kNseHby^vQE*BL*RP;qlaQSq|o`R5Jj~ zjO)4saA;-hBB2YyRw^yq*EfzL{Q37xv;R|_`arG5p%pWD7!##7{u=(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;JV``BRCwBClTS|@F%ZRnyX*o<>=2-WjY==2m3r;R?g!w)3GP)-T%c5n_>=C^ zR!Vm4-JondJ;bC)ebQ(wYsP-#_nfGz5+Q(%>lzsH4>gbg&U*mHg8`S9m!z+1SONDU z%zyw)z31EQEvibV%1neV1d4v2wr%T%edd?#2B8ciV@(PLqzb-ZJ3V7WAg27mdoXOgpbF^>k&fW z!8x3B46Vgl%PQurG$o6N%m8BytF9xh0LmiI6mvNsx0&*$7tCM4(Q=L+EXAB(nS zl;>nwhNzOHDF=Cu03igt2&k&gUq#h4S~ZQ9-s_jMGwoD2F?CK~FpIU>y$Ha1gtDY4 z3IHaP33;C5qbGtYT?mK>kI_s3**m-To`^8(x@=lzEdn}%{arSYCc+tP)=uc{(*j-8^|mGk+K0B+lS4DU(NA^-pY07*qoM6N<$f|j8_v;Y7A diff --git a/src/main/resources/assets/botania/textures/blocks/custombrick3.png b/src/main/resources/assets/botania/textures/blocks/custombrick3.png deleted file mode 100644 index 7c22f0f0e406f424bec2afe87ec27d19f05dc2c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 798 zcmV+(1L6FMP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;q)9|URCwAflS^;gMifTR42PVdI3$NmocIyfmfT%{Ae-*GXuIsMDf|oiEBmq@ z2C76*k=T+fiF$FS3ub$9aWBrf-xa_A`a^JK2Efzvnpaf;kz}#m;_{4eJhE)|xYEMm z$k#7RYG*;fV%4CGNidlKqsb8HvOok$vfZMUghbOE4(L3ER+Db_n4()~jviGMmVd@G zBye|q#_;bE1Q=YOF`CSfD&qF~oY7zZeyhJ_G@ZlAbNlWU;{N9kp)51P$+K9!P#6Qi za<`|lJp!=YG`K9qOIW?^a9IkpEY=OGv?*0xfCnK3&RIgUM+m5j6i^TX^?40|49`@~ zLL?DLl(8vEtUwA9r8;hBF>Q;^ZO3}pcRhekHQJ`odQ6$2^2{)PoDn<>-o0V;_?Zyk z?&gBYc#ijnj(a!-1cUD{nM`Jc;JJBQBkq6s7z(2x!1Jb|DlGzdTCS-oi$LoqcS4&OqKKr~kwg-JI94QDL99sg43+DM(fAV}=wH?hCv%iZxanW;@aGt* z5(c;DOs4-q5ZqqYj2@;Cpnv%q@!OB@gDX-%uvl*?dMQ#07R{c*7@{O%wQ0yxLkNM@ zroojx@Pfs1-8raS-mwBzoq>lC0(E7PS&Eo{rL?BY%BjT_-2j3|8EepG+THtfLfZ_I z7}M-KAO1uv1&J02k)U^bwARpzFl~z}vXs&A6L{#qDR}tf5g9A`SFag9&Jj{D`0j%7 zbdDgKGUp8A^iug8z?fz!3bM9awHK za29w(7Bet#3xP1>rMq>1fP%4}E{-7@!KG(z^ED{&FbA+3Nj&&ppQpN}!uyT)NyWQu z{{Ixxzp^{74n5Tpvo^Z0a6_Gmw|S52=1&Y6k=#rsKmW6KKE3z(-0ySKRW2^GiJG?mzQHku1)e$#H#P4uFbBL03wp_r!a1p`NN>WG z;Asn1MS6;!_58E-&pzqXI~_8+iZ0G)n#yA~+uW%B$j17EhwcftF?v@kxZKp7drtG- zaox>7weNml%#O7^YQ>i6b+S&Dd9(jE4@K{Q#NU5*C33lbZGW--W>iOb|IbG?cOR*L zYtPuO$1SI`A-48@U1jsO)opxn?}{=Q+|&Qp96A}y;_%&4kJHRcv1^fi@DCXVF6&=A Us%$NsfFZ%)>FVdQ&MBb@0NiquEC2ui diff --git a/src/main/resources/assets/botania/textures/blocks/daybloomprime.png b/src/main/resources/assets/botania/textures/blocks/daybloomprime.png deleted file mode 100644 index 473d7d4b584d81d989d26733316bbc2e4e20d11d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP*5S+ zBgmJ5p-Pp3p`n?9;pcxK{gQ#9)PRBERRRNp)eHs(@%%~gN8K107&Sdz978H@ExBat z#q20?>?1piY1U*V4zB|u&v+V3;?&JO(q}S9R5X@^RX4PVST=|`nYjLOkhr^p25J2|WKi`C;!BBqrXRmP;YL#;w|Hl5 zLi6z=h4aOkR)<`fvLd1xvvzpAd3YfwhUdiHU+3bFX4W-r73~q!6ABIDYIJT$e7#%Z z+z#{O5z&h8xNGl-FmJlf{n2@&q0+l<*-1$Wv(sPJwsp4{Ms>tL?yb5hU@GacdE*qn zf{E{?z8@7UHrancukxpT#Bq;1EBUrm+ihE>y!PV)txQV=Pxs|clV-)%w{5-R&*QLL zT}qapr66;`UE#Cq*rjCq*Rr(y=-ZQrr*_2@SDt(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;kx4{BRCwA1!P#=!RsaUz|13faM-qz^Yz)|L<9HlTGMQe~*L{Ir^d0*$y=i9B z88>cP6E@j^5E4j2+d2I{^5^frZI1Bz*7vW$A+IPwR~We@ZchaB&H32ZIBV)=7Q{c@ zU;Oj5=F?fssP=gl3&AIsp2m<>H7zRuH#cYTE{+@W@bg;nb}@ zRu{)T0N&C7{PEX{8SVG)F8+QD+Jf6Ar_k6hAAQzhclTrAnlH<+tYynIg89Z4ZK;$H z`qSgQOsgp+rH|axn{wQ?0k{%P@@QVUeeW zl*%+)9QDoJwFXrx5+`X}m{d68cqjm@7u$Fj*&XNhs>fyJ>N3v?qMOg(U%x)B49b&z z8U{P6kxJM)076l5{c6$&Ky_mgmQ|YZrkDrO`Pg5+CIA#?biK>cv;d%_^19YGI(l6p zi<95CK0VyZmNh=_u7WtpiVvTz-~MpHEkmnIJa3}O!~@VY%{Dq}oS2p|{}!OCgLOgx zgW}8QX8=5mae1Y;T718bT*uu+N235#JIhi zO#fYbUBl^l({HQ6$iM%1{oiZ{0Kn^FLlpY1$rWV3V?>h9XHn5$pOi@&6-omzordW? zHrhr_DAQV8HepiI(XhA8X}L>ZcKaW1-i&UTV1r7Zq#+{IZP@^WJA}l zSzT8BLDyn<{PNuC+xu-S+S={AHvl-}O;J#yucJJz_~E4f9{@`aTjud{=tTek002ov JPDHLkV1hebZ$AJ4 diff --git a/src/main/resources/assets/botania/textures/blocks/islandside.png b/src/main/resources/assets/botania/textures/blocks/island_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/islandside.png rename to src/main/resources/assets/botania/textures/blocks/island_side.png diff --git a/src/main/resources/assets/botania/textures/blocks/islandtop.png b/src/main/resources/assets/botania/textures/blocks/island_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/islandtop.png rename to src/main/resources/assets/botania/textures/blocks/island_top.png diff --git a/src/main/resources/assets/botania/textures/blocks/mana_detector.png b/src/main/resources/assets/botania/textures/blocks/mana_detector.png new file mode 100644 index 0000000000000000000000000000000000000000..85d2ec838b5f359db5e1774204beb6515193a66c GIT binary patch literal 16578 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/mana_fluxfield.png b/src/main/resources/assets/botania/textures/blocks/mana_fluxfield.png index db35d9318df78e3231cea643fabb5c5bd4691ad5..a168e164e5e4ef9f93b6c34e3938a2a07e8609a0 100644 GIT binary patch delta 1159 zcmZ2lIlF;zf(4UJ;zp|)W^NG5v25}OHaiugWD7$B zixg8`OG^VwU4t}}RNX{Fi$vYzG=nt5l*HuJ)YO#8LF`sAJ1wkCjV4cLZ<>6IjY}dq zBQY;MHN{TfM!&ekwXDPnDlnOYLmk5=V%&&q6WF(eY}(Ahp=`+VU3^{UWPMBhdJ|6< z$B>F!ArsE}CzVUI)^E>#-HMw3Sd0Dsm^Sg6C&yz{KbANG4NXc5qH1&gb z=lZR!JNovmZsgVWi&+H`Cl+LuZrc|0LU(R`j9zQv3z2V^I}UqwJ~(9KWz<)G%lGSi zA#U!(PdioiA9oJv%3RjO_pLa)f;n%}Owm7#>ejalk1_eRByI`Ve*MB$HTC7Jr>-h3 zJ;k{6lwA6B^*L9yV&dZq0#^rE>lXehpZIr?*XpGUH4Ixe8Tlt9wIpTsFI_6x7IXfi z-ygS%fAym4%@?^GHjC-sz*1m*pz^{*C9J1Qx@((m94=El`` zL$)7HIis{8QZ;YgDj(L=O|Ntk=gTg9ZFQ=sCGGE|AD4L8>*cwbWSczN6ZXU!TuFPh znX7KASIFw!74E+bd1PH*Ia2&%YC9pIj39AWOI>ie;~?(ACAE zZnAq-mdRhf{Mpj!y7Zd#e+z1AT25bd-{>u{Vb-(2?v=`KnSRzD41X(>zj`*0-S0`i zu4*by=bad&{*jgK#@*ZXM^x?q#XI~s{D0OS?u@OoPW0s|{mXy(^BMPMN2O zA(`;~ZbxoYVfTT2!|xTTqBZFgci7!`uKUTcwy<@RMNdcDoIihF82g=)&ROR#@Z00i zHN}sAm^~)SNudlb*nsK#j{j{y0x_zth zxpVzHS6tQjv-8luQ!-Z{%Pdc~JheM}j`+O?g*P&?%u_CPcl>E=aJ<9W|8VNt zA9rhgSf6|7=n3%k8l?PZ+`d_Q{cp}<;lE$L*7;fqCtD@Bzi2!6&5z4Bdx3`GmbAHl z62%T@EL^qPBu}ri?`Fo!Qoc=r@A68ySp7v0U$_z1uOQSZu<1AJ=hJfY?5bT-s%8j2 z_ujTmG^M|}AcN!PKjo8KISzWxTwElzzJ9`$b2>!_4)14XxL5eFVdQ I&MBb@0FpBR?*IS* delta 920 zcmV;J184l3fB~g>kT?Q3?Xfz10}C-ZR5CC+F*!OkIg`NyI}0&6R5CC+F*!OkIkN`@ zW&x8f2PTv51qQR31(pJ{qYL~n1ejwtfs>;=FMl#gL_t(|+EkF;Q(|=hhJUAPbHVDu zwfd*}3%aU{u9_*QDV-*Ao7VPgj1h4T3a;{@h$xC8Og5g?MLdEj;1`SFAd!lz0_Skl zdAgvc>EfC9>iw8k829%mDHUC-liH1Occ)XWU2%JROIr0{H0vDYQfOL@?d=45Qzw&2 zV1F1oxq~F)s8qnexPTIm;+}C*{;R;^VvuYm&Tr8GrF@cUzm0>;I&Pnncxn}|&(7{n zlyRROVHi!+opp4r!D%H&v7Dz+I;2qA=j`&7vucU!>kBTbC90JIl|SG6%`YOnACQ4v>h;%y1_=Jqm z>NlwIIkMSx#)hB6$AZd7f?Ss%{ZNqTY_a=Lpma*y-x>IWGDfpbD!qb;ggn@-eUyu7 zmS!Ei=@N`R5IEXf>NK?&Hwi3eiJPl3(|(z>I!DlBMd-SYvJ#?EyCk|i%i)ItUw?-n z)FGH?7Yw(x@R$X^m?g^PJ=~)M7>16b^dr>d8g_Yr!)%h!tcP4zt9_`g#gtj#XcLT? z1brP6<>NKRY<xC+TP*(O^Tt%-5h0KGcx!yqEWjh=(3PIQpxVCynn5padv*f zMYT%qk5vv<=P93LsGMae?yYm4dyUIxp`qQ7N-iO?hYBwF32`Ni&pVD=w&Hd6Gwq)z zwzNnvFv_s?dz|)e+|I|$PY%%E_Z7)hgc+X|p&L3oy9qR{j-o`+8a1*(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZxXG!6}Pew&|8z>rLg0 zdSR}%SiNX&%@?hguC1+?%{5nT_@-q!hcy`*D|MiFbspdaoZO)h+;RVZclY}}eLljn zZM~IABPvAwQSWhg3HCOd4uAX6~#qGTMh--X;>;L}_WT5?>|U+r>*S?#CDMbK#4N4D|Qnar^Li z8j;j!Yw>YtXn>=K`_WbC4xi%bv!7AJM@AVx_YPyPoyJl@QkyBlFC5^?#7{^BLQ13% z{Be7d$BPl73lA6!_faSnIeYd)6at(+50U$Knf`N@o_)J;8wx2T%BZ7KDS@HTLQ^U1 zu>Uzf)#5hAd>XWYLTg-g;0?7gIFQ353e*`ET3ggC3jt``rjW_twry5Y&j^JKB$8UC ziUg>ZEz+3;Q!}@y>Kf(D2Ex{0X{4brq(a%6J?%XlJ9P$!*N4%IRKTdnNfy9$#49h`wa|ydtqU7QrzA`2^-vwdhX1vaPg~4 z6bp)~E_3qaTm1O#*Bt5VVfM*79X+i~Pu}4BiK{%{@e#Gu60U}N#7=fYFFc$<<6}_o#U)&)) zbQ)9VdAhNVX}Rg>9c3<(q~2T4;K&FLe={DZgG$*#&ClLuHI<-XW~t^XD6NPmzTvaa zzr@ynwn1x7y#5N!d%JLYGUW0(EKy=pF diff --git a/src/main/resources/assets/botania/textures/blocks/manadetector1.png b/src/main/resources/assets/botania/textures/blocks/manadetector1.png deleted file mode 100644 index 687b83490cb2234684458beb75288960c805cfae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 968 zcmV;(12_DMP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ}7uH=X(b`g%Ou$D{_>+ay$XO0qx1o>p_3;KGy@p=My zy-mo}Y1<#**iauQkN4u#pffhY*7jvYX7EWKee^MBUK+&`VKTcJVo&#T?!uS2B`Da? zuR`{(BoCM3EG*t-Al5_K&@tZ_MffFf1-!)X+-CabEL}&M@hAef1W_644$M{IkmOJ; z?{V~rAT>RQuH^v`ngi|z@JHGh=qurs$}}hz0!Uj>aUf?ybD@C8wpq(;6NxCu$Q%+N z*MVBaB40=|HFKSsQ>Rkc;j#T+A^>4K9BA+2)X3YY{veiFp;ZBCYU(HF>f|JEy*h-1 zLe(&Nu(-;J6EC7^Sv>wQZsEb#6sBnIad+w((NH59UE+`H(}>O^?F=O)RN3a&>3f_x zdzSWCBk4!0D3(fbcNyC-FuXwyM4DNcPZBy7qrYzuJ(oq6Z1AW)Zq2RH_4ycAE=}?K zZ#QU)c5-#%GWpaxle72P-c9k{__v%J|C;sP94nb++>Jh@z2c6ucy9&=H>r&*od@@! zG-#;7LBb(Hv6NwPGRWXK#?oq$!(4YNaZ|5hT-JG4kmL{NK$N qUZanMprAss zN02WALzOB6LqjtI!_WUf`XvKHsR0ASs{{rHs~HRo;`x)}kGcWX{`7Ql45_%4^ymM7 zduG*!&PFGL4{RGAOcMBP^z;0I0|!3*zaHOqz51N-q$f;{+Gqc3?Yq_k!t1}!Nf#+K z{Nq1~k!}9xfFD124t{9r4ZB}&CKkuG?Bu8a{W022)_>1$mp{_VD6DKe=bA2edPU{a zclDOl%5Gtdd5`vPcps#t%*@Puc(U^Jf2)5)8Qa~dl`7Br4RlFZ&GW0;Z0vJ0|G(c; zbu{75#8V2dGXKcWwwm)&;a=UxdN((*wu;|JKfF-UR8(v~+V(~7Q;?F5PTjwMXMt`$ z5D*vFx3F#EjXN68Qa}Cw-oBpaeSd7ailzR6Nv7Q5>~naT8yFcr$Cu9UGdq z{_&s0$Tt6Tz>gn12R}6RhTX3>6N_V8cJkBz{uu2h>%Zr>%O7cF6jnB#b4`~!y`u8z zyL!uNWw$WKyhnRCybsb+W@ctSJXv}AztumYjP35!N|k5*2D&7y=J{1^Hukxh|KIPa zI+}22;wgn!nSbPGTg`c?aIfxTy_=g@TgC6AA6}?vDk`=gZTq74DM(32r|#dsvp_c= z2#AaGtC3ic9O(b}|Eg81Bpx2{@F_DhX;E2ZU;ocw!-fq8bL{&)ZZ$A66l|Ms`r%8T R4lpDbJYD@<);T3K0RVgrppgIo diff --git a/src/main/resources/assets/botania/textures/blocks/nightshadeprime.png b/src/main/resources/assets/botania/textures/blocks/nightshadeprime.png deleted file mode 100644 index 902f574cd6503548afba1774dc465257cc5df4c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 420 zcmV;V0bBlwP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ-DoI2^RCwCllD$g902GA}4%M+kQ&1dSgf_HL$RMEvS~}$^d;=%xCTPWOrRiXX zg6|+G=qC683Wbh}pkhrrb&5g#99)b)ZN$ytaJhH*IGlR~=r7Vg1{kh|;acPx6@CrK z+68QXL$<#mK+_;!4rgmnEBWl|ktJR=91f>K5=&Px)nbQwxlgs&p{Ez}#EPOwS-UVB zu%#Ou)1zMQDMHsF{xwS6CwPphj^Wc~s`*ZIzYZp*(sa&H%DuAxe)zSlcy4H^F zsg-=Tb&D>J(mBWwXccs@Kq8Ah1*8fw3`1#fqD>7FS#%Yr1H^Hx(P*T$#yF-&PtQ1} zM_XfZjS9_XbGC!YWTIuz=?csf>Ua?{1TtKU?_T*syY3SDSnJPWz6}7Rsi#pJat?n0 O0000pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;?$JiLd`p~jo*&HhlX#t5Q6ciC!BqXGeCW%4= zLO=mR;;Ly7h;5*9g@i-_1)`vXK!J#mAOUeDf_1#vBTLp^AI#cw&zQm+D-B=yE`8tk z-V5#8^KDPaGPY%s&=QOe=do;?h^q2urHZPm0Q7o29LHhvh7yV_)6#Y7jTT~j^B9rx zO$j0FtLAvw!X~UeR}~AdZ&ZagUZYt5ANQk`r;{m5a4Uk_qXqf$2C6H>I8)t0Iug_*$yFKdUl@a z`32q)LDzLeEE*k9l7--!6e8O5$!CT*U$2p}477NR(+l$$rp2b>C_f+A$E`CbsVQn- zLMq)Q2!j8)ox|}wt_)?kK2pH<1Ion`li3`u@AK=+H?&Ej$}*B+nk+Q?R`@}H?Yfwj zO)8l{7J{!KgWlglQqw4`33&JMFH}Y5Xr)4@Yof)YoUJc066!NMK3%2LHOOby0$?cp zxbS>`F!j4bhuOVzoVLD<>v_DNs<=pkS>$TU1#&B*QeR9z2E=3eldPp|xoPk`%&mT$X3%_?S-NI4-1D p^G~IUvpPj?Xe~w%K&8r;0RRdnI7Sclzc~N^002ovPDHLkV1h(Agu?&; diff --git a/src/main/resources/assets/botania/textures/blocks/ocpattern1.png b/src/main/resources/assets/botania/textures/blocks/ocpattern1.png deleted file mode 100644 index 2dfb5e79fecaa4a79007e5d790394633e24248be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 873 zcmV-v1D5=WP)pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;?@2^KRCwBKlSyclcNoThGxPtJnfYcM$IM1dLgI#2NG*8LLk}Vm1f_bh)qp6{ z_TU08rBFoCYD+zN@)`)zAfi<8(Cr}FLKKU2BW9eKNgByAi(h8u+rQ~y;?P5%!pnRCMNt4~Hk;VC&HB}S$dW`w*O@O>5dG`d zpL=jPjz9oNIO zYy!YUahi$g8J?k{>pCJ54!0#qLNGS^fTF6BOQ*OyGRz-$Z=*#coS2!WVVJD#?cu<# z9Som5%ABmUMo1*<_`d(2ZD+Avm+w<)u6A|fc|O;A`?!+H;&>hp9{)|1IEo|@Y#0VJ z<<=@Z-^X$s4AUYJkF{O+KcvxHF2psB?iD`IUcE+w=PB0LlIx$IQ?P`L-0JiP0 zI61|uWCGiEAi11>@&)YW39_jU8om$t0{;#G#_T)-(_ZuM00000NkvXXu0mjfA1;k` diff --git a/src/main/resources/assets/botania/textures/blocks/ocpattern2.png b/src/main/resources/assets/botania/textures/blocks/ocpattern2.png deleted file mode 100644 index b735d508ce6b948b3d5ccb43ab88caa1073ebb9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 869 zcmV-r1DgDaP)pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;>q$gGRCwBSlRIovcNE5dw*U8G``Q>2zZBvqh7v)MLXlYL(4j&>s)PhxT0|BQ zY8gP4pzYG32$hG(#FVKL5(5Y!2DY{^AW)^WY6YdOLX1P4G&FYn;Ksi1d)>jQ#lkn9 zm%i^i=Y;ls@L^9#61HWM&=QOe7qDy_RZ;l6TtQJ30D8S1j^nU%dkI;RXz4ojMhh{q za~yT%ItC_fWQK8ACrSbn1DOmeHadA?{EAEN=lhsWoZXoGbYKzzkloT{|Gio6J$T3` zA0J|VaS7M+h|E{mn$Pmyu5naZrg`HQlOIje*4O#t-~j-H-s#}_2q!fSk?!z6c5NF2px$Z|35Nkt6^YeG3)k}iNN-9G>c#3> zgW|?m%d+_T%d>;VbF2T7GCFAS7-yEMG+*m%E#wBxzU%fS0E`Y7hzP+q=P&T>cbAZb zU^s&G1#dM#?hK;xWEhS;jCec8ra3?9f4O zoIOoVR{9cB=`KMKyy12p$Md+7$#QL^i0=o?jFp(q<#BzV$G<(LO%g?t2pgu!O0#c; z9|YL0i)q=Uk_jXscpI|l{VgOljpCMoXU|`t$Py>ZWjb9GEgt1ueT|V&pV{XN6*^sm zLUsrML+;0g=lg@Hho_G7{@w}N`Z})X@#lPnci$;d8X4yIzvftNGzWPA+jSXmeDdiD zs@PcAMA89`W{N5{J~lrBIbaSMYvb9X^2Q+x)Y~ vPp5Dk7t)*gr(D6=oFbnY!UzH=SNLxLluSAR0MS+I00000NkvXXu0mjfhCGCT diff --git a/src/main/resources/assets/botania/textures/blocks/ocpattern3.png b/src/main/resources/assets/botania/textures/blocks/ocpattern3.png deleted file mode 100644 index e986e3d8b43e56e75c24cb30890e29d7365b57ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 869 zcmV-r1DgDaP)pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;>q$gGRCwBKlS_zGcNE5dx%uCF^Y|ym=;XmT84|67wlG$3V;3%pj35ZwjTUEP zk?O*>U~B2J8)@lm>S|VkAVn7<)ScQcq@`eA_^Rl{Oy|*&NhS~PB=>!9y2vzi;kP_5 zzVAEdMD`tcw=Yx`$F@kx6yu{sY{wy{>pZR2&~+Vve!q|Fy6oCfK~q)QhC!p*MojLS zAU1mi6N?TSqqwXSCxwNH#t1PS3<@Op4UhaUKVZ2@-ooPU!6^hlZcC5-x9)T6$9o)q z?+9}XOL)Fdbgss>LXNk0PY}~IT34?#b$E)7vCgAI2LTX9w~O0{>cSGYZ(O7H>rVt> zi0Avftgj)H32sV>W!o6N9)CZ$&#~!K064ad0^qkKn^F>02;M(^mM<@UMNHE;e0-XZ zFMI*O^*xi!GnXKBS}y!M93;ct4<+8{tBuPR2Ho$poLQEMr-&5?lH<}?i697>EmxSy7x03BpZ|DBhcvpXqL`M&N^4+6 z5QaFOhh;lt(y8GVUWXjUU<+v}DQyXP{QL#FrgFMkrQ5TR$vB@j))R426-cm|+Oj8vhOe`&u`uZ-lpx00000NkvXXu0mjfqw|QE diff --git a/src/main/resources/assets/botania/textures/blocks/ocpattern4.png b/src/main/resources/assets/botania/textures/blocks/ocpattern4.png deleted file mode 100644 index a9dd9c9576b5203262173f0c4776a63db4417f2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 877 zcmV-z1CsoSP)pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;^GQTORCwBSlS^n+cNE5dGxNWXnYlBLW9CK7giNhLTS!~zrY^cD5cmL2#jz;=)}YE<_QcwAlI}CY>~s7@L{QBX?%*``+nd;_Uh@ z&pF@W`_3cu=G*V|gd|~GCJ8OU=x_ncwow&@Cktg1MFF7K>)|*KyLOb2C5fi4Q>!-- z6T8MyXD(x4(n4k!hc;0Xm>9@pP_fa;6XQNExx2q%I&ogb2( z@q+-@^LSoeM~la}u4$N-h2HJ*&x2VG9X$qsZCQi?yoSb>goY#pM~;8Q)R$kQ$}$&o zd1l5+09<=*g6Uj=5Pdj6M3M+6H4TyO@B+JE8Uvu#Y!L~E0Z0`ji49+)rx~?N)(da;uBm{G_cc`c;g=~g1wJIsgK#RxtWOW6@wAeW|%KHcQ zaply#B#I;v zHcXS%Mt>B35YRRZ8XG#PWCBSD{tsF7{uYv&MsZuf!>50v$P!cM&(Z0cXz?hgYwL`J z`pQl$mg#g23fUn547nc{p6?I39z1%CJ#S3V(%ZP6$D{c&ue@BMG&0N|kLOscHwJkC z+jSXed~o;!D%e=qMA8BEMv4kHJ~qDqIbaSMYxCKn^5!8Krb+qGhlE2RT8m3GckUn@ z4&gX1?WJX&rc*eM3+b&qTPWjfO_9$GVFUpzl=*J}mFzlll*JY!00000NkvXXu0mjf D&e4pb diff --git a/src/main/resources/assets/botania/textures/blocks/ocpattern5.png b/src/main/resources/assets/botania/textures/blocks/ocpattern5.png deleted file mode 100644 index 5a112dbec204854775d7db8865bf30577701c6fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 877 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 VK4a<=m@)tW002ovPDHLkV1jPHmz)3q diff --git a/src/main/resources/assets/botania/textures/blocks/opencrate3.png b/src/main/resources/assets/botania/textures/blocks/opencrate3.png deleted file mode 100644 index 41c5639b3aab9595540df98e30b5f0acd1e411ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 730 zcmV<00ww*4P)pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;U`a$lRCwB4lTB~aN)(2ljA!hovE4d$ng&#Xs!C9?Kth5o68+!s6A&wObrDjz z7l}4@+&GRu#~v0gE^u~7n)C6V_nFD-w^v3gMO~G6uE&$dE2_HYz;XEeZe*P5G_W)#h&LRlt z`W^`o1;>2&_?|S|arfgpRo!4P6lKM=t(Z-xTu&z4#0mS&ny%}4cXb7T$nu<~)l^Lb zK)haK+X`t}7z_Y?-&58#byXmQKzAB|x~dQWy6cdZMVaTcT9d?Ul$4_sfPIz$ki;eB}B*N=l+=!LBHnFah8$-Oy^yq3Z##+YZeD#7&%Ft6`efnjj4MJLX~Z z#}>hS4nWtog9HFuDT;kQ7UkP5Oa=*?Br?Hj7^<3oiz#&fW0626#uD^Z5 z5*A(G(X<*}RV+?U*q0?U|A=^#BBkWhKmSr!CE{>89j98BVCpzb4{TPe)#$*lm`q?9 zg+#$Im*-DWwlhfZU3b)|q{Kf8*d#GC-@CW=c06>~_w4q2wt0@D6rw0gZsG)hsq4`j zLz1jHJzY`cyFZTjdn|%raKU$7&Q?o`szOQ&W6TH?F!G?g4r9zHsi>-ofCx(#^1;5aJ%Lp=sT=!(RY+_4*C}|G4GF#W_L<(kvVE^(JL85BPHZ z9~V!~$cy3uq@pY-s+yyFB5kFxmE_p-aBQ1x{=i1vw%jHgey8{60FNsg;d-oK6#xJL M07*qoM6N<$g0uinHUIzs diff --git a/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_0.png b/src/main/resources/assets/botania/textures/blocks/spark_tinkerer_0.png index a890bbd53dfb77e59304e3b2de16299cb189644f..102a3147430567c925ae6979ad92c464d8de1a2f 100644 GIT binary patch delta 1286 zcmX@m#CV{Uae@Vt-OG(u<;>hhrXdEVRz?<924<7@Fk2(@H#4#HFshgs8YfvAn;Ghw zrX-u|8kw6|=vpRPn(G>;nI~GB85x)*CZ|qT;8d90$~s}P0xP#pMQ(v!N@j{xqESkU zNs6JRuBB0$v2I$jNvdw5xv`~gqGh5{GEi@diHRXdqplrHN0Pa*fpK!Gg|0=Kse!Ih ziiw%7WipVJY-R#BEPAin~z0ZBzkmcLK z8@`iQ+3ME^db&7r6mf9npJJD8TNdzCJ+R*IkhdrjpJ zucbvD%lG%k%X5}kvGsbh9=>oPI(){mw$xWKQ~tTWxKk=QyMDeaS5>DElB5>4`Wow~h&fW99b)9FwiR*pm-c!8(BkS^; z9<3Zd?<^@hoTHwSByG2<-fPa0Z#v6vs%+6wy5e_Vnf>mStjc9E`aA#T6qE)pNWJ#s z&ea$9qVC+A88PkDai^a4_1|-riWx+!K3O5YFv`wxj@-elu*j&A#o5n~Jd%5K`?JiO z;}-Vz&mR40NU9T!lvd2sr#Y+~iati3Kel4PA-DuX}Q`qtQw??>#)YjlX-EmVM>u$QKaq|z`{47_q z$4cx!eNTx?y2;ir2-~c4wnt!En@7#{_79(x8>1HcT)t3X{q|3|*W~-ric>i!-R7Uv zbAGb#$v4ZJcf9q_SlNDNm)z&PFYb5#)^gO(TDKr>e&GI)g59}S&Iv6!`lu;XME&Ie!=Bkr#`FdkfWM|np}eF0|m+N z6aC#Q_lv7;QA>K6?vdY~F(tS|_%O%R%R1}Z>JH|J-Ml;V@!@t8zv*+s_2(I7ZU6XV zxx9qrk9ywSe>LZA*T1Oke#VOZWyJMAwqKaypar`WQ2 z!k=soU+~MAEm~D>HMg%XHFndk7fv_sO%tqryyv4;L7(mMr!sDzc11*ro~*s!4ouuT vJ=yI}9zC|pBd=bv@~U$}?wrPl>3{4QzA{=rwX@n3%m4(Qu6{1-oD!MaK*WAD)S=S=fJVn z;*V30ENc1TaAm39CyCf2j5Q0I3?fV;>Z4G*RAK8 zaaOCppTDN=kJHW?msiz|pSCWzYqs)wh)?kGjJV`Tt8J+Tk$>1PzN;^j_m}t&2X0Kt=R6eiwWUGY*@)_PC_tv^riW{&R8ml^3snGcV7U zIR7WR=3wTvU_~c8@s)QCqOG|;)|bkQnjSoNO=j9vg)KUYtDe6PXwqACRVMh{^gFdi zJNMZx&J6u|<>JdbH}90{=0ra}969H>K7YrrK7vc;0yO7 zPV-J({dV?3Jw3l2dn{DuN4rjR&xn+Yo^3R(@Zh^sDo*C>G^d~Y@#li-8l9k>T0;Ky zZ8y(pqaHS8b#@I}hJsTY8#jvGe|gp__Eh_6bb;J@coV0+Um~+UXfHtn`j6{1?0Y{__!uE>s6D|f`yhHzUiImEX~ z+Gu93zWQ;_D=}@4QyNY*P5%9x?^BNcznk|b#yE4t>Knh7J75wr?GInc+bM^A8hn%v zcqMeC9CFu_eSEjBCm`gI8P|#Y-z%pFc?dIie5#xl{?|U)^wXQX^Pm6KO0^eH2tRyY zLiWw$lm7Mwm+C)rH#eUz*k9WjXqR^GqWA5657)1}-r;4}Tl^wC&txiptBh~3yZO3| z8EVs)XLh~RxHa`u@46t{`;QmaI%ky4@cPP;TFI2S-NfmW#P69FA7?nZ%u^F9F|ac` zJn2p9Ctvxv?+lJBr+ZvDc<`1;va)~X4AHVh!W?%mS)P^;x_l}lH;Q%bq~m$fElfgk z=T*3a^*MIVPkyz0%NnEavCU<-4{Xa`qh}=;9nCc+4i!%$GT&ZXFpv`G$3bTV$zlN8e@R4|D#rGw`gk@x5;O!a8( diff --git a/src/main/resources/assets/botania/textures/blocks/turntable1.png b/src/main/resources/assets/botania/textures/blocks/spreader_turntable.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/turntable1.png rename to src/main/resources/assets/botania/textures/blocks/spreader_turntable.png diff --git a/src/main/resources/assets/botania/textures/blocks/turntable0.png b/src/main/resources/assets/botania/textures/blocks/spreader_turntable_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/turntable0.png rename to src/main/resources/assets/botania/textures/blocks/spreader_turntable_top.png diff --git a/src/main/resources/assets/botania/textures/blocks/storage5.png b/src/main/resources/assets/botania/textures/blocks/storage5.png new file mode 100644 index 0000000000000000000000000000000000000000..e13daa41284c42b2de5250fb8f1a6a9101b8251c GIT binary patch literal 19379 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/elementium_new.png b/src/main/resources/assets/botania/textures/model/armor_elementium.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/elementium_new.png rename to src/main/resources/assets/botania/textures/model/armor_elementium.png diff --git a/src/main/resources/assets/botania/textures/model/invisiblearmor.png b/src/main/resources/assets/botania/textures/model/armor_invisible.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/invisiblearmor.png rename to src/main/resources/assets/botania/textures/model/armor_invisible.png diff --git a/src/main/resources/assets/botania/textures/model/manasteel_new.png b/src/main/resources/assets/botania/textures/model/armor_manasteel.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/manasteel_new.png rename to src/main/resources/assets/botania/textures/model/armor_manasteel.png diff --git a/src/main/resources/assets/botania/textures/model/manaweave_new.png b/src/main/resources/assets/botania/textures/model/armor_manaweave.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/manaweave_new.png rename to src/main/resources/assets/botania/textures/model/armor_manaweave.png diff --git a/src/main/resources/assets/botania/textures/model/manaweavenewholiday.png b/src/main/resources/assets/botania/textures/model/armor_manaweave_holiday.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/manaweavenewholiday.png rename to src/main/resources/assets/botania/textures/model/armor_manaweave_holiday.png diff --git a/src/main/resources/assets/botania/textures/model/terrasteel_new.png b/src/main/resources/assets/botania/textures/model/armor_terrasteel.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/terrasteel_new.png rename to src/main/resources/assets/botania/textures/model/armor_terrasteel.png diff --git a/src/main/resources/assets/botania/textures/model/knockbackbelt.png b/src/main/resources/assets/botania/textures/model/belt_knockback.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/knockbackbelt.png rename to src/main/resources/assets/botania/textures/model/belt_knockback.png diff --git a/src/main/resources/assets/botania/textures/model/speedupbelt.png b/src/main/resources/assets/botania/textures/model/belt_speed.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/speedupbelt.png rename to src/main/resources/assets/botania/textures/model/belt_speed.png diff --git a/src/main/resources/assets/botania/textures/model/travelbelt.png b/src/main/resources/assets/botania/textures/model/belt_travel.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/travelbelt.png rename to src/main/resources/assets/botania/textures/model/belt_travel.png diff --git a/src/main/resources/assets/botania/textures/model/supertravelbelt.png b/src/main/resources/assets/botania/textures/model/belt_travel_super.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/supertravelbelt.png rename to src/main/resources/assets/botania/textures/model/belt_travel_super.png diff --git a/src/main/resources/assets/botania/textures/model/corporeaindex.png b/src/main/resources/assets/botania/textures/model/corporea_index.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/corporeaindex.png rename to src/main/resources/assets/botania/textures/model/corporea_index.png diff --git a/src/main/resources/assets/botania/textures/model/hourglass.png b/src/main/resources/assets/botania/textures/model/hourglass.png index e53cc2f82279441ed1ea4770f2792a917268b783..f4bdef0794b6ec534fb31a605492edee4dc3dccd 100644 GIT binary patch literal 16860 zcmeI4eQ*?K9mf|4C~peG&<3ROyvkc~Z{KfUyc`J$kW4tpKstcd!n3>2CJT4B$K8fI z(oW3)g3|g@Mn{WfWKg7bnATB8=~N1_5OhEV!I4&+h8M?{g2a|~&XU!9eNJ|Pe!H99EzL^;3+qR5M%@v$@`P&7wz zG|6%bPb)m@%fI~LG3Zk$sT<1D`UUyskX7w(v+aaJQR#F#kmdqbvXx?FS*B=~Vp$T^ zAX6LSHpr0i)Pp&ZKAn1)(voJvHm$hN(FLm2Zdd#LPDA~#{J3I?{)XbIJUc{@%76sL z1Zb*MkgoN|B-)eFY}a&+f>9WQaXW?Ln38dcHp{kBZPpM?_Pd8{7|lr}(%*K;{>EY@ zn@-vD*CPaZq$ML$EgKS$S_)HEds2h**Q234SZegPX%r@BfRf`GvhOfs4iV;fa$(t} zkei_p8mm&5guu3vEtVAx=T=#BA3|SUU3OLZW-T}4x|L4N4pDeWVZIA$upZbjjMk$_ z(h|vtEwrq#GFp;zXhxywB9UB8Oe13HrmNcseA|!Pn>l^@#ATdVS zVw?(qsMC<-HJK+hju%N;pf!@$HBOR&1T=;%TTCznm4~8EYPx2Svd*IsssNH4Ppb^4 za)QLmWs6B%kl_u3Ck0?Iq@nRLDRYn^HJJmdC-6lT1+LSyqRJA?s!L40Q!+NR8B0fD~n3 zCjpeuEC4PTXoCDI1{u*;pTTR+ouZ7ax=*v^F6r zYd|DfnpY7i4GohHGLopvf(+2$289>4T3))Z^}KZX3pXcS6h26LNzz0&5)dt_i7WMlKuWb5iz%ReMTBa6trkKxv^{{gI(u1#|EOmX{s|g%90Ex(&wN4!)dJw${)hDa)|aAPH+*(UDNj znVeG{7>3K2-WT^|B2r-ehnofoWj+S&7SfPaffPBOC1nGpMxLfcl)XU^GAQHR?KH4L z3oR%#rwBsd-QmAC4G!>J>slL#w?aKk^^L5r;D2f6%FBRvJ#&L^eg6kDm)nU0b7J2q zF*t{YoD08#@-NB-Ae;Bloo!HAVa?>~uW<5cv^`s2WNGxG80T+3wAhV@u5=GAcH^Oi z$cN*m9Y&X-Y)7%;qA2I7BzI+Ah900{I4B655Tfv6Jfhjm!03v46J428&PfpD^D(%i zWZ=p|Acwk`Z7dsDAT8+)WRcJ0HyJ;lhBpn;tHAKA6|Tg#mFlJzVa5Ft3LT1LAIaxZL?* zUJn-r#NG68x%0ui9xe=syXoO_=Yx4YTo@2{)5GP?2lINkFd*)xhs&K0=Jjx4K-^6a zmpdQK>*2zHxSJj>cRrZc!-WBHH$7bLd@!$v3j^YAdbr&AU|tUw2E^U;aJlorydEwL zh`Z_Ga_572JzN+Nchke=&Ij{)xG*5@riaU&59al7VL;qX50^V1%&pk;nV0#?>FZ>brgMJ-lsJzjSxh~bb{#IL=e~Sp!c^3qMas) zOREV&`3^zcZ*5<7WC1}8zpt^rwk7lWe&1%~jWYpQ<|ajR~8Y8fvz~#=Sew4PXEA&yRiWr$77rTc3@r znsMd$+Xt_HFmrNuWp~%@*<)Wld*BoM=s-u)mJ3ThJ@bv;inh@wtIj_D{+35x(JH1N z`o%M${pUip3(jYDzIat^dt>CJS1-rT{N+p6UmE_(h-EW7$DaPps4G*>JU0Ezwec?= z?7Z~DTYpY}Tv|GD?b?q#7ueG^=SpqW;c)cEmaC%=Pqnwdv+$ww=^xzggJs^y+mFJXJAeUelgimyT{4w`vCw`0h{G?%0_d!;)i9tR8nu*}QNrXuWCOUiYoZ z6K)if1+m8O|@`z`f_g32TeycWL+&OCI zKljVw8#hir^GYZO5cMqhRJ%9 ztiz_F;ug%|tEuVkM^|0AJqRcZwsGqpcHSL=-GVq9{&+sAy{>3TlBE z5_eyGl0_Hr_4U5v;C7mS5(8)Tz2~3hulqnHLVbG|A!FtU6(zTDQZOn;H!HG1On-)X zO_(ajlau9gI7YUf9G=$D+kGs|>XjN_=v(*OVf diff --git a/src/main/resources/assets/botania/textures/model/spreader_gaia_halloween.png b/src/main/resources/assets/botania/textures/model/spreader_gaia_halloween.png index 63ead32da72bc17f7eb7822ccc4ff27f733c2e7a..7c15314f7a22aae4f27133ef9ba6a4bc9d86866b 100644 GIT binary patch delta 4645 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 I(%aDg0}iu4?*IS* diff --git a/src/main/resources/assets/botania/textures/model/pinkwither.png b/src/main/resources/assets/botania/textures/model/wither_pink.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/pinkwither.png rename to src/main/resources/assets/botania/textures/model/wither_pink.png