Merge pull request #578 from BBoldt/1.8-Rewrite

Browse source

Sentient armour, Living armour, sentient bow and arrow; routing stuff; soul forge gui tweaks

...

This commit is contained in:

WayofTime 2016-01-26 06:28:09 -05:00

parent 895413f0f0 c953228585

commit e2a007d932

31 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

BIN

src/main/resources/assets/bloodmagic/models/armor/boundArmour_layer_1.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 3.7 KiB

BIN

src/main/resources/assets/bloodmagic/models/armor/boundArmour_layer_2.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 3.1 KiB

0

src/main/resources/assets/bloodmagic/models/armor/boundArmour_invisible_layer_1.png → src/main/resources/assets/bloodmagic/models/armor/livingArmour_invisible_layer_1.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.7 KiB After Width:  |  Height:  |  Size: 3.7 KiB

0

src/main/resources/assets/bloodmagic/models/armor/boundArmour_invisible_layer_2.png → src/main/resources/assets/bloodmagic/models/armor/livingArmour_invisible_layer_2.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

BIN

src/main/resources/assets/bloodmagic/models/armor/livingArmour_layer_1.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.3 KiB

BIN

src/main/resources/assets/bloodmagic/models/armor/livingArmour_layer_2.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

src/main/resources/assets/bloodmagic/models/armor/sentientArmour_layer_1.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.7 KiB After Width:  |  Height:  |  Size: 21 KiB

BIN

src/main/resources/assets/bloodmagic/models/armor/sentientArmour_layer_2.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 18 KiB

BIN

src/main/resources/assets/bloodmagic/textures/entities/soulArrow.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 279 B After Width:  |  Height:  |  Size: 772 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 4.9 KiB After Width:  |  Height:  |  Size: 25 KiB

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 441 B After Width:  |  Height:  |  Size: 667 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 698 B After Width:  |  Height:  |  Size: 678 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 692 B After Width:  |  Height:  |  Size: 682 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 693 B After Width:  |  Height:  |  Size: 681 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 697 B After Width:  |  Height:  |  Size: 681 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 255 B After Width:  |  Height:  |  Size: 584 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 253 B After Width:  |  Height:  |  Size: 436 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 231 B After Width:  |  Height:  |  Size: 419 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 282 B After Width:  |  Height:  |  Size: 473 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 221 B After Width:  |  Height:  |  Size: 500 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 475 B After Width:  |  Height:  |  Size: 921 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 472 B After Width:  |  Height:  |  Size: 851 B

BIN

src/main/resources/assets/bloodmagic/textures/items/SentientArrow.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 437 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 255 B After Width:  |  Height:  |  Size: 15 KiB

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 708 B After Width:  |  Height:  |  Size: 769 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 712 B After Width:  |  Height:  |  Size: 606 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 697 B After Width:  |  Height:  |  Size: 846 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 687 B After Width:  |  Height:  |  Size: 821 B

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 253 B After Width:  |  Height:  |  Size: 14 KiB

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 231 B After Width:  |  Height:  |  Size: 14 KiB

BIN

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

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 282 B After Width:  |  Height:  |  Size: 15 KiB