Commit graph

1826 commits

Author SHA1 Message Date
Prospector
28fd887ee3 Ruby, sapphire, and peridot armour 2016-03-27 22:48:31 -07:00
Prospector
a636da1882 Bronze Tools and Armour 2016-03-27 21:20:27 -07:00
modmuss50
877308a75c Some small tweaks 2016-03-27 19:23:38 +01:00
Stuart Pomeroy
dfb7d0afd4 Fix Merges 2016-03-27 20:14:13 +01:00
gigabit101
f4b32cfcef closes #432 2016-03-27 20:11:39 +01:00
Stuart Pomeroy
78e8acce7b Fixed some GUIS and some Mass Fabs 2016-03-27 20:10:49 +01:00
gigabit101
da4f8fcb4d Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-27 20:08:55 +01:00
gigabit101
ea9b92139e closes #431 2016-03-27 20:08:51 +01:00
gigabit101
2360df0148 closes #429 2016-03-27 19:53:55 +01:00
gigabit101
33c8386324 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-27 19:40:22 +01:00
gigabit101
d0289037dc Added WIP tag to book 2016-03-27 19:40:10 +01:00
modmuss50
52ffbd65df Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-27 18:56:37 +01:00
modmuss50
1ab2415e40 Fix crash, fix #414 and fix #411 2016-03-27 18:56:27 +01:00
modmuss50
aeb567deb7 Fixes #416 2016-03-27 18:38:43 +01:00
Gigabit101
9ea37a0799 Merge pull request #415 from Rushmead/1.9
Fixes solar panels being powered wierdly...
2016-03-27 18:28:13 +01:00
Stuart Pomeroy
525a91e931 Fixes solar panels being powered wierdly... 2016-03-27 18:25:45 +01:00
modmuss50
aceceb7d2d Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-27 18:21:42 +01:00
Prospector
576f204ce0 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-27 11:15:08 -07:00
Prospector
40a10cafd9 Localize cable tooltips 2016-03-27 11:14:59 -07:00
modmuss50
2801535bf8 Fixes #426 2016-03-27 18:21:31 +01:00
modmuss50
49e45b27e2 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-27 18:06:50 +01:00
gigabit101
c73d1dc773 closes #425 2016-03-27 19:05:05 +01:00
modmuss50
8261384cdd Fixes #420 2016-03-27 18:06:40 +01:00
modmuss50
cd8de44e79 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-27 17:58:52 +01:00
Prospector
b08ca6b91c Diesel and Semifluid generator GUI textures
Closes #421
2016-03-27 10:57:31 -07:00
Prospector
5dad8067eb Hide fluids from JEI 2016-03-27 10:30:32 -07:00
modmuss50
5846f1c784 Remove debug code, and 1.0.2 2016-03-27 17:58:41 +01:00
Gigabit101
99f9fc4903 Merge pull request #409 from Rushmead/1.9
Closes #402,#404,406
2016-03-27 17:45:09 +01:00
Stuart Pomeroy
8fba82312c Closes #402,#404,406 2016-03-27 17:41:56 +01:00
modmuss50
96464980c2 Fixed crash when not running with MCMP 2016-03-27 13:14:57 +01:00
modmuss50
a0dea07407 Fix multiblocks 2016-03-27 12:51:39 +01:00
modmuss50
02931939b6 Update mc multipart for new forge 2016-03-26 18:52:30 +00:00
modmuss50
7ea1f438c1 Fix running in dev 2016-03-26 18:41:09 +00:00
Modmuss50
6616d72304 Update build.gradle 2016-03-26 18:11:47 +00:00
Modmuss50
891ff1d2ed Merge pull request #397 from Rushmead/1.9
Fix Grinder GUI
2016-03-26 17:19:12 +00:00
Stuart Pomeroy
aad396e1b4 Revert "Merged branch 1.9 into 1.9"
This reverts commit d142704a15.
2016-03-26 17:16:51 +00:00
Stuart Pomeroy
d142704a15 Merged branch 1.9 into 1.9 2016-03-26 17:16:27 +00:00
Stuart Pomeroy
77818b609e Fix Grinder GUI 2016-03-26 17:16:09 +00:00
Stuart Pomeroy
a284c45475 Fix Grinder GUI 2016-03-26 17:05:44 +00:00
Stuart Pomeroy
267ac7b8a2 Fixed Grinder GUI and other?
Just fixed the grinder GUI and stuff.
2016-03-26 16:59:12 +00:00
gigabit101
4861364cd6 blocks are hard ;) 2016-03-26 16:17:56 +00:00
Modmuss50
ee16097339 Merge pull request #395 from Rushmead/1.9
Fix Shit!
2016-03-26 16:05:14 +00:00
Stuart Pomeroy
ba2ad6aa4e FIX IT AGAIN! 2016-03-26 16:03:23 +00:00
Modmuss50
37ba3e29c0 Fix PR 2016-03-26 16:01:14 +00:00
Stuart Pomeroy
c4345bacae Fix a fuck up. 2016-03-26 16:01:06 +00:00
Modmuss50
d5a49b4c59 Merge pull request #394 from Rushmead/1.9
Update to forge and fuck up the cables? Not sure :P
2016-03-26 15:59:34 +00:00
Stuart Pomeroy
6498bd1974 Update to forge and fuck up the cables? Not sure :P 2016-03-26 15:58:38 +00:00
Modmuss50
bc5c30dd3a Update build.gradle 2016-03-26 08:52:30 +00:00
modmuss50
5eed5b161d Code formatter take 2 2016-03-25 09:47:34 +00:00
modmuss50
33985f1a31 Revert "Added code formatter"
This reverts commit b9448d5d90.
2016-03-24 00:41:47 +00:00