Commit Graph
1485 Commits
Author SHA1 Message Date
tterrag1098 31f193be2c Move overlay textures into their own folder, fix model machine overlays 2015-03-18 14:48:36 -04:00
tterrag1098 1e085eb35f Fix overlay lighting on model machines.
Somewhat hacky but seems to work fine
2015-03-18 13:23:18 -04:00
tterrag1098 510cf06738 More cleanup to techne rendering, implement the vat model 2015-03-18 10:53:52 -04:00
tterrag1098 2deb098819 Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2015-03-18 05:57:39 -04:00
tterrag1098 b0ab4c2a22 Fix position of block item renders in inventories 2015-03-18 05:57:31 -04:00
tterrag1098 35f79dccb9 Merge pull request #2048 from HenryLoenwind/unbreakingFix
Fix: Allow Unbreaking to work on dark steel items
2015-03-18 05:51:53 -04:00
tterrag1098 e232836361 Cleanup how dark pressure plates drop 2015-03-18 05:50:50 -04:00
tterrag1098 4218070089 Merge pull request #2103 from HenryLoenwind/plateFix
Fix: Dark Pressure Plate item now works as intended
2015-03-18 05:41:46 -04:00
tterrag1098 9140d4fefc Use explicitly TechneModelLoader instead of AdvancedModelLoader
Fixes crashes with mods that override the techne loader #2104
2015-03-18 05:28:23 -04:00
HenryLoenwind 58e7c65b86 Fix: Dark Pressure Plate item now works as intended 2015-03-18 01:23:01 +01:00
tterrag1098 6cccf5f734 Fix non-model machine rendering 2015-03-17 13:44:07 -04:00
tterrag1098 533c51e150 Selected conduits will now have separated bounding boxes.
This helps immensely with being able to tell what you are pointing at
2015-03-17 10:33:32 -04:00
tterrag1098 b09d475485 #2093 Fix breaking facade preserving conduits 2015-03-17 08:22:43 -04:00
tterrag1098 05f2c28afd Improve model block lighting 2015-03-17 08:04:41 -04:00
tterrag1098 1239a5a17a Fix breaking animation on techne model blocks 2015-03-17 06:52:30 -04:00
tterrag1098 d5fec4d1e5 That's one mystery solved 2015-03-17 03:28:17 -04:00
tterrag1098 c989340b02 Implement combustion gen model and add system for rotatable ISBRH models 2015-03-17 03:23:59 -04:00
tterrag1098 fca2a2fbfc Further implement techne model rendering. Implement farm model. 2015-03-16 23:46:51 -04:00
tterrag1098 fbeb3822fd Add in base work for rendering techne models. Fix potential obelisk bug
Thanks @RainWarrior :D
2015-03-16 22:25:57 -04:00
tterrag1098 22e29a6d07 Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2015-03-16 00:10:53 -04:00
tterrag1098 7b02c9719b Add redstone control for telepad, and improve automatic teleport sync 2015-03-16 00:10:45 -04:00
tterrag1098 d44f72b09d Merge pull request #2040 from HenryLoenwind/crafterFixes
Fixes for the Crafter
2015-03-15 23:47:35 -04:00
tterrag1098 9c0c86542f Merge pull request #2063 from HenryLoenwind/fix
Fix: Added VAT amount check
2015-03-15 23:40:39 -04:00
tterrag1098 e690ddf884 #2070 #2067 Bug when updating IO mode with certain blocks adjacent 2015-03-15 23:34:25 -04:00
tterrag1098 110355829a Fix wrenching blocks not working 2015-03-15 22:29:19 -04:00
tterrag1098 1592a1e360 Fix crash when opening buffer GUIs 2015-03-15 22:25:02 -04:00
tterrag1098 42c99bbdae Add interdimensional travel to telepad. Some improvements to text fields 2015-03-15 04:28:22 -04:00
tterrag1098 350860fb2c Merge branch 'master' into Telepad 2015-03-14 21:22:04 -04:00
tterrag1098 ffc0adc6f1 Merge pull request #2052 from HenryLoenwind/scrollWheel2
Fix Mouse Wheel Handling
2015-03-09 15:01:59 -04:00
HenryLoenwind aae9a39c25 Added VAT amount check
* Fixes #2061
* Also added missing sneaking check
2015-03-08 11:22:02 +01:00
HenryLoenwind 9198616802 Removed Debugging code 2015-03-07 13:40:24 +01:00
tterrag1098 542f761769 Add "Sunlight Blocked!" to WAILA for solar panels if they cannot see sky 2015-03-05 15:36:32 -05:00
tterrag1098 b1efc0d8fe #2053 #1960 Refactor how block drops work. Now relies on getDrops. 2015-03-05 15:13:03 -05:00
HenryLoenwind f2cde5646b Fix Mouse Wheel Handling
* Mouse wheel data is no longer consumed; fixes #2049
* Mouse wheel handling now uses Forge mouse event
2015-03-04 21:23:05 +01:00
HenryLoenwind 681aff0009 Fix: Allow Unbreaking to work on dark steel items
* Dark Axe: Damage is routed the vanilla way (which does enchantment
damage reduction) and then intercepted at the "apply" stage.
Multi-harvesting is handled as direct energy use, as multi-harvesting
only works with power.
* Dark Pick: Damage is routed the vanilla way (which does enchantment
damage reduction) and then intercepted at the "apply" stage. Obsidian is
handled as additional direct energy use.
* Dark Armour: Damage is no longer set directly but routed through the
stack (which does enchantment damage reduction). This makes armor check
enchantments *after* power use.
2015-03-03 20:14:27 +01:00
HenryLoenwind a1f89f9c2a Fixes for the Crafter
* Fixes #2038. Recipes that return different amounts based on input item
NBT or phase of the moon will result in the correct amount now.
* Fix for the same case: Result itemstacks will never be too big.
* Fix: Recipes that return different NBT data based upon input item NBT
or phase of the moon will be handled (nearly) correctly. Remaining error
is that there will be an output queue instead of the crafting being
paused. Not worth to fix.
* Fix: Overflow items are now merged into the result stack correctly.
* Improvement: Container items should now be handled correctly no matter
what kind of funny things a mod does with its items.
2015-03-02 23:45:54 +01:00
tterrag1098 583121f2be Merge pull request #2037 from HenryLoenwind/shearFarmer
Fix for Farming Station Upgrading
2015-03-02 13:05:05 -05:00
HenryLoenwind 9555f5b91f Fix for Farming Station Upgrading
* Farming station slot shifting had an off-by-one error that destroyed
installed capacitors
* Also added some sanity checks that would have prevented item loss
2015-03-02 19:02:38 +01:00
tterrag1098 4bef8f2492 Merge pull request #2033 from HenryLoenwind/shearFarmer
Some fixes/optimizations for the TreeFarmer
2015-03-01 12:12:08 -05:00
HenryLoenwind e08aa9c533 Some fixes/optimizations for the TreeFarmer
* Fix: Shears will stop shearing after being destroyed
* Optimization: Don't bother trying to do work if there is no axe or no
tree (harvestBlock() is allowed to return null...)
* Optimization: Changed hasAxe handling to the same as hasShears (if we
have an axe we'll keep it as long as we don't damage it)
* Optimization: In damageTool(), only roll the dice if there is a tool
to be damaged
* Fix: When asking a block for its drops, give it its own coordinates
2015-03-01 18:09:53 +01:00
tterrag1098 739d235b66 Fix crashes with potion effects applied to the killer joe 2015-03-01 12:02:25 -05:00
tterrag1098 558f382543 Fix WAILA issues with conduits inside facades (#2013) 2015-03-01 09:34:38 -05:00
tterrag1098 6092625367 Fix shearing not working 2015-03-01 09:06:54 -05:00
tterrag1098 3f9993289c Merge pull request #1877 from HenryLoenwind/shearFarmer
Farming station can utilize shears
2015-03-01 08:49:12 -05:00
tterrag1098 5cd08eebb3 Merge pull request #2031 from ljfa-ag/master
#1745 Fix grinding ball handling
2015-03-01 08:45:48 -05:00
tterrag1098 141fa53fea #2027 Skeleton spawner in nether freezes game 2015-03-01 08:10:47 -05:00
tterrag1098 65dd674a40 Fix logic issues in killer joe preventing parallel joes from working 2015-03-01 08:00:29 -05:00
tterrag1098 0f90f4aefe #2019 Fix soul vials not working if stacked 2015-03-01 07:51:40 -05:00
tterrag1098 a1b04d55d2 #2017 Fix spelling errors in ServerChannelRegister logging 2015-03-01 07:42:44 -05:00
ljfa-ag f82386120b #1745 Fix grinding ball handling
Also, typo
2015-03-01 11:35:08 +01:00