From bce22cd4a11bf98ca574c6b7f88de777aee7e796 Mon Sep 17 00:00:00 2001
From: Dmitry <ondyshev.dmitry@gmail.com>
Date: Wed, 31 Jan 2024 11:23:06 +0700
Subject: [PATCH] ready oy 0.6.9

---
 CHANGELOG.md              |  2 ++
 config/craftpresence.json | 18 ++++++++++--------
 mods                      |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0230f1f8e..0225b98d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,8 @@
 - Candle colorization recipes in gtceu assembler.
 - MoreRed cable colorization via gtceu chemical bath.
 - Try to fix crash - create pressing.
+- Removed *NewYear* logo from drp.
+- Removed fix for xaero-map, because tfc grass colors has been fixed in xaero.
 
 ## [0.6.8] - 24.01.2024
 ### Changes
diff --git a/config/craftpresence.json b/config/craftpresence.json
index 147ae52ba..2511a5202 100644
--- a/config/craftpresence.json
+++ b/config/craftpresence.json
@@ -14,7 +14,7 @@
     "detectDimensionData": true,
     "detectWorldData": true,
     "clientId": "1182610212121743470",
-    "defaultIcon": "logo_new_year",
+    "defaultIcon": "tfg-icon",
     "enableJoinRequests": false,
     "partyPrivacyLevel": 1,
     "preferredClientLevel": 3,
@@ -22,7 +22,7 @@
     "autoRegister": false
   },
   "biomeSettings": {
-    "fallbackBiomeIcon": "logo_new_year",
+    "fallbackBiomeIcon": "tfg-icon",
     "biomeData": {
       "default": {
         "textOverride": "Playing in {biome.name}"
@@ -30,7 +30,7 @@
     }
   },
   "dimensionSettings": {
-    "fallbackDimensionIcon": "logo_new_year",
+    "fallbackDimensionIcon": "tfg-icon",
     "dimensionData": {
       "default": {
         "textOverride": "In the {dimension.name}"
@@ -38,7 +38,7 @@
     }
   },
   "serverSettings": {
-    "fallbackServerIcon": "logo_new_year",
+    "fallbackServerIcon": "tfg-icon",
     "fallbackServerName": "Minecraft Server",
     "fallbackServerMotd": "A Minecraft Server",
     "serverData": {
@@ -71,7 +71,7 @@
     "refreshRate": 2,
     "allowPlaceholderPreviews": false,
     "guiSettings": {
-      "fallbackGuiIcon": "logo_new_year",
+      "fallbackGuiIcon": "tfg-icon",
       "guiData": {
         "default": {
           "textOverride": "In {screen.name}"
@@ -82,7 +82,7 @@
       "default": "Holding {item.message.holding}"
     },
     "entitySettings": {
-      "fallbackEntityIcon": "logo_new_year",
+      "fallbackEntityIcon": "tfg-icon",
       "targetData": {
         "default": {
           "textOverride": "Targeting {entity.target.name}"
@@ -148,9 +148,10 @@
     },
     "languageId": "en_us",
     "stripTranslationColors": false,
+    "stripTranslationFormatting": false,
     "stripExtraGuiElements": false,
     "renderTooltips": true,
-    "configKeyCode": -1
+    "configKeyCode": 48
   },
   "displaySettings": {
     "presenceData": {
@@ -174,7 +175,8 @@
     "dynamicIcons": {
       "default": "https://via.placeholder.com/256.png",
       "SpeeeDCraft": "https://mc-heads.net/avatar/9d9c39ad4d3a4e6191c73d327f5dcf51",
-      "Xikaro": "https://mc-heads.net/avatar/57b3dfb5f8a649e28b544e4ffc63256f"
+      "Xikaro": "https://mc-heads.net/avatar/57b3dfb5f8a649e28b544e4ffc63256f",
+      "modern.terrafirmagreg.su": "https://api.mcsrvstat.us/icon/modern.terrafirmagreg.su"
     },
     "dynamicVariables": {
       "default": "Example Text",
diff --git a/mods b/mods
index b92a05bcc..501f0ee60 160000
--- a/mods
+++ b/mods
@@ -1 +1 @@
-Subproject commit b92a05bccba1fe479021dcdb65ff170bf0d00840
+Subproject commit 501f0ee6098c26cf9718c16014021ac6220ac545