Add controller for many-to-many fusion reactor.

New:
- Ex Astris
- Ex Compressum
- RFTools
- Steves Carts
- Thaumcraft NEI Plugin
- TC NEI Additions
- Bibliocraft
- ComputerCraft

Updated:
- Thermal Expansion
- Project Red

README.md

@@ -1,6 +1,6 @@
 # NotEnoughItems Unofficial - By the GTNH Team
 
-A continuation of NotEnoughItems for 1.7.10 by the developers of Gregtech: New Horizons modpack, with features either inspired and/or backported from JustEnoughItems
+A continuation of NotEnoughItems for 1.7.10 by the developers of Gregtech: New Horizons modpack, with features either inspired and/or backported from JustEnoughItems.
 
 We've tested this against all of the mods included in GTNH, as well as a limited set of other mods (like Reika's mods). Every effort has been made to maintain backwards compatibility, however the focus is on the mods contained in the GTNH modpack.
 

src/main/java/codechicken/nei/ClientHandler.java

@@ -299,6 +299,10 @@ public class ClientHandler
                 lastworld = null;
             else if (gui instanceof GuiSelectWorld)
                 NEIClientConfig.reloadSaves();
+            else if(gui == null) {
+                /* prevent WorldClient reference being held in the Gui */
+                NEIController.manager = null;
+            }
         }
         lastGui = gui;
     }
@@ -328,6 +332,8 @@ public class ClientHandler
 
                 if (!Minecraft.getMinecraft().isSingleplayer())//wait for server to initiate in singleplayer
                     NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~'));
+
+                ItemMobSpawner.clearEntityReferences(world);
             }
 
             lastworld = world;

src/main/java/codechicken/nei/ItemMobSpawner.java

@@ -96,6 +96,10 @@ public class ItemMobSpawner extends ItemBlock
         return e;
     }
 
+    public static void clearEntityReferences(World newWorld) {
+        entityHashMap.values().removeIf(e -> e.worldObj != newWorld);
+    }
+
     private void setDefaultTag(ItemStack itemstack) {
         if (!IDtoNameMap.containsKey(itemstack.getItemDamage()))
             itemstack.setItemDamage(idPig);

src/main/resources/assets/nei/csv/catalysts.csv

@@ -401,13 +401,13 @@ minechem.nei.SynthesisNEIRecipeHandler,minechem:tile.chemicalSynthesizer,,minech
 exter.fodc.nei.ODCRecipeHandler,fodc:oreConverter,,fodc,TRUE,,,,,,
 exter.fodc.nei.ODCRecipeHandler,fodc:oreConvTable,,fodc,TRUE,,,,,,
 exter.fodc.nei.ODCRecipeHandler,fodc:oreAutoconverter,,fodc,TRUE,,,,,,
-cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerCharger,ThermalExpansion:Machine:10,,ThermalExpansion,TRUE,,,,,,this and below are not working well
+cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerCharger,ThermalExpansion:Machine:10,,ThermalExpansion,TRUE,,,,,,"this and below are not working well, ReSiever mod fixes it"
 cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerCrucible,ThermalExpansion:Machine:4,,ThermalExpansion,TRUE,,,,,,
 crafting,ThermalExpansion:Workbench:1,,ThermalExpansion,TRUE,,,,,,
 crafting,ThermalExpansion:Workbench:2,,ThermalExpansion,TRUE,,,,,,
 crafting,ThermalExpansion:Workbench:3,,ThermalExpansion,TRUE,,,,,,
 crafting,ThermalExpansion:Workbench:4,,ThermalExpansion,TRUE,,,,,,
-smelting,ThermalExpansion:Machine:0,,ThermalExpansion,TRUE,,,,,,
+cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerFurnace,ThermalExpansion:Machine,,ThermalExpansion,TRUE,,,,,,
 cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerInsolator,ThermalExpansion:Machine:11,,ThermalExpansion,TRUE,,,,,,
 cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerPulverizer,ThermalExpansion:Machine:1,,ThermalExpansion,TRUE,,,,,,
 cofh.thermalexpansion.plugins.nei.handlers.RecipeHandlerSawmill,ThermalExpansion:Machine:2,,ThermalExpansion,TRUE,,,,,,
@@ -456,7 +456,7 @@ mekanism.client.nei.PurificationChamberRecipeHandler,Mekanism:MachineBlock:7,"{r
 mekanism.client.nei.RotaryCondensentratorRecipeHandler,Mekanism:MachineBlock2:0,,Mekanism,TRUE,,,,,,
 mekanism.client.nei.SolarNeutronRecipeHandler,Mekanism:MachineBlock3:1,,Mekanism,TRUE,,,,,,
 mekanism.client.nei.ThermalEvaporationRecipeHandler,Mekanism:BasicBlock:14,,Mekanism,TRUE,,,,,,
-exnihilo.compatibility.nei.RecipeHandlerHammer,exnihilo:hammer_wood,,exnihilo,TRUE,,,,,,
+exnihilo.compatibility.nei.RecipeHandlerHammer,exnihilo:hammer_wood,,exnihilo,TRUE,,,,,,"Ex Nihilo does not really work out of the box, use the ReSiever mod to fix this"
 exnihilo.compatibility.nei.RecipeHandlerHammer,exnihilo:hammer_stone,,exnihilo,TRUE,,,,,,
 exnihilo.compatibility.nei.RecipeHandlerHammer,exnihilo:hammer_iron,,exnihilo,TRUE,,,,,,
 exnihilo.compatibility.nei.RecipeHandlerHammer,exnihilo:hammer_gold,,exnihilo,TRUE,,,,,,
@@ -507,6 +507,8 @@ crafting,LogisticsPipes:logisticsSolidBlock:3,,LogisticsPipes,TRUE,,,,,,
 crafting,LogisticsPipes:logisticsSolidBlock:4,,LogisticsPipes,TRUE,,,,,,
 crafting,DraconicEvolution:draconiumChest,,DraconicEvolution,TRUE,,-50,,,,
 smelting,DraconicEvolution:draconiumChest,,DraconicEvolution,TRUE,,-50,,,,
+smelting,ProjRed|Expansion:projectred.expansion.machine1,,ProjRed|Expansion,TRUE,,,,,,
+crafting,ProjRed|Expansion:projectred.expansion.machine2:10,,ProjRed|Expansion,TRUE,,,,,,
 crafting,ProjRed|Expansion:projectred.expansion.machine2:11,,ProjRed|Expansion,TRUE,,,,,,
 crafting,TwilightForest:tile.TFUncraftingTable,,TwilightForest,TRUE,,,,,,
 com.teammetallurgy.metallurgy.nei.CrusherHandler,Metallurgy:crusher,,Metallurgy,TRUE,,,,,,
@@ -1252,4 +1254,64 @@ gg.recipe.naquadah_fuel_refine_factory,gregtech:gt.blockmachines:16999,,GoodGene
 gt.recipe.researchStation,gregtech:gt.blockmachines:15331,,tectech,TRUE,,,,,,
 gt.recipe.em_scanner,tectech:item.em.definitionScanStorage,,tectech,TRUE,,,,,,no recipe? don't know
 gt.recipe.gasturbinefuel,gregtech:gt.blockmachines:13101,,kekztech,TRUE,,,,,,
-gt.recipe.gasturbinefuel,gregtech:gt.blockmachines:13102,,kekztech,TRUE,,,,,,
+gt.recipe.gasturbinefuel,gregtech:gt.blockmachines:13102,,kekztech,TRUE,,,,,,
+exnihilo.compatibility.nei.RecipeHandlerSieve,exastris:sieve_automatic,,exastris,TRUE,,,,,,
+exnihilo.compatibility.nei.RecipeHandlerHammer,exastris:hammer_thaumium,,exastris,TRUE,,,,,,
+exnihilo.compatibility.nei.RecipeHandlerHammer,exastris:hammer_rf,,exastris,TRUE,,,,,,
+exnihilo.compatibility.nei.RecipeHandlerHammer,exastris:manaHammer,,exastris,TRUE,,,,,,
+exnihilo.compatibility.nei.RecipeHandlerSieve,excompressum:manaSieve,,excompressum,TRUE,,,,,,
+exnihilo.compatibility.nei.RecipeHandlerSieve,excompressum:autoSieve,,excompressum,TRUE,,,,,,
+exnihilo.compatibility.nei.RecipeHandlerHammer,excompressum:chickenStick,,excompressum,TRUE,,,,,,
+exnihilo.compatibility.nei.RecipeHandlerHammer,excompressum:oreSmasher,,excompressum,TRUE,,,,,,
+exnihilo.compatibility.nei.RecipeHandlerHammer,excompressum:autoHammer,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve,excompressum:heavySieve,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve,excompressum:heavySieve:1,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve,excompressum:heavySieve:2,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve,excompressum:heavySieve:3,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve,excompressum:heavySieve:4,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve,excompressum:heavySieve:5,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve,excompressum:autoHeavySieve,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer,excompressum:compressedHammerWood,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer,excompressum:compressedHammerStone,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer,excompressum:compressedHammerGold,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer,excompressum:compressedHammerIron,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer,excompressum:compressedHammerDiamond,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer,excompressum:autoCompressedHammer,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,exnihilo:barrel,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,exnihilo:barrel:1,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,exnihilo:barrel:2,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,exnihilo:barrel:3,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,exnihilo:barrel:4,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,exnihilo:barrel:5,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,exnihilo:barrel_stone,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,exastris:barrel_thaumium,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,exnihilo:barrel,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,exnihilo:barrel:1,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,exnihilo:barrel:2,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,exnihilo:barrel:3,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,exnihilo:barrel:4,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,exnihilo:barrel:5,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,exnihilo:barrel_stone,,excompressum,TRUE,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,exastris:barrel_thaumium,,excompressum,TRUE,,,,,,
+crafting,rftools:crafterBlock1,,rftools,TRUE,,,,,,
+crafting,rftools:crafterBlock2,,rftools,TRUE,,,,,,
+crafting,rftools:crafterBlock3,,rftools,TRUE,,,,,,
+crafting,StevesCarts:CartModule:87,,StevesCarts,TRUE,,,,,,
+crafting,StevesCarts:CartModule:92,,StevesCarts,TRUE,,,,,,
+smelting,StevesCarts:CartModule:91,,StevesCarts,TRUE,,,,,,
+smelting,StevesCarts:CartModule:93,,StevesCarts,TRUE,,,,,,
+com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler.ArcaneShapedRecipeHandler,thaumicenergistics:thaumicenergistics.block.arcane.assembler,,thaumicenergistics,TRUE,,,,,,
+com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler.ArcaneShapelessRecipeHandler,thaumicenergistics:thaumicenergistics.block.arcane.assembler,,thaumicenergistics,TRUE,,,,,,
+ru.timeconqueror.tcneiadditions.nei.arcaneworkbench.ArcaneCraftingShapedHandler,thaumicenergistics:thaumicenergistics.block.arcane.assembler,,thaumicenergistics,TRUE,,,,,,
+com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler.ArcaneShapedRecipeHandler,thaumicenergistics:part.base:5,,thaumicenergistics,TRUE,,,,,,
+com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler.ArcaneShapelessRecipeHandler,thaumicenergistics:part.base:6,,thaumicenergistics,TRUE,,,,,,
+ru.timeconqueror.tcneiadditions.nei.arcaneworkbench.ArcaneCraftingShapedHandler,thaumicenergistics:part.base:7,,thaumicenergistics,TRUE,,,,,,
+crafting,BiblioCraft:BiblioWorkbench,,BiblioCraft,TRUE,,,,,,
+crafting,BiblioCraft:BiblioWorkbench:1,,BiblioCraft,TRUE,,,,,,
+crafting,BiblioCraft:BiblioWorkbench:2,,BiblioCraft,TRUE,,,,,,
+crafting,BiblioCraft:BiblioWorkbench:3,,BiblioCraft,TRUE,,,,,,
+crafting,BiblioCraft:BiblioWorkbench:4,,BiblioCraft,TRUE,,,,,,
+crafting,BiblioCraft:BiblioWorkbench:5,,BiblioCraft,TRUE,,,,,,
+crafting,BiblioCraft:BiblioWorkbench:6,,BiblioCraft,TRUE,,,,,,
+crafting,ComputerCraft:CC-TurtleExpanded,{leftUpgrade:2},ComputerCraft,TRUE,,,,,,
+crafting,ComputerCraft:CC-TurtleAdvanced,{leftUpgrade:2},ComputerCraft,TRUE,,,,,,

src/main/resources/assets/nei/csv/handlers.csv

@@ -93,6 +93,7 @@ gt.recipe.arcfurnace,GregTech,gregtech:gt.blockmachines:651,,gregtech,TRUE,grega
 gt.recipe.assembler,GregTech,gregtech:gt.blockmachines:211,,gregtech,TRUE,gregapi_post,6,145,166,2,,,,,,
 gt.recipe.autoclave,GregTech,gregtech:gt.blockmachines:571,,gregtech,TRUE,gregapi_post,6,135,166,2,,,,,,
 gt.recipe.blastfurnace,GregTech,gregtech:gt.blockmachines:1000,,gregtech,TRUE,gregapi_post,6,135,166,2,,,,,,
+gt.recipe.plasmaforge,GregTech,gregtech:gt.blockmachines:1004,,gregtech,TRUE,gregapi_post,6,135,166,2,,,,,,
 gt.recipe.brewer,GregTech,gregtech:gt.blockmachines:491,,gregtech,TRUE,gregapi_post,6,135,166,2,,,,,,
 gt.recipe.byproductlist,GregTech,gregtech:gt.metaitem.01:2019,,gregtech,TRUE,gregapi_post,6,135,166,2,,,,,,
 gt.recipe.canner,GregTech,gregtech:gt.blockmachines:231,,gregtech,TRUE,gregapi_post,6,135,166,2,,,,,,
@@ -123,6 +124,7 @@ gt.recipe.fluidheater,GregTech,gregtech:gt.blockmachines:621,,gregtech,TRUE,greg
 gt.recipe.fluidnaquadahreactor,GregTech,gregtech:gt.blockmachines:1192,,gregtech,TRUE,gregapi_post,6,135,166,2,,,,,,
 gt.recipe.fluidsolidifier,GregTech,gregtech:gt.blockmachines:521,,gregtech,TRUE,gregapi_post,6,135,166,2,,,,,,
 gt.recipe.fusionreactor,GregTech,gregtech:gt.blockmachines:1193,,gregtech,TRUE,gregapi_post,6,135,166,2,,,,,,
+gt.recipe.complexfusionreactor,GregTech,gregtech:gt.blockmachines:1193,,gregtech,TRUE,gregapi_post,6,135,166,2,,,,,,
 gt.recipe.gasturbinefuel,GregTech,gregtech:gt.blockmachines:1115,,gregtech,TRUE,gregapi_post,6,135,166,2,,,,,,
 gt.recipe.hammer,GregTech,gregtech:gt.blockmachines:611,,gregtech,TRUE,gregapi_post,6,135,166,2,,,,,,
 gt.recipe.hugenaquadahreactor,GregTech,gregtech:gt.blockmachines:1188,,gregtech,TRUE,gregapi_post,6,135,166,2,,,,,,
@@ -494,4 +496,10 @@ nc.crafting.nei.NuclearWorkspaceRecipeHandler,NuclearCraft,NuclearCraft:nuclearW
 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker,EtFuturum Requiem,etfuturum:lit_smoker,,etfuturum,TRUE,,,65,166,5,,,,,,
 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace,EtFuturum Requiem,etfuturum:lit_blast_furnace,,etfuturum,TRUE,,,65,166,5,,,,,,
 connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler,Campfire Backport,campfirebackport:campfire,,campfirebackport,TRUE,,,65,166,5,,,,,,
-connor135246.campfirebackport.client.compat.nei.NEICampfireStateChangerHandler,Campfire Backport,campfirebackport:campfire_base,,campfirebackport,TRUE,,,65,166,5,,,,,,
+connor135246.campfirebackport.client.compat.nei.NEICampfireStateChangerHandler,Campfire Backport,campfirebackport:campfire_base,,campfirebackport,TRUE,,,65,166,5,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerHeavySieve,Ex Compressum,excompressum:heavySieve,,excompressum,TRUE,,,130,166,5,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,Ex Compressum,exnihilo:barrel,,excompressum,TRUE,,,58,166,10,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,Ex Compressum,exnihilo:barrel,,excompressum,TRUE,,,130,166,5,,,,,,
+net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer,Ex Compressum,excompressum:compressedHammerIron,,excompressum,TRUE,,,58,166,10,,,,,,
+com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropMutationHandler,AgriCraft,AgriCraft:cropsItem,,AgriCraft,TRUE,,,85,166,5,,,,,,
+com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropProductHandler,AgriCraft,minecraft:farmland,,AgriCraft,TRUE,,,85,166,5,,,,,,

src/main/resources/assets/nei/lang/zh_CN.lang

@@ -66,6 +66,7 @@ nei.chat.rain.on=开启雨雪
 nei.chat.rain.off=关闭雨雪
 nei.chat.time=白天 %d. %d:00
 nei.chat.give.noitem=没有此物品
+nei.chat.recipe.error=加载合成表过程中出现错误.请查看log文件获取详细信息.
 
 nei.options=NEI选项
 nei.options.back=后退
@@ -77,7 +78,7 @@ nei.options.wbutton.tip.0=使用全局设置
 nei.options.wbutton.tip.1=覆写全局设置
 
 nei.options.keys=按键绑定
-nei.options.keys.showenchant=显示附魔
+nei.options.keys.showenchant=显示附魔值
 nei.options.keys.gui=物品栏
 nei.options.keys.gui.recipe=查看合成
 nei.options.keys.gui.usage=查看用途
@@ -94,6 +95,7 @@ nei.options.keys.gui.prev_machine=上一机器
 nei.options.keys.gui.search=跳转到搜索框
 nei.options.keys.gui.bookmark=添加书签
 nei.options.keys.gui.hide_bookmarks=显示/隐藏书签页
+nei.options.keys.gui.overlay=提取合成表至合成栏/工作台
 nei.options.keys.world=世界
 nei.options.keys.world.chunkoverlay=区块(chunks)边界显示
 nei.options.keys.world.moboverlay=刷怪区域显示
@@ -132,6 +134,9 @@ nei.options.inventory.saveCurrentRecipeInBookmarksEnabled.false=禁用
 nei.options.inventory.useNBTInBookmarks=在书签中启用NBT
 nei.options.inventory.useNBTInBookmarks.true=是
 nei.options.inventory.useNBTInBookmarks.false=否
+nei.options.inventory.showRecipeMarker=在书签栏显示合成产物标记
+nei.options.inventory.showRecipeMarker.true=是
+nei.options.inventory.showRecipeMarker.false=否
 nei.options.inventory.creative_tab_style=创造模式/JEI标签页
 nei.options.inventory.creative_tab_style.true=创造模式
 nei.options.inventory.creative_tab_style.false=JEI
@@ -174,6 +179,9 @@ nei.options.inventory.disableMouseScrollTransfer.false=关闭
 nei.options.inventory.invertMouseScrollTransfer=反转鼠标滚轮方向
 nei.options.inventory.invertMouseScrollTransfer.true=开启
 nei.options.inventory.invertMouseScrollTransfer.false=关闭
+nei.options.inventory.cacheItemRendering=缓存物品渲染
+nei.options.inventory.cacheItemRendering.true=开启
+nei.options.inventory.cacheItemRendering.false=关闭
 
 nei.options.command=指令
 nei.options.command.creative=游戏模式
@@ -192,6 +200,8 @@ nei.options.world.highlight_tips.hide=隐藏
 nei.options.world.highlight_tips.show=显示
 nei.options.world.highlight_tips.sample=样本
 
+nei.options.world.panels=面板布局
+
 nei.options.tools=工具
 nei.options.tools.handler_load_from_config=从Config加载handler(加工所使用的机器类别)
 nei.options.tools.handler_load_from_config.true=Config
@@ -293,4 +303,4 @@ nei.presets.whitelist.tooltip=白名单
 nei.presets.textfield.tooltip.1=Enter - 保存
 nei.presets.textfield.tooltip.2=Esc - 取消
 nei.presets.label.tooltip=双击编辑
-nei.presets.label.selected=%s 预设
+nei.presets.label.selected=%s 预设