Commit Graph
394 Commits
Author SHA1 Message Date
CrazyPants 15327cdef6 Fixed wrenching of wireless charger. 2014-07-05 21:43:00 +08:00
CrazyPants 6043e1b52b #789 Vacuum chest now keeps its inventory when broken and can be wrenched properly. 2014-07-05 20:50:06 +08:00
CrazyPants 296bd08514 #781 Enabled Dim. Trans. to work on offline servers. 2014-07-05 20:34:40 +08:00
CrazyPants 9040a64dd0 Fixed issues when DS leggings with speed upgrade ran out of power. 2014-07-05 17:00:57 +08:00
CrazyPants aefbe73168 Fixed some rendering issues. 2014-07-05 01:06:30 +08:00
CrazyPants 6a34f60a6b Modified upgrade items for DS. 2014-07-04 14:06:43 +08:00
CrazyPants db63dd8141 Updated tooltips. 2014-07-04 13:37:04 +08:00
CrazyPants 5b69c77f34 Finished off wireless charger. 2014-07-04 13:27:32 +08:00
CrazyPants 2afdb61663 I hate you GUIs 2014-07-04 12:53:07 +08:00
CrazyPants 76c256d18a Fixed some rendering issues.
Fixed wireless chargers continuous drain.
2014-07-04 12:43:21 +08:00
CrazyPants 98ae9db25e Added wireless charger. 2014-07-04 00:01:23 +08:00
CrazyPants 1bfe73ded2 Fixed armor slots on cap bank dropping items when armor is selected. 2014-07-03 14:27:55 +08:00
CrazyPants 11be5dc6a6 #774 Crash when block next to cap bank changes. 2014-07-03 13:02:05 +08:00
CrazyPants 64ba3d0817 Merge branch '1.7.10' 2014-07-01 14:39:35 +08:00
CrazyPants c579165d81 Fixed NPE 2014-06-30 09:58:49 +08:00
tterrag1098 c67dd04d88 Fix config saving twice 2014-06-29 15:33:40 -04:00
CrazyPants 1fbb9b33b4 Added vacuum chest. 2014-06-29 22:51:22 +08:00
tterrag1098 7c7b644b3f Revert "Merge remote-tracking branch 'origin/master' into 1.7.10"
Yeah that didn't work...

This reverts commit 714542e2c2, reversing
changes made to b579bcdcd8.
2014-06-28 23:53:49 -04:00
tterrag1098 714542e2c2 Merge remote-tracking branch 'origin/master' into 1.7.10
Merging in master to 1.7.10, not clean.

Conflicts:
	build.gradle
	src/main/java/crazypants/enderio/EnderIO.java
	src/main/java/crazypants/enderio/config/Config.java
2014-06-28 23:51:11 -04:00
tterrag1098 b579bcdcd8 Finish ingame configs.
Thanks @bspkrs :)

Oh also fix Crazy's spelling again :P
2014-06-28 23:43:41 -04:00
CrazyPants 7f7cbf343e Fall damage now negated when dark steel boots are powered. 2014-06-28 22:44:00 +08:00
CrazyPants 6db4eaff09 Added glider wings for glider upgrade. 2014-06-28 21:53:53 +08:00
tterrag1098 95693aaf8b Merge branch '1.7.10' of https://github.com/CrazyPants/EnderIO.git into 1.7.10 2014-06-28 05:50:23 -04:00
tterrag1098 8be88c1d01 Begin implementation of ingame configs.
@bspkrs I have no idea what I'm doing.
2014-06-28 05:50:15 -04:00
CrazyPants 13edf6363a Added key binding for glider upgrade and added options to config. 2014-06-27 17:42:11 +08:00
CrazyPants ceccfe5d6a Added first cut of 'glide' upgrade for DS chestplate. 2014-06-27 01:54:17 +08:00
CrazyPants 5cc1819c39 Fixed ore-dict items not being consumed. 2014-06-26 18:17:28 +08:00
CrazyPants bb2875f572 #776 Ore dictionary support in recipes broken. 2014-06-26 17:38:30 +08:00
tterrag1098 37558c0a7e Merge remote-tracking branch 'origin/master' into 1.7.10 2014-06-25 05:45:56 -04:00
CrazyPants 7647c57825 #773 Included the @API declaration for bundled RF API 2014-06-25 16:45:42 +08:00
tterrag1098 21421910e3 Update to 1.7.10_pre4 (Forge 1138) 2014-06-24 22:31:09 -04:00
CrazyPants e6971b5651 Changed version to 2.0_beta 2014-06-23 18:54:37 +08:00
CrazyPants 08647dc0bf #762 The roof of the Farming Station next to a solid block disappears 2014-06-23 18:52:27 +08:00
CrazyPants c7556343cd #755 Sand+Sand in Alloy smelter = Enlightened Clear Glass 2014-06-21 20:16:56 +08:00
tterrag1098 bc192e8a65 Switch to iterator in Crafter to make MatthiasM2 happy 2014-06-19 14:18:52 -04:00
tterrag1098 78109e2b7d Farm upgrades. Fix some power display bugs. Fix CME in Crafter. 2014-06-19 14:05:29 -04:00
tterrag1098 cfd32a7ef8 Change the crafter to function on a buffer as per request. 2014-06-19 13:01:53 -04:00
tterrag1098 6c308fade5 #757 Crafter not returning container items.
@CrazyPants stop setting stacks to null >:(
2014-06-19 00:00:11 -04:00
CrazyPants d9b3bc0645 Merge branch '1.7' of https://github.com/CrazyPants/EnderIO into 1.7 2014-06-19 13:11:52 +08:00
CrazyPants c5bee1942b Excluded ingot from sag mill bonuses. 2014-06-19 13:11:40 +08:00
tterrag1098 fec888d325 Proper @SideOnly annotations on ANY references to IIcons 2014-06-17 15:12:15 -04:00
tterrag1098 0c1aac76b2 Organize imports to fix server crash. 2014-06-17 14:52:34 -04:00
CrazyPants 2ab6085489 Added recipe and GUI for powered spawner. 2014-06-17 20:19:56 +08:00
CrazyPants db8b914ca6 Added code to the DarkSteelAxe to handle both the bugged and fixed versions of forge. 2014-06-17 19:19:44 +08:00
CrazyPants 3182f4a4a8 More work on powered spawner. 2014-06-17 19:15:06 +08:00
CrazyPants 0d7d60a19a Fixed com. gen. crash 2014-06-17 14:25:37 +08:00
tterrag1098 c31965622a #753 Config options for farm 2014-06-16 23:58:31 -04:00
CrazyPants a4bfc60b7d Initial work on powered spawner. 2014-06-16 23:05:52 +08:00
CrazyPants 1553fbbf12 #747 NullPointerException: Ticking screen 2014-06-16 13:38:18 +08:00
CrazyPants 20a2d2ac61 Some performance tweaks. 2014-06-16 13:03:09 +08:00