Commit Graph
1241 Commits
Author SHA1 Message Date
tterrag1098 b60a44fe7a Conduit connectors should now combine into a single box (experimental) 2015-01-22 09:48:30 -05:00
tterrag1098 5540204afe Merge pull request #1719 from MatthiasMann/forestry_armor_upgrades
#1703 added Forestry upgrades to the Dark Steel Armor
2015-01-21 16:15:45 -05:00
Matthias Mann de2459696f move dark steel item instances into it's own statis class to solve class loading order dependencies 2015-01-21 22:13:18 +01:00
Matthias Mann 1a35e6df71 #1703 added Forestry upgrades to the Dark Steel Armor 2015-01-21 22:13:11 +01:00
tterrag1098 243843aff2 Add hashCode to CollidableComponent just to be safe 2015-01-21 00:55:32 -05:00
tterrag1098 2c19fe16b7 Adjust all renderers to support break overlay 2015-01-21 00:52:56 -05:00
tterrag1098 471f665351 Fix crash with iguana tweaks level ups 2015-01-20 22:37:04 -05:00
tterrag1098 9c7f671e14 #1643 Ender Rails break instantly 2015-01-19 20:37:28 -05:00
tterrag1098 fd3064cf17 #1640 Soulbound has ridiculous values for enchantability 2015-01-19 20:32:39 -05:00
tterrag1098 b2442d7849 Fix glass sides not rendering when a different type is placed against it 2015-01-19 20:13:05 -05:00
tterrag1098 aaee449a70 Merge pull request #1706 from MatthiasMann/soulvial_sheeps
display sheep color in soul vial tooltip
2015-01-19 13:31:42 -05:00
tterrag1098 d295aa8f92 Merge pull request #1715 from MatthiasMann/enderfluid_blacklist
added blacklist option to ender fluid conduits
2015-01-19 13:31:29 -05:00
Adaptivity cca20690a9 Localized NEI and Keybinds 2015-01-19 20:56:28 +03:00
Matthias Mann 738b12d2be added blacklist option to ender fluid conduits 2015-01-19 00:53:59 +01:00
Matthias Mann ad6ef78320 display sheep color in soul vial tooltip 2015-01-18 22:47:04 +01:00
tterrag1098 e70875c0ef Merge pull request #1686 from MatthiasMann/master
show upgrade information in Stirling generator GUI when the upgrade slot is empty
2015-01-18 16:31:27 -05:00
Matthias Mann 35c4380d0f #1701 - ignore side config for interaction with buckets 2015-01-17 14:56:49 +01:00
Matthias Mann 5e1d82e0e9 show upgrade information in Stirling generator GUI when the upgrade slot is empty 2015-01-17 10:33:48 +01:00
tterrag1098 9d0450219e Merge pull request #1689 from MatthiasMann/sagmill_grindingball
simplify grinding ball synchronization and fix wrong display (issue #1673)...
2015-01-16 21:55:56 -05:00
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
Matthias Mann e7386f412a simplify grinding ball synchronization and fix wrong display (issue #1673) when switching between different grinding ball types 2015-01-16 00:49:26 +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