Commit Graph
65 Commits
Author SHA1 Message Date
cp 1af1ad1578 Fixed failed merge. 2014-03-28 15:39:51 +08:00
cp 44686c0c1e Still working from recipes now. 2014-03-28 15:22:40 +08:00
cp cfde3bed5a Merge branch '1.7' of https://github.com/CrazyPants/EnderIO into 1.7 2014-03-28 13:37:49 +08:00
cp 1cf5c6f234 Fixed the machines. 2014-03-28 13:37:21 +08:00
tterrag1098 182bf22403 Fix item conduits connected when they shouldn't 2014-03-28 00:16:10 -04:00
cp b13cbdace0 Still working some more. 2014-03-27 21:53:12 +08:00
cp b190296e3f started work on proper recipes for the still, probably to be renamed vat 2014-03-27 15:45:26 +08:00
cp 21724f33b2 Still now working, need to add xml recipes etc now. 2014-03-27 14:28:00 +08:00
cp 2f13e3b8e8 Fixed skull drops. 2014-03-27 13:46:37 +08:00
cp 3a234d8781 Fix for not always dropping ender pearls. 2014-03-27 13:40:51 +08:00
cp 51865af400 More progress on the still. 2014-03-27 13:09:40 +08:00
cp 66544c83f8 Started work on the still. 2014-03-27 01:09:15 +08:00
cp 2379d12230 Added fluid 'nutrient distillation'. 2014-03-26 16:50:28 +08:00
cp 685fc0875f Finished off sword and pick. 2014-03-25 21:29:51 +08:00
cp 7baeb89e0b Stirling gen now gets more efficient and faster with upgrades. 2014-03-25 20:30:30 +08:00
cp 4ac3cd092b Added dark steel pickaxe. 2014-03-25 20:14:03 +08:00
cp 9bd71bb4ee Added 'The Ender' 2014-03-25 02:01:59 +08:00
cp 57f7b52276 Updated release notes and versions. 2014-03-24 10:16:16 +08:00
cp 68596986b1 Added anvil repair support to armor. 2014-03-24 09:24:02 +08:00
cp 434e0899ed Added check to ensure the boots are being worn before allowing a double jump. 2014-03-24 09:07:40 +08:00
cp 6fdd43f0cb Added custom damage and durability calcs for armor. 2014-03-21 21:44:27 +08:00
cp 52bc4b9b2a Armor looking pretty good. 2014-03-21 16:46:10 +08:00
cp f6f7b3a3b0 more item stuff. 2014-03-19 23:23:28 +08:00
cp b71931b661 Started work on some items. 2014-03-19 22:31:17 +08:00
cp 15a723bcec Merge branch 'master' into 1.7
#447 Invisible rendering.
2014-03-19 15:55:50 +08:00
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