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

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

..

java/com/sosnitzka/ztic_addon

Merged conflicts in commits to be on same level :)

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

resources

Removed unused, not necessary textures.

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