Prospector
|
40a10cafd9
|
Localize cable tooltips
|
2016-03-27 11:14:59 -07: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 |
|
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
|
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 |
|
modmuss50
|
b9448d5d90
|
Added code formatter
|
2016-03-24 00:39:26 +00:00 |
|
gigabit101
|
710f9c04e7
|
gui fixs
|
2016-03-23 23:31:40 +00:00 |
|
gigabit101
|
1a580bb1d1
|
Fixed guis
|
2016-03-23 21:36:58 +00:00 |
|
modmuss50
|
887708d128
|
Fixed player detector crash
|
2016-03-23 20:10:08 +00:00 |
|
modmuss50
|
244ade085d
|
Some small fixes
|
2016-03-23 20:00:00 +00:00 |
|
modmuss50
|
a56bc65f3f
|
Remove alpha tag
|
2016-03-23 19:03:23 +00:00 |
|
modmuss50
|
a1078a4951
|
Added WIP tool tip
|
2016-03-23 18:59:39 +00:00 |
|
gigabit101
|
1d9fe100b1
|
Recipes and debug texture
|
2016-03-23 18:45:58 +00:00 |
|
gigabit101
|
ad2c34e969
|
Textures
|
2016-03-23 18:21:55 +00:00 |
|
gigabit101
|
a999d5064a
|
another recipe
|
2016-03-23 18:19:42 +00:00 |
|
gigabit101
|
f31d50c81e
|
added missing loc
|
2016-03-23 18:19:34 +00:00 |
|
gigabit101
|
5c7035c389
|
Added a but ton of recipes
|
2016-03-23 18:17:37 +00:00 |
|
modmuss50
|
4d55b94a0a
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-23 18:08:45 +00:00 |
|
modmuss50
|
d9eded60cc
|
Remove explode sub command
|
2016-03-23 18:08:29 +00:00 |
|
gigabit101
|
bd37e8ad7f
|
3D Wrench
|
2016-03-23 17:05:21 +00:00 |
|
modmuss50
|
8f3b3ede78
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-23 17:02:34 +00:00 |
|
modmuss50
|
f0d6b9e78d
|
Can now place blocks facing up and down
|
2016-03-23 17:02:21 +00:00 |
|
gigabit101
|
8945aa1634
|
Added missing localizations
|
2016-03-23 17:00:41 +00:00 |
|
gigabit101
|
17ff9b2aad
|
some texture fixs
|
2016-03-23 16:53:32 +00:00 |
|
modmuss50
|
fffcecbb98
|
Revert "Removed bucket textures as it now generates them at runtime"
This reverts commit 4585684fe2.
|
2016-03-23 11:37:30 +00:00 |
|
