Commit Graph
1221 Commits
Author SHA1 Message Date
tterrag1098 f0242f1fec Merge pull request #1690 from MatthiasMann/enderfluidconduit_copypaste
move redstone mode handling for conduit probe into fluid conduit base class - fixes #1655
2015-01-16 21:52:43 -05:00
tterrag1098 56b697d684 Merge pull request #1691 from MatthiasMann/gui_tooltip_locations
adjust tooltip location when moving a button - fixes #1609
2015-01-16 21:51:32 -05:00
Matthias Mann 66b5603138 fixed missing tooltip for chargeable item filter upgrade 2015-01-16 08:28:42 +01:00
Matthias Mann 28a5189223 adjust tooltip location when moving a button - fixes #1609 2015-01-16 01:37:03 +01:00
Matthias Mann 2ebb92c061 move redstone mode handling for conduit probe into fluid conduit base class - fixes #1655 2015-01-16 01:21:29 +01:00
tterrag1098 2f98cba0eb Merge pull request #1674 from MatthiasMann/master
display power generation for fuel items in sterling gen UI, fixed painted slabs light calculation
2015-01-15 02:29:11 -05:00
Parker Young d049fd9d9c Process IMCs from mods who send them in PostInit 2015-01-14 19:13:36 -05:00
Matthias Mann 75e077e82a fixed light calculation of painted slabs to match vanilla slabs 2015-01-14 20:33:12 +01:00
Matthias Mann 2358498dae show how much power is generated for a fuel item inside a Stirling generator 2015-01-14 20:32:32 +01:00
Matthias Mann 804bc707e5 use a block access wrapper to correctly render Extra Utilities' colored cobblestone 2015-01-14 00:21:06 +01:00
tterrag1098 3a71e193ac #1657 Remove caching of IIcons in soul binder renderer. 2015-01-13 01:09:10 -05:00
tterrag1098 1e4eedb5b2 Update to Waila 1.5.8 2015-01-12 23:10:55 -05:00
Matthias Mann c4ad7f3272 provide fluid conduit information in Waila 2015-01-12 21:04:25 +01:00
Matthias Mann 2344009224 fix pushing out empty buckets from stirling gen 2015-01-11 18:48:20 +01:00
tterrag1098 1101a8073f Merge pull request #1592 from hilburn/master
Unique Wither Skeleton Entity
2015-01-10 19:18:24 -05:00
Matthias Mann d55d1b231d Fix buffer IO mode handling - #1627 2015-01-11 00:17:09 +01:00
tterrag1098 a68fd3e450 Merge pull request #1605 from MatthiasMann/master
added MagicCrops' hoes to default whitelist
2015-01-10 10:33:02 -05:00
Matthias Mann 256ebc8195 added MagicCrops' hoes to default whitelist 2015-01-10 16:26:58 +01:00
tterrag1098 90938074e3 Merge pull request #1621 from MatthiasMann/cap_bank
support rendering of larger IO labels
2015-01-10 10:20:26 -05:00
Matthias Mann 0bb7ef4f5c added chargeable item filter - part of #1330 2015-01-10 15:06:29 +01:00
Matthias Mann a60fcea000 cache IO display info in client side network, compute tile entity render bounding box based on IO display info 2015-01-10 13:27:52 +01:00
Matthias Mann f088b20ca8 support rendering of larger IO labels 2015-01-08 16:19:29 +01:00
Matthias Mann 1c253a3d80 #1433 fix crash with Mekanism universal cables 2015-01-08 02:56:51 +01:00
tterrag1098 42464d3097 Merge pull request #1610 from MatthiasMann/item_filter
#1458 Add button to merge inventory content with existing snapshot
2015-01-07 18:52:56 -05:00
Matthias Mann 2fccdaa683 right clicking while sneaking with an existing item filter on an inventory will add the content to the snapshot 2015-01-07 23:23:28 +01:00
Matthias Mann 173821524d #1458 Add button to merge inventory content with existing snapshot 2015-01-07 23:22:44 +01:00
tterrag1098 086c80f79f Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2015-01-07 00:40:48 -05:00
tterrag1098 742197ad9b #1607 Fix farm damaging some items incorrectly 2015-01-07 00:40:42 -05:00
hilburn 77a9c0f42a Adds config for Wither 2015-01-07 00:57:22 +00:00
Matthias Mann 5087a371b0 drain fluid containers also when the top side is configured for push or disabled 2015-01-07 00:20:31 +01:00
Matthias Mann 91a7b0ce81 show mob health on soul vials 2015-01-06 22:38:39 +01:00
tterrag1098 4c800028fe Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2015-01-06 16:11:11 -05:00
tterrag1098 0ca7bf783e #1600 Travel Anchor crashes when repainted with itself 2015-01-06 16:11:04 -05:00
tterrag1098 ff41ead8be Merge pull request #1598 from MatthiasMann/master
added recipes for Lumium and Signalum
2015-01-06 15:11:36 -05:00
tterrag1098 3b3173eb26 Merge pull request #1599 from hilburn/better_conduits
Implement IInventoryConnection on ItemConduits
2015-01-06 15:11:18 -05:00
tterrag1098 c386c08c02 #1595 All buffers show as Item Buffer in WAILA
TODO: fix this for all machines in a less hacky way
2015-01-06 15:10:21 -05:00
hilburn e3e707bd0a Implement IInventoryConnection on ItemConduits
much better than the old way
2015-01-06 18:21:58 +00:00
Matthias Mann 1946735a99 show mob name on soul vials, allow naming of soul vials, show moo fluid name in tooltip, add soul bound enchanment description 2015-01-06 17:06:28 +01:00
hilburn cd4a958784 Unique Wither Skeleton Entity 2015-01-06 01:40:16 +00:00
Matthias Mann 791bcf0271 fixed other potential crashes when the XP juice could not be found 2015-01-05 01:12:16 +01:00
tterrag1098 c22f9f4837 Merge pull request #1579 from Vexatos/patch-1
Made Power Monitor Engine control accessible
2015-01-04 18:18:24 -05:00
tterrag1098 eec706b465 Merge pull request #1571 from MatthiasMann/master
fixed connected textures between conduit facade and fuzed quartz
2015-01-04 18:18:00 -05:00
Matthias Mann eee6e98c52 allow to configure XP juice ID, take value from OpenBlocks' config if possible 2015-01-05 00:14:10 +01:00
Vexatos ecccd563ab Made Engine control accessible
Required for asiekierka/Computronics#99
2015-01-04 20:41:55 +01:00
hilburn 76a13f3df3 Farm Station respects Tinker's Tools
Also fixed an edge case where crops could be inserted into the tool slot
on the tick that the tool broke
2015-01-04 19:05:42 +00:00
Matthias Mann da6daab14c prevent crash when XP juice could not be found 2015-01-04 13:28:30 +01:00
Matthias Mann 74742841fe make stacking of capbanks easier by remove NONE entries from facesMode map so that the NBT format is normalized 2015-01-04 02:42:03 +01:00
Matthias Mann 41fd6dffec fixed connected textures between conduit facade and fuzed quartz 2015-01-04 01:12:01 +01:00
hilburn a481704215 Derp 2015-01-03 03:48:17 +00:00
hilburn 3b2d96924a added a null check to stop a crash 2015-01-03 03:21:43 +00:00