Updated World files for release and merged conflicts

This commit is contained in:
Rumble
2017-02-04 19:05:59 +01:00
40 changed files with 112 additions and 124 deletions

View File

@@ -112,6 +112,10 @@ O 0 34346 7 34390 (a short teak bench)
R 0 34382 34346 -1 (a short teak bench)
O 0 34346 7 34382 (a short teak bench)
O 0 34347 2 34382 (a gurgling spring)
D 0 34386 0 1 (Inside a Garden)
R 0 34386 34346 -1 (a short teak bench)
O 0 34346 7 34386 (a short teak bench)
M 0 34305 2 34386 (a gardener)
D 0 34385 0 1 (In a Garden)
R 0 34385 34346 -1 (a short teak bench)
O 0 34346 7 34385 (a short teak bench)
@@ -239,7 +243,10 @@ D 0 34315 2 1 (God Hall, North)
D 0 34365 2 1 (Fizbin's Office)
D 0 34367 3 1 (Rhade's Office)
D 0 34366 0 1 (Shama's Office)
D 0 34364 0 1 (Wyld's Office)
D 0 34363 2 1 (Empty Office)
D 0 34330 0 1 (Upper Immortal Hall, East)
D 0 34330 2 1 (Upper Immortal Hall, East)
D 0 34361 2 1 (Rumbles Office)
D 0 34360 0 1 (Empty Office)
D 0 34359 2 1 (Elona's Office)