github/RoughlyEnoughItems.git/default-plugin/src/main, branch 12.x-1.20 Unnamed repository; edit this file 'description' to name the repository. 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/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/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







Merge remote-tracking branch 'origin/9.x-1.19' into 11.x-1.19.4
2024-04-16T17:58:24+00:00

shedaniel
daniel@shedaniel.me

2024-04-16T17:56:55+00:00

3411a078ef92b06fb1f5b12116a8241811ff9aab

# Conflicts:
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java





# Conflicts:
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java







Add anvil recipes, Close #1381
2024-04-16T17:55:39+00:00

shedaniel
daniel@shedaniel.me

2024-04-16T09:32:47+00:00

6cc0322aacd36bbf325d3e08b7fa0b76d2eb0e5a












Fix compositing category not showing chance in tooltips
2024-04-16T17:55:39+00:00

shedaniel
daniel@shedaniel.me

2024-04-16T09:39:40+00:00

da47c76268e89abc8bb95f02964ca9ae3550d5a9












Merge remote-tracking branch 'origin/feature/11.1' into feature/12.1
2024-04-15T17:14:53+00:00

shedaniel
daniel@shedaniel.me

2024-04-15T17:14:22+00:00

d96699c5e2858ef1d25d2a2fc77deff59041af81

# Conflicts:
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java





# Conflicts:
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java