Merge remote-tracking branch 'origin/master'

2026-01-04 15:31:40 +00:00 · 2020-08-04 21:55:41 -07:00
parent 61fc641f0a 56284789b9
commit 3aefb578cd
69 changed files with 633 additions and 570 deletions
--- a/overworld/objects/struct-soultemple/a.iob
+++ b/overworld/objects/struct-soultemple/a.iob
--- a/overworld/objects/struct-soultemple/c-1.iob
+++ b/overworld/objects/struct-soultemple/c-1.iob
--- a/overworld/objects/struct-soultemple/c-a.iob
+++ b/overworld/objects/struct-soultemple/c-a.iob
--- a/overworld/objects/struct-soultemple/c-c.iob
+++ b/overworld/objects/struct-soultemple/c-c.iob
--- a/overworld/objects/struct-soultemple/c-h.iob
+++ b/overworld/objects/struct-soultemple/c-h.iob
--- a/overworld/objects/struct-soultemple/c-r.iob
+++ b/overworld/objects/struct-soultemple/c-r.iob
--- a/overworld/objects/struct-soultemple/c.iob
+++ b/overworld/objects/struct-soultemple/c.iob
--- a/overworld/objects/struct-soultemple/f-1.iob
+++ b/overworld/objects/struct-soultemple/f-1.iob
--- a/overworld/objects/struct-soultemple/f-a.iob
+++ b/overworld/objects/struct-soultemple/f-a.iob
--- a/overworld/objects/struct-soultemple/f-c.iob
+++ b/overworld/objects/struct-soultemple/f-c.iob
--- a/overworld/objects/struct-soultemple/f-h.iob
+++ b/overworld/objects/struct-soultemple/f-h.iob
--- a/overworld/objects/struct-soultemple/f-r.iob
+++ b/overworld/objects/struct-soultemple/f-r.iob
--- a/overworld/objects/struct-soultemple/f.iob
+++ b/overworld/objects/struct-soultemple/f.iob
--- a/overworld/objects/struct-soultemple/fc-1.iob
+++ b/overworld/objects/struct-soultemple/fc-1.iob
--- a/overworld/objects/struct-soultemple/fc-c.iob
+++ b/overworld/objects/struct-soultemple/fc-c.iob
--- a/overworld/objects/struct-soultemple/fc-h.iob
+++ b/overworld/objects/struct-soultemple/fc-h.iob
--- a/overworld/objects/struct-soultemple/fc-r.iob
+++ b/overworld/objects/struct-soultemple/fc-r.iob
--- a/overworld/objects/struct-soultemple/fc.iob
+++ b/overworld/objects/struct-soultemple/fc.iob
--- a/overworld/objects/struct-soultemple/x-1.iob
+++ b/overworld/objects/struct-soultemple/x-1.iob
--- a/overworld/objects/struct-soultemple/x-a.iob
+++ b/overworld/objects/struct-soultemple/x-a.iob
--- a/overworld/objects/struct-soultemple/x-c.iob
+++ b/overworld/objects/struct-soultemple/x-c.iob
--- a/overworld/objects/struct-soultemple/x-h.iob
+++ b/overworld/objects/struct-soultemple/x-h.iob
--- a/overworld/objects/struct-soultemple/x-r.iob
+++ b/overworld/objects/struct-soultemple/x-r.iob
--- a/overworld/objects/structure/desert-base.iob
+++ b/overworld/objects/structure/desert-base.iob