Merge remote-tracking branch 'origin/7.x-1.18' into 7.x-1.18.2

# Conflicts:
#	gradle.properties
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java

7 files changed, 71 insertions, 0 deletions

diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
index 1be327de4..e687b3565 100755
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
@@ -20,6 +20,7 @@
   "text.rei.config.menu.display.left_side_mob_effects": "Left Side Mob Effects",
   "text.rei.config.menu.display.left_side_panel": "Left Side Panel",
   "text.rei.config.menu.display.scrolling_side_panel": "Scrolling Side Panel",
+  "text.rei.config.menu.display.caching_entry_rendering": "Caching Entry Rendering",
   "text.rei.config.menu.display.side_search_field": "Side Search Field",
   "text.rei.config.menu.display.syntax_highlighting": "Syntax Highlighting",
   "text.rei.config.menu.config": "More Options...",
@@ -94,6 +95,12 @@
   "text.rei.gamemode_button.tooltip.entry": "Switch to %s",
   "text.rei.weather_button.tooltip.dropdown": "Switch Weather: Dropdown",
   "text.rei.weather_button.tooltip.entry": "Switch to %s",
+  "text.rei.time_button.tooltip.dropdown": "Switch Time: Dropdown",
+  "text.rei.time_button.tooltip.entry": "Switch to %s",
+  "text.rei.time_button.name.morn": "Morning",
+  "text.rei.time_button.name.noon": "Noon",
+  "text.rei.time_button.name.evening": "Evening",
+  "text.rei.time_button.name.night": "Night",
   "text.rei.reload_config": "Reload Plugins",
   "text.rei.config.is.reloading": "Plugins are reloading!",
   "text.rei.enabled": "Yes",
@@ -129,8 +136,15 @@
   "text.rei.tiny_potato": "Tiny Potatoz",
   "text.rei.add_favorite_widget": "Add...",
   "text.rei.dispose_here": "Dispose Here",
+  "text.rei.crash.title": "REI Crashed!",
+  "text.rei.crash.description": "§cRoughly Enough Item just experienced a crash during \"%s\".\n\n§fDetails of the crashed are displayed below. Please identify the mod that caused the crash and report it to the mod author, alongside the crash log provided below.\n\nIf you believe this crash is caused by a bug in Roughly Enough Item, please report it to our issue tracker.\n\n§6Thanks for your help!\n",
+  "text.rei.crash.crash_report": "Open Crash Report",
+  "text.rei.changelog.title": "REI Changelog",
+  "text.rei.changelog.error.missingChangelogFile": "Missing changelog File!",
+  "text.rei.changelog.error.failedToReadChangelogFile": "Failed to read changelog File!",
   "favorite.section.gamemode": "Game Mode",
   "favorite.section.weather": "Weather",
+  "favorite.section.time": "Time",
   "tooltip.rei.fluid_amount": "§7%d Unit",
   "tooltip.rei.fluid_amount.forge": "§7%d mB",
   "tooltip.rei.drag_to_add_favorites": "§7Drag this up to add this to your favorites!",
@@ -147,6 +161,7 @@
   "config.roughlyenoughitems.functionality": "Functionality",
   "config.roughlyenoughitems.advanced": "Advanced",
   "config.roughlyenoughitems.cheating": "Cheating:",
+  "config.roughlyenoughitems.cheating.when_creative": "During Creative Mode",
   "config.roughlyenoughitems.favoritesEnabled": "Favorites Enabled:",
   "config.roughlyenoughitems.keyBindings": "Keybindings",
   "config.roughlyenoughitems.keyBindings.recipeKeybind": "Show Recipe:",
@@ -186,6 +201,10 @@
   "config.roughlyenoughitems.layout.configButtonLocation.upper": "Upper",
   "config.roughlyenoughitems.layout.configButtonLocation.lower": "Lower",
   "config.roughlyenoughitems.layout.mergeDisplayUnderOne": "Merge Displays with Equal Contents:",
+  "config.roughlyenoughitems.layout.favoriteAddWidgetMode": "Favorites Add Widget Button:",
+  "config.roughlyenoughitems.layout.favoriteAddWidgetMode.always_invisible": "Always Invisible",
+  "config.roughlyenoughitems.layout.favoriteAddWidgetMode.auto_hide": "Auto Hide",
+  "config.roughlyenoughitems.layout.favoriteAddWidgetMode.always_visible": "Always Visible",
   "config.roughlyenoughitems.filteredEntries.selectAll": "Select All",
   "config.roughlyenoughitems.filteredEntries.selectNone": "Unselect All",
   "config.roughlyenoughitems.filteredEntries.hide": "Hide Selected",
@@ -245,6 +264,8 @@
   "config.roughlyenoughitems.layout.entryPanelOrdering": "Entry Panel Ordering:",
   "config.roughlyenoughitems.list_ordering_button": "%s [%s]",
   "config.roughlyenoughitems.miscellaneous.newFastEntryRendering": "Faster Entry Rendering:",
+  "config.roughlyenoughitems.miscellaneous.cachingFastEntryRendering": "Caching Entry Rendering:",
+  "config.roughlyenoughitems.miscellaneous.cachingFastEntryRendering.@PrefixText": "This option will improve performance for rendering entries for up to 5x, with an average of 2.5x performance gain. However, this will break enchantment glints and animated textures.",
   "config.roughlyenoughitems.itemCheatingMode": "Item Cheating Amount:",
   "config.roughlyenoughitems.itemCheatingMode.rei_like": "Normal",
   "config.roughlyenoughitems.itemCheatingMode.jei_like": "Inverted",
@@ -268,6 +289,9 @@
   "config.roughlyenoughitems.syntaxHighlightingMode.plain_underscored": "Plain (Underscored)",
   "config.roughlyenoughitems.syntaxHighlightingMode.colorful": "Colorful",
   "config.roughlyenoughitems.syntaxHighlightingMode.colorful_underscored": "Colorful (Underscored)",
+  "config.roughlyenoughitems.isFocusModeZoomed": "Entry Focus Mode:",
+  "config.roughlyenoughitems.isFocusModeZoomed.boolean.true": "Zoomed",
+  "config.roughlyenoughitems.isFocusModeZoomed.boolean.false": "Highlighted",
   "config.roughlyenoughitems.filtering.shouldFilterDisplays": "Should Filter Displays:",
   "config.roughlyenoughitems.filteringScreen": "Customized Filtering",
   "config.roughlyenoughitems.filteringRulesScreen": "Customized Filtering Rules",
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer.png
index 773636e65..7d553eaae 100644
--- a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer.png
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer.png
diff --git a/runtime/src/main/resources/roughlyenoughitems.changes.json b/runtime/src/main/resources/roughlyenoughitems.changes.json
new file mode 100644
index 000000000..0a3e2be7c
--- /dev/null
+++ b/runtime/src/main/resources/roughlyenoughitems.changes.json
@@ -0,0 +1,3 @@
+{
+  "version": "2022.1"
+}
\ No newline at end of file
diff --git a/runtime/src/main/resources/roughlyenoughitems/2022.1/2022-02-18_01-30.png b/runtime/src/main/resources/roughlyenoughitems/2022.1/2022-02-18_01-30.png
new file mode 100644
index 000000000..85e0ba7af
--- /dev/null
+++ b/runtime/src/main/resources/roughlyenoughitems/2022.1/2022-02-18_01-30.png
diff --git a/runtime/src/main/resources/roughlyenoughitems/2022.1/2022-02-18_01-32.png b/runtime/src/main/resources/roughlyenoughitems/2022.1/2022-02-18_01-32.png
new file mode 100644
index 000000000..c12af89ee
--- /dev/null
+++ b/runtime/src/main/resources/roughlyenoughitems/2022.1/2022-02-18_01-32.png
diff --git a/runtime/src/main/resources/roughlyenoughitems/2022.1/2022-02-18_09-05.png b/runtime/src/main/resources/roughlyenoughitems/2022.1/2022-02-18_09-05.png
new file mode 100644
index 000000000..380079ac3
--- /dev/null
+++ b/runtime/src/main/resources/roughlyenoughitems/2022.1/2022-02-18_09-05.png
diff --git a/runtime/src/main/resources/roughlyenoughitems/2022.1/changelog.md b/runtime/src/main/resources/roughlyenoughitems/2022.1/changelog.md
new file mode 100644
index 000000000..74a4e3c5d
--- /dev/null
+++ b/runtime/src/main/resources/roughlyenoughitems/2022.1/changelog.md
@@ -0,0 +1,44 @@
+#**New features**
+- **Time Favorites** [#110](https://github.com/shedaniel/RoughlyEnoughItems/issues/110)
+
+You can now easily set the time of day for your worlds. You can click the "+" button on the bottom left of
+the screen to add this new favorite. We also took some time to re-make the weather icons!
+![Example](roughlyenoughitems/2022.1/2022-02-18_01-30.png)
+
+- **Creative Mode Cheats** [#768](https://github.com/shedaniel/RoughlyEnoughItems/issues/768)
+
+You can now tell REI to automatically enable Cheats when in Creative Mode, and
+switch it off when you are not.
+![Example](roughlyenoughitems/2022.1/2022-02-18_01-32.png)
+
+- **Caching Item Rendering**
+
+The new Caching Item Rendering option will improve performance for rendering items up to **5 times**, 
+with an average of **2.5x performance gain**. However, this will break enchantment glints and animated textures.
+\n\nDemonstration: [Twitter Post](https://twitter.com/shedaniel_/status/1490675724193497091)
+- **Item Zoom** [#430](https://github.com/shedaniel/RoughlyEnoughItems/issues/430)
+
+Instead of highlighting the items on hover, you can now configure REI to zoom in on the item you are hovering.
+![Example](roughlyenoughitems/2022.1/2022-02-18_09-05.png)
+---
+#**Changes**
+- **Smoother Scrolling**
+
+With the [REI Feedback Form](https://forms.gle/5tdnK5WN1wng78pV8), we have received a lot of feedback on the
+scrolling experience. An overwhelming majority of users (79.1%) is happy with smooth scrolling, so we have decided to
+implement this back in REI.
+- **Support for JEI API 9.3** [#781](https://github.com/shedaniel/RoughlyEnoughItems/issues/781)
+
+The JEI compatibility layer has been updated to support APIs from JEI 9.3, this is a completely new way for
+JEI plugins to layout their categories, please report any issues you find with this new update.
+- **Filtering of Entries in Recipes** [#783](https://github.com/shedaniel/RoughlyEnoughItems/issues/783)
+
+REI will now attempt to filter items / fluids shown in recipes based on the filtering rules, this
+will allow mod packs to unify resources easier.
+---
+#**Bug Fixes**
+- **Multiple Outputs for Composite Display** [#617](https://github.com/shedaniel/RoughlyEnoughItems/issues/617)
+
+When you have multiple outputs for a composite display, the outputs will now display properly.
+
+- ... and more!
\ No newline at end of file