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
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