Merge branch '1.21' into new-container-api

2025-03-21 21:24:26 +07:00 · 2025-03-21 21:24:26 +07:00 · be2011cf96
commit be2011cf96
parent 9413ae5f2b ab2cc33b7a
3 changed files with 1 additions and 0 deletions
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt
@ -30,6 +30,7 @@ object Widgets18 {
 	val RESTOCK_FROM_STORAGE = storageGrid.next()
 	val RESTOCK_WITH_MOVE_TO_STORAGE = storageGrid.next()
 	val RESTOCK_WITH_MOVE_FROM_STORAGE = storageGrid.next()
+	val SMART_STORAGE_EXCHANGE = storageGrid.next()

 	private val miscGrid = WidgetLocation.WIDGET_18.grid(4, 4)

--- a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/storage_controls.png
+++ b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/storage_controls.png
--- a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/storage_controls.xcf
+++ b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/storage_controls.xcf