github/RoughlyEnoughItems.git/forge/src, branch feature/calculator Unnamed repository; edit this file 'description' to name the repository. Use correct buffer source for rendering (#1768) 2024-12-06T20:47:40+00:00 RK_01 50594595+RaphiMC@users.noreply.github.com 2024-12-06T20:47:40+00:00 18baa61d7ed0a06c0b5ff94d86875ca9f88c2b0a 






Merge branch '12.x-1.20' into 14.x-1.20.4
2024-09-24T03:59:18+00:00

shedaniel
daniel@shedaniel.me

2024-09-24T03:53:57+00:00

106896bce86f1984df7be0bda33aba93c8815c4a

# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListWidget.java





# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListWidget.java







Closes #1648
2024-09-24T03:46:39+00:00

shedaniel
daniel@shedaniel.me

2024-09-24T03:46:39+00:00

c97b1a424bcfb57347bb650457aaded33c77c2ae












Merge branch '9.x-1.19' into 12.x-1.20
2024-09-24T03:36:20+00:00

shedaniel
daniel@shedaniel.me

2024-09-24T03:36:20+00:00

0f3e25a5c940f88f2abfa1f860be113a8a3d0c3d

# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/configure/PanelBoundariesConfiguration.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/preview/TooltipPreviewer.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryHighlighter.java





# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/configure/PanelBoundariesConfiguration.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/preview/TooltipPreviewer.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryHighlighter.java







Update Gradle
2024-09-23T08:00:12+00:00

shedaniel
daniel@shedaniel.me

2024-09-23T07:49:10+00:00

2a8a1f4a6491daf210bb0bc18abee4530dc9aa8a












Merge remote-tracking branch 'origin/13.x-1.20.2' into 14.x-1.20.4
2024-09-17T13:46:23+00:00

shedaniel
daniel@shedaniel.me

2024-09-17T13:46:23+00:00

ed0f9e051623b0a37b438a3df11c3e50a7d85ab5












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