Merge pull request #536 from BBoldt/1.8-Rewrite

Browse source

Unity textures

...

This commit is contained in:

WayofTime 2016-01-01 19:58:56 -05:00

parent 2eaa9bf578 6edd578646

commit b51705d90a

276 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

src/main/resources/assets/bloodmagic

gui

jei

altar.png

nei

altar.pngaltar_alt2.png

textures

blocks

AccelerationRune.pngAirRitualStone.pngAlchemicChemistrySet.pngAltarCapacityRune.pngArcanePedestal.pngArcanePlinth.pngBetterCapacityRune.pngBlankRune.pngBloodAltar_Bottom.pngBloodAltar_SideType1.pngBloodAltar_SideType2.pngBloodAltar_Top.pngBloodSocket.pngBloodStoneBrick.pngCrucible_Bottom.pngCrucible_Side.pngCrucible_Top.pngDemonPortal.pngDislocationRune.pngDuskRitualStone.pngEarthRitualStone.pngEfficiencyRune.pngEmptySocket.pngFireRitualStone.pngGlyphEnchantability.pngGlyphEnchantmentLevel.pngGlyphStability.pngImperfectRitualStone.pngLargeBloodStoneBrick.pngLightRitualStone.pngMasterStone.pngOrbCapacityRune.pngRitualStone.pngRuneOfSacrifice.pngRuneOfSelfSacrifice.pngShardCluster.pngShardClusterBrick.pngSoulForge.pngSpectralBlock.pngSpeedRune.pngTeleposer_Side.pngTeleposer_Top.pngTesting.pngWaterRitualStone.pngfireEffectBlock_blank.pngfireEffectBlock_input.pngfireEffectBlock_output.pngfireEffectBlock_upArrow.pnglifeEssenceFlowing.pnglifeEssenceStill.pngspell_table_bottom.pngspell_table_side.pngspell_table_top.png

gui

HPBar1.pngHPBar2.pngcontainer.pngcontainer1.pnglpVial.png

items

8wWtY8d.pngAirScribeTool.pngAirSigil.pngApprenticeBloodOrb.pngArchmageBloodOrb.pngArmourInhibitor_activated.pngArmourInhibitor_deactivated.pngAttunedCrystal1.pngAttunedCrystal2.pngAverageLengtheningCatalyst.pngAveragePowerCatalyst.pngBlankSlate.pngBlankSpell.pngBloodFrame.pngBloodLightSigil.pngBloodPack.pngBoundAxe_activated.pngBoundBoots.pngBoundHelmet.pngBoundLeggings.pngBoundPickaxe_activated.pngBoundPlate.pngBoundShovel_activated.pngBoundSword_activated.pngBoundTool.pngBridgeSigil_activated.pngBridgeSigil_deactivated.pngCeremonialDagger.pngCombinationalCatalyst.pngComplexCrystal.pngCompressionSigil_activated.pngCompressionSigil_deactivated.pngCrystallos.pngDaggerOfSacrifice.pngDawnScribeTool.pngDemonBloodShard.pngDemonPlacer.pngDemonSlate.pngDemonicTeleposerFocus.png

Show more

BIN

src/main/resources/assets/bloodmagic/gui/jei/altar.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 18 KiB After (image error) Size: 2.3 KiB

BIN

src/main/resources/assets/bloodmagic/gui/nei/altar.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 4.1 KiB After (image error) Size: 3.6 KiB

BIN

src/main/resources/assets/bloodmagic/gui/nei/altar_alt2.png Normal file

View file

Binary file not shown.

Side by side After (image error) Size: 4.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/AccelerationRune.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 754 B After (image error) Size: 3.4 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/AirRitualStone.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 706 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/AlchemicChemistrySet.png

View file

Binary file not shown.

Side by side Before (image error) Size: 450 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/AltarCapacityRune.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 761 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/ArcanePedestal.png

View file

Binary file not shown.

Side by side Before (image error) Size: 428 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/ArcanePlinth.png

View file

Binary file not shown.

Side by side Before (image error) Size: 497 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/BetterCapacityRune.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 771 B After (image error) Size: 3.4 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/BlankRune.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 693 B After (image error) Size: 1.5 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/BloodAltar_Bottom.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.7 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/BloodAltar_SideType1.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.4 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/BloodAltar_SideType2.png

View file

Binary file not shown.

Side by side Before (image error) Size: 1.4 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/BloodAltar_Top.png

View file

Binary file not shown.

Side by side Before (image error) Size: 2.2 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/BloodSocket.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 481 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/BloodStoneBrick.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 459 B After (image error) Size: 1.5 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/Crucible_Bottom.png

View file

Binary file not shown.

Side by side Before (image error) Size: 434 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/Crucible_Side.png

View file

Binary file not shown.

Side by side Before (image error) Size: 737 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/Crucible_Top.png

View file

Binary file not shown.

Side by side Before (image error) Size: 498 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/DemonPortal.png

View file

Binary file not shown.

Side by side Before (image error) Size: 416 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/DislocationRune.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 741 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/DuskRitualStone.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 762 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/EarthRitualStone.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 736 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/EfficiencyRune.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 738 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/EmptySocket.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 271 B After (image error) Size: 1.5 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/FireRitualStone.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 779 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/GlyphEnchantability.png

View file

Binary file not shown.

Side by side Before (image error) Size: 667 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/GlyphEnchantmentLevel.png

View file

Binary file not shown.

Side by side Before (image error) Size: 699 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/GlyphStability.png

View file

Binary file not shown.

Side by side Before (image error) Size: 572 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/ImperfectRitualStone.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 617 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/LargeBloodStoneBrick.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 493 B After (image error) Size: 598 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/LightRitualStone.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 811 B After (image error) Size: 878 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/MasterStone.png Normal file

View file

Binary file not shown.

Side by side After (image error) Size: 1.5 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/OrbCapacityRune.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 733 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/RitualStone.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 630 B After (image error) Size: 1.5 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/RuneOfSacrifice.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 741 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/RuneOfSelfSacrifice.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 830 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/ShardCluster.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 691 B After (image error) Size: 891 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/ShardClusterBrick.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 506 B After (image error) Size: 809 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/SoulForge.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 632 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/SpectralBlock.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 174 B After (image error) Size: 1.7 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/SpeedRune.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 797 B After (image error) Size: 1.7 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/Teleposer_Side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 719 B After (image error) Size: 1.7 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/Teleposer_Top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 696 B After (image error) Size: 1.7 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/Testing.png

View file

Binary file not shown.

Side by side Before (image error) Size: 815 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/WaterRitualStone.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 745 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/fireEffectBlock_blank.png

View file

Binary file not shown.

Side by side Before (image error) Size: 311 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/fireEffectBlock_input.png

View file

Binary file not shown.

Side by side Before (image error) Size: 342 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/fireEffectBlock_output.png

View file

Binary file not shown.

Side by side Before (image error) Size: 314 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/fireEffectBlock_upArrow.png

View file

Binary file not shown.

Side by side Before (image error) Size: 329 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/lifeEssenceFlowing.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 6 KiB After (image error) Size: 6.9 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/lifeEssenceStill.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 5.3 KiB After (image error) Size: 7.4 KiB

BIN

src/main/resources/assets/bloodmagic/textures/blocks/spell_table_bottom.png

View file

Binary file not shown.

Side by side Before (image error) Size: 680 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/spell_table_side.png

View file

Binary file not shown.

Side by side Before (image error) Size: 734 B

BIN

src/main/resources/assets/bloodmagic/textures/blocks/spell_table_top.png

View file

Binary file not shown.

Side by side Before (image error) Size: 622 B

BIN

src/main/resources/assets/bloodmagic/textures/gui/HPBar1.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 737 B After (image error) Size: 1.5 KiB

BIN

src/main/resources/assets/bloodmagic/textures/gui/HPBar2.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 451 B After (image error) Size: 610 B

BIN

src/main/resources/assets/bloodmagic/textures/gui/container.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 695 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/gui/container1.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 526 B After (image error) Size: 1.7 KiB

BIN

src/main/resources/assets/bloodmagic/textures/gui/lpVial.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 541 B After (image error) Size: 1.3 KiB

BIN

src/main/resources/assets/bloodmagic/textures/items/8wWtY8d.png

View file

Binary file not shown.

Side by side Before (image error) Size: 319 B

BIN

src/main/resources/assets/bloodmagic/textures/items/AirScribeTool.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 1.1 KiB After (image error) Size: 1.4 KiB

BIN

src/main/resources/assets/bloodmagic/textures/items/AirSigil.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 500 B After (image error) Size: 1.5 KiB

BIN

src/main/resources/assets/bloodmagic/textures/items/ApprenticeBloodOrb.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 831 B After (image error) Size: 2.1 KiB

BIN

src/main/resources/assets/bloodmagic/textures/items/ArchmageBloodOrb.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 590 B After (image error) Size: 2 KiB

BIN

src/main/resources/assets/bloodmagic/textures/items/ArmourInhibitor_activated.png

View file

Binary file not shown.

Side by side Before (image error) Size: 544 B

BIN

src/main/resources/assets/bloodmagic/textures/items/ArmourInhibitor_deactivated.png

View file

Binary file not shown.

Side by side Before (image error) Size: 556 B

BIN

src/main/resources/assets/bloodmagic/textures/items/AttunedCrystal1.png

View file

Binary file not shown.

Side by side Before (image error) Size: 221 B

BIN

src/main/resources/assets/bloodmagic/textures/items/AttunedCrystal2.png

View file

Binary file not shown.

Side by side Before (image error) Size: 177 B

BIN

src/main/resources/assets/bloodmagic/textures/items/AverageLengtheningCatalyst.png

View file

Binary file not shown.

Side by side Before (image error) Size: 405 B

BIN

src/main/resources/assets/bloodmagic/textures/items/AveragePowerCatalyst.png

View file

Binary file not shown.

Side by side Before (image error) Size: 387 B

BIN

src/main/resources/assets/bloodmagic/textures/items/BlankSlate.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 547 B After (image error) Size: 1.5 KiB

BIN

src/main/resources/assets/bloodmagic/textures/items/BlankSpell.png

View file

Binary file not shown.

Side by side Before (image error) Size: 339 B

BIN

src/main/resources/assets/bloodmagic/textures/items/BloodFrame.png

View file

Binary file not shown.

Side by side Before (image error) Size: 363 B

BIN

src/main/resources/assets/bloodmagic/textures/items/BloodLightSigil.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 536 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/items/BloodPack.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 319 B After (image error) Size: 446 B

BIN

src/main/resources/assets/bloodmagic/textures/items/BoundAxe_activated.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 397 B After (image error) Size: 522 B

BIN

src/main/resources/assets/bloodmagic/textures/items/BoundBoots.png

View file

Binary file not shown.

Side by side Before (image error) Size: 255 B

BIN

src/main/resources/assets/bloodmagic/textures/items/BoundHelmet.png

View file

Binary file not shown.

Side by side Before (image error) Size: 253 B

BIN

src/main/resources/assets/bloodmagic/textures/items/BoundLeggings.png

View file

Binary file not shown.

Side by side Before (image error) Size: 231 B

BIN

src/main/resources/assets/bloodmagic/textures/items/BoundPickaxe_activated.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 394 B After (image error) Size: 1.4 KiB

BIN

src/main/resources/assets/bloodmagic/textures/items/BoundPlate.png

View file

Binary file not shown.

Side by side Before (image error) Size: 282 B

BIN

src/main/resources/assets/bloodmagic/textures/items/BoundShovel_activated.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 390 B After (image error) Size: 1.4 KiB

BIN

src/main/resources/assets/bloodmagic/textures/items/BoundSword_activated.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 386 B After (image error) Size: 1.5 KiB

BIN

src/main/resources/assets/bloodmagic/textures/items/BoundTool.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 376 B After (image error) Size: 1.4 KiB

BIN

src/main/resources/assets/bloodmagic/textures/items/BridgeSigil_activated.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 632 B After (image error) Size: 1.5 KiB

BIN

src/main/resources/assets/bloodmagic/textures/items/BridgeSigil_deactivated.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 534 B After (image error) Size: 1.6 KiB

BIN

src/main/resources/assets/bloodmagic/textures/items/CeremonialDagger.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 321 B After (image error) Size: 1.2 KiB

BIN

src/main/resources/assets/bloodmagic/textures/items/CombinationalCatalyst.png

View file

Binary file not shown.

Side by side Before (image error) Size: 548 B

BIN

src/main/resources/assets/bloodmagic/textures/items/ComplexCrystal.png

View file

Binary file not shown.

Side by side Before (image error) Size: 414 B

BIN

src/main/resources/assets/bloodmagic/textures/items/CompressionSigil_activated.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 592 B After (image error) Size: 747 B

BIN

src/main/resources/assets/bloodmagic/textures/items/CompressionSigil_deactivated.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 616 B After (image error) Size: 724 B

BIN

src/main/resources/assets/bloodmagic/textures/items/Crystallos.png

View file

Binary file not shown.

Side by side Before (image error) Size: 391 B

BIN

src/main/resources/assets/bloodmagic/textures/items/DaggerOfSacrifice.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 476 B After (image error) Size: 523 B

BIN

src/main/resources/assets/bloodmagic/textures/items/DawnScribeTool.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 1.1 KiB After (image error) Size: 611 B

BIN

src/main/resources/assets/bloodmagic/textures/items/DemonBloodShard.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 457 B After (image error) Size: 1.5 KiB

BIN

src/main/resources/assets/bloodmagic/textures/items/DemonPlacer.png

View file

Binary file not shown.

Side by side Before (image error) Size: 399 B

BIN

src/main/resources/assets/bloodmagic/textures/items/DemonSlate.png

View file

Binary file not shown.

Side by side Swipe Overlay Before (image error) Size: 571 B After (image error) Size: 1.5 KiB

BIN

src/main/resources/assets/bloodmagic/textures/items/DemonicTeleposerFocus.png

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 603 B After (image error) Size: 976 B

Some files were not shown because too many files have changed in this diff Show more