Commit Graph
1432 Commits
Author SHA1 Message Date
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
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
tterrag1098 b82e642d1e Merge pull request #1948 from MatthiasMann/conduit_waila
only transmit required information for conduits, add used channels display for ME conduits
2015-02-21 18:26:13 -05:00
tterrag1098 136bc71d14 Merge pull request #1924 from MatthiasMann/farmstation_locked_slots
save locked slots state when picking up a Farming Station
2015-02-21 18:24:09 -05:00
Matthias Mann f6d70cbb9c rewrote crafter GUI to use ghost slots 2015-02-21 21:37:43 +01:00
Matthias Mann ab3dea54a3 removed duplicate code, simplified conduit network tick handling, removed dead code, and deal with #1954 while we are here 2015-02-19 21:46:17 +01:00
tterrag1098 fcf78ed23b Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2015-02-19 11:33:34 -05:00
tterrag1098 ab0f87d10f Fix some weather obelisk server and GUI bugs 2015-02-19 11:33:21 -05:00
tterrag1098 bf0bf98c21 Add a teleport active sound, fix Lang 2015-02-18 01:23:03 -05:00
HenryLoenwind 5da6a47420 Added missing SideOnly annotations
* Added @SideOnly(Side.CLIENT) to methods that override methods that are
@SideOnly(Side.CLIENT).
* Added @SideOnly(Side.CLIENT) to classes that extend classes that are
@SideOnly(Side.CLIENT)
* Added @SideOnly(Side.CLIENT) to ClientProxy class
2015-02-18 02:18:53 +01:00
tterrag1098 24549156c0 TIL I18n is clientside only 2015-02-17 19:34:59 -05:00
tterrag1098 452934ffdc Fix conduits rendering on the alpha pass 2015-02-17 19:25:07 -05:00
tterrag1098 7982efd015 Fix item conduit arrows disappearing sometimes 2015-02-17 19:12:01 -05:00
Matthias Mann a7cb123f1a #1937 reconnect to P2P ME tunnels after chunk load 2015-02-17 17:08:33 +01:00
Matthias Mann 46f75ff5c1 only transmit required information for conduits, add used channels display for ME conduits 2015-02-17 14:30:33 +01:00
tterrag1098 a5ff6dd96a Merge pull request #1918 from MatthiasMann/itemconduit_gui
rewrote item filter GUI to use GhostSlots
2015-02-16 12:31:35 -05:00
tterrag1098 0c105c7c78 Lots of telepad function/GUI work, add some rudimentary rendering 2015-02-16 00:11:52 -05:00
HenryLoenwind caed1611f6 Removed unnecessary client sync
50% FPS drop from just a single buffer is a bit too much...
2015-02-14 18:38:04 +01:00
Matthias Mann c91860bc6b save locked slots state when picking up a Farming Station, cleanup GUI code and locked state handling 2015-02-14 13:00:42 +01:00
Matthias Mann 77ae00f768 #1886 remember smelting mode when wrenching the Alloy Smelter 2015-02-14 08:39:38 +01:00
tterrag1098 2cb28a72eb Telepad now actually teleports, additional GUI/other refinements 2015-02-14 02:34:08 -05:00
tterrag1098 de55e3336c Merge remote-tracking branch 'origin/master' into Telepad
Conflicts:
	src/main/java/crazypants/gui/GuiContainerBase.java
2015-02-14 00:41:37 -05:00
tterrag1098 ca656b8ece Merge pull request #1917 from MatthiasMann/darksteel_pickaxe
display the right amount of energy required for mining obsidian
2015-02-13 23:46:16 -05:00
Matthias Mann 095be41b25 #1919 don't crash when the item conduit network has not yet been formed 2015-02-14 05:38:16 +01:00
tterrag1098 2e74bbd5e6 Add new coord selector textures and rename to fit more appropriately 2015-02-13 23:21:41 -05:00
tterrag1098 95d123a132 Redo how the coords card works, finish it off, except for texture 2015-02-13 22:44:33 -05:00
tterrag1098 007c24377e Add Coords Card 2015-02-13 19:20:14 -05:00
Matthias Mann e10e4eaa7e rewrote item filter GUI to use GhostSlots 2015-02-14 00:51:07 +01:00