Compare commits

..
Author SHA1 Message Date
Martin Robertz 7a1065e789 Merge remote-tracking branch 'slprime/hide_items_until_searching' into dev 2024-12-29 11:56:47 +01:00
Martin Robertz 2cb60ea0cf Merge remote-tracking branch 'slprime/fix_item_rendering_cache' into dev 2024-12-29 11:56:40 +01:00
Martin Robertz a078d71746 Merge remote-tracking branch 'slprime/extend_subset_widget' into dev 2024-12-29 11:56:30 +01:00
Martin Robertz 1608665de0 Merge remote-tracking branch 'slprime/option_integer_field_width' into dev 2024-12-29 11:54:35 +01:00
Maya 55c111dff0 Merge branch 'master' into option_integer_field_width 2024-12-28 20:32:48 -06:00
Martin Robertz c041c953c6 missing imports 2024-12-27 09:56:46 +01:00
Martin Robertz 2448008b91 Merge remote-tracking branch 'slprime/extend_subset_widget' into dev
# Conflicts:
#	src/main/java/codechicken/nei/ItemPanel.java
#	src/main/java/codechicken/nei/guihook/GuiContainerManager.java
2024-12-27 09:55:10 +01:00
Martin Robertz 4e808cb44e Merge remote-tracking branch 'slprime/option_integer_field_width' into dev 2024-12-27 09:49:59 +01:00
Martin Robertz 827d42907d Merge remote-tracking branch 'origin/colored-tooltips' into dev 2024-12-27 09:49:40 +01:00
Martin Robertz ba659ee6ef Merge remote-tracking branch 'slprime/fix_item_rendering_cache' into dev 2024-12-27 09:49:34 +01:00
Martin Robertz a23e70c433 Merge remote-tracking branch 'slprime/hide_items_until_searching' into dev 2024-12-27 09:49:00 +01:00
Martin Robertz 489bfb7079 Merge branch 'master' into colored-tooltips 2024-12-26 23:20:56 +01:00
slprime c824d26bb1 Change OptionIntegerField Width 2024-12-20 18:37:08 +02:00
glowredman 91ec6b7e5e Add RenderTooltipEvent compat 2024-12-20 15:16:27 +01:00
@@ -414,6 +414,7 @@ public class ItemPanel extends PanelWidget {
super.setVisible();
if (grid.getPerPage() > 0) {
if (!CollapsibleItems.isEmpty() && !grid.isEmpty()) {
LayoutManager.addWidget(toggleGroups);
}