aboutsummaryrefslogtreecommitdiff
path: root/runtime/src/main/java
AgeCommit message (Collapse)Author
2023-09-01Merge remote-tracking branch 'shedaniel/11.x-1.19.4' into 12.x-1.20shedaniel
2023-09-01Merge remote-tracking branch 'shedaniel/9.x-1.19' into 11.x-1.19.4shedaniel
# Conflicts: # api/src/main/java/me/shedaniel/rei/api/common/transfer/RecipeFinder.java # default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
2023-09-01Reworked the transfer apishedaniel
See https://www.craft.me/s/TVL01jO3OZarPE for the documentation of the new experimental simple transfer handle
2023-09-01Merge branch '11.x-1.19.4' into 12.x-1.20shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CachedEntryListRender.java
2023-09-01Merge branch '10.x-1.19.3' into 11.x-1.19.4shedaniel
2023-09-01Fix #127110.x-1.19.3shedaniel
2023-08-09Merge remote-tracking branch 'shedaniel/11.x-1.19.4' into 12.x-1.20shedaniel
2023-08-09Merge remote-tracking branch 'shedaniel/9.x-1.19' into 11.x-1.19.4shedaniel
2023-08-09Fix crash on lookupshedaniel
2023-08-09Merge branch '11.x-1.19.4' into 12.x-1.20shedaniel
2023-08-09Merge remote-tracking branch 'shedaniel/9.x-1.19' into 11.x-1.19.4shedaniel
2023-08-09Improve performance on views lookup for ~20%shedaniel
2023-08-09Fix plugin names in performance screenshedaniel
2023-08-09Fix concurrency issues with recipe lookupshedaniel
2023-07-17Merge remote-tracking branch 'shedaniel/11.x-1.19.4' into 12.x-1.20shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayEntry.java
2023-07-17Merge remote-tracking branch 'shedaniel/9.x-1.19' into 11.x-1.19.4shedaniel
2023-07-17Fix display entry matricesshedaniel
2023-07-15Merge remote-tracking branch 'shedaniel/11.x-1.19.4' into 12.x-1.20shedaniel
2023-07-15Merge remote-tracking branch 'shedaniel/9.x-1.19' into 11.x-1.19.4shedaniel
2023-07-15Make pinned displays inherit existing displays' originsshedaniel
2023-07-03Fix hints text rendershedaniel
2023-06-13Fix inventory highlightershedaniel
2023-06-08Update to 1.20 and support Forgeshedaniel
2023-06-08Fix merge conflictsshedaniel
2023-06-08Merge remote-tracking branch 'shedaniel/11.x-1.19.4' into 12.x-1.20shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
2023-06-01Merge remote-tracking branch 'shedaniel/10.x-1.19.3' into 11.x-1.19.4shedaniel
2023-06-01Merge remote-tracking branch 'shedaniel/9.x-1.19' into 10.x-1.19.3shedaniel
2023-06-01Fix merge conflictsshedaniel
2023-06-01Close #1421shedaniel
2023-06-01Fix #1242shedaniel
2023-06-01Fix #1389shedaniel
2023-06-01Fix #1396 and fix #998shedaniel
2023-06-01Fix #1318shedaniel
2023-05-31Merge branch '11.x-1.19.4' into 12.x-1.20shedaniel
2023-05-30Merge remote-tracking branch 'shedaniel/10.x-1.19.3' into 11.x-1.19.4shedaniel
2023-05-30Merge remote-tracking branch 'shedaniel/9.x-1.19' into 10.x-1.19.3shedaniel
2023-05-30Fix compile issuesshedaniel
2023-05-30Improve search againshedaniel
2023-05-30Merge remote-tracking branch 'shedaniel/10.x-1.19.3' into 11.x-1.19.4shedaniel
2023-05-30Merge remote-tracking branch 'shedaniel/9.x-1.19' into 10.x-1.19.3shedaniel
2023-05-30Fix fork thread's context class loadershedaniel
2023-05-29Merge remote-tracking branch 'shedaniel/10.x-1.19.3' into 11.x-1.19.4shedaniel
2023-05-29Merge remote-tracking branch 'shedaniel/9.x-1.19' into 10.x-1.19.3shedaniel
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java
2023-05-29Fix #1025shedaniel
2023-05-29Close #1391shedaniel
2023-05-29Fix #1352shedaniel
2023-05-29Fix #1317shedaniel
2023-05-29Fix #1362shedaniel
2023-05-29Fix #1295shedaniel
2023-05-29Improve search performanceshedaniel