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 |
|
Stuart Pomeroy
|
525a91e931
|
Fixes solar panels being powered wierdly...
|
2016-03-27 18:25:45 +01:00 |
|
Stuart Pomeroy
|
8fba82312c
|
Closes #402,#404,406
|
2016-03-27 17:41:56 +01:00 |
|
Stuart Pomeroy
|
6498bd1974
|
Update to forge and fuck up the cables? Not sure :P
|
2016-03-26 15:58:38 +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
|
6d1a8a835e
|
more gui things
|
2016-03-22 23:58:16 +00:00 |
|
gigabit101
|
123e704caf
|
fixed some machine drops
|
2016-03-22 23:34:43 +00:00 |
|
modmuss50
|
fee31761b1
|
Fix NPE
|
2016-03-20 19:51:41 +00:00 |
|
modmuss50
|
d8829fd33c
|
Fix some small issues
|
2016-03-20 16:27:57 +00:00 |
|
gigabit101
|
2fa00b9c7f
|
little fixs
|
2016-03-19 23:18:31 +00:00 |
|
modmuss50
|
e319398bc9
|
Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
|
2016-03-16 17:09:34 +00:00 |
|
modmuss50
|
5a0f8be435
|
Added transformers
|
2016-03-16 16:54:44 +00:00 |
|
TheDoctorSoda
|
c4a00c8152
|
[TEXTURES] LV, MV, and HV transformers.
|
2016-03-15 11:03:26 -07:00 |
|
modmuss50
|
8c24711d4f
|
Optimise imports
|
2016-03-15 08:13:05 +00:00 |
|
modmuss50
|
e0547cecff
|
Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
|
2016-03-15 08:07:06 +00:00 |
|
TheDoctorSoda
|
e90592403b
|
Added Scrapboxinator, reverted yellow energy outlines, added grinder textures
|
2016-03-14 21:53:05 -07:00 |
|
modmuss50
|
b7c71edf4f
|
Added MFE and MFSU blocks and tiles, gui and textures to come later
|
2016-03-14 08:34:15 +00:00 |
|
modmuss50
|
5480a5c3e5
|
Added batBox, gui to come later
|
2016-03-14 08:26:41 +00:00 |
|
modmuss50
|
cc0b762b56
|
87 errors, will finish later
|
2016-03-13 17:38:12 +00:00 |
|
modmuss50
|
b4a16c03ed
|
And 50 more errors fixed
|
2016-03-13 16:15:27 +00:00 |
|
modmuss50
|
9a40abbe78
|
Now comes the grind, 244 errors left
|
2016-03-13 16:08:30 +00:00 |
|
modmuss50
|
7f920b282f
|
Optimise imports to make it easier to find and replace package names
|
2016-03-13 15:37:55 +00:00 |
|
gigabit101
|
d069bf77e3
|
closes #377
|
2016-03-09 13:59:38 +00:00 |
|
gigabit101
|
e1cd18ad7d
|
closes #376
|
2016-03-09 13:46:08 +00:00 |
|
modmuss50
|
9ac1db6dc1
|
Fixes #375
|
2016-03-09 08:35:06 +00:00 |
|
modmuss50
|
7e5e40a338
|
Added machine teirs (can someone check them)
Fixed crash when machines explode
|
2016-03-08 17:34:04 +00:00 |
|
TheDoctorSoda
|
2221a303ad
|
Move thermal generator TE to proper package
|
2016-03-07 21:56:37 -08:00 |
|
modmuss50
|
67526480ad
|
Added walia support for the cables
|
2016-03-07 20:33:08 +00:00 |
|
gigabit101
|
626cbbbbc7
|
derp
|
2016-03-07 17:26:04 +00:00 |
|
gigabit101
|
080b633493
|
Finish up on recycler and temp jei handler
|
2016-03-07 14:07:52 +00:00 |
|
gigabit101
|
007f9266e5
|
Recycler output is now a random chance
|
2016-03-07 12:45:54 +00:00 |
|
gigabit101
|
77e2edc005
|
More work on recycler
|
2016-03-07 00:21:22 +00:00 |
|
gigabit101
|
02ac62a180
|
Started Recycler
|
2016-03-06 23:15:28 +00:00 |
|
gigabit101
|
e6c510bbea
|
Fixed machines returning wrong itemstack when wrenched
|
2016-03-06 21:03:20 +00:00 |
|
gigabit101
|
059b197d5c
|
More recipe tweaks
|
2016-03-06 21:00:42 +00:00 |
|
gigabit101
|
5f1d059058
|
Added logic to Electric furnace
|
2016-03-06 20:39:31 +00:00 |
|
gigabit101
|
87d41aaa53
|
Small code clean up
|
2016-03-06 20:14:42 +00:00 |
|
gigabit101
|
90f5d77a41
|
Finish on Iron furnace
Added Jei support to Iron Furnace
|
2016-03-06 19:59:39 +00:00 |
|
gigabit101
|
a84075ff69
|
Nerfed generator and fix generator gui
|
2016-03-06 15:42:12 +00:00 |
|
gigabit101
|
b7212bec69
|
Fixed generator not storing inv
|
2016-03-06 15:20:38 +00:00 |
|
gigabit101
|
e96fe4bea7
|
grinder now returns grinder
|
2016-03-05 23:31:22 +00:00 |
|
modmuss50
|
06d23b10b7
|
Remove overcomplicated powernet
|
2016-03-02 15:42:45 +00:00 |
|
modmuss50
|
80d5e00706
|
Power net work
|
2016-02-29 17:30:46 +00:00 |
|
modmuss50
|
e4b8918224
|
More work on the cables, and add items
|
2016-02-27 19:36:01 +00:00 |
|
modmuss50
|
1cd886e770
|
Made it compile
|
2016-02-27 19:03:10 +00:00 |
|