Commit graph

2111 commits

Author SHA1 Message Date
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
Prospector
be36455415 Rename to tungstenGrindingHead 2016-05-22 14:01:38 -07:00
modmuss50
a19f115925 Fix ConcurrentModificationException when merging two power networks 2016-05-22 21:47:07 +01:00
modmuss50
55c7f68d75 Remove Distributor from creative tab 2016-05-22 21:40:32 +01:00
modmuss50
b1215b62fe Temp fix for armour 2016-05-22 21:33:50 +01:00
modmuss50
c765e8cefc Ignore unity master resource pack 2016-05-22 21:23:28 +01:00
modmuss50
4b6ae534b5 Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 2016-05-22 21:21:03 +01:00
modmuss50
a24ee95c4d Fix crash when reloading texture 2016-05-22 21:20:39 +01: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
modmuss50
0f1e8eb6d7 Fixes cable issues, closes #596 thanks @xannor for spotting this 2016-05-22 20:48:03 +01: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
Yulife
ab74f1c077 Remove Red Rock, implement new vanilla stones 2016-05-22 16:53:15 +02:00
modmuss50
d94e5156cc Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 2016-05-22 14:54:04 +01:00
modmuss50
161eb87246 Remove voidstone, does NOT break worlds 2016-05-22 14:53:56 +01:00
Modmuss50
5e1be17e4e Fix links to jenkins 2016-05-22 14:35:47 +01:00
modmuss50
bc3fea299c Allow res packs 2016-05-22 14:31:18 +01:00
modmuss50
ccb5ab7e2f Remove 1.9 deps 2016-05-22 13:24:44 +01:00
Prospector
fda54cb37b Diamond saw blade 2016-05-22 02:28:36 -07:00
Prospector
40095495f9 Grinding heads 2016-05-22 02:13:42 -07:00
Yulife
b213535066 Dusts \o/ 2016-05-22 10:23:07 +02:00
Prospector
df27ac6b15 Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 2016-05-21 21:51:39 -07:00
Prospector
8fffe67f17 Update to use new ChatUtils 2016-05-21 21:51:26 -07:00
Yulife
556084f3d8 Unity masterplan 2016-05-21 23:06:56 +02:00
Prospector
7e3cfbe946 Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 2016-05-21 12:28:08 -07:00
modmuss50
6f3c8780c5 Disable update checker, use curse 2016-05-21 20:18:30 +01:00
Prospector
a512baa0f1 Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 2016-05-21 12:15:41 -07:00
modmuss50
dbaed2721e Fixes #590 and fixes build 2016-05-21 20:05:13 +01:00
Prospector
1bb9ce5316 Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 2016-05-21 12:02:54 -07:00
Prospector
e9962c29e0 Add TOP to libs folder (no support yet) 2016-05-21 12:02:38 -07:00
modmuss50
1efa303bad Fixes #593 2016-05-21 20:01:03 +01:00
Modmuss50
f71edfa792 Delete Waila-1.7.0-B2_1.9-dev.jar 2016-05-19 18:05:27 +01:00
Modmuss50
33e70fb7c6 Update Walia 2016-05-19 18:05:15 +01:00
modmuss50
128a95c338 jei 1.9.4 and clean tile packets 2016-05-19 09:07:31 +01:00
modmuss50
f3a760ed4d Use fixed version of forge 2016-05-19 08:55:37 +01:00
modmuss50
8fb186c39f Merge remote-tracking branch 'remotes/origin/1.9' into 1.9.4 2016-05-18 20:20:33 +01:00
modmuss50
84f84afa6f Merge branch '1.9' into 1.9.4 2016-05-18 20:19:16 +01:00
modmuss50
3509ff4f10 Clean up Ore Dic Registry, should fix INV Tweaks crash 2016-05-18 20:14:50 +01:00