Robert Sosnitzka 8d92b6b11f Merged conflicts in commits to be on same level :)

2016-05-19 20:28:32 +02:00

..

blocks

Better texture-colors for regular metals. Added bismuth texture to tool. Fixed explosion of tiberiumOre.

2016-05-18 12:09:35 +02:00

generic

Added several blocks, basicBlockOre renamed to basicBlock

2016-05-13 19:47:39 +02:00

items

changed things a lot

2016-05-13 15:13:55 +02:00

proxy

Finally fixed textures and colors of blocks and tools for every of the 32 additional ores.

2016-05-19 00:15:34 +02:00

recipes

Fixed some blocks and colors! Put back in integration of materials - something's wrong here

2016-05-17 23:40:24 +02:00

util

Better texture-colors for regular metals. Added bismuth texture to tool. Fixed explosion of tiberiumOre.

2016-05-18 12:09:35 +02:00

world

Most names changed to those that are more legible. Changed assicuated textures. Planned 8 special Traits for Alloys.

2016-05-15 01:38:42 +02:00

Alloys.java

changed things a lot

2016-05-13 15:13:55 +02:00

Blocks.java

Fixed hardness of most blocks, a lot more work to do here!

2016-05-15 20:51:13 +02:00

Fluids.java

Fixed some blocks and colors! Put back in integration of materials - something's wrong here

2016-05-17 23:40:24 +02:00

Items.java

Fixed some blocks and colors! Put back in integration of materials - something's wrong here

2016-05-17 23:40:24 +02:00

Materials.java

Most names changed to those that are more legible. Changed assicuated textures. Planned 8 special Traits for Alloys.

2016-05-15 01:38:42 +02:00

ZTiC.java

Merged conflicts in commits to be on same level :)

2016-05-19 20:28:32 +02:00