github/RoughlyEnoughItems.git/default-plugin/src/main/java/me, branch 13.x-1.20.2 Unnamed repository; edit this file 'description' to name the repository. Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2 2024-09-17T13:41:20+00:00 shedaniel daniel@shedaniel.me 2024-09-17T13:38:27+00:00 93c67936af006bbaad287a9e902a8b67a0d7fc7d 






Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2
2024-09-17T13:34:04+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T13:34:04+00:00

3febdc4e1d6927f19d0de6fc8430765336d34d7e

# Conflicts:
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java
#	fabric/src/main/resources/roughlyenoughitems.accessWidener
#	runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java
#	runtime/src/main/java/me/shedaniel/rei/impl/common/registry/RecipeManagerContextImpl.java





# Conflicts:
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java
#	fabric/src/main/resources/roughlyenoughitems.accessWidener
#	runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java
#	runtime/src/main/java/me/shedaniel/rei/impl/common/registry/RecipeManagerContextImpl.java







Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20
2024-09-17T06:10:43+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T06:06:55+00:00

ccf3dcd60aa6c1d079dd57c59d9a89c2ca60b1e7

# Conflicts:
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java
#	fabric/src/main/resources/roughlyenoughitems.accessWidener
#	forge/src/main/resources/META-INF/accesstransformer.cfg





# Conflicts:
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java
#	fabric/src/main/resources/roughlyenoughitems.accessWidener
#	forge/src/main/resources/META-INF/accesstransformer.cfg







Compute the output of smithing displays on the fly
2024-09-17T05:53:26+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T05:53:26+00:00

b666943c4f14cfc6a8f1db7d3ac7fa2c7c0519da












Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2
2024-09-04T17:11:34+00:00

shedaniel
daniel@shedaniel.me

2024-09-04T17:11:34+00:00

bc039e2d0a45409396c9156307d70529ccb28a3e












Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20
2024-09-04T16:33:01+00:00

shedaniel
daniel@shedaniel.me

2024-09-04T16:33:01+00:00

97adf5d548ddb76d94e1c0542573cd21b7c6827c

# Conflicts:
#	api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/simple/SimpleTransferHandler.java





# Conflicts:
#	api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/simple/SimpleTransferHandler.java







Merge remote-tracking branch 'origin/9.x-1.19' into 11.x-1.19.4
2024-09-04T16:09:07+00:00

shedaniel
daniel@shedaniel.me

2024-09-04T16:09:07+00:00

7b5ed400a9bb5a26013441a7ca5589ca30803abd

# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java





# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListSearchManager.java







New Optimised Craftable Filter
2024-09-04T16:06:44+00:00

shedaniel
daniel@shedaniel.me

2024-08-14T14:11:28+00:00

3cf87de5b6fea02eb26b747761f8f85ad0b65f51

(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.





(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.







Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2
2024-04-16T18:00:50+00:00

shedaniel
daniel@shedaniel.me

2024-04-16T18:00:50+00:00

1ada31ed1507733e0a45d51f3b5c9a198af4bd58












Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20
2024-04-16T18:00:17+00:00

shedaniel
daniel@shedaniel.me

2024-04-16T17:58:51+00:00

90fd49a7d1decc43c41c23550afe326b6df570eb

# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntryWidget.java





# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntryWidget.java