Auto stash before merge of "master" and "origin/master"

2026-01-04 15:31:40 +00:00 · 2020-09-02 23:55:35 -07:00
parent 46687e1f27
commit f7195d6c79
20 changed files with 155 additions and 15 deletions
--- a/objects/structure/cottage-lot/corner-1.iob
+++ b/objects/structure/cottage-lot/corner-1.iob
--- a/objects/structure/cottage-lot/cross-1.iob
+++ b/objects/structure/cottage-lot/cross-1.iob
--- a/objects/structure/cottage-lot/hall-1.iob
+++ b/objects/structure/cottage-lot/hall-1.iob
--- a/objects/structure/cottage-lot/room-1.iob
+++ b/objects/structure/cottage-lot/room-1.iob
--- a/objects/structure/cottage-lot/room-2.iob
+++ b/objects/structure/cottage-lot/room-2.iob
--- a/objects/structure/cottage-lot/room-3.iob
+++ b/objects/structure/cottage-lot/room-3.iob
--- a/objects/structure/cottage-lot/room-4.iob
+++ b/objects/structure/cottage-lot/room-4.iob
--- a/objects/structure/cottage-lot/t-connect-1.iob
+++ b/objects/structure/cottage-lot/t-connect-1.iob
--- a/objects/structure/cottage-lot/walled-room-1.iob
+++ b/objects/structure/cottage-lot/walled-room-1.iob
--- a/objects/structure/ogMurkyCavern/room-1.iob
+++ b/objects/structure/ogMurkyCavern/room-1.iob
--- a/objects/structure/ogMurkyCavern/room-2.iob
+++ b/objects/structure/ogMurkyCavern/room-2.iob
--- a/objects/structure/ogMurkyCavern/room-3.iob
+++ b/objects/structure/ogMurkyCavern/room-3.iob
--- a/objects/structure/ogMurkyCavern/room-4.iob
+++ b/objects/structure/ogMurkyCavern/room-4.iob
--- a/objects/structure/ogMurkyCavern/room-5.iob
+++ b/objects/structure/ogMurkyCavern/room-5.iob
--- a/objects/structure/ogMurkyCavern/room-6-o.iob
+++ b/objects/structure/ogMurkyCavern/room-6-o.iob
--- a/objects/structure/ogMurkyCavern/room-7-tallllllll.iob
+++ b/objects/structure/ogMurkyCavern/room-7-tallllllll.iob
--- a/objects/structure/ogMurkyCavern/room-7.iob
+++ b/objects/structure/ogMurkyCavern/room-7.iob