github/RoughlyEnoughItems.git/api/src/main, branch 14.x-1.20.4 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/11.x-1.19.4' into 12.x-1.20
2024-09-17T13:37:11+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T13:37:11+00:00

9856139ad309ab833defb92ccfedaf48b9bde64e

# Conflicts:
#	api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java





# Conflicts:
#	api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java







Use InstanceHelper to get registryAccess
2024-09-17T13:36:09+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T13:36:09+00:00

644c3f591d42d91c8445b199202b37ba05b0bf93












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







Merge remote-tracking branch 'origin/9.x-1.19' into 11.x-1.19.4
2024-09-17T05:50:51+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T05:47:41+00:00

27e06fad89867281ef7d7bcebff194633812c9da

# Conflicts:
#	fabric/src/main/resources/roughlyenoughitems.accessWidener
#	forge/src/main/resources/META-INF/accesstransformer.cfg





# Conflicts:
#	fabric/src/main/resources/roughlyenoughitems.accessWidener
#	forge/src/main/resources/META-INF/accesstransformer.cfg







New Slot.withEntriesListener
2024-09-17T05:46:57+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T05:46:46+00:00

b8d0975527d86b79a1f9c160415baf8a6e6cf5cb












New plugin reload setup
2024-09-06T09:20:41+00:00

shedaniel
daniel@shedaniel.me

2024-09-04T07:20:39+00:00

a31f7254d76add6c34f134713c131463602f8cef

1. Plugin reloads will now interrupt existing reloading tasks if a new plugin reload has been requested
2. Plugin reloads will be automatically interrupted when the player leaves the level / the level is removed
3. More logging in DisplayRegistryImpl showing the stats of displays
4. Failure in filling recipes will now not stop the caching of display lookup
5. Slightly improve performance of checking display visibility on display lookup





1. Plugin reloads will now interrupt existing reloading tasks if a new plugin reload has been requested
2. Plugin reloads will be automatically interrupted when the player leaves the level / the level is removed
3. More logging in DisplayRegistryImpl showing the stats of displays
4. Failure in filling recipes will now not stop the caching of display lookup
5. Slightly improve performance of checking display visibility on display lookup







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