Commit Graph
1530 Commits
Author SHA1 Message Date
tterrag1098 3ddf4e311b Allow gas conduits to load with Mekanism v7 2015-03-23 16:21:25 -04:00
tterrag1098 681407a555 Rewrite Fertilizer to be an enum 2015-03-22 17:28:30 -04:00
tterrag1098 c83f6fde5a Merge pull request #2134 from HenryLoenwind/fertilizer
Support for more types of fertilizer
2015-03-22 17:06:09 -04:00
tterrag1098 66094132c7 Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2015-03-22 16:39:49 -04:00
tterrag1098 752342d15d Implement Mekanism v8 gas API, in the process move mek API to src/api 2015-03-22 16:39:41 -04:00
Vexatos f2164ad1cd Fixed target dimension methods in TileTelePad.java 2015-03-22 21:31:26 +01:00
tterrag1098 e05b3c2f75 Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2015-03-22 16:12:28 -04:00
tterrag1098 6278ab1842 Implement telepad animation 2015-03-22 16:12:21 -04:00
Vexatos 7e67b023c0 Properly synchronized Telepad coordinate changes 2015-03-22 20:56:00 +01:00
tterrag1098 537c8f3491 Improve Weather Obelisk methods for @Vexatos 2015-03-22 06:06:15 -04:00
tterrag1098 2d39c6b60c Selection box of formed telepad contains whole structure, fix render BB 2015-03-21 04:26:54 -04:00
tterrag1098 e024666a4f Merge all telepad models into one, add (very very basic) animation 2015-03-21 04:04:41 -04:00
HenryLoenwind 770513ce30 Support for more types of fertilizer
Now supported:
* Vanilla Bonemeal
* Forestry FertilizerCompound
* Botania FloralFertilizer (no harvest yet)
* Metallurgy Fertilizer
* GardenCore Compost_pile
2015-03-21 00:22:02 +01:00
tterrag1098 88341fc5c3 Fix NPE if serverside entity for teleport cannot be found 2015-03-20 18:53:59 -04:00
tterrag1098 172c7a1342 Merge pull request #2129 from HenryLoenwind/fix
Micro-Fix: Useless null check
2015-03-20 16:49:32 -04:00
tterrag1098 0b9ecf9a0e Merge pull request #2133 from HenryLoenwind/fertilizer
Generic fertilizer support for Farming Station
2015-03-20 16:49:08 -04:00
HenryLoenwind 6c2a33bc28 Generic fertilizer support for Farming Station
Currently supported:
* Vanilla Bone Meal
* Forestry Fertilizer
2015-03-20 21:47:40 +01:00
tterrag1098 af4c7ce587 #2128 Fix server crash without use of SideOnly. Obsoletes #2130 2015-03-20 16:45:51 -04:00
HenryLoenwind 191c5800fd Fix: Stack size limits on Farming Station
* The Farming Station's stack size limitations now actually work. Cases:
** Manual insert
** Shift-Click
** Pulling
** Pushing (e.g. item conduits)
** Harvesting
2015-03-20 19:45:13 +01:00
HenryLoenwind 86c3fdba2e Micro-Fix: Useless null check 2015-03-20 16:50:55 +01:00
tterrag1098 6d8cf393d9 Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2015-03-20 00:09:46 -04:00
tterrag1098 8605d02f3e Partially implement telepad model 2015-03-20 00:09:39 -04:00
HenryLoenwind b5fab930c3 Removed doubled SFX 2015-03-20 03:45:08 +01:00
Henry Loenwind 139544af3e Added bone meal support to farming station
* 2 new slots for bone meal
* Will try to use it on everything thats on the field and cannot be
harvested
* Different RF usage for successful and unsuccessfull tries
* Fix: Output slots no longer accept seeds
* Fix: "Only one tool per slot" policy works again
2015-03-20 03:16:23 +01:00
tterrag1098 39b871dd17 Merge pull request #2101 from HenryLoenwind/shearFarmer
Add more output slots to farming station
2015-03-19 22:08:42 -04:00
tterrag1098 0aa6db01cf Merge pull request #2124 from HenryLoenwind/fixCap
Fixed Farming Station power use and display
2015-03-19 21:56:16 -04:00
tterrag1098 3723130c76 Merge pull request #2123 from HenryLoenwind/shearPercentage
More shearing tweaks
2015-03-19 21:55:35 -04:00
tterrag1098 f3c8d213dd Merge pull request #2125 from HenryLoenwind/magnetKey
KeyBinding for the Magnet
2015-03-19 21:53:51 -04:00
tterrag1098 0e6ca217fe Fix conduit breaking animation 2015-03-19 21:52:34 -04:00
tterrag1098 d4b9c3fba3 Add telepad recipe 2015-03-19 21:49:40 -04:00
HenryLoenwind 374b37a15e KeyBinding for the Magnet
* default binding is "none"
2015-03-20 01:08:09 +01:00
tterrag1098 537e18ab4d Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2015-03-19 17:04:17 -04:00
tterrag1098 a7656eb8ce The great block texture update! Retexture almost every block. 2015-03-19 17:04:04 -04:00
HenryLoenwind 5181106aae Fixed Farming Station power use and display 2015-03-19 21:48:30 +01:00
Henry Loenwind 593c395ad7 More shearing tweaks
* Shearing ratio is now dynamic, between 10% at empty supply slot and
100% at the configured reserve
* Harvested seeds/sappling are added to the supply slot for the quarter
they were harvested from, then the others in order
2015-03-19 21:20:43 +01:00
Matthias Mann a1e404ce77 Cycle through the enchantment levels in NEI 2015-03-19 19:25:26 +01:00
HenryLoenwind 31c1c41c1b Added Soulbound support for Baubles
* Includes Baubles API 1.0.1.10 (will not be included in ender io jar)
2015-03-19 01:29:04 +01:00
tterrag1098 9bbc87db50 Merge pull request #2109 from HenryLoenwind/shearFarmer2
Shear less when low on saplings
2015-03-18 17:47:11 -04:00
HenryLoenwind 4988a16aeb Shear less when low on saplings
* New config setting for sapling reserve amount.
* When there are less than reserver amount saplings, only half the
leaves will be sheard, the other half will be harvested for saplings.
2015-03-18 22:44:03 +01:00
tterrag1098 9f9a5e39a6 Fix breaking animation rendering incorrectly with overlay 2015-03-18 17:21:14 -04:00
tterrag1098 6082285fd7 Fix break animation rendering on faces outside block bounds 2015-03-18 17:05:55 -04:00
HenryLoenwind d7a3b347b8 Added output slots to farming station
* Added 2 output slots to farming station to prevent overflow from
shearing leaves
* Resized GUI to make space
* Solves #2096
2015-03-18 21:58:16 +01:00
tterrag1098 32bb6fb41e Merge pull request #2108 from HenryLoenwind/setCap
Cleanup of common constructs
2015-03-18 16:50:11 -04:00
Henry Loenwind d7f9eb05fe Cleanup of common constructs 2015-03-18 21:44:48 +01:00
tterrag1098 d08dbbff0b Add diffuse lighting to techne models 2015-03-18 16:32:02 -04:00
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