Commit Graph
1393 Commits
Author SHA1 Message Date
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
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 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 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
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 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
Matthias Mann e10e4eaa7e rewrote item filter GUI to use GhostSlots 2015-02-14 00:51:07 +01:00
Matthias Mann 31746f9a7c display the right amount of energy required for mining obsidian 2015-02-13 22:43:50 +01:00
tterrag1098 cb311e1b4d Merge pull request #1862 from HenryLoenwind/newTooltips
Added Tooltips for item conduit upgrade slots
2015-02-13 16:20:00 -05:00
tterrag1098 95f016ee92 Merge pull request #1907 from MatthiasMann/generator_progress_tooltips
add remaining percentage/time/RF tooltip on stirling generator
2015-02-13 16:18:54 -05:00
tterrag1098 c355defbc8 Merge pull request #1916 from Adaptivity/additlocalization
Localized few tooltips
2015-02-13 16:18:14 -05:00
tterrag1098 8467cf96c5 Merge pull request #1879 from MatthiasMann/vacuum_chest_filters
#991 add item filters, range and redstone control and to vacuum chest
2015-02-13 16:17:24 -05:00
Adaptivity 50548cae19 Localized few tooltips 2015-02-13 22:19:32 +03:00
Matthias Mann e894d6760d ignore NBT size limits for parsing packet data 2015-02-12 00:36:35 +01:00
Matthias Mann fbb7cec773 add remaining percentage/time/RF tooltip on stirling generator 2015-02-12 00:13:39 +01:00
tterrag1098 d3d8bcfab5 Merge pull request #1891 from nekosune/master
Fixed UUID showing up in denied message
2015-02-11 12:28:13 -05:00
tterrag1098 96d4f85cf2 Merge pull request #1895 from HenryLoenwind/fix
Fix for SideOnly-Error in DarkSteelAxe
2015-02-11 12:27:48 -05:00
Matthias Mann 1631aa4c20 #1843 another isRemote check 2015-02-10 21:21:46 +01:00
HenryLoenwind c439269cc5 Fix for SideOnly-Error in DarkSteelAxe
Fixes #1893
2015-02-10 19:46:12 +01:00
HenryLoenwind 6f768524cc Added Tooltips for item conduit upgrade slots 2015-02-10 17:35:22 +01:00
Katrina Swales 1f20602420 Fixed UUID showing up in denied message 2015-02-10 13:51:31 +01:00
Matthias Mann bb5ec19b4f facades painted with logs can now be rotated 2015-02-10 00:07:06 +01:00
tterrag1098 6e25da63a3 Merge pull request #1858 from nekosune/master
Switched to storing UUID instead of username, with Offline Mode compatibility
2015-02-09 17:39:18 -05:00
Matthias Mann 0c23f5ece3 #1770 add redstone control to vacuum chest 2015-02-08 16:17:39 +01:00
Matthias Mann c6ddec37e7 #991 add item filters and range control to vacuum chest 2015-02-08 16:17:33 +01:00
Matthias Mann a2170310cc #1843 only create conduits on server 2015-02-08 11:51:16 +01:00
tterrag1098 fb1cd698e8 Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2015-02-07 20:29:51 -05:00
tterrag1098 c58241c89f Improve obelisk rendering to be more consistent 2015-02-07 20:29:32 -05:00
tterrag1098 26ee42cfef Fix debugging code 2015-02-07 19:36:20 -05:00
tterrag1098 d836f76722 Finish weather obelisk functionality and add configs 2015-02-07 19:34:34 -05:00
tterrag1098 bbd305a0ab Merge remote-tracking branch 'origin/master' into Weather_Obelisk
Conflicts:
	resources/assets/enderio/textures/gui/widgets.png
	src/main/java/crazypants/enderio/gui/IconEIO.java
2015-02-07 17:24:27 -05:00
tterrag1098 52c628a7ab Merge pull request #1870 from HenryLoenwind/solarTooltips
Make Photovoltaic Cell more findable
2015-02-07 17:17:08 -05:00
tterrag1098 bcb983a783 Merge pull request #1874 from HenryLoenwind/typos
Miner typos
2015-02-07 17:16:24 -05:00
tterrag1098 4fba47aa58 Merge pull request #1875 from HenryLoenwind/vacuumCHestRicghtClick
Fix right-click on vacuum chest
2015-02-07 17:16:02 -05:00
HenryLoenwind a7acc79a4b Fix right-click on vaccum chest
* Right-clicking on a vacuumchest no longer places a block
2015-02-07 22:25:42 +01:00