Commit Graph
127 Commits
Author SHA1 Message Date
CrazyPants 91370e20e7 Stubs in place 2014-12-02 15:32:16 +08:00
CrazyPants 04632dbc5f Added config option to disable Dimensional Transceiver 2014-11-27 12:51:45 +08:00
CrazyPants 1257afad5d #1157 Ender IO and Staff of Travelling bugs in Mystcraft Ages 2014-11-07 17:57:01 +08:00
tterrag1098 f6a9b0d845 Merge branch 'master' into AE2_MEConduits
Conflicts:
	build.gradle
	src/main/java/crazypants/enderio/conduit/IConduitBundle.java
	src/main/java/crazypants/enderio/conduit/TileConduitBundle.java
	src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java
	src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java
	src/main/java/crazypants/enderio/conduit/me/IMEConduit.java
	src/main/java/crazypants/enderio/conduit/me/MEConduit.java
	src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java
	src/main/java/crazypants/enderio/conduit/me/MEConduitRenderer.java
2014-11-04 22:06:52 -05:00
tterrag1098 9bc4e21c2f Fix item render 2014-11-01 23:48:39 -04:00
CrazyPants 315c926d0c Reverted merging of ME conduits. 2014-11-01 12:53:43 +08:00
tterrag1098 86330ff2af Use old ME conduit art 2014-10-31 23:20:06 -04:00
CrazyPants 15327417f3 Removed mobs from EnderIO, moved to new mod EnderZoo 2014-10-31 16:40:03 +08:00
CrazyPants 167d019738 Experience Obelisk now stores XP internally. Can still be extracted/inserted to/from liquidXP. 2014-10-19 19:53:47 +08:00
CrazyPants e03e7fab04 Added EnderCreeper (yes, it will be moved to a sperate mod) and added some enderminie config options. 2014-10-16 20:15:32 +08:00
CrazyPants b7f9cfb013 Started re-write of dim. trans. 2014-10-09 13:58:36 +08:00
CrazyPants 10d57c5da3 Added the Enderminy. 2014-10-07 23:55:32 +08:00
CrazyPants e75d98ca17 Added XP obelisk to use / drain liquid XP. 2014-09-14 22:56:44 +08:00
CrazyPants f13d44b278 Started work on Liquid XP support. 2014-09-13 21:59:10 +08:00
CrazyPants b74904c6be Aversion Oblisk is 'done' 2014-09-12 22:38:04 +08:00
CrazyPants 03fb6f0664 Added renderer for showing the range of the 'spawn guard' 2014-09-12 16:51:54 +08:00
CrazyPants 597d5225f3 Started work on renderer for attractor. 2014-09-12 00:50:59 +08:00
CrazyPants 1662eb2cbb #974 Conduit probe now has a 'copy/paste' mode to copy conduit settings. 2014-09-10 00:58:22 +08:00
CrazyPants 365c34ff3f Soul binder model and recipe done. 2014-09-04 21:53:39 +08:00
CrazyPants 0d314b380d Merge branch 'GasConduits' of https://github.com/Tonius/EnderIO into Tonius-GasConduits 2014-08-29 16:50:58 +08:00
tterrag1098 a8c59bf2f9 Add basic farm notifications, never wonder why your farm is stuck again! 2014-08-28 01:52:29 -04:00
Tonius e8531024fa Added Gas Conduits 2014-08-24 15:12:37 +02:00
CrazyPants 40dbda715a Made travel anchors paintable. 2014-08-24 01:39:44 +08:00
CrazyPants 948e478c6d Made DS pressure plates paintable, invisible if painted with quite clear glass. 2014-08-23 21:43:51 +08:00
CrazyPants 1f178188eb Fixed rendering of glowstone painted with grass. 2014-08-21 17:01:09 +08:00
CrazyPants b158492665 #878 Keyboard shortcut to change Yeta Wrench modes 2014-08-18 19:23:26 +08:00
CrazyPants 83c5b88f14 GUI and placeholder model for Killer Joe 2014-08-12 21:03:02 +08:00
CrazyPants a86531674e Spiffy new enchanter model from CyanideX 2014-08-12 00:34:31 +08:00
CrazyPants 25c0038c87 Added enderman skull. 2014-07-24 23:52:51 +08:00
CrazyPants 272f8c5eaf #810 Crash on start-up (compatibility) 2014-07-23 12:40:12 +08:00
CrazyPants 3d861551b8 Finished first cut of enchanter. 2014-07-17 14:51:06 +08:00
CrazyPants 9b8b41489f CP 'dodgy special' model done for Enchanter 2014-07-17 13:18:35 +08:00
CrazyPants c59e19c729 Started work on sound detector upgrade. 2014-07-08 13:30:59 +08:00
CrazyPants 98ae9db25e Added wireless charger. 2014-07-04 00:01:23 +08:00
CrazyPants 64ba3d0817 Merge branch '1.7.10' 2014-07-01 14:39:35 +08: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 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 3182f4a4a8 More work on powered spawner. 2014-06-17 19:15:06 +08:00
CrazyPants 60556483f7 Added 'Ender Fluid Conduits', which support multiple liquids and provide instant transfer.
Filters still to be added.
2014-06-14 21:05:32 +08:00
CrazyPants 95e3e7ecba Added painted carpet. 2014-06-13 12:06:54 +08:00
CrazyPants 1f6bf46696 Added painted glowstone.
Fixed some item rendering alignment.
2014-06-12 22:07:06 +08:00
tterrag1098 ec975567b2 Only machines package remains, lots to do in there. 2014-06-03 07:20:07 -04:00
CrazyPants 2775279854 Added zombie head generator. 2014-05-30 22:54:46 +08:00
CrazyPants 0faf8857f2 moved generators into their own package 2014-05-30 19:32:57 +08:00
CrazyPants fc734d878f Added WIP combustion gen model, disabled by default. 2014-05-28 16:50:57 +08:00
CrazyPants 490eb2e3e6 Changed the default comb. gen. model so the fluid in the tanks is not rendered. 2014-05-22 21:45:09 +08:00
CrazyPants c9925572f3 Added dark steel axe: powered, shift-harvest to do an entire tree. 2014-05-22 16:20:02 +08:00