Commit graph

426 commits

Author SHA1 Message Date
Stuart Pomeroy
427963b40a Closes #434, Add tooltips to grinder and batbox. Fix centrifuge. closes #436 2016-03-28 17:50:25 +01:00
Stuart
6149511d0b Frickin. what. 2016-03-28 11:47:20 +01:00
Stuart
ca33b92cea Dont even know. 2016-03-28 11:47:01 +01:00
Stuart Pomeroy
1993fa92bd Add MFE GUI and made batterys charge and decharge? 2016-03-28 09:34:48 +01: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
Stuart Pomeroy
78e8acce7b Fixed some GUIS and some Mass Fabs 2016-03-27 20:10:49 +01:00
Prospector
b08ca6b91c Diesel and Semifluid generator GUI textures
Closes #421
2016-03-27 10:57:31 -07:00
Stuart Pomeroy
8fba82312c Closes #402,#404,406 2016-03-27 17:41:56 +01:00
Stuart Pomeroy
77818b609e Fix Grinder GUI 2016-03-26 17:16:09 +00:00
Stuart Pomeroy
c4345bacae Fix a fuck up. 2016-03-26 16:01:06 +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
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
gigabit101
6d1a8a835e more gui things 2016-03-22 23:58:16 +00:00
gigabit101
5ea4dedcb2 Fixed some progress bars 2016-03-22 23:27:35 +00:00
gigabit101
1acdc13e2d Guis for batbox, mfe, mfsu 2016-03-21 15:52:46 +00:00
gigabit101
8f382f2239 stuff and things 2016-03-21 15:30:32 +00:00
modmuss50
d8829fd33c Fix some small issues 2016-03-20 16:27:57 +00:00
Rushmead
af9ed84015 Fixed Cable rendering 2016-03-20 15:44:19 +00:00
modmuss50
492917ac95 Improvements to cable rendering. still broken, but not as bad 2016-03-20 10:58:58 +00:00
modmuss50
471a945de6 Its all broke, mcmultipart support 2016-03-19 18:01:34 +00:00
modmuss50
00fc80b071 Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9 2016-03-16 16:26:44 +00:00
modmuss50
65a64e650b Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-03-16 15:52:36 +00:00
modmuss50
929d2f4b7f Improvements to the nuke, rendering needs fixing 2016-03-16 15:52:27 +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
cc0b762b56 87 errors, will finish later 2016-03-13 17:38:12 +00:00
modmuss50
7a121be651 Some small fixes 2016-03-13 16:57:10 +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
modmuss50
05ee9f30f4 Nuke. 2016-03-13 11:50:46 +00:00
gigabit101
a938a1ab4d Thermal gen now shows stored power in gui 2016-03-09 15:03:09 +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
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
5f1d059058 Added logic to Electric furnace 2016-03-06 20:39:31 +00:00
gigabit101
90f5d77a41 Finish on Iron furnace
Added Jei support to Iron Furnace
2016-03-06 19:59:39 +00:00
gigabit101
961e821402 Start on Iron furnace 2016-03-06 15:58:34 +00:00
gigabit101
a84075ff69 Nerfed generator and fix generator gui 2016-03-06 15:42:12 +00:00
modmuss50
71062a55bd Fusion reactor now kills the player, coils to come soon 2016-03-05 19:09:07 +00:00
modmuss50
1e24d1f116 Texture Rendering for cables 2016-03-05 18:10:36 +00:00