github/RoughlyEnoughItems.git/default-plugin/src/main/java/me, branch 15.x-24w14potato Unnamed repository; edit this file 'description' to name the repository. Update to 24w09a 2024-03-01T18:09:05+00:00 shedaniel daniel@shedaniel.me 2024-03-01T18:09:05+00:00 52a6bf840ed665a2086ed37bbe0f99907d160350 






Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2
2023-11-02T08:05:35+00:00

shedaniel
daniel@shedaniel.me

2023-11-02T08:03:44+00:00

11b87fdd96f5542d646aa8f5136095917f207564

# Conflicts:
#	fabric/src/main/resources/roughlyenoughitems.accessWidener





# Conflicts:
#	fabric/src/main/resources/roughlyenoughitems.accessWidener







Rewrite how creative mode tab items are collected
2023-10-23T16:26:03+00:00

shedaniel
daniel@shedaniel.me

2023-10-23T16:26:03+00:00

3a6f6fc734603ce2b5540908bb23d87ee8a59913












Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2
2023-10-23T13:55:53+00:00

shedaniel
daniel@shedaniel.me

2023-10-23T13:55:53+00:00

c1eee9d8cc7e605215131055d11a0775bdd28f3b












Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20
2023-10-23T13:54:28+00:00

shedaniel
daniel@shedaniel.me

2023-10-23T13:54:28+00:00

120e6ea190a342e367e7c26b77d22b057091af84

# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/ConfigReloadingScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/DefaultScreenOverlayRenderer.java





# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/ConfigReloadingScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/DefaultScreenOverlayRenderer.java







Merge remote-tracking branch 'origin/9.x-1.19' into 11.x-1.19.4
2023-10-23T13:53:29+00:00

shedaniel
daniel@shedaniel.me

2023-10-23T13:52:30+00:00

11278f48effaa9a7ccc212ce0a047e356d9c4859

# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CraftableFilterButtonWidget.java
#	runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryListImpl.java





# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CraftableFilterButtonWidget.java
#	runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryListImpl.java







Fix crafting recipe duplicator not functioning
2023-10-23T13:49:48+00:00

shedaniel
daniel@shedaniel.me

2023-10-23T13:34:55+00:00

1f19414195fa93e7e0d39215f45314d8e305be09












Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2
2023-09-26T02:54:35+00:00

shedaniel
daniel@shedaniel.me

2023-09-26T02:54:35+00:00

2183ee93d46099837999b539c7463c24eda9d6fb

# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java





# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java







Merge remote-tracking branch 'shedaniel/11.x-1.19.4' into 12.x-1.20
2023-09-18T13:55:59+00:00

shedaniel
daniel@shedaniel.me

2023-09-18T13:55:59+00:00

001fc846c6002bf70a48dca67cee1437cc11c5e5












Merge remote-tracking branch 'shedaniel/9.x-1.19' into 11.x-1.19.4
2023-09-18T13:54:56+00:00

shedaniel
daniel@shedaniel.me

2023-09-18T13:54:56+00:00

3dc4238eb7a61a992d37a98b9035a9101c022f42