tterrag1098
2c55c8a512
Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git
2015-04-02 13:16:47 -04:00
tterrag1098
dfa8e8ff95
Allow breaking conduits with yeta wrench in survival mode
2015-04-02 13:16:36 -04:00
tterrag1098
b5ce275594
Merge pull request #2153 from HenryLoenwind/fertilizer
...
Added magicalcrops_MagicalCropFertilizer
2015-04-02 12:45:11 -04:00
HenryLoenwind
73665d5047
Added magicalcrops_MagicalCropFertilizer
2015-04-02 18:22:47 +02:00
tterrag1098
a394aaa1f0
Fix some remaining render issues with conduits and breaking animations
2015-03-30 05:18:08 -04:00
tterrag1098
007552b812
Merge pull request #2114 from HenryLoenwind/baubles
...
More Baubles support
2015-03-29 01:29:00 -04:00
tterrag1098
0481fdcbd4
Merge pull request #2158 from HenryLoenwind/fertilizer2
...
Properly set up farmerJoe when fertilizing
2015-03-29 01:28:12 -04:00
tterrag1098
9d4a5ccccc
Fix telepad sound playing once block is destroyed
2015-03-26 19:30:45 -04:00
tterrag1098
c757f51069
Turns out Gson allows comments, who knew?
2015-03-25 22:31:37 -04:00
Henry Loenwind
dc4ad7dd3d
Fix: Properly set up farmerJoe
...
Properly set up farmerJoe when fertilizing
2015-03-25 13:51:52 +01:00
tterrag1098
b1b1a925d7
Improve Fertilizer efficiency
2015-03-23 21:12:40 -04:00
tterrag1098
0e66049e25
Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git
2015-03-23 21:02:34 -04:00
tterrag1098
93a554828b
Temporarly ship the Mek v8 API to maintain compatibility with v7
2015-03-23 21:02:26 -04:00
tterrag1098
f8b7a06a9b
Merge pull request #2136 from HenryLoenwind/flowers
...
Added flower support to farming station
2015-03-23 18:18:14 -04:00
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
7f9270affc
Added flower support to farming station
...
* Farming station will now pick flowers (not plant!)
* Supported flowers: Vanilla single block, BoP, Botany, Botania
2015-03-21 02:35:17 +01: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