Commit Graph
40 Commits
Author SHA1 Message Date
cp c73861ab6c Completed merge of Issue #545 fix from 1.6.4 2014-03-19 12:59:33 +08:00
cp 5232ca189c Fixed merge. 2014-03-18 17:45:37 +08:00
cp c6287436cb Merge branch 'master' into 1.7: Release 0.11.4
Note: Issue #545 Crash with Conduit Probe not fixed, need to create a new packet for this.
2014-03-18 17:29:02 +08:00
cp ed8f961973 Recipe tweeks. 2014-03-18 17:17:39 +08:00
cp b06966ee4a #529 Using travel anchor with an empty hand causes crash 2014-03-05 21:38:30 +08:00
cp ffc97bf3ed More bug fixes. 2014-03-04 15:05:22 +08:00
cp 78d828aff8 Getting close now. 2014-03-04 14:51:35 +08:00
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
cp c6670e0060 fun times. 2014-03-03 21:54:49 +08:00
cp d6229d573e refactor 2014-03-03 21:44:20 +08: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
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
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
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
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
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
cp 6fa96d9376 It builds! 2014-02-28 01:21:33 +08:00
cp bef5f6193e more moving. 2014-02-28 00:08:24 +08:00