github/RoughlyEnoughItems.git/default-plugin/src, branch 16.x-1.21 Unnamed repository; edit this file 'description' to name the repository. fix: register S2C packet type for TagNodes (#1827) 2025-02-16T11:50:31+00:00 ellellie me@ell.gay 2025-02-16T11:50:31+00:00 afd98b073b4e86425a424e4d93b2ac1a0fa1d80b Closes #1744, #1772, #1800 
Closes #1744, #1772, #1800
 Merge remote-tracking branch 'origin/15.x-1.20.5' into 16.x-1.21 2024-09-17T14:15:52+00:00 shedaniel daniel@shedaniel.me 2024-09-17T14:15:52+00:00 3251f01cacfaf6dcdfd35ee3eaa5e5bee9d372b7 # Conflicts: # runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java 
# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5 2024-09-17T13:52:18+00:00 shedaniel daniel@shedaniel.me 2024-09-17T13:52:18+00:00 581543cb56b8a85d32d7237e0d37fb5ad24da9b5 # Conflicts: # api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java # api/src/main/java/me/shedaniel/rei/impl/Internals.java # 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/RoughlyEnoughItemsCoreClient.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java 
# Conflicts:
#	api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java
#	api/src/main/java/me/shedaniel/rei/impl/Internals.java
#	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/RoughlyEnoughItemsCoreClient.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java
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/15.x-1.20.5' into 16.x-1.21
2024-09-04T17:18:03+00:00

shedaniel
daniel@shedaniel.me

2024-09-04T17:18:03+00:00

dcac5f4891046507047c5951c164fb1c1f08da74












Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5
2024-09-04T17:16:54+00:00

shedaniel
daniel@shedaniel.me

2024-09-04T17:16:54+00:00

048eccb27ce9907b1028b7acc4f0f98321864750












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