From cfd18221986e1828cb25149cc9a68d15d984f2c9 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Thu, 6 Feb 2025 00:41:45 +0100
Subject: [PATCH] update

---
 forge-gui/res/adventure/common/maps/map/cave/cave_fog.tmx  | 4 ++--
 forge-gui/res/adventure/common/world/biomes/blue.json      | 1 +
 forge-gui/res/adventure/common/world/biomes/colorless.json | 1 +
 forge-gui/res/adventure/common/world/enemies.json          | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/adventure/common/maps/map/cave/cave_fog.tmx b/forge-gui/res/adventure/common/maps/map/cave/cave_fog.tmx
index 464335efc6e..b43ac7a6e46 100644
--- a/forge-gui/res/adventure/common/maps/map/cave/cave_fog.tmx
+++ b/forge-gui/res/adventure/common/maps/map/cave/cave_fog.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="54">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="54">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -36,7 +36,7 @@
   </object>
   <object id="53" template="../../obj/enemy.tx" x="197.5" y="138.75">
    <properties>
-    <property name="enemy" value="Mimic"/>
+    <property name="enemy" value="Fog Trap"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/forge-gui/res/adventure/common/world/biomes/blue.json b/forge-gui/res/adventure/common/world/biomes/blue.json
index 5d0be31323e..a588842bcbf 100644
--- a/forge-gui/res/adventure/common/world/biomes/blue.json
+++ b/forge-gui/res/adventure/common/world/biomes/blue.json
@@ -108,6 +108,7 @@
 	"CaveU2",
 	"CaveU3",
 	"CaveU4",
+	"CaveCE",
 	"CaveAmphin",
 	"GitaxianLab",
 	"Kiora Island",
diff --git a/forge-gui/res/adventure/common/world/biomes/colorless.json b/forge-gui/res/adventure/common/world/biomes/colorless.json
index df7912377b9..dccb9fe0914 100644
--- a/forge-gui/res/adventure/common/world/biomes/colorless.json
+++ b/forge-gui/res/adventure/common/world/biomes/colorless.json
@@ -113,6 +113,7 @@
 		"CaveC9",
 		"CaveCA",
 		"CaveCB",
+		"CaveCE",
 		"FortMultilevel",
 		"CaveCerodon",
 		"CaveEldrazi",
diff --git a/forge-gui/res/adventure/common/world/enemies.json b/forge-gui/res/adventure/common/world/enemies.json
index 00b9a0b785f..25016419a80 100644
--- a/forge-gui/res/adventure/common/world/enemies.json
+++ b/forge-gui/res/adventure/common/world/enemies.json
@@ -19341,7 +19341,7 @@
 },
 {
 	"name": "Merfolk",
-	"nameOverride": "Merfok Raider",
+	"nameOverride": "Merfolk Raider",
 	"sprite": "sprites/enemy/elemental/waterelemental.atlas",
 	"deck": [
 		"decks/standard/merfolk_bad.json"