dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #173 from GustoniaEagle/mc1.10

Browse Source 
New textures + model
This commit is contained in:
Raoul
2016-07-08 18:33:31 +02:00
committed by GitHub
parent d63199cf81 a66b214561
commit 34afdb8915
44 changed files with 202 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

202
src/main/resources/assets/refinedstorage/models/block/solderer.json Normal file
View File

@@ -0,0 +1,202 @@
{
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
"0": "refinedstorage:blocks/quartz_enriched_iron_block.pngquartz_enriched_iron_block",
"1": "refinedstorage:blocks/side.pngside",
"2": "blocks/quartz_enriched_iron_block",
"3": "blocks/redstone_block.pngredstone_block",
"4": "blocks/redstone_block"
},
"elements": [
{
"name": "base",
"from": [ 0.0, 0.0, 0.0 ],
"to": [ 16.0, 4.0, 16.0 ],
"faces": {
"north": { "texture": "#0", "uv": [ 0.0, 12.0, 16.0, 16.0 ] },
"east": { "texture": "#0", "uv": [ 0.0, 12.0, 16.0, 16.0 ] },
"south": { "texture": "#0", "uv": [ 0.0, 12.0, 16.0, 16.0 ] },
"west": { "texture": "#0", "uv": [ 0.0, 12.0, 16.0, 16.0 ] },
"up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
"down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }
}
},
{
"name": "pedestalNW",
"from": [ 3.0, 4.0, 3.0 ],
"to": [ 7.0, 5.0, 7.0 ],
"faces": {
"north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] },
"east": { "texture": "#1", "uv": [ 4.0, 0.0, 8.0, 1.0 ] },
"south": { "texture": "#1", "uv": [ 7.0, 0.0, 11.0, 1.0 ] },
"west": { "texture": "#1", "uv": [ 12.0, 0.0, 16.0, 1.0 ] },
"up": { "texture": "#1", "uv": [ 2.0, 2.0, 6.0, 6.0 ] }
}
},
{
"name": "pedestalNE",
"from": [ 9.0, 4.0, 3.0 ],
"to": [ 13.0, 5.0, 7.0 ],
"faces": {
"north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] },
"east": { "texture": "#1", "uv": [ 4.0, 0.0, 8.0, 1.0 ] },
"south": { "texture": "#1", "uv": [ 8.0, 0.0, 12.0, 1.0 ] },
"west": { "texture": "#1", "uv": [ 12.0, 0.0, 16.0, 1.0 ] },
"up": { "texture": "#1", "uv": [ 10.0, 2.0, 14.0, 6.0 ] }
}
},
{
"name": "pedestalS",
"from": [ 6.0, 4.0, 9.0 ],
"to": [ 10.0, 5.0, 13.0 ],
"faces": {
"north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] },
"east": { "texture": "#1", "uv": [ 4.0, 0.0, 8.0, 1.0 ] },
"south": { "texture": "#1", "uv": [ 8.0, 0.0, 12.0, 1.0 ] },
"west": { "texture": "#1", "uv": [ 12.0, 0.0, 16.0, 1.0 ] },
"up": { "texture": "#1", "uv": [ 6.0, 11.0, 10.0, 15.0 ] }
}
},
{
"name": "poleNW",
"from": [ 1.0, 4.0, 1.0 ],
"to": [ 1.5, 12.0, 1.5 ],
"faces": {
"north": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] },
"east": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] },
"south": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] },
"west": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }
}
},
{
"name": "poleNE",
"from": [ 15.0, 4.0, 1.0 ],
"to": [ 15.5, 12.0, 1.5 ],
"faces": {
"north": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] },
"east": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] },
"south": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] },
"west": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }
}
},
{
"name": "poleSW",
"from": [ 1.0, 4.0, 15.0 ],
"to": [ 1.5, 12.0, 15.5 ],
"faces": {
"north": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] },
"east": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] },
"south": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] },
"west": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }
}
},
{
"name": "poleSE",
"from": [ 15.0, 4.0, 15.0 ],
"to": [ 15.5, 12.0, 15.5 ],
"faces": {
"north": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] },
"east": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] },
"south": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] },
"west": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }
}
},
{
"name": "roof",
"from": [ 0.0, 12.0, 0.0 ],
"to": [ 16.0, 13.5, 16.0 ],
"faces": {
"north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.5 ] },
"east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.5 ] },
"south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.5 ] },
"west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.5 ] },
"up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
"down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }
}
},
{
"name": "roofAccent",
"from": [ 2.0, 13.5, 2.0 ],
"to": [ 14.0, 14.0, 14.0 ],
"faces": {
"north": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 0.5 ] },
"east": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 0.5 ] },
"south": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 0.5 ] },
"west": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 0.5 ] },
"up": { "texture": "#0", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }
}
},
{
"name": "laserbaseNW",
"from": [ 4.0, 9.0, 4.0 ],
"to": [ 6.0, 12.0, 6.0 ],
"faces": {
"north": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] },
"east": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] },
"south": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] },
"west": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] },
"down": { "texture": "#2", "uv": [ 1.0, 1.0, 3.0, 3.0 ] }
}
},
{
"name": "laserbaseNE",
"from": [ 10.0, 9.0, 4.0 ],
"to": [ 12.0, 12.0, 6.0 ],
"faces": {
"north": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] },
"east": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] },
"south": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] },
"west": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] },
"down": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 3.0 ] }
}
},
{
"name": "laserbaseS",
"from": [ 7.0, 9.0, 10.0 ],
"to": [ 9.0, 12.0, 12.0 ],
"faces": {
"north": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] },
"east": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] },
"south": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] },
"west": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] },
"down": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 3.0 ] }
}
},
{
"name": "laserNW",
"from": [ 4.5, 6.0, 4.5 ],
"to": [ 5.5, 9.0, 5.5 ],
"faces": {
"north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
}
},
{
"name": "laserNE",
"from": [ 10.5, 6.0, 4.5 ],
"to": [ 11.5, 9.0, 5.5 ],
"faces": {
"north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"down": { "texture": "#4", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
}
},
{
"name": "laserS",
"from": [ 7.5, 6.0, 10.5 ],
"to": [ 8.5, 9.0, 11.5 ],
"faces": {
"north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] },
"down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
}
}
]
}

BIN
src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 583 B

After

Width:  |  Height:  |  Size: 652 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 581 B

After

Width:  |  Height:  |  Size: 638 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 580 B

After

Width:  |  Height:  |  Size: 651 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 645 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/constructor.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 658 B

After

Width:  |  Height:  |  Size: 679 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/controller_0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 638 B

After

Width:  |  Height:  |  Size: 679 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/controller_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 657 B

After

Width:  |  Height:  |  Size: 699 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/controller_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 708 B

After

Width:  |  Height:  |  Size: 731 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/controller_3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 710 B

After

Width:  |  Height:  |  Size: 731 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/controller_4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 712 B

After

Width:  |  Height:  |  Size: 729 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/controller_5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 713 B

After

Width:  |  Height:  |  Size: 728 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/controller_6.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 716 B

After

Width:  |  Height:  |  Size: 729 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 716 B

After

Width:  |  Height:  |  Size: 728 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/controller_8.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 717 B

After

Width:  |  Height:  |  Size: 731 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/crafter_connected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 628 B

After

Width:  |  Height:  |  Size: 704 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/crafter_disconnected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 591 B

After

Width:  |  Height:  |  Size: 697 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 653 B

After

Width:  |  Height:  |  Size: 663 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_disconnected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 605 B

After

Width:  |  Height:  |  Size: 580 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 616 B

After

Width:  |  Height:  |  Size: 661 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/destructor.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 657 B

After

Width:  |  Height:  |  Size: 668 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 656 B

After

Width:  |  Height:  |  Size: 692 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/detector_unpowered.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 662 B

After

Width:  |  Height:  |  Size: 680 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/disk_drive.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 601 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 645 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 655 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 655 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 655 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 659 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 659 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 659 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 650 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/exporter.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 626 B

After

Width:  |  Height:  |  Size: 641 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/external_storage.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 640 B

After

Width:  |  Height:  |  Size: 631 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/grid_connected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 676 B

After

Width:  |  Height:  |  Size: 687 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/grid_disconnected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 639 B

After

Width:  |  Height:  |  Size: 614 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/importer.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 603 B

After

Width:  |  Height:  |  Size: 639 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/interface.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 575 B

After

Width:  |  Height:  |  Size: 655 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 559 B

After

Width:  |  Height:  |  Size: 648 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 584 B

After

Width:  |  Height:  |  Size: 601 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 584 B

After

Width:  |  Height:  |  Size: 585 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/side.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 551 B

After

Width:  |  Height:  |  Size: 567 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 588 B

After

Width:  |  Height:  |  Size: 647 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_disconnected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 586 B

After

Width:  |  Height:  |  Size: 623 B