Commit Graph
2194 Commits
Author SHA1 Message Date
bdew 7f89eba8b5 Added forestry sapling support to farm station
Cherry picked & backported from 1b242dc2d786b8c1fb545845768faa1f6c15818a
2020-11-07 12:50:04 -08:00
Glease 41c51754bb Ignore dead entities 2020-10-29 18:07:20 +08:00
Prometheus0000 806d162b19 Change fused quartz blast resistance 2000 -> 20 2020-10-21 15:40:46 -04:00
glowredman f9bc80ef91 Hide tile.blockLightNode.name in NEI 2020-10-11 00:02:35 +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
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
2020-05-27 13:24:21 +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 <[email protected]>
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
DreamMasterXXL dfd194159f Merge remote-tracking branch 'Zoko/release/1.7.10/2.3' into 1.12-stuff
# Conflicts:
#	.gitignore
#	gradle.properties
#	src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java
2020-05-10 13:38:46 +02:00
Zoko061602 15d7f7405b Added 1.12 content 2020-05-10 12:36:33 +02:00
DreamMasterXXL 36eaeeb615 Merge remote-tracking branch 'Zoko/master' 2020-04-18 23:40:09 +02:00
Zoko061602 49c17652cd Fixed Transceiver crash 2020-04-18 23:27:46 +02:00
Martin Robertz be44112161 Merge pull request #15 from Zoko061602/master
Fixed basic ItemFilter
2020-04-17 11:23:56 +02:00
Zoko061602 88d90c2d07 Fixed basic ItemFilter 2020-04-17 00:52:36 +02:00
DreamMasterXXL 7da7525257 Merge remote-tracking branch 'Zoko/master'
# Conflicts:
#	gradle.properties
2020-04-17 00:49:58 +02:00
Zoko061602 1b610403b3 Update localization, add filter recipes 2020-04-05 23:46:19 +02:00
Dream-Master 7d239bd2ab ore dicted Endsteel nugget 2020-04-05 23:28:51 +02:00
Zoko061602 bc46a1f198 Capacitors, Conduits, Stellar Armor 2020-04-05 18:29:44 +02:00
Zoko061602 4e9b00702a Added Big Item Filter 2020-04-02 14:13:47 +02:00
Zoko061602 0d00ff00cb Fixed Conduit Filter 2020-04-02 13:43:51 +02:00
Zoko061602 30befc896c Fixed Armor again 2020-03-14 13:01:08 +01:00
Zoko061602 805ba22e52 Fixed Armor & new Conduit texture 2020-03-13 22:07:16 +01:00
Zoko061602 ab0de22156 Fixed Upgrades 2020-03-12 21:51:15 +01:00
Zoko061602 06d0749766 Fixed missing localization 2020-02-08 21:33:51 +01:00
Zoko061602 fb64552ca4 Added more 1.12 content
- Added Generators
- Added Fluids
- made grindingBalls seperate Items
- Added solar Panel 3
2020-02-08 03:20:54 +01:00
Zoko061602 548d8d3d17 Add EndSteel Armor
- Added EndSteel Armor
- Added Capacitor
- Added Empowered 5
2020-02-05 01:25:27 +01:00
Zoko061602 3ae96b3f35 Added Grinding Balls and End Steel 2020-02-03 22:38:49 +01:00
Martin Robertz 3af0cb5421 Revert "Allow Galacticraft handles SoulBound itself" 2018-01-25 09:03:01 +01:00
Ugachaga a5a61f9fe5 Allow Galacticraft handles SoulBound itself 2018-01-25 13:07:41 +07:00
Ugachaga d5f78ad1f3 Allow Baubles handle SoulBound itself 2017-03-07 03:18:41 +07:00
Ugachaga 246633ca7b Fixed Googles chat message 2017-03-04 08:45:33 +07:00
Ugachaga dbfe3d10f6 Added support for NightVision enchant 2017-03-04 03:23:30 +07:00
Martin Robertz 77beea05aa Merge pull request #1 from catt0/master
farming station will cut down IC2 rubber trees if an axe is present
2017-01-10 18:42:13 +01:00
yepidoodles f77f6a9fdf Fixed a spelling mistake 2016-12-03 15:14:43 +00:00
Henry Loenwind f94c442a55 Backport: Prevent generators from stalling if they are configured to produce more RF/t than normal 2016-08-10 22:40:03 +02:00
Benjamin Kollenda f805e88147 farming station will cut down IC2 rubber trees if an axe is present 2016-07-25 17:01:19 +02:00
Henry Loenwind d2efbd5694 Backport: Fix for inventory panel creating 'phantom items' (#3508)
* Fix for inventory panel creating 'phantom items'
2016-07-12 04:58:55 +02:00
MatthiasMann d3830941b3 Merge pull request #3473 from HenryLoenwind/invFix
Fixed invPanel item mixup
2016-07-04 22:00:53 +02:00
Henry Loenwind 65899cdd12 Fixed invPanel item mixup 2016-07-04 20:13:58 +02:00
Henry Loenwind 411e760ed1 Small Fixes for the Farm (#3344)
Small Fixes for the Farm (actually one big one, too)
2016-06-14 00:00:05 +02:00
CrazyPants f66ccef5dc Merge pull request #3163 from HenryLoenwind/magnetPower
Prevent magnet from being used as battery by default
2016-05-29 00:25:33 +08:00
CrazyPants 8f05a8a48a Merge pull request #3309 from OneEyeMaker/TelePad
Added config options for TelePad
2016-05-29 00:22:58 +08:00
CrazyPants fa4afebca2 Merge pull request #3081 from HenryLoenwind/farmLoaded
Check if chunk is loaded in farming station
2016-05-29 00:21:46 +08:00
CrazyPants eb906440ea Merge pull request #3164 from HenryLoenwind/baublesCrash
Handle Baubles inv more careful in MP
2016-05-29 00:20:54 +08:00
CrazyPants 4c2f928db1 Merge pull request #3263 from HenryLoenwind/magicalHoe
Added new Magic Crops hoe names
2016-05-29 00:19:39 +08:00
CrazyPants 3ab75b2f09 Merge pull request #3287 from MaPePeR/implement1984
Show Block Name in GuiExternalConnectionSelector. Fixes #1984
2016-05-29 00:18:54 +08:00