cp
1bb3dbabc7
Merge branch 'master' into 1.7
...
Conflicts:
src/main/java/crazypants/enderio/EnderIO.java
src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java
src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java
2014-03-04 13:00:52 +08:00
cp
02d3805656
packets packets every where.
2014-03-04 12:52:10 +08:00
CrazyPants
f05c86a31d
0.11.3
...
- #523 Crash
- #524 Ender IO Item conduits are eating items
2014-03-04 11:17:14 +08:00
CrazyPants
58d31ec887
Merge branch 'master' of https://github.com/CrazyPants/EnderIO
2014-03-04 11:15:39 +08:00
CrazyPants
c555b756de
#524 Item conduits are eating items.
2014-03-04 11:14:40 +08:00
CrazyPants
edf0b9e819
#523 Crash
2014-03-04 09:50:17 +08:00
CrazyPants
d8e1c9186d
Merge pull request #522 from joaopms/master
...
Fixing the README
2014-03-04 09:27:46 +08:00
CrazyPants
5dad301654
Merge pull request #514 from kostek00/patch-3
...
Update pl_PL.lang
2014-03-04 09:26:10 +08:00
CrazyPants
d4a77db193
Merge pull request #509 from mymagadsl/patch-2
...
Update and rename zh_TW to zh_TW.lang
2014-03-04 09:25:50 +08:00
cp
c6670e0060
fun times.
2014-03-03 21:54:49 +08:00
cp
d6229d573e
refactor
2014-03-03 21:44:20 +08:00
João Pedro
5c7bca6e69
Fixing the README
...
Fixed a typo in "license" and formatting the text a little bit.
2014-03-03 13:38:04 +00:00
cp
a4c3993e6d
Adding stuff back in.
2014-03-03 21:36:08 +08:00
cp
b264131cf8
Added back power monitor functionality.
2014-03-03 20:58:53 +08:00
CrazyPants
35e6a95c2c
0.11.2
...
- #510 Travel distance config not working correctly
- #511 Staff of Traveling not using power
- #512 Capacitor banks not responding to redstone signals bug
- #517 Item conduit filters fail when more than one conduit ends at one chest
- #518 Crash when breaking a TE redstone conduit, connected to an EIO power conduit, which is connected to a Power Monitor.
- #519 Can't shift-wrench to pick up certain TE blocks
- #520 Alloy Smelter upgrade breaks ME interface 'blocking mode'
2014-03-03 18:30:43 +08:00
cp
3ed9e6c399
#520 Alloy Smelter upgrade breaks ME interface 'blocking mode'
...
#519 Can't shift-wrench to pick up certain TE blocks
Mereged from 1.6,4
2014-03-03 18:23:16 +08:00
CrazyPants
2b6018bf28
#519 Can't shift-wrench to pick up certain TE blocks
2014-03-03 18:18:54 +08:00
CrazyPants
bbff9ff60f
#520 Alloy Smelter upgrade breaks ME interface 'blocking mode'
2014-03-03 18:13:29 +08:00
cp
3c32f76483
#517 Item conduit filters fail when more than one conduit ends at one chest
...
#512 Capacitor banks not responding to redstone signals
Merge branch 'master' into 1.7
2014-03-03 15:23:38 +08:00
CrazyPants
8b6095fd5d
#512Capacitor banks not responding to redstone signals
2014-03-03 15:11:14 +08:00
CrazyPants
cb2cd58040
#517 Item conduit filters fail when more than one conduit ends at one chest
2014-03-03 15:01:16 +08:00
cp
6620d6dff2
for tterrag.
2014-03-03 04:02:55 +08:00
cp
d421d5e2b1
NEI and build craft triggers left to do.
2014-03-03 04:01:58 +08:00
cp
59cbda3ba0
All done except the conduit GUI packets.
...
Should all compile now except the excluded NEI related stuff.
2014-03-03 03:44:08 +08:00
cp
c3a60feafc
Power and redstone conduits working (no gui)
2014-03-03 03:16:08 +08:00
cp
b6a2514984
Machines all ported, bar wrenching and conduit specific stuff.
2014-03-03 01:25:47 +08:00
cp
6a4b91da16
More packety packets.
2014-03-02 23:53:15 +08:00
cp
3e84d12b8f
#518 Crash when breaking a TE redstone conduit, connected to an EIO power conduit, which is connected to a Power Monitor.
...
Merged from 1.6.4.
2014-03-02 21:46:51 +08:00
CrazyPants
7e958a1a3b
Removed debug.
2014-03-02 21:40:19 +08:00
cp
d1f354edc7
sadd
2014-03-02 21:33:07 +08:00
CrazyPants
ad8da03ab4
#518 Crash when breaking a TE redstone conduit, connected to an EIO power conduit, which is connected to a Power Monitor.
2014-03-02 21:21:26 +08:00
cp
d661be1f70
More packety fun.
2014-03-02 01:30:43 +08:00
cp
bd83138a7a
Transceiver compiling.
2014-03-01 22:29:38 +08:00
cp
4af6e0c059
Fixed up the fused quartz stuff.
2014-03-01 21:03:30 +08:00
cp
bbd1c54fd2
Fixed stuff an things.
2014-03-01 20:23:56 +08:00
cp
dd5664e604
Renamed all the 'custom' items to 'painted' items.
2014-03-01 18:56:37 +08:00
cp
f98a99ab9e
Finished painter.
2014-03-01 18:38:47 +08:00
cp
2f785f8c8c
more more more
2014-03-01 02:00:11 +08:00
cp
869cf0eb31
and more...
2014-03-01 01:18:03 +08:00
cp
a1921a3944
Machines getting there.
2014-03-01 00:42:54 +08:00
cp
fcf5fdf417
Started on machines.
2014-02-28 22:42:09 +08:00
cp
c0bef5cc24
Materials and capacitors ported.
2014-02-28 20:46:26 +08:00
cp
f0fbfe5844
ready to start porting some more stuff.
2014-02-28 18:57:39 +08:00
cp
49f412c88c
Fixed rendering of eio block.
2014-02-28 18:18:52 +08:00
cp
1161ff8c4a
EnderIO block is all bag in action.
2014-02-28 18:13:22 +08:00
CrazyPants
5495d04beb
Could access and ender io and travel to a anchor without enough power.
2014-02-28 10:09:06 +08:00
kostek00
0d467cb31d
Update pl_PL.lang
2014-02-27 23:39:40 +01:00
cp
fffdc8de63
Lovely.
2014-02-28 02:53:09 +08:00
cp
4e6f877a09
Stuff an thigns.
2014-02-28 02:38:24 +08:00
cp
822ebff789
Zappidy zoom time!
2014-02-28 01:49:16 +08:00