Commit graph

31 commits

Author SHA1 Message Date
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
Prospector
7951e9913e Armour textures 2016-06-04 09:59:20 +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
b09e60f774 Electrolyzer 2016-06-02 21:31:58 +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
9f0298b9d5 Nugget Removal 2016-05-30 14:04:17 +02:00
Yulife
341e862e37 Bunch of new item textures, move Lazurite to plates
... and relocation of some assets
2016-05-30 13:37:27 +02:00
Yulife
90c32f9cff Backpack 2016-05-28 18:20:00 +02:00
Yulife
338a7cda0c More tools
@ProfessorProspector
2016-05-28 15:42:22 +02:00
Prospector
188e2ef0c5 Fix tool tiers 2016-05-23 00:13:11 -07:00
Prospector
850e39d674 Player detector textures, universal cell textures 2016-05-22 22:19:49 -07:00
Prospector
5c0f8a5e64 Improve advanced circuit again 2016-05-22 14:30:53 -07:00
Prospector
d452cf0fe6 Fix 2016-05-22 14:13:38 -07:00
Yulife
70de001b02 Wolfranioom 2016-05-22 22:20:26 +02:00
Prospector
7d69cab414 Make the tools make sense 2016-05-22 13:06:46 -07:00
Prospector
b1ed9eb209 centre shit 2016-05-22 13:05:35 -07:00
Yulife
e3361bf662 Lazurite Chunk and Neutron Reflectors 2016-05-22 21:57:55 +02:00
Yulife
cf99c3bcb2 no 2016-05-22 20:57:27 +02:00
Yulife
0a68a8a031 Coolant 2016-05-22 20:56:36 +02:00
Yulife
6beba77fe2 Gem Blocks 2016-05-22 20:18:33 +02:00
Yulife
702536aabe Circuits and Orbs 2016-05-22 18:46:06 +02:00
Yulife
9b35dffd26 Sawblade and Grinding Head Tweaks 2016-05-22 18:11:40 +02:00
Yulife
24f4bf288f Jack Hammers
@ProfessorProspector you better not have done thes already
2016-05-22 18:03:21 +02:00
Yulife
570b8b4328 Saw Dust Dust Dust 2016-05-22 17:54:02 +02:00
Yulife
4050076a81 Clean up, Missing dusts, no more ID shifting 2016-05-22 17:44:15 +02:00
Yulife
54106e082d Relocation of assets, TINY DUSTS 2016-05-22 17:19:05 +02:00
modmuss50
bc3fea299c Allow res packs 2016-05-22 14:31:18 +01:00