Merge remote-tracking branch 'origin/feature/9.2' into feature/11.1

# Conflicts:
#	default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
#	gradle.properties
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ConfigureCategoriesScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringAddRuleScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/NoFilteringCategoriesEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/NoFilteringEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/RecipeScreenTypeEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/SearchFilterSyntaxHighlightingEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/entry/PerformanceEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/generic/OptionEntriesScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/basewidgets/PanelWidget.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/PaginatedEntryListWidget.java

16 files changed, 0 insertions, 0 deletions

diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/accessibility.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/accessibility.png
new file mode 100644
index 000000000..a4f181186
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/accessibility.png
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/appearance.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/appearance.png
new file mode 100644
index 000000000..e0b3f0b80
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/appearance.png
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/cheats.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/cheats.png
new file mode 100644
index 000000000..7721425da
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/cheats.png
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/debug.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/debug.png
new file mode 100644
index 000000000..58c3d4cf0
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/debug.png
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/favorites.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/favorites.png
new file mode 100644
index 000000000..7d71ec1f3
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/favorites.png
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/filtering.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/filtering.png
new file mode 100644
index 000000000..bd7e580b4
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/filtering.png
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/flags.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/flags.png
new file mode 100644
index 000000000..c102f5784
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/flags.png
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/input.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/input.png
new file mode 100644
index 000000000..beec65770
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/input.png
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/layout.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/layout.png
new file mode 100644
index 000000000..f0a5b3beb
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/layout.png
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/list.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/list.png
new file mode 100644
index 000000000..c3398beda
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/list.png
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/performance.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/performance.png
new file mode 100644
index 000000000..0e00fffe6
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/performance.png
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/reset.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/reset.png
new file mode 100644
index 000000000..26c80b43e
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/reset.png
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/search.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/search.png
new file mode 100644
index 000000000..f98d4aa9c
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/search.png
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/search_options.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/search_options.png
new file mode 100644
index 000000000..b7b3696ee
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/search_options.png
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/selector.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/selector.png
new file mode 100644
index 000000000..231b3170f
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/selector.png
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/info.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/info.png
new file mode 100644
index 000000000..50ef593ec
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/info.png