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 |
|
modmuss50
|
4b5d05a063
|
Started work on the new PowerNetwork
|
2016-02-27 19:02:28 +00:00 |
|
gigabit101
|
6549282ea0
|
Cleaned up imports
|
2016-02-26 13:03:30 +00:00 |
|
modmuss50
|
e3c71248a4
|
Added solar panel textures that are based on sate
|
2016-02-26 08:26:24 +00:00 |
|
modmuss50
|
ec054e09f6
|
Rebalance the windmill
|
2016-02-25 20:29:56 +00:00 |
|
modmuss50
|
d0392dabb8
|
Added wind and water mill
|
2016-02-25 20:03:58 +00:00 |
|
modmuss50
|
ed3d3c78b5
|
Added solar panel
|
2016-02-25 18:21:59 +00:00 |
|
modmuss50
|
b61acffc68
|
Generator logic
|
2016-02-24 16:11:07 +00:00 |
|
modmuss50
|
46cdf8f587
|
Fixes to configs, optimise imports.
|
2016-02-24 08:18:21 +00:00 |
|
gigabit101
|
0522e9539f
|
Added some textures
Added Tree Tap
Added Tree Tap logic
|
2016-02-20 22:50:24 +00:00 |
|
modmuss50
|
457178842c
|
Revert "Move IC2 api"
This reverts commit ac43b5afc4 .
|
2016-02-20 17:06:46 +00:00 |
|
modmuss50
|
ac43b5afc4
|
Move IC2 api
|
2016-02-20 17:02:28 +00:00 |
|
modmuss50
|
71c2bfee7f
|
Moved power system to RC and spawn trees in groups
|
2016-02-20 16:59:31 +00:00 |
|
gigabit101
|
047625389d
|
Added compressor, extractor, electric furnace
|
2016-02-20 03:07:56 +00:00 |
|
gigabit101
|
cd13932bde
|
Basic generator just needs logic
|
2016-02-20 02:21:44 +00:00 |
|
gigabit101
|
8ad4a45716
|
Added basic Grinder
|
2016-02-20 00:57:57 +00:00 |
|
modmuss50
|
415531587b
|
Fix incorrect merge
|
2016-01-16 13:11:08 +00:00 |
|
modmuss50
|
2a617919d9
|
Merge remote-tracking branch 'remotes/origin/1.7.10' into 1.8.9
# Conflicts:
# src/main/java/techreborn/compat/fmp/ForgeMultipartCompat.java
# src/main/java/techreborn/tiles/TileBlastFurnace.java
|
2016-01-16 13:09:09 +00:00 |
|
gigabit101
|
1ed3d226f2
|
Closes #320
|
2016-01-16 04:27:17 +00:00 |
|