Commit graph

2086 commits

Author SHA1 Message Date
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
modmuss50
83e2cd1310 Update forge 2016-05-18 19:19:22 +01:00
modmuss50
caa05a26a0 Beta release 2016-05-18 17:40:52 +01:00
modmuss50
0af1e97fe2 Add 1.9.4 build info 2016-05-18 17:16:46 +01:00
modmuss50
fcae1a54d7 Use 1.9.4, update mc multipart 2016-05-18 17:06:05 +01:00
modmuss50
8f3352238f Workaround a forge bug, REVERT WHEN FIXED 2016-05-18 17:00:42 +01:00
modmuss50
74d500a2fd Update to minecraft version 1.9.4 2016-05-18 16:53:54 +01:00
modmuss50
7d95dea783 Update Item Registry 2016-05-17 21:39:07 +01:00
modmuss50
e38c800f21 Added Universal Cell 2016-05-17 21:12:33 +01:00
modmuss50
9035f2a21c Merge branch '1.9' into 1.9-BTM 2016-05-17 19:55:57 +01:00
modmuss50
90c7ab09ec Fixes #587 2016-05-17 18:41:09 +01:00
modmuss50
7e2db4a715 Rewrote fluids
Now uses json files
Now uses forge bucket
Now not broken, closes #557
2016-05-17 18:36:51 +01:00
modmuss50
c20c6d4722 Fixes #496 and update Json-Destoyer 2016-05-17 11:41:37 +01:00
modmuss50
0ac27fd90e Fixes #585 2016-05-17 10:35:00 +01:00
modmuss50
aaeb67f9c4 Fixes #583 2016-05-17 10:28:06 +01:00
modmuss50
2e4943cf85 Improve cable rendering test.png 2016-05-16 17:07:38 +01:00
modmuss50
4a1226322e Merge branch '1.9' into 1.9-BTM 2016-05-16 16:21:33 +01:00
modmuss50
68b77fca0a Version 1.1.1 2016-05-16 16:09:28 +01:00
modmuss50
89d9dc99e2 Fixes #381 rubber ore dic issue 2016-05-16 16:04:31 +01:00
modmuss50
4c5cf82db4 Rewrite ores 2016-05-16 15:48:48 +01:00
modmuss50
3fb1e4ceb8 Some improvements to cable rendering 2016-05-16 15:09:59 +01:00
modmuss50
2df4688887 Fixes #578 2016-05-16 14:30:32 +01:00
modmuss50
5a454c2e8b Fixes #579 2016-05-16 14:29:02 +01:00
Prospector
3cf950d491 Shift-Right click on non-block to clear freq. transmitter and advanced drill/chainsaw recipes. 2016-05-15 21:24:35 -07:00
Prospector
58037e3c9c Removed In/Output markers on GUIs 2016-05-15 16:55:38 -07:00
Prospector
4a05018849 Fix rockcutter 2016-05-15 15:03:13 -07:00