Yulife
|
f174749f26
|
Merge remote-tracking branch 'origin/1.9.4' into 1.9.4
# Conflicts:
# run/resourcepacks/unity/assets/techreborn/blockstates/machines/centrifuge.json
|
2016-06-04 12:30:23 +02:00 |
|
Yulife
|
01ed5c22ab
|
Big JSON cleanup
|
2016-06-04 12:27:08 +02:00 |
|
modmuss50
|
8a8fd59cc1
|
Add a way to rename and move the blockstates json file
|
2016-06-04 11:02:35 +01:00 |
|
modmuss50
|
42d271c018
|
Recommit 85d9a7ce317affe2067cd6d9c5c7a6a0fbda91a9
|
2016-06-04 09:56:48 +01:00 |
|
Yulife
|
d8b425abc5
|
Industrial Grinder
|
2016-06-02 22:09:14 +02:00 |
|
Yulife
|
e34a5bb4b5
|
Blast Furnace
|
2016-06-02 20:53:34 +02:00 |
|
Yulife
|
1380724d10
|
Industrial Sawmill
|
2016-06-02 19:21:53 +02:00 |
|
Yulife
|
54106e082d
|
Relocation of assets, TINY DUSTS
|
2016-05-22 17:19:05 +02:00 |
|