From 9dc6d676146caeaeb61ea616cc9419bb63c95756 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Fri, 7 Aug 2020 18:41:15 -0400
Subject: [PATCH] Auto stash before merge of "master" and "origin/master"

---
 .../structure/murky-stronghold/fc-x-1.iob     | Bin 4483 -> 0 bytes
 overworld/structures/murky-stronghold.json    |  96 ------------------
 2 files changed, 96 deletions(-)
 delete mode 100644 overworld/objects/structure/murky-stronghold/fc-x-1.iob
 delete mode 100644 overworld/structures/murky-stronghold.json

diff --git a/overworld/objects/structure/murky-stronghold/fc-x-1.iob b/overworld/objects/structure/murky-stronghold/fc-x-1.iob
deleted file mode 100644
index 8bbd515d56998ba1072ac5bdb9653cc51893cf51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4483
zcmcIoO^e$w5LE*0xu>4`0X^qZdRxd}=&da@EJ1OU*d%Ki%OOesd+oj_yLEzNjT#7H
z*#$q(ywSXQqpVWul~U?8e)xN>ruZoJ?j_4jQtD0h^kSVmFI{DGvs{%~vU6(UF>ia!
z)l=o4e(0YfPO>xWs~Alag{osvz)ZmTOP_JA%iYrI-O}y#YEhjFGp}qhJL<}md%NA5
z^?alE&OGBqzWTF&)fMF-G0Upd#oF3(vC&DEZ|6q4YL@E##s{*6$=e9C!X8ceH{Pub
z%4c}fXGrYoXjV9Y2WM_-pW&`!nKr+1EMpy>_@_dLm5M<%O%$s3sIV%bTpX&z3fcu~
ztTJd<jsXNwK{h!2h)7f}BE9d$(aG;<?Rue4nVbLe8U^U<0OTs2mF~7eU8*5^2N`GE
zv>MSRqJADm6-EXxk+VeSXf6jvq|>0oh$?iCY5{7rdoeM<J`@AWkKj>*Z==2s4sT=f
z#4KnQojv5XtkQW^9?Z<y1OD{BGwjEV=hc}KV<Y;|GHT4!1GC0xk?Ub1wFwBKf&&73
z5iuy1n2~mK#3Hy5Gl>{6fFw;{F9A{0D3Ph}8?gvF|2<-!j$k%){?Q}n?BJ=;SQ+D8
ze>4ldK+Hn7uLUObdI>|v7ci6|Faa5kKcz&k<97~^Ye;MG=hoosphQp46cYm7v(3Su
zuZ9|bdImryimPEnF~of8tuaY;mM?~PFVG?~+C*FDjBru9E$flFVnxgKc+AJXp1sa-
zjm#IR&bPc8w&{S1ESsB7RGh~M+YkjZ(ugk6PB9O3O^lES^N7#otPM5H>Vb)9J7orB
zu<d?dwyQI`>)nMOlPYrMeiiD$-0~B4I<7eh!!;*h{F;+6Ty|5bQ$Uc@1?yp_fFLI9
z27Yx-)wf>tU7(8#&OJ@)W+j3F8YGv(uc}hHfB^F&R7tC`yYvQ{G6jAU5NUc$a4PPi
z`Olre;6d%=x)!C0kt1r%toUW|>WFUr+aUtO>&s{sZw*&jZj1-F#x%;vcqtH~A*0y(
EKRdJ2g#Z8m

diff --git a/overworld/structures/murky-stronghold.json b/overworld/structures/murky-stronghold.json
deleted file mode 100644
index 7b188120..00000000
--- a/overworld/structures/murky-stronghold.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "name": "Murky Stronghold",
-    "gridSize": 5,
-    "gridHeight": 6,
-    "maxLayers": 1,
-    "mergeEdges": false,
-    "wallChanceZoom": 0.25,
-    "wallChance": 0.31,
-    "tiles": [
-        {
-            "ceiling": "REQUIRED",
-            "floor": "REQUIRED",
-            "north": "NEVER",
-            "south": "NEVER",
-            "east": "NEVER",                 
-            "west": "NEVER",
-            "objects": [
-                "structure/murky-stronghold/fc-x-1",
-                "structure/murky-stronghold/fc-x-2",
-                "structure/murky-stronghold/fc-x-3",
-                "structure/murky-stronghold/fc-x-4"
-            ]
-        },
-        {
-            "ceiling": "REQUIRED",
-            "floor": "REQUIRED",
-            "north": "REQUIRED",
-            "south": "NEVER",
-            "east": "REQUIRED",                 
-            "west": "NEVER",
-            "objects": [
-                "structure/murky-stronghold/fc-sw-1",
-                "structure/murky-stronghold/fc-sw-2",
-                "structure/murky-stronghold/fc-sw-3",
-                "structure/murky-stronghold/fc-sw-4"
-            ]
-        },
-        {
-            "ceiling": "REQUIRED",
-            "floor": "REQUIRED",
-            "north": "NEVER",
-            "south": "NEVER",
-            "east": "REQUIRED",                 
-            "west": "NEVER",
-            "objects": [
-                "structure/murky-stronghold/fc-nws-1",
-                "structure/murky-stronghold/fc-nws-2",
-                "structure/murky-stronghold/fc-nws-3",
-                "structure/murky-stronghold/fc-nws-4"
-            ]
-        },
-        {
-            "ceiling": "REQUIRED",
-            "floor": "REQUIRED",
-            "north": "NEVER",
-            "south": "NEVER",
-            "east": "REQUIRED",                 
-            "west": "NEVER",
-            "objects": [
-                "structure/murky-stronghold/fc-nws-1",
-                "structure/murky-stronghold/fc-nws-2",
-                "structure/murky-stronghold/fc-nws-3",
-                "structure/murky-stronghold/fc-nws-4"
-            ]
-        },
-        {
-            "ceiling": "REQUIRED",
-            "floor": "REQUIRED",
-            "north": "NEVER",
-            "south": "NEVER",
-            "east": "REQUIRED",                 
-            "west": "REQUIRED",
-            "objects": [
-                "structure/murky-stronghold/fc-ns-1",
-                "structure/murky-stronghold/fc-ns-2",
-                "structure/murky-stronghold/fc-ns-3",
-                "structure/murky-stronghold/fc-ns-4"
-            ]
-        },
-        {
-            "ceiling": "REQUIRED",
-            "floor": "REQUIRED",
-            "north": "REQUIRED",
-            "south": "NEVER",
-            "east": "NEVER",                 
-            "west": "NEVER",
-            "objects": [
-                "structure/murky-stronghold/fc-esw-1",
-                "structure/murky-stronghold/fc-esw-2",
-                "structure/murky-stronghold/fc-esw-3",
-                "structure/murky-stronghold/fc-esw-4"
-            ]
-        }
-    ],
-    "dispersion": "WISPY"
-}