Fix incorrect RecipeCatalysts for naquadah generators (#318)

Fixes #315

.gitattributes

@@ -0,0 +1,44 @@
+* text eol=lf
+
+*.[jJ][aA][rR]          binary
+
+*.[pP][nN][gG]          binary
+*.[jJ][pP][gG]          binary
+*.[jJ][pP][eE][gG]      binary
+*.[gG][iI][fF]          binary
+*.[tT][iI][fF]          binary
+*.[tT][iI][fF][fF]      binary
+*.[iI][cC][oO]          binary
+*.[sS][vV][gG]          text
+*.[eE][pP][sS]          binary
+*.[xX][cC][fF]          binary
+
+*.[kK][aA][rR]          binary
+*.[mM]4[aA]             binary
+*.[mM][iI][dD]          binary
+*.[mM][iI][dD][iI]      binary
+*.[mM][pP]3             binary
+*.[oO][gG][gG]          binary
+*.[rR][aA]              binary
+
+*.7[zZ]                 binary
+*.[gG][zZ]              binary
+*.[tT][aA][rR]          binary
+*.[tT][gG][zZ]          binary
+*.[zZ][iI][pP]          binary
+
+*.[tT][cC][nN]          binary
+*.[sS][oO]              binary
+*.[dD][lL][lL]          binary
+*.[dD][yY][lL][iI][bB]  binary
+*.[pP][sS][dD]          binary
+*.[tT][tT][fF]          binary
+*.[oO][tT][fF]          binary
+
+*.[pP][aA][tT][cC][hH]  -text
+
+*.[bB][aA][tT]          text eol=crlf
+*.[cC][mM][dD]          text eol=crlf
+*.[pP][sS]1             text eol=crlf
+
+*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary

README.md

@@ -27,6 +27,13 @@ If you have issues with NEI outside of the GTNH modpack you may report them in t
 * Remove TMI style
 * Removed inventory Load/Save state
 
+## Development
+Before launching, you need to add 
+```
+-Dfml.coreMods.load=codechicken.nei.asm.NEICorePlugin
+``` 
+as a command line argument to the VM.
+
 ## License
 
 GTNH Modifications Copyright (c) 2019-2022 mitchej123 and the GTNH Team

addon.gradle

@@ -1,3 +1,3 @@
 compileJava {
-	options.encoding = "UTF-8"
+    options.encoding = "UTF-8"
 }

dependencies.gradle

@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-	compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev')
-	compile('com.github.GTNewHorizons:CodeChickenCore:1.1.3:dev')
-	shadowImplementation('org.apache.commons:commons-csv:1.8')
+    compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.5:dev')
+    compile('com.github.GTNewHorizons:CodeChickenCore:1.1.6:dev')
+    shadowImplementation('org.apache.commons:commons-csv:1.8')
 }

gradle.properties

@@ -58,3 +58,6 @@ containsMixinsAndOrCoreModOnly = true
 # If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
 # responsibility check the licence and request permission for distribution, if required.
 usesShadowedDependencies = true
+
+curseForgeProjectId = 358228
+modrinthProjectId = iNPc3Onu

repositories.gradle

@@ -1,18 +1,18 @@
 // Add any additional repositiroes for your dependencies here
 
 repositories {
-	mavenCentral()
-	maven {
-		name 'GTNH Maven'
-		url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
-	}
-	maven {
-		url 'https://cursemaven.com'
-		content {
-			includeGroup 'curse.maven'
-		}
-	}
-	maven {
-		url 'https://jitpack.io'
-	}
+    mavenCentral()
+    maven {
+        name 'GTNH Maven'
+        url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
+    }
+    maven {
+        url 'https://cursemaven.com'
+        content {
+            includeGroup 'curse.maven'
+        }
+    }
+    maven {
+        url 'https://jitpack.io'
+    }
 }

settings.gradle

@@ -0,0 +1,10 @@
+plugins {
+    id 'com.diffplug.blowdryerSetup' version '1.6.0'
+}
+
+apply plugin: 'com.diffplug.blowdryerSetup'
+
+blowdryerSetup {
+    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.1.4')
+    //devLocal '.' // Use this when testing config updates locally
+}

src/main/java/codechicken/nei/BookmarkPanel.java

@@ -27,6 +27,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.WeakHashMap;
 import javax.annotation.Nullable;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -70,8 +71,11 @@ public class BookmarkPanel extends PanelWidget {
 
     protected static class BookmarkGrid extends ItemsGrid {
 
+        protected static final float SCALE_SPEED = 0.1f;
+
         protected List<List<Integer>> gridMask;
         protected List<BookmarkStackMeta> metadata = new ArrayList<>();
+        protected WeakHashMap<ItemStack, Float> animation = new WeakHashMap<>();
 
         protected BookmarkViewMode viewMode = BookmarkViewMode.DEFAULT;
         protected boolean[] todoSpaces;
@@ -207,7 +211,7 @@ public class BookmarkPanel extends PanelWidget {
                 final BookmarkStackMeta meta = getMetadata(idx);
                 if ((recipeId == null && meta.recipeId == null
                                 || recipeId != null && meta.recipeId != null && recipeId.equals(meta.recipeId))
-                        && StackInfo.equalItemAndNBT(stackA, realItems.get(idx), useNBT)) {
+                        && StackInfo.equalItemAndNBT(stackA, getItem(idx), useNBT)) {
                     return idx;
                 }
             }
@@ -220,8 +224,17 @@ public class BookmarkPanel extends PanelWidget {
         }
 
         public void addItem(ItemStack stackA, BookmarkStackMeta meta) {
+            addItem(stackA, meta, true);
+        }
+
+        public void addItem(ItemStack stackA, BookmarkStackMeta meta, boolean animate) {
             realItems.add(stackA);
             metadata.add(meta);
+
+            if (animate && !NEIClientConfig.shouldCacheItemRendering() && NEIClientConfig.areBookmarksAnimated()) {
+                animation.put(stackA, 0f);
+            }
+
             onGridChanged();
         }
 
@@ -253,6 +266,7 @@ public class BookmarkPanel extends PanelWidget {
         }
 
         protected boolean removeItem(int idx) {
+            animation.remove(getItem(idx));
             realItems.remove(idx);
             metadata.remove(idx);
             onGridChanged();
@@ -317,20 +331,36 @@ public class BookmarkPanel extends PanelWidget {
                     || LayoutManager.bookmarkPanel.sortedStackIndex != idx) {
                 final ItemStack stack = getItem(idx);
                 final BookmarkStackMeta meta = getMetadata(idx);
+                final String stackSize = meta.factor < 0 || meta.fluidDisplay ? "" : String.valueOf(stack.stackSize);
 
-                GuiContainerManager.drawItem(
-                        rect.x + 1,
-                        rect.y + 1,
-                        stack,
-                        true,
-                        meta.factor < 0 || meta.fluidDisplay ? "" : String.valueOf(stack.stackSize));
+                if (animation.containsKey(stack) && animation.get(stack) < 1) {
+                    final float currentScale = animation.get(stack) + SCALE_SPEED;
+                    animation.put(stack, currentScale);
+                    drawPoppingItem(rect, stack, stackSize, currentScale);
+                } else {
 
-                if (meta.recipeId != null && !meta.ingredient && NEIClientConfig.showRecipeMarker()) {
-                    drawRecipeMarker(rect.x, rect.y, GuiContainerManager.getFontRenderer(stack));
+                    GuiContainerManager.drawItem(rect.x + 1, rect.y + 1, stack, true, stackSize);
+
+                    if (meta.recipeId != null && !meta.ingredient && NEIClientConfig.showRecipeMarker()) {
+                        drawRecipeMarker(rect.x, rect.y, GuiContainerManager.getFontRenderer(stack));
+                    }
                 }
             }
         }
 
+        protected void drawPoppingItem(Rectangle4i rect, ItemStack stack, String stackSize, float currentScale) {
+            GL11.glScalef(currentScale, currentScale, currentScale); // push & pop matrix crashes the game
+
+            GuiContainerManager.drawItem(
+                    Math.round((rect.x + 1 + (SLOT_SIZE / 2 - currentScale * SLOT_SIZE / 2)) / currentScale),
+                    Math.round((rect.y + 1 + (SLOT_SIZE / 2 - currentScale * SLOT_SIZE / 2)) / currentScale),
+                    stack,
+                    true,
+                    stackSize);
+
+            GL11.glScalef(1 / currentScale, 1 / currentScale, 1 / currentScale);
+        }
+
         protected void drawRecipeMarker(int offsetX, int offsetY, FontRenderer fontRenderer) {
             final float scaleFactor = fontRenderer.getUnicodeFlag() ? 0.85f : 0.5f;
             final float inverseScaleFactor = 1.0f / scaleFactor;
@@ -739,7 +769,8 @@ public class BookmarkPanel extends PanelWidget {
                                                             .get("ingredient")
                                                             .getAsBoolean()
                                                     : false,
-                                            itemStackNBT.hasKey("gtFluidName")));
+                                            itemStackNBT.hasKey("gtFluidName")),
+                                    false);
                 } else {
                     NEIClientConfig.logger.warn(
                             "Failed to load bookmarked ItemStack from json string, the item no longer exists:\n{}",
@@ -883,17 +914,12 @@ public class BookmarkPanel extends PanelWidget {
                     final BookmarkGrid hoverGrid = namespaces.get(activeNamespaceIndex);
                     final BookmarkGrid sortedGrid = namespaces.get(sortedNamespaceIndex);
 
-                    if (mouseOverSlot == null) {
-                        mouseOverSlot =
-                                getNextSlot(mousex, mousey, hoverGrid.getViewMode() == BookmarkViewMode.TODO_LIST);
-                    }
-
-                    if (mouseOverSlot != null) {
+                    if (mouseOverSlot != null || getNextSlot(new Point(mousex, mousey)) >= 0) {
                         final ItemStack stack = sortedGrid.getItem(sortedStackIndex);
                         final BookmarkStackMeta meta = sortedGrid.getMetadata(sortedStackIndex);
 
                         sortedGrid.removeItem(sortedStackIndex);
-                        hoverGrid.addItem(stack, meta);
+                        hoverGrid.addItem(stack, meta, false);
 
                         sortedNamespaceIndex = activeNamespaceIndex;
                         sortedStackIndex = hoverGrid.indexOf(stack, meta.recipeId);
@@ -938,23 +964,24 @@ public class BookmarkPanel extends PanelWidget {
         super.mouseDragged(mousex, mousey, button, heldTime);
     }
 
-    private ItemPanelSlot getNextSlot(int mousex, int mousey, boolean line) {
+    private int getNextSlot(final Point point) {
         final List<Integer> mask = grid.getMask();
         final int columns = grid.getColumns();
         final int perPage = grid.getRows() * columns;
+        final boolean line = ((BookmarkGrid) grid).getViewMode() == BookmarkViewMode.TODO_LIST;
 
         for (int i = mask.size(); i < perPage; i++) {
             if (!grid.isInvalidSlot(i) && (!line || (i % columns) == 0)) {
 
-                if (grid.getSlotRect(i).contains(mousex, mousey)) {
-                    return new ItemPanelSlot(grid.size() - 1, null);
+                if (point == null || grid.getSlotRect(i).contains(point.x, point.y)) {
+                    return i;
                 }
 
-                return null;
+                return -1;
             }
         }
 
-        return null;
+        return -1;
     }
 
     @Override
@@ -973,6 +1000,15 @@ public class BookmarkPanel extends PanelWidget {
             GuiContainerManager.drawItems.zLevel -= 100;
         }
 
+        if (ItemPanels.itemPanel.draggedStack != null && this.contains(mousex, mousey)) {
+            final int idx = getNextSlot(null);
+
+            if (idx >= 0) {
+                Rectangle4i rect = grid.getSlotRect(idx);
+                drawRect(rect.x, rect.y, rect.w, rect.h, 0xee555555); // highlight
+            }
+        }
+
         super.postDraw(mousex, mousey);
     }
 

src/main/java/codechicken/nei/ItemList.java

@@ -37,6 +37,11 @@ public class ItemList {
 
     private static final HashSet<Item> erroredItems = new HashSet<>();
     private static final HashSet<String> stackTraces = new HashSet<>();
+    /**
+     * Unlike {@link LayoutManager#itemsLoaded}, this indicates whether item loading is
+     * actually finished or not.
+     */
+    public static boolean loadFinished;
 
     public static class EverythingItemFilter implements ItemFilter {
         @Override
@@ -179,6 +184,7 @@ public class ItemList {
         public void execute() {
             // System.out.println("Executing NEI Item Loading");
             ThreadOperationTimer timer = getTimer(NEIClientConfig.getItemLoadingTimeout());
+            loadFinished = false;
 
             LinkedList<ItemStack> items = new LinkedList<>();
             LinkedList<ItemStack> permutations = new LinkedList<>();
@@ -218,6 +224,8 @@ public class ItemList {
             for (ItemsLoadedCallback callback : loadCallbacks) callback.itemsLoaded();
 
             updateFilter.restart();
+
+            loadFinished = true;
         }
     };
 

src/main/java/codechicken/nei/ItemPanel.java

@@ -73,6 +73,11 @@ public class ItemPanel extends PanelWidget {
                 super.drawSlotOutline(focused, slotIdx, rect);
             }
         }
+
+        @Override
+        public String getMessageOnEmpty() {
+            return ItemList.loadFinished ? null : NEIClientUtils.translate("itempanel.loading");
+        }
     }
 
     public ItemPanel() {

src/main/java/codechicken/nei/ItemsGrid.java

@@ -41,6 +41,8 @@ public class ItemsGrid {
 
     protected boolean[] invalidSlotMap;
 
+    protected Label messageLabel = new Label(getMessageOnEmpty(), true);
+
     @Nullable
     private Framebuffer framebuffer = null;
 
@@ -61,7 +63,7 @@ public class ItemsGrid {
     public int indexOf(ItemStack stackA, boolean useNBT) {
 
         for (int idx = 0; idx < realItems.size(); idx++) {
-            if (StackInfo.equalItemAndNBT(stackA, realItems.get(idx), useNBT)) {
+            if (StackInfo.equalItemAndNBT(stackA, getItem(idx), useNBT)) {
                 return idx;
             }
         }
@@ -104,6 +106,9 @@ public class ItemsGrid {
         rows = height / SLOT_SIZE;
 
         paddingLeft = (width % SLOT_SIZE) / 2;
+
+        messageLabel.x = marginLeft + width / 2;
+        messageLabel.y = marginTop + height / 2;
     }
 
     public void shiftPage(int shift) {
@@ -148,8 +153,12 @@ public class ItemsGrid {
         invalidSlotMap = new boolean[rows * columns];
         perPage = columns * rows;
 
-        checkGuiOverlap(gui, 0, columns - 2, 1);
-        checkGuiOverlap(gui, columns - 1, 1, -1);
+        if (NEIClientConfig.optimizeGuiOverlapComputation()) {
+            checkGuiOverlap(gui, 0, columns - 2, 1);
+            checkGuiOverlap(gui, columns - 1, 1, -1);
+        } else {
+            checkGuiOverlap(gui, 0, columns, 1);
+        }
 
         if (oldRows != rows || oldColumns != columns || !Arrays.equals(oldSlotMap, invalidSlotMap)) {
             onGridChanged();
@@ -159,7 +168,7 @@ public class ItemsGrid {
     private void checkGuiOverlap(GuiContainer gui, int start, int end, int dir) {
         boolean validColumn = false;
 
-        for (int c = start; c != end && !validColumn; c += dir) {
+        for (int c = start; c != end && (!NEIClientConfig.optimizeGuiOverlapComputation() || !validColumn); c += dir) {
             validColumn = true;
 
             for (int r = 0; r < rows; r++) {
@@ -305,6 +314,12 @@ public class ItemsGrid {
         }
     }
 
+    public void setVisible() {
+        if (getItems().isEmpty() && getMessageOnEmpty() != null) {
+            LayoutManager.addWidget(messageLabel);
+        }
+    }
+
     protected void drawItem(Rectangle4i rect, int idx) {
         GuiContainerManager.drawItem(rect.x + 1, rect.y + 1, getItem(idx));
     }
@@ -345,4 +360,8 @@ public class ItemsGrid {
 
         return r >= rows || c >= columns || !isInvalidSlot(slt);
     }
+
+    public String getMessageOnEmpty() {
+        return null;
+    }
 }

src/main/java/codechicken/nei/LayoutManager.java

@@ -112,6 +112,12 @@ public class LayoutManager
 
     public static HashMap<Integer, LayoutStyle> layoutStyles = new HashMap<>();
 
+    /**
+     * This is set to true immediately after item loading thread is started,
+     * to prevent duplicated loading thread from being executed.
+     * If you want to know if item list is actually finished loading,
+     * Use {@link ItemList#loadFinished} instead.
+     */
     public static boolean itemsLoaded = false;
 
     /**
@@ -729,10 +735,12 @@ public class LayoutManager
                         ? !getSearchExpression().equals("")
                         : !((SearchField) searchField).getFilter().matches(item))) {
             GL11.glDisable(GL11.GL_LIGHTING);
+            GL11.glDisable(GL11.GL_DEPTH_TEST);
             GL11.glTranslatef(0, 0, 150);
             drawRect(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, 0x80000000);
             GL11.glTranslatef(0, 0, -150);
             GL11.glEnable(GL11.GL_LIGHTING);
+            GL11.glEnable(GL11.GL_DEPTH_TEST);
         }
     }
 

src/main/java/codechicken/nei/NEIClientConfig.java

@@ -87,9 +87,19 @@ public class NEIClientConfig {
     public static final Function<IRecipeHandler, String> HANDLER_ID_FUNCTION =
             handler -> Objects.firstNonNull(handler.getOverlayIdentifier(), handler.getHandlerId());
 
+    public static int getHandlerOrder(IRecipeHandler handler) {
+        if (handlerOrdering.get(handler.getOverlayIdentifier()) != null) {
+            return handlerOrdering.get(handler.getOverlayIdentifier());
+        }
+        if (handlerOrdering.get(handler.getHandlerId()) != null) {
+            return handlerOrdering.get(handler.getHandlerId());
+        }
+        return 0;
+    }
+
     // Comparator that compares handlers using the handlerOrdering map.
     public static final Comparator<IRecipeHandler> HANDLER_COMPARATOR =
-            Comparator.comparingInt(handler -> handlerOrdering.getOrDefault(HANDLER_ID_FUNCTION.apply(handler), 0));
+            Comparator.comparingInt(NEIClientConfig::getHandlerOrder);
 
     public static ItemStack[] creativeInv;
 
@@ -227,6 +237,10 @@ public class NEIClientConfig {
                 .setComment("Use NBT in Bookmarks")
                 .getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.useNBTInBookmarks", true));
+        tag.getTag("inventory.bookmarksAnimationEnabled")
+                .setComment("REI Style Animation in Bookmarks")
+                .getBooleanValue(true);
+        API.addOption(new OptionToggleButton("inventory.bookmarksAnimationEnabled", true));
         tag.getTag("inventory.showRecipeMarker")
                 .setComment("Show Recipe Marker")
                 .getBooleanValue(false);
@@ -260,6 +274,11 @@ public class NEIClientConfig {
                 .getBooleanValue(false);
         API.addOption(new OptionToggleButton("inventory.ignore_potion_overlap", true));
 
+        tag.getTag("inventory.optimize_gui_overlap_computation")
+                .setComment("Optimize computation for GUI overlap")
+                .getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.optimize_gui_overlap_computation", true));
+
         tag.getTag("tools.handler_load_from_config")
                 .setComment("ADVANCED: Load handlers from config")
                 .getBooleanValue(false);
@@ -334,6 +353,8 @@ public class NEIClientConfig {
         API.addHashBind("gui.overlay_use", Keyboard.KEY_S + NEIClientUtils.SHIFT_HASH);
         API.addHashBind("gui.overlay_hide", Keyboard.KEY_S + NEIClientUtils.CTRL_HASH);
         API.addHashBind("gui.hide_bookmarks", Keyboard.KEY_B);
+        API.addKeyBind("gui.getprevioussearch", Keyboard.KEY_UP);
+        API.addKeyBind("gui.getnextsearch", Keyboard.KEY_DOWN);
 
         API.addKeyBind("world.chunkoverlay", Keyboard.KEY_F9);
         API.addKeyBind("world.moboverlay", Keyboard.KEY_F7);
@@ -492,6 +513,10 @@ public class NEIClientConfig {
         return getBooleanSetting("inventory.useNBTInBookmarks");
     }
 
+    public static boolean areBookmarksAnimated() {
+        return getBooleanSetting("inventory.bookmarksAnimationEnabled");
+    }
+
     public static boolean showRecipeMarker() {
         return getBooleanSetting("inventory.showRecipeMarker");
     }
@@ -520,6 +545,10 @@ public class NEIClientConfig {
         return getBooleanSetting("inventory.ignore_potion_overlap");
     }
 
+    public static boolean optimizeGuiOverlapComputation() {
+        return getBooleanSetting("inventory.optimize_gui_overlap_computation");
+    }
+
     public static boolean isEnabled() {
         return enabledOverride && getBooleanSetting("inventory.widgetsenabled");
     }

src/main/java/codechicken/nei/NEIClientUtils.java

@@ -15,6 +15,8 @@ import codechicken.nei.api.GuiInfo;
 import codechicken.nei.api.IInfiniteItemHandler;
 import codechicken.nei.api.ItemInfo;
 import com.google.common.collect.Iterables;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
@@ -29,6 +31,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
@@ -39,6 +42,8 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 import net.minecraft.util.ResourceLocation;
 import org.lwjgl.input.Keyboard;
@@ -445,4 +450,30 @@ public class NEIClientUtils extends NEIServerUtils {
         mc().getSoundHandler()
                 .playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
     }
+
+    public static void reportErrorBuffered(Throwable e, Set<String> buffer, String cause) {
+        StringWriter sw = new StringWriter();
+        e.printStackTrace(new PrintWriter(sw));
+        String stackTrace = cause + sw;
+        if (buffer.contains(stackTrace)) return;
+
+        System.err.println("Error while rendering: " + cause);
+        e.printStackTrace();
+        buffer.add(stackTrace);
+
+        EntityPlayer player = Minecraft.getMinecraft().thePlayer;
+        if (player != null) {
+            IChatComponent chat = new ChatComponentTranslation("nei.chat.render.error");
+            chat.getChatStyle().setColor(EnumChatFormatting.RED);
+            player.addChatComponentMessage(chat);
+        }
+    }
+
+    public static void reportErrorBuffered(Throwable e, Set<String> buffer, ItemStack cause) {
+        if (cause != null) {
+            reportErrorBuffered(e, buffer, cause.toString());
+        } else {
+            reportErrorBuffered(e, buffer, "null");
+        }
+    }
 }

src/main/java/codechicken/nei/PanelWidget.java

@@ -160,6 +160,7 @@ public abstract class PanelWidget extends Widget {
             LayoutManager.addWidget(pagePrev);
             LayoutManager.addWidget(pageNext);
             LayoutManager.addWidget(pageLabel);
+            grid.setVisible();
         }
     }
 
@@ -182,8 +183,7 @@ public abstract class PanelWidget extends Widget {
         if (mouseDownSlot >= 0
                 && draggedStack == null
                 && NEIClientUtils.getHeldItem() == null
-                && NEIClientConfig.hasSMPCounterPart()
-                && !GuiInfo.hasCustomSlots(NEIClientUtils.getGuiContainer())) {
+                && NEIClientConfig.hasSMPCounterPart()) {
             ItemPanelSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
 
             if (mouseOverSlot == null || mouseOverSlot.slotIndex != mouseDownSlot || heldTime > 500) {
@@ -240,6 +240,13 @@ public abstract class PanelWidget extends Widget {
 
     @Override
     public boolean handleClickExt(int mouseX, int mouseY, int button) {
+
+        if (ItemPanels.itemPanel.draggedStack != null && ItemPanels.bookmarkPanel.contains(mouseX, mouseY)) {
+            ItemPanels.bookmarkPanel.addOrRemoveItem(ItemPanels.itemPanel.draggedStack, null, null, false, true);
+            ItemPanels.itemPanel.draggedStack = null;
+            return true;
+        }
+
         if (ItemPanels.itemPanel.draggedStack != null) {
             return ItemPanels.itemPanel.handleDraggedClick(mouseX, mouseY, button);
         }
@@ -289,9 +296,6 @@ public abstract class PanelWidget extends Widget {
             GuiInfo.readLock.lock();
             for (INEIGuiHandler handler : GuiInfo.guiHandlers) {
                 if (handler.handleDragNDrop(gui, mouseX, mouseY, draggedStack, button)) {
-
-                    NEIClientConfig.logger.info(handler);
-
                     handled = true;
                     break;
                 }

src/main/java/codechicken/nei/PresetsWidget.java

@@ -312,7 +312,8 @@ public class PresetsWidget extends Widget {
             final int directionState = direction.contains(x + mx, y + my) ? 1 : 2;
             final int deleteState = delete.contains(x + mx, y + my) ? 1 : 2;
 
-            final String displayName = NEIClientUtils.cropText(fontRenderer, tag.displayName, option.w - 6);
+            final String displayName =
+                    NEIClientUtils.cropText(PresetsWidget.fontRenderer, tag.displayName, option.w - 6);
             final String dirName =
                     tag.whitelist ? translate("presets.whitelist.label") : translate("presets.blacklist.label");
 

src/main/java/codechicken/nei/SearchField.java

@@ -9,6 +9,7 @@ import codechicken.nei.ItemList.PatternItemFilter;
 import codechicken.nei.api.API;
 import codechicken.nei.api.ItemFilter;
 import codechicken.nei.api.ItemFilter.ItemFilterProvider;
+import codechicken.nei.util.TextHistory;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -45,6 +46,7 @@ public class SearchField extends TextField implements ItemFilterProvider {
     }
 
     public static List<ISearchProvider> searchProviders = new LinkedList<>();
+    private static final TextHistory history = new TextHistory();
     private boolean isVisible = true;
 
     long lastclicktime;
@@ -116,6 +118,13 @@ public class SearchField extends TextField implements ItemFilterProvider {
         if (isVisible() && NEIClientConfig.isKeyHashDown("gui.search")) {
             setFocus(true);
         }
+        if (NEIClientConfig.isKeyHashDown("gui.getprevioussearch") && focused()) {
+            handleNavigateHistory(TextHistory.Direction.PREVIOUS);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.getnextsearch") && focused()) {
+            handleNavigateHistory(TextHistory.Direction.NEXT);
+        }
     }
 
     @Override
@@ -156,4 +165,26 @@ public class SearchField extends TextField implements ItemFilterProvider {
         if (!secondary.isEmpty()) return new AnyMultiItemFilter(secondary);
         return new EverythingItemFilter();
     }
+
+    @Override
+    public void setFocus(boolean focus) {
+        final boolean previousFocus = field.isFocused();
+
+        if (previousFocus != focus) {
+            history.add(text());
+        }
+        super.setFocus(focus);
+    }
+
+    private boolean handleNavigateHistory(TextHistory.Direction direction) {
+        if (focused()) {
+            return history.get(direction, text())
+                    .map(newText -> {
+                        setText(newText);
+                        return true;
+                    })
+                    .orElse(false);
+        }
+        return false;
+    }
 }

src/main/java/codechicken/nei/api/API.java

@@ -24,6 +24,7 @@ import codechicken.nei.recipe.IUsageHandler;
 import codechicken.nei.recipe.RecipeCatalysts;
 import codechicken.nei.recipe.RecipeInfo;
 import codechicken.nei.recipe.StackInfo;
+import com.google.common.collect.Sets;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -130,16 +131,20 @@ public class API {
      * Damage values of OreDictionary.WILDCARD_VALUE and ItemStackMap.WILDCARD_TAG tags function as wildcards for their respective variables
      */
     public static void hideItem(ItemStack item) {
-        ItemInfo.hiddenItems.add(item);
-        LayoutManager.markItemsDirty();
+        if (!ItemInfo.hiddenItems.contains(item)) {
+            ItemInfo.hiddenItems.add(item);
+            LayoutManager.markItemsDirty();
+        }
     }
 
     /**
      * Add or replace the name normally shown on the item tooltip
      */
     public static void setOverrideName(ItemStack item, String name) {
-        ItemInfo.nameOverrides.put(item, name);
-        LayoutManager.markItemsDirty();
+        if (!name.equals(ItemInfo.nameOverrides.get(item))) {
+            ItemInfo.nameOverrides.put(item, name);
+            LayoutManager.markItemsDirty();
+        }
     }
 
     /**
@@ -147,8 +152,10 @@ public class API {
      * @param item an item with data
      */
     public static void addItemListEntry(ItemStack item) {
-        ItemInfo.itemOverrides.put(item.getItem(), item);
-        LayoutManager.markItemsDirty();
+        if (!ItemInfo.itemOverrides.containsEntry(item.getItem(), item)) {
+            ItemInfo.itemOverrides.put(item.getItem(), item);
+            LayoutManager.markItemsDirty();
+        }
     }
 
     /**
@@ -156,8 +163,10 @@ public class API {
      */
     public static void setItemListEntries(Item item, Iterable<ItemStack> items) {
         if (items == null) items = Collections.emptyList();
-        ItemInfo.itemOverrides.replaceValues(item, items);
-        LayoutManager.markItemsDirty();
+        if (!Sets.newHashSet(items).equals(Sets.newHashSet(ItemInfo.itemOverrides.get(item)))) {
+            ItemInfo.itemOverrides.replaceValues(item, items);
+            LayoutManager.markItemsDirty();
+        }
     }
 
     /**
@@ -294,8 +303,10 @@ public class API {
      * @param variant The stack to appear in the item panel
      */
     public static void addItemVariant(Item item, ItemStack variant) {
-        ItemInfo.itemVariants.put(item, variant);
-        LayoutManager.markItemsDirty();
+        if (!ItemInfo.itemVariants.containsEntry(item, variant)) {
+            ItemInfo.itemVariants.put(item, variant);
+            LayoutManager.markItemsDirty();
+        }
     }
 
     public static void registerStackStringifyHandler(IStackStringifyHandler handler) {

src/main/java/codechicken/nei/api/INEIGuiAdapter.java

@@ -3,13 +3,18 @@ package codechicken.nei.api;
 import codechicken.nei.VisiblityData;
 import java.util.Collections;
 import java.util.List;
+import java.util.regex.Pattern;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
 
 /**
  * Lets you just override those things you want to
  */
 public class INEIGuiAdapter implements INEIGuiHandler {
+
+    static final Pattern SPECIAL_REGEX_CHARS = Pattern.compile("[{}()\\[\\].+*?^$\\\\|]");
+
     @Override
     public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) {
         return currentVisibility;
@@ -34,4 +39,10 @@ public class INEIGuiAdapter implements INEIGuiHandler {
     public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) {
         return false;
     }
+
+    protected String formattingText(String displayName) {
+        return SPECIAL_REGEX_CHARS
+                .matcher(EnumChatFormatting.getTextWithoutFormattingCodes(displayName))
+                .replaceAll("\\\\$0");
+    }
 }

src/main/java/codechicken/nei/api/ShortcutInputHandler.java

@@ -0,0 +1,120 @@
+package codechicken.nei.api;
+
+import codechicken.nei.ItemPanels;
+import codechicken.nei.LayoutManager;
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.NEIClientUtils;
+import codechicken.nei.PositionedStack;
+import codechicken.nei.recipe.GuiCraftingRecipe;
+import codechicken.nei.recipe.GuiRecipe;
+import codechicken.nei.recipe.GuiUsageRecipe;
+import java.util.List;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.item.ItemStack;
+import org.lwjgl.input.Mouse;
+
+public abstract class ShortcutInputHandler {
+
+    public static boolean handleKeyEvent(ItemStack stackover) {
+
+        if (NEIClientConfig.isKeyHashDown("gui.overlay_hide")) {
+            return hideOverlayRecipe();
+        }
+
+        if (stackover == null) {
+            return false;
+        }
+
+        stackover = stackover.copy();
+
+        if (NEIClientConfig.isKeyHashDown("gui.overlay")) {
+            return openOverlayRecipe(stackover, false);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.overlay_use")) {
+            return openOverlayRecipe(stackover, true);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.recipe")) {
+            return GuiCraftingRecipe.openRecipeGui("item", stackover);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.usage")) {
+            return GuiUsageRecipe.openRecipeGui("item", stackover);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.bookmark")) {
+            return saveRecipeInBookmark(stackover, false, false);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.bookmark_recipe")) {
+            return saveRecipeInBookmark(stackover, true, false);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.bookmark_count")) {
+            return saveRecipeInBookmark(stackover, false, true);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.bookmark_recipe_count")) {
+            return saveRecipeInBookmark(stackover, true, true);
+        }
+
+        return false;
+    }
+
+    public static boolean handleMouseClick(ItemStack stackover) {
+
+        if (stackover != null) {
+            final int button = Mouse.getEventButton();
+            stackover = stackover.copy();
+
+            if (button == 0) {
+                return GuiCraftingRecipe.openRecipeGui("item", stackover);
+            } else if (button == 1) {
+                return GuiUsageRecipe.openRecipeGui("item", stackover);
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean hideOverlayRecipe() {
+
+        if (LayoutManager.overlayRenderer != null) {
+            LayoutManager.overlayRenderer = null;
+            return true;
+        }
+
+        return false;
+    }
+
+    private static boolean openOverlayRecipe(ItemStack stack, boolean shift) {
+        final GuiContainer gui = NEIClientUtils.getGuiContainer();
+
+        if (gui == null || gui instanceof GuiRecipe) {
+            return false;
+        }
+
+        return GuiCraftingRecipe.openRecipeGui("item", true, shift, stack);
+    }
+
+    private static boolean saveRecipeInBookmark(ItemStack stack, boolean saveIngredients, boolean saveStackSize) {
+
+        if (stack != null) {
+            final GuiContainer gui = NEIClientUtils.getGuiContainer();
+            List<PositionedStack> ingredients = null;
+            String handlerName = "";
+
+            if (gui instanceof GuiRecipe) {
+                ingredients = ((GuiRecipe<?>) gui).getFocusedRecipeIngredients();
+                handlerName = ((GuiRecipe<?>) gui).getHandlerName();
+                stack.stackSize = ((GuiRecipe<?>) gui).prepareFocusedRecipeResultStackSize(stack);
+            }
+
+            ItemPanels.bookmarkPanel.addOrRemoveItem(stack, handlerName, ingredients, saveIngredients, saveStackSize);
+            return true;
+        }
+
+        return false;
+    }
+}

src/main/java/codechicken/nei/asm/NEITransformer.java

@@ -238,9 +238,9 @@ public class NEITransformer implements IClassTransformer {
             @Override
             public void transform(MethodNode mv) {
                 ASMHelper.logger.debug("NEI: Injecting mouseUp call");
-                ASMBlock gotoBlock = asmblocks.get("n_mouseUpGoto");
-                ASMBlock needleBlock = asmblocks.get("n_mouseUp");
-                ASMBlock injectionBlock = asmblocks.get("mouseUp");
+                ASMBlock gotoBlock = asmblocks.get("n_mouseUpGoto").copy();
+                ASMBlock needleBlock = asmblocks.get("n_mouseUp").copy();
+                ASMBlock injectionBlock = asmblocks.get("mouseUp").copy();
 
                 gotoBlock.mergeLabels(injectionBlock);
                 findOnce(mv.instructions, gotoBlock.list).replace(gotoBlock.list.list);

src/main/java/codechicken/nei/config/GuiPanelSettings.java

@@ -163,6 +163,7 @@ public class GuiPanelSettings extends GuiScreenWidget {
             final int rows = (h - (PANEL_SIZE + 2) * 2) / ItemsGrid.SLOT_SIZE;
             final int paddingLeft = (w % ItemsGrid.SLOT_SIZE) / 2;
             final ArrayList<ItemStack> items = ItemPanels.itemPanel.getItems();
+            if (items.isEmpty()) return;
 
             for (int r = 0; r < rows; r++) {
                 for (int c = 0; c < columns; c++) {

src/main/java/codechicken/nei/drawable/GuiElementDuex.java

@@ -3,6 +3,7 @@ package codechicken.nei.drawable;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.gui.GuiScreen;
+import org.lwjgl.opengl.GL11;
 
 /*
 * Taken from Mantle 1.12-1.3.3.49 under the MIT License
@@ -70,6 +71,7 @@ public class GuiElementDuex {
      */
     public int draw(int xPos, int yPos) {
         // drawModalRectWithCustomSizedTexture
+        GL11.glColor4f(1, 1, 1, 1);
         GuiScreen.func_146110_a(xPos, yPos, x, y, w, h, texW, texH);
         return w;
     }

src/main/java/codechicken/nei/guihook/GuiContainerManager.java

@@ -9,8 +9,6 @@ import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.NEIClientUtils;
 import codechicken.nei.recipe.StackInfo;
 import java.awt.Point;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -270,14 +268,7 @@ public class GuiContainerManager {
             if (!checkMatrixStack()) throw new IllegalStateException("Modelview matrix stack too deep");
             if (Tessellator.instance.isDrawing) throw new IllegalStateException("Still drawing");
         } catch (Exception e) {
-            StringWriter sw = new StringWriter();
-            e.printStackTrace(new PrintWriter(sw));
-            String stackTrace = itemstack + sw.toString();
-            if (!stackTraces.contains(stackTrace)) {
-                System.err.println("Error while rendering: " + itemstack);
-                e.printStackTrace();
-                stackTraces.add(stackTrace);
-            }
+            NEIClientUtils.reportErrorBuffered(e, stackTraces, itemstack);
 
             restoreMatrixStack();
             if (Tessellator.instance.isDrawing) Tessellator.instance.draw();
@@ -579,17 +570,28 @@ public class GuiContainerManager {
     public void drawSlotItem(Slot slot, ItemStack stack, int x, int y, String quantity) {
         // for lighting correction
         boolean glRescale = GL11.glGetBoolean(GL12.GL_RESCALE_NORMAL);
+        float zLevel = drawItems.zLevel += 100F;
 
-        if (window instanceof IGuiSlotDraw) {
-            ((IGuiSlotDraw) window).drawSlotItem(slot, stack, x, y, quantity);
-        } else {
+        try {
+            if (window instanceof IGuiSlotDraw) {
+                ((IGuiSlotDraw) window).drawSlotItem(slot, stack, x, y, quantity);
+            } else {
 
-            if (quantity == null) {
-                quantity = stack != null && stack.stackSize > 1 ? String.valueOf(stack.stackSize) : "";
+                if (quantity == null) {
+                    quantity = stack != null && stack.stackSize > 1 ? String.valueOf(stack.stackSize) : "";
+                }
+
+                drawItems.renderItemAndEffectIntoGUI(fontRenderer, renderEngine, stack, x, y);
+                drawItems.renderItemOverlayIntoGUI(fontRenderer, renderEngine, stack, x, y, quantity);
             }
+        } catch (Exception e) {
+            NEIClientUtils.reportErrorBuffered(e, stackTraces, stack);
 
-            drawItems.renderItemAndEffectIntoGUI(fontRenderer, renderEngine, stack, x, y);
-            drawItems.renderItemOverlayIntoGUI(fontRenderer, renderEngine, stack, x, y, quantity);
+            restoreMatrixStack();
+            if (Tessellator.instance.isDrawing) Tessellator.instance.draw();
+
+            drawItems.zLevel = zLevel;
+            drawItems.renderItemIntoGUI(fontRenderer, renderEngine, new ItemStack(Blocks.fire), x, y);
         }
 
         if (glRescale) {
@@ -597,6 +599,7 @@ public class GuiContainerManager {
         } else {
             GL11.glDisable(GL12.GL_RESCALE_NORMAL);
         }
+        drawItems.zLevel = zLevel - 100;
     }
 
     /**

src/main/java/codechicken/nei/recipe/GuiRecipe.java

@@ -273,6 +273,32 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer
         return null;
     }
 
+    public int prepareFocusedRecipeResultStackSize(ItemStack stackover) {
+        final int recipesPerPage = getRecipesPerPage();
+
+        for (int idx = page * recipesPerPage; idx < handler.numRecipes() && idx < (page + 1) * recipesPerPage; idx++) {
+            if (recipeInFocus(idx)) {
+                final PositionedStack result = handler.getResultStack(idx);
+                int stackSize = 0;
+
+                if (result != null && StackInfo.equalItemAndNBT(result.item, stackover, true)) {
+                    stackSize += result.item.stackSize;
+                }
+
+                final List<PositionedStack> stacks = handler.getOtherStacks(idx);
+                for (PositionedStack pStack : stacks) {
+                    if (StackInfo.equalItemAndNBT(pStack.item, stackover, true)) {
+                        stackSize += pStack.item.stackSize;
+                    }
+                }
+
+                return stackSize;
+            }
+        }
+
+        return stackover.stackSize;
+    }
+
     protected boolean recipeInFocus(int idx) {
         final PositionedStack result = handler.getResultStack(idx);
         if (result != null && isMouseOver(result, idx)) {

src/main/java/codechicken/nei/recipe/GuiRecipeTab.java

@@ -140,6 +140,7 @@ public abstract class GuiRecipeTab extends Widget {
             tooltip.add("");
             tooltip.add("HandlerName: " + handlerName);
             tooltip.add("HandlerID: " + handlerID);
+            tooltip.add("HandlerOrder: " + NEIClientConfig.getHandlerOrder(handler));
         }
     }
 

src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java

@@ -1,12 +1,9 @@
 package codechicken.nei.recipe;
 
 import codechicken.nei.ItemPanels;
-import codechicken.nei.LayoutManager;
-import codechicken.nei.NEIClientConfig;
-import codechicken.nei.PositionedStack;
+import codechicken.nei.api.ShortcutInputHandler;
 import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.guihook.IContainerInputHandler;
-import java.util.List;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
@@ -14,52 +11,7 @@ public class RecipeItemInputHandler implements IContainerInputHandler {
 
     @Override
     public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyCode) {
-
-        if (NEIClientConfig.isKeyHashDown("gui.overlay_hide")) {
-            return hideOverlayRecipe();
-        }
-
-        ItemStack stackover = GuiContainerManager.getStackMouseOver(gui);
-
-        if (stackover == null) {
-            return false;
-        }
-
-        stackover = stackover.copy();
-
-        if (NEIClientConfig.isKeyHashDown("gui.overlay")) {
-            return openOverlayRecipe(gui, stackover, false);
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.overlay_use")) {
-            return openOverlayRecipe(gui, stackover, true);
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.recipe")) {
-            return GuiCraftingRecipe.openRecipeGui("item", stackover);
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.usage")) {
-            return GuiUsageRecipe.openRecipeGui("item", stackover);
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.bookmark")) {
-            return saveRecipeInBookmark(gui, stackover, false, false);
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.bookmark_recipe")) {
-            return saveRecipeInBookmark(gui, stackover, true, false);
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.bookmark_count")) {
-            return saveRecipeInBookmark(gui, stackover, false, true);
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.bookmark_recipe_count")) {
-            return saveRecipeInBookmark(gui, stackover, true, true);
-        }
-
-        return false;
+        return ShortcutInputHandler.handleKeyEvent(GuiContainerManager.getStackMouseOver(gui));
     }
 
     @Override
@@ -70,53 +22,7 @@ public class RecipeItemInputHandler implements IContainerInputHandler {
 
         ItemStack stackover = GuiContainerManager.getStackMouseOver(gui);
 
-        if (stackover != null) {
-            if (button == 0) {
-                return GuiCraftingRecipe.openRecipeGui("item", stackover.copy());
-            } else if (button == 1) {
-                return GuiUsageRecipe.openRecipeGui("item", stackover.copy());
-            }
-        }
-
-        return false;
-    }
-
-    private boolean hideOverlayRecipe() {
-
-        if (LayoutManager.overlayRenderer != null) {
-            LayoutManager.overlayRenderer = null;
-            return true;
-        }
-
-        return false;
-    }
-
-    private boolean openOverlayRecipe(GuiContainer gui, ItemStack stack, boolean shift) {
-
-        if (gui instanceof GuiRecipe) {
-            return false;
-        }
-
-        return GuiCraftingRecipe.openRecipeGui("item", true, shift, stack);
-    }
-
-    private boolean saveRecipeInBookmark(
-            GuiContainer gui, ItemStack stack, boolean saveIngredients, boolean saveStackSize) {
-
-        if (stack != null) {
-            List<PositionedStack> ingredients = null;
-            String handlerName = "";
-
-            if (gui instanceof GuiRecipe) {
-                ingredients = ((GuiRecipe<?>) gui).getFocusedRecipeIngredients();
-                handlerName = ((GuiRecipe<?>) gui).getHandlerName();
-            }
-
-            ItemPanels.bookmarkPanel.addOrRemoveItem(stack, handlerName, ingredients, saveIngredients, saveStackSize);
-            return true;
-        }
-
-        return false;
+        return ShortcutInputHandler.handleMouseClick(stackover);
     }
 
     @Override

src/main/java/codechicken/nei/recipe/SearchInputDropHandler.java

@@ -3,16 +3,12 @@ package codechicken.nei.recipe;
 import static codechicken.nei.LayoutManager.searchField;
 
 import codechicken.nei.api.INEIGuiAdapter;
-import java.util.regex.Pattern;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.fluids.FluidStack;
 
 public class SearchInputDropHandler extends INEIGuiAdapter {
 
-    protected static final Pattern SPECIAL_REGEX_CHARS = Pattern.compile("[{}()\\[\\].+*?^$\\\\|]");
-
     @Override
     public boolean handleDragNDrop(GuiContainer gui, int mouseX, int mouseY, ItemStack draggedStack, int button) {
 
@@ -30,10 +26,4 @@ public class SearchInputDropHandler extends INEIGuiAdapter {
 
         return false;
     }
-
-    protected String formattingText(String displayName) {
-        return SPECIAL_REGEX_CHARS
-                .matcher(EnumChatFormatting.getTextWithoutFormattingCodes(displayName))
-                .replaceAll("\\\\$0");
-    }
 }

src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java

@@ -605,7 +605,11 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
     }
 
     public PositionedStack getResultStack(int recipe) {
-        return arecipes.get(recipe).getResult();
+        try {
+            return arecipes.get(recipe).getResult();
+        } catch (ArrayIndexOutOfBoundsException ignored) {
+            return null;
+        }
     }
 
     public List<PositionedStack> getOtherStacks(int recipe) {

src/main/java/codechicken/nei/util/TextHistory.java

@@ -0,0 +1,69 @@
+package codechicken.nei.util;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Backported from JustEnoughItems/Core/src/main/java/mezz/jei/core/util/TextHistory.java
+ */
+public class TextHistory {
+    private static final int MAX_HISTORY = 100;
+
+    public enum Direction {
+        NEXT,
+        PREVIOUS
+    }
+
+    private final List<String> history = new ArrayList<>();
+
+    public boolean add(String currentText) {
+        if (currentText.length() > 0) {
+            history.remove(currentText);
+            history.add(currentText);
+            if (history.size() > MAX_HISTORY) {
+                history.remove(0);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public Optional<String> get(Direction direction, String currentText) {
+        if (direction == direction.NEXT) {
+            return getNext(currentText);
+        } else {
+            return getPrevious(currentText);
+        }
+    }
+
+    public Optional<String> getPrevious(String currentText) {
+        int historyIndex = history.indexOf(currentText);
+        if (historyIndex < 0) {
+            if (add(currentText)) {
+                historyIndex = history.size() - 1;
+            } else {
+                historyIndex = history.size();
+            }
+        }
+        if (historyIndex <= 0) {
+            return Optional.empty();
+        }
+        String value = history.get(historyIndex - 1);
+        return Optional.of(value);
+    }
+
+    public Optional<String> getNext(String currentText) {
+        int historyIndex = history.indexOf(currentText);
+        if (historyIndex < 0) {
+            return Optional.empty();
+        }
+        final String historyString;
+        if (historyIndex + 1 < history.size()) {
+            historyString = history.get(historyIndex + 1);
+        } else {
+            historyString = "";
+        }
+        return Optional.of(historyString);
+    }
+}

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

@@ -8,6 +8,7 @@ advsolar.client.nei.MTRecipeHandler,AdvancedSolarPanel:BlockMolecularTransformer
 crafting,appliedenergistics2:item.ItemMultiPart:360,,appliedenergistics2,TRUE,,,,,,
 appeng.integration.modules.NEIHelpers.NEIGrinderRecipeHandler,appliedenergistics2:tile.BlockGrinder,,appliedenergistics2,TRUE,dreamcraft,,,,,
 appeng.integration.modules.NEIHelpers.NEIInscriberRecipeHandler,appliedenergistics2:tile.BlockInscriber,,appliedenergistics2,TRUE,,,,,,
+appeng.integration.modules.NEIHelpers.NEIInscriberRecipeHandler,ae2stuff:Inscriber,,ae2stuff,TRUE,,,,,,
 fox.spiteful.avaritia.compat.nei.CompressionHandler,Avaritia:Neutronium_Compressor,,Avaritia,TRUE,,,,,,
 extreme,Avaritia:Dire_Crafting,,Avaritia,TRUE,,,,,,
 extreme,avaritiaddons:ExtremeAutoCrafter,,avaritiaddons,TRUE,,,,,,
@@ -467,7 +468,15 @@ exnihilo.compatibility.nei.RecipeHandlerSieve,exnihilo:sifting_table:2,,exnihilo
 exnihilo.compatibility.nei.RecipeHandlerSieve,exnihilo:sifting_table:3,,exnihilo,TRUE,,,,,,
 exnihilo.compatibility.nei.RecipeHandlerSieve,exnihilo:sifting_table:4,,exnihilo,TRUE,,,,,,
 exnihilo.compatibility.nei.RecipeHandlerSieve,exnihilo:sifting_table:5,,exnihilo,TRUE,,,,,,
+crafting,gregtech_addon:machine:16,,gregtech_addon,TRUE,,,,,,
+crafting,gregtech_addon:machine:112,,gregtech_addon,TRUE,,,,,,
+crafting,gregtech_addon:machine:128,,gregtech_addon,TRUE,,,,,,
+smelting,gregtech_addon:machine:131,,gregtech_addon,TRUE,,,,,,
+smelting,gregtech_addon:machine:138,,gregtech_addon,TRUE,,,,,,
+smelting,gregtech_addon:machine:54,,gregtech_addon,TRUE,,,,,,
+smelting,gregtech_addon:machine:63,,gregtech_addon,TRUE,,,,,,
 gregtech.Alloy,gregtech_addon:machine:56,,gregtech_addon,TRUE,,,,,,
+gregtechmod.integration.nei.handlers.AlloySmelterRecipeHandler,gregtech_addon:machine:132,,gregtech_addon,TRUE,,,,,,
 gregtech.Assembler,gregtech_addon:machine:60,,gregtech_addon,TRUE,,,,,,
 gregtech.Bender,gregtech_addon:machine:59,,gregtech_addon,TRUE,,,,,,
 gregtech.Blast,gregtech_addon:machine:29,,gregtech_addon,TRUE,,,,,,
@@ -494,6 +503,13 @@ gregtech.Lathe,gregtech_addon:machine:111,,gregtech_addon,TRUE,,,,,,
 gregtech.Sawmill,gregtech_addon:machine:32,,gregtech_addon,TRUE,,,,,,
 gregtech.VacuumFreezer,gregtech_addon:machine:38,,gregtech_addon,TRUE,,,,,,
 gregtech.Wiremill,gregtech_addon:machine:55,,gregtech_addon,TRUE,,,,,,
+ic2.neiIntegration.core.recipehandler.MaceratorRecipeHandler,gregtech_addon:machine:130,,gregtech_addon,TRUE,,,,,,
+ic2.neiIntegration.core.recipehandler.MaceratorRecipeHandler,gregtech_addon:machine:50,,gregtech_addon,TRUE,,,,,,
+ic2.neiIntegration.core.recipehandler.MaceratorRecipeHandler,gregtech_addon:machine:64,,gregtech_addon,TRUE,,,,,,
+ic2.neiIntegration.core.recipehandler.ExtractorRecipeHandler,gregtech_addon:machine:51,,gregtech_addon,TRUE,,,,,,
+ic2.neiIntegration.core.recipehandler.ExtractorRecipeHandler,gregtech_addon:machine:135,,gregtech_addon,TRUE,,,,,,
+ic2.neiIntegration.core.recipehandler.CompressorRecipeHandler,gregtech_addon:machine:52,,gregtech_addon,TRUE,,,,,,
+ic2.neiIntegration.core.recipehandler.CompressorRecipeHandler,gregtech_addon:machine:134,,gregtech_addon,TRUE,,,,,,
 wanion.biggercraftingtables.nei.BigShapedRecipeHandler,biggercraftingtables:BiggerCraftingTables,,biggercraftingtables,TRUE,,,,,,this and below are not tested
 wanion.biggercraftingtables.nei.BigShapedRecipeHandler,biggercraftingtables:AutoBiggerCraftingTables,,biggercraftingtables,TRUE,,,,,,
 wanion.biggercraftingtables.nei.BigShapelessRecipeHandler,biggercraftingtables:BiggerCraftingTables,,biggercraftingtables,TRUE,,,,,,
@@ -527,6 +543,10 @@ nc.crafting.nei.CoolerRecipeHandler,NuclearCraft:coolerIdle,,NuclearCraft,TRUE,,
 nc.crafting.nei.HeliumExtractorRecipeHandler,NuclearCraft:heliumExtractorIdle,,NuclearCraft,TRUE,,,,,,
 nc.crafting.nei.RecyclerRecipeHandler,NuclearCraft:recyclerIdle,,NuclearCraft,TRUE,,,,,,
 nc.crafting.nei.NuclearWorkspaceRecipeHandler,NuclearCraft:nuclearWorkspace,,NuclearCraft,TRUE,,,,,,
+nc.crafting.nei.FissionRecipeHandler,NuclearCraft:fissionReactorGraphiteIdle,,NuclearCraft,TRUE,,,,,,
+nc.crafting.nei.FissionSteamRecipeHandler,NuclearCraft:fissionReactorSteamIdle,,NuclearCraft,TRUE,,,,,,
+nc.crafting.nei.FusionRecipeHandler,NuclearCraft:fusionReactor,,NuclearCraft,TRUE,,,,,,
+nc.crafting.nei.FusionSteamRecipeHandler,NuclearCraft:fusionReactorSteam,,NuclearCraft,TRUE,,,,,,
 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker,etfuturum:smoker,,etfuturum,TRUE,,,,,,not working well
 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace,etfuturum:blast_furnace,,etfuturum,TRUE,,,,,,not working well
 connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler,campfirebackport:campfire,,campfirebackport,TRUE,,,,,,
@@ -807,11 +827,11 @@ gt.recipe.dieselgeneratorfuel,gregtech:gt.blockmachines:1112,,gregtech,TRUE,greg
 gt.recipe.gasturbinefuel,gregtech:gt.blockmachines:1115,,gregtech,TRUE,gregapi_post,,,,,
 gt.recipe.gasturbinefuel,gregtech:gt.blockmachines:1116,,gregtech,TRUE,gregapi_post,,,,,
 gt.recipe.gasturbinefuel,gregtech:gt.blockmachines:1117,,gregtech,TRUE,gregapi_post,,,,,
-gt.recipe.fluidnaquadahreactor,gregtech:gt.blockmachines:1190,,gregtech,TRUE,gregapi_post,,,,,
-gt.recipe.fluidnaquadahreactor,gregtech:gt.blockmachines:1191,,gregtech,TRUE,gregapi_post,,,,,
+gt.recipe.smallnaquadahreactor,gregtech:gt.blockmachines:1190,,gregtech,TRUE,gregapi_post,,,,,
+gt.recipe.largenaquadahreactor,gregtech:gt.blockmachines:1191,,gregtech,TRUE,gregapi_post,,,,,
 gt.recipe.fluidnaquadahreactor,gregtech:gt.blockmachines:1192,,gregtech,TRUE,gregapi_post,,,,,
-gt.recipe.fluidnaquadahreactor,gregtech:gt.blockmachines:1188,,gregtech,TRUE,gregapi_post,,,,,
-gt.recipe.fluidnaquadahreactor,gregtech:gt.blockmachines:1189,,gregtech,TRUE,gregapi_post,,,,,
+gt.recipe.hugenaquadahreactor,gregtech:gt.blockmachines:1188,,gregtech,TRUE,gregapi_post,,,,,
+gt.recipe.extrahugenaquadahreactor,gregtech:gt.blockmachines:1189,,gregtech,TRUE,gregapi_post,,,,,
 gt.recipe.magicfuels,gregtech:gt.blockmachines:1123,,gregtech,TRUE,gregapi_post,,,,,
 gt.recipe.magicfuels,gregtech:gt.blockmachines:1124,,gregtech,TRUE,gregapi_post,,,,,
 gt.recipe.magicfuels,gregtech:gt.blockmachines:1125,,gregtech,TRUE,gregapi_post,,,,,
@@ -1316,4 +1336,9 @@ 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,,,,,,
+crafting,ComputerCraft:CC-TurtleAdvanced,{leftUpgrade:2},ComputerCraft,TRUE,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerHarvester,MineFactoryReloaded:machine.0:2,,MineFactoryReloaded,TRUE,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSewer,MineFactoryReloaded:machine.0:10,,MineFactoryReloaded,TRUE,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerGrinder,MineFactoryReloaded:machine.0:13,,MineFactoryReloaded,TRUE,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerBioReactor,MineFactoryReloaded:machine.1:10,,MineFactoryReloaded,TRUE,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSlaughterhouse,MineFactoryReloaded:machine.1:13,,MineFactoryReloaded,TRUE,,,,,,

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

@@ -24,8 +24,8 @@ WayofTime.alchemicalWizardry.client.nei.NEIBloodOrbShapedHandler,Blood Magic,AWW
 WayofTime.alchemicalWizardry.client.nei.NEIBloodOrbShapelessHandler,Blood Magic,AWWayofTime:AlchemicalWizardrybloodRune:4,,AWWayofTime,TRUE,,,65,,5,,,,,,
 bw.fuels.acidgens,BartWorks,gregtech:gt.blockmachines:12726,,bartworks,TRUE,,6,145,,2,,,,,,
 bw.recipe.cal,BartWorks,gregtech:gt.blockmachines:12735,,bartworks,TRUE,,6,135,,2,,,,,,
-gg.recipe.naquadah_reactor,Good Generator,gregtech:gt.blockmachines:12732,,GoodGenerator,TRUE,,,145,,1,,,,,,
-gg.recipe.naquadah_fuel_refine_factory,Good Generator,gregtech:gt.blockmachines:16999,,GoodGenerator,TRUE,,,145,,1,,,,,,
+gg.recipe.naquadah_reactor,Good Generator,gregtech:gt.blockmachines:12732,,GoodGenerator,TRUE,,6,145,,1,,,,,,
+gg.recipe.naquadah_fuel_refine_factory,Good Generator,gregtech:gt.blockmachines:16999,,GoodGenerator,TRUE,,6,145,,1,,,,,,
 com.github.bartimaeusnek.bartworks.neiHandler.BW_NEI_BioLabHandler,BartWorks,gregtech:gt.blockmachines:12699,,bartworks,TRUE,,6,145,,2,,,,,,
 com.github.bartimaeusnek.bartworks.neiHandler.BW_NEI_BioVatHandler,BartWorks,gregtech:gt.blockmachines:12712,,bartworks,TRUE,,6,140,,2,,,,,,
 com.github.bartimaeusnek.bartworks.neiHandler.BW_NEI_OreHandler,BartWorks,bartworks:bw.blockores.01:89,,bartworks,TRUE,,,135,,2,,,,,,
@@ -491,6 +491,11 @@ nc.crafting.nei.CoolerRecipeHandler,NuclearCraft,NuclearCraft:coolerIdle,,Nuclea
 nc.crafting.nei.HeliumExtractorRecipeHandler,NuclearCraft,NuclearCraft:heliumExtractorIdle,,NuclearCraft,TRUE,,,65,166,5,,,,,,
 nc.crafting.nei.RecyclerRecipeHandler,NuclearCraft,NuclearCraft:recyclerIdle,,NuclearCraft,TRUE,,,65,166,5,,,,,,
 nc.crafting.nei.NuclearWorkspaceRecipeHandler,NuclearCraft,NuclearCraft:nuclearWorkspace,,NuclearCraft,TRUE,,,130,,2,,,,,,
+nc.crafting.nei.InfoUsageHandler,NuclearCraft,NuclearCraft:fuel,,NuclearCraft,TRUE,,,,,,,,,,,
+nc.crafting.nei.FissionRecipeHandler,NuclearCraft,NuclearCraft:fissionReactorGraphiteIdle,,NuclearCraft,TRUE,,,,,,,,,,,
+nc.crafting.nei.FissionSteamRecipeHandler,NuclearCraft,NuclearCraft:fissionReactorSteamIdle,,NuclearCraft,TRUE,,,,,,,,,,,
+nc.crafting.nei.FusionRecipeHandler,NuclearCraft,NuclearCraft:fusionReactor,,NuclearCraft,TRUE,,,,,,,,,,,
+nc.crafting.nei.FusionSteamRecipeHandler,NuclearCraft,NuclearCraft:fusionReactorSteam,,NuclearCraft,TRUE,,,,,,,,,,,
 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,,,,,,
@@ -500,4 +505,9 @@ net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,Ex Compressum
 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,,,,,,
+com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropProductHandler,AgriCraft,minecraft:farmland,,AgriCraft,TRUE,,,85,166,5,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerHarvester,MineFactory Reloaded,MineFactoryReloaded:machine.0:2,,MineFactoryReloaded,TRUE,,,,,,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSewer,MineFactory Reloaded,MineFactoryReloaded:machine.0:10,,MineFactoryReloaded,TRUE,,,,,,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerGrinder,MineFactory Reloaded,MineFactoryReloaded:machine.0:13,,MineFactoryReloaded,TRUE,,,,,,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerBioReactor,MineFactory Reloaded,MineFactoryReloaded:machine.1:10,,MineFactoryReloaded,TRUE,,,,,,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSlaughterhouse,MineFactory Reloaded,MineFactoryReloaded:machine.1:13,,MineFactoryReloaded,TRUE,,,,,,,,,,,

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

@@ -11,6 +11,7 @@ nei.bookmark.toggle.tip=Toggle visibility of the Bookmark Panel
 nei.bookmark.viewmode.toggle.tip=Toggle Bookmark View Mode
 
 nei.itempanel.quantity.default=One stack
+nei.itempanel.loading=Loading Item List...
 
 nei.enchant=Enchant
 nei.enchant.level=Level
@@ -70,6 +71,7 @@ nei.chat.rain.off=Rain turned off
 nei.chat.time=Day %d. %d:00
 nei.chat.give.noitem=No such item.
 nei.chat.recipe.error=There was error during loading recipe. Please check log for details.
+nei.chat.render.error=There was error during rendering item. Please check log for details.
 
 nei.options=NEI Options
 nei.options.back=Back
@@ -104,6 +106,8 @@ nei.options.keys.gui.hide_bookmarks=Toggle Bookmark Panel Visibility
 nei.options.keys.gui.overlay=Overlay Recipe
 nei.options.keys.gui.overlay_hide=Hide Overlay Recipe
 nei.options.keys.gui.overlay_use=Use Overlay Recipe
+nei.options.keys.gui.getprevioussearch=Previous Search
+nei.options.keys.gui.getnextsearch=Next Search
 nei.options.keys.world=World
 nei.options.keys.world.chunkoverlay=Chunk Boundary Overlay
 nei.options.keys.world.moboverlay=Mob Spawn Overlay
@@ -142,6 +146,9 @@ nei.options.inventory.saveCurrentRecipeInBookmarksEnabled.false=Disabled
 nei.options.inventory.useNBTInBookmarks=Use NBT in Bookmarks
 nei.options.inventory.useNBTInBookmarks.true=Yes
 nei.options.inventory.useNBTInBookmarks.false=No
+nei.options.inventory.bookmarksAnimationEnabled=REI Style Animation in Bookmarks
+nei.options.inventory.bookmarksAnimationEnabled.true=Yes
+nei.options.inventory.bookmarksAnimationEnabled.false=No
 nei.options.inventory.showRecipeMarker=Show Recipe Marker
 nei.options.inventory.showRecipeMarker.true=Yes
 nei.options.inventory.showRecipeMarker.false=No
@@ -154,6 +161,9 @@ nei.options.inventory.creative_tab_style.false=JEI
 nei.options.inventory.ignore_potion_overlap=Ignore overlap with potion effect HUD
 nei.options.inventory.ignore_potion_overlap.true=Yes
 nei.options.inventory.ignore_potion_overlap.false=No
+nei.options.inventory.optimize_gui_overlap_computation=Optimize computation for GUI overlap
+nei.options.inventory.optimize_gui_overlap_computation.true=Yes
+nei.options.inventory.optimize_gui_overlap_computation.false=No
 nei.options.inventory.widgetsenabled.true=NEI Enabled
 nei.options.inventory.widgetsenabled.false=NEI Disabled
 nei.options.inventory.cheatmode.0=Recipe Mode

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

@@ -8,6 +8,10 @@ nei.key.ctrl.mac=CMD
 
 nei.bookmark.toggle=书签
 nei.bookmark.toggle.tip=显示/隐藏书签页
+nei.bookmark.viewmode.toggle.tip=切换书签栏浏览模式
+
+nei.itempanel.quantity.default=一组
+nei.itempanel.loading=物品列表加载中...
 
 nei.enchant=附魔
 nei.enchant.level=等级
@@ -66,7 +70,8 @@ nei.chat.rain.on=开启雨雪
 nei.chat.rain.off=关闭雨雪
 nei.chat.time=白天 %d. %d:00
 nei.chat.give.noitem=没有此物品
-nei.chat.recipe.error=加载合成表过程中出现错误.请查看log文件获取详细信息.
+nei.chat.recipe.error=加载合成表过程中出现错误.请查看日志了解详情.
+nei.chat.render.error=渲染物品过程中出现错误.请查看日志了解详情.
 
 nei.options=NEI选项
 nei.options.back=后退
@@ -94,8 +99,15 @@ nei.options.keys.gui.next_machine=下一机器
 nei.options.keys.gui.prev_machine=上一机器
 nei.options.keys.gui.search=跳转到搜索框
 nei.options.keys.gui.bookmark=添加书签
+nei.options.keys.gui.bookmark_recipe=添加带有合成表的书签
+nei.options.keys.gui.bookmark_count=添加带有数量的书签
+nei.options.keys.gui.bookmark_recipe_count=添加带有合成表和数量的书签
 nei.options.keys.gui.hide_bookmarks=显示/隐藏书签页
 nei.options.keys.gui.overlay=提取合成表至合成栏/工作台
+nei.options.keys.gui.overlay_hide=隐藏覆盖合成表
+nei.options.keys.gui.overlay_use=使用覆盖合成表
+nei.options.keys.gui.getprevioussearch=上一个搜索
+nei.options.keys.gui.getnextsearch=下一个搜索
 nei.options.keys.world=世界
 nei.options.keys.world.chunkoverlay=区块(chunks)边界显示
 nei.options.keys.world.moboverlay=刷怪区域显示
@@ -134,12 +146,21 @@ nei.options.inventory.saveCurrentRecipeInBookmarksEnabled.false=禁用
 nei.options.inventory.useNBTInBookmarks=在书签中启用NBT
 nei.options.inventory.useNBTInBookmarks.true=是
 nei.options.inventory.useNBTInBookmarks.false=否
+nei.options.inventory.bookmarksAnimationEnabled=REI风格书签动画
+nei.options.inventory.bookmarksAnimationEnabled.true=是
+nei.options.inventory.bookmarksAnimationEnabled.false=否
 nei.options.inventory.showRecipeMarker=在书签栏显示合成产物标记
 nei.options.inventory.showRecipeMarker.true=是
 nei.options.inventory.showRecipeMarker.false=否
+nei.options.inventory.showItemQuantityWidget=显示物品数量栏(右下角)
+nei.options.inventory.showItemQuantityWidget.true=是
+nei.options.inventory.showItemQuantityWidget.false=否
 nei.options.inventory.creative_tab_style=创造模式/JEI标签页
 nei.options.inventory.creative_tab_style.true=创造模式
 nei.options.inventory.creative_tab_style.false=JEI
+nei.options.inventory.ignore_potion_overlap=忽略书签与药水效果重叠
+nei.options.inventory.ignore_potion_overlap.true=忽略
+nei.options.inventory.ignore_potion_overlap.false=规避
 nei.options.inventory.widgetsenabled.true=激活NEI
 nei.options.inventory.widgetsenabled.false=禁用NEI
 nei.options.inventory.cheatmode.0=合成模式

src/main/resources/dependencies.info

@@ -1,7 +1,7 @@
 {
-        "repo": "https://github.com/GTNewHorizons/CodeChickenLib/releases/download/1.1.5.3/",
-        "file": "CodeChickenLib-1.7.10-1.1.5.3.jar",
-        "dev": "CodeChickenLib-1.7.10-1.1.5.3-dev.jar",
+        "repo": "https://github.com/GTNewHorizons/CodeChickenLib/releases/download/1.1.5.5/",
+        "file": "CodeChickenLib-1.7.10-1.1.5.5.jar",
+        "dev": "CodeChickenLib-1.7.10-1.1.5.5-dev.jar",
         "class": "codechicken.lib.asm.ASMHelper",
         "coreLib": true
 }