Commit Graph
1458 Commits
Author SHA1 Message Date
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 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
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
tterrag1098 763c7c508c #1991 Fix capacitor banks dropped from explosions being "creative" 2015-02-28 19:47:14 -05:00
tterrag1098 9e6aaf2ac3 WailaWorldWrapper should not be passed to waila body handlers 2015-02-28 18:48:41 -05:00
tterrag1098 43a8fe256e Fix telepad entity rendering being incorrect on older entities 2015-02-28 18:13:22 -05:00
tterrag1098 8e432bd9d5 Fix enqueue allowing duplicate entities and move to ArrayDequeue 2015-02-28 17:44:06 -05:00
tterrag1098 0bef36c8bb Improve rendering effects 2015-02-28 17:31:55 -05:00
tterrag1098 d5abaa8003 Improve active sound, add teleport sound, fix sync issues 2015-02-28 14:45:20 -05:00
tterrag1098 96273cede4 Merge remote-tracking branch 'origin/master' into Telepad
Conflicts:
	src/main/java/crazypants/enderio/EnderIO.java
	src/main/java/crazypants/enderio/enderface/BlockEnderIO.java
	src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java
	src/main/java/crazypants/enderio/teleport/TravelEntitySpecialRenderer.java
	src/main/java/crazypants/gui/GuiContainerBase.java
	src/main/java/crazypants/gui/IGuiScreen.java
2015-02-26 11:33:42 -05:00
tterrag1098 4a4077a50b Merge pull request #2008 from HenryLoenwind/fix
Added check for blocks without item
2015-02-25 06:42:05 -05:00
tterrag1098 710be88b6f Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2015-02-25 06:22:01 -05:00
tterrag1098 f430aac973 Fix a stirling gen with a non-burnable item in the inv making FPS drop 2015-02-25 06:21:46 -05:00
HenryLoenwind 5c5b2a3886 Added check for block without items
Simple null check, may fix #2007
2015-02-25 01:24:02 +01:00
tterrag1098 19c73082d3 Merge pull request #1996 from MatthiasMann/capbank_io_tracking
track capbank input and output separately - display both on tall info panels
2015-02-24 02:29:28 -05:00
tterrag1098 fa4e0c360c Merge pull request #2001 from greenchem4/master
Deep copy ore dictionary list
2015-02-24 01:43:49 -05:00
greenchem4 4739ff0d2b Deep copy ore dictionary list
prevents ore dictionary from being modified (
2015-02-24 00:39:29 -05:00
tterrag1098 2fa7f0f2ed Merge pull request #1926 from HenryLoenwind/test
Removed unnecessary client sync
2015-02-23 22:29:08 -05:00
Matthias Mann 0287384dd0 track capbank input and output separately - display both on higher than wide info panels 2015-02-23 22:09:48 +01:00
tterrag1098 ae392faf89 Add potential fix for #1994 2015-02-23 12:35:00 -05:00
tterrag1098 7fd2d0bb66 Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2015-02-23 06:52:58 -05:00
tterrag1098 2ad37c1990 Fix missing conduit textures 2015-02-23 06:52:47 -05:00
HenryLoenwind a79ae8b0d3 Farming station can utilize shears
* Farming stations will use shears if available and there are enough
sapling in store
* Otherwise they will break the leaves with the axe
* Third tool slot was added for the shears
* Old inventories will be adapted automagically
* GUI texture is still missing

Added GUI texture

* GUI texture with third slot for shears
* Fixed slot positioning

Fixed transparency
2015-02-23 09:52:30 +01:00
tterrag1098 bb822b9988 Merge pull request #1941 from MatthiasMann/ae2_api_is_garbage
#1937 reconnect to P2P ME tunnels after chunk load
2015-02-23 02:47:38 -05:00
tterrag1098 e874a7ea67 Merge pull request #1971 from MatthiasMann/conduit_code_cleanup
removed duplicate code, simplified conduit network tick handling, ...
2015-02-23 02:47:09 -05:00
tterrag1098 c8b755367a Merge pull request #1987 from MatthiasMann/despawn_protection_time
made despawn protection time configurable, set default to the intended 2 minutes
2015-02-23 02:46:32 -05:00
tterrag1098 0a7e696029 Add TC aspects for all items. Add full TC API to src/api 2015-02-23 01:03:48 -05:00
Matthias Mann e79f012a87 made despawn protection time configurable, set default to the (per comment) intended 2 minutes 2015-02-22 22:30:24 +01:00
tterrag1098 d6d32becc9 Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2015-02-21 18:51:07 -05:00
tterrag1098 8a2da93def Fix odd dupe bug when painting buffers 2015-02-21 18:50:50 -05:00