upstream/EnderIO
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/EnderIO.git synced 2026-10-25 20:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,960 Commits 12 Branches 241 Tags
master
Commit Graph
3960 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
D-Cysteine 6c70e43a77 Fix accidentally swapping core and segment textures 2021-10-21 03:45:55 -06:00
Martin Robertz b100bb2e12 Merge pull request #33 from D-Cysteine/advanced-ender-fluid 
Implement advanced ender fluid conduits
 2021-10-17 13:34:22 +02:00
D-CysteineandPrometheus0000 f8605f6642 Implement advanced ender fluid conduits 
Adaptation of code in:
 * https://github.com/GTNewHorizons/EnderIO/pull/23

Co-Authored-By: Prometheus0000 <8517039+Prometheus0000@users.noreply.github.com>
 2021-10-16 19:57:17 -06:00
Martin Robertz a6c00f117c Merge pull request #32 from Kiwi233/master 
Update zh_CN.lang
 2021-10-16 15:31:32 +02:00
Martin Robertz a614038a18 Merge pull request #31 from D-Cysteine/master 
Fix capacitor NBT conversion
2.3.1.17 		2021-10-16 15:21:44 +02:00
D-Cysteine cd58ee6866 Remove "_beta" from mod version 2021-10-16 06:06:46 -06:00
[Kiwi233] a12731398f Update zh_CN.lang 2021-10-16 16:29:43 +08:00
D-Cysteine 88ac45d6b6 Fix capacitor NBT conversion 2021-10-13 22:53:19 -06:00
Martin Robertz 187ba74826 Merge pull request #30 from GTNewHorizons/fuzzymode-improvements 
Item Filter Improvements
 2021-09-05 18:09:43 +02:00
TimeConqueror 10a05d75bc Collapse logic in #doesItemPassFilter 2021-09-05 00:50:57 +03:00
TimeConqueror b9d405312d Item Filters: Changed the logic of fuzzy mode, changed the way empty item list works 2021-08-28 18:50:54 +03:00
DreamMasterXXL 067d602a9d add(Ender-IO)Changelog 2021-06-27 23:22:33 +02:00
Martin Robertz 9b54770785 Merge pull request #29 from charagarlnad/master 
fix a crash with capacitor banks
 2021-03-22 15:50:33 +01:00
charagarlnad 51d553d6a0 fix a crash with capacitor banks 2021-02-28 15:26:50 -06:00
DreamMasterXXL a2da1c4832 bump version 2.3.1.16_beta 2021-01-29 19:56:32 +01:00
Martin Robertz a40e48f5d8 Merge pull request #28 from GTNewHorizons/fix_burn_time_tooltip 
Fix Burn Time tooltip
 2021-01-24 22:37:43 +01:00
Jason Mitchell 0e7bf1c530 Revert "Update TooltipHandlerBurnTime.java" 
This reverts commit 3093ea6180.
 2021-01-24 13:02:17 -08:00
DreamMasterXXL 81ac330ec8 bump version 2.3.1.15_beta 2020-12-15 23:33:49 +01:00
Martin Robertz c08af8ef02 Merge pull request #26 from dvdmandt/master 
Initial support for channels on EnderFluidConduits
 2020-12-13 13:47:37 +01:00
David Lindström 15ed039813 Sync settings layouts for fluid conduits and item conduits 2020-12-13 11:40:59 +01:00
David Lindström a217fd3699 Make icons explicitly reference the fields from ItemConduit. 2020-12-11 06:16:34 +01:00
David Lindström 246a6d8f0a Update LiquidSettings.java 
* Fix missing } after merge
 2020-12-11 06:09:41 +01:00
David Lindström b652b79e61 Merge branch 'master' into master 2020-12-11 06:02:45 +01:00
Martin Robertz 27a0a443a2 Merge pull request #27 from GTNewHorizons/feature/ender-conduit-round-robin 
Add round-robin button to ender conduit
 2020-12-10 15:19:58 +01:00
Glease c7a334c913 Add round-robin button to ender conduit 
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
 2020-12-10 19:32:40 +08:00
David Lindström f512b210a5 Initial support for channels on EnderFluidConduits 
This is pretty basic support for channels. There's plenty of room for optimizations in the network logic.
 2020-12-08 00:21:44 +01:00
Martin Robertz e2b41a49c3 Merge pull request #25 from GTNewHorizons/forestry_compat 
Added forestry sapling support to farm station
2.3.1.14_beta 		2020-11-08 09:22:35 +01:00
bdew 7f89eba8b5 Added forestry sapling support to farm station 
Cherry picked & backported from 1b242dc2d786b8c1fb545845768faa1f6c15818a
 2020-11-07 12:50:04 -08:00
Martin Robertz 76dabdf493 Merge pull request #24 from GTNewHorizons/fix-dupe-mob 
Ignore dead entities when capturing mobs with soul vial
 2020-11-01 10:24:47 +01:00
Glease 41c51754bb Ignore dead entities 2020-10-29 18:07:20 +08:00
Martin Robertz 472b3649e1 Merge pull request #22 from Prometheus0000/fused-quartz-nerf 
Change fused quartz blast resistance 2000 -> 20
 2020-10-24 22:34:24 +02:00
Prometheus0000 806d162b19 Change fused quartz blast resistance 2000 -> 20 2020-10-21 15:40:46 -04:00
Martin Robertz ad1f98b03e Merge pull request #21 from glowredman/master 
Hide tile.blockLightNode.name in NEI
 2020-10-11 12:16:43 +02:00
glowredman f9bc80ef91 Hide tile.blockLightNode.name in NEI 2020-10-11 00:02:35 +02:00
Martin Robertz 8807be5887 Merge pull request #20 from TataTawa/patch-2 
Update TileConduitBundle.java
 2020-08-31 13:17:05 +02:00
TataTawa 026a36d51d Update TileConduitBundle.java 2020-08-31 17:12:00 +08:00
TataTawa c6c539ea13 Update TileConduitBundle.java 2020-08-31 06:51:28 +00:00
TataTawa 983a76dd1d Update TileConduitBundle.java 
Greatly increase Client Side ItemConduit performance. (20% fps increase if have 100 - 200 item conduit in render area, these are lag-spikes.)

EnderIO Conduits are very laggy, partly because Redstone/fluid/gas Conduits causing RenderChunks re-render back and forth. But if there is only one ItemConduit in the bundle, it is pretty sure that we only need to re-render ItemConduit near the player , because only player's behavior range (5) can change the shape of ItemConduit. 
But if there is another conduit in the bundle, the re-render is not sure because Redstone conduit in the bundle might needs to re-render in any time. So in this case I left to default.
 2020-08-28 17:59:14 +08:00
Martin Robertz f492c45f50 Merge pull request #19 from TataTawa/patch-1 
Update TooltipHandlerBurnTime.java
 2020-08-01 16:37:34 +02:00
TataTawa 3093ea6180 Update TooltipHandlerBurnTime.java 
After performance profiling I found 
TileEntityFurnace.getItemBurnTime(item); 
is computationaly expensive. It occupied almost a cpu core forever, because NEI starts a task thread every few seconds and this line of code keep iteraing through all the furnance recipe in GTNH. Besides, usually the result of this computation is not useful.

Add thread name check will help performance and will not influence the player.
if (!Thread.currentThread().getName().startsWith("Client Thread")) return false;
 2020-07-29 09:34:08 +00:00
bartimaeusnek ea5786c266 Fixed Fuckup 
+ renamed constructor params for easier access
+ reduced log-spam
+ version increase
2.3.1.13_beta 		2020-05-27 13:24:21 +02:00
DreamMasterXXL 2c714d4321 bump version 2.3.1.12_beta 2.3.12_beta 2020-05-24 16:41:26 +02:00
Martin Robertz 40462a06fd Merge pull request #18 from Kiwi233/master 
Update zh_CN.lang
 2020-05-24 09:03:50 +02:00
[Kiwi233] eb83e72c74 Update zh_CN.lang 2020-05-24 11:47:19 +08:00
Martin Robertz 6ed29e1ae1 Merge pull request #17 from GTNewHorizons/deps 
Fixed Capacitor bug
2.3.1.11_beta 		2020-05-20 18:39:19 +02:00
bartimaeusnek a388c7ed2d Fixed capacitor bug on load 
+ Cleaned up capacitor loading code
+ Version increase
 2020-05-20 17:46:20 +02:00
bartimaeusnek d7080d356e Updated Deps 
+ update to Java8
+ enabled UTF-8 encoding
+ applied Java & IntelliJ plugins
+ removed unused class

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
 2020-05-20 12:51:25 +02:00
DreamMasterXXL f7c2a36e36 removed unused trigger classes from bc 
(cherry picked from commit 08fa2ea69214cb42f635a43e3b8ef2b6f37aa398)
 2020-05-10 14:17:18 +02:00
Martin Robertz 3f57c1ba79 Merge pull request #16 from GTNewHorizons/1.12-stuff 
1.12 stuff
2.3.1.10_beta 		2020-05-10 13:51:46 +02:00
DreamMasterXXL 1e30b56d65 change version 2020-05-10 13:47:36 +02:00