From 826ab1cf3a01dadae2a5d5a204fa557f7134eac6 Mon Sep 17 00:00:00 2001 From: Giovanni Harting Date: Mon, 5 Dec 2016 20:34:02 +0100 Subject: [1.2] Material rework (#60) * Developement tests for nbt data in traits * Lot of trait changes and better balancing * Traits reworked a bit, new traits added. * First correction of NBT Data in Trait (Soulbound). Is shown twice. Still needs corrections. * Few fixes in traits and new trait "catcher" * Small fix, needs workaround * fixed some catch issues * Fixed Catcher and Reviving Traits, new Trait: Souleater. Updated build.gradle for new TiC Version. * Splitted SoulEater to get the bad touch to an extra trait "Cursed". Added method for using nbt more easily. Changed declaration names of fluids * Some minor changes in Traits, Registry and Utils. * Iron_nugget is replaced with oreDict Item when not loaded via TAIGA. * Beginning of new material integration. Lot of names changed, lot more work to do here. Many null pointer exceptions and no changes of values up to now. * Some Small changes in names, registry and recipes * Some weird stuff I don't remember :D * fixed some things I missed while merging * Rollback to something * More Stuff * fixed some merging stuff * Fixed some misspelled names. Actually working with lots of restrictions. * Rearranged alloys, tried to add blocks / ingots for non-tinker-materials, but they won't work. * Again tried to fix the melting issue, but non-tinker materials still are not able to be casted as a block, ingot or nugget... * Fixed integration of materials without tools. * changed IMC to direct lib calls * removed more IMC, removed redundant code * some reformatting * Alloy integration reworked, needs to be balanced. * updated deps, renamed some func's, added duplicate material check * some more renaming * some reformatting, fixed wrong import, fixed string cmp's * Added images for blocks, ingots, nuggets and dust. Json changes do not work yet. * some reformatting * Removed old json files. Placeholder needed. * Fixed block json, items not working yet. * Fixed my own derp (missing json files) * Reduced materials to ensure unique traits for most of them. Still 30 though, but reduced by 20 more :'( RIP * Changed some generator stuff, not working properly right now! * rewrote offset generation, added some debug command, fixed some stuff * fixed on-surface-generation, made dependencies more flexible * reverted gen-weight back to its normal value * Meteor generator implemented. * fixed generating on ground * optimized a thing * Replaced Uru with Osram, replaced Meteorite with Uru, added Meteorite again for Hull-Material and late game alloy. * Some changes in generation of ores, not ready yet. * Added Cobble Meteorite. Added debug command. Implemented rest of ore generation. Some minor fixes left for generation including balancing. * Some changes for ore generation. Added 2 separate Generic Blocks for meteorite and their cobble variant. * some cleanup in Generator class, added meteor world save handler * Added Textures. Added blockstates and item models. Fixed fluid rendering. * renamed world save data file to be little more specific, removed a unused method * some preps for the upcoming release * First attempt of well balancing material stats. Renamed TiberiumX to Triberium. * Final changes... ready for beta testing * Added missing alloys. * Corrected balancing of ore generation. Still WIP * removed some last debug out * one last reformat --- .../assets/taiga/textures/blocks/adamantite_block.png | Bin 16040 -> 0 bytes .../assets/taiga/textures/blocks/adamantite_ore.png | Bin 16325 -> 0 bytes .../assets/taiga/textures/blocks/aegisalt_block.png | Bin 16159 -> 0 bytes .../assets/taiga/textures/blocks/arcanite_block.png | Bin 16377 -> 0 bytes .../assets/taiga/textures/blocks/arcanite_ore.png | Bin 15564 -> 0 bytes .../assets/taiga/textures/blocks/astrium_block.png | Bin 16352 -> 0 bytes .../resources/assets/taiga/textures/blocks/basalt.png | Bin 16146 -> 0 bytes .../assets/taiga/textures/blocks/bismuth_block.png | Bin 16263 -> 0 bytes .../assets/taiga/textures/blocks/bismuth_ore.png | Bin 15813 -> 0 bytes .../assets/taiga/textures/blocks/block/abyssum.png | Bin 0 -> 16485 bytes .../assets/taiga/textures/blocks/block/adamant.png | Bin 0 -> 16154 bytes .../assets/taiga/textures/blocks/block/astrium.png | Bin 0 -> 16375 bytes .../assets/taiga/textures/blocks/block/aurorium.png | Bin 0 -> 16231 bytes .../assets/taiga/textures/blocks/block/basalt.png | Bin 0 -> 16022 bytes .../assets/taiga/textures/blocks/block/duranite.png | Bin 0 -> 16512 bytes .../assets/taiga/textures/blocks/block/dyonite.png | Bin 0 -> 16347 bytes .../assets/taiga/textures/blocks/block/eezo.png | Bin 0 -> 16147 bytes .../assets/taiga/textures/blocks/block/fractum.png | Bin 0 -> 16416 bytes .../assets/taiga/textures/blocks/block/ignitz.png | Bin 0 -> 16598 bytes .../assets/taiga/textures/blocks/block/imperomite.png | Bin 0 -> 16410 bytes .../assets/taiga/textures/blocks/block/iox.png | Bin 0 -> 16378 bytes .../assets/taiga/textures/blocks/block/karmesine.png | Bin 0 -> 16416 bytes .../assets/taiga/textures/blocks/block/lumix.png | Bin 0 -> 16478 bytes .../assets/taiga/textures/blocks/block/meteorite.png | Bin 0 -> 16523 bytes .../taiga/textures/blocks/block/meteoritecobble.png | Bin 0 -> 16838 bytes .../assets/taiga/textures/blocks/block/nihilite.png | Bin 0 -> 18955 bytes .../assets/taiga/textures/blocks/block/niob.png | Bin 0 -> 18656 bytes .../assets/taiga/textures/blocks/block/nucleum.png | Bin 0 -> 16205 bytes .../assets/taiga/textures/blocks/block/obsidiorite.png | Bin 0 -> 16322 bytes .../taiga/textures/blocks/block/obsidioritecobble.png | Bin 0 -> 16624 bytes .../assets/taiga/textures/blocks/block/osram.png | Bin 0 -> 16416 bytes .../assets/taiga/textures/blocks/block/palladium.png | Bin 0 -> 16416 bytes .../assets/taiga/textures/blocks/block/prometheum.png | Bin 0 -> 16133 bytes .../assets/taiga/textures/blocks/block/proxii.png | Bin 0 -> 18908 bytes .../assets/taiga/textures/blocks/block/seismum.png | Bin 0 -> 16507 bytes .../assets/taiga/textures/blocks/block/solarium.png | Bin 0 -> 16327 bytes .../assets/taiga/textures/blocks/block/tiberium.png | Bin 0 -> 16507 bytes .../assets/taiga/textures/blocks/block/triberium.png | Bin 0 -> 16507 bytes .../assets/taiga/textures/blocks/block/tritonite.png | Bin 0 -> 16412 bytes .../assets/taiga/textures/blocks/block/uru.png | Bin 0 -> 15818 bytes .../assets/taiga/textures/blocks/block/valyrium.png | Bin 0 -> 16402 bytes .../assets/taiga/textures/blocks/block/vibranium.png | Bin 0 -> 16313 bytes .../assets/taiga/textures/blocks/block/violium.png | Bin 0 -> 18676 bytes .../assets/taiga/textures/blocks/block/yrdeen.png | Bin 0 -> 16245 bytes .../assets/taiga/textures/blocks/bysmuid_block.png | Bin 16309 -> 0 bytes .../assets/taiga/textures/blocks/cryptogen_block.png | Bin 16372 -> 0 bytes .../assets/taiga/textures/blocks/dyonite_block.png | Bin 16355 -> 0 bytes .../assets/taiga/textures/blocks/eternite_block.png | Bin 16338 -> 0 bytes .../assets/taiga/textures/blocks/eternite_ore.png | Bin 15787 -> 0 bytes .../assets/taiga/textures/blocks/fractoryte_block.png | Bin 16330 -> 0 bytes .../assets/taiga/textures/blocks/glimmerstone_block.png | Bin 16169 -> 0 bytes .../assets/taiga/textures/blocks/ignitite_block.png | Bin 16566 -> 0 bytes .../assets/taiga/textures/blocks/ignitite_ore.png | Bin 16033 -> 0 bytes .../assets/taiga/textures/blocks/imperomite_block.png | Bin 16410 -> 0 bytes .../assets/taiga/textures/blocks/karmesine_block.png | Bin 16416 -> 0 bytes .../assets/taiga/textures/blocks/karmesine_ore.png | Bin 15940 -> 0 bytes .../assets/taiga/textures/blocks/lignite_ore.png | Bin 15210 -> 0 bytes .../assets/taiga/textures/blocks/luminar_block.png | Bin 16201 -> 0 bytes .../assets/taiga/textures/blocks/lumixyl_block.png | Bin 16495 -> 0 bytes .../taiga/textures/blocks/materials/adamantite.png | Bin 16136 -> 0 bytes .../assets/taiga/textures/blocks/materials/arcanite.png | Bin 16356 -> 0 bytes .../taiga/textures/blocks/materials/ardite_rust.png | Bin 15782 -> 0 bytes .../assets/taiga/textures/blocks/materials/bismuth.png | Bin 16187 -> 0 bytes .../assets/taiga/textures/blocks/materials/bysmuid.png | Bin 16382 -> 0 bytes .../assets/taiga/textures/blocks/materials/dyonite.png | Bin 16261 -> 0 bytes .../taiga/textures/blocks/materials/imperomite.png | Bin 16387 -> 0 bytes .../taiga/textures/blocks/materials/meteorite.png | Bin 16282 -> 0 bytes .../assets/taiga/textures/blocks/materials/noctunyx.png | Bin 16304 -> 0 bytes .../assets/taiga/textures/blocks/materials/nucleum.png | Bin 16269 -> 0 bytes .../taiga/textures/blocks/materials/prometheum.png | Bin 16272 -> 0 bytes .../taiga/textures/blocks/materials/proxideum.png | Bin 16389 -> 0 bytes .../assets/taiga/textures/blocks/materials/solarium.png | Bin 16381 -> 0 bytes .../assets/taiga/textures/blocks/materials/tiberium.png | Bin 16303 -> 0 bytes .../assets/taiga/textures/blocks/meteorite_block.png | Bin 16149 -> 0 bytes .../assets/taiga/textures/blocks/meteorite_ore.png | Bin 16081 -> 0 bytes .../assets/taiga/textures/blocks/mindorite_block.png | Bin 16393 -> 0 bytes .../assets/taiga/textures/blocks/mindorite_ore.png | Bin 15722 -> 0 bytes .../assets/taiga/textures/blocks/mythril_block.png | Bin 16287 -> 0 bytes .../assets/taiga/textures/blocks/mythril_ore.png | Bin 15668 -> 0 bytes .../assets/taiga/textures/blocks/nitronite_block.png | Bin 16409 -> 0 bytes .../assets/taiga/textures/blocks/noctunyx_block.png | Bin 16507 -> 0 bytes .../assets/taiga/textures/blocks/nucleum_block.png | Bin 16244 -> 0 bytes .../assets/taiga/textures/blocks/ore/abyssum.png | Bin 0 -> 16458 bytes .../assets/taiga/textures/blocks/ore/aurorium.png | Bin 0 -> 16317 bytes .../assets/taiga/textures/blocks/ore/duranite.png | Bin 0 -> 17091 bytes .../resources/assets/taiga/textures/blocks/ore/eezo.png | Bin 0 -> 16153 bytes .../assets/taiga/textures/blocks/ore/karmesine.png | Bin 0 -> 16346 bytes .../taiga/textures/blocks/ore/karmesineandensite.png | Bin 0 -> 16346 bytes .../taiga/textures/blocks/ore/karmesinediorite.png | Bin 0 -> 16328 bytes .../taiga/textures/blocks/ore/karmesinegranite.png | Bin 0 -> 16278 bytes .../assets/taiga/textures/blocks/ore/osram.png | Bin 0 -> 16576 bytes .../assets/taiga/textures/blocks/ore/palladium.png | Bin 0 -> 16268 bytes .../assets/taiga/textures/blocks/ore/prometheum.png | Bin 0 -> 16359 bytes .../assets/taiga/textures/blocks/ore/tiberium.png | Bin 0 -> 16507 bytes .../resources/assets/taiga/textures/blocks/ore/uru.png | Bin 0 -> 17057 bytes .../assets/taiga/textures/blocks/ore/valyrium.png | Bin 0 -> 16402 bytes .../assets/taiga/textures/blocks/ore/vibranium.png | Bin 0 -> 16291 bytes .../assets/taiga/textures/blocks/palladium_block.png | Bin 16416 -> 0 bytes .../assets/taiga/textures/blocks/palladium_ore.png | Bin 16380 -> 0 bytes .../assets/taiga/textures/blocks/prometheum_block.png | Bin 15949 -> 0 bytes .../assets/taiga/textures/blocks/prometheum_ore.png | Bin 16364 -> 0 bytes .../assets/taiga/textures/blocks/proxideum_block.png | Bin 16482 -> 0 bytes .../assets/taiga/textures/blocks/rotten_ground.png | Bin 15816 -> 0 bytes .../assets/taiga/textures/blocks/rubium_block.png | Bin 16416 -> 0 bytes .../assets/taiga/textures/blocks/rubium_ore.png | Bin 16026 -> 0 bytes .../assets/taiga/textures/blocks/seismodium_block.png | Bin 16351 -> 0 bytes .../assets/taiga/textures/blocks/slaggold_ore.png | Bin 15548 -> 0 bytes .../assets/taiga/textures/blocks/slagiron_ore.png | Bin 15473 -> 0 bytes .../assets/taiga/textures/blocks/solarium_block.png | Bin 16314 -> 0 bytes .../assets/taiga/textures/blocks/terramite_block.png | Bin 16378 -> 0 bytes .../assets/taiga/textures/blocks/tiberium_block.png | Bin 16507 -> 0 bytes .../assets/taiga/textures/blocks/tiberium_ore.png | Bin 16454 -> 0 bytes .../assets/taiga/textures/blocks/titanite_block.png | Bin 16273 -> 0 bytes .../assets/taiga/textures/blocks/titanite_ore.png | Bin 16401 -> 0 bytes .../assets/taiga/textures/blocks/ultranite_block.png | Bin 16096 -> 0 bytes .../assets/taiga/textures/blocks/vibranium_block.png | Bin 16410 -> 0 bytes .../assets/taiga/textures/blocks/vibranium_ore.png | Bin 15832 -> 0 bytes .../assets/taiga/textures/blocks/violium_block.png | Bin 18654 -> 0 bytes .../assets/taiga/textures/blocks/violium_ore.png | Bin 15997 -> 0 bytes 119 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/taiga/textures/blocks/adamantite_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/adamantite_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/aegisalt_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/arcanite_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/arcanite_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/astrium_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/basalt.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/bismuth_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/bismuth_ore.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/abyssum.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/adamant.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/astrium.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/aurorium.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/basalt.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/duranite.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/dyonite.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/eezo.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/fractum.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/ignitz.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/imperomite.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/iox.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/karmesine.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/lumix.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/meteorite.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/meteoritecobble.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/nihilite.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/niob.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/nucleum.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/obsidiorite.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/obsidioritecobble.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/osram.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/palladium.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/prometheum.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/proxii.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/seismum.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/solarium.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/tiberium.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/triberium.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/tritonite.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/uru.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/valyrium.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/vibranium.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/violium.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/yrdeen.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/bysmuid_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/cryptogen_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/dyonite_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/eternite_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/eternite_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/fractoryte_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/glimmerstone_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/ignitite_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/ignitite_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/imperomite_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/karmesine_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/karmesine_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/lignite_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/luminar_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/lumixyl_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/adamantite.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/arcanite.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/ardite_rust.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/bismuth.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/bysmuid.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/dyonite.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/imperomite.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/meteorite.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/noctunyx.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/nucleum.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/prometheum.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/proxideum.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/solarium.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/materials/tiberium.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/meteorite_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/meteorite_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/mindorite_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/mindorite_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/mythril_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/mythril_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/nitronite_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/noctunyx_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/nucleum_block.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/abyssum.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/aurorium.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/duranite.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/eezo.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/osram.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/palladium.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/prometheum.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/tiberium.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/uru.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/valyrium.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/palladium_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/palladium_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/prometheum_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/prometheum_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/proxideum_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/rotten_ground.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/rubium_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/rubium_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/seismodium_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/slaggold_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/slagiron_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/solarium_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/terramite_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/tiberium_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/tiberium_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/titanite_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/titanite_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/ultranite_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/vibranium_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/vibranium_ore.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/violium_block.png delete mode 100644 src/main/resources/assets/taiga/textures/blocks/violium_ore.png (limited to 'src/main/resources/assets/taiga/textures/blocks') diff --git a/src/main/resources/assets/taiga/textures/blocks/adamantite_block.png b/src/main/resources/assets/taiga/textures/blocks/adamantite_block.png deleted file mode 100644 index f67fec9..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/adamantite_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/adamantite_ore.png b/src/main/resources/assets/taiga/textures/blocks/adamantite_ore.png deleted file mode 100644 index eef2f58..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/adamantite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/aegisalt_block.png b/src/main/resources/assets/taiga/textures/blocks/aegisalt_block.png deleted file mode 100644 index 2a06673..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/aegisalt_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/arcanite_block.png b/src/main/resources/assets/taiga/textures/blocks/arcanite_block.png deleted file mode 100644 index 922eff5..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/arcanite_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/arcanite_ore.png b/src/main/resources/assets/taiga/textures/blocks/arcanite_ore.png deleted file mode 100644 index c0ccaa8..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/arcanite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/astrium_block.png b/src/main/resources/assets/taiga/textures/blocks/astrium_block.png deleted file mode 100644 index 9081516..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/astrium_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/basalt.png b/src/main/resources/assets/taiga/textures/blocks/basalt.png deleted file mode 100644 index 9c99a1d..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/basalt.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/bismuth_block.png b/src/main/resources/assets/taiga/textures/blocks/bismuth_block.png deleted file mode 100644 index 52bed7a..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/bismuth_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/bismuth_ore.png b/src/main/resources/assets/taiga/textures/blocks/bismuth_ore.png deleted file mode 100644 index f25e468..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/bismuth_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/abyssum.png b/src/main/resources/assets/taiga/textures/blocks/block/abyssum.png new file mode 100644 index 0000000..61af1b0 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/abyssum.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/adamant.png b/src/main/resources/assets/taiga/textures/blocks/block/adamant.png new file mode 100644 index 0000000..02a1600 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/adamant.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/astrium.png b/src/main/resources/assets/taiga/textures/blocks/block/astrium.png new file mode 100644 index 0000000..41fc303 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/astrium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/aurorium.png b/src/main/resources/assets/taiga/textures/blocks/block/aurorium.png new file mode 100644 index 0000000..c01a0a6 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/aurorium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/basalt.png b/src/main/resources/assets/taiga/textures/blocks/block/basalt.png new file mode 100644 index 0000000..89b1bc0 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/basalt.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/duranite.png b/src/main/resources/assets/taiga/textures/blocks/block/duranite.png new file mode 100644 index 0000000..33ebb6f Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/duranite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/dyonite.png b/src/main/resources/assets/taiga/textures/blocks/block/dyonite.png new file mode 100644 index 0000000..8c62c2c Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/dyonite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/eezo.png b/src/main/resources/assets/taiga/textures/blocks/block/eezo.png new file mode 100644 index 0000000..31f6995 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/eezo.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/fractum.png b/src/main/resources/assets/taiga/textures/blocks/block/fractum.png new file mode 100644 index 0000000..1385cb2 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/fractum.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/ignitz.png b/src/main/resources/assets/taiga/textures/blocks/block/ignitz.png new file mode 100644 index 0000000..6b6b469 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/ignitz.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/imperomite.png b/src/main/resources/assets/taiga/textures/blocks/block/imperomite.png new file mode 100644 index 0000000..eec6810 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/imperomite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/iox.png b/src/main/resources/assets/taiga/textures/blocks/block/iox.png new file mode 100644 index 0000000..b83e533 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/iox.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/karmesine.png b/src/main/resources/assets/taiga/textures/blocks/block/karmesine.png new file mode 100644 index 0000000..aa4fbaf Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/karmesine.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/lumix.png b/src/main/resources/assets/taiga/textures/blocks/block/lumix.png new file mode 100644 index 0000000..9fabbf5 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/lumix.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/meteorite.png b/src/main/resources/assets/taiga/textures/blocks/block/meteorite.png new file mode 100644 index 0000000..9fa9f7c Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/meteorite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/meteoritecobble.png b/src/main/resources/assets/taiga/textures/blocks/block/meteoritecobble.png new file mode 100644 index 0000000..52bd818 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/meteoritecobble.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/nihilite.png b/src/main/resources/assets/taiga/textures/blocks/block/nihilite.png new file mode 100644 index 0000000..7ac79e9 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/nihilite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/niob.png b/src/main/resources/assets/taiga/textures/blocks/block/niob.png new file mode 100644 index 0000000..237de66 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/niob.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/nucleum.png b/src/main/resources/assets/taiga/textures/blocks/block/nucleum.png new file mode 100644 index 0000000..e1e7a94 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/nucleum.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/obsidiorite.png b/src/main/resources/assets/taiga/textures/blocks/block/obsidiorite.png new file mode 100644 index 0000000..e7cbd1f Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/obsidiorite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/obsidioritecobble.png b/src/main/resources/assets/taiga/textures/blocks/block/obsidioritecobble.png new file mode 100644 index 0000000..30bc10d Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/obsidioritecobble.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/osram.png b/src/main/resources/assets/taiga/textures/blocks/block/osram.png new file mode 100644 index 0000000..f5b694e Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/osram.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/palladium.png b/src/main/resources/assets/taiga/textures/blocks/block/palladium.png new file mode 100644 index 0000000..7c133ac Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/palladium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/prometheum.png b/src/main/resources/assets/taiga/textures/blocks/block/prometheum.png new file mode 100644 index 0000000..6927ed4 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/prometheum.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/proxii.png b/src/main/resources/assets/taiga/textures/blocks/block/proxii.png new file mode 100644 index 0000000..97bb2bb Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/proxii.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/seismum.png b/src/main/resources/assets/taiga/textures/blocks/block/seismum.png new file mode 100644 index 0000000..3230362 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/seismum.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/solarium.png b/src/main/resources/assets/taiga/textures/blocks/block/solarium.png new file mode 100644 index 0000000..c817270 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/solarium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/tiberium.png b/src/main/resources/assets/taiga/textures/blocks/block/tiberium.png new file mode 100644 index 0000000..694f605 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/tiberium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/triberium.png b/src/main/resources/assets/taiga/textures/blocks/block/triberium.png new file mode 100644 index 0000000..e72e2ad Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/triberium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/tritonite.png b/src/main/resources/assets/taiga/textures/blocks/block/tritonite.png new file mode 100644 index 0000000..20a8aca Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/tritonite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/uru.png b/src/main/resources/assets/taiga/textures/blocks/block/uru.png new file mode 100644 index 0000000..1c5539c Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/uru.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/valyrium.png b/src/main/resources/assets/taiga/textures/blocks/block/valyrium.png new file mode 100644 index 0000000..c77036e Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/valyrium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/vibranium.png b/src/main/resources/assets/taiga/textures/blocks/block/vibranium.png new file mode 100644 index 0000000..a4c81f1 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/vibranium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/violium.png b/src/main/resources/assets/taiga/textures/blocks/block/violium.png new file mode 100644 index 0000000..e47d8bd Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/violium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/block/yrdeen.png b/src/main/resources/assets/taiga/textures/blocks/block/yrdeen.png new file mode 100644 index 0000000..ebc8e17 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/block/yrdeen.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/bysmuid_block.png b/src/main/resources/assets/taiga/textures/blocks/bysmuid_block.png deleted file mode 100644 index 97f51ac..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/bysmuid_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/cryptogen_block.png b/src/main/resources/assets/taiga/textures/blocks/cryptogen_block.png deleted file mode 100644 index 8cbab02..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/cryptogen_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/dyonite_block.png b/src/main/resources/assets/taiga/textures/blocks/dyonite_block.png deleted file mode 100644 index f2da30d..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/dyonite_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/eternite_block.png b/src/main/resources/assets/taiga/textures/blocks/eternite_block.png deleted file mode 100644 index 816cb59..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/eternite_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/eternite_ore.png b/src/main/resources/assets/taiga/textures/blocks/eternite_ore.png deleted file mode 100644 index e670b09..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/eternite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/fractoryte_block.png b/src/main/resources/assets/taiga/textures/blocks/fractoryte_block.png deleted file mode 100644 index 72a39cb..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/fractoryte_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/glimmerstone_block.png b/src/main/resources/assets/taiga/textures/blocks/glimmerstone_block.png deleted file mode 100644 index 2130671..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/glimmerstone_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ignitite_block.png b/src/main/resources/assets/taiga/textures/blocks/ignitite_block.png deleted file mode 100644 index 367e093..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/ignitite_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ignitite_ore.png b/src/main/resources/assets/taiga/textures/blocks/ignitite_ore.png deleted file mode 100644 index 52340ce..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/ignitite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/imperomite_block.png b/src/main/resources/assets/taiga/textures/blocks/imperomite_block.png deleted file mode 100644 index 8117b3e..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/imperomite_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/karmesine_block.png b/src/main/resources/assets/taiga/textures/blocks/karmesine_block.png deleted file mode 100644 index aba4464..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/karmesine_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/karmesine_ore.png b/src/main/resources/assets/taiga/textures/blocks/karmesine_ore.png deleted file mode 100644 index a2231d3..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/karmesine_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/lignite_ore.png b/src/main/resources/assets/taiga/textures/blocks/lignite_ore.png deleted file mode 100644 index b29c12c..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/lignite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/luminar_block.png b/src/main/resources/assets/taiga/textures/blocks/luminar_block.png deleted file mode 100644 index 4de3538..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/luminar_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/lumixyl_block.png b/src/main/resources/assets/taiga/textures/blocks/lumixyl_block.png deleted file mode 100644 index a3f39a2..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/lumixyl_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/adamantite.png b/src/main/resources/assets/taiga/textures/blocks/materials/adamantite.png deleted file mode 100644 index 819d422..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/adamantite.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/arcanite.png b/src/main/resources/assets/taiga/textures/blocks/materials/arcanite.png deleted file mode 100644 index 38be3fb..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/arcanite.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/ardite_rust.png b/src/main/resources/assets/taiga/textures/blocks/materials/ardite_rust.png deleted file mode 100644 index bb0c6ea..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/ardite_rust.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/bismuth.png b/src/main/resources/assets/taiga/textures/blocks/materials/bismuth.png deleted file mode 100644 index d924fc4..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/bismuth.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/bysmuid.png b/src/main/resources/assets/taiga/textures/blocks/materials/bysmuid.png deleted file mode 100644 index c34d608..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/bysmuid.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/dyonite.png b/src/main/resources/assets/taiga/textures/blocks/materials/dyonite.png deleted file mode 100644 index 1f0d20a..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/dyonite.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/imperomite.png b/src/main/resources/assets/taiga/textures/blocks/materials/imperomite.png deleted file mode 100644 index 9bd120b..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/imperomite.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/meteorite.png b/src/main/resources/assets/taiga/textures/blocks/materials/meteorite.png deleted file mode 100644 index 1ee5646..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/meteorite.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/noctunyx.png b/src/main/resources/assets/taiga/textures/blocks/materials/noctunyx.png deleted file mode 100644 index 76a8cda..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/noctunyx.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/nucleum.png b/src/main/resources/assets/taiga/textures/blocks/materials/nucleum.png deleted file mode 100644 index 7a0eb1c..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/nucleum.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/prometheum.png b/src/main/resources/assets/taiga/textures/blocks/materials/prometheum.png deleted file mode 100644 index affe950..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/prometheum.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/proxideum.png b/src/main/resources/assets/taiga/textures/blocks/materials/proxideum.png deleted file mode 100644 index 329228b..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/proxideum.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/solarium.png b/src/main/resources/assets/taiga/textures/blocks/materials/solarium.png deleted file mode 100644 index 0927f8c..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/solarium.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/tiberium.png b/src/main/resources/assets/taiga/textures/blocks/materials/tiberium.png deleted file mode 100644 index 83c08e7..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/materials/tiberium.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/meteorite_block.png b/src/main/resources/assets/taiga/textures/blocks/meteorite_block.png deleted file mode 100644 index 291df0d..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/meteorite_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/meteorite_ore.png b/src/main/resources/assets/taiga/textures/blocks/meteorite_ore.png deleted file mode 100644 index c7ea152..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/meteorite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/mindorite_block.png b/src/main/resources/assets/taiga/textures/blocks/mindorite_block.png deleted file mode 100644 index 55f2dcd..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/mindorite_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/mindorite_ore.png b/src/main/resources/assets/taiga/textures/blocks/mindorite_ore.png deleted file mode 100644 index 83257cc..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/mindorite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/mythril_block.png b/src/main/resources/assets/taiga/textures/blocks/mythril_block.png deleted file mode 100644 index fc7f9dd..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/mythril_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/mythril_ore.png b/src/main/resources/assets/taiga/textures/blocks/mythril_ore.png deleted file mode 100644 index 4e5d8ac..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/mythril_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/nitronite_block.png b/src/main/resources/assets/taiga/textures/blocks/nitronite_block.png deleted file mode 100644 index bb1f7b6..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/nitronite_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/noctunyx_block.png b/src/main/resources/assets/taiga/textures/blocks/noctunyx_block.png deleted file mode 100644 index cbd7271..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/noctunyx_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/nucleum_block.png b/src/main/resources/assets/taiga/textures/blocks/nucleum_block.png deleted file mode 100644 index 83b9373..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/nucleum_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/abyssum.png b/src/main/resources/assets/taiga/textures/blocks/ore/abyssum.png new file mode 100644 index 0000000..ca66cd5 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/abyssum.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/aurorium.png b/src/main/resources/assets/taiga/textures/blocks/ore/aurorium.png new file mode 100644 index 0000000..317e11b Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/aurorium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/duranite.png b/src/main/resources/assets/taiga/textures/blocks/ore/duranite.png new file mode 100644 index 0000000..1a42364 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/duranite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/eezo.png b/src/main/resources/assets/taiga/textures/blocks/ore/eezo.png new file mode 100644 index 0000000..6de223a Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/eezo.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png new file mode 100644 index 0000000..7e4d7c2 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png new file mode 100644 index 0000000..7e4d7c2 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png new file mode 100644 index 0000000..4f14e7a Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png new file mode 100644 index 0000000..9b42d38 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/osram.png b/src/main/resources/assets/taiga/textures/blocks/ore/osram.png new file mode 100644 index 0000000..904c9a5 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/osram.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/palladium.png b/src/main/resources/assets/taiga/textures/blocks/ore/palladium.png new file mode 100644 index 0000000..b389832 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/palladium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/prometheum.png b/src/main/resources/assets/taiga/textures/blocks/ore/prometheum.png new file mode 100644 index 0000000..7e18f41 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/prometheum.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/tiberium.png b/src/main/resources/assets/taiga/textures/blocks/ore/tiberium.png new file mode 100644 index 0000000..54fde77 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/tiberium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/uru.png b/src/main/resources/assets/taiga/textures/blocks/ore/uru.png new file mode 100644 index 0000000..bc108a4 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/uru.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/valyrium.png b/src/main/resources/assets/taiga/textures/blocks/ore/valyrium.png new file mode 100644 index 0000000..a2ef123 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/valyrium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png b/src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png new file mode 100644 index 0000000..7f57ab8 Binary files /dev/null and b/src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png differ diff --git a/src/main/resources/assets/taiga/textures/blocks/palladium_block.png b/src/main/resources/assets/taiga/textures/blocks/palladium_block.png deleted file mode 100644 index 7ea420d..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/palladium_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/palladium_ore.png b/src/main/resources/assets/taiga/textures/blocks/palladium_ore.png deleted file mode 100644 index f40aafc..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/palladium_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/prometheum_block.png b/src/main/resources/assets/taiga/textures/blocks/prometheum_block.png deleted file mode 100644 index aad5be2..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/prometheum_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/prometheum_ore.png b/src/main/resources/assets/taiga/textures/blocks/prometheum_ore.png deleted file mode 100644 index 7d4b3c7..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/prometheum_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/proxideum_block.png b/src/main/resources/assets/taiga/textures/blocks/proxideum_block.png deleted file mode 100644 index a305bae..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/proxideum_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/rotten_ground.png b/src/main/resources/assets/taiga/textures/blocks/rotten_ground.png deleted file mode 100644 index 10be0ab..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/rotten_ground.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/rubium_block.png b/src/main/resources/assets/taiga/textures/blocks/rubium_block.png deleted file mode 100644 index 2caaf9c..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/rubium_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/rubium_ore.png b/src/main/resources/assets/taiga/textures/blocks/rubium_ore.png deleted file mode 100644 index a2c1cb9..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/rubium_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/seismodium_block.png b/src/main/resources/assets/taiga/textures/blocks/seismodium_block.png deleted file mode 100644 index 32f7eba..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/seismodium_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/slaggold_ore.png b/src/main/resources/assets/taiga/textures/blocks/slaggold_ore.png deleted file mode 100644 index a2cbd94..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/slaggold_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/slagiron_ore.png b/src/main/resources/assets/taiga/textures/blocks/slagiron_ore.png deleted file mode 100644 index c3f9d53..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/slagiron_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/solarium_block.png b/src/main/resources/assets/taiga/textures/blocks/solarium_block.png deleted file mode 100644 index 34466a9..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/solarium_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/terramite_block.png b/src/main/resources/assets/taiga/textures/blocks/terramite_block.png deleted file mode 100644 index f3307b4..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/terramite_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/tiberium_block.png b/src/main/resources/assets/taiga/textures/blocks/tiberium_block.png deleted file mode 100644 index 1869eaf..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/tiberium_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/tiberium_ore.png b/src/main/resources/assets/taiga/textures/blocks/tiberium_ore.png deleted file mode 100644 index ca7d295..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/tiberium_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/titanite_block.png b/src/main/resources/assets/taiga/textures/blocks/titanite_block.png deleted file mode 100644 index 4b05462..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/titanite_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/titanite_ore.png b/src/main/resources/assets/taiga/textures/blocks/titanite_ore.png deleted file mode 100644 index 9348e24..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/titanite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/ultranite_block.png b/src/main/resources/assets/taiga/textures/blocks/ultranite_block.png deleted file mode 100644 index 6ae2fbb..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/ultranite_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/vibranium_block.png b/src/main/resources/assets/taiga/textures/blocks/vibranium_block.png deleted file mode 100644 index 71e61c1..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/vibranium_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/vibranium_ore.png b/src/main/resources/assets/taiga/textures/blocks/vibranium_ore.png deleted file mode 100644 index 166649a..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/vibranium_ore.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/violium_block.png b/src/main/resources/assets/taiga/textures/blocks/violium_block.png deleted file mode 100644 index ef5d02c..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/violium_block.png and /dev/null differ diff --git a/src/main/resources/assets/taiga/textures/blocks/violium_ore.png b/src/main/resources/assets/taiga/textures/blocks/violium_ore.png deleted file mode 100644 index cb0b06d..0000000 Binary files a/src/main/resources/assets/taiga/textures/blocks/violium_ore.png and /dev/null differ -- cgit v1.2.3