Commit Graph
825 Commits
Author SHA1 Message Date
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 dd30dafba7 Merge branch 'master' into 1.7 2014-03-24 09:26:16 +08:00
cp 68596986b1 Added anvil repair support to armor. 2014-03-24 09:24:02 +08:00
CrazyPants 76b57eb732 1.0
- #447 Capacitor Bank and Quite Clear Glass causing rendering issues.
- Registered EIO alloys in the ore dictionary.
2014-03-24 09:14:40 +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
CrazyPants 60178eeb3f Registered alloys in the ore dictionary. 2014-03-22 21:21:47 +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
CrazyPants eb5ac42437 #447 Invisible rendering. 2014-03-19 14:05:13 +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
CrazyPants 4d7432fcf0 0.11.4
- #521 Item conduits only fill one half of large chests when placing the second chest after connecting the conduits
- #529 Using travel anchor causes crash
- #533 NullPointerException
- #539 Capacitor bank content can go negative
- #545 Crash with Conduit Probe
- #548 AE Crashes
- #552 Fixed NPE crash(Xfel)
- #553 OpenBlocks XP Bottler crash
- #554 Updated localization for zh_CN (ProgrammedSoul)
- #556 Fluid Conduit 'Active Without Signal' not working
- #557 Conduits eating items after upgrading an iron chest
2014-03-18 15:00:18 +08:00
CrazyPants 478e4b82f0 #557 Conduits eating items after upgrading an iron chest
#521 Item conduits only fill one half of large chests when placing the second chest after connecting the conduits
2014-03-18 14:48:39 +08:00
CrazyPants 1d4888c703 #533 NullPointerException 2014-03-17 20:47:21 +08:00
CrazyPants 05f4ba149c #539 Capacitor bank content can go negative 2014-03-17 20:11:59 +08:00
CrazyPants ba0d9c9602 #556 Fluid conduit [extract:Active without signal] still extracts liquid even if you apply a signal. 2014-03-17 17:17:12 +08:00
CrazyPants 54be78eddc #548 AE Crashes with Dim. Trans. 2014-03-17 16:40:37 +08:00
CrazyPants 6e794ab9a2 Merge branch 'master' of https://github.com/CrazyPants/EnderIO 2014-03-17 09:35:39 +08:00
CrazyPants 04cd560258 #545 Crash with Conduit Probe 2014-03-17 09:35:11 +08:00
CrazyPants 3383f39d55 Merge pull request #554 from ProgrammedSoul/master
Localization for zh_CN
2014-03-15 12:18:34 +08:00
ProgrammedSoul c0b8ca90d3 Localization for zh_CN
I have played with EnderIO for a while. This is really a cool mod but the localization of zh_CN is not updated and even some old translation seems to be less than perfect. So I decide to make one by my own.
2014-03-14 16:14:55 -04:00
CrazyPants 258b38ec72 Merge pull request #552 from Xfel/bugfix
Crash-Bugfix
2014-03-14 00:50:18 +08:00
Felix Treede a5870ff9d5 Crash-Bugfix
Prevents a NPE in some cases
2014-03-13 17:46:31 +01:00
cp b06966ee4a #529 Using travel anchor with an empty hand causes crash 2014-03-05 21:38:30 +08:00
CrazyPants 6d97c88a1b #529 Using travel anchor with an empty hand causes crash 2014-03-05 16:47:58 +08:00
CrazyPants 018b748c95 Merge pull request #526 from Vexatos/1.7
Updated de_DE.lang
2014-03-04 15:10:54 +08:00
Vexatos ee7c6dee7f Updated de_DE.lang 2014-03-04 08:09:05 +01: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
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