aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-09-05Merge remote-tracking branch 'origin/15.x-1.20.5' into 16.x-1.21shedaniel
2024-09-05Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5shedaniel
2024-09-05Merge remote-tracking branch 'origin/13.x-1.20.2' into 14.x-1.20.4shedaniel
2024-09-05Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2shedaniel
2024-09-05Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20shedaniel
# Conflicts: # api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/simple/SimpleTransferHandler.java
2024-09-05Merge remote-tracking branch 'origin/9.x-1.19' into 11.x-1.19.4shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java
2024-09-05New Optimised Craftable Filtershedaniel
(should remove almost all stutters with the filter) Developers can also use the new TransferHandlerMeta to provide custom info for available ingredients used for quickly determining whether the player can craft it.
2024-08-14Merge remote-tracking branch 'origin/15.x-1.20.5' into 16.x-1.21shedaniel
Fixes #1665 Fixes #1662 Fixes #1663
2024-08-14Fix #1666shedaniel
2024-08-14Merge remote-tracking branch 'refs/remotes/origin/14.x-1.20.4' into 15.x-1.20.5shedaniel
# Conflicts: # neoforge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java
2024-08-14Merge remote-tracking branch 'refs/remotes/origin/13.x-1.20.2' into 14.x-1.20.4shedaniel
2024-08-14Merge remote-tracking branch 'refs/remotes/origin/12.x-1.20' into 13.x-1.20.2shedaniel
2024-08-14Fix potential NPEshedaniel
2024-08-14Merge remote-tracking branch 'refs/remotes/origin/12.x-1.20' into 13.x-1.20.2shedaniel
2024-08-14Fix potential NPEshedaniel
2024-08-14Merge remote-tracking branch 'refs/remotes/origin/13.x-1.20.2' into 14.x-1.20.4shedaniel
2024-08-14Merge remote-tracking branch 'refs/remotes/origin/12.x-1.20' into 13.x-1.20.2shedaniel
2024-08-14Fix #1666shedaniel
2024-08-14Update dependenciesshedaniel
2024-07-22Merge remote-tracking branch 'refs/remotes/origin/15.x-1.20.5' into 16.x-1.21shedaniel
# Conflicts: # gradle.properties
2024-07-22Merge remote-tracking branch 'refs/remotes/origin/14.x-1.20.4' into 15.x-1.20.5shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/InputSlotCrafter.java
2024-07-22Merge remote-tracking branch 'refs/remotes/origin/13.x-1.20.2' into 14.x-1.20.4shedaniel
2024-07-22Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2shedaniel
2024-07-22Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20shedaniel
2024-07-22Merge remote-tracking branch 'refs/remotes/origin/9.x-1.19' into 11.x-1.19.4shedaniel
2024-07-22Check slots before modificationshedaniel
2024-06-17Update to 1.21shedaniel
2024-04-30Mark as 1.20.6 compatibleshedaniel
2024-04-30Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5shedaniel
2024-04-30Merge remote-tracking branch 'origin/13.x-1.20.2' into 14.x-1.20.4shedaniel
2024-04-30Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2shedaniel
2024-04-30Merge remote-tracking branch 'origin/9.x-1.19' into 12.x-1.20shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/components/ConfigGroupWidget.java
2024-04-30Fix #1614shedaniel
2024-04-30Fix #1620shedaniel
2024-04-30Use J21 to runshedaniel
2024-04-25Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5shedaniel
2024-04-25Merge remote-tracking branch 'origin/13.x-1.20.2' into 14.x-1.20.4shedaniel
2024-04-25Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2shedaniel
2024-04-25Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20shedaniel
2024-04-25Merge remote-tracking branch 'origin/9.x-1.19' into 11.x-1.19.4shedaniel
2024-04-25Fix #1611shedaniel
2024-04-25Add option for rainbowshedaniel
2024-04-25Update to 1.20.5shedaniel
2024-04-25Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntryWidget.java
2024-04-17Merge remote-tracking branch 'origin/13.x-1.20.2' into 14.x-1.20.4shedaniel
2024-04-17Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2shedaniel
2024-04-17Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntryWidget.java
2024-04-17Merge remote-tracking branch 'origin/9.x-1.19' into 11.x-1.19.4shedaniel
# Conflicts: # default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
2024-04-17Add anvil recipes, Close #1381shedaniel
2024-04-17Fix compositing category not showing chance in tooltipsshedaniel