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
..
machines	Add a way to rename and move the blockstates json file	2016-06-04 11:02:35 +01:00
tier0_machines	Big JSON cleanup	2016-06-04 12:27:08 +02:00
tier1_machines	Merge remote-tracking branch 'origin/1.9.4' into 1.9.4	2016-06-04 12:30:23 +02:00
tier2_machines	Big JSON cleanup	2016-06-04 12:27:08 +02:00