diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index c4aaa88f..a5fa322f 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -27,13 +27,13 @@ body: attributes: label: What Biome description: Which biome are you experiencing issues in? Use `/iris what biome` and send the full text here. If this is not related to a biome, omit this. - placeholder: clutter/concretelith1 + placeholder: Mosaic/Lith/Black - type: input id: Object-Id attributes: label: Object Id description: What object are you talking about? (Use `/iris object dust`, and right click on the structure thats misbehaving) and send a screenshot link (imgur or related) - placeholder: objects/structures/generic1@5976587650987... + placeholder: Ships/Generic-1@5976587650987... - type: input id: mcversion attributes: diff --git a/biomes/.util/ruined_portals.json b/biomes/.util/ruined_portals.json index 12c82af4..a0cb24c5 100644 --- a/biomes/.util/ruined_portals.json +++ b/biomes/.util/ruined_portals.json @@ -13,10 +13,10 @@ "name": "standard-surface", "chance": 0.2, "place": [ - "clutter/swordnp2", - "clutter/swordnp1", - "clutter/swordnp2", - "clutter/swordnp1", + "global-clutter/BigSwordPortal-unlit-1", + "global-clutter/BigSwordPortal-lit-1", + "global-clutter/BigSwordPortal-unlit-1", + "global-clutter/BigSwordPortal-lit-1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", @@ -60,8 +60,8 @@ "name": "standard-underground", "chance": 0.2, "place": [ - "clutter/swordnp2", - "clutter/swordnp1", + "global-clutter/BigSwordPortal-unlit-1", + "global-clutter/BigSwordPortal-lit-1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/biomes/cave/cavern-coral.json b/biomes/cave/cavern-coral.json index 24986495..0411a597 100644 --- a/biomes/cave/cavern-coral.json +++ b/biomes/cave/cavern-coral.json @@ -123,7 +123,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -142,7 +142,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/cavern-root.json b/biomes/cave/cavern-root.json index 98962172..35511d0d 100644 --- a/biomes/cave/cavern-root.json +++ b/biomes/cave/cavern-root.json @@ -70,7 +70,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -89,7 +89,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/cracked-cavern.json b/biomes/cave/cracked-cavern.json index 4832f51b..c971f5b8 100644 --- a/biomes/cave/cracked-cavern.json +++ b/biomes/cave/cracked-cavern.json @@ -41,7 +41,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -60,7 +60,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/lit-cavern.json b/biomes/cave/lit-cavern.json index 7564269e..34eae154 100644 --- a/biomes/cave/lit-cavern.json +++ b/biomes/cave/lit-cavern.json @@ -43,7 +43,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -62,7 +62,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/murky-cavern-gleaming.json b/biomes/cave/murky-cavern-gleaming.json index 85b0eb36..59a2cc21 100644 --- a/biomes/cave/murky-cavern-gleaming.json +++ b/biomes/cave/murky-cavern-gleaming.json @@ -181,7 +181,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -200,7 +200,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/murky-cavern.json b/biomes/cave/murky-cavern.json index 25156fee..59e6874d 100644 --- a/biomes/cave/murky-cavern.json +++ b/biomes/cave/murky-cavern.json @@ -67,7 +67,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -86,7 +86,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/old-cavern.json b/biomes/cave/old-cavern.json index 4c6e9b5f..6d032b49 100644 --- a/biomes/cave/old-cavern.json +++ b/biomes/cave/old-cavern.json @@ -204,7 +204,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -223,7 +223,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, @@ -242,7 +242,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"] + "place": ["camp/camp"] } ] } diff --git a/biomes/cave/sandy-cave.json b/biomes/cave/sandy-cave.json index 44de57bb..86ac273a 100644 --- a/biomes/cave/sandy-cave.json +++ b/biomes/cave/sandy-cave.json @@ -78,11 +78,11 @@ "enabled": true }, "place": [ - "clutter/oakclutt1", - "clutter/oakclutt2", - "clutter/oakclutt3", - "clutter/oakclutt4", - "clutter/oakclutt5" + "clutter/oak-clutt-1", + "clutter/oak-clutt-2", + "clutter/oak-clutt-3", + "clutter/oak-clutt-4", + "clutter/oak-clutt-5" ], "translate": { "x": 0, @@ -101,7 +101,7 @@ }, "enabled": true }, - "place": ["clutter/grave1"], + "place": ["grave/grave"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/sandy-red-cave.json b/biomes/cave/sandy-red-cave.json index b20ecbd6..151bfb4d 100644 --- a/biomes/cave/sandy-red-cave.json +++ b/biomes/cave/sandy-red-cave.json @@ -34,11 +34,11 @@ "enabled": true }, "place": [ - "clutter/oakclutt1", - "clutter/oakclutt2", - "clutter/oakclutt3", - "clutter/oakclutt4", - "clutter/oakclutt5" + "clutter/oak-clutt-1", + "clutter/oak-clutt-2", + "clutter/oak-clutt-3", + "clutter/oak-clutt-4", + "clutter/oak-clutt-5" ], "translate": { "x": 0, diff --git a/biomes/cave/spiked-cavern.json b/biomes/cave/spiked-cavern.json index fdc9e0d2..5c640890 100644 --- a/biomes/cave/spiked-cavern.json +++ b/biomes/cave/spiked-cavern.json @@ -78,7 +78,7 @@ }, "enabled": true }, - "place": ["clutter/grave1"], + "place": ["grave/grave"], "translate": { "x": 0, "y": 0, @@ -106,14 +106,14 @@ "enabled": true }, "place": [ - "clutter/spikestone1", - "clutter/spikestone2", - "clutter/spikestone3", - "clutter/spikestone4", - "clutter/spikestone5", - "clutter/spikestone6", - "clutter/spikestone7", - "clutter/spikestone8" + "stone-clutt/stone-spike-1", + "stone-clutt/stone-spike-2", + "stone-clutt/stone-spike-3", + "stone-clutt/stone-spike-4", + "stone-clutt/stone-spike-5", + "stone-clutt/stone-spike-6", + "stone-clutt/stone-spike-7", + "stone-clutt/stone-spike-8" ], "translate": { "x": 0, diff --git a/biomes/cave/tropical-cavern.json b/biomes/cave/tropical-cavern.json index 68f6c682..4a410f61 100644 --- a/biomes/cave/tropical-cavern.json +++ b/biomes/cave/tropical-cavern.json @@ -56,7 +56,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -75,7 +75,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/tundra-cavern.json b/biomes/cave/tundra-cavern.json index 608bb683..735d350d 100644 --- a/biomes/cave/tundra-cavern.json +++ b/biomes/cave/tundra-cavern.json @@ -73,7 +73,7 @@ }, "enabled": true }, - "place": ["clutter/grave1"], + "place": ["grave/grave"], "translate": { "x": 0, "y": 0, diff --git a/biomes/frozen/fzn-beach.json b/biomes/frozen/fzn-beach.json index d507dd47..9c4869b4 100644 --- a/biomes/frozen/fzn-beach.json +++ b/biomes/frozen/fzn-beach.json @@ -26,7 +26,6 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", - "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" @@ -42,6 +41,12 @@ "style": {"style": "STATIC"}, "palette": [{"block": "packed_ice"}] }], + "entityInitialSpawns": [{ + "entity": "wolf", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 6 + }], "objects": [ { "chance": 0.003, @@ -57,10 +62,10 @@ "enabled": true }, "place": [ - "clutter/twoicespike1", - "clutter/twoicespike2", - "clutter/twoicespike3", - "clutter/twoicespike4" + "ice-spikes/tp-1", + "ice-spikes/tp-2", + "ice-spikes/tp-3", + "ice-spikes/tp-4" ], "translate": { "x": 0, @@ -83,15 +88,15 @@ "enabled": true }, "place": [ - "clutter/smolicespike1", - "clutter/smolicespike2", - "clutter/smolicespike3", - "clutter/smolicespike4", - "clutter/smolicespike5", - "clutter/smolicespike6", - "clutter/smolicespike7", - "clutter/smolicespike8", - "clutter/smolicespike9" + "ice-spikes/smol-ice-spike-1", + "ice-spikes/smol-ice-spike-2", + "ice-spikes/smol-ice-spike-3", + "ice-spikes/smol-ice-spike-4", + "ice-spikes/smol-ice-spike-5", + "ice-spikes/smol-ice-spike-6", + "ice-spikes/smol-ice-spike-7", + "ice-spikes/smol-ice-spike-8", + "ice-spikes/smol-ice-spike-9" ], "translate": { "x": 0, @@ -114,27 +119,27 @@ "enabled": true }, "place": [ - "clutter/icespec1", - "clutter/icespec2", - "clutter/icespec3", - "clutter/icespec4", - "clutter/icespec5", - "clutter/icecluster1", - "clutter/icecluster2", - "clutter/icecluster3", - "clutter/icecluster4", - "clutter/icecluster5", - "clutter/icecluster6", - "clutter/icecluster7", - "clutter/icecluster8", - "clutter/icecluster9", - "clutter/icecluster10", - "clutter/icecluster11", - "clutter/singleicespike1", - "clutter/singleicespike2", - "clutter/singleicespike3", - "clutter/singleicespike4", - "clutter/singleicespike5" + "ice-spikes/ice-spec-1", + "ice-spikes/ice-spec-2", + "ice-spikes/ice-spec-3", + "ice-spikes/ice-spec-4", + "ice-spikes/ice-spec-5", + "ice-spikes/ic-1", + "ice-spikes/ic-2", + "ice-spikes/ic-3", + "ice-spikes/ic-4", + "ice-spikes/ic-5", + "ice-spikes/ic-6", + "ice-spikes/ic-7", + "ice-spikes/ic-8", + "ice-spikes/ic-9", + "ice-spikes/ic-10", + "ice-spikes/ic-11", + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5" ], "translate": { "x": 0, diff --git a/biomes/frozen/fzn-hills.json b/biomes/frozen/fzn-hills.json index 4422b432..1be92ee0 100644 --- a/biomes/frozen/fzn-hills.json +++ b/biomes/frozen/fzn-hills.json @@ -35,7 +35,6 @@ "id": "fznhills", "waterColor": "#216FC4", "downfallType": "snow", - "temperature": -3, "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", @@ -88,16 +87,16 @@ } ], "place": [ - "trees/spruce/twirl1", - "trees/spruce/twirl2", - "trees/spruce/twirl3", - "trees/spruce/twirl4", - "trees/spruce/twirl5", - "trees/spruce/twirl6", - "trees/spruce/twirl7", - "trees/spruce/twirl8", - "trees/spruce/twirl9", - "trees/spruce/twirl10" + "wonderland/twirlSpruce-1", + "wonderland/twirlSpruce-2", + "wonderland/twirlSpruce-3", + "wonderland/twirlSpruce-4", + "wonderland/twirlSpruce-5", + "wonderland/twirlSpruce-6", + "wonderland/twirlSpruce-7", + "wonderland/twirlSpruce-8", + "wonderland/twirlSpruce-9", + "wonderland/twirlSpruce-10" ], "translate": { "x": 0, @@ -122,13 +121,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ] } ], @@ -149,5 +148,11 @@ "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} - ]} + ]}, + "entityInitialSpawns": [{ + "entity": "polar-bear", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 7 + }] } diff --git a/biomes/frozen/fzn-mountain-cliffs.json b/biomes/frozen/fzn-mountain-cliffs.json index a825107b..c19454d1 100644 --- a/biomes/frozen/fzn-mountain-cliffs.json +++ b/biomes/frozen/fzn-mountain-cliffs.json @@ -36,7 +36,6 @@ "customDerivitives": [{ "id": "fznmountaincliff", "downfallType": "snow", - "temperature": -3, "waterColor": "#216FC4", "fogColor": "#B8D0E1", "waterFogColor": "#216FC4", @@ -83,11 +82,11 @@ "enabled": true }, "place": [ - "clutter/singleicespike5", - "clutter/twoicespike1", - "clutter/twoicespike2", - "clutter/twoicespike3", - "clutter/twoicespike4" + "ice-spikes/sp-5", + "ice-spikes/tp-1", + "ice-spikes/tp-2", + "ice-spikes/tp-3", + "ice-spikes/tp-4" ], "translate": { "x": 0, @@ -115,26 +114,26 @@ } ], "place": [ - "trees/spruce/lfrostgeneric5", - "trees/spruce/lfrostgeneric6", - "trees/spruce/lfrostgeneric7", - "trees/spruce/lfrostgeneric8", - "trees/spruce/lfrostgeneric9", - "trees/spruce/lfrostgeneric10", - "trees/spruce/lfrostgeneric12", - "trees/spruce/lfrostgeneric13", - "trees/spruce/lfrostgeneric14", - "trees/spruce/lfrostgeneric15", - "trees/spruce/lfrostgeneric16", - "trees/spruce/lfrostgeneric17", - "trees/spruce/lfrostgeneric18", - "trees/spruce/lfrostgeneric19", - "trees/spruce/lfrostgeneric20", - "trees/spruce/lfrostgeneric21", - "trees/spruce/lfrostgeneric22", - "trees/spruce/lfrostgeneric23", - "trees/spruce/lfrostgeneric24", - "trees/spruce/lfrostgeneric25" + "frosted-spruce/large-5", + "frosted-spruce/large-6", + "frosted-spruce/large-7", + "frosted-spruce/large-8", + "frosted-spruce/large-9", + "frosted-spruce/large-10", + "frosted-spruce/large-12", + "frosted-spruce/large-13", + "frosted-spruce/large-14", + "frosted-spruce/large-15", + "frosted-spruce/large-16", + "frosted-spruce/large-17", + "frosted-spruce/large-18", + "frosted-spruce/large-19", + "frosted-spruce/large-20", + "frosted-spruce/large-21", + "frosted-spruce/large-22", + "frosted-spruce/large-23", + "frosted-spruce/large-24", + "frosted-spruce/large-25" ], "translate": { "x": 0, @@ -162,10 +161,10 @@ } ], "place": [ - "trees/spruce/lfrostgeneric22", - "trees/spruce/lfrostgeneric23", - "trees/spruce/lfrostgeneric24", - "trees/spruce/lfrostgeneric25" + "frosted-spruce/large-22", + "frosted-spruce/large-23", + "frosted-spruce/large-24", + "frosted-spruce/large-25" ], "translate": { "x": 0, @@ -188,27 +187,27 @@ "enabled": true }, "place": [ - "clutter/icespec1", - "clutter/icespec2", - "clutter/icespec3", - "clutter/icespec4", - "clutter/icespec5", - "clutter/icecluster1", - "clutter/icecluster2", - "clutter/icecluster3", - "clutter/icecluster4", - "clutter/icecluster5", - "clutter/icecluster6", - "clutter/icecluster7", - "clutter/icecluster8", - "clutter/icecluster9", - "clutter/icecluster10", - "clutter/icecluster11", - "clutter/singleicespike1", - "clutter/singleicespike2", - "clutter/singleicespike3", - "clutter/singleicespike4", - "clutter/singleicespike5" + "ice-spikes/ice-spec-1", + "ice-spikes/ice-spec-2", + "ice-spikes/ice-spec-3", + "ice-spikes/ice-spec-4", + "ice-spikes/ice-spec-5", + "ice-spikes/ic-1", + "ice-spikes/ic-2", + "ice-spikes/ic-3", + "ice-spikes/ic-4", + "ice-spikes/ic-5", + "ice-spikes/ic-6", + "ice-spikes/ic-7", + "ice-spikes/ic-8", + "ice-spikes/ic-9", + "ice-spikes/ic-10", + "ice-spikes/ic-11", + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5" ], "translate": { "x": 0, @@ -249,7 +248,20 @@ } ] }], - + "entityInitialSpawns": [ + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "wall": { "style": {"style": "IRIS"}, "palette": [{"block": "packed_ice"}] diff --git a/biomes/frozen/fzn-mountain-middle.json b/biomes/frozen/fzn-mountain-middle.json index f61381b3..9ed52341 100644 --- a/biomes/frozen/fzn-mountain-middle.json +++ b/biomes/frozen/fzn-mountain-middle.json @@ -21,7 +21,6 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", - "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" diff --git a/biomes/frozen/fzn-mountain.json b/biomes/frozen/fzn-mountain.json index 83f828e0..952e5037 100644 --- a/biomes/frozen/fzn-mountain.json +++ b/biomes/frozen/fzn-mountain.json @@ -13,7 +13,6 @@ "id": "fznmountain", "waterColor": "#216FC4", "downfallType": "snow", - "temperature": -3, "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", diff --git a/biomes/frozen/fzn-mountains.json b/biomes/frozen/fzn-mountains.json index b848dfa2..c20b2607 100644 --- a/biomes/frozen/fzn-mountains.json +++ b/biomes/frozen/fzn-mountains.json @@ -12,7 +12,6 @@ "id": "fznmountains", "waterColor": "#216FC4", "downfallType": "snow", - "temperature": -3, "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", @@ -89,10 +88,10 @@ "enabled": true }, "place": [ - "clutter/twoicespike1", - "clutter/twoicespike2", - "clutter/twoicespike3", - "clutter/twoicespike4" + "ice-spikes/tp-1", + "ice-spikes/tp-2", + "ice-spikes/tp-3", + "ice-spikes/tp-4" ], "translate": { "x": 0, @@ -120,25 +119,25 @@ } ], "place": [ - "trees/spruce/lfrostgeneric5", - "trees/spruce/lfrostgeneric6", - "trees/spruce/lfrostgeneric7", - "trees/spruce/lfrostgeneric8", - "trees/spruce/lfrostgeneric9", - "trees/spruce/lfrostgeneric12", - "trees/spruce/lfrostgeneric13", - "trees/spruce/lfrostgeneric14", - "trees/spruce/lfrostgeneric15", - "trees/spruce/lfrostgeneric16", - "trees/spruce/lfrostgeneric17", - "trees/spruce/lfrostgeneric18", - "trees/spruce/lfrostgeneric19", - "trees/spruce/lfrostgeneric20", - "trees/spruce/lfrostgeneric21", - "trees/spruce/lfrostgeneric22", - "trees/spruce/lfrostgeneric23", - "trees/spruce/lfrostgeneric24", - "trees/spruce/lfrostgeneric25" + "frosted-spruce/large-5", + "frosted-spruce/large-6", + "frosted-spruce/large-7", + "frosted-spruce/large-8", + "frosted-spruce/large-9", + "frosted-spruce/large-12", + "frosted-spruce/large-13", + "frosted-spruce/large-14", + "frosted-spruce/large-15", + "frosted-spruce/large-16", + "frosted-spruce/large-17", + "frosted-spruce/large-18", + "frosted-spruce/large-19", + "frosted-spruce/large-20", + "frosted-spruce/large-21", + "frosted-spruce/large-22", + "frosted-spruce/large-23", + "frosted-spruce/large-24", + "frosted-spruce/large-25" ], "translate": { "x": 0, @@ -171,27 +170,27 @@ "enabled": true }, "place": [ - "clutter/icespec1", - "clutter/icespec2", - "clutter/icespec3", - "clutter/icespec4", - "clutter/icespec5", - "clutter/icecluster1", - "clutter/icecluster2", - "clutter/icecluster3", - "clutter/icecluster4", - "clutter/icecluster5", - "clutter/icecluster6", - "clutter/icecluster7", - "clutter/icecluster8", - "clutter/icecluster9", - "clutter/icecluster10", - "clutter/icecluster11", - "clutter/singleicespike1", - "clutter/singleicespike2", - "clutter/singleicespike3", - "clutter/singleicespike4", - "clutter/singleicespike5" + "ice-spikes/ice-spec-1", + "ice-spikes/ice-spec-2", + "ice-spikes/ice-spec-3", + "ice-spikes/ice-spec-4", + "ice-spikes/ice-spec-5", + "ice-spikes/ic-1", + "ice-spikes/ic-2", + "ice-spikes/ic-3", + "ice-spikes/ic-4", + "ice-spikes/ic-5", + "ice-spikes/ic-6", + "ice-spikes/ic-7", + "ice-spikes/ic-8", + "ice-spikes/ic-9", + "ice-spikes/ic-10", + "ice-spikes/ic-11", + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5" ], "translate": { "x": 0, @@ -200,6 +199,20 @@ } } ], + "entityInitialSpawns": [ + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "biomeZoom": 30, "biomeStyle": {"style": "IRIS"}, "decorators": [{ diff --git a/biomes/frozen/fzn-peak.json b/biomes/frozen/fzn-peak.json index ba58cd76..2344ba24 100644 --- a/biomes/frozen/fzn-peak.json +++ b/biomes/frozen/fzn-peak.json @@ -8,7 +8,6 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", - "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" @@ -132,15 +131,15 @@ "enabled": true }, "place": [ - "clutter/singleicespike1", - "clutter/singleicespike2", - "clutter/singleicespike3", - "clutter/singleicespike4", - "clutter/singleicespike5", - "clutter/twoicespike1", - "clutter/twoicespike2", - "clutter/twoicespike3", - "clutter/twoicespike4" + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5", + "ice-spikes/tp-1", + "ice-spikes/tp-2", + "ice-spikes/tp-3", + "ice-spikes/tp-4" ], "translate": { "x": 0, @@ -163,16 +162,16 @@ "enabled": true }, "place": [ - "clutter/singleicespike1", - "clutter/singleicespike2", - "clutter/singleicespike3", - "clutter/singleicespike4", - "clutter/singleicespike5", - "clutter/icespec1", - "clutter/icespec2", - "clutter/icespec3", - "clutter/icespec4", - "clutter/icespec5" + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5", + "ice-spikes/ice-spec-1", + "ice-spikes/ice-spec-2", + "ice-spikes/ice-spec-3", + "ice-spikes/ice-spec-4", + "ice-spikes/ice-spec-5" ], "translate": { "x": 0, @@ -181,6 +180,20 @@ } } ], + "entityInitialSpawns": [ + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "biomeZoom": 30, "biomeStyle": {"style": "IRIS"}, "biomeScatter": [ diff --git a/biomes/frozen/fzn-pine-hills.json b/biomes/frozen/fzn-pine-hills.json index 8164de53..c5b4f25b 100644 --- a/biomes/frozen/fzn-pine-hills.json +++ b/biomes/frozen/fzn-pine-hills.json @@ -34,7 +34,6 @@ "customDerivitives": [{ "id": "fznpinehills", "downfallType": "snow", - "temperature": -3, "waterColor": "#216FC4", "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", @@ -112,5 +111,11 @@ "zoom": 0.4 }, "snow": 0.1 + }], + "entityInitialSpawns": [{ + "entity": "polar-bear", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 7 }] } diff --git a/biomes/frozen/fzn-pine-plains.json b/biomes/frozen/fzn-pine-plains.json index 6d1587ae..b996cecf 100644 --- a/biomes/frozen/fzn-pine-plains.json +++ b/biomes/frozen/fzn-pine-plains.json @@ -22,7 +22,6 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", - "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" @@ -121,5 +120,11 @@ "zoom": 0.4 }, "snow": 0.1 + }], + "entityInitialSpawns": [{ + "entity": "polar-bear", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 7 }] } diff --git a/biomes/frozen/fzn-pines.json b/biomes/frozen/fzn-pines.json index 62726acb..527a8c3b 100644 --- a/biomes/frozen/fzn-pines.json +++ b/biomes/frozen/fzn-pines.json @@ -40,7 +40,6 @@ "id": "fznpines", "waterColor": "#216FC4", "downfallType": "snow", - "temperature": -3, "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", @@ -93,22 +92,22 @@ } ], "place": [ - "clutter/icecluster1", - "clutter/icecluster2", - "clutter/icecluster3", - "clutter/icecluster4", - "clutter/icecluster5", - "clutter/icecluster6", - "clutter/icecluster7", - "clutter/icecluster8", - "clutter/icecluster9", - "clutter/icecluster10", - "clutter/icecluster11", - "clutter/singleicespike1", - "clutter/singleicespike2", - "clutter/singleicespike3", - "clutter/singleicespike4", - "clutter/singleicespike5" + "ice-spikes/ic-1", + "ice-spikes/ic-2", + "ice-spikes/ic-3", + "ice-spikes/ic-4", + "ice-spikes/ic-5", + "ice-spikes/ic-6", + "ice-spikes/ic-7", + "ice-spikes/ic-8", + "ice-spikes/ic-9", + "ice-spikes/ic-10", + "ice-spikes/ic-11", + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5" ], "translate": { "x": 0, @@ -134,11 +133,11 @@ "enabled": true }, "place": [ - "trees/spruce/levergreen1", - "trees/spruce/levergreen1", - "trees/spruce/mevergreen1", - "trees/spruce/mevergreen2", - "trees/spruce/mevergreen3" + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_medium1", + "evergreen/fantasy_evergreen_medium2", + "evergreen/fantasy_evergreen_medium3" ], "translate": { "x": 0, @@ -160,11 +159,11 @@ "enabled": true }, "place": [ - "clutter/icespec1", - "clutter/icespec2", - "clutter/icespec3", - "clutter/icespec4", - "clutter/icespec5" + "ice-spikes/ice-spec-1", + "ice-spikes/ice-spec-2", + "ice-spikes/ice-spec-3", + "ice-spikes/ice-spec-4", + "ice-spikes/ice-spec-5" ], "translate": { "x": 0, @@ -189,6 +188,20 @@ {"block": "air"} ] }], + "entityInitialSpawns": [ + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "childShrinkFactor": 20, "wall": { "style": {"style": "STATIC"}, diff --git a/biomes/frozen/fzn-plains.json b/biomes/frozen/fzn-plains.json index 95d1e299..ee79a741 100644 --- a/biomes/frozen/fzn-plains.json +++ b/biomes/frozen/fzn-plains.json @@ -23,7 +23,6 @@ "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "downfallType": "snow", - "temperature": -3, "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" }], @@ -95,7 +94,7 @@ }, "enabled": true }, - "place": ["clutter/grave1"], + "place": ["grave/grave"], "translate": { "x": 0, "y": 0, @@ -118,13 +117,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, @@ -146,22 +145,22 @@ "enabled": true }, "place": [ - "clutter/icecluster1", - "clutter/icecluster2", - "clutter/icecluster3", - "clutter/icecluster4", - "clutter/icecluster5", - "clutter/icecluster6", - "clutter/icecluster7", - "clutter/icecluster8", - "clutter/icecluster9", - "clutter/icecluster10", - "clutter/icecluster11", - "clutter/singleicespike1", - "clutter/singleicespike2", - "clutter/singleicespike3", - "clutter/singleicespike4", - "clutter/singleicespike5" + "ice-spikes/ic-1", + "ice-spikes/ic-2", + "ice-spikes/ic-3", + "ice-spikes/ic-4", + "ice-spikes/ic-5", + "ice-spikes/ic-6", + "ice-spikes/ic-7", + "ice-spikes/ic-8", + "ice-spikes/ic-9", + "ice-spikes/ic-10", + "ice-spikes/ic-11", + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5" ], "translate": { "x": 0, @@ -189,16 +188,16 @@ } ], "place": [ - "trees/spruce/twirl1", - "trees/spruce/twirl2", - "trees/spruce/twirl3", - "trees/spruce/twirl4", - "trees/spruce/twirl5", - "trees/spruce/twirl6", - "trees/spruce/twirl7", - "trees/spruce/twirl8", - "trees/spruce/twirl9", - "trees/spruce/twirl10" + "wonderland/twirlSpruce-1", + "wonderland/twirlSpruce-2", + "wonderland/twirlSpruce-3", + "wonderland/twirlSpruce-4", + "wonderland/twirlSpruce-5", + "wonderland/twirlSpruce-6", + "wonderland/twirlSpruce-7", + "wonderland/twirlSpruce-8", + "wonderland/twirlSpruce-9", + "wonderland/twirlSpruce-10" ], "translate": { "x": 0, @@ -218,7 +217,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -239,11 +238,11 @@ "enabled": true }, "place": [ - "clutter/icespec1", - "clutter/icespec2", - "clutter/icespec3", - "clutter/icespec4", - "clutter/icespec5" + "ice-spikes/ice-spec-1", + "ice-spikes/ice-spec-2", + "ice-spikes/ice-spec-3", + "ice-spikes/ice-spec-4", + "ice-spikes/ice-spec-5" ], "translate": { "x": 0, @@ -265,6 +264,25 @@ "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} - ]} - + ]}, + "entityInitialSpawns": [ + { + "entity": "polar-bear", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ] } diff --git a/biomes/frozen/fzn-redwood-forest.json b/biomes/frozen/fzn-redwood-forest.json index 644e92b4..8ac57268 100644 --- a/biomes/frozen/fzn-redwood-forest.json +++ b/biomes/frozen/fzn-redwood-forest.json @@ -21,7 +21,6 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", - "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" @@ -81,22 +80,22 @@ "enabled": true }, "place": [ - "clutter/icecluster1", - "clutter/icecluster2", - "clutter/icecluster3", - "clutter/icecluster4", - "clutter/icecluster5", - "clutter/icecluster6", - "clutter/icecluster7", - "clutter/icecluster8", - "clutter/icecluster9", - "clutter/icecluster10", - "clutter/icecluster11", - "clutter/singleicespike1", - "clutter/singleicespike2", - "clutter/singleicespike3", - "clutter/singleicespike4", - "clutter/singleicespike5" + "ice-spikes/ic-1", + "ice-spikes/ic-2", + "ice-spikes/ic-3", + "ice-spikes/ic-4", + "ice-spikes/ic-5", + "ice-spikes/ic-6", + "ice-spikes/ic-7", + "ice-spikes/ic-8", + "ice-spikes/ic-9", + "ice-spikes/ic-10", + "ice-spikes/ic-11", + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5" ], "translate": { "x": 0, @@ -136,16 +135,16 @@ "enabled": true }, "place": [ - "trees/mixed/tredwood1", - "trees/mixed/tredwood2", - "trees/mixed/tredwood3", - "trees/mixed/tredwood4", - "trees/mixed/tredwood5", - "trees/mixed/tredwood6", - "trees/mixed/tredwood7", - "trees/mixed/tredwood8", - "trees/mixed/tredwood9", - "trees/mixed/tredwood10" + "true-redwood/true-redwood-1", + "true-redwood/true-redwood-2", + "true-redwood/true-redwood-3", + "true-redwood/true-redwood-4", + "true-redwood/true-redwood-5", + "true-redwood/true-redwood-6", + "true-redwood/true-redwood-7", + "true-redwood/true-redwood-8", + "true-redwood/true-redwood-9", + "true-redwood/true-redwood-10" ], "translate": { "x": 0, @@ -167,11 +166,11 @@ "enabled": true }, "place": [ - "clutter/icespec1", - "clutter/icespec2", - "clutter/icespec3", - "clutter/icespec4", - "clutter/icespec5" + "ice-spikes/ice-spec-1", + "ice-spikes/ice-spec-2", + "ice-spikes/ice-spec-3", + "ice-spikes/ice-spec-4", + "ice-spikes/ice-spec-5" ], "translate": { "x": 0, @@ -180,6 +179,20 @@ } } ], + "entityInitialSpawns": [ + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "biomeZoom": 30, "biomeStyle": {"style": "IRIS"}, "decorators": [{ diff --git a/biomes/frozen/fzn-spruce-hills.json b/biomes/frozen/fzn-spruce-hills.json index 833b135d..401d696f 100644 --- a/biomes/frozen/fzn-spruce-hills.json +++ b/biomes/frozen/fzn-spruce-hills.json @@ -36,7 +36,6 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", - "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" @@ -93,11 +92,11 @@ } ], "place": [ - "trees/spruce/levergreen1", - "trees/spruce/levergreen1", - "trees/spruce/mevergreen1", - "trees/spruce/mevergreen2", - "trees/spruce/mevergreen3" + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_medium1", + "evergreen/fantasy_evergreen_medium2", + "evergreen/fantasy_evergreen_medium3" ], "translate": { "x": 0, @@ -108,5 +107,11 @@ "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} - ]} + ]}, + "entityInitialSpawns": [{ + "entity": "polar-bear", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 7 + }] } diff --git a/biomes/frozen/fzn-spruce-plains.json b/biomes/frozen/fzn-spruce-plains.json index 060c160c..9fa9a63f 100644 --- a/biomes/frozen/fzn-spruce-plains.json +++ b/biomes/frozen/fzn-spruce-plains.json @@ -37,7 +37,6 @@ "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "downfallType": "snow", - "temperature": -3, "fogColor": "#A6D1FF", "grassColor": "#D0E1FF" }], @@ -101,11 +100,11 @@ } ], "place": [ - "trees/spruce/levergreen1", - "trees/spruce/levergreen1", - "trees/spruce/mevergreen1", - "trees/spruce/mevergreen2", - "trees/spruce/mevergreen3" + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_medium1", + "evergreen/fantasy_evergreen_medium2", + "evergreen/fantasy_evergreen_medium3" ], "translate": { "x": 0, @@ -116,5 +115,11 @@ "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} - ]} + ]}, + "entityInitialSpawns": [{ + "entity": "polar-bear", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 7 + }] } diff --git a/biomes/frozen/fzn-vander.json b/biomes/frozen/fzn-vander.json index d96ebbe4..c723a61d 100644 --- a/biomes/frozen/fzn-vander.json +++ b/biomes/frozen/fzn-vander.json @@ -36,7 +36,6 @@ "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "downfallType": "snow", - "temperature": -3, "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" }], @@ -177,18 +176,18 @@ "enabled": true }, "place": [ - "frosted-trees/sproak/generic1", - "frosted-trees/sproak/generic2", - "frosted-trees/sproak/generic3", - "frosted-trees/sproak/generic4", - "frosted-trees/sproak/generic5", - "frosted-trees/sproak/generic7", - "frosted-trees/sproak/generic8", - "frosted-trees/sproak/generic9", - "frosted-trees/sproak/generic10", - "frosted-trees/sproak/generic11", - "frosted-trees/sproak/generic12", - "frosted-trees/sproak/generic13" + "frosted-sproak/med-1", + "frosted-sproak/med-2", + "frosted-sproak/med-3", + "frosted-sproak/med-4", + "frosted-sproak/med-5", + "frosted-sproak/med-7", + "frosted-sproak/med-8", + "frosted-sproak/med-9", + "frosted-sproak/med-10", + "frosted-sproak/med-11", + "frosted-sproak/med-12", + "frosted-sproak/med-13" ], "translate": { "x": 0, @@ -211,16 +210,16 @@ "enabled": true }, "place": [ - "clutter/singleicespike1", - "clutter/singleicespike2", - "clutter/singleicespike3", - "clutter/singleicespike4", - "clutter/singleicespike5", - "clutter/icespec1", - "clutter/icespec2", - "clutter/icespec3", - "clutter/icespec4", - "clutter/icespec5" + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5", + "ice-spikes/ice-spec-1", + "ice-spikes/ice-spec-2", + "ice-spikes/ice-spec-3", + "ice-spikes/ice-spec-4", + "ice-spikes/ice-spec-5" ], "translate": { "x": 0, @@ -229,6 +228,20 @@ } } ], + "entityInitialSpawns": [ + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "biomeZoom": 50, "biomeStyle": {"style": "IRIS"}, "childShrinkFactor": 20, diff --git a/biomes/hot/hot-desert-dunes-red.json b/biomes/hot/hot-desert-dunes-red.json index 82f84f43..9e9c7c41 100644 --- a/biomes/hot/hot-desert-dunes-red.json +++ b/biomes/hot/hot-desert-dunes-red.json @@ -48,9 +48,9 @@ "chance": 0.001, "density": 3, "place": [ - "clutter/clutter/desertpost1", - "clutter/clutter/desertpost2", - "clutter/clutter/desertpost3" + "clutter/desert-post1", + "clutter/desert-post2", + "clutter/desert-post3" ] }, { diff --git a/biomes/hot/hot-desert-dunes.json b/biomes/hot/hot-desert-dunes.json index 8bbf5c13..bb1f0a33 100644 --- a/biomes/hot/hot-desert-dunes.json +++ b/biomes/hot/hot-desert-dunes.json @@ -48,9 +48,9 @@ "chance": 0.001, "density": 3, "place": [ - "clutter/clutter/desertpost1", - "clutter/clutter/desertpost2", - "clutter/clutter/desertpost3" + "clutter/desert-post1", + "clutter/desert-post2", + "clutter/desert-post3" ] }, { diff --git a/biomes/hot/sav-acacia-denmyre.json b/biomes/hot/sav-acacia-denmyre.json index 8bce2e5e..df139160 100644 --- a/biomes/hot/sav-acacia-denmyre.json +++ b/biomes/hot/sav-acacia-denmyre.json @@ -149,7 +149,20 @@ "z": 0 } }], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "wall": { "style": {"style": "STATIC"}, "palette": [ diff --git a/biomes/hot/sav-beach.json b/biomes/hot/sav-beach.json index b41ece4e..38010ce2 100644 --- a/biomes/hot/sav-beach.json +++ b/biomes/hot/sav-beach.json @@ -41,6 +41,32 @@ ] } ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "chance": 0.001, @@ -54,13 +80,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, @@ -80,10 +106,10 @@ "enabled": true }, "place": [ - "clutter/literalgarbage1", - "clutter/literalgarbage2", - "clutter/literalgarbage3", - "clutter/literalgarbage4" + "garbage/clutter-1", + "garbage/clutter-2", + "garbage/clutter-3", + "garbage/clutter-4" ], "translate": { "x": 0, diff --git a/biomes/hot/sav-cliff.json b/biomes/hot/sav-cliff.json index 9b0ad7ff..5e26a902 100644 --- a/biomes/hot/sav-cliff.json +++ b/biomes/hot/sav-cliff.json @@ -103,7 +103,20 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "objects": [ { "chance": 0.07, @@ -202,14 +215,14 @@ "enabled": true }, "place": [ - "clutter/savrock1", - "clutter/savrock2", - "clutter/savrock3", - "clutter/savrock4", - "clutter/savrock5", - "clutter/savrock6", - "clutter/savrock7", - "clutter/savrock8" + "savanna-rock/SavanaRock1", + "savanna-rock/SavanaRock2", + "savanna-rock/SavanaRock3", + "savanna-rock/SavanaRock4", + "savanna-rock/SavanaRock5", + "savanna-rock/SavanaRock6", + "savanna-rock/SavanaRock7", + "savanna-rock/SavanaRock8" ], "translate": { "x": 0, diff --git a/biomes/hot/sav-forest.json b/biomes/hot/sav-forest.json index db71531d..d8946798 100644 --- a/biomes/hot/sav-forest.json +++ b/biomes/hot/sav-forest.json @@ -142,7 +142,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, @@ -161,9 +161,9 @@ "enabled": true }, "place": [ - "clutter/hay1", - "clutter/hay3", - "clutter/hay2" + "haybale/hay1", + "haybale/hay3", + "haybale/hay2" ], "translate": { "x": 0, @@ -197,12 +197,12 @@ "enabled": true }, "place": [ - "trees/oak/dadwood1", - "trees/oak/dadwood2", - "trees/oak/dadwood3", - "trees/oak/dadwood4", - "trees/oak/dadwood5", - "trees/oak/dadwood6" + "deadwood/dadwood1", + "deadwood/dadwood2", + "deadwood/dadwood3", + "deadwood/dadwood4", + "deadwood/dadwood5", + "deadwood/dadwood6" ], "translate": { "x": 0, @@ -222,9 +222,9 @@ "enabled": true }, "place": [ - "clutter/hay1", - "clutter/hay3", - "clutter/hay2" + "haybale/hay1", + "haybale/hay3", + "haybale/hay2" ], "translate": { "x": 0, @@ -244,11 +244,11 @@ "enabled": true }, "place": [ - "clutter/oakclutt1", - "clutter/oakclutt2", - "clutter/oakclutt3", - "clutter/oakclutt4", - "clutter/oakclutt5" + "clutter/oak-clutt-1", + "clutter/oak-clutt-2", + "clutter/oak-clutt-3", + "clutter/oak-clutt-4", + "clutter/oak-clutt-5" ], "translate": { "x": 0, @@ -257,7 +257,20 @@ } } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "biomeZoom": 20, "biomeStyle": {"style": "IRIS"}, "wall": { diff --git a/biomes/hot/sav-plateau.json b/biomes/hot/sav-plateau.json index 27562262..0a55e2ae 100644 --- a/biomes/hot/sav-plateau.json +++ b/biomes/hot/sav-plateau.json @@ -67,7 +67,20 @@ "DESERT", "SAVANNA" ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.001, @@ -111,7 +124,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -130,7 +143,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, @@ -234,14 +247,14 @@ "enabled": true }, "place": [ - "clutter/savrock1", - "clutter/savrock2", - "clutter/savrock3", - "clutter/savrock4", - "clutter/savrock5", - "clutter/savrock6", - "clutter/savrock7", - "clutter/savrock8" + "savanna-rock/SavanaRock1", + "savanna-rock/SavanaRock2", + "savanna-rock/SavanaRock3", + "savanna-rock/SavanaRock4", + "savanna-rock/SavanaRock5", + "savanna-rock/SavanaRock6", + "savanna-rock/SavanaRock7", + "savanna-rock/SavanaRock8" ], "translate": { "x": 0, diff --git a/biomes/hot/sav-savanna.json b/biomes/hot/sav-savanna.json index e46754ce..caf1d4d7 100644 --- a/biomes/hot/sav-savanna.json +++ b/biomes/hot/sav-savanna.json @@ -75,7 +75,20 @@ "DESERT", "SAVANNA" ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.001, @@ -119,7 +132,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -138,7 +151,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, @@ -242,14 +255,14 @@ "enabled": true }, "place": [ - "clutter/savrock1", - "clutter/savrock2", - "clutter/savrock3", - "clutter/savrock4", - "clutter/savrock5", - "clutter/savrock6", - "clutter/savrock7", - "clutter/savrock8" + "savanna-rock/SavanaRock1", + "savanna-rock/SavanaRock2", + "savanna-rock/SavanaRock3", + "savanna-rock/SavanaRock4", + "savanna-rock/SavanaRock5", + "savanna-rock/SavanaRock6", + "savanna-rock/SavanaRock7", + "savanna-rock/SavanaRock8" ], "translate": { "x": 0, diff --git a/biomes/hot/msa-beach.json b/biomes/mesa/msa-beach.json similarity index 100% rename from biomes/hot/msa-beach.json rename to biomes/mesa/msa-beach.json diff --git a/biomes/hot/msa-blue.json b/biomes/mesa/msa-blue.json similarity index 90% rename from biomes/hot/msa-blue.json rename to biomes/mesa/msa-blue.json index 368df825..edcf379c 100644 --- a/biomes/hot/msa-blue.json +++ b/biomes/mesa/msa-blue.json @@ -79,8 +79,8 @@ "name": "standard-surface-portals", "chance": 0.00505, "place": [ - "clutter/swordnp2", - "clutter/swordnp1", + "global-clutter/BigSwordPortal-unlit-1", + "global-clutter/BigSwordPortal-lit-1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", @@ -120,7 +120,20 @@ "mode": "VACUUM", "carvingSupport": "SURFACE_ONLY" }], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "lockLayers": true, "wall": { "style": {"style": "IRIS"}, diff --git a/biomes/hot/msa-cliffs.json b/biomes/mesa/msa-cliffs.json similarity index 89% rename from biomes/hot/msa-cliffs.json rename to biomes/mesa/msa-cliffs.json index d0a246e7..846b5b7a 100644 --- a/biomes/hot/msa-cliffs.json +++ b/biomes/mesa/msa-cliffs.json @@ -87,7 +87,20 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "lockLayers": true, "wall": { "style": {"style": "IRIS"}, diff --git a/biomes/hot/msa-dark.json b/biomes/mesa/msa-dark.json similarity index 89% rename from biomes/hot/msa-dark.json rename to biomes/mesa/msa-dark.json index 4aa60cb5..839bfccc 100644 --- a/biomes/hot/msa-dark.json +++ b/biomes/mesa/msa-dark.json @@ -5,10 +5,10 @@ "derivative": "SHATTERED_SAVANNA", "vanillaDerivative": "ERODED_BADLANDS", "children": [ - "hot/msa-cliffs", - "hot/msa-red", - "hot/msa-green", - "hot/msa-blue" + "mesa/msa-cliffs", + "mesa/msa-red", + "mesa/msa-green", + "mesa/msa-blue" ], "generators": [ { @@ -97,8 +97,8 @@ "name": "standard-surface-portals", "chance": 0.00505, "place": [ - "clutter/swordnp2", - "clutter/swordnp1", + "global-clutter/BigSwordPortal-unlit-1", + "global-clutter/BigSwordPortal-lit-1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", @@ -138,7 +138,20 @@ "mode": "VACUUM", "carvingSupport": "SURFACE_ONLY" }], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "childShrinkFactor": 0.35, "lockLayers": true, "wall": { diff --git a/biomes/hot/msa-green.json b/biomes/mesa/msa-green.json similarity index 90% rename from biomes/hot/msa-green.json rename to biomes/mesa/msa-green.json index bb32547c..df5879bd 100644 --- a/biomes/hot/msa-green.json +++ b/biomes/mesa/msa-green.json @@ -79,8 +79,8 @@ "name": "standard-surface-portals", "chance": 0.00505, "place": [ - "clutter/swordnp2", - "clutter/swordnp1", + "global-clutter/BigSwordPortal-unlit-1", + "global-clutter/BigSwordPortal-lit-1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", @@ -120,7 +120,20 @@ "mode": "VACUUM", "carvingSupport": "SURFACE_ONLY" }], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "lockLayers": true, "wall": { "style": {"style": "IRIS"}, diff --git a/biomes/hot/msa-mesa.json b/biomes/mesa/msa-mesa.json similarity index 95% rename from biomes/hot/msa-mesa.json rename to biomes/mesa/msa-mesa.json index e40211e6..e961b17a 100644 --- a/biomes/hot/msa-mesa.json +++ b/biomes/mesa/msa-mesa.json @@ -10,14 +10,14 @@ "ERODED_BADLANDS" ], "children": [ - "hot/msa-valleys", - "hot/msa-red", - "hot/msa-blue", - "hot/msa-dark", - "hot/msa-green", - "hot/msa-red", - "hot/msa-yellow", - "hot/msa-blue" + "mesa/msa-valleys", + "mesa/msa-red", + "mesa/msa-blue", + "mesa/msa-dark", + "mesa/msa-green", + "mesa/msa-red", + "mesa/msa-yellow", + "mesa/msa-blue" ], "generators": [{ "min": 25, diff --git a/biomes/hot/msa-plateau-dirt-high.json b/biomes/mesa/msa-plateau-dirt-high.json similarity index 100% rename from biomes/hot/msa-plateau-dirt-high.json rename to biomes/mesa/msa-plateau-dirt-high.json diff --git a/biomes/hot/msa-plateau-dirt.json b/biomes/mesa/msa-plateau-dirt.json similarity index 83% rename from biomes/hot/msa-plateau-dirt.json rename to biomes/mesa/msa-plateau-dirt.json index 01076e02..20c78a05 100644 --- a/biomes/hot/msa-plateau-dirt.json +++ b/biomes/mesa/msa-plateau-dirt.json @@ -72,6 +72,32 @@ }], "lockLayers": true, "biomeStyle": {"style": "IRIS"}, + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "place": [ diff --git a/biomes/hot/msa-plateau-high.json b/biomes/mesa/msa-plateau-high.json similarity index 98% rename from biomes/hot/msa-plateau-high.json rename to biomes/mesa/msa-plateau-high.json index eea354e2..9d626589 100644 --- a/biomes/hot/msa-plateau-high.json +++ b/biomes/mesa/msa-plateau-high.json @@ -9,7 +9,7 @@ "BADLANDS_PLATEAU", "ERODED_BADLANDS" ], - "children": ["hot/msa-plateau-dirt-high"], + "children": ["mesa/msa-plateau-dirt-high"], "generators": [ { "min": 55, diff --git a/biomes/hot/msa-plateau.json b/biomes/mesa/msa-plateau.json similarity index 99% rename from biomes/hot/msa-plateau.json rename to biomes/mesa/msa-plateau.json index ec3cb1a9..97ce71fb 100644 --- a/biomes/hot/msa-plateau.json +++ b/biomes/mesa/msa-plateau.json @@ -9,7 +9,7 @@ "BADLANDS_PLATEAU", "ERODED_BADLANDS" ], - "children": ["hot/msa-plateau-dirt"], + "children": ["mesa/msa-plateau-dirt"], "generators": [ { "min": 35, diff --git a/biomes/hot/msa-red.json b/biomes/mesa/msa-red.json similarity index 91% rename from biomes/hot/msa-red.json rename to biomes/mesa/msa-red.json index 82260047..f2aab863 100644 --- a/biomes/hot/msa-red.json +++ b/biomes/mesa/msa-red.json @@ -85,8 +85,8 @@ "name": "standard-surface-portals", "chance": 0.00505, "place": [ - "clutter/swordnp2", - "clutter/swordnp1", + "global-clutter/BigSwordPortal-unlit-1", + "global-clutter/BigSwordPortal-lit-1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", @@ -126,7 +126,20 @@ "mode": "VACUUM", "carvingSupport": "SURFACE_ONLY" }], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "lockLayers": true, "wall": { "style": {"style": "IRIS"}, diff --git a/biomes/hot/msa-valleys.json b/biomes/mesa/msa-valleys.json similarity index 92% rename from biomes/hot/msa-valleys.json rename to biomes/mesa/msa-valleys.json index a53915da..d61d67c9 100644 --- a/biomes/hot/msa-valleys.json +++ b/biomes/mesa/msa-valleys.json @@ -107,6 +107,32 @@ "palette": [{"block": "terracotta"}] } ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + } + ], "decorators": [ { "chance": 0.189, @@ -171,7 +197,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -190,7 +216,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, diff --git a/biomes/hot/msa-yellow.json b/biomes/mesa/msa-yellow.json similarity index 89% rename from biomes/hot/msa-yellow.json rename to biomes/mesa/msa-yellow.json index 438caac9..331b55bb 100644 --- a/biomes/hot/msa-yellow.json +++ b/biomes/mesa/msa-yellow.json @@ -4,7 +4,7 @@ "rarity": 1, "color": "#BDBF05", "vanillaDerivative": "BADLANDS", - "children": ["hot/msa-dark"], + "children": ["mesa/msa-dark"], "generators": [ { "min": 9, @@ -100,7 +100,20 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "objects": [{ "rotation": { "yAxis": { @@ -113,7 +126,7 @@ }, "chance": 0.1, "translate": {"y": -2}, - "place": ["clutter/tntower1"] + "place": ["misc/tntower-1"] }], "lockLayers": true, "wall": { diff --git a/biomes/mountain/mtn-beach.json b/biomes/mountain/mtn-beach.json index 9a67bd71..94676aee 100644 --- a/biomes/mountain/mtn-beach.json +++ b/biomes/mountain/mtn-beach.json @@ -36,7 +36,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, diff --git a/biomes/mountain/mtn-forest-hills.json b/biomes/mountain/mtn-forest-hills.json index a3dc0f44..8cd332a5 100644 --- a/biomes/mountain/mtn-forest-hills.json +++ b/biomes/mountain/mtn-forest-hills.json @@ -74,7 +74,26 @@ "palette": [{"block": "dirt"}] } ], - + "entityInitialSpawns": [ + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "fox", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"}, @@ -147,63 +166,63 @@ "mode": "PAINT", "chance": 0.1, "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ] }, { "mode": "PAINT", "chance": 0.1, "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ] }, { "mode": "PAINT", "chance": 0.1, "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ] }, { "place": [ - "trees/spruce/vgeneric1", - "trees/spruce/vgeneric2", - "trees/spruce/vgeneric3", - "trees/spruce/vgeneric4", - "trees/spruce/vgeneric5", - "trees/spruce/vgeneric6", - "trees/spruce/vgeneric7", - "trees/spruce/vgeneric8", - "trees/spruce/vgeneric9", - "trees/spruce/vgeneric10", - "trees/spruce/vgeneric11", - "trees/spruce/vgeneric12", - "trees/spruce/vgeneric13", - "trees/spruce/vgeneric14", - "trees/spruce/vgeneric15", - "trees/spruce/vgeneric16", - "trees/spruce/vgeneric17", - "trees/spruce/vgeneric18", - "trees/spruce/vgeneric19", - "trees/spruce/vgeneric20", - "trees/spruce/vgeneric21", - "trees/spruce/vgeneric22", - "trees/spruce/vgeneric23", - "trees/spruce/vgeneric24", - "trees/spruce/vgeneric25", - "trees/spruce/vgeneric26", - "trees/spruce/vgeneric27", - "trees/spruce/vgeneric28", - "trees/spruce/vgeneric29", - "trees/spruce/vgeneric30", - "trees/spruce/vgeneric31", - "trees/spruce/vgeneric32" + "spruce-medium/spruce1", + "spruce-medium/spruce2", + "spruce-medium/spruce3", + "spruce-medium/spruce4", + "spruce-medium/spruce5", + "spruce-medium/spruce6", + "spruce-medium/spruce7", + "spruce-medium/spruce8", + "spruce-medium/spruce9", + "spruce-medium/spruce10", + "spruce-medium/spruce11", + "spruce-medium/spruce12", + "spruce-medium/spruce13", + "spruce-medium/spruce14", + "spruce-medium/spruce16", + "spruce-medium/spruce17", + "spruce-medium/spruce18", + "spruce-medium/spruce19", + "spruce-medium/spruce20", + "spruce-medium/spruce27", + "spruce-medium/spruce28", + "spruce-medium/spruce29", + "spruce-medium/spruce30", + "spruce-medium/spruce31", + "spruce-medium/spruce32", + "spruce-medium/spruce33", + "spruce-medium/spruce34", + "spruce-medium/spruce37", + "spruce-medium/spruce39", + "spruce-medium/spruce41", + "spruce-medium/spruce42", + "spruce-medium/spruce43" ], "edit": [{ "find": [ diff --git a/biomes/mountain/mtn-forest.json b/biomes/mountain/mtn-forest.json index 04f1ffec..2fdfd5ae 100644 --- a/biomes/mountain/mtn-forest.json +++ b/biomes/mountain/mtn-forest.json @@ -74,6 +74,26 @@ "palette": [{"block": "dirt"}] } ], + "entityInitialSpawns": [ + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "fox", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"}, @@ -146,63 +166,63 @@ "mode": "PAINT", "chance": 0.1, "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ] }, { "mode": "PAINT", "chance": 0.1, "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ] }, { "mode": "PAINT", "chance": 0.1, "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ] }, { "place": [ - "trees/spruce/vgeneric1", - "trees/spruce/vgeneric2", - "trees/spruce/vgeneric3", - "trees/spruce/vgeneric4", - "trees/spruce/vgeneric5", - "trees/spruce/vgeneric6", - "trees/spruce/vgeneric7", - "trees/spruce/vgeneric8", - "trees/spruce/vgeneric9", - "trees/spruce/vgeneric10", - "trees/spruce/vgeneric11", - "trees/spruce/vgeneric12", - "trees/spruce/vgeneric13", - "trees/spruce/vgeneric14", - "trees/spruce/vgeneric15", - "trees/spruce/vgeneric16", - "trees/spruce/vgeneric17", - "trees/spruce/vgeneric18", - "trees/spruce/vgeneric19", - "trees/spruce/vgeneric20", - "trees/spruce/vgeneric21", - "trees/spruce/vgeneric22", - "trees/spruce/vgeneric23", - "trees/spruce/vgeneric24", - "trees/spruce/vgeneric25", - "trees/spruce/vgeneric26", - "trees/spruce/vgeneric27", - "trees/spruce/vgeneric28", - "trees/spruce/vgeneric29", - "trees/spruce/vgeneric30", - "trees/spruce/vgeneric31", - "trees/spruce/vgeneric32" + "spruce-medium/spruce1", + "spruce-medium/spruce2", + "spruce-medium/spruce3", + "spruce-medium/spruce4", + "spruce-medium/spruce5", + "spruce-medium/spruce6", + "spruce-medium/spruce7", + "spruce-medium/spruce8", + "spruce-medium/spruce9", + "spruce-medium/spruce10", + "spruce-medium/spruce11", + "spruce-medium/spruce12", + "spruce-medium/spruce13", + "spruce-medium/spruce14", + "spruce-medium/spruce16", + "spruce-medium/spruce17", + "spruce-medium/spruce18", + "spruce-medium/spruce19", + "spruce-medium/spruce20", + "spruce-medium/spruce27", + "spruce-medium/spruce28", + "spruce-medium/spruce29", + "spruce-medium/spruce30", + "spruce-medium/spruce31", + "spruce-medium/spruce32", + "spruce-medium/spruce33", + "spruce-medium/spruce34", + "spruce-medium/spruce37", + "spruce-medium/spruce39", + "spruce-medium/spruce41", + "spruce-medium/spruce42", + "spruce-medium/spruce43" ], "edit": [{ "find": [ diff --git a/biomes/mountain/mtn-hills.json b/biomes/mountain/mtn-hills.json index 54c50b22..13f2cf46 100644 --- a/biomes/mountain/mtn-hills.json +++ b/biomes/mountain/mtn-hills.json @@ -145,23 +145,49 @@ }] } ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "mode": "PAINT", "chance": 0.1, "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ] }, { "mode": "PAINT", "chance": 0.1, "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ] }, { @@ -187,19 +213,19 @@ "mode": "PAINT", "chance": 0.1, "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ] }, { "mode": "PAINT", "place": [ - "objects/structures/mlandstone1", - "objects/structures/mlandstone2", - "objects/structures/mlandstone3", - "objects/structures/mlandstone4", - "objects/structures/mlandstone5" + "mrock/mrock-1", + "mrock/mrock-2", + "mrock/mrock-3", + "mrock/mrock-4", + "mrock/mrock-5" ], "chance": 0.04, "rotation": { diff --git a/biomes/mountain/mtn-plain-hills.json b/biomes/mountain/mtn-plain-hills.json index 11e6f3b5..6d7e7265 100644 --- a/biomes/mountain/mtn-plain-hills.json +++ b/biomes/mountain/mtn-plain-hills.json @@ -114,11 +114,11 @@ }, { "place": [ - "objects/structures/landstone1", - "objects/structures/landstone2", - "objects/structures/landstone3", - "objects/structures/landstone4", - "objects/structures/landstone5" + "landform/stone/1", + "landform/stone/2", + "landform/stone/3", + "landform/stone/4", + "landform/stone/5" ], "chance": 0.02, "mode": "MIN_HEIGHT", diff --git a/biomes/mountain/mtn-plains.json b/biomes/mountain/mtn-plains.json index 7ac058cb..e98f0355 100644 --- a/biomes/mountain/mtn-plains.json +++ b/biomes/mountain/mtn-plains.json @@ -152,24 +152,49 @@ }] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "mode": "PAINT", "chance": 0.1, "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ] }, { "mode": "PAINT", "chance": 0.1, "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ] }, { @@ -195,19 +220,19 @@ "mode": "PAINT", "chance": 0.1, "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ] }, { "mode": "PAINT", "place": [ - "objects/structures/mlandstone1", - "objects/structures/mlandstone2", - "objects/structures/mlandstone3", - "objects/structures/mlandstone4", - "objects/structures/mlandstone5" + "mrock/mrock-1", + "mrock/mrock-2", + "mrock/mrock-3", + "mrock/mrock-4", + "mrock/mrock-5" ], "chance": 0.04, "rotation": { diff --git a/biomes/mushroom/mus-beach.json b/biomes/mushroom/mus-beach.json index 9791a048..c57bd324 100644 --- a/biomes/mushroom/mus-beach.json +++ b/biomes/mushroom/mus-beach.json @@ -36,8 +36,8 @@ "name": "standard-surface-portals", "chance": 0.00505, "place": [ - "clutter/swordnp2", - "clutter/swordnp1", + "global-clutter/BigSwordPortal-unlit-1", + "global-clutter/BigSwordPortal-lit-1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/biomes/mushroom/mus-crimson-forest.json b/biomes/mushroom/mus-crimson-forest.json index 7b4c820d..bef3a3d6 100644 --- a/biomes/mushroom/mus-crimson-forest.json +++ b/biomes/mushroom/mus-crimson-forest.json @@ -98,16 +98,16 @@ "enabled": true }, "place": [ - "trees/mushroom/mushclut1", - "trees/mushroom/mushclut2", - "trees/mushroom/mushclut3", - "trees/mushroom/mushclut4", - "trees/mushroom/mushclut5", - "trees/mushroom/mushclut6", - "trees/mushroom/mushclut7", - "trees/mushroom/mushclut8", - "trees/mushroom/mushclut9", - "trees/mushroom/mushclut10" + "mushroom-red/small-organell-r-1", + "mushroom-red/small-organell-r-2", + "mushroom-red/small-organell-r-3", + "mushroom-red/small-organell-r-4", + "mushroom-red/small-organell-r-5", + "mushroom-red/small-organell-r-6", + "mushroom-red/small-organell-r-7", + "mushroom-red/small-organell-r-8", + "mushroom-red/small-organell-r-9", + "mushroom-red/small-organell-r-10" ], "mode": "VACUUM", "translate": { @@ -139,16 +139,16 @@ "enabled": true }, "place": [ - "trees/mushroom/mushclut1", - "trees/mushroom/mushclut2", - "trees/mushroom/mushclut3", - "trees/mushroom/mushclut4", - "trees/mushroom/mushclut5", - "trees/mushroom/mushclut6", - "trees/mushroom/mushclut7", - "trees/mushroom/mushclut8", - "trees/mushroom/mushclut9", - "trees/mushroom/mushclut10" + "mushroom-red/small-organell-r-1", + "mushroom-red/small-organell-r-2", + "mushroom-red/small-organell-r-3", + "mushroom-red/small-organell-r-4", + "mushroom-red/small-organell-r-5", + "mushroom-red/small-organell-r-6", + "mushroom-red/small-organell-r-7", + "mushroom-red/small-organell-r-8", + "mushroom-red/small-organell-r-9", + "mushroom-red/small-organell-r-10" ], "translate": { "x": 0, @@ -179,18 +179,18 @@ "enabled": true }, "place": [ - "trees/mushroom/redgeneric1", - "trees/mushroom/redgeneric2", - "trees/mushroom/browngeneric1", - "trees/mushroom/browngeneric2", - "trees/mushroom/redgeneric3", - "trees/mushroom/redgeneric4", - "trees/mushroom/redgeneric5", - "trees/mushroom/redgeneric6", - "trees/mushroom/redgeneric7", - "trees/mushroom/redgeneric8", - "trees/mushroom/redgeneric9", - "trees/mushroom/redgeneric10" + "mushroom-red/organell-r-1", + "mushroom-red/organell-r-2", + "mushroom-red/organell-b-1", + "mushroom-red/organell-b-2", + "mushroom-red/organell-r-3", + "mushroom-red/organell-r-4", + "mushroom-red/organell-r-5", + "mushroom-red/organell-r-6", + "mushroom-red/organell-r-7", + "mushroom-red/organell-r-8", + "mushroom-red/organell-r-9", + "mushroom-red/organell-r-10" ], "translate": { "x": 0, @@ -221,18 +221,18 @@ "enabled": true }, "place": [ - "trees/mushroom/redgeneric1", - "trees/mushroom/redgeneric2", - "trees/mushroom/browngeneric1", - "trees/mushroom/browngeneric2", - "trees/mushroom/redgeneric3", - "trees/mushroom/redgeneric4", - "trees/mushroom/redgeneric5", - "trees/mushroom/redgeneric6", - "trees/mushroom/redgeneric7", - "trees/mushroom/redgeneric8", - "trees/mushroom/redgeneric9", - "trees/mushroom/redgeneric10" + "mushroom-red/organell-r-1", + "mushroom-red/organell-r-2", + "mushroom-red/organell-b-1", + "mushroom-red/organell-b-2", + "mushroom-red/organell-r-3", + "mushroom-red/organell-r-4", + "mushroom-red/organell-r-5", + "mushroom-red/organell-r-6", + "mushroom-red/organell-r-7", + "mushroom-red/organell-r-8", + "mushroom-red/organell-r-9", + "mushroom-red/organell-r-10" ], "translate": { "x": 0, @@ -263,11 +263,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "shroom/mushclutt1", + "shroom/mushclutt2", + "shroom/mushclutt3", + "shroom/mushclutt4", + "shroom/mushclutt5" ], "translate": { "x": 0, @@ -298,11 +298,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "shroom/mushclutt1", + "shroom/mushclutt2", + "shroom/mushclutt3", + "shroom/mushclutt4", + "shroom/mushclutt5" ], "translate": { "x": 0, diff --git a/biomes/mushroom/mus-forest-hills.json b/biomes/mushroom/mus-forest-hills.json index efe9fb63..dab1ac94 100644 --- a/biomes/mushroom/mus-forest-hills.json +++ b/biomes/mushroom/mus-forest-hills.json @@ -90,7 +90,12 @@ ] } ], - + "entityInitialSpawns": [{ + "maxSpawns": 5, + "minSpawns": 2, + "entity": "mooshroom", + "rarity": 5 + }], "decorators": [ { "chance": 0.009, @@ -141,16 +146,16 @@ "enabled": true }, "place": [ - "trees/mushroom/mushclut1", - "trees/mushroom/mushclut2", - "trees/mushroom/mushclut3", - "trees/mushroom/mushclut4", - "trees/mushroom/mushclut5", - "trees/mushroom/mushclut6", - "trees/mushroom/mushclut7", - "trees/mushroom/mushclut8", - "trees/mushroom/mushclut9", - "trees/mushroom/mushclut10" + "mushroom-red/small-organell-r-1", + "mushroom-red/small-organell-r-2", + "mushroom-red/small-organell-r-3", + "mushroom-red/small-organell-r-4", + "mushroom-red/small-organell-r-5", + "mushroom-red/small-organell-r-6", + "mushroom-red/small-organell-r-7", + "mushroom-red/small-organell-r-8", + "mushroom-red/small-organell-r-9", + "mushroom-red/small-organell-r-10" ], "mode": "MIN_HEIGHT", "translate": { @@ -176,16 +181,16 @@ "enabled": true }, "place": [ - "trees/mushroom/mushclut1", - "trees/mushroom/mushclut2", - "trees/mushroom/mushclut3", - "trees/mushroom/mushclut4", - "trees/mushroom/mushclut5", - "trees/mushroom/mushclut6", - "trees/mushroom/mushclut7", - "trees/mushroom/mushclut8", - "trees/mushroom/mushclut9", - "trees/mushroom/mushclut10" + "mushroom-red/small-organell-r-1", + "mushroom-red/small-organell-r-2", + "mushroom-red/small-organell-r-3", + "mushroom-red/small-organell-r-4", + "mushroom-red/small-organell-r-5", + "mushroom-red/small-organell-r-6", + "mushroom-red/small-organell-r-7", + "mushroom-red/small-organell-r-8", + "mushroom-red/small-organell-r-9", + "mushroom-red/small-organell-r-10" ], "translate": { "x": 0, @@ -206,17 +211,17 @@ "enabled": true }, "place": [ - "trees/mushroom/browngeneric1", - "trees/mushroom/browngeneric2", - "trees/mushroom/redgeneric3", - "trees/mushroom/redgeneric4", - "trees/mushroom/redgeneric5", - "trees/mushroom/redgeneric6", - "trees/mushroom/redgeneric7", - "trees/mushroom/redgeneric8", - "trees/mushroom/redgeneric9", - "trees/mushroom/redgeneric10", - "trees/mushroom/redgeneric11" + "mushroom-red/organell-b-1", + "mushroom-red/organell-b-2", + "mushroom-red/organell-r-3", + "mushroom-red/organell-r-4", + "mushroom-red/organell-r-5", + "mushroom-red/organell-r-6", + "mushroom-red/organell-r-7", + "mushroom-red/organell-r-8", + "mushroom-red/organell-r-9", + "mushroom-red/organell-r-10", + "mushroom-red/organell-r-11" ], "translate": { "x": 0, @@ -241,17 +246,17 @@ "enabled": true }, "place": [ - "trees/mushroom/redlumotall1", - "trees/mushroom/redlumotall2", - "trees/mushroom/redlumotall3", - "trees/mushroom/redlumotall4", - "trees/mushroom/redlumotall5", - "trees/mushroom/redlumotall6", - "trees/mushroom/redlumotall7", - "trees/mushroom/redlumotall8", - "trees/mushroom/redlumotall9", - "trees/mushroom/redlumotall10", - "trees/mushroom/redlumotall11" + "mushroom-red/illuminorganell-r-1", + "mushroom-red/illuminorganell-r-2", + "mushroom-red/illuminorganell-r-3", + "mushroom-red/illuminorganell-r-4", + "mushroom-red/illuminorganell-r-5", + "mushroom-red/illuminorganell-r-6", + "mushroom-red/illuminorganell-r-7", + "mushroom-red/illuminorganell-r-8", + "mushroom-red/illuminorganell-r-9", + "mushroom-red/illuminorganell-r-10", + "mushroom-red/illuminorganell-r-11" ], "translate": { "x": 0, @@ -276,17 +281,17 @@ "enabled": true }, "place": [ - "trees/mushroom/browngeneric1", - "trees/mushroom/browngeneric2", - "trees/mushroom/redgeneric3", - "trees/mushroom/redgeneric4", - "trees/mushroom/redgeneric5", - "trees/mushroom/redgeneric6", - "trees/mushroom/redgeneric7", - "trees/mushroom/redgeneric8", - "trees/mushroom/redgeneric9", - "trees/mushroom/redgeneric10", - "trees/mushroom/redgeneric11" + "mushroom-red/organell-b-1", + "mushroom-red/organell-b-2", + "mushroom-red/organell-r-3", + "mushroom-red/organell-r-4", + "mushroom-red/organell-r-5", + "mushroom-red/organell-r-6", + "mushroom-red/organell-r-7", + "mushroom-red/organell-r-8", + "mushroom-red/organell-r-9", + "mushroom-red/organell-r-10", + "mushroom-red/organell-r-11" ], "translate": { "x": 0, @@ -311,11 +316,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "shroom/mushclutt1", + "shroom/mushclutt2", + "shroom/mushclutt3", + "shroom/mushclutt4", + "shroom/mushclutt5" ], "translate": { "x": 0, @@ -336,11 +341,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "shroom/mushclutt1", + "shroom/mushclutt2", + "shroom/mushclutt3", + "shroom/mushclutt4", + "shroom/mushclutt5" ], "translate": { "x": 0, diff --git a/biomes/mushroom/mus-forest.json b/biomes/mushroom/mus-forest.json index 45eed73b..bf368620 100644 --- a/biomes/mushroom/mus-forest.json +++ b/biomes/mushroom/mus-forest.json @@ -91,6 +91,12 @@ "max": 24, "generator": "plain" }], + "entityInitialSpawns": [{ + "maxSpawns": 5, + "minSpawns": 2, + "entity": "mooshroom", + "rarity": 5 + }], "decorators": [ { "chance": 0.009, @@ -141,16 +147,16 @@ "enabled": true }, "place": [ - "trees/mushroom/mushclut1", - "trees/mushroom/mushclut2", - "trees/mushroom/mushclut3", - "trees/mushroom/mushclut4", - "trees/mushroom/mushclut5", - "trees/mushroom/mushclut6", - "trees/mushroom/mushclut7", - "trees/mushroom/mushclut8", - "trees/mushroom/mushclut9", - "trees/mushroom/mushclut10" + "mushroom-red/small-organell-r-1", + "mushroom-red/small-organell-r-2", + "mushroom-red/small-organell-r-3", + "mushroom-red/small-organell-r-4", + "mushroom-red/small-organell-r-5", + "mushroom-red/small-organell-r-6", + "mushroom-red/small-organell-r-7", + "mushroom-red/small-organell-r-8", + "mushroom-red/small-organell-r-9", + "mushroom-red/small-organell-r-10" ], "mode": "MIN_HEIGHT", "translate": { @@ -176,16 +182,16 @@ "enabled": true }, "place": [ - "trees/mushroom/mushclut1", - "trees/mushroom/mushclut2", - "trees/mushroom/mushclut3", - "trees/mushroom/mushclut4", - "trees/mushroom/mushclut5", - "trees/mushroom/mushclut6", - "trees/mushroom/mushclut7", - "trees/mushroom/mushclut8", - "trees/mushroom/mushclut9", - "trees/mushroom/mushclut10" + "mushroom-red/small-organell-r-1", + "mushroom-red/small-organell-r-2", + "mushroom-red/small-organell-r-3", + "mushroom-red/small-organell-r-4", + "mushroom-red/small-organell-r-5", + "mushroom-red/small-organell-r-6", + "mushroom-red/small-organell-r-7", + "mushroom-red/small-organell-r-8", + "mushroom-red/small-organell-r-9", + "mushroom-red/small-organell-r-10" ], "mode": "MIN_HEIGHT", "translate": { @@ -207,17 +213,17 @@ "enabled": true }, "place": [ - "trees/mushroom/browngeneric1", - "trees/mushroom/browngeneric2", - "trees/mushroom/redgeneric3", - "trees/mushroom/redgeneric4", - "trees/mushroom/redgeneric5", - "trees/mushroom/redgeneric6", - "trees/mushroom/redgeneric7", - "trees/mushroom/redgeneric8", - "trees/mushroom/redgeneric9", - "trees/mushroom/redgeneric10", - "trees/mushroom/redgeneric11" + "mushroom-red/organell-b-1", + "mushroom-red/organell-b-2", + "mushroom-red/organell-r-3", + "mushroom-red/organell-r-4", + "mushroom-red/organell-r-5", + "mushroom-red/organell-r-6", + "mushroom-red/organell-r-7", + "mushroom-red/organell-r-8", + "mushroom-red/organell-r-9", + "mushroom-red/organell-r-10", + "mushroom-red/organell-r-11" ], "translate": { "x": 0, @@ -242,17 +248,17 @@ "enabled": true }, "place": [ - "trees/mushroom/redlumotall1", - "trees/mushroom/redlumotall2", - "trees/mushroom/redlumotall3", - "trees/mushroom/redlumotall4", - "trees/mushroom/redlumotall5", - "trees/mushroom/redlumotall6", - "trees/mushroom/redlumotall7", - "trees/mushroom/redlumotall8", - "trees/mushroom/redlumotall9", - "trees/mushroom/redlumotall10", - "trees/mushroom/redlumotall11" + "mushroom-red/illuminorganell-r-1", + "mushroom-red/illuminorganell-r-2", + "mushroom-red/illuminorganell-r-3", + "mushroom-red/illuminorganell-r-4", + "mushroom-red/illuminorganell-r-5", + "mushroom-red/illuminorganell-r-6", + "mushroom-red/illuminorganell-r-7", + "mushroom-red/illuminorganell-r-8", + "mushroom-red/illuminorganell-r-9", + "mushroom-red/illuminorganell-r-10", + "mushroom-red/illuminorganell-r-11" ], "translate": { "x": 0, @@ -277,17 +283,17 @@ "enabled": true }, "place": [ - "trees/mushroom/browngeneric1", - "trees/mushroom/browngeneric2", - "trees/mushroom/redgeneric3", - "trees/mushroom/redgeneric4", - "trees/mushroom/redgeneric5", - "trees/mushroom/redgeneric6", - "trees/mushroom/redgeneric7", - "trees/mushroom/redgeneric8", - "trees/mushroom/redgeneric9", - "trees/mushroom/redgeneric10", - "trees/mushroom/redgeneric11" + "mushroom-red/organell-b-1", + "mushroom-red/organell-b-2", + "mushroom-red/organell-r-3", + "mushroom-red/organell-r-4", + "mushroom-red/organell-r-5", + "mushroom-red/organell-r-6", + "mushroom-red/organell-r-7", + "mushroom-red/organell-r-8", + "mushroom-red/organell-r-9", + "mushroom-red/organell-r-10", + "mushroom-red/organell-r-11" ], "translate": { "x": 0, @@ -312,11 +318,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "shroom/mushclutt1", + "shroom/mushclutt2", + "shroom/mushclutt3", + "shroom/mushclutt4", + "shroom/mushclutt5" ], "translate": { "x": 0, @@ -337,11 +343,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "shroom/mushclutt1", + "shroom/mushclutt2", + "shroom/mushclutt3", + "shroom/mushclutt4", + "shroom/mushclutt5" ], "translate": { "x": 0, diff --git a/biomes/mushroom/mus-plains.json b/biomes/mushroom/mus-plains.json index a35561e7..d5fd765a 100644 --- a/biomes/mushroom/mus-plains.json +++ b/biomes/mushroom/mus-plains.json @@ -55,7 +55,12 @@ "rarity": 150, "structure": "mush-huts" }], - + "entityInitialSpawns": [{ + "maxSpawns": 6, + "minSpawns": 2, + "entity": "mooshroom", + "rarity": 3 + }], "decorators": [ { "chance": 0.005, @@ -106,16 +111,16 @@ "enabled": true }, "place": [ - "trees/mushroom/mushclut1", - "trees/mushroom/mushclut2", - "trees/mushroom/mushclut3", - "trees/mushroom/mushclut4", - "trees/mushroom/mushclut5", - "trees/mushroom/mushclut6", - "trees/mushroom/mushclut7", - "trees/mushroom/mushclut8", - "trees/mushroom/mushclut9", - "trees/mushroom/mushclut10" + "mushroom-red/small-organell-r-1", + "mushroom-red/small-organell-r-2", + "mushroom-red/small-organell-r-3", + "mushroom-red/small-organell-r-4", + "mushroom-red/small-organell-r-5", + "mushroom-red/small-organell-r-6", + "mushroom-red/small-organell-r-7", + "mushroom-red/small-organell-r-8", + "mushroom-red/small-organell-r-9", + "mushroom-red/small-organell-r-10" ], "translate": { "x": 0, @@ -140,16 +145,16 @@ "enabled": true }, "place": [ - "trees/mushroom/mushclut1", - "trees/mushroom/mushclut2", - "trees/mushroom/mushclut3", - "trees/mushroom/mushclut4", - "trees/mushroom/mushclut5", - "trees/mushroom/mushclut6", - "trees/mushroom/mushclut7", - "trees/mushroom/mushclut8", - "trees/mushroom/mushclut9", - "trees/mushroom/mushclut10" + "mushroom-red/small-organell-r-1", + "mushroom-red/small-organell-r-2", + "mushroom-red/small-organell-r-3", + "mushroom-red/small-organell-r-4", + "mushroom-red/small-organell-r-5", + "mushroom-red/small-organell-r-6", + "mushroom-red/small-organell-r-7", + "mushroom-red/small-organell-r-8", + "mushroom-red/small-organell-r-9", + "mushroom-red/small-organell-r-10" ], "translate": { "x": 0, @@ -174,11 +179,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "shroom/mushclutt1", + "shroom/mushclutt2", + "shroom/mushclutt3", + "shroom/mushclutt4", + "shroom/mushclutt5" ], "translate": { "x": 0, @@ -199,11 +204,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "shroom/mushclutt1", + "shroom/mushclutt2", + "shroom/mushclutt3", + "shroom/mushclutt4", + "shroom/mushclutt5" ], "translate": { "x": 0, diff --git a/biomes/mushroom/mus-warped-forest.json b/biomes/mushroom/mus-warped-forest.json index 9b56c990..0e0e4570 100644 --- a/biomes/mushroom/mus-warped-forest.json +++ b/biomes/mushroom/mus-warped-forest.json @@ -107,16 +107,16 @@ "enabled": true }, "place": [ - "trees/mushroom/mushclut1", - "trees/mushroom/mushclut2", - "trees/mushroom/mushclut3", - "trees/mushroom/mushclut4", - "trees/mushroom/mushclut5", - "trees/mushroom/mushclut6", - "trees/mushroom/mushclut7", - "trees/mushroom/mushclut8", - "trees/mushroom/mushclut9", - "trees/mushroom/mushclut10" + "mushroom-red/small-organell-r-1", + "mushroom-red/small-organell-r-2", + "mushroom-red/small-organell-r-3", + "mushroom-red/small-organell-r-4", + "mushroom-red/small-organell-r-5", + "mushroom-red/small-organell-r-6", + "mushroom-red/small-organell-r-7", + "mushroom-red/small-organell-r-8", + "mushroom-red/small-organell-r-9", + "mushroom-red/small-organell-r-10" ], "translate": { "x": 0, @@ -151,16 +151,16 @@ "enabled": true }, "place": [ - "trees/mushroom/mushclut1", - "trees/mushroom/mushclut2", - "trees/mushroom/mushclut3", - "trees/mushroom/mushclut4", - "trees/mushroom/mushclut5", - "trees/mushroom/mushclut6", - "trees/mushroom/mushclut7", - "trees/mushroom/mushclut8", - "trees/mushroom/mushclut9", - "trees/mushroom/mushclut10" + "mushroom-red/small-organell-r-1", + "mushroom-red/small-organell-r-2", + "mushroom-red/small-organell-r-3", + "mushroom-red/small-organell-r-4", + "mushroom-red/small-organell-r-5", + "mushroom-red/small-organell-r-6", + "mushroom-red/small-organell-r-7", + "mushroom-red/small-organell-r-8", + "mushroom-red/small-organell-r-9", + "mushroom-red/small-organell-r-10" ], "translate": { "x": 0, @@ -195,18 +195,18 @@ "enabled": true }, "place": [ - "trees/mushroom/redgeneric1", - "trees/mushroom/redgeneric2", - "trees/mushroom/browngeneric1", - "trees/mushroom/browngeneric2", - "trees/mushroom/redgeneric3", - "trees/mushroom/redgeneric4", - "trees/mushroom/redgeneric5", - "trees/mushroom/redgeneric6", - "trees/mushroom/redgeneric7", - "trees/mushroom/redgeneric8", - "trees/mushroom/redgeneric9", - "trees/mushroom/redgeneric10" + "mushroom-red/organell-r-1", + "mushroom-red/organell-r-2", + "mushroom-red/organell-b-1", + "mushroom-red/organell-b-2", + "mushroom-red/organell-r-3", + "mushroom-red/organell-r-4", + "mushroom-red/organell-r-5", + "mushroom-red/organell-r-6", + "mushroom-red/organell-r-7", + "mushroom-red/organell-r-8", + "mushroom-red/organell-r-9", + "mushroom-red/organell-r-10" ], "translate": { "x": 0, @@ -241,18 +241,18 @@ "enabled": true }, "place": [ - "trees/mushroom/redgeneric1", - "trees/mushroom/redgeneric2", - "trees/mushroom/browngeneric1", - "trees/mushroom/browngeneric2", - "trees/mushroom/redgeneric3", - "trees/mushroom/redgeneric4", - "trees/mushroom/redgeneric5", - "trees/mushroom/redgeneric6", - "trees/mushroom/redgeneric7", - "trees/mushroom/redgeneric8", - "trees/mushroom/redgeneric9", - "trees/mushroom/redgeneric10" + "mushroom-red/organell-r-1", + "mushroom-red/organell-r-2", + "mushroom-red/organell-b-1", + "mushroom-red/organell-b-2", + "mushroom-red/organell-r-3", + "mushroom-red/organell-r-4", + "mushroom-red/organell-r-5", + "mushroom-red/organell-r-6", + "mushroom-red/organell-r-7", + "mushroom-red/organell-r-8", + "mushroom-red/organell-r-9", + "mushroom-red/organell-r-10" ], "translate": { "x": 0, @@ -287,11 +287,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "shroom/mushclutt1", + "shroom/mushclutt2", + "shroom/mushclutt3", + "shroom/mushclutt4", + "shroom/mushclutt5" ], "translate": { "x": 0, @@ -326,11 +326,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "shroom/mushclutt1", + "shroom/mushclutt2", + "shroom/mushclutt3", + "shroom/mushclutt4", + "shroom/mushclutt5" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-beach.json b/biomes/ocean/oce-beach.json index d0253237..075f3140 100644 --- a/biomes/ocean/oce-beach.json +++ b/biomes/ocean/oce-beach.json @@ -69,11 +69,11 @@ ], "objects": [{ "place": [ - "objects/structures/landstone1", - "objects/structures/landstone2", - "objects/structures/landstone3", - "objects/structures/landstone4", - "objects/structures/landstone5" + "landform/stone/1", + "landform/stone/2", + "landform/stone/3", + "landform/stone/4", + "landform/stone/5" ], "chance": 0.02, "mode": "MIN_HEIGHT", diff --git a/biomes/ocean/oce-deep.json b/biomes/ocean/oce-deep.json index be49f15e..4f50e66e 100644 --- a/biomes/ocean/oce-deep.json +++ b/biomes/ocean/oce-deep.json @@ -79,18 +79,18 @@ } }, "place": [ - "objects/structures/gall1", - "objects/structures/gall2", - "objects/structures/gall3" + "ships/gall-1", + "ships/gall-2", + "ships/gall-3" ] }, { "place": [ - "objects/structures/genericw", - "objects/structures/genericc", - "objects/structures/genericr", - "objects/structures/genericu", - "objects/structures/genericc" + "ships/generic-w", + "ships/generic-c", + "ships/generic-r", + "ships/generic-u", + "ships/generic-c" ], "chance": 0.001, "onwater": true, @@ -112,26 +112,26 @@ } }, "place": [ - "shipwreck/shipwithmast", - "shipwreck/shipwithmastdegraded", - "shipwreck/shiprightsideupfull", - "shipwreck/shiprightsideupfulldegraded", - "shipwreck/shiprightsideupfronthalf", - "shipwreck/shiprightsideupfronthalfdegraded", - "shipwreck/shiprightsideupbackhalf", - "shipwreck/shiprightsideupbackhalfdegraded", - "shipwreck/shipsidewaysfull", - "shipwreck/shipsidewaysfulldegraded", - "shipwreck/shipsidewaysfronthalf", - "shipwreck/shipsidewaysfronthalfdegraded", - "shipwreck/shipsidewaysbackhalf", - "shipwreck/shipsidewaysbackhalfdegraded", - "shipwreck/shipupsidedownfull", - "shipwreck/shipupsidedownfulldegraded", - "shipwreck/shipupsidedownfronthalf", - "shipwreck/shipupsidedownfronthalfdegraded", - "shipwreck/shipupsidedownbackhalf", - "shipwreck/shipupsidedownbackhalfdegraded" + "shipwreck/with-mast", + "shipwreck/with-mast-degraded", + "shipwreck/rightsideup-full", + "shipwreck/rightsideup-full-degraded", + "shipwreck/rightsideup-fronthalf", + "shipwreck/rightsideup-fronthalf-degraded", + "shipwreck/rightsideup-backhalf", + "shipwreck/rightsideup-backhalf-degraded", + "shipwreck/sideways-full", + "shipwreck/sideways-full-degraded", + "shipwreck/sideways-fronthalf", + "shipwreck/sideways-fronthalf-degraded", + "shipwreck/sideways-backhalf", + "shipwreck/sideways-backhalf-degraded", + "shipwreck/upsidedown-full", + "shipwreck/upsidedown-full-degraded", + "shipwreck/upsidedown-fronthalf", + "shipwreck/upsidedown-fronthalf-degraded", + "shipwreck/upsidedown-backhalf", + "shipwreck/upsidedown-backhalf-degraded" ] } ] diff --git a/biomes/ocean/oce-fzn-ocean.json b/biomes/ocean/oce-fzn-ocean.json index 663f8005..f55b04f8 100644 --- a/biomes/ocean/oce-fzn-ocean.json +++ b/biomes/ocean/oce-fzn-ocean.json @@ -92,10 +92,10 @@ }, "onwater": true, "place": [ - "clutter/twoicespike1", - "clutter/twoicespike2", - "clutter/twoicespike3", - "clutter/twoicespike4" + "ice-spikes/tp-1", + "ice-spikes/tp-2", + "ice-spikes/tp-3", + "ice-spikes/tp-4" ], "translate": { "x": 0, @@ -119,15 +119,15 @@ }, "onwater": true, "place": [ - "clutter/smolicespike1", - "clutter/smolicespike2", - "clutter/smolicespike3", - "clutter/smolicespike4", - "clutter/smolicespike5", - "clutter/smolicespike6", - "clutter/smolicespike7", - "clutter/smolicespike8", - "clutter/smolicespike9" + "ice-spikes/smol-ice-spike-1", + "ice-spikes/smol-ice-spike-2", + "ice-spikes/smol-ice-spike-3", + "ice-spikes/smol-ice-spike-4", + "ice-spikes/smol-ice-spike-5", + "ice-spikes/smol-ice-spike-6", + "ice-spikes/smol-ice-spike-7", + "ice-spikes/smol-ice-spike-8", + "ice-spikes/smol-ice-spike-9" ], "translate": { "x": 0, @@ -150,16 +150,16 @@ }, "onwater": true, "place": [ - "clutter/singleicespike1", - "clutter/singleicespike2", - "clutter/singleicespike3", - "clutter/singleicespike4", - "clutter/singleicespike5", - "clutter/icespec1", - "clutter/icespec2", - "clutter/icespec3", - "clutter/icespec4", - "clutter/icespec5" + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5", + "ice-spikes/ice-spec-1", + "ice-spikes/ice-spec-2", + "ice-spikes/ice-spec-3", + "ice-spikes/ice-spec-4", + "ice-spikes/ice-spec-5" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-fzn-river.json b/biomes/ocean/oce-fzn-river.json index 92738622..112e1041 100644 --- a/biomes/ocean/oce-fzn-river.json +++ b/biomes/ocean/oce-fzn-river.json @@ -80,10 +80,10 @@ }, "onwater": true, "place": [ - "clutter/twoicespike1", - "clutter/twoicespike2", - "clutter/twoicespike3", - "clutter/twoicespike4" + "ice-spikes/tp-1", + "ice-spikes/tp-2", + "ice-spikes/tp-3", + "ice-spikes/tp-4" ], "translate": { "x": 0, @@ -106,16 +106,16 @@ }, "onwater": true, "place": [ - "clutter/singleicespike1", - "clutter/singleicespike2", - "clutter/singleicespike3", - "clutter/singleicespike4", - "clutter/singleicespike5", - "clutter/icespec1", - "clutter/icespec2", - "clutter/icespec3", - "clutter/icespec4", - "clutter/icespec5" + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5", + "ice-spikes/ice-spec-1", + "ice-spikes/ice-spec-2", + "ice-spikes/ice-spec-3", + "ice-spikes/ice-spec-4", + "ice-spikes/ice-spec-5" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-hot-ocean-cliffs.json b/biomes/ocean/oce-hot-ocean-cliffs.json index 23411177..3f04ce82 100644 --- a/biomes/ocean/oce-hot-ocean-cliffs.json +++ b/biomes/ocean/oce-hot-ocean-cliffs.json @@ -116,9 +116,9 @@ }, "underwater": true, "place": [ - "objects/structures/swreck1", - "objects/structures/usdship1", - "objects/structures/usdship2" + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" ], "edit": [{ "find": [{"block": "oak_stairs"}], diff --git a/biomes/ocean/oce-hot-ocean.json b/biomes/ocean/oce-hot-ocean.json index e68b5f9f..69096837 100644 --- a/biomes/ocean/oce-hot-ocean.json +++ b/biomes/ocean/oce-hot-ocean.json @@ -114,7 +114,7 @@ }], "rotation": {"enabled": false}, "underwater": true, - "place": ["clutter/bomb1"], + "place": ["bombs/bomb"], "translate": { "x": 0, "y": 0, @@ -135,9 +135,9 @@ }, "underwater": true, "place": [ - "objects/structures/swreck1", - "objects/structures/usdship1", - "objects/structures/usdship2" + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" ], "edit": [{ "find": [{"block": "oak_stairs"}], diff --git a/biomes/ocean/oce-mtn-lake.json b/biomes/ocean/oce-mtn-lake.json index 58d12b92..78dbb2bf 100644 --- a/biomes/ocean/oce-mtn-lake.json +++ b/biomes/ocean/oce-mtn-lake.json @@ -130,24 +130,49 @@ }] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "mode": "PAINT", "chance": 0.1, "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ] }, { "mode": "PAINT", "chance": 0.1, "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ] }, { @@ -173,19 +198,19 @@ "mode": "PAINT", "chance": 0.1, "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ] }, { "mode": "PAINT", "place": [ - "objects/structures/mlandstone1", - "objects/structures/mlandstone2", - "objects/structures/mlandstone3", - "objects/structures/mlandstone4", - "objects/structures/mlandstone5" + "mrock/mrock-1", + "mrock/mrock-2", + "mrock/mrock-3", + "mrock/mrock-4", + "mrock/mrock-5" ], "chance": 0.04, "rotation": { diff --git a/biomes/ocean/oce-mtn-river-soft.json b/biomes/ocean/oce-mtn-river-soft.json index 67884604..80c9d8a9 100644 --- a/biomes/ocean/oce-mtn-river-soft.json +++ b/biomes/ocean/oce-mtn-river-soft.json @@ -72,13 +72,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-mtn-river.json b/biomes/ocean/oce-mtn-river.json index cb884c3f..cd1e56be 100644 --- a/biomes/ocean/oce-mtn-river.json +++ b/biomes/ocean/oce-mtn-river.json @@ -72,13 +72,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-mus-lake.json b/biomes/ocean/oce-mus-lake.json index ad9125d0..8708408f 100644 --- a/biomes/ocean/oce-mus-lake.json +++ b/biomes/ocean/oce-mus-lake.json @@ -43,7 +43,12 @@ "max": -10, "generator": "river" }], - + "entityInitialSpawns": [{ + "maxSpawns": 5, + "minSpawns": 2, + "entity": "mooshroom", + "rarity": 5 + }], "decorators": [ { "chance": 0.005, @@ -94,16 +99,16 @@ "enabled": true }, "place": [ - "trees/mushroom/mushclut1", - "trees/mushroom/mushclut2", - "trees/mushroom/mushclut3", - "trees/mushroom/mushclut4", - "trees/mushroom/mushclut5", - "trees/mushroom/mushclut6", - "trees/mushroom/mushclut7", - "trees/mushroom/mushclut8", - "trees/mushroom/mushclut9", - "trees/mushroom/mushclut10" + "mushroom-red/small-organell-r-1", + "mushroom-red/small-organell-r-2", + "mushroom-red/small-organell-r-3", + "mushroom-red/small-organell-r-4", + "mushroom-red/small-organell-r-5", + "mushroom-red/small-organell-r-6", + "mushroom-red/small-organell-r-7", + "mushroom-red/small-organell-r-8", + "mushroom-red/small-organell-r-9", + "mushroom-red/small-organell-r-10" ], "translate": { "x": 0, @@ -128,16 +133,16 @@ "enabled": true }, "place": [ - "trees/mushroom/mushclut1", - "trees/mushroom/mushclut2", - "trees/mushroom/mushclut3", - "trees/mushroom/mushclut4", - "trees/mushroom/mushclut5", - "trees/mushroom/mushclut6", - "trees/mushroom/mushclut7", - "trees/mushroom/mushclut8", - "trees/mushroom/mushclut9", - "trees/mushroom/mushclut10" + "mushroom-red/small-organell-r-1", + "mushroom-red/small-organell-r-2", + "mushroom-red/small-organell-r-3", + "mushroom-red/small-organell-r-4", + "mushroom-red/small-organell-r-5", + "mushroom-red/small-organell-r-6", + "mushroom-red/small-organell-r-7", + "mushroom-red/small-organell-r-8", + "mushroom-red/small-organell-r-9", + "mushroom-red/small-organell-r-10" ], "translate": { "x": 0, @@ -162,11 +167,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "shroom/mushclutt1", + "shroom/mushclutt2", + "shroom/mushclutt3", + "shroom/mushclutt4", + "shroom/mushclutt5" ], "translate": { "x": 0, @@ -187,11 +192,11 @@ "enabled": true }, "place": [ - "trees/mushroom/smolshroomt1", - "trees/mushroom/smolshroomt2", - "trees/mushroom/smolshroomt3", - "trees/mushroom/smolshroomt4", - "trees/mushroom/smolshroomt5" + "shroom/mushclutt1", + "shroom/mushclutt2", + "shroom/mushclutt3", + "shroom/mushclutt4", + "shroom/mushclutt5" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-mus-ocean.json b/biomes/ocean/oce-mus-ocean.json index 4dd4ebf1..2d860c91 100644 --- a/biomes/ocean/oce-mus-ocean.json +++ b/biomes/ocean/oce-mus-ocean.json @@ -115,9 +115,9 @@ }, "underwater": true, "place": [ - "objects/structures/swreck1", - "objects/structures/usdship1", - "objects/structures/usdship2" + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" ], "edit": [{ "find": [{"block": "oak_stairs"}], @@ -146,16 +146,16 @@ }, "underwater": true, "place": [ - "trees/mushroom/lumo1", - "trees/mushroom/lumo2", - "trees/mushroom/lumo3", - "trees/mushroom/lumo4", - "trees/mushroom/lumo5", - "trees/mushroom/lumo6", - "trees/mushroom/lumo7", - "trees/mushroom/lumo8", - "trees/mushroom/lumo9", - "trees/mushroom/lumo0" + "lumoshroom/subnauti-1", + "lumoshroom/subnauti-2", + "lumoshroom/subnauti-3", + "lumoshroom/subnauti-4", + "lumoshroom/subnauti-5", + "lumoshroom/subnauti-6", + "lumoshroom/subnauti-7", + "lumoshroom/subnauti-8", + "lumoshroom/subnauti-9", + "lumoshroom/subnauti-10" ], "translate": { "x": 0, @@ -176,16 +176,16 @@ }, "underwater": true, "place": [ - "trees/mushroom/lumo1", - "trees/mushroom/lumo2", - "trees/mushroom/lumo3", - "trees/mushroom/lumo4", - "trees/mushroom/lumo5", - "trees/mushroom/lumo6", - "trees/mushroom/lumo7", - "trees/mushroom/lumo8", - "trees/mushroom/lumo9", - "trees/mushroom/lumo0" + "lumoshroom/subnauti-1", + "lumoshroom/subnauti-2", + "lumoshroom/subnauti-3", + "lumoshroom/subnauti-4", + "lumoshroom/subnauti-5", + "lumoshroom/subnauti-6", + "lumoshroom/subnauti-7", + "lumoshroom/subnauti-8", + "lumoshroom/subnauti-9", + "lumoshroom/subnauti-10" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-ocean.json b/biomes/ocean/oce-ocean.json index 3d77bc32..c2fb2f28 100644 --- a/biomes/ocean/oce-ocean.json +++ b/biomes/ocean/oce-ocean.json @@ -78,11 +78,11 @@ "objects": [ { "place": [ - "objects/structures/landstone1", - "objects/structures/landstone2", - "objects/structures/landstone3", - "objects/structures/landstone4", - "objects/structures/landstone5" + "landform/stone/1", + "landform/stone/2", + "landform/stone/3", + "landform/stone/4", + "landform/stone/5" ], "chance": 1, "mode": "FAST_MIN_HEIGHT", @@ -116,26 +116,26 @@ }, { "place": [ - "shipwreck/shipwithmastdegraded", - "shipwreck/shipwithmast", - "shipwreck/shipupsidedownfulldegraded", - "shipwreck/shipupsidedownfull", - "shipwreck/shipupsidedownfronthalfdegraded", - "shipwreck/shipupsidedownfronthalf", - "shipwreck/shipupsidedownbackhalfdegraded", - "shipwreck/shipupsidedownbackhalf", - "shipwreck/shipsidewaysfulldegraded", - "shipwreck/shipsidewaysfull", - "shipwreck/shipsidewaysfronthalfdegraded", - "shipwreck/shipsidewaysfronthalf", - "shipwreck/shipsidewaysbackhalfdegraded", - "shipwreck/shipsidewaysbackhalf", - "shipwreck/shiprightsideupfulldegraded", - "shipwreck/shiprightsideupfull", - "shipwreck/shiprightsideupfronthalfdegraded", - "shipwreck/shiprightsideupfronthalf", - "shipwreck/shiprightsideupbackhalfdegraded", - "shipwreck/shiprightsideupbackhalf" + "shipwreck/with-mast-degraded", + "shipwreck/with-mast", + "shipwreck/upsidedown-full-degraded", + "shipwreck/upsidedown-full", + "shipwreck/upsidedown-fronthalf-degraded", + "shipwreck/upsidedown-fronthalf", + "shipwreck/upsidedown-backhalf-degraded", + "shipwreck/upsidedown-backhalf", + "shipwreck/sideways-full-degraded", + "shipwreck/sideways-full", + "shipwreck/sideways-fronthalf-degraded", + "shipwreck/sideways-fronthalf", + "shipwreck/sideways-backhalf-degraded", + "shipwreck/sideways-backhalf", + "shipwreck/rightsideup-full-degraded", + "shipwreck/rightsideup-full", + "shipwreck/rightsideup-fronthalf-degraded", + "shipwreck/rightsideup-fronthalf", + "shipwreck/rightsideup-backhalf-degraded", + "shipwreck/rightsideup-backhalf" ], "chance": 0.008, "underwater": true, @@ -143,9 +143,9 @@ }, { "place": [ - "objects/structures/oruins1", - "objects/structures/oruins2", - "objects/structures/oruins3" + "ocean-ruins/ruin1", + "ocean-ruins/ruin2", + "ocean-ruins/ruin3" ], "chance": 0.008, "mode": "VACUUM", diff --git a/biomes/ocean/oce-swa-ocean-tree.json b/biomes/ocean/oce-swa-ocean-tree.json index 8753995c..8a77cc66 100644 --- a/biomes/ocean/oce-swa-ocean-tree.json +++ b/biomes/ocean/oce-swa-ocean-tree.json @@ -127,9 +127,9 @@ }, "underwater": true, "place": [ - "objects/structures/swreck1", - "objects/structures/usdship1", - "objects/structures/usdship2" + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" ], "edit": [{ "find": [{"block": "oak_stairs"}], diff --git a/biomes/ocean/oce-swa-ocean.json b/biomes/ocean/oce-swa-ocean.json index ed482153..fc50417b 100644 --- a/biomes/ocean/oce-swa-ocean.json +++ b/biomes/ocean/oce-swa-ocean.json @@ -123,9 +123,9 @@ }, "underwater": true, "place": [ - "objects/structures/swreck1", - "objects/structures/usdship1", - "objects/structures/usdship2" + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" ], "edit": [{ "find": [{"block": "oak_stairs"}], diff --git a/biomes/ocean/oce-tem-ocean-deep.json b/biomes/ocean/oce-tem-ocean-deep.json index 283f5ba3..d3949a68 100644 --- a/biomes/ocean/oce-tem-ocean-deep.json +++ b/biomes/ocean/oce-tem-ocean-deep.json @@ -103,9 +103,9 @@ "underwater": true, "bottom": true, "place": [ - "objects/structures/swreck1", - "objects/structures/usdship1", - "objects/structures/usdship2" + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" ], "edit": [{ "find": [{"block": "oak_stairs"}], @@ -132,9 +132,9 @@ "underwater": true, "bottom": true, "place": [ - "objects/structures/gall1", - "objects/structures/gall2", - "objects/structures/gall3" + "ships/gall-1", + "ships/gall-2", + "ships/gall-3" ] }, { @@ -150,11 +150,11 @@ }, "underwater": true, "place": [ - "clutter/substat1", - "clutter/substat2", - "clutter/substat3", - "clutter/substat4", - "clutter/substat5" + "statue/sub-stat-1", + "statue/sub-stat-2", + "statue/sub-stat-3", + "statue/sub-stat-4", + "statue/sub-stat-5" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-tem-ocean.json b/biomes/ocean/oce-tem-ocean.json index e8e437d9..9536520d 100644 --- a/biomes/ocean/oce-tem-ocean.json +++ b/biomes/ocean/oce-tem-ocean.json @@ -102,9 +102,9 @@ }, "underwater": true, "place": [ - "objects/structures/swreck1", - "objects/structures/usdship1", - "objects/structures/usdship2" + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" ], "edit": [{ "find": [{"block": "oak_stairs"}], @@ -129,11 +129,11 @@ }, "underwater": true, "place": [ - "clutter/substat1", - "clutter/substat2", - "clutter/substat3", - "clutter/substat4", - "clutter/substat5" + "statue/sub-stat-1", + "statue/sub-stat-2", + "statue/sub-stat-3", + "statue/sub-stat-4", + "statue/sub-stat-5" ], "translate": { "x": 0, @@ -153,13 +153,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-tem-river.json b/biomes/ocean/oce-tem-river.json index 4b6d1dd7..9338a5a5 100644 --- a/biomes/ocean/oce-tem-river.json +++ b/biomes/ocean/oce-tem-river.json @@ -104,13 +104,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-tro-coral-ocean-cliffs.json b/biomes/ocean/oce-tro-coral-ocean-cliffs.json index 09582ce4..767833a0 100644 --- a/biomes/ocean/oce-tro-coral-ocean-cliffs.json +++ b/biomes/ocean/oce-tro-coral-ocean-cliffs.json @@ -200,13 +200,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "clamp": {"minimumHeight": 0}, "translate": { @@ -238,13 +238,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -275,13 +275,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -312,13 +312,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -349,13 +349,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -386,13 +386,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -423,13 +423,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -460,13 +460,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -497,13 +497,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -534,13 +534,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -571,13 +571,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -608,13 +608,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -645,13 +645,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -682,13 +682,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -719,13 +719,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -756,13 +756,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -793,13 +793,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -830,13 +830,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -867,13 +867,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -904,13 +904,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -941,13 +941,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -978,13 +978,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -1015,13 +1015,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -1052,13 +1052,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -1089,13 +1089,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-tro-coral-ocean.json b/biomes/ocean/oce-tro-coral-ocean.json index d8dc0f7a..d9e46936 100644 --- a/biomes/ocean/oce-tro-coral-ocean.json +++ b/biomes/ocean/oce-tro-coral-ocean.json @@ -187,13 +187,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "clamp": {"minimumHeight": 0}, "translate": { @@ -225,13 +225,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -262,13 +262,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -299,13 +299,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -336,13 +336,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -373,13 +373,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -410,13 +410,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -447,13 +447,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -484,13 +484,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -521,13 +521,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -558,13 +558,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -595,13 +595,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -632,13 +632,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -669,13 +669,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -706,13 +706,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -743,13 +743,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -780,13 +780,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -817,13 +817,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -854,13 +854,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -891,13 +891,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -928,13 +928,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -965,13 +965,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -1002,13 +1002,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -1039,13 +1039,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, @@ -1076,13 +1076,13 @@ }, "underwater": true, "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-tro-ocean.json b/biomes/ocean/oce-tro-ocean.json index 64d0b2d5..ee6647b7 100644 --- a/biomes/ocean/oce-tro-ocean.json +++ b/biomes/ocean/oce-tro-ocean.json @@ -214,9 +214,9 @@ }, "underwater": true, "place": [ - "objects/structures/swreck1", - "objects/structures/usdship1", - "objects/structures/usdship2" + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" ], "edit": [{ "find": [{"block": "oak_stairs"}], diff --git a/biomes/ocean/oce-tro-river-soft.json b/biomes/ocean/oce-tro-river-soft.json index d3afe7ff..8b069f2b 100644 --- a/biomes/ocean/oce-tro-river-soft.json +++ b/biomes/ocean/oce-tro-river-soft.json @@ -58,18 +58,18 @@ "objects": [ { "place": [ - "clutter/coralpink1", - "clutter/coralpink2", - "clutter/coralpink3", - "clutter/coralpink4", - "clutter/coralpurp1", - "clutter/coralpurp2", - "clutter/coralpurp3", - "clutter/coralred1", - "clutter/coralby1", - "clutter/coralby2", - "clutter/coralby3", - "clutter/coralby4" + "coral/coral-pink-1", + "coral/coral-pink-2", + "coral/coral-pink-3", + "coral/coral-pink-4", + "coral/coral-purp-1", + "coral/coral-purp-2", + "coral/coral-purp-3", + "coral/coral-red-1", + "coral/coral-by-1", + "coral/coral-by-2", + "coral/coral-by-3", + "coral/coral-by-4" ], "chance": 1, "density": 2, @@ -87,13 +87,13 @@ }, { "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "chance": 0.5, "density": 2, @@ -128,11 +128,11 @@ }, { "place": [ - "objects/structures/landstone1", - "objects/structures/landstone2", - "objects/structures/landstone3", - "objects/structures/landstone4", - "objects/structures/landstone5" + "landform/stone/1", + "landform/stone/2", + "landform/stone/3", + "landform/stone/4", + "landform/stone/5" ], "chance": 1, "mode": "FAST_MIN_HEIGHT", @@ -157,11 +157,11 @@ }, { "place": [ - "objects/structures/genericw", - "objects/structures/genericc", - "objects/structures/genericr", - "objects/structures/genericu", - "objects/structures/genericc" + "ships/generic-w", + "ships/generic-c", + "ships/generic-r", + "ships/generic-u", + "ships/generic-c" ], "chance": 0.003, "onwater": true, diff --git a/biomes/ocean/oce-tro-river-steep.json b/biomes/ocean/oce-tro-river-steep.json index 0152f05a..925cd754 100644 --- a/biomes/ocean/oce-tro-river-steep.json +++ b/biomes/ocean/oce-tro-river-steep.json @@ -63,11 +63,11 @@ "objects": [ { "place": [ - "objects/structures/landstone1", - "objects/structures/landstone2", - "objects/structures/landstone3", - "objects/structures/landstone4", - "objects/structures/landstone5" + "landform/stone/1", + "landform/stone/2", + "landform/stone/3", + "landform/stone/4", + "landform/stone/5" ], "chance": 1, "mode": "FAST_MIN_HEIGHT", @@ -117,11 +117,11 @@ }, { "place": [ - "objects/structures/genericw", - "objects/structures/genericc", - "objects/structures/genericr", - "objects/structures/genericu", - "objects/structures/genericc" + "ships/generic-w", + "ships/generic-c", + "ships/generic-r", + "ships/generic-u", + "ships/generic-c" ], "chance": 0.005, "onwater": true, diff --git a/biomes/ocean/oce-tun-river-rocky.json b/biomes/ocean/oce-tun-river-rocky.json index 61472d93..d71d2e52 100644 --- a/biomes/ocean/oce-tun-river-rocky.json +++ b/biomes/ocean/oce-tun-river-rocky.json @@ -105,9 +105,9 @@ }, "underwater": true, "place": [ - "objects/structures/swreck1", - "objects/structures/usdship1", - "objects/structures/usdship2" + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" ], "edit": [{ "find": [{"block": "oak_stairs"}], @@ -132,11 +132,11 @@ }, "underwater": true, "place": [ - "clutter/substat1", - "clutter/substat2", - "clutter/substat3", - "clutter/substat4", - "clutter/substat5" + "statue/sub-stat-1", + "statue/sub-stat-2", + "statue/sub-stat-3", + "statue/sub-stat-4", + "statue/sub-stat-5" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-tun-river.json b/biomes/ocean/oce-tun-river.json index 44b53907..5bca91b0 100644 --- a/biomes/ocean/oce-tun-river.json +++ b/biomes/ocean/oce-tun-river.json @@ -98,9 +98,9 @@ }, "underwater": true, "place": [ - "objects/structures/swreck1", - "objects/structures/usdship1", - "objects/structures/usdship2" + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" ], "translate": { "x": 0, @@ -121,11 +121,11 @@ }, "underwater": true, "place": [ - "clutter/substat1", - "clutter/substat2", - "clutter/substat3", - "clutter/substat4", - "clutter/substat5" + "statue/sub-stat-1", + "statue/sub-stat-2", + "statue/sub-stat-3", + "statue/sub-stat-4", + "statue/sub-stat-5" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-warm-bottom.json b/biomes/ocean/oce-warm-bottom.json index b440dfdb..7cf3ab26 100644 --- a/biomes/ocean/oce-warm-bottom.json +++ b/biomes/ocean/oce-warm-bottom.json @@ -67,18 +67,18 @@ "objects": [ { "place": [ - "clutter/coralpink1", - "clutter/coralpink2", - "clutter/coralpink3", - "clutter/coralpink4", - "clutter/coralpurp1", - "clutter/coralpurp2", - "clutter/coralpurp3", - "clutter/coralred1", - "clutter/coralby1", - "clutter/coralby2", - "clutter/coralby3", - "clutter/coralby4" + "coral/coral-pink-1", + "coral/coral-pink-2", + "coral/coral-pink-3", + "coral/coral-pink-4", + "coral/coral-purp-1", + "coral/coral-purp-2", + "coral/coral-purp-3", + "coral/coral-red-1", + "coral/coral-by-1", + "coral/coral-by-2", + "coral/coral-by-3", + "coral/coral-by-4" ], "chance": 1, "underwater": true, @@ -95,13 +95,13 @@ }, { "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "chance": 1, "density": 8, @@ -136,11 +136,11 @@ }, { "place": [ - "objects/structures/landstone1", - "objects/structures/landstone2", - "objects/structures/landstone3", - "objects/structures/landstone4", - "objects/structures/landstone5" + "landform/stone/1", + "landform/stone/2", + "landform/stone/3", + "landform/stone/4", + "landform/stone/5" ], "chance": 1, "mode": "FAST_MIN_HEIGHT", @@ -194,11 +194,11 @@ }, { "place": [ - "objects/structures/genericw", - "objects/structures/genericc", - "objects/structures/genericr", - "objects/structures/genericu", - "objects/structures/genericc" + "ships/generic-w", + "ships/generic-c", + "ships/generic-r", + "ships/generic-u", + "ships/generic-c" ], "chance": 0.005, "onwater": true, diff --git a/biomes/ocean/oce-warm.json b/biomes/ocean/oce-warm.json index 12166777..4b240cd8 100644 --- a/biomes/ocean/oce-warm.json +++ b/biomes/ocean/oce-warm.json @@ -61,18 +61,18 @@ "objects": [ { "place": [ - "clutter/coralpink1", - "clutter/coralpink2", - "clutter/coralpink3", - "clutter/coralpink4", - "clutter/coralpurp1", - "clutter/coralpurp2", - "clutter/coralpurp3", - "clutter/coralred1", - "clutter/coralby1", - "clutter/coralby2", - "clutter/coralby3", - "clutter/coralby4" + "coral/coral-pink-1", + "coral/coral-pink-2", + "coral/coral-pink-3", + "coral/coral-pink-4", + "coral/coral-purp-1", + "coral/coral-purp-2", + "coral/coral-purp-3", + "coral/coral-red-1", + "coral/coral-by-1", + "coral/coral-by-2", + "coral/coral-by-3", + "coral/coral-by-4" ], "chance": 1, "density": 2, @@ -90,13 +90,13 @@ }, { "place": [ - "clutter/stonedirtsetter1", - "clutter/stonedirtsetter2", - "clutter/stonedirtsetter3", - "clutter/stonedirtsetter4", - "clutter/stonedirtsetter5", - "clutter/stonedirtsetter6", - "clutter/stonedirtsetter7" + "coral/stonedirtsetter-1", + "coral/stonedirtsetter-2", + "coral/stonedirtsetter-3", + "coral/stonedirtsetter-4", + "coral/stonedirtsetter-5", + "coral/stonedirtsetter-6", + "coral/stonedirtsetter-7" ], "chance": 0.5, "density": 2, @@ -131,11 +131,11 @@ }, { "place": [ - "objects/structures/landstone1", - "objects/structures/landstone2", - "objects/structures/landstone3", - "objects/structures/landstone4", - "objects/structures/landstone5" + "landform/stone/1", + "landform/stone/2", + "landform/stone/3", + "landform/stone/4", + "landform/stone/5" ], "chance": 1, "mode": "FAST_MIN_HEIGHT", @@ -160,11 +160,11 @@ }, { "place": [ - "objects/structures/genericw", - "objects/structures/genericc", - "objects/structures/genericr", - "objects/structures/genericu", - "objects/structures/genericc" + "ships/generic-w", + "ships/generic-c", + "ships/generic-r", + "ships/generic-u", + "ships/generic-c" ], "chance": 0.005, "onwater": true, diff --git a/biomes/swamp/swa-beach.json b/biomes/swamp/swa-beach.json index 29c6cbf4..feffb30b 100644 --- a/biomes/swamp/swa-beach.json +++ b/biomes/swamp/swa-beach.json @@ -77,7 +77,20 @@ "heightVariance": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "objects": [{ "place": [ "tree/jungle/1", diff --git a/biomes/swamp/swa-denmyre.json b/biomes/swamp/swa-denmyre.json index ee27aa89..398898c8 100644 --- a/biomes/swamp/swa-denmyre.json +++ b/biomes/swamp/swa-denmyre.json @@ -104,7 +104,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, @@ -171,13 +171,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, @@ -221,16 +221,16 @@ "enabled": true }, "place": [ - "denmyre/clutter/oakdenclutt1", - "denmyre/clutter/oakdenclutt2", - "denmyre/clutter/oakdenclutt3", - "denmyre/clutter/oakdenclutt4", - "denmyre/clutter/oakdenclutt5", - "denmyre/clutter/oakdenclutt6", - "denmyre/clutter/oakdenclutt7", - "denmyre/clutter/oakdenclutt8", - "denmyre/clutter/oakdenclutt9", - "denmyre/clutter/oakdenclutt10" + "denmyre/oak-denmyre-clutter-1", + "denmyre/oak-denmyre-clutter-2", + "denmyre/oak-denmyre-clutter-3", + "denmyre/oak-denmyre-clutter-4", + "denmyre/oak-denmyre-clutter-5", + "denmyre/oak-denmyre-clutter-6", + "denmyre/oak-denmyre-clutter-7", + "denmyre/oak-denmyre-clutter-8", + "denmyre/oak-denmyre-clutter-9", + "denmyre/oak-denmyre-clutter-10" ], "translate": { "x": 0, @@ -239,7 +239,20 @@ } } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "wall": { "style": {"style": "STATIC"}, "palette": [ diff --git a/biomes/swamp/swa-lake.json b/biomes/swamp/swa-lake.json index e176c6b1..66961539 100644 --- a/biomes/swamp/swa-lake.json +++ b/biomes/swamp/swa-lake.json @@ -78,7 +78,20 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "objects": [{ "chance": 0.35, "density": 2, @@ -92,9 +105,9 @@ "enabled": true }, "place": [ - "clutter/oakclutt1", - "clutter/oakclutt2", - "clutter/oakclutt3" + "clutter/oak-clutt-1", + "clutter/oak-clutt-2", + "clutter/oak-clutt-3" ], "translate": { "x": 0, diff --git a/biomes/swamp/swa-marsh-rotten.json b/biomes/swamp/swa-marsh-rotten.json index 37b888ab..be7473bb 100644 --- a/biomes/swamp/swa-marsh-rotten.json +++ b/biomes/swamp/swa-marsh-rotten.json @@ -5,23 +5,10 @@ "derivative": "SWAMP_HILLS", "vanillaDerivative": "SWAMP", "generators": [{ - "min": -5, - "max": 4, - "generator": "plain" + "min": 7, + "max": 3, + "generator": "mountain" }], - "customDerivitives": [ - { - "id": "swamprottenmarsh", - "waterColor": "#684D1A", - "grassColor": "#5C581A", - "spawnRarity": 20, - "spawns": [ - { - "type": "SLIME" - } - ] - } - ], "layers": [ { "style": {"style": "IRIS"}, @@ -91,7 +78,20 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "objects": [ { "chance": 0.4, @@ -132,12 +132,12 @@ "enabled": true }, "place": [ - "clutter/shrub1", - "clutter/shrub2", - "clutter/shrub3", - "clutter/shrub4", - "clutter/shrub5", - "clutter/shrub6" + "misc/shrub-1", + "misc/shrub-2", + "misc/shrub-3", + "misc/shrub-4", + "misc/shrub-5", + "misc/shrub-6" ], "translate": { "x": 0, diff --git a/biomes/swamp/swa-marsh.json b/biomes/swamp/swa-marsh.json index 0b4e0933..b830a695 100644 --- a/biomes/swamp/swa-marsh.json +++ b/biomes/swamp/swa-marsh.json @@ -78,7 +78,20 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "objects": [ { "place": [ @@ -133,9 +146,9 @@ "enabled": true }, "place": [ - "clutter/oakclutt1", - "clutter/oakclutt2", - "clutter/oakclutt3" + "clutter/oak-clutt-1", + "clutter/oak-clutt-2", + "clutter/oak-clutt-3" ], "translate": { "x": 0, diff --git a/biomes/swamp/swa-roofed-forest.json b/biomes/swamp/swa-roofed-forest.json index 87b2a2d0..1a2162ac 100644 --- a/biomes/swamp/swa-roofed-forest.json +++ b/biomes/swamp/swa-roofed-forest.json @@ -130,18 +130,18 @@ "enabled": true }, "place": [ - "trees/oak/mroofed1", - "trees/oak/mroofed2", - "trees/oak/mroofed3", - "trees/oak/mroofed4", - "trees/oak/mroofed5", - "trees/oak/mroofed6", - "trees/oak/mroofed7", - "trees/oak/mroofed8", - "trees/oak/mroofed9", - "trees/oak/mroofed10", - "trees/oak/mroofed11", - "trees/oak/mroofed12" + "roofed-wayward/med-1", + "roofed-wayward/med-2", + "roofed-wayward/med-3", + "roofed-wayward/med-4", + "roofed-wayward/med-5", + "roofed-wayward/med-6", + "roofed-wayward/med-7", + "roofed-wayward/med-8", + "roofed-wayward/med-9", + "roofed-wayward/med-10", + "roofed-wayward/med-11", + "roofed-wayward/med-12" ], "translate": { "x": 0, @@ -162,17 +162,17 @@ "enabled": true }, "place": [ - "trees/mushroom/browngeneric1", - "trees/mushroom/browngeneric2", - "trees/mushroom/redgeneric3", - "trees/mushroom/redgeneric4", - "trees/mushroom/redgeneric5", - "trees/mushroom/redgeneric6", - "trees/mushroom/redgeneric7", - "trees/mushroom/redgeneric8", - "trees/mushroom/redgeneric9", - "trees/mushroom/redgeneric10", - "trees/mushroom/redgeneric11" + "mushroom-red/organell-b-1", + "mushroom-red/organell-b-2", + "mushroom-red/organell-r-3", + "mushroom-red/organell-r-4", + "mushroom-red/organell-r-5", + "mushroom-red/organell-r-6", + "mushroom-red/organell-r-7", + "mushroom-red/organell-r-8", + "mushroom-red/organell-r-9", + "mushroom-red/organell-r-10", + "mushroom-red/organell-r-11" ], "translate": { "x": 0, @@ -197,17 +197,17 @@ "enabled": true }, "place": [ - "trees/mushroom/browngeneric1", - "trees/mushroom/browngeneric2", - "trees/mushroom/redgeneric3", - "trees/mushroom/redgeneric4", - "trees/mushroom/redgeneric5", - "trees/mushroom/redgeneric6", - "trees/mushroom/redgeneric7", - "trees/mushroom/redgeneric8", - "trees/mushroom/redgeneric9", - "trees/mushroom/redgeneric10", - "trees/mushroom/redgeneric11" + "mushroom-red/organell-b-1", + "mushroom-red/organell-b-2", + "mushroom-red/organell-r-3", + "mushroom-red/organell-r-4", + "mushroom-red/organell-r-5", + "mushroom-red/organell-r-6", + "mushroom-red/organell-r-7", + "mushroom-red/organell-r-8", + "mushroom-red/organell-r-9", + "mushroom-red/organell-r-10", + "mushroom-red/organell-r-11" ], "translate": { "x": 0, @@ -237,16 +237,16 @@ "enabled": true }, "place": [ - "trees/oak/troofed1", - "trees/oak/troofed2", - "trees/oak/troofed3", - "trees/oak/troofed4", - "trees/oak/troofed5", - "trees/oak/troofed6", - "trees/oak/troofed7", - "trees/oak/troofed8", - "trees/oak/troofed9", - "trees/oak/troofed10" + "roofed-wayward/taller-roof-1", + "roofed-wayward/taller-roof-2", + "roofed-wayward/taller-roof-3", + "roofed-wayward/taller-roof-4", + "roofed-wayward/taller-roof-5", + "roofed-wayward/taller-roof-6", + "roofed-wayward/taller-roof-7", + "roofed-wayward/taller-roof-8", + "roofed-wayward/taller-roof-9", + "roofed-wayward/taller-roof-10" ], "translate": { "x": 0, @@ -311,12 +311,12 @@ "enabled": true }, "place": [ - "clutter/stump1", - "clutter/stump2", - "clutter/stump3", - "clutter/stump4", - "clutter/stump5", - "clutter/stump6" + "stump/stump1", + "stump/stump2", + "stump/stump3", + "stump/stump4", + "stump/stump5", + "stump/stump6" ], "mode": "VACUUM", "translate": { @@ -355,11 +355,11 @@ "enabled": true }, "place": [ - "clutter/oakclutt1", - "clutter/oakclutt2", - "clutter/oakclutt3", - "clutter/oakclutt4", - "clutter/oakclutt5" + "clutter/oak-clutt-1", + "clutter/oak-clutt-2", + "clutter/oak-clutt-3", + "clutter/oak-clutt-4", + "clutter/oak-clutt-5" ], "translate": { "x": 0, @@ -370,7 +370,7 @@ { "chance": 0.001, "rotation": {"enabled": false}, - "place": ["clutter/genericgrave1"], + "place": ["stump/grave-1"], "translate": { "x": 0, "y": -1, @@ -378,7 +378,20 @@ } } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "wall": { "style": {"style": "STATIC"}, "palette": [ diff --git a/biomes/swamp/swa-roofed-wayward.json b/biomes/swamp/swa-roofed-wayward.json index 070eb4b9..4802bac8 100644 --- a/biomes/swamp/swa-roofed-wayward.json +++ b/biomes/swamp/swa-roofed-wayward.json @@ -112,16 +112,16 @@ "enabled": true }, "place": [ - "trees/oak/troofed1", - "trees/oak/troofed2", - "trees/oak/troofed3", - "trees/oak/troofed4", - "trees/oak/troofed5", - "trees/oak/troofed6", - "trees/oak/troofed7", - "trees/oak/troofed8", - "trees/oak/troofed9", - "trees/oak/troofed10" + "roofed-wayward/taller-roof-1", + "roofed-wayward/taller-roof-2", + "roofed-wayward/taller-roof-3", + "roofed-wayward/taller-roof-4", + "roofed-wayward/taller-roof-5", + "roofed-wayward/taller-roof-6", + "roofed-wayward/taller-roof-7", + "roofed-wayward/taller-roof-8", + "roofed-wayward/taller-roof-9", + "roofed-wayward/taller-roof-10" ], "translate": { "x": 0, @@ -157,18 +157,18 @@ "enabled": true }, "place": [ - "trees/oak/mroofed1", - "trees/oak/mroofed2", - "trees/oak/mroofed3", - "trees/oak/mroofed4", - "trees/oak/mroofed5", - "trees/oak/mroofed6", - "trees/oak/mroofed7", - "trees/oak/mroofed8", - "trees/oak/mroofed9", - "trees/oak/mroofed10", - "trees/oak/mroofed11", - "trees/oak/mroofed12" + "roofed-wayward/med-1", + "roofed-wayward/med-2", + "roofed-wayward/med-3", + "roofed-wayward/med-4", + "roofed-wayward/med-5", + "roofed-wayward/med-6", + "roofed-wayward/med-7", + "roofed-wayward/med-8", + "roofed-wayward/med-9", + "roofed-wayward/med-10", + "roofed-wayward/med-11", + "roofed-wayward/med-12" ], "translate": { "x": 0, @@ -189,17 +189,17 @@ "enabled": true }, "place": [ - "trees/mushroom/browngeneric1", - "trees/mushroom/browngeneric2", - "trees/mushroom/mushclut3", - "trees/mushroom/mushclut4", - "trees/mushroom/mushclut5", - "trees/mushroom/mushclut6", - "trees/mushroom/mushclut7", - "trees/mushroom/mushclut8", - "trees/mushroom/mushclut9", - "trees/mushroom/mushclut10", - "trees/mushroom/redgeneric11" + "mushroom-red/organell-b-1", + "mushroom-red/organell-b-2", + "mushroom-red/small-organell-r-3", + "mushroom-red/small-organell-r-4", + "mushroom-red/small-organell-r-5", + "mushroom-red/small-organell-r-6", + "mushroom-red/small-organell-r-7", + "mushroom-red/small-organell-r-8", + "mushroom-red/small-organell-r-9", + "mushroom-red/small-organell-r-10", + "mushroom-red/organell-r-11" ], "translate": { "x": 0, @@ -224,17 +224,17 @@ "enabled": true }, "place": [ - "trees/mushroom/browngeneric1", - "trees/mushroom/browngeneric2", - "trees/mushroom/mushclut3", - "trees/mushroom/mushclut4", - "trees/mushroom/mushclut5", - "trees/mushroom/mushclut6", - "trees/mushroom/mushclut7", - "trees/mushroom/mushclut8", - "trees/mushroom/mushclut9", - "trees/mushroom/mushclut10", - "trees/mushroom/redgeneric11" + "mushroom-red/organell-b-1", + "mushroom-red/organell-b-2", + "mushroom-red/small-organell-r-3", + "mushroom-red/small-organell-r-4", + "mushroom-red/small-organell-r-5", + "mushroom-red/small-organell-r-6", + "mushroom-red/small-organell-r-7", + "mushroom-red/small-organell-r-8", + "mushroom-red/small-organell-r-9", + "mushroom-red/small-organell-r-10", + "mushroom-red/organell-r-11" ], "translate": { "x": 0, @@ -299,12 +299,12 @@ "enabled": true }, "place": [ - "clutter/stump1", - "clutter/stump2", - "clutter/stump3", - "clutter/stump4", - "clutter/stump5", - "clutter/stump6" + "stump/stump1", + "stump/stump2", + "stump/stump3", + "stump/stump4", + "stump/stump5", + "stump/stump6" ], "mode": "VACUUM", "translate": { @@ -343,11 +343,11 @@ "enabled": true }, "place": [ - "clutter/oakclutt1", - "clutter/oakclutt2", - "clutter/oakclutt3", - "clutter/oakclutt4", - "clutter/oakclutt5" + "clutter/oak-clutt-1", + "clutter/oak-clutt-2", + "clutter/oak-clutt-3", + "clutter/oak-clutt-4", + "clutter/oak-clutt-5" ], "translate": { "x": 0, @@ -358,7 +358,7 @@ { "chance": 0.001, "rotation": {"enabled": false}, - "place": ["clutter/genericgrave1"], + "place": ["stump/grave-1"], "translate": { "x": 0, "y": -1, @@ -366,7 +366,20 @@ } } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "wall": { "style": {"style": "STATIC"}, "palette": [ diff --git a/biomes/swamp/swa-willow-forest.json b/biomes/swamp/swa-willow-forest.json index 425e5530..cd705ab6 100644 --- a/biomes/swamp/swa-willow-forest.json +++ b/biomes/swamp/swa-willow-forest.json @@ -147,16 +147,16 @@ "enabled": true }, "place": [ - "darkoak/generic1", - "darkoak/generic2", - "darkoak/generic3", - "darkoak/generic5", - "darkoak/generic6", - "darkoak/generic7", - "darkoak/generic8", - "darkoak/generic9", - "darkoak/generic10", - "darkoak/generic11" + "willwo/willwo-1", + "willwo/willwo-2", + "willwo/willwo-3", + "willwo/willwo-5", + "willwo/willwo-6", + "willwo/willwo-7", + "willwo/willwo-8", + "willwo/willwo-9", + "willwo/willwo-10", + "willwo/willwo-11" ], "translate": { "x": 0, @@ -194,8 +194,8 @@ "enabled": true }, "place": [ - "trees/darkoak/willowgeneric1", - "trees/darkoak/willowgeneric2" + "willowbutbigger/o1", + "willowbutbigger/o2" ], "mode": "VACUUM", "translate": { @@ -261,11 +261,11 @@ "enabled": true }, "place": [ - "clutter/oakclutt1", - "clutter/oakclutt2", - "clutter/oakclutt3", - "clutter/oakclutt4", - "clutter/oakclutt5" + "clutter/oak-clutt-1", + "clutter/oak-clutt-2", + "clutter/oak-clutt-3", + "clutter/oak-clutt-4", + "clutter/oak-clutt-5" ], "translate": { "x": 0, @@ -303,12 +303,12 @@ "enabled": true }, "place": [ - "clutter/stump1", - "clutter/stump2", - "clutter/stump3", - "clutter/stump4", - "clutter/stump5", - "clutter/stump6" + "stump/stump1", + "stump/stump2", + "stump/stump3", + "stump/stump4", + "stump/stump5", + "stump/stump6" ], "mode": "VACUUM", "translate": { @@ -320,7 +320,7 @@ { "chance": 5.0E-5, "rotation": {"enabled": false}, - "place": ["clutter/genericgrave1"], + "place": ["stump/grave-1"], "translate": { "x": 0, "y": 1, diff --git a/biomes/temperate/tem-beach.json b/biomes/temperate/tem-beach.json index c5544572..366ef043 100644 --- a/biomes/temperate/tem-beach.json +++ b/biomes/temperate/tem-beach.json @@ -60,7 +60,32 @@ "heightVariance": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [{ "mode": "PAINT", "chance": 0.0025, @@ -73,7 +98,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, diff --git a/biomes/temperate/tem-birch-denmyre.json b/biomes/temperate/tem-birch-denmyre.json index 5152d6b5..33a15649 100644 --- a/biomes/temperate/tem-birch-denmyre.json +++ b/biomes/temperate/tem-birch-denmyre.json @@ -104,7 +104,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, @@ -123,7 +123,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -214,16 +214,16 @@ "enabled": true }, "place": [ - "denmyre/clutter/oakdenclutt1", - "denmyre/clutter/oakdenclutt2", - "denmyre/clutter/oakdenclutt3", - "denmyre/clutter/oakdenclutt4", - "denmyre/clutter/oakdenclutt5", - "denmyre/clutter/oakdenclutt6", - "denmyre/clutter/oakdenclutt7", - "denmyre/clutter/oakdenclutt8", - "denmyre/clutter/oakdenclutt9", - "denmyre/clutter/oakdenclutt10" + "denmyre/oak-denmyre-clutter-1", + "denmyre/oak-denmyre-clutter-2", + "denmyre/oak-denmyre-clutter-3", + "denmyre/oak-denmyre-clutter-4", + "denmyre/oak-denmyre-clutter-5", + "denmyre/oak-denmyre-clutter-6", + "denmyre/oak-denmyre-clutter-7", + "denmyre/oak-denmyre-clutter-8", + "denmyre/oak-denmyre-clutter-9", + "denmyre/oak-denmyre-clutter-10" ], "translate": { "x": 0, @@ -234,10 +234,28 @@ ], "entityInitialSpawns": [ { - "entity": "bee", - "maxSpawns": 5, - "minSpawns": 2, - "rarity": 3 + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 } ], "wall": { diff --git a/biomes/temperate/tem-birch-forest.json b/biomes/temperate/tem-birch-forest.json index cc153c72..0e8de67f 100644 --- a/biomes/temperate/tem-birch-forest.json +++ b/biomes/temperate/tem-birch-forest.json @@ -62,7 +62,38 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "bee", + "maxSpawns": 5, + "minSpawns": 1, + "rarity": 2 + } + ], "objects": [ { "mode": "PAINT", @@ -76,7 +107,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, @@ -95,7 +126,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -115,17 +146,17 @@ "enabled": true }, "place": [ - "trees/birch/antioch3", - "trees/birch/antioch4", - "trees/birch/antioch5", - "trees/birch/antioch6", - "trees/birch/antioch7", - "trees/birch/antioch8", - "trees/birch/antioch9", - "trees/birch/antioch10", - "trees/birch/antioch11", - "trees/birch/antioch12", - "trees/birch/antioch13" + "birch-antioch/antioch-3", + "birch-antioch/antioch-4", + "birch-antioch/antioch-5", + "birch-antioch/antioch-6", + "birch-antioch/antioch-7", + "birch-antioch/antioch-8", + "birch-antioch/antioch-9", + "birch-antioch/antioch-10", + "birch-antioch/antioch-11", + "birch-antioch/antioch-12", + "birch-antioch/antioch-13" ], "translate": { "x": 0, @@ -170,10 +201,10 @@ "enabled": true }, "place": [ - "trees/birch/antioch3-b", - "trees/birch/antioch4-b", - "trees/birch/antioch5-b", - "trees/birch/antioch6-b" + "birch-antioch/antioch-3-b", + "birch-antioch/antioch-4-b", + "birch-antioch/antioch-5-b", + "birch-antioch/antioch-6-b" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-flower-forest.json b/biomes/temperate/tem-flower-forest.json index b19b30ff..81e01316 100644 --- a/biomes/temperate/tem-flower-forest.json +++ b/biomes/temperate/tem-flower-forest.json @@ -62,10 +62,34 @@ } ], "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 4, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 4, + "minSpawns": 1, + "rarity": 7 + }, { "entity": "bee", "maxSpawns": 5, - "minSpawns": 2, + "minSpawns": 1, "rarity": 3 } ], @@ -82,23 +106,23 @@ "enabled": true }, "place": [ - "trees/oak/hoakgeneric3", - "trees/oak/hoakgeneric4", - "trees/oak/hoakgeneric5", - "trees/oak/hoakgeneric6", - "trees/oak/hoakgeneric7", - "trees/oak/hoakgeneric8", - "trees/oak/hoakgeneric9", - "trees/oak/hoakgeneric1", - "trees/oak/shoakgeneric3", - "trees/oak/shoakgeneric4", - "trees/oak/shoakgeneric5", - "trees/oak/shoakgeneric6", - "trees/oak/shoakgeneric7", - "trees/oak/shoakgeneric8", - "trees/oak/shoakgeneric9", - "trees/oak/shoakgeneric1", - "trees/oak/shoakgeneric2" + "hazel-oak/hoak-3", + "hazel-oak/hoak-4", + "hazel-oak/hoak-5", + "hazel-oak/hoak-6", + "hazel-oak/hoak-7", + "hazel-oak/hoak-8", + "hazel-oak/hoak-9", + "hazel-oak/hoak-1", + "hazel-oak/s-hoak-3", + "hazel-oak/s-hoak-4", + "hazel-oak/s-hoak-5", + "hazel-oak/s-hoak-6", + "hazel-oak/s-hoak-7", + "hazel-oak/s-hoak-8", + "hazel-oak/s-hoak-9", + "hazel-oak/s-hoak-1", + "hazel-oak/s-hoak-2" ], "translate": { "x": 0, @@ -118,7 +142,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -137,7 +161,7 @@ }, "enabled": true }, - "place": ["clutter/bee/hive1"], + "place": ["bee/hive"], "translate": { "x": 0, "y": 0, @@ -171,17 +195,17 @@ } ], "place": [ - "trees/birch/antioch3", - "trees/birch/antioch4", - "trees/birch/antioch5", - "trees/birch/antioch6", - "trees/birch/antioch7", - "trees/birch/antioch8", - "trees/birch/antioch9", - "trees/birch/antioch10", - "trees/birch/antioch11", - "trees/birch/antioch12", - "trees/birch/antioch13" + "birch-antioch/antioch-3", + "birch-antioch/antioch-4", + "birch-antioch/antioch-5", + "birch-antioch/antioch-6", + "birch-antioch/antioch-7", + "birch-antioch/antioch-8", + "birch-antioch/antioch-9", + "birch-antioch/antioch-10", + "birch-antioch/antioch-11", + "birch-antioch/antioch-12", + "birch-antioch/antioch-13" ], "translate": { "x": 0, @@ -203,17 +227,17 @@ "enabled": true }, "place": [ - "trees/birch/antioch3", - "trees/birch/antioch4", - "trees/birch/antioch5", - "trees/birch/antioch6", - "trees/birch/antioch7", - "trees/birch/antioch8", - "trees/birch/antioch9", - "trees/birch/antioch10", - "trees/birch/antioch11", - "trees/birch/antioch12", - "trees/birch/antioch13" + "birch-antioch/antioch-3", + "birch-antioch/antioch-4", + "birch-antioch/antioch-5", + "birch-antioch/antioch-6", + "birch-antioch/antioch-7", + "birch-antioch/antioch-8", + "birch-antioch/antioch-9", + "birch-antioch/antioch-10", + "birch-antioch/antioch-11", + "birch-antioch/antioch-12", + "birch-antioch/antioch-13" ], "translate": { "x": 0, @@ -235,17 +259,17 @@ "enabled": true }, "place": [ - "trees/birch/antioch3", - "trees/birch/antioch4", - "trees/birch/antioch5", - "trees/birch/antioch6", - "trees/birch/antioch7", - "trees/birch/antioch8", - "trees/birch/antioch9", - "trees/birch/antioch10", - "trees/birch/antioch11", - "trees/birch/antioch12", - "trees/birch/antioch13" + "birch-antioch/antioch-3", + "birch-antioch/antioch-4", + "birch-antioch/antioch-5", + "birch-antioch/antioch-6", + "birch-antioch/antioch-7", + "birch-antioch/antioch-8", + "birch-antioch/antioch-9", + "birch-antioch/antioch-10", + "birch-antioch/antioch-11", + "birch-antioch/antioch-12", + "birch-antioch/antioch-13" ], "translate": { "x": 0, @@ -266,12 +290,12 @@ "enabled": true }, "place": [ - "trees/oak/thoakgeneric1", - "trees/oak/thoakgeneric2", - "trees/oak/thoakgeneric3", - "trees/oak/thoakgeneric4", - "trees/oak/thoakgeneric8", - "trees/oak/thoakgeneric10" + "hazel-oak/taller-oak-1", + "hazel-oak/taller-oak-2", + "hazel-oak/taller-oak-3", + "hazel-oak/taller-oak-4", + "hazel-oak/taller-oak-8", + "hazel-oak/taller-oak-10" ], "translate": { "x": 0, @@ -291,13 +315,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, @@ -335,10 +359,10 @@ "enabled": true }, "place": [ - "clutter/literalgarbage1", - "clutter/literalgarbage2", - "clutter/literalgarbage3", - "clutter/literalgarbage4" + "garbage/clutter-1", + "garbage/clutter-2", + "garbage/clutter-3", + "garbage/clutter-4" ], "translate": { "x": 0, @@ -359,13 +383,13 @@ "enabled": true }, "place": [ - "clutter/stoneclutt1", - "clutter/stoneclutt2", - "clutter/stoneclutt3", - "clutter/stoneclutt4", - "clutter/stoneclutt5", - "clutter/stoneclutt6", - "clutter/stoneclutt7", + "clutter/stone-clutt-1", + "clutter/stone-clutt-2", + "clutter/stone-clutt-3", + "clutter/stone-clutt-4", + "clutter/stone-clutt-5", + "clutter/stone-clutt-6", + "clutter/stone-clutt-7", "boulder/boulder1", "boulder/boulder2", "boulder/boulder4", @@ -393,8 +417,8 @@ "enabled": true }, "place": [ - "clutter/rock1", - "clutter/rock3" + "rocks/r1", + "rocks/r3" ], "translate": { "x": 0, @@ -415,9 +439,9 @@ "enabled": true }, "place": [ - "clutter/rock2", - "clutter/rock3", - "clutter/rock4" + "rocks/r2", + "rocks/r3", + "rocks/r4" ], "translate": { "x": 0, @@ -446,7 +470,7 @@ }, "enabled": true }, - "place": ["trees/mixed/smoakog80"], + "place": ["sm-tree/oakw-oakl-80"], "mode": "MIN_HEIGHT", "translate": { "x": 0, diff --git a/biomes/temperate/tem-highlands.json b/biomes/temperate/tem-highlands.json index 58b5c56e..6961b81b 100644 --- a/biomes/temperate/tem-highlands.json +++ b/biomes/temperate/tem-highlands.json @@ -57,10 +57,28 @@ ], "entityInitialSpawns": [ { - "entity": "bee", - "maxSpawns": 5, - "minSpawns": 2, - "rarity": 3 + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 } ], "decorators": [ @@ -122,16 +140,16 @@ "enabled": true }, "place": [ - "clutter/oakclutt1", - "clutter/oakclutt2", - "clutter/oakclutt3", - "clutter/oakclutt4", - "clutter/oakclutt5", - "clutter/birchclutt1", - "clutter/birchclutt2", - "clutter/birchclutt3", - "clutter/birchclutt4", - "clutter/birchclutt5" + "clutter/oak-clutt-1", + "clutter/oak-clutt-2", + "clutter/oak-clutt-3", + "clutter/oak-clutt-4", + "clutter/oak-clutt-5", + "clutter/birch-clutt-1", + "clutter/birch-clutt-2", + "clutter/birch-clutt-3", + "clutter/birch-clutt-4", + "clutter/birch-clutt-5" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-island.json b/biomes/temperate/tem-island.json index d260f2b2..0a5c4526 100644 --- a/biomes/temperate/tem-island.json +++ b/biomes/temperate/tem-island.json @@ -39,7 +39,32 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "decorators": [ { "chance": 0.19, @@ -75,23 +100,23 @@ "enabled": true }, "place": [ - "trees/oak/hoakgeneric3", - "trees/oak/hoakgeneric4", - "trees/oak/hoakgeneric5", - "trees/oak/hoakgeneric6", - "trees/oak/hoakgeneric7", - "trees/oak/hoakgeneric8", - "trees/oak/hoakgeneric9", - "trees/oak/hoakgeneric1", - "trees/oak/shoakgeneric3", - "trees/oak/shoakgeneric4", - "trees/oak/shoakgeneric5", - "trees/oak/shoakgeneric6", - "trees/oak/shoakgeneric7", - "trees/oak/shoakgeneric8", - "trees/oak/shoakgeneric9", - "trees/oak/shoakgeneric1", - "trees/oak/shoakgeneric2" + "hazel-oak/hoak-3", + "hazel-oak/hoak-4", + "hazel-oak/hoak-5", + "hazel-oak/hoak-6", + "hazel-oak/hoak-7", + "hazel-oak/hoak-8", + "hazel-oak/hoak-9", + "hazel-oak/hoak-1", + "hazel-oak/s-hoak-3", + "hazel-oak/s-hoak-4", + "hazel-oak/s-hoak-5", + "hazel-oak/s-hoak-6", + "hazel-oak/s-hoak-7", + "hazel-oak/s-hoak-8", + "hazel-oak/s-hoak-9", + "hazel-oak/s-hoak-1", + "hazel-oak/s-hoak-2" ], "translate": { "x": 0, @@ -111,13 +136,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-longtree-forest.json b/biomes/temperate/tem-longtree-forest.json index 5dfba912..5d8c7044 100644 --- a/biomes/temperate/tem-longtree-forest.json +++ b/biomes/temperate/tem-longtree-forest.json @@ -252,7 +252,31 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pandaUwU", + "maxSpawns": 1, + "rarity": 40 + }, + { + "entity": "panda", + "maxSpawns": 4, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "fox", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 5 + } + ], "objects": [ { "chance": 0.7, @@ -266,13 +290,13 @@ "enabled": true }, "place": [ - "clutter/stoneclutt1", - "clutter/stoneclutt2", - "clutter/stoneclutt3", - "clutter/stoneclutt4", - "clutter/stoneclutt5", - "clutter/stoneclutt6", - "clutter/stoneclutt7", + "clutter/stone-clutt-1", + "clutter/stone-clutt-2", + "clutter/stone-clutt-3", + "clutter/stone-clutt-4", + "clutter/stone-clutt-5", + "clutter/stone-clutt-6", + "clutter/stone-clutt-7", "boulder/boulder1", "boulder/boulder2", "boulder/boulder4", @@ -299,7 +323,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -321,7 +345,7 @@ }, "enabled": true }, - "place": ["clutter/log"], + "place": ["sakura/tronco"], "translate": { "x": 0, "y": 1, @@ -330,8 +354,8 @@ }, { "place": [ - "clutter/sbush1", - "clutter/sbush2" + "bush/small/1", + "bush/small/2" ], "chance": 0.3, "density": 2, @@ -357,14 +381,14 @@ "enabled": true }, "place": [ - "trees/oak/toak1", - "trees/oak/toak2", - "trees/oak/toak3", - "trees/oak/toak4", - "trees/oak/toak5", - "trees/oak/toak6", - "trees/oak/toak7", - "trees/oak/toak8" + "oak-tall/tall-oak1", + "oak-tall/tall-oak2", + "oak-tall/tall-oak3", + "oak-tall/tall-oak4", + "oak-tall/tall-oak5", + "oak-tall/tall-oak6", + "oak-tall/tall-oak7", + "oak-tall/tall-oak8" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-oak-beach.json b/biomes/temperate/tem-oak-beach.json index ea4d6fc6..48049352 100644 --- a/biomes/temperate/tem-oak-beach.json +++ b/biomes/temperate/tem-oak-beach.json @@ -44,7 +44,32 @@ "structure": "village-temperate" } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "chance": 0.001, @@ -58,13 +83,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, @@ -84,10 +109,10 @@ "enabled": true }, "place": [ - "clutter/literalgarbage1", - "clutter/literalgarbage2", - "clutter/literalgarbage3", - "clutter/literalgarbage4" + "garbage/clutter-1", + "garbage/clutter-2", + "garbage/clutter-3", + "garbage/clutter-4" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-oak-denmyre.json b/biomes/temperate/tem-oak-denmyre.json index d2e9b1b1..ed5ae7f9 100644 --- a/biomes/temperate/tem-oak-denmyre.json +++ b/biomes/temperate/tem-oak-denmyre.json @@ -114,7 +114,32 @@ "palette": [{"block": "cobblestone_slab"}] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "mode": "PAINT", @@ -128,7 +153,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -219,16 +244,16 @@ "enabled": true }, "place": [ - "denmyre/clutter/oakdenclutt1", - "denmyre/clutter/oakdenclutt2", - "denmyre/clutter/oakdenclutt3", - "denmyre/clutter/oakdenclutt4", - "denmyre/clutter/oakdenclutt5", - "denmyre/clutter/oakdenclutt6", - "denmyre/clutter/oakdenclutt7", - "denmyre/clutter/oakdenclutt8", - "denmyre/clutter/oakdenclutt9", - "denmyre/clutter/oakdenclutt10" + "denmyre/oak-denmyre-clutter-1", + "denmyre/oak-denmyre-clutter-2", + "denmyre/oak-denmyre-clutter-3", + "denmyre/oak-denmyre-clutter-4", + "denmyre/oak-denmyre-clutter-5", + "denmyre/oak-denmyre-clutter-6", + "denmyre/oak-denmyre-clutter-7", + "denmyre/oak-denmyre-clutter-8", + "denmyre/oak-denmyre-clutter-9", + "denmyre/oak-denmyre-clutter-10" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-oak-forest.json b/biomes/temperate/tem-oak-forest.json index 4f27ac9c..bee18eb8 100644 --- a/biomes/temperate/tem-oak-forest.json +++ b/biomes/temperate/tem-oak-forest.json @@ -52,7 +52,32 @@ "structure": "village-temperate" } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "chance": 0.07, @@ -66,23 +91,23 @@ "enabled": true }, "place": [ - "trees/oak/hoakgeneric3", - "trees/oak/hoakgeneric4", - "trees/oak/hoakgeneric5", - "trees/oak/hoakgeneric6", - "trees/oak/hoakgeneric7", - "trees/oak/hoakgeneric8", - "trees/oak/hoakgeneric9", - "trees/oak/hoakgeneric1", - "trees/oak/shoakgeneric3", - "trees/oak/shoakgeneric4", - "trees/oak/shoakgeneric5", - "trees/oak/shoakgeneric6", - "trees/oak/shoakgeneric7", - "trees/oak/shoakgeneric8", - "trees/oak/shoakgeneric9", - "trees/oak/shoakgeneric1", - "trees/oak/shoakgeneric2" + "hazel-oak/hoak-3", + "hazel-oak/hoak-4", + "hazel-oak/hoak-5", + "hazel-oak/hoak-6", + "hazel-oak/hoak-7", + "hazel-oak/hoak-8", + "hazel-oak/hoak-9", + "hazel-oak/hoak-1", + "hazel-oak/s-hoak-3", + "hazel-oak/s-hoak-4", + "hazel-oak/s-hoak-5", + "hazel-oak/s-hoak-6", + "hazel-oak/s-hoak-7", + "hazel-oak/s-hoak-8", + "hazel-oak/s-hoak-9", + "hazel-oak/s-hoak-1", + "hazel-oak/s-hoak-2" ], "translate": { "x": 0, @@ -103,10 +128,10 @@ "enabled": true }, "place": [ - "clutter/camp1", - "clutter/camp4", - "clutter/camp5", - "clutter/camp3" + "camp/camp", + "camp/camp4", + "camp/camp5", + "camp/camp3" ], "translate": { "x": 0, @@ -143,17 +168,17 @@ } ], "place": [ - "trees/birch/antioch3", - "trees/birch/antioch4", - "trees/birch/antioch5", - "trees/birch/antioch6", - "trees/birch/antioch7", - "trees/birch/antioch8", - "trees/birch/antioch9", - "trees/birch/antioch10", - "trees/birch/antioch11", - "trees/birch/antioch12", - "trees/birch/antioch13" + "birch-antioch/antioch-3", + "birch-antioch/antioch-4", + "birch-antioch/antioch-5", + "birch-antioch/antioch-6", + "birch-antioch/antioch-7", + "birch-antioch/antioch-8", + "birch-antioch/antioch-9", + "birch-antioch/antioch-10", + "birch-antioch/antioch-11", + "birch-antioch/antioch-12", + "birch-antioch/antioch-13" ], "translate": { "x": 0, @@ -173,12 +198,12 @@ "enabled": true }, "place": [ - "trees/oak/thoakgeneric1", - "trees/oak/thoakgeneric2", - "trees/oak/thoakgeneric3", - "trees/oak/thoakgeneric4", - "trees/oak/thoakgeneric8", - "trees/oak/thoakgeneric10" + "hazel-oak/taller-oak-1", + "hazel-oak/taller-oak-2", + "hazel-oak/taller-oak-3", + "hazel-oak/taller-oak-4", + "hazel-oak/taller-oak-8", + "hazel-oak/taller-oak-10" ], "translate": { "x": 0, @@ -198,13 +223,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, @@ -224,10 +249,10 @@ "enabled": true }, "place": [ - "clutter/literalgarbage1", - "clutter/literalgarbage2", - "clutter/literalgarbage3", - "clutter/literalgarbage4" + "garbage/clutter-1", + "garbage/clutter-2", + "garbage/clutter-3", + "garbage/clutter-4" ], "translate": { "x": 0, @@ -257,7 +282,7 @@ "enabled": true }, "mode": "MIN_HEIGHT", - "place": ["trees/mixed/smoakog80"], + "place": ["sm-tree/oakw-oakl-80"], "translate": { "x": 0, "y": -4, diff --git a/biomes/temperate/tem-oak-hills.json b/biomes/temperate/tem-oak-hills.json index 8121e854..ca11b359 100644 --- a/biomes/temperate/tem-oak-hills.json +++ b/biomes/temperate/tem-oak-hills.json @@ -154,11 +154,11 @@ }, { "place": [ - "trees/oak/hoakgeneric1", - "trees/oak/hoakgeneric2", - "trees/oak/hoakgeneric3", - "trees/oak/hoakgeneric4", - "trees/oak/hoakgeneric5" + "hazel-oak/hoak-1", + "hazel-oak/hoak-2", + "hazel-oak/hoak-3", + "hazel-oak/hoak-4", + "hazel-oak/hoak-5" ], "chance": 0.5, "rotation": { @@ -173,11 +173,11 @@ }, { "place": [ - "trees/oak/shoakgeneric1", - "trees/oak/shoakgeneric2", - "trees/oak/shoakgeneric3", - "trees/oak/shoakgeneric4", - "trees/oak/shoakgeneric5" + "hazel-oak/s-hoak-1", + "hazel-oak/s-hoak-2", + "hazel-oak/s-hoak-3", + "hazel-oak/s-hoak-4", + "hazel-oak/s-hoak-5" ], "chance": 0.5, "rotation": { @@ -192,11 +192,11 @@ }, { "place": [ - "trees/oak/thoakgeneric1", - "trees/oak/thoakgeneric2", - "trees/oak/thoakgeneric3", - "trees/oak/thoakgeneric4", - "trees/oak/thoakgeneric6" + "hazel-oak/taller-oak-1", + "hazel-oak/taller-oak-2", + "hazel-oak/taller-oak-3", + "hazel-oak/taller-oak-4", + "hazel-oak/taller-oak-6" ], "chance": 0.5, "rotation": { @@ -211,9 +211,9 @@ }, { "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ], "chance": 0.6, "rotation": { diff --git a/biomes/temperate/tem-oak.json b/biomes/temperate/tem-oak.json index 3b19116f..818ac034 100644 --- a/biomes/temperate/tem-oak.json +++ b/biomes/temperate/tem-oak.json @@ -148,11 +148,11 @@ }, { "place": [ - "trees/oak/hoakgeneric1", - "trees/oak/hoakgeneric2", - "trees/oak/hoakgeneric3", - "trees/oak/hoakgeneric4", - "trees/oak/hoakgeneric5" + "hazel-oak/hoak-1", + "hazel-oak/hoak-2", + "hazel-oak/hoak-3", + "hazel-oak/hoak-4", + "hazel-oak/hoak-5" ], "chance": 0.5, "rotation": { @@ -167,11 +167,11 @@ }, { "place": [ - "trees/oak/shoakgeneric1", - "trees/oak/shoakgeneric2", - "trees/oak/shoakgeneric3", - "trees/oak/shoakgeneric4", - "trees/oak/shoakgeneric5" + "hazel-oak/s-hoak-1", + "hazel-oak/s-hoak-2", + "hazel-oak/s-hoak-3", + "hazel-oak/s-hoak-4", + "hazel-oak/s-hoak-5" ], "chance": 0.5, "rotation": { @@ -186,11 +186,11 @@ }, { "place": [ - "trees/oak/thoakgeneric1", - "trees/oak/thoakgeneric2", - "trees/oak/thoakgeneric3", - "trees/oak/thoakgeneric4", - "trees/oak/thoakgeneric6" + "hazel-oak/taller-oak-1", + "hazel-oak/taller-oak-2", + "hazel-oak/taller-oak-3", + "hazel-oak/taller-oak-4", + "hazel-oak/taller-oak-6" ], "chance": 0.5, "rotation": { @@ -205,9 +205,9 @@ }, { "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ], "chance": 0.6, "rotation": { diff --git a/biomes/temperate/tem-plain-hills.json b/biomes/temperate/tem-plain-hills.json index 17cac63d..9f26ce61 100644 --- a/biomes/temperate/tem-plain-hills.json +++ b/biomes/temperate/tem-plain-hills.json @@ -121,11 +121,11 @@ }, { "place": [ - "objects/structures/landstone1", - "objects/structures/landstone2", - "objects/structures/landstone3", - "objects/structures/landstone4", - "objects/structures/landstone5" + "landform/stone/1", + "landform/stone/2", + "landform/stone/3", + "landform/stone/4", + "landform/stone/5" ], "chance": 0.02, "mode": "MIN_HEIGHT", diff --git a/biomes/temperate/tem-plains.json b/biomes/temperate/tem-plains.json index 9165ddc3..3d2989c0 100644 --- a/biomes/temperate/tem-plains.json +++ b/biomes/temperate/tem-plains.json @@ -138,10 +138,10 @@ "enabled": true }, "place": [ - "clutter/camp1", - "clutter/camp3", - "clutter/camp4", - "clutter/camp5" + "camp/camp", + "camp/camp3", + "camp/camp4", + "camp/camp5" ], "translate": { "x": 0, @@ -161,7 +161,7 @@ }, "enabled": true }, - "place": ["clutter/camp2"], + "place": ["camp/camp2"], "translate": { "x": 0, "y": 0, @@ -180,13 +180,35 @@ }, "enabled": true }, - "place": ["clutter/camp2"], + "place": ["camp/camp2"], "translate": { "x": 0, "y": 0, "z": 0 } }, + { + "chance": 0.002, + "edit": [{ + "find": [{"block": "glass"}], + "replace": {"palette": [{"block": "void_air"}]} + }], + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": ["caves/cave2"], + "translate": { + "x": 0, + "y": -57, + "z": 0 + } + }, { "chance": 0.01, "rotation": { @@ -199,23 +221,23 @@ "enabled": true }, "place": [ - "trees/oak/hoakgeneric3", - "trees/oak/hoakgeneric4", - "trees/oak/hoakgeneric5", - "trees/oak/hoakgeneric6", - "trees/oak/hoakgeneric7", - "trees/oak/hoakgeneric8", - "trees/oak/hoakgeneric9", - "trees/oak/hoakgeneric1", - "trees/oak/shoakgeneric3", - "trees/oak/shoakgeneric4", - "trees/oak/shoakgeneric5", - "trees/oak/shoakgeneric6", - "trees/oak/shoakgeneric7", - "trees/oak/shoakgeneric8", - "trees/oak/shoakgeneric9", - "trees/oak/shoakgeneric1", - "trees/oak/shoakgeneric2" + "hazel-oak/hoak-3", + "hazel-oak/hoak-4", + "hazel-oak/hoak-5", + "hazel-oak/hoak-6", + "hazel-oak/hoak-7", + "hazel-oak/hoak-8", + "hazel-oak/hoak-9", + "hazel-oak/hoak-1", + "hazel-oak/s-hoak-3", + "hazel-oak/s-hoak-4", + "hazel-oak/s-hoak-5", + "hazel-oak/s-hoak-6", + "hazel-oak/s-hoak-7", + "hazel-oak/s-hoak-8", + "hazel-oak/s-hoak-9", + "hazel-oak/s-hoak-1", + "hazel-oak/s-hoak-2" ], "translate": { "x": 0, @@ -275,13 +297,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, @@ -302,11 +324,11 @@ "enabled": true }, "place": [ - "clutter/genericpeak1", - "clutter/genericpeak2", - "clutter/genericpeak3", - "clutter/genericpeak5", - "clutter/genericpeak6" + "peaks/p1", + "peaks/p2", + "peaks/p3", + "peaks/p5", + "peaks/p6" ], "translate": { "x": 0, @@ -340,7 +362,7 @@ "void/void", "void/void", "void/void", - "trees/mixed/smoakog80" + "sm-tree/oakw-oakl-80" ], "translate": { "x": 0, @@ -370,11 +392,11 @@ }, { "place": [ - "objects/structures/landstone1", - "objects/structures/landstone2", - "objects/structures/landstone3", - "objects/structures/landstone4", - "objects/structures/landstone5" + "landform/stone/1", + "landform/stone/2", + "landform/stone/3", + "landform/stone/4", + "landform/stone/5" ], "chance": 0.02, "mode": "MIN_HEIGHT", @@ -389,7 +411,32 @@ } } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + } + ], "biomeStyle": {"style": "IRIS"}, "wall": {"palette": [ {"block": "stone"}, diff --git a/biomes/temperate/tem-plateau.json b/biomes/temperate/tem-plateau.json index d7abb0fb..e4fc560a 100644 --- a/biomes/temperate/tem-plateau.json +++ b/biomes/temperate/tem-plateau.json @@ -63,14 +63,39 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "name": "standard-surface-portals", "chance": 0.005, "place": [ - "clutter/swordnp2", - "clutter/swordnp1", + "global-clutter/BigSwordPortal-unlit-1", + "global-clutter/BigSwordPortal-lit-1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", @@ -122,23 +147,23 @@ "enabled": true }, "place": [ - "trees/oak/hoakgeneric3", - "trees/oak/hoakgeneric4", - "trees/oak/hoakgeneric5", - "trees/oak/hoakgeneric6", - "trees/oak/hoakgeneric7", - "trees/oak/hoakgeneric8", - "trees/oak/hoakgeneric9", - "trees/oak/hoakgeneric1", - "trees/oak/shoakgeneric3", - "trees/oak/shoakgeneric4", - "trees/oak/shoakgeneric5", - "trees/oak/shoakgeneric6", - "trees/oak/shoakgeneric7", - "trees/oak/shoakgeneric8", - "trees/oak/shoakgeneric9", - "trees/oak/shoakgeneric1", - "trees/oak/shoakgeneric2" + "hazel-oak/hoak-3", + "hazel-oak/hoak-4", + "hazel-oak/hoak-5", + "hazel-oak/hoak-6", + "hazel-oak/hoak-7", + "hazel-oak/hoak-8", + "hazel-oak/hoak-9", + "hazel-oak/hoak-1", + "hazel-oak/s-hoak-3", + "hazel-oak/s-hoak-4", + "hazel-oak/s-hoak-5", + "hazel-oak/s-hoak-6", + "hazel-oak/s-hoak-7", + "hazel-oak/s-hoak-8", + "hazel-oak/s-hoak-9", + "hazel-oak/s-hoak-1", + "hazel-oak/s-hoak-2" ], "translate": { "x": 0, @@ -158,7 +183,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -192,17 +217,17 @@ } ], "place": [ - "trees/birch/antioch3", - "trees/birch/antioch4", - "trees/birch/antioch5", - "trees/birch/antioch6", - "trees/birch/antioch7", - "trees/birch/antioch8", - "trees/birch/antioch9", - "trees/birch/antioch10", - "trees/birch/antioch11", - "trees/birch/antioch12", - "trees/birch/antioch13" + "birch-antioch/antioch-3", + "birch-antioch/antioch-4", + "birch-antioch/antioch-5", + "birch-antioch/antioch-6", + "birch-antioch/antioch-7", + "birch-antioch/antioch-8", + "birch-antioch/antioch-9", + "birch-antioch/antioch-10", + "birch-antioch/antioch-11", + "birch-antioch/antioch-12", + "birch-antioch/antioch-13" ], "translate": { "x": 0, @@ -223,12 +248,12 @@ }, "mode": "MIN_HEIGHT", "place": [ - "trees/oak/thoakgeneric1", - "trees/oak/thoakgeneric2", - "trees/oak/thoakgeneric3", - "trees/oak/thoakgeneric4", - "trees/oak/thoakgeneric8", - "trees/oak/thoakgeneric10" + "hazel-oak/taller-oak-1", + "hazel-oak/taller-oak-2", + "hazel-oak/taller-oak-3", + "hazel-oak/taller-oak-4", + "hazel-oak/taller-oak-8", + "hazel-oak/taller-oak-10" ], "translate": { "x": 0, @@ -249,13 +274,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, @@ -276,10 +301,10 @@ "enabled": true }, "place": [ - "clutter/literalgarbage1", - "clutter/literalgarbage2", - "clutter/literalgarbage3", - "clutter/literalgarbage4" + "garbage/clutter-1", + "garbage/clutter-2", + "garbage/clutter-3", + "garbage/clutter-4" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-sakura-pink-child.json b/biomes/temperate/tem-sakura-pink-child.json index ca851540..382ece15 100644 --- a/biomes/temperate/tem-sakura-pink-child.json +++ b/biomes/temperate/tem-sakura-pink-child.json @@ -41,7 +41,32 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "chance": 0.1, @@ -61,23 +86,23 @@ } ], "place": [ - "trees/oak/hoakgeneric3", - "trees/oak/hoakgeneric4", - "trees/oak/hoakgeneric5", - "trees/oak/hoakgeneric6", - "trees/oak/hoakgeneric7", - "trees/oak/hoakgeneric8", - "trees/oak/hoakgeneric9", - "trees/oak/hoakgeneric1", - "trees/oak/shoakgeneric3", - "trees/oak/shoakgeneric4", - "trees/oak/shoakgeneric5", - "trees/oak/shoakgeneric6", - "trees/oak/shoakgeneric7", - "trees/oak/shoakgeneric8", - "trees/oak/shoakgeneric9", - "trees/oak/shoakgeneric1", - "trees/oak/shoakgeneric2" + "hazel-oak/hoak-3", + "hazel-oak/hoak-4", + "hazel-oak/hoak-5", + "hazel-oak/hoak-6", + "hazel-oak/hoak-7", + "hazel-oak/hoak-8", + "hazel-oak/hoak-9", + "hazel-oak/hoak-1", + "hazel-oak/s-hoak-3", + "hazel-oak/s-hoak-4", + "hazel-oak/s-hoak-5", + "hazel-oak/s-hoak-6", + "hazel-oak/s-hoak-7", + "hazel-oak/s-hoak-8", + "hazel-oak/s-hoak-9", + "hazel-oak/s-hoak-1", + "hazel-oak/s-hoak-2" ], "translate": { "x": 0, @@ -98,10 +123,10 @@ "enabled": true }, "place": [ - "clutter/camp1", - "clutter/camp4", - "clutter/camp5", - "clutter/camp3" + "camp/camp", + "camp/camp4", + "camp/camp5", + "camp/camp3" ], "translate": { "x": 0, @@ -147,13 +172,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, @@ -179,10 +204,10 @@ } ], "place": [ - "clutter/literalgarbage1", - "clutter/literalgarbage2", - "clutter/literalgarbage3", - "clutter/literalgarbage4" + "garbage/clutter-1", + "garbage/clutter-2", + "garbage/clutter-3", + "garbage/clutter-4" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-sakura-pink-forest.json b/biomes/temperate/tem-sakura-pink-forest.json index f492e72b..64c5b711 100644 --- a/biomes/temperate/tem-sakura-pink-forest.json +++ b/biomes/temperate/tem-sakura-pink-forest.json @@ -49,10 +49,28 @@ ], "entityInitialSpawns": [ { - "entity": "bee", - "maxSpawns": 5, - "minSpawns": 2, - "rarity": 3 + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 } ], "objects": [ @@ -75,23 +93,23 @@ } ], "place": [ - "trees/oak/hoakgeneric3", - "trees/oak/hoakgeneric4", - "trees/oak/hoakgeneric5", - "trees/oak/hoakgeneric6", - "trees/oak/hoakgeneric7", - "trees/oak/hoakgeneric8", - "trees/oak/hoakgeneric9", - "trees/oak/hoakgeneric1", - "trees/oak/shoakgeneric3", - "trees/oak/shoakgeneric4", - "trees/oak/shoakgeneric5", - "trees/oak/shoakgeneric6", - "trees/oak/shoakgeneric7", - "trees/oak/shoakgeneric8", - "trees/oak/shoakgeneric9", - "trees/oak/shoakgeneric1", - "trees/oak/shoakgeneric2" + "hazel-oak/hoak-3", + "hazel-oak/hoak-4", + "hazel-oak/hoak-5", + "hazel-oak/hoak-6", + "hazel-oak/hoak-7", + "hazel-oak/hoak-8", + "hazel-oak/hoak-9", + "hazel-oak/hoak-1", + "hazel-oak/s-hoak-3", + "hazel-oak/s-hoak-4", + "hazel-oak/s-hoak-5", + "hazel-oak/s-hoak-6", + "hazel-oak/s-hoak-7", + "hazel-oak/s-hoak-8", + "hazel-oak/s-hoak-9", + "hazel-oak/s-hoak-1", + "hazel-oak/s-hoak-2" ], "translate": { "x": 0, @@ -112,10 +130,10 @@ "enabled": true }, "place": [ - "clutter/camp1", - "clutter/camp4", - "clutter/camp5", - "clutter/camp3" + "camp/camp", + "camp/camp4", + "camp/camp5", + "camp/camp3" ], "translate": { "x": 0, @@ -161,13 +179,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, @@ -187,10 +205,10 @@ "enabled": true }, "place": [ - "clutter/literalgarbage1", - "clutter/literalgarbage2", - "clutter/literalgarbage3", - "clutter/literalgarbage4" + "garbage/clutter-1", + "garbage/clutter-2", + "garbage/clutter-3", + "garbage/clutter-4" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-stranged-plains.json b/biomes/temperate/tem-stranged-plains.json index 6831e9e6..189c8ad6 100644 --- a/biomes/temperate/tem-stranged-plains.json +++ b/biomes/temperate/tem-stranged-plains.json @@ -78,10 +78,10 @@ "enabled": true }, "place": [ - "clutter/camp1", - "clutter/camp3", - "clutter/camp4", - "clutter/camp5" + "camp/camp", + "camp/camp3", + "camp/camp4", + "camp/camp5" ] }, { @@ -96,23 +96,23 @@ "enabled": true }, "place": [ - "trees/oak/hoakgeneric3", - "trees/oak/hoakgeneric4", - "trees/oak/hoakgeneric5", - "trees/oak/hoakgeneric6", - "trees/oak/hoakgeneric7", - "trees/oak/hoakgeneric8", - "trees/oak/hoakgeneric9", - "trees/oak/hoakgeneric1", - "trees/oak/shoakgeneric3", - "trees/oak/shoakgeneric4", - "trees/oak/shoakgeneric5", - "trees/oak/shoakgeneric6", - "trees/oak/shoakgeneric7", - "trees/oak/shoakgeneric8", - "trees/oak/shoakgeneric9", - "trees/oak/shoakgeneric1", - "trees/oak/shoakgeneric2" + "hazel-oak/hoak-3", + "hazel-oak/hoak-4", + "hazel-oak/hoak-5", + "hazel-oak/hoak-6", + "hazel-oak/hoak-7", + "hazel-oak/hoak-8", + "hazel-oak/hoak-9", + "hazel-oak/hoak-1", + "hazel-oak/s-hoak-3", + "hazel-oak/s-hoak-4", + "hazel-oak/s-hoak-5", + "hazel-oak/s-hoak-6", + "hazel-oak/s-hoak-7", + "hazel-oak/s-hoak-8", + "hazel-oak/s-hoak-9", + "hazel-oak/s-hoak-1", + "hazel-oak/s-hoak-2" ] }, { @@ -151,7 +151,7 @@ "void/void", "void/void", "void/void", - "trees/mixed/smoakog80" + "sm-tree/oakw-oakl-80" ], "translate": { "x": 0, @@ -181,11 +181,11 @@ }, { "place": [ - "objects/structures/landstone1", - "objects/structures/landstone2", - "objects/structures/landstone3", - "objects/structures/landstone4", - "objects/structures/landstone5" + "landform/stone/1", + "landform/stone/2", + "landform/stone/3", + "landform/stone/4", + "landform/stone/5" ], "chance": 0.02, "mode": "MIN_HEIGHT", @@ -225,6 +225,32 @@ ] } ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + } + ], "biomeZoom": 60, "biomeStyle": {"style": "IRIS"}, "wall": {"palette": [ diff --git a/biomes/temperate/tem-wilds.json b/biomes/temperate/tem-wilds.json index 8ef19dbe..4162c1e5 100644 --- a/biomes/temperate/tem-wilds.json +++ b/biomes/temperate/tem-wilds.json @@ -81,7 +81,32 @@ "style": {"style": "IRIS"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "effects": [{ "interval": 250, "chance": 5, @@ -94,9 +119,9 @@ { "chance": 0.125, "place": [ - "clutter/oakshrub1", - "clutter/oakshrub2", - "clutter/oakshrub3" + "shrub/shrub1", + "shrub/shrub2", + "shrub/shrub3" ], "translate": {"y": -1} }, @@ -112,13 +137,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, @@ -138,8 +163,8 @@ "enabled": true }, "place": [ - "clutter/camp1", - "clutter/bincluster1" + "camp/camp", + "camp/barrel-bin" ], "translate": { "x": 0, diff --git a/biomes/tropical/tro-bamboo-forest.json b/biomes/tropical/tro-bamboo-forest.json index 9d57bca7..17686d08 100644 --- a/biomes/tropical/tro-bamboo-forest.json +++ b/biomes/tropical/tro-bamboo-forest.json @@ -12,7 +12,7 @@ }], "customDerivitives": [{ "id": "trobamboo", - "foliageColor": "#20A52F", + "foliageColor": "#44A906", "grassColor": "#1E7307", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2", @@ -99,7 +99,7 @@ "replace": {"palette": [{"block": "air"}]} }, { - "find": [{"block": "birch_leaves"}], + "find": [{"block": "acacia_leaves"}], "replace": {"palette": [{ "block": "jungle_leaves", "data": {"persistent": true} @@ -107,23 +107,23 @@ }, { "find": [{"block": "stripped_birch_log"}], - "replace": {"palette": [{"block": "jungle_wood"}]} + "replace": {"palette": [{"block": "stripped_jungle_log"}]} }, { "find": [{"block": "stripped_birch_wood"}], - "replace": {"palette": [{"block": "oak_wood"}]} + "replace": {"palette": [{"block": "stripped_jungle_wood"}]} } ], "place": [ - "jungle-remade/bmbogeneric1", - "jungle-remade/bmbogeneric2", - "jungle-remade/bmbogeneric3", - "jungle-remade/bmbogeneric4", - "jungle-remade/bmbogeneric5", - "jungle-remade/bmbogeneric6", - "jungle-remade/bmbogeneric7", - "jungle-remade/bmbogeneric8", - "jungle-remade/bmbogeneric9" + "jungle-remade/bmbo-1", + "jungle-remade/bmbo-2", + "jungle-remade/bmbo-3", + "jungle-remade/bmbo-4", + "jungle-remade/bmbo-5", + "jungle-remade/bmbo-6", + "jungle-remade/bmbo-7", + "jungle-remade/bmbo-8", + "jungle-remade/bmbo-9" ], "translate": { "x": 0, @@ -161,13 +161,13 @@ } ], "place": [ - "jungle-remade/spire1", - "jungle-remade/spire2", - "jungle-remade/spire3", - "jungle-remade/spire4", - "jungle-remade/spire5", - "jungle-remade/spire6", - "jungle-remade/spire7" + "jungle-remade/jspire-1", + "jungle-remade/jspire-2", + "jungle-remade/jspire-3", + "jungle-remade/jspire-4", + "jungle-remade/jspire-5", + "jungle-remade/jspire-6", + "jungle-remade/jspire-7" ], "translate": { "x": 0, @@ -176,7 +176,32 @@ } } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "biomeZoom": 10, "biomeStyle": {"style": "IRIS"}, "effects": [{ diff --git a/biomes/tropical/tro-beach-bamboo.json b/biomes/tropical/tro-beach-bamboo.json index 6157f238..a5328c20 100644 --- a/biomes/tropical/tro-beach-bamboo.json +++ b/biomes/tropical/tro-beach-bamboo.json @@ -31,6 +31,20 @@ "interval": 550, "particleCount": 0 }], + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.03, diff --git a/biomes/tropical/tro-beach-charred.json b/biomes/tropical/tro-beach-charred.json index f0f0d45a..fffc56f3 100644 --- a/biomes/tropical/tro-beach-charred.json +++ b/biomes/tropical/tro-beach-charred.json @@ -31,6 +31,12 @@ "interval": 550, "particleCount": 0 }], + "entityInitialSpawns": [{ + "entity": "wolf", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4 + }], "decorators": [{ "chance": 0.01, "variance": {"style": "STATIC"}, @@ -75,10 +81,10 @@ "palm/palm1", "palm/palm2", "palm/palm3", - "palm/palm12", - "palm/palm11", - "palm/palm10", - "palm/palm9" + "palm/palm-4", + "palm/palm-6", + "palm/palm-7", + "palm/palm-8" ], "translate": { "x": 0, diff --git a/biomes/tropical/tro-beach.json b/biomes/tropical/tro-beach.json index d94e4f35..24615200 100644 --- a/biomes/tropical/tro-beach.json +++ b/biomes/tropical/tro-beach.json @@ -31,6 +31,20 @@ "interval": 550, "particleCount": 0 }], + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.01, @@ -89,10 +103,10 @@ "palm/palm1", "palm/palm2", "palm/palm3", - "palm/palm12", - "palm/palm11", - "palm/palm10", - "palm/palm9" + "palm/palm-4", + "palm/palm-6", + "palm/palm-7", + "palm/palm-8" ], "translate": { "x": 0, diff --git a/biomes/tropical/tro-highlands.json b/biomes/tropical/tro-highlands.json index 93efd98e..4c066c52 100644 --- a/biomes/tropical/tro-highlands.json +++ b/biomes/tropical/tro-highlands.json @@ -11,7 +11,7 @@ }], "customDerivitives": [{ "id": "trohighlands", - "foliageColor": "#478F04", + "foliageColor": "#40C42B", "grassColor": "#41A726", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2", @@ -67,7 +67,32 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "decorators": [ { "chance": 0.003, @@ -127,16 +152,16 @@ "enabled": true }, "place": [ - "clutter/oakclutt1", - "clutter/oakclutt2", - "clutter/oakclutt3", - "clutter/oakclutt4", - "clutter/oakclutt5", - "clutter/birchclutt1", - "clutter/birchclutt2", - "clutter/birchclutt3", - "clutter/birchclutt4", - "clutter/birchclutt5" + "clutter/oak-clutt-1", + "clutter/oak-clutt-2", + "clutter/oak-clutt-3", + "clutter/oak-clutt-4", + "clutter/oak-clutt-5", + "clutter/birch-clutt-1", + "clutter/birch-clutt-2", + "clutter/birch-clutt-3", + "clutter/birch-clutt-4", + "clutter/birch-clutt-5" ], "translate": { "x": 0, diff --git a/biomes/tropical/tro-island-beach.json b/biomes/tropical/tro-island-beach.json index a496ba12..0f996cea 100644 --- a/biomes/tropical/tro-island-beach.json +++ b/biomes/tropical/tro-island-beach.json @@ -31,7 +31,20 @@ "interval": 550, "particleCount": 0 }], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.01, diff --git a/biomes/tropical/tro-jungle-denmyre.json b/biomes/tropical/tro-jungle-denmyre.json index 513b776c..dd0e1272 100644 --- a/biomes/tropical/tro-jungle-denmyre.json +++ b/biomes/tropical/tro-jungle-denmyre.json @@ -56,7 +56,20 @@ "interval": 550, "particleCount": 0 }], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.4, @@ -181,16 +194,16 @@ "enabled": true }, "place": [ - "denmyre/clutter/oakdenclutt1", - "denmyre/clutter/oakdenclutt2", - "denmyre/clutter/oakdenclutt3", - "denmyre/clutter/oakdenclutt4", - "denmyre/clutter/oakdenclutt5", - "denmyre/clutter/oakdenclutt6", - "denmyre/clutter/oakdenclutt7", - "denmyre/clutter/oakdenclutt8", - "denmyre/clutter/oakdenclutt9", - "denmyre/clutter/oakdenclutt10" + "denmyre/oak-denmyre-clutter-1", + "denmyre/oak-denmyre-clutter-2", + "denmyre/oak-denmyre-clutter-3", + "denmyre/oak-denmyre-clutter-4", + "denmyre/oak-denmyre-clutter-5", + "denmyre/oak-denmyre-clutter-6", + "denmyre/oak-denmyre-clutter-7", + "denmyre/oak-denmyre-clutter-8", + "denmyre/oak-denmyre-clutter-9", + "denmyre/oak-denmyre-clutter-10" ], "translate": { "x": 0, diff --git a/biomes/tropical/tro-mountain-extreme.json b/biomes/tropical/tro-mountain-extreme.json index f0f9e686..5ace1524 100644 --- a/biomes/tropical/tro-mountain-extreme.json +++ b/biomes/tropical/tro-mountain-extreme.json @@ -12,10 +12,10 @@ }], "customDerivitives": [{ "id": "tromtnextreme", - "foliageColor": "#478F04", - "grassColor": "#41A726", + "foliageColor": "#40C42B", + "grassColor": "#5CCA52", "waterColor": "#3AB2A2", - "waterFogColor": "#3FE727", + "waterFogColor": "#3AB2A2", "category": "jungle" }], "layers": [ @@ -137,9 +137,9 @@ "objects": [ { "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ], "chance": 1, "density": 5 diff --git a/biomes/tropical/tro-mountain-middle.json b/biomes/tropical/tro-mountain-middle.json index 26b28c52..be0959f5 100644 --- a/biomes/tropical/tro-mountain-middle.json +++ b/biomes/tropical/tro-mountain-middle.json @@ -19,8 +19,8 @@ ], "customDerivitives": [{ "id": "tromtnmiddle", - "foliageColor": "#478F04", - "grassColor": "#41A726", + "foliageColor": "#40C42B", + "grassColor": "#1E7307", "waterColor": "#3AB2A2", "fogColor": "#6DCA87", "category": "jungle" @@ -111,9 +111,9 @@ { "mode": "PAINT", "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ], "chance": 1, "density": 5 diff --git a/biomes/tropical/tro-mountain-plains.json b/biomes/tropical/tro-mountain-plains.json index aac6ee3d..94c6bbcf 100644 --- a/biomes/tropical/tro-mountain-plains.json +++ b/biomes/tropical/tro-mountain-plains.json @@ -11,8 +11,8 @@ }], "customDerivitives": [{ "id": "tromtnplains", - "foliageColor": "#258F04", - "grassColor": "#41A726", + "foliageColor": "#40C42B", + "grassColor": "#5CCA52", "category": "jungle", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" @@ -150,9 +150,9 @@ "objects": [ { "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ], "chance": 1, "density": 5 diff --git a/biomes/tropical/tro-mountain.json b/biomes/tropical/tro-mountain.json index 4315f308..ffd1b666 100644 --- a/biomes/tropical/tro-mountain.json +++ b/biomes/tropical/tro-mountain.json @@ -12,8 +12,8 @@ }], "customDerivitives": [{ "id": "tromountain", - "foliageColor": "#478F04", - "grassColor": "#41A726", + "foliageColor": "#40C42B", + "grassColor": "#5CCA52", "category": "jungle", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" @@ -115,9 +115,9 @@ { "mode": "PAINT", "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ], "chance": 1, "density": 5 diff --git a/biomes/tropical/tro-plains-hills.json b/biomes/tropical/tro-plains-hills.json index 3313a08a..c96ae9ea 100644 --- a/biomes/tropical/tro-plains-hills.json +++ b/biomes/tropical/tro-plains-hills.json @@ -12,7 +12,7 @@ "customDerivitives": [{ "id": "troplainshills", "foliageColor": "#40C42B", - "grassColor": "#41A726", + "grassColor": "#1E7307", "category": "jungle", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" @@ -96,17 +96,17 @@ "enabled": true }, "place": [ - "jungle-remade/cocogeneric2", - "jungle-remade/cocogeneric3", - "jungle-remade/cocogeneric4", - "jungle-remade/cocogeneric5", - "jungle-remade/lgeneric6", - "jungle-remade/lgeneric7", - "jungle-remade/lgeneric8", - "jungle-remade/lgeneric9", - "jungle-remade/lgeneric1", - "jungle-remade/lgeneric2", - "jungle-remade/lgeneric3" + "jungle-remade/jcoco-2", + "jungle-remade/jcoco-3", + "jungle-remade/jcoco-4", + "jungle-remade/jcoco-5", + "jungle-remade/J6", + "jungle-remade/J7", + "jungle-remade/J8", + "jungle-remade/J9", + "jungle-remade/J11", + "jungle-remade/J12", + "jungle-remade/J13" ], "translate": { "x": 0, @@ -117,9 +117,9 @@ { "mode": "PAINT", "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ], "chance": 1, "density": 5 diff --git a/biomes/tropical/tro-plains.json b/biomes/tropical/tro-plains.json index ac5e247f..b36ceba0 100644 --- a/biomes/tropical/tro-plains.json +++ b/biomes/tropical/tro-plains.json @@ -101,10 +101,10 @@ "enabled": true }, "place": [ - "jungle-remade/cocogeneric2", - "jungle-remade/cocogeneric3", - "jungle-remade/cocogeneric4", - "jungle-remade/cocogeneric5" + "jungle-remade/jcoco-2", + "jungle-remade/jcoco-3", + "jungle-remade/jcoco-4", + "jungle-remade/jcoco-5" ], "translate": { "x": 0, @@ -115,9 +115,9 @@ { "mode": "PAINT", "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ], "chance": 1, "density": 5 diff --git a/biomes/tropical/tro-rainforest-hills.json b/biomes/tropical/tro-rainforest-hills.json index cf7418f0..bc766bab 100644 --- a/biomes/tropical/tro-rainforest-hills.json +++ b/biomes/tropical/tro-rainforest-hills.json @@ -11,7 +11,7 @@ }], "customDerivitives": [{ "id": "trohills", - "foliageColor": "#258F04", + "foliageColor": "#40C42B", "grassColor": "#41A726", "category": "jungle", "waterColor": "#3AB2A2", @@ -73,7 +73,20 @@ "interval": 550, "particleCount": 0 }], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.45, @@ -140,7 +153,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, @@ -160,17 +173,17 @@ "enabled": true }, "place": [ - "jungle-remade/cocogeneric2", - "jungle-remade/cocogeneric3", - "jungle-remade/cocogeneric4", - "jungle-remade/cocogeneric5", - "jungle-remade/spire1", - "jungle-remade/spire2", - "jungle-remade/spire3", - "jungle-remade/spire4", - "jungle-remade/spire5", - "jungle-remade/spire6", - "jungle-remade/spire7" + "jungle-remade/jcoco-2", + "jungle-remade/jcoco-3", + "jungle-remade/jcoco-4", + "jungle-remade/jcoco-5", + "jungle-remade/jspire-1", + "jungle-remade/jspire-2", + "jungle-remade/jspire-3", + "jungle-remade/jspire-4", + "jungle-remade/jspire-5", + "jungle-remade/jspire-6", + "jungle-remade/jspire-7" ], "translate": { "x": 0, @@ -191,17 +204,17 @@ "enabled": true }, "place": [ - "jungle-remade/cocogeneric2", - "jungle-remade/cocogeneric3", - "jungle-remade/cocogeneric4", - "jungle-remade/cocogeneric5", - "jungle-remade/lgeneric6", - "jungle-remade/lgeneric7", - "jungle-remade/lgeneric8", - "jungle-remade/lgeneric9", - "jungle-remade/lgeneric1", - "jungle-remade/lgeneric2", - "jungle-remade/lgeneric3" + "jungle-remade/jcoco-2", + "jungle-remade/jcoco-3", + "jungle-remade/jcoco-4", + "jungle-remade/jcoco-5", + "jungle-remade/J6", + "jungle-remade/J7", + "jungle-remade/J8", + "jungle-remade/J9", + "jungle-remade/J11", + "jungle-remade/J12", + "jungle-remade/J13" ], "translate": { "x": 0, @@ -249,11 +262,11 @@ "enabled": true }, "place": [ - "jungle-remade/largegeneric1", - "jungle-remade/largegeneric2", - "jungle-remade/largegeneric3", - "jungle-remade/largegeneric4", - "jungle-remade/largegeneric5" + "jungle-remade/bjungle-1", + "jungle-remade/bjungle-2", + "jungle-remade/bjungle-3", + "jungle-remade/bjungle-4", + "jungle-remade/bjungle-5" ], "translate": { "x": 0, diff --git a/biomes/tropical/tro-rainforest-island.json b/biomes/tropical/tro-rainforest-island.json index cd671743..4fa3df1c 100644 --- a/biomes/tropical/tro-rainforest-island.json +++ b/biomes/tropical/tro-rainforest-island.json @@ -5,14 +5,14 @@ "color": "#6F9F60", "vanillaDerivative": "MODIFIED_JUNGLE_EDGE", "generators": [{ - "min": 25, + "min": 49, "max": 65, - "generator": "mountain" + "generator": "plain" }], "customDerivitives": [{ "id": "troisle", - "foliageColor": "#258F04", - "grassColor": "#3FE727", + "foliageColor": "#40C42B", + "grassColor": "#2DAF09", "category": "jungle", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" @@ -54,7 +54,20 @@ "maxHeight": 64, "palette": [{"block": "air"}] }], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "effects": [{ "particleAltX": 0.301, "particleAltY": -0.33885, @@ -130,7 +143,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, @@ -148,7 +161,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -168,17 +181,17 @@ "enabled": true }, "place": [ - "jungle-remade/cocogeneric2", - "jungle-remade/cocogeneric3", - "jungle-remade/cocogeneric4", - "jungle-remade/cocogeneric5", - "jungle-remade/lgeneric6", - "jungle-remade/lgeneric7", - "jungle-remade/lgeneric8", - "jungle-remade/lgeneric9", - "jungle-remade/lgeneric1", - "jungle-remade/lgeneric2", - "jungle-remade/lgeneric3" + "jungle-remade/jcoco-2", + "jungle-remade/jcoco-3", + "jungle-remade/jcoco-4", + "jungle-remade/jcoco-5", + "jungle-remade/J6", + "jungle-remade/J7", + "jungle-remade/J8", + "jungle-remade/J9", + "jungle-remade/J11", + "jungle-remade/J12", + "jungle-remade/J13" ], "translate": { "x": 0, @@ -198,10 +211,10 @@ "enabled": true }, "place": [ - "jungle-remade/sgeneric1", - "jungle-remade/sgeneric2", - "jungle-remade/sgeneric3", - "jungle-remade/sgeneric4" + "jungle-remade/sjungle-1", + "jungle-remade/sjungle-2", + "jungle-remade/sjungle-3", + "jungle-remade/sjungle-4" ], "translate": { "x": 0, @@ -249,11 +262,11 @@ "enabled": true }, "place": [ - "jungle-remade/largegeneric1", - "jungle-remade/largegeneric2", - "jungle-remade/largegeneric3", - "jungle-remade/largegeneric4", - "jungle-remade/largegeneric5" + "jungle-remade/bjungle-1", + "jungle-remade/bjungle-2", + "jungle-remade/bjungle-3", + "jungle-remade/bjungle-4", + "jungle-remade/bjungle-5" ], "translate": { "x": 0, diff --git a/biomes/tropical/tro-rainforest-wicked-child.json b/biomes/tropical/tro-rainforest-wicked-child.json index a2ec2dbc..2152adc9 100644 --- a/biomes/tropical/tro-rainforest-wicked-child.json +++ b/biomes/tropical/tro-rainforest-wicked-child.json @@ -73,7 +73,20 @@ "interval": 550, "particleCount": 3 }], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.45, @@ -139,7 +152,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, @@ -157,7 +170,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -177,17 +190,17 @@ "enabled": true }, "place": [ - "jungle-remade/cocogeneric2", - "jungle-remade/cocogeneric3", - "jungle-remade/cocogeneric4", - "jungle-remade/cocogeneric5", - "jungle-remade/lgeneric6", - "jungle-remade/lgeneric7", - "jungle-remade/lgeneric8", - "jungle-remade/lgeneric9", - "jungle-remade/lgeneric1", - "jungle-remade/lgeneric2", - "jungle-remade/lgeneric3" + "jungle-remade/jcoco-2", + "jungle-remade/jcoco-3", + "jungle-remade/jcoco-4", + "jungle-remade/jcoco-5", + "jungle-remade/J6", + "jungle-remade/J7", + "jungle-remade/J8", + "jungle-remade/J9", + "jungle-remade/J11", + "jungle-remade/J12", + "jungle-remade/J13" ], "translate": { "x": 0, @@ -207,10 +220,10 @@ "enabled": true }, "place": [ - "jungle-remade/sgeneric1", - "jungle-remade/sgeneric2", - "jungle-remade/sgeneric3", - "jungle-remade/sgeneric4" + "jungle-remade/sjungle-1", + "jungle-remade/sjungle-2", + "jungle-remade/sjungle-3", + "jungle-remade/sjungle-4" ], "translate": { "x": 0, @@ -258,11 +271,11 @@ "enabled": true }, "place": [ - "jungle-remade/largegeneric1", - "jungle-remade/largegeneric2", - "jungle-remade/largegeneric3", - "jungle-remade/largegeneric4", - "jungle-remade/largegeneric5" + "jungle-remade/bjungle-1", + "jungle-remade/bjungle-2", + "jungle-remade/bjungle-3", + "jungle-remade/bjungle-4", + "jungle-remade/bjungle-5" ], "translate": { "x": 0, diff --git a/biomes/tropical/tro-rainforest-wicked-village.json b/biomes/tropical/tro-rainforest-wicked-village.json index ec61d5c8..69f121b0 100644 --- a/biomes/tropical/tro-rainforest-wicked-village.json +++ b/biomes/tropical/tro-rainforest-wicked-village.json @@ -59,7 +59,20 @@ "interval": 550, "particleCount": 0 }], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.45, diff --git a/biomes/tropical/tro-rainforest-wicked.json b/biomes/tropical/tro-rainforest-wicked.json index 224458f4..be6aed6f 100644 --- a/biomes/tropical/tro-rainforest-wicked.json +++ b/biomes/tropical/tro-rainforest-wicked.json @@ -2,7 +2,7 @@ "name": "Tropical Rainforest Wicked", "derivative": "MODIFIED_JUNGLE", "rarity": 1, - "color": "#10EF15", + "color": "10EF15#", "vanillaDerivative": "MODIFIED_JUNGLE_EDGE", "children": [ "tropical/tro-rainforest-hills", @@ -64,6 +64,20 @@ "interval": 550, "particleCount": 0 }], + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.45, @@ -129,7 +143,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, @@ -147,7 +161,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -167,17 +181,17 @@ "enabled": true }, "place": [ - "jungle-remade/cocogeneric2", - "jungle-remade/cocogeneric3", - "jungle-remade/cocogeneric4", - "jungle-remade/cocogeneric5", - "jungle-remade/lgeneric6", - "jungle-remade/lgeneric7", - "jungle-remade/lgeneric8", - "jungle-remade/lgeneric9", - "jungle-remade/lgeneric1", - "jungle-remade/lgeneric2", - "jungle-remade/lgeneric3" + "jungle-remade/jcoco-2", + "jungle-remade/jcoco-3", + "jungle-remade/jcoco-4", + "jungle-remade/jcoco-5", + "jungle-remade/J6", + "jungle-remade/J7", + "jungle-remade/J8", + "jungle-remade/J9", + "jungle-remade/J11", + "jungle-remade/J12", + "jungle-remade/J13" ], "translate": { "x": 0, @@ -197,10 +211,10 @@ "enabled": true }, "place": [ - "jungle-remade/sgeneric1", - "jungle-remade/sgeneric2", - "jungle-remade/sgeneric3", - "jungle-remade/sgeneric4" + "jungle-remade/sjungle-1", + "jungle-remade/sjungle-2", + "jungle-remade/sjungle-3", + "jungle-remade/sjungle-4" ], "translate": { "x": 0, @@ -248,11 +262,11 @@ "enabled": true }, "place": [ - "jungle-remade/largegeneric1", - "jungle-remade/largegeneric2", - "jungle-remade/largegeneric3", - "jungle-remade/largegeneric4", - "jungle-remade/largegeneric5" + "jungle-remade/bjungle-1", + "jungle-remade/bjungle-2", + "jungle-remade/bjungle-3", + "jungle-remade/bjungle-4", + "jungle-remade/bjungle-5" ], "translate": { "x": 0, diff --git a/biomes/tropical/tro-rainforest.json b/biomes/tropical/tro-rainforest.json index a60803f1..874361c1 100644 --- a/biomes/tropical/tro-rainforest.json +++ b/biomes/tropical/tro-rainforest.json @@ -15,7 +15,7 @@ }], "customDerivitives": [{ "id": "trorainforest", - "foliageColor": "#258F04", + "foliageColor": "#40C42B", "grassColor": "#2DAF09", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2", @@ -63,6 +63,20 @@ "interval": 550, "particleCount": 3 }], + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4 + } + ], "decorators": [ { "chance": 0.45, @@ -140,7 +154,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, @@ -158,7 +172,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -178,17 +192,17 @@ "enabled": true }, "place": [ - "jungle-remade/cocogeneric2", - "jungle-remade/cocogeneric3", - "jungle-remade/cocogeneric4", - "jungle-remade/cocogeneric5", - "jungle-remade/lgeneric6", - "jungle-remade/lgeneric7", - "jungle-remade/lgeneric8", - "jungle-remade/lgeneric9", - "jungle-remade/lgeneric1", - "jungle-remade/lgeneric2", - "jungle-remade/lgeneric3" + "jungle-remade/jcoco-2", + "jungle-remade/jcoco-3", + "jungle-remade/jcoco-4", + "jungle-remade/jcoco-5", + "jungle-remade/J6", + "jungle-remade/J7", + "jungle-remade/J8", + "jungle-remade/J9", + "jungle-remade/J11", + "jungle-remade/J12", + "jungle-remade/J13" ], "translate": { "x": 0, @@ -208,10 +222,10 @@ "enabled": true }, "place": [ - "jungle-remade/sgeneric1", - "jungle-remade/sgeneric2", - "jungle-remade/sgeneric3", - "jungle-remade/sgeneric4" + "jungle-remade/sjungle-1", + "jungle-remade/sjungle-2", + "jungle-remade/sjungle-3", + "jungle-remade/sjungle-4" ], "translate": { "x": 0, @@ -259,11 +273,11 @@ "enabled": true }, "place": [ - "jungle-remade/largegeneric1", - "jungle-remade/largegeneric2", - "jungle-remade/largegeneric3", - "jungle-remade/largegeneric4", - "jungle-remade/largegeneric5" + "jungle-remade/bjungle-1", + "jungle-remade/bjungle-2", + "jungle-remade/bjungle-3", + "jungle-remade/bjungle-4", + "jungle-remade/bjungle-5" ], "translate": { "x": 0, diff --git a/biomes/tropical/tro-volcanic-plains.json b/biomes/tropical/tro-volcanic-plains.json index 4efb5ff7..04353851 100644 --- a/biomes/tropical/tro-volcanic-plains.json +++ b/biomes/tropical/tro-volcanic-plains.json @@ -10,15 +10,6 @@ "max": 190, "generator": "mountain" }], - "customDerivitives": [ - { - "id": "trovolcanoplains", - "grassColor": "#9BC20D", - "foliageColor": "#9CD320", - "fogColor": "#DD793C", - "downfallType": "none" - } - ], "layers": [ { "style": { @@ -79,9 +70,9 @@ "childShrinkFactor": 1, "objects": [{ "place": [ - "objects/structures/landspike1", - "objects/structures/landspike2", - "objects/structures/landspike3" + "landform/spikes/1", + "landform/spikes/2", + "landform/spikes/3" ], "chance": 1, "density": 2, diff --git a/biomes/tropical/tro-volcanoes-lava.json b/biomes/tropical/tro-volcanoes-lava.json index 183ce214..c980e9cd 100644 --- a/biomes/tropical/tro-volcanoes-lava.json +++ b/biomes/tropical/tro-volcanoes-lava.json @@ -4,15 +4,6 @@ "vanillaDerivative": "THE_VOID", "rarity": 1, "color": "#50AF52", - "customDerivitives": [ - { - "id": "trovolcanolava", - "grassColor": "#BDBF0B", - "foliageColor": "#BDBF0B", - "fogColor": "#DD793C", - "downfallType": "none" - } - ], "generators": [ { "generator": "mountain", diff --git a/biomes/tropical/tro-volcanoes.json b/biomes/tropical/tro-volcanoes.json index c1b4a7d3..57247faf 100644 --- a/biomes/tropical/tro-volcanoes.json +++ b/biomes/tropical/tro-volcanoes.json @@ -4,15 +4,6 @@ "vanillaDerivative": "THE_VOID", "rarity": 1, "color": "#609F61", - "customDerivitives": [ - { - "id": "trovolcanolava", - "grassColor": "#BDBF0B", - "foliageColor": "#BDBF0B", - "fogColor": "#DD793C", - "downfallType": "none" - } - ], "children": ["tropical/tro-volcanoes-lava"], "generators": [ { diff --git a/biomes/tropical/tro-wilds.json b/biomes/tropical/tro-wilds.json index a42299d5..01e128e3 100644 --- a/biomes/tropical/tro-wilds.json +++ b/biomes/tropical/tro-wilds.json @@ -11,7 +11,7 @@ "generator": "mountain" }], "customDerivitives": [{ - "id": "trowilds", + "id": "tromtnextreme", "foliageColor": "#2C8806", "grassColor": "#183F0E", "waterColor": "#11BA89", @@ -113,7 +113,32 @@ "style": {"style": "IRIS"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "effects": [{ "interval": 250, "chance": 5, @@ -126,9 +151,9 @@ { "chance": 0.125, "place": [ - "clutter/oakshrub1", - "clutter/oakshrub2", - "clutter/oakshrub3" + "shrub/shrub1", + "shrub/shrub2", + "shrub/shrub3" ], "translate": {"y": -1} }, @@ -144,13 +169,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, @@ -170,8 +195,8 @@ "enabled": true }, "place": [ - "clutter/camp1", - "clutter/bincluster1" + "camp/camp", + "camp/barrel-bin" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-beach.json b/biomes/tundra/tun-beach.json index 123a0a30..611d43fc 100644 --- a/biomes/tundra/tun-beach.json +++ b/biomes/tundra/tun-beach.json @@ -75,8 +75,8 @@ "name": "standard-surface-portals", "chance": 0.00505, "place": [ - "clutter/swordnp2", - "clutter/swordnp1", + "global-clutter/BigSwordPortal-unlit-1", + "global-clutter/BigSwordPortal-lit-1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", @@ -116,7 +116,26 @@ "mode": "VACUUM", "carvingSupport": "SURFACE_ONLY" }], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "slab": { "style": {"style": "STATIC"}, "palette": [ diff --git a/biomes/tundra/tun-bonsai-forest.json b/biomes/tundra/tun-bonsai-forest.json index 669ccaf0..ac3b09fb 100644 --- a/biomes/tundra/tun-bonsai-forest.json +++ b/biomes/tundra/tun-bonsai-forest.json @@ -127,7 +127,26 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "chance": 0.00375, @@ -140,7 +159,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -187,13 +206,13 @@ "enabled": true }, "place": [ - "clutter/stoneclutt1", - "clutter/stoneclutt2", - "clutter/stoneclutt3", - "clutter/stoneclutt4", - "clutter/stoneclutt5", - "clutter/stoneclutt6", - "clutter/stoneclutt7" + "clutter/stone-clutt-1", + "clutter/stone-clutt-2", + "clutter/stone-clutt-3", + "clutter/stone-clutt-4", + "clutter/stone-clutt-5", + "clutter/stone-clutt-6", + "clutter/stone-clutt-7" ], "translate": { "x": 0, @@ -220,14 +239,14 @@ "enabled": true }, "place": [ - "trees/mixed/tredwoodsmol1", - "trees/mixed/tredwoodsmol2", - "trees/mixed/tredwoodsmol3", - "trees/mixed/tredwoodsmol1", - "trees/mixed/tredwoodsmol2", - "trees/mixed/tredwoodsmol3", - "trees/mixed/tredwoodsmol4", - "trees/mixed/tredwoodsmol5" + "true-redwood/true-redwood-small-1", + "true-redwood/true-redwood-small-2", + "true-redwood/true-redwood-small-3", + "true-redwood/true-redwood-small-1", + "true-redwood/true-redwood-small-2", + "true-redwood/true-redwood-small-3", + "true-redwood/true-redwood-small-4", + "true-redwood/true-redwood-small-5" ], "translate": { "x": 0, @@ -247,11 +266,11 @@ "enabled": true }, "place": [ - "clutter/spruceclutt1", - "clutter/spruceclutt2", - "clutter/spruceclutt3", - "clutter/spruceclutt4", - "clutter/spruceclutt5" + "clutter/spruce-clutt-1", + "clutter/spruce-clutt-2", + "clutter/spruce-clutt-3", + "clutter/spruce-clutt-4", + "clutter/spruce-clutt-5" ], "translate": { "x": 0, @@ -271,10 +290,10 @@ "enabled": true }, "place": [ - "trees/mixed/tredwoodbee1", - "trees/mixed/tredwoodbee2", - "trees/mixed/tredwoodbee3", - "trees/mixed/tredwoodbee4" + "true-redwood/true-redwood-7-b", + "true-redwood/true-redwood-8-b", + "true-redwood/true-redwood-9-b", + "true-redwood/true-redwood-10-b" ], "translate": { "x": 0, @@ -328,12 +347,12 @@ "enabled": true }, "place": [ - "clutter/stump1", - "clutter/stump2", - "clutter/stump3", - "clutter/stump4", - "clutter/stump5", - "clutter/stump6" + "stump/stump1", + "stump/stump2", + "stump/stump3", + "stump/stump4", + "stump/stump5", + "stump/stump6" ], "mode": "VACUUM", "translate": { diff --git a/biomes/tundra/tun-forest-cliffs.json b/biomes/tundra/tun-forest-cliffs.json index 59fd4c88..fe9ad151 100644 --- a/biomes/tundra/tun-forest-cliffs.json +++ b/biomes/tundra/tun-forest-cliffs.json @@ -60,7 +60,26 @@ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "decorators": [ { "chance": 0.01, @@ -120,10 +139,10 @@ "objects": [ { "place": [ - "clutter/gravelsplotch1", - "clutter/gravelsplotch2", - "clutter/gravelsplotch3", - "clutter/gravelsplotch4" + "patch/graveldirt1", + "patch/graveldirt2", + "patch/graveldirt3", + "patch/graveldirt4" ], "chance": 0.75, "mode": "PAINT" @@ -140,11 +159,11 @@ "enabled": true }, "place": [ - "trees/spruce/levergreen1", - "trees/spruce/levergreen1", - "trees/spruce/mevergreen1", - "trees/spruce/mevergreen2", - "trees/spruce/mevergreen3" + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_medium1", + "evergreen/fantasy_evergreen_medium2", + "evergreen/fantasy_evergreen_medium3" ], "translate": { "x": 0, @@ -164,13 +183,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, @@ -228,12 +247,12 @@ "enabled": true }, "place": [ - "clutter/stump1", - "clutter/stump2", - "clutter/stump3", - "clutter/stump4", - "clutter/stump5", - "clutter/stump6" + "stump/stump1", + "stump/stump2", + "stump/stump3", + "stump/stump4", + "stump/stump5", + "stump/stump6" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-forest.json b/biomes/tundra/tun-forest.json index 183a0d90..4cb691b8 100644 --- a/biomes/tundra/tun-forest.json +++ b/biomes/tundra/tun-forest.json @@ -60,14 +60,33 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "place": [ - "clutter/gravelsplotch1", - "clutter/gravelsplotch2", - "clutter/gravelsplotch3", - "clutter/gravelsplotch4" + "patch/graveldirt1", + "patch/graveldirt2", + "patch/graveldirt3", + "patch/graveldirt4" ], "chance": 0.75, "mode": "PAINT" @@ -84,19 +103,19 @@ "enabled": true }, "place": [ - "trees/spruce/levergreen1", - "trees/spruce/levergreen2", - "trees/spruce/levergreen1", - "trees/spruce/levergreen2", - "trees/spruce/levergreen1", - "trees/spruce/levergreen2", - "trees/spruce/levergreen3", - "trees/spruce/levergreen4", - "trees/spruce/levergreen5", - "trees/spruce/levergreen6", - "trees/spruce/mevergreen1", - "trees/spruce/mevergreen2", - "trees/spruce/mevergreen3" + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_large2", + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_large2", + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_large2", + "evergreen/fantasy_evergreen_large3", + "evergreen/fantasy_evergreen_large4", + "evergreen/fantasy_evergreen_large5", + "evergreen/fantasy_evergreen_large6", + "evergreen/fantasy_evergreen_medium1", + "evergreen/fantasy_evergreen_medium2", + "evergreen/fantasy_evergreen_medium3" ], "translate": { "x": 0, @@ -116,13 +135,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-lake.json b/biomes/tundra/tun-lake.json index 325304b0..9c470b71 100644 --- a/biomes/tundra/tun-lake.json +++ b/biomes/tundra/tun-lake.json @@ -123,7 +123,26 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "mode": "PAINT", @@ -137,7 +156,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, @@ -234,16 +253,16 @@ "enabled": true }, "place": [ - "denmyre/clutter/oakdenclutt1", - "denmyre/clutter/oakdenclutt2", - "denmyre/clutter/oakdenclutt3", - "denmyre/clutter/oakdenclutt4", - "denmyre/clutter/oakdenclutt5", - "denmyre/clutter/oakdenclutt6", - "denmyre/clutter/oakdenclutt7", - "denmyre/clutter/oakdenclutt8", - "denmyre/clutter/oakdenclutt9", - "denmyre/clutter/oakdenclutt10" + "denmyre/oak-denmyre-clutter-1", + "denmyre/oak-denmyre-clutter-2", + "denmyre/oak-denmyre-clutter-3", + "denmyre/oak-denmyre-clutter-4", + "denmyre/oak-denmyre-clutter-5", + "denmyre/oak-denmyre-clutter-6", + "denmyre/oak-denmyre-clutter-7", + "denmyre/oak-denmyre-clutter-8", + "denmyre/oak-denmyre-clutter-9", + "denmyre/oak-denmyre-clutter-10" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-magic-forest.json b/biomes/tundra/tun-magic-forest.json index ee57f20c..2133cd40 100644 --- a/biomes/tundra/tun-magic-forest.json +++ b/biomes/tundra/tun-magic-forest.json @@ -62,14 +62,33 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "place": [ - "clutter/gravelsplotch1", - "clutter/gravelsplotch2", - "clutter/gravelsplotch3", - "clutter/gravelsplotch4" + "patch/graveldirt1", + "patch/graveldirt2", + "patch/graveldirt3", + "patch/graveldirt4" ], "chance": 0.35, "mode": "PAINT" @@ -86,16 +105,16 @@ "enabled": true }, "place": [ - "trees/mixed/dotree1", - "trees/mixed/dotree2", - "trees/mixed/dotree3", - "trees/mixed/dotree4", - "trees/mixed/dotree5", - "trees/mixed/dotree6", - "trees/mixed/dotree7", - "trees/mixed/dotree8", - "trees/mixed/dotree9", - "trees/mixed/dotree10" + "mystic-trees/dotree1", + "mystic-trees/dotree2", + "mystic-trees/dotree3", + "mystic-trees/dotree4", + "mystic-trees/dotree5", + "mystic-trees/dotree6", + "mystic-trees/dotree7", + "mystic-trees/dotree8", + "mystic-trees/dotree9", + "mystic-trees/dotree10" ], "translate": { "x": 0, @@ -115,13 +134,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-mountains-cliffs.json b/biomes/tundra/tun-mountains-cliffs.json index c9d87f76..ee1cbe62 100644 --- a/biomes/tundra/tun-mountains-cliffs.json +++ b/biomes/tundra/tun-mountains-cliffs.json @@ -60,7 +60,26 @@ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "decorators": [ { "chance": 0.01, @@ -120,10 +139,10 @@ "objects": [ { "place": [ - "clutter/gravelsplotch1", - "clutter/gravelsplotch2", - "clutter/gravelsplotch3", - "clutter/gravelsplotch4" + "patch/graveldirt1", + "patch/graveldirt2", + "patch/graveldirt3", + "patch/graveldirt4" ], "chance": 0.75, "mode": "PAINT" @@ -140,19 +159,19 @@ "enabled": true }, "place": [ - "trees/spruce/levergreen1", - "trees/spruce/levergreen2", - "trees/spruce/levergreen1", - "trees/spruce/levergreen2", - "trees/spruce/levergreen1", - "trees/spruce/levergreen2", - "trees/spruce/levergreen3", - "trees/spruce/levergreen4", - "trees/spruce/levergreen5", - "trees/spruce/levergreen6", - "trees/spruce/mevergreen1", - "trees/spruce/mevergreen2", - "trees/spruce/mevergreen3" + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_large2", + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_large2", + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_large2", + "evergreen/fantasy_evergreen_large3", + "evergreen/fantasy_evergreen_large4", + "evergreen/fantasy_evergreen_large5", + "evergreen/fantasy_evergreen_large6", + "evergreen/fantasy_evergreen_medium1", + "evergreen/fantasy_evergreen_medium2", + "evergreen/fantasy_evergreen_medium3" ], "translate": { "x": 0, @@ -172,13 +191,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, @@ -236,12 +255,12 @@ "enabled": true }, "place": [ - "clutter/stump1", - "clutter/stump2", - "clutter/stump3", - "clutter/stump4", - "clutter/stump5", - "clutter/stump6" + "stump/stump1", + "stump/stump2", + "stump/stump3", + "stump/stump4", + "stump/stump5", + "stump/stump6" ], "mode": "VACUUM", "translate": { diff --git a/biomes/tundra/tun-mountains.json b/biomes/tundra/tun-mountains.json index d466f596..52619e74 100644 --- a/biomes/tundra/tun-mountains.json +++ b/biomes/tundra/tun-mountains.json @@ -64,14 +64,33 @@ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "place": [ - "clutter/gravelsplotch1", - "clutter/gravelsplotch2", - "clutter/gravelsplotch3", - "clutter/gravelsplotch4" + "patch/graveldirt1", + "patch/graveldirt2", + "patch/graveldirt3", + "patch/graveldirt4" ], "chance": 0.75, "mode": "PAINT" @@ -88,19 +107,19 @@ "enabled": true }, "place": [ - "trees/spruce/levergreen1", - "trees/spruce/levergreen2", - "trees/spruce/levergreen1", - "trees/spruce/levergreen2", - "trees/spruce/levergreen1", - "trees/spruce/levergreen2", - "trees/spruce/levergreen3", - "trees/spruce/levergreen4", - "trees/spruce/levergreen5", - "trees/spruce/levergreen6", - "trees/spruce/mevergreen1", - "trees/spruce/mevergreen2", - "trees/spruce/mevergreen3" + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_large2", + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_large2", + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_large2", + "evergreen/fantasy_evergreen_large3", + "evergreen/fantasy_evergreen_large4", + "evergreen/fantasy_evergreen_large5", + "evergreen/fantasy_evergreen_large6", + "evergreen/fantasy_evergreen_medium1", + "evergreen/fantasy_evergreen_medium2", + "evergreen/fantasy_evergreen_medium3" ], "translate": { "x": 0, @@ -120,13 +139,13 @@ "enabled": true }, "place": [ - "clutter/obelisk1", - "clutter/obelisk2", - "clutter/obelisk3", - "clutter/obelisk4", - "clutter/obelisk5", - "clutter/obelisk6", - "clutter/obelisk7" + "stone-clutt/obelisk-1", + "stone-clutt/obelisk-2", + "stone-clutt/obelisk-3", + "stone-clutt/obelisk-4", + "stone-clutt/obelisk-5", + "stone-clutt/obelisk-6", + "stone-clutt/obelisk-7" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-redwood-cliffs.json b/biomes/tundra/tun-redwood-cliffs.json index 3a5e0103..92959531 100644 --- a/biomes/tundra/tun-redwood-cliffs.json +++ b/biomes/tundra/tun-redwood-cliffs.json @@ -58,7 +58,26 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "wall": { "style": {"style": "FRACTAL_WATER"}, "palette": [ @@ -168,9 +187,9 @@ { "mode": "PAINT", "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ], "chance": 0.6, "rotation": { @@ -195,16 +214,16 @@ "enabled": true }, "place": [ - "trees/mixed/tredwood1", - "trees/mixed/tredwood2", - "trees/mixed/tredwood3", - "trees/mixed/tredwood4", - "trees/mixed/tredwood5", - "trees/mixed/tredwood6", - "trees/mixed/tredwood7", - "trees/mixed/tredwood8", - "trees/mixed/tredwood9", - "trees/mixed/tredwood10" + "true-redwood/true-redwood-1", + "true-redwood/true-redwood-2", + "true-redwood/true-redwood-3", + "true-redwood/true-redwood-4", + "true-redwood/true-redwood-5", + "true-redwood/true-redwood-6", + "true-redwood/true-redwood-7", + "true-redwood/true-redwood-8", + "true-redwood/true-redwood-9", + "true-redwood/true-redwood-10" ], "translate": { "x": 0, @@ -268,8 +287,8 @@ }, "mode": "PAINT", "place": [ - "clutter/srock1", - "clutter/srock2" + "redwood/rock-1", + "redwood/rock-2" ], "translate": { "x": 0, @@ -301,14 +320,14 @@ "enabled": true }, "place": [ - "trees/mixed/tredwoodsmol1", - "trees/mixed/tredwoodsmol2", - "trees/mixed/tredwoodsmol3", - "trees/mixed/tredwoodsmol1", - "trees/mixed/tredwoodsmol2", - "trees/mixed/tredwoodsmol3", - "trees/mixed/tredwoodsmol4", - "trees/mixed/tredwoodsmol5" + "true-redwood/true-redwood-small-1", + "true-redwood/true-redwood-small-2", + "true-redwood/true-redwood-small-3", + "true-redwood/true-redwood-small-1", + "true-redwood/true-redwood-small-2", + "true-redwood/true-redwood-small-3", + "true-redwood/true-redwood-small-4", + "true-redwood/true-redwood-small-5" ], "translate": { "x": 0, @@ -328,11 +347,11 @@ "enabled": true }, "place": [ - "clutter/spruceclutt1", - "clutter/spruceclutt2", - "clutter/spruceclutt3", - "clutter/spruceclutt4", - "clutter/spruceclutt5" + "clutter/spruce-clutt-1", + "clutter/spruce-clutt-2", + "clutter/spruce-clutt-3", + "clutter/spruce-clutt-4", + "clutter/spruce-clutt-5" ], "translate": { "x": 0, @@ -352,8 +371,8 @@ "enabled": true }, "place": [ - "clutter/rshrub1", - "clutter/rshrub2" + "redwood/bush-1", + "redwood/bush-2" ], "translate": { "x": 0, @@ -373,10 +392,10 @@ "enabled": true }, "place": [ - "trees/mixed/tredwoodbee1", - "trees/mixed/tredwoodbee2", - "trees/mixed/tredwoodbee3", - "trees/mixed/tredwoodbee4" + "true-redwood/true-redwood-7-b", + "true-redwood/true-redwood-8-b", + "true-redwood/true-redwood-9-b", + "true-redwood/true-redwood-10-b" ], "translate": { "x": 0, @@ -396,12 +415,12 @@ "enabled": true }, "place": [ - "clutter/stump1", - "clutter/stump2", - "clutter/stump3", - "clutter/stump4", - "clutter/stump5", - "clutter/stump6" + "stump/stump1", + "stump/stump2", + "stump/stump3", + "stump/stump4", + "stump/stump5", + "stump/stump6" ], "edit": [ { diff --git a/biomes/tundra/tun-redwood-forest.json b/biomes/tundra/tun-redwood-forest.json index 5d6380ca..6f7b9d3a 100644 --- a/biomes/tundra/tun-redwood-forest.json +++ b/biomes/tundra/tun-redwood-forest.json @@ -62,7 +62,26 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "wall": { "style": {"style": "FRACTAL_WATER"}, "palette": [ @@ -172,9 +191,9 @@ { "mode": "PAINT", "place": [ - "clutter/sbush1", - "clutter/sbush2", - "clutter/sbush3" + "bush/small/1", + "bush/small/2", + "bush/small/3" ], "chance": 0.6, "rotation": { @@ -199,16 +218,16 @@ "enabled": true }, "place": [ - "trees/mixed/tredwood1", - "trees/mixed/tredwood2", - "trees/mixed/tredwood3", - "trees/mixed/tredwood4", - "trees/mixed/tredwood5", - "trees/mixed/tredwood6", - "trees/mixed/tredwood7", - "trees/mixed/tredwood8", - "trees/mixed/tredwood9", - "trees/mixed/tredwood10" + "true-redwood/true-redwood-1", + "true-redwood/true-redwood-2", + "true-redwood/true-redwood-3", + "true-redwood/true-redwood-4", + "true-redwood/true-redwood-5", + "true-redwood/true-redwood-6", + "true-redwood/true-redwood-7", + "true-redwood/true-redwood-8", + "true-redwood/true-redwood-9", + "true-redwood/true-redwood-10" ], "translate": { "x": 0, @@ -229,8 +248,8 @@ }, "mode": "PAINT", "place": [ - "clutter/srock1", - "clutter/srock2" + "redwood/rock-1", + "redwood/rock-2" ], "translate": { "x": 0, @@ -262,14 +281,14 @@ "enabled": true }, "place": [ - "trees/mixed/tredwoodsmol1", - "trees/mixed/tredwoodsmol2", - "trees/mixed/tredwoodsmol3", - "trees/mixed/tredwoodsmol1", - "trees/mixed/tredwoodsmol2", - "trees/mixed/tredwoodsmol3", - "trees/mixed/tredwoodsmol4", - "trees/mixed/tredwoodsmol5" + "true-redwood/true-redwood-small-1", + "true-redwood/true-redwood-small-2", + "true-redwood/true-redwood-small-3", + "true-redwood/true-redwood-small-1", + "true-redwood/true-redwood-small-2", + "true-redwood/true-redwood-small-3", + "true-redwood/true-redwood-small-4", + "true-redwood/true-redwood-small-5" ], "translate": { "x": 0, @@ -289,11 +308,11 @@ "enabled": true }, "place": [ - "clutter/spruceclutt1", - "clutter/spruceclutt2", - "clutter/spruceclutt3", - "clutter/spruceclutt4", - "clutter/spruceclutt5" + "clutter/spruce-clutt-1", + "clutter/spruce-clutt-2", + "clutter/spruce-clutt-3", + "clutter/spruce-clutt-4", + "clutter/spruce-clutt-5" ], "translate": { "x": 0, @@ -313,8 +332,8 @@ "enabled": true }, "place": [ - "clutter/rshrub1", - "clutter/rshrub2" + "redwood/bush-1", + "redwood/bush-2" ], "translate": { "x": 0, @@ -334,10 +353,10 @@ "enabled": true }, "place": [ - "trees/mixed/tredwoodbee1", - "trees/mixed/tredwoodbee2", - "trees/mixed/tredwoodbee3", - "trees/mixed/tredwoodbee4" + "true-redwood/true-redwood-7-b", + "true-redwood/true-redwood-8-b", + "true-redwood/true-redwood-9-b", + "true-redwood/true-redwood-10-b" ], "translate": { "x": 0, @@ -357,12 +376,12 @@ "enabled": true }, "place": [ - "clutter/stump1", - "clutter/stump2", - "clutter/stump3", - "clutter/stump4", - "clutter/stump5", - "clutter/stump6" + "stump/stump1", + "stump/stump2", + "stump/stump3", + "stump/stump4", + "stump/stump5", + "stump/stump6" ], "edit": [ { diff --git a/biomes/tundra/tun-sequia-redwoods.json b/biomes/tundra/tun-sequia-redwoods.json index e6fef8c3..923ae5a7 100644 --- a/biomes/tundra/tun-sequia-redwoods.json +++ b/biomes/tundra/tun-sequia-redwoods.json @@ -156,14 +156,33 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "place": [ - "clutter/gravelsplotch1", - "clutter/gravelsplotch2", - "clutter/gravelsplotch3", - "clutter/gravelsplotch4" + "patch/graveldirt1", + "patch/graveldirt2", + "patch/graveldirt3", + "patch/graveldirt4" ], "chance": 0.75, "mode": "PAINT" @@ -179,7 +198,7 @@ }, "enabled": true }, - "place": ["clutter/camp1"], + "place": ["camp/camp"], "translate": { "x": 0, "y": 0, @@ -198,7 +217,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, @@ -294,12 +313,12 @@ "enabled": true }, "place": [ - "clutter/stump1", - "clutter/stump2", - "clutter/stump3", - "clutter/stump4", - "clutter/stump5", - "clutter/stump6" + "stump/stump1", + "stump/stump2", + "stump/stump3", + "stump/stump4", + "stump/stump5", + "stump/stump6" ], "mode": "VACUUM", "translate": { diff --git a/biomes/tundra/tun-spruce-denmyre.json b/biomes/tundra/tun-spruce-denmyre.json index 64dbb4cd..5086b44d 100644 --- a/biomes/tundra/tun-spruce-denmyre.json +++ b/biomes/tundra/tun-spruce-denmyre.json @@ -133,7 +133,26 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "mode": "PAINT", @@ -147,7 +166,7 @@ }, "enabled": true }, - "place": ["clutter/bincluster1"], + "place": ["camp/barrel-bin"], "translate": { "x": 0, "y": 0, @@ -244,16 +263,16 @@ "enabled": true }, "place": [ - "denmyre/clutter/oakdenclutt1", - "denmyre/clutter/oakdenclutt2", - "denmyre/clutter/oakdenclutt3", - "denmyre/clutter/oakdenclutt4", - "denmyre/clutter/oakdenclutt5", - "denmyre/clutter/oakdenclutt6", - "denmyre/clutter/oakdenclutt7", - "denmyre/clutter/oakdenclutt8", - "denmyre/clutter/oakdenclutt9", - "denmyre/clutter/oakdenclutt10" + "denmyre/oak-denmyre-clutter-1", + "denmyre/oak-denmyre-clutter-2", + "denmyre/oak-denmyre-clutter-3", + "denmyre/oak-denmyre-clutter-4", + "denmyre/oak-denmyre-clutter-5", + "denmyre/oak-denmyre-clutter-6", + "denmyre/oak-denmyre-clutter-7", + "denmyre/oak-denmyre-clutter-8", + "denmyre/oak-denmyre-clutter-9", + "denmyre/oak-denmyre-clutter-10" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-taiga.json b/biomes/tundra/tun-taiga.json index ad0771ad..85299ad8 100644 --- a/biomes/tundra/tun-taiga.json +++ b/biomes/tundra/tun-taiga.json @@ -144,7 +144,7 @@ }, "enabled": true }, - "place": ["clutter/grave1"], + "place": ["grave/grave"], "translate": { "x": 0, "y": 0, @@ -164,8 +164,8 @@ "enabled": true }, "place": [ - "clutter/swordnp2", - "clutter/swordnp1" + "global-clutter/BigSwordPortal-unlit-1", + "global-clutter/BigSwordPortal-lit-1" ], "translate": { "x": 0, @@ -185,13 +185,13 @@ "enabled": true }, "place": [ - "clutter/stoneclutt1", - "clutter/stoneclutt2", - "clutter/stoneclutt3", - "clutter/stoneclutt4", - "clutter/stoneclutt5", - "clutter/stoneclutt6", - "clutter/stoneclutt7" + "clutter/stone-clutt-1", + "clutter/stone-clutt-2", + "clutter/stone-clutt-3", + "clutter/stone-clutt-4", + "clutter/stone-clutt-5", + "clutter/stone-clutt-6", + "clutter/stone-clutt-7" ], "translate": { "x": 0, @@ -218,11 +218,11 @@ "enabled": true }, "place": [ - "trees/mixed/tredwoodsmol1", - "trees/mixed/tredwoodsmol1", - "trees/mixed/tredwoodsmol1", - "trees/mixed/tredwoodsmol2", - "trees/mixed/tredwoodsmol3" + "true-redwood/true-redwood-small-1", + "true-redwood/true-redwood-small-1", + "true-redwood/true-redwood-small-1", + "true-redwood/true-redwood-small-2", + "true-redwood/true-redwood-small-3" ], "translate": { "x": 0, @@ -273,12 +273,12 @@ "enabled": true }, "place": [ - "clutter/stump1", - "clutter/stump2", - "clutter/stump3", - "clutter/stump4", - "clutter/stump5", - "clutter/stump6" + "stump/stump1", + "stump/stump2", + "stump/stump3", + "stump/stump4", + "stump/stump5", + "stump/stump6" ], "mode": "VACUUM", "translate": { @@ -288,7 +288,26 @@ } } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "wall": { "style": {"style": "STATIC"}, "palette": [ diff --git a/biomes/tundra/tun-tundra-beach-stone.json b/biomes/tundra/tun-tundra-beach-stone.json index 9b4cb1c7..f8fb6369 100644 --- a/biomes/tundra/tun-tundra-beach-stone.json +++ b/biomes/tundra/tun-tundra-beach-stone.json @@ -24,13 +24,32 @@ "palette": [{"block": "dirt"}] } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [{ "name": "standard-surface-portals", "chance": 0.00505, "place": [ - "clutter/swordnp2", - "clutter/swordnp1", + "global-clutter/BigSwordPortal-unlit-1", + "global-clutter/BigSwordPortal-lit-1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/dimensions/overworld.json b/dimensions/overworld.json index e335bae4..a457152c 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -18,17 +18,23 @@ "regions": [ "mushroom", "swamp", - "frozen", + "ocean", "tundra", "temperate", - "ocean", + "frozen", + "hot", "tropical", - "hot" - + "mesa" ], "regionStyle": { "style": "NOWHERE_CELLULAR", - "zoom": 1 + "zoom": 1, + "fracture": { + "multiplier": 18, + "maxFractureAccuracy": true, + "style": "FRACTAL_SMOKE", + "zoom": 1 + } }, "islandBiomeChanceStyle": { "style": "NOWHERE_CELLULAR", diff --git a/entities/donkey.json b/entities/donkey.json deleted file mode 100644 index a571a5a4..00000000 --- a/entities/donkey.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "DONKEY"} diff --git a/entities/glowsquid.json b/entities/glowsquid.json deleted file mode 100644 index cb763085..00000000 --- a/entities/glowsquid.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "GLOW_SQUID", - "glowing": true -} diff --git a/entities/goat.json b/entities/goat.json deleted file mode 100644 index 3477a173..00000000 --- a/entities/goat.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "GOAT"} diff --git a/entities/horse.json b/entities/horse.json deleted file mode 100644 index e4655c8b..00000000 --- a/entities/horse.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "HORSE"} diff --git a/entities/llama.json b/entities/llama.json deleted file mode 100644 index f60cee71..00000000 --- a/entities/llama.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "LLAMA"} diff --git a/entities/mule.json b/entities/mule.json deleted file mode 100644 index 6e12d13b..00000000 --- a/entities/mule.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "MULE"} diff --git a/entities/parrot.json b/entities/parrot.json deleted file mode 100644 index f5371701..00000000 --- a/entities/parrot.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "PARROT"} diff --git a/entities/rabbit.json b/entities/rabbit.json deleted file mode 100644 index bd623b85..00000000 --- a/entities/rabbit.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "RABBIT"} diff --git a/entities/turtle.json b/entities/turtle.json deleted file mode 100644 index 659fd6b6..00000000 --- a/entities/turtle.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "TURTLE"} diff --git a/entities/wanderingtrader.json b/entities/wanderingtrader.json deleted file mode 100644 index 1f51f397..00000000 --- a/entities/wanderingtrader.json +++ /dev/null @@ -1,10 +0,0 @@ -{"type": "HORSE", -"customName": "THE WANDERING HORSE", -"passengers": [ - { - "type": "WANDERING_TRADER", - "customName": "THE WANDERING TRADER!", - "invulnerable": true - } -] -} diff --git a/jigsaw-pieces/bastion/blocks/air.json b/jigsaw-pieces/bastion/blocks/air.json index bee4dd7b..2c369038 100644 --- a/jigsaw-pieces/bastion/blocks/air.json +++ b/jigsaw-pieces/bastion/blocks/air.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/blocks/air" + "object": "bastion/blocks/air" } diff --git a/jigsaw-pieces/bastion/blocks/gold.json b/jigsaw-pieces/bastion/blocks/gold.json index 12b29359..dd77bee1 100644 --- a/jigsaw-pieces/bastion/blocks/gold.json +++ b/jigsaw-pieces/bastion/blocks/gold.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/blocks/gold" + "object": "bastion/blocks/gold" } diff --git a/jigsaw-pieces/bastion/bridge/bridge_pieces/bridge.json b/jigsaw-pieces/bastion/bridge/bridge_pieces/bridge.json index 023f3348..3960f19f 100644 --- a/jigsaw-pieces/bastion/bridge/bridge_pieces/bridge.json +++ b/jigsaw-pieces/bastion/bridge/bridge_pieces/bridge.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/bridge/bridge_pieces/bridge" + "object": "bastion/bridge/bridge_pieces/bridge" } diff --git a/jigsaw-pieces/bastion/bridge/connectors/back_bridge_bottom.json b/jigsaw-pieces/bastion/bridge/connectors/back_bridge_bottom.json index d058ba56..4b5abc10 100644 --- a/jigsaw-pieces/bastion/bridge/connectors/back_bridge_bottom.json +++ b/jigsaw-pieces/bastion/bridge/connectors/back_bridge_bottom.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/bridge/connectors/back_bridge_bottom" + "object": "bastion/bridge/connectors/back_bridge_bottom" } diff --git a/jigsaw-pieces/bastion/bridge/connectors/back_bridge_top.json b/jigsaw-pieces/bastion/bridge/connectors/back_bridge_top.json index 61146e0d..8fe4e5fc 100644 --- a/jigsaw-pieces/bastion/bridge/connectors/back_bridge_top.json +++ b/jigsaw-pieces/bastion/bridge/connectors/back_bridge_top.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/bridge/connectors/back_bridge_top" + "object": "bastion/bridge/connectors/back_bridge_top" } diff --git a/jigsaw-pieces/bastion/bridge/legs/leg_0.json b/jigsaw-pieces/bastion/bridge/legs/leg_0.json index e6152e99..89566794 100644 --- a/jigsaw-pieces/bastion/bridge/legs/leg_0.json +++ b/jigsaw-pieces/bastion/bridge/legs/leg_0.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/bridge/legs/leg_0" + "object": "bastion/bridge/legs/leg_0" } diff --git a/jigsaw-pieces/bastion/bridge/legs/leg_1.json b/jigsaw-pieces/bastion/bridge/legs/leg_1.json index b355b7bc..8894c9fc 100644 --- a/jigsaw-pieces/bastion/bridge/legs/leg_1.json +++ b/jigsaw-pieces/bastion/bridge/legs/leg_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/bridge/legs/leg_1" + "object": "bastion/bridge/legs/leg_1" } diff --git a/jigsaw-pieces/bastion/bridge/rampart_plates/plate_0.json b/jigsaw-pieces/bastion/bridge/rampart_plates/plate_0.json index 0792c38e..1d234919 100644 --- a/jigsaw-pieces/bastion/bridge/rampart_plates/plate_0.json +++ b/jigsaw-pieces/bastion/bridge/rampart_plates/plate_0.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/bridge/rampart_plates/plate_0" + "object": "bastion/bridge/rampart_plates/plate_0" } diff --git a/jigsaw-pieces/bastion/bridge/ramparts/rampart_0.json b/jigsaw-pieces/bastion/bridge/ramparts/rampart_0.json index 61bc8f53..eed2bdb7 100644 --- a/jigsaw-pieces/bastion/bridge/ramparts/rampart_0.json +++ b/jigsaw-pieces/bastion/bridge/ramparts/rampart_0.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/bridge/ramparts/rampart_0" + "object": "bastion/bridge/ramparts/rampart_0" } diff --git a/jigsaw-pieces/bastion/bridge/ramparts/rampart_1.json b/jigsaw-pieces/bastion/bridge/ramparts/rampart_1.json index 00fa8bdb..4e1b2740 100644 --- a/jigsaw-pieces/bastion/bridge/ramparts/rampart_1.json +++ b/jigsaw-pieces/bastion/bridge/ramparts/rampart_1.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/bridge/ramparts/rampart_1" + "object": "bastion/bridge/ramparts/rampart_1" } diff --git a/jigsaw-pieces/bastion/bridge/starting_pieces/entrance.json b/jigsaw-pieces/bastion/bridge/starting_pieces/entrance.json index e0e5a1e0..e2b67e3c 100644 --- a/jigsaw-pieces/bastion/bridge/starting_pieces/entrance.json +++ b/jigsaw-pieces/bastion/bridge/starting_pieces/entrance.json @@ -332,5 +332,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/bridge/starting_pieces/entrance" + "object": "bastion/bridge/starting_pieces/entrance" } diff --git a/jigsaw-pieces/bastion/bridge/starting_pieces/entrance_base.json b/jigsaw-pieces/bastion/bridge/starting_pieces/entrance_base.json index 4c7f60a6..c0a6577c 100644 --- a/jigsaw-pieces/bastion/bridge/starting_pieces/entrance_base.json +++ b/jigsaw-pieces/bastion/bridge/starting_pieces/entrance_base.json @@ -202,5 +202,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/bridge/starting_pieces/entrance_base" + "object": "bastion/bridge/starting_pieces/entrance_base" } diff --git a/jigsaw-pieces/bastion/bridge/starting_pieces/entrance_face.json b/jigsaw-pieces/bastion/bridge/starting_pieces/entrance_face.json index 0fae194d..5c4de370 100644 --- a/jigsaw-pieces/bastion/bridge/starting_pieces/entrance_face.json +++ b/jigsaw-pieces/bastion/bridge/starting_pieces/entrance_face.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/bridge/starting_pieces/entrance_face" + "object": "bastion/bridge/starting_pieces/entrance_face" } diff --git a/jigsaw-pieces/bastion/bridge/walls/wall_base_0.json b/jigsaw-pieces/bastion/bridge/walls/wall_base_0.json index d97ddab5..c4597a6a 100644 --- a/jigsaw-pieces/bastion/bridge/walls/wall_base_0.json +++ b/jigsaw-pieces/bastion/bridge/walls/wall_base_0.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/bridge/walls/wall_base_0" + "object": "bastion/bridge/walls/wall_base_0" } diff --git a/jigsaw-pieces/bastion/bridge/walls/wall_base_1.json b/jigsaw-pieces/bastion/bridge/walls/wall_base_1.json index 77be5ba3..6e1c5017 100644 --- a/jigsaw-pieces/bastion/bridge/walls/wall_base_1.json +++ b/jigsaw-pieces/bastion/bridge/walls/wall_base_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/bridge/walls/wall_base_1" + "object": "bastion/bridge/walls/wall_base_1" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/air_base.json b/jigsaw-pieces/bastion/hoglin_stable/air_base.json index 4fc8fc72..cf59a327 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/air_base.json +++ b/jigsaw-pieces/bastion/hoglin_stable/air_base.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/air_base" + "object": "bastion/hoglin_stable/air_base" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/connectors/end_post_connector.json b/jigsaw-pieces/bastion/hoglin_stable/connectors/end_post_connector.json index 189c081a..1929bd3a 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/connectors/end_post_connector.json +++ b/jigsaw-pieces/bastion/hoglin_stable/connectors/end_post_connector.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/connectors/end_post_connector" + "object": "bastion/hoglin_stable/connectors/end_post_connector" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_0.json b/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_0.json index 52f031de..4619c442 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_0.json +++ b/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_0.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/large_stables/inner_0" + "object": "bastion/hoglin_stable/large_stables/inner_0" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_1.json b/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_1.json index 4d3ba508..2d089497 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_1.json +++ b/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_1.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/large_stables/inner_1" + "object": "bastion/hoglin_stable/large_stables/inner_1" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_2.json b/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_2.json index 8d2c4f39..ece84f94 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_2.json +++ b/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_2.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/large_stables/inner_2" + "object": "bastion/hoglin_stable/large_stables/inner_2" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_3.json b/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_3.json index c7a323b0..5f0930c8 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_3.json +++ b/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_3.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/large_stables/inner_3" + "object": "bastion/hoglin_stable/large_stables/inner_3" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_4.json b/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_4.json index 4c009ce3..b92a9800 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_4.json +++ b/jigsaw-pieces/bastion/hoglin_stable/large_stables/inner_4.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/large_stables/inner_4" + "object": "bastion/hoglin_stable/large_stables/inner_4" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_0.json b/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_0.json index f6e1d3f8..4ce2b992 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_0.json +++ b/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_0.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/large_stables/outer_0" + "object": "bastion/hoglin_stable/large_stables/outer_0" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_1.json b/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_1.json index 65f4a02b..51cebc9a 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_1.json +++ b/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/large_stables/outer_1" + "object": "bastion/hoglin_stable/large_stables/outer_1" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_2.json b/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_2.json index 17e80139..a8cd226d 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_2.json +++ b/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_2.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/large_stables/outer_2" + "object": "bastion/hoglin_stable/large_stables/outer_2" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_3.json b/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_3.json index fb3656f7..cf9d0b90 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_3.json +++ b/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_3.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/large_stables/outer_3" + "object": "bastion/hoglin_stable/large_stables/outer_3" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_4.json b/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_4.json index 2b55160c..db413e38 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_4.json +++ b/jigsaw-pieces/bastion/hoglin_stable/large_stables/outer_4.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/large_stables/outer_4" + "object": "bastion/hoglin_stable/large_stables/outer_4" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/posts/end_post.json b/jigsaw-pieces/bastion/hoglin_stable/posts/end_post.json index cab4c79c..420b32d2 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/posts/end_post.json +++ b/jigsaw-pieces/bastion/hoglin_stable/posts/end_post.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/posts/end_post" + "object": "bastion/hoglin_stable/posts/end_post" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/posts/stair_post.json b/jigsaw-pieces/bastion/hoglin_stable/posts/stair_post.json index 0beb0ede..29017798 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/posts/stair_post.json +++ b/jigsaw-pieces/bastion/hoglin_stable/posts/stair_post.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/posts/stair_post" + "object": "bastion/hoglin_stable/posts/stair_post" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/rampart_plates/rampart_plate_1.json b/jigsaw-pieces/bastion/hoglin_stable/rampart_plates/rampart_plate_1.json index f8e59b67..04c886ee 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/rampart_plates/rampart_plate_1.json +++ b/jigsaw-pieces/bastion/hoglin_stable/rampart_plates/rampart_plate_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/rampart_plates/rampart_plate_1" + "object": "bastion/hoglin_stable/rampart_plates/rampart_plate_1" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/ramparts/ramparts_1.json b/jigsaw-pieces/bastion/hoglin_stable/ramparts/ramparts_1.json index 589f579e..72d4cca1 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/ramparts/ramparts_1.json +++ b/jigsaw-pieces/bastion/hoglin_stable/ramparts/ramparts_1.json @@ -189,5 +189,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/ramparts/ramparts_1" + "object": "bastion/hoglin_stable/ramparts/ramparts_1" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/ramparts/ramparts_2.json b/jigsaw-pieces/bastion/hoglin_stable/ramparts/ramparts_2.json index f0b0883f..86efa5ab 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/ramparts/ramparts_2.json +++ b/jigsaw-pieces/bastion/hoglin_stable/ramparts/ramparts_2.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/ramparts/ramparts_2" + "object": "bastion/hoglin_stable/ramparts/ramparts_2" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/ramparts/ramparts_3.json b/jigsaw-pieces/bastion/hoglin_stable/ramparts/ramparts_3.json index 706080a2..f4e63f8a 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/ramparts/ramparts_3.json +++ b/jigsaw-pieces/bastion/hoglin_stable/ramparts/ramparts_3.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/ramparts/ramparts_3" + "object": "bastion/hoglin_stable/ramparts/ramparts_3" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/small_stables/inner_0.json b/jigsaw-pieces/bastion/hoglin_stable/small_stables/inner_0.json index f475d378..2dd75ad1 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/small_stables/inner_0.json +++ b/jigsaw-pieces/bastion/hoglin_stable/small_stables/inner_0.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/small_stables/inner_0" + "object": "bastion/hoglin_stable/small_stables/inner_0" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/small_stables/inner_1.json b/jigsaw-pieces/bastion/hoglin_stable/small_stables/inner_1.json index 19464ea3..7ef09194 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/small_stables/inner_1.json +++ b/jigsaw-pieces/bastion/hoglin_stable/small_stables/inner_1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/small_stables/inner_1" + "object": "bastion/hoglin_stable/small_stables/inner_1" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/small_stables/inner_2.json b/jigsaw-pieces/bastion/hoglin_stable/small_stables/inner_2.json index d84ed92e..7b236101 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/small_stables/inner_2.json +++ b/jigsaw-pieces/bastion/hoglin_stable/small_stables/inner_2.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/small_stables/inner_2" + "object": "bastion/hoglin_stable/small_stables/inner_2" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/small_stables/inner_3.json b/jigsaw-pieces/bastion/hoglin_stable/small_stables/inner_3.json index 98d4800a..ca522c46 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/small_stables/inner_3.json +++ b/jigsaw-pieces/bastion/hoglin_stable/small_stables/inner_3.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/small_stables/inner_3" + "object": "bastion/hoglin_stable/small_stables/inner_3" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/small_stables/outer_0.json b/jigsaw-pieces/bastion/hoglin_stable/small_stables/outer_0.json index d0e837fb..ecf1e331 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/small_stables/outer_0.json +++ b/jigsaw-pieces/bastion/hoglin_stable/small_stables/outer_0.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/small_stables/outer_0" + "object": "bastion/hoglin_stable/small_stables/outer_0" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/small_stables/outer_1.json b/jigsaw-pieces/bastion/hoglin_stable/small_stables/outer_1.json index 48f08cff..a1179318 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/small_stables/outer_1.json +++ b/jigsaw-pieces/bastion/hoglin_stable/small_stables/outer_1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/small_stables/outer_1" + "object": "bastion/hoglin_stable/small_stables/outer_1" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/small_stables/outer_2.json b/jigsaw-pieces/bastion/hoglin_stable/small_stables/outer_2.json index b05b9b11..b44f1329 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/small_stables/outer_2.json +++ b/jigsaw-pieces/bastion/hoglin_stable/small_stables/outer_2.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/small_stables/outer_2" + "object": "bastion/hoglin_stable/small_stables/outer_2" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/small_stables/outer_3.json b/jigsaw-pieces/bastion/hoglin_stable/small_stables/outer_3.json index f68f5440..8763ee19 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/small_stables/outer_3.json +++ b/jigsaw-pieces/bastion/hoglin_stable/small_stables/outer_3.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/small_stables/outer_3" + "object": "bastion/hoglin_stable/small_stables/outer_3" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_0.json b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_0.json index d99da76f..71926717 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_0.json +++ b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_0.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/stairs/stairs_1_0" + "object": "bastion/hoglin_stable/stairs/stairs_1_0" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_1.json b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_1.json index a76524fd..89d2231b 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_1.json +++ b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/stairs/stairs_1_1" + "object": "bastion/hoglin_stable/stairs/stairs_1_1" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_2.json b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_2.json index ac2be0b7..5dc36f19 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_2.json +++ b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_2.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/stairs/stairs_1_2" + "object": "bastion/hoglin_stable/stairs/stairs_1_2" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_3.json b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_3.json index 41e44a6b..b72f66f0 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_3.json +++ b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_3.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/stairs/stairs_1_3" + "object": "bastion/hoglin_stable/stairs/stairs_1_3" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_4.json b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_4.json index 6e08dca1..148681f7 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_4.json +++ b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_1_4.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/stairs/stairs_1_4" + "object": "bastion/hoglin_stable/stairs/stairs_1_4" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_0.json b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_0.json index f3cb2e85..557f9955 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_0.json +++ b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_0.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/stairs/stairs_2_0" + "object": "bastion/hoglin_stable/stairs/stairs_2_0" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_1.json b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_1.json index 1ab7e700..5a9d40bc 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_1.json +++ b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/stairs/stairs_2_1" + "object": "bastion/hoglin_stable/stairs/stairs_2_1" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_2.json b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_2.json index 76c509bc..5698619d 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_2.json +++ b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_2.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/stairs/stairs_2_2" + "object": "bastion/hoglin_stable/stairs/stairs_2_2" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_3.json b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_3.json index 9832e9f6..3c99829e 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_3.json +++ b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_3.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/stairs/stairs_2_3" + "object": "bastion/hoglin_stable/stairs/stairs_2_3" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_4.json b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_4.json index 452ac973..9df85d40 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_4.json +++ b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_2_4.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/stairs/stairs_2_4" + "object": "bastion/hoglin_stable/stairs/stairs_2_4" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_0.json b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_0.json index a5496594..2604910e 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_0.json +++ b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_0.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/stairs/stairs_3_0" + "object": "bastion/hoglin_stable/stairs/stairs_3_0" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_1.json b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_1.json index 4df28b64..0d8a10a3 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_1.json +++ b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_1.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/stairs/stairs_3_1" + "object": "bastion/hoglin_stable/stairs/stairs_3_1" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_2.json b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_2.json index e05f1426..92086c20 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_2.json +++ b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_2.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/stairs/stairs_3_2" + "object": "bastion/hoglin_stable/stairs/stairs_3_2" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_3.json b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_3.json index 47485af6..9e440e81 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_3.json +++ b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_3.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/stairs/stairs_3_3" + "object": "bastion/hoglin_stable/stairs/stairs_3_3" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_4.json b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_4.json index 65855821..46381138 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_4.json +++ b/jigsaw-pieces/bastion/hoglin_stable/stairs/stairs_3_4.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/stairs/stairs_3_4" + "object": "bastion/hoglin_stable/stairs/stairs_3_4" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.json b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.json index 833454d6..98e738f4 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.json +++ b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored" + "object": "bastion/hoglin_stable/starting_pieces/stairs_0_mirrored" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.json b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.json index d2b9f2dd..223fce4f 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.json +++ b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored" + "object": "bastion/hoglin_stable/starting_pieces/stairs_1_mirrored" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.json b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.json index 56eeb67d..6f14577c 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.json +++ b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored" + "object": "bastion/hoglin_stable/starting_pieces/stairs_2_mirrored" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.json b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.json index eaa8dcf3..f33b8a13 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.json +++ b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored" + "object": "bastion/hoglin_stable/starting_pieces/stairs_3_mirrored" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.json b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.json index 36595c31..f980276f 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.json +++ b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored" + "object": "bastion/hoglin_stable/starting_pieces/stairs_4_mirrored" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_0.json b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_0.json index ff94b14c..f0f9232a 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_0.json +++ b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_0.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_0" + "object": "bastion/hoglin_stable/starting_pieces/starting_stairs_0" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_1.json b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_1.json index 08880aee..4be50ed4 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_1.json +++ b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_1.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_1" + "object": "bastion/hoglin_stable/starting_pieces/starting_stairs_1" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_2.json b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_2.json index 3ddb6b74..562b3da6 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_2.json +++ b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_2.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_2" + "object": "bastion/hoglin_stable/starting_pieces/starting_stairs_2" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_3.json b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_3.json index 581d942a..e51aa0cc 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_3.json +++ b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_3.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_3" + "object": "bastion/hoglin_stable/starting_pieces/starting_stairs_3" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_4.json b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_4.json index 296e3c9d..42569c8b 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_4.json +++ b/jigsaw-pieces/bastion/hoglin_stable/starting_pieces/starting_stairs_4.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_4" + "object": "bastion/hoglin_stable/starting_pieces/starting_stairs_4" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/walls/side_wall_0.json b/jigsaw-pieces/bastion/hoglin_stable/walls/side_wall_0.json index a60ac4fa..e5cd6360 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/walls/side_wall_0.json +++ b/jigsaw-pieces/bastion/hoglin_stable/walls/side_wall_0.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/walls/side_wall_0" + "object": "bastion/hoglin_stable/walls/side_wall_0" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/walls/side_wall_1.json b/jigsaw-pieces/bastion/hoglin_stable/walls/side_wall_1.json index 8eba8fcf..bee1ea40 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/walls/side_wall_1.json +++ b/jigsaw-pieces/bastion/hoglin_stable/walls/side_wall_1.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/walls/side_wall_1" + "object": "bastion/hoglin_stable/walls/side_wall_1" } diff --git a/jigsaw-pieces/bastion/hoglin_stable/walls/wall_base.json b/jigsaw-pieces/bastion/hoglin_stable/walls/wall_base.json index 224ef5e0..2aac019a 100644 --- a/jigsaw-pieces/bastion/hoglin_stable/walls/wall_base.json +++ b/jigsaw-pieces/bastion/hoglin_stable/walls/wall_base.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/hoglin_stable/walls/wall_base" + "object": "bastion/hoglin_stable/walls/wall_base" } diff --git a/jigsaw-pieces/bastion/mobs/crossbow_piglin.json b/jigsaw-pieces/bastion/mobs/crossbow_piglin.json index 361c51b7..b44cc6c8 100644 --- a/jigsaw-pieces/bastion/mobs/crossbow_piglin.json +++ b/jigsaw-pieces/bastion/mobs/crossbow_piglin.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/mobs/crossbow_piglin" + "object": "bastion/mobs/crossbow_piglin" } diff --git a/jigsaw-pieces/bastion/mobs/empty.json b/jigsaw-pieces/bastion/mobs/empty.json index 58e6d623..54cb787b 100644 --- a/jigsaw-pieces/bastion/mobs/empty.json +++ b/jigsaw-pieces/bastion/mobs/empty.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/mobs/empty" + "object": "bastion/mobs/empty" } diff --git a/jigsaw-pieces/bastion/mobs/hoglin.json b/jigsaw-pieces/bastion/mobs/hoglin.json index 050494f3..f707b93b 100644 --- a/jigsaw-pieces/bastion/mobs/hoglin.json +++ b/jigsaw-pieces/bastion/mobs/hoglin.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/mobs/hoglin" + "object": "bastion/mobs/hoglin" } diff --git a/jigsaw-pieces/bastion/mobs/melee_piglin.json b/jigsaw-pieces/bastion/mobs/melee_piglin.json index c2aea43f..fdff1727 100644 --- a/jigsaw-pieces/bastion/mobs/melee_piglin.json +++ b/jigsaw-pieces/bastion/mobs/melee_piglin.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/mobs/melee_piglin" + "object": "bastion/mobs/melee_piglin" } diff --git a/jigsaw-pieces/bastion/mobs/melee_piglin_always.json b/jigsaw-pieces/bastion/mobs/melee_piglin_always.json index 42ffdd44..124217e2 100644 --- a/jigsaw-pieces/bastion/mobs/melee_piglin_always.json +++ b/jigsaw-pieces/bastion/mobs/melee_piglin_always.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/mobs/melee_piglin_always" + "object": "bastion/mobs/melee_piglin_always" } diff --git a/jigsaw-pieces/bastion/mobs/sword_piglin.json b/jigsaw-pieces/bastion/mobs/sword_piglin.json index 1d228292..ba9ad344 100644 --- a/jigsaw-pieces/bastion/mobs/sword_piglin.json +++ b/jigsaw-pieces/bastion/mobs/sword_piglin.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/mobs/sword_piglin" + "object": "bastion/mobs/sword_piglin" } diff --git a/jigsaw-pieces/bastion/treasure/bases/centers/center_0.json b/jigsaw-pieces/bastion/treasure/bases/centers/center_0.json index 678fd375..453137e5 100644 --- a/jigsaw-pieces/bastion/treasure/bases/centers/center_0.json +++ b/jigsaw-pieces/bastion/treasure/bases/centers/center_0.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/bases/centers/center_0" + "object": "bastion/treasure/bases/centers/center_0" } diff --git a/jigsaw-pieces/bastion/treasure/bases/centers/center_1.json b/jigsaw-pieces/bastion/treasure/bases/centers/center_1.json index ba20b885..bf2ca5e8 100644 --- a/jigsaw-pieces/bastion/treasure/bases/centers/center_1.json +++ b/jigsaw-pieces/bastion/treasure/bases/centers/center_1.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/bases/centers/center_1" + "object": "bastion/treasure/bases/centers/center_1" } diff --git a/jigsaw-pieces/bastion/treasure/bases/centers/center_2.json b/jigsaw-pieces/bastion/treasure/bases/centers/center_2.json index d770398f..01df95cb 100644 --- a/jigsaw-pieces/bastion/treasure/bases/centers/center_2.json +++ b/jigsaw-pieces/bastion/treasure/bases/centers/center_2.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/bases/centers/center_2" + "object": "bastion/treasure/bases/centers/center_2" } diff --git a/jigsaw-pieces/bastion/treasure/bases/centers/center_3.json b/jigsaw-pieces/bastion/treasure/bases/centers/center_3.json index 907d7a4e..52a3fbc4 100644 --- a/jigsaw-pieces/bastion/treasure/bases/centers/center_3.json +++ b/jigsaw-pieces/bastion/treasure/bases/centers/center_3.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/bases/centers/center_3" + "object": "bastion/treasure/bases/centers/center_3" } diff --git a/jigsaw-pieces/bastion/treasure/bases/lava_basin.json b/jigsaw-pieces/bastion/treasure/bases/lava_basin.json index 98ab63a9..2bd5ec87 100644 --- a/jigsaw-pieces/bastion/treasure/bases/lava_basin.json +++ b/jigsaw-pieces/bastion/treasure/bases/lava_basin.json @@ -189,5 +189,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/bases/lava_basin" + "object": "bastion/treasure/bases/lava_basin" } diff --git a/jigsaw-pieces/bastion/treasure/big_air_full.json b/jigsaw-pieces/bastion/treasure/big_air_full.json index f15eaab8..a10fb6c5 100644 --- a/jigsaw-pieces/bastion/treasure/big_air_full.json +++ b/jigsaw-pieces/bastion/treasure/big_air_full.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/big_air_full" + "object": "bastion/treasure/big_air_full" } diff --git a/jigsaw-pieces/bastion/treasure/brains/center_brain.json b/jigsaw-pieces/bastion/treasure/brains/center_brain.json index b25cf081..719a8b6e 100644 --- a/jigsaw-pieces/bastion/treasure/brains/center_brain.json +++ b/jigsaw-pieces/bastion/treasure/brains/center_brain.json @@ -189,5 +189,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/brains/center_brain" + "object": "bastion/treasure/brains/center_brain" } diff --git a/jigsaw-pieces/bastion/treasure/connectors/center_to_wall_middle.json b/jigsaw-pieces/bastion/treasure/connectors/center_to_wall_middle.json index 255d317a..056a8f10 100644 --- a/jigsaw-pieces/bastion/treasure/connectors/center_to_wall_middle.json +++ b/jigsaw-pieces/bastion/treasure/connectors/center_to_wall_middle.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/connectors/center_to_wall_middle" + "object": "bastion/treasure/connectors/center_to_wall_middle" } diff --git a/jigsaw-pieces/bastion/treasure/connectors/center_to_wall_top.json b/jigsaw-pieces/bastion/treasure/connectors/center_to_wall_top.json index 9d5642f9..d9bc4fca 100644 --- a/jigsaw-pieces/bastion/treasure/connectors/center_to_wall_top.json +++ b/jigsaw-pieces/bastion/treasure/connectors/center_to_wall_top.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/connectors/center_to_wall_top" + "object": "bastion/treasure/connectors/center_to_wall_top" } diff --git a/jigsaw-pieces/bastion/treasure/connectors/center_to_wall_top_entrance.json b/jigsaw-pieces/bastion/treasure/connectors/center_to_wall_top_entrance.json index 34a321ec..3df7dfc1 100644 --- a/jigsaw-pieces/bastion/treasure/connectors/center_to_wall_top_entrance.json +++ b/jigsaw-pieces/bastion/treasure/connectors/center_to_wall_top_entrance.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/connectors/center_to_wall_top_entrance" + "object": "bastion/treasure/connectors/center_to_wall_top_entrance" } diff --git a/jigsaw-pieces/bastion/treasure/corners/bottom/corner_0.json b/jigsaw-pieces/bastion/treasure/corners/bottom/corner_0.json index 085d032c..5e87fbd2 100644 --- a/jigsaw-pieces/bastion/treasure/corners/bottom/corner_0.json +++ b/jigsaw-pieces/bastion/treasure/corners/bottom/corner_0.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/corners/bottom/corner_0" + "object": "bastion/treasure/corners/bottom/corner_0" } diff --git a/jigsaw-pieces/bastion/treasure/corners/bottom/corner_1.json b/jigsaw-pieces/bastion/treasure/corners/bottom/corner_1.json index ca58b5df..5c4e953d 100644 --- a/jigsaw-pieces/bastion/treasure/corners/bottom/corner_1.json +++ b/jigsaw-pieces/bastion/treasure/corners/bottom/corner_1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/corners/bottom/corner_1" + "object": "bastion/treasure/corners/bottom/corner_1" } diff --git a/jigsaw-pieces/bastion/treasure/corners/edges/bottom.json b/jigsaw-pieces/bastion/treasure/corners/edges/bottom.json index 4316342c..25275bd5 100644 --- a/jigsaw-pieces/bastion/treasure/corners/edges/bottom.json +++ b/jigsaw-pieces/bastion/treasure/corners/edges/bottom.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/corners/edges/bottom" + "object": "bastion/treasure/corners/edges/bottom" } diff --git a/jigsaw-pieces/bastion/treasure/corners/edges/middle.json b/jigsaw-pieces/bastion/treasure/corners/edges/middle.json index 17c97f10..da6d6f78 100644 --- a/jigsaw-pieces/bastion/treasure/corners/edges/middle.json +++ b/jigsaw-pieces/bastion/treasure/corners/edges/middle.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/corners/edges/middle" + "object": "bastion/treasure/corners/edges/middle" } diff --git a/jigsaw-pieces/bastion/treasure/corners/edges/top.json b/jigsaw-pieces/bastion/treasure/corners/edges/top.json index 644f540d..4e670fe0 100644 --- a/jigsaw-pieces/bastion/treasure/corners/edges/top.json +++ b/jigsaw-pieces/bastion/treasure/corners/edges/top.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/corners/edges/top" + "object": "bastion/treasure/corners/edges/top" } diff --git a/jigsaw-pieces/bastion/treasure/corners/middle/corner_0.json b/jigsaw-pieces/bastion/treasure/corners/middle/corner_0.json index 3ff6a96a..ff84b2cd 100644 --- a/jigsaw-pieces/bastion/treasure/corners/middle/corner_0.json +++ b/jigsaw-pieces/bastion/treasure/corners/middle/corner_0.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/corners/middle/corner_0" + "object": "bastion/treasure/corners/middle/corner_0" } diff --git a/jigsaw-pieces/bastion/treasure/corners/middle/corner_1.json b/jigsaw-pieces/bastion/treasure/corners/middle/corner_1.json index 407b28c8..25943b4f 100644 --- a/jigsaw-pieces/bastion/treasure/corners/middle/corner_1.json +++ b/jigsaw-pieces/bastion/treasure/corners/middle/corner_1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/corners/middle/corner_1" + "object": "bastion/treasure/corners/middle/corner_1" } diff --git a/jigsaw-pieces/bastion/treasure/corners/top/corner_0.json b/jigsaw-pieces/bastion/treasure/corners/top/corner_0.json index a50b65a3..1e190581 100644 --- a/jigsaw-pieces/bastion/treasure/corners/top/corner_0.json +++ b/jigsaw-pieces/bastion/treasure/corners/top/corner_0.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/corners/top/corner_0" + "object": "bastion/treasure/corners/top/corner_0" } diff --git a/jigsaw-pieces/bastion/treasure/corners/top/corner_1.json b/jigsaw-pieces/bastion/treasure/corners/top/corner_1.json index 345db6b0..da165ed4 100644 --- a/jigsaw-pieces/bastion/treasure/corners/top/corner_1.json +++ b/jigsaw-pieces/bastion/treasure/corners/top/corner_1.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/corners/top/corner_1" + "object": "bastion/treasure/corners/top/corner_1" } diff --git a/jigsaw-pieces/bastion/treasure/entrances/entrance_0.json b/jigsaw-pieces/bastion/treasure/entrances/entrance_0.json index acd084db..b32fbc1b 100644 --- a/jigsaw-pieces/bastion/treasure/entrances/entrance_0.json +++ b/jigsaw-pieces/bastion/treasure/entrances/entrance_0.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/entrances/entrance_0" + "object": "bastion/treasure/entrances/entrance_0" } diff --git a/jigsaw-pieces/bastion/treasure/extensions/empty.json b/jigsaw-pieces/bastion/treasure/extensions/empty.json index eebc861b..fe62eb5f 100644 --- a/jigsaw-pieces/bastion/treasure/extensions/empty.json +++ b/jigsaw-pieces/bastion/treasure/extensions/empty.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/extensions/empty" + "object": "bastion/treasure/extensions/empty" } diff --git a/jigsaw-pieces/bastion/treasure/extensions/fire_room.json b/jigsaw-pieces/bastion/treasure/extensions/fire_room.json index 44a6f36e..2f49a3a3 100644 --- a/jigsaw-pieces/bastion/treasure/extensions/fire_room.json +++ b/jigsaw-pieces/bastion/treasure/extensions/fire_room.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/extensions/fire_room" + "object": "bastion/treasure/extensions/fire_room" } diff --git a/jigsaw-pieces/bastion/treasure/extensions/house_0.json b/jigsaw-pieces/bastion/treasure/extensions/house_0.json index 731ccf8c..ba98bd55 100644 --- a/jigsaw-pieces/bastion/treasure/extensions/house_0.json +++ b/jigsaw-pieces/bastion/treasure/extensions/house_0.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/extensions/house_0" + "object": "bastion/treasure/extensions/house_0" } diff --git a/jigsaw-pieces/bastion/treasure/extensions/house_1.json b/jigsaw-pieces/bastion/treasure/extensions/house_1.json index cc501c87..23a5a4f2 100644 --- a/jigsaw-pieces/bastion/treasure/extensions/house_1.json +++ b/jigsaw-pieces/bastion/treasure/extensions/house_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/extensions/house_1" + "object": "bastion/treasure/extensions/house_1" } diff --git a/jigsaw-pieces/bastion/treasure/extensions/large_bridge_0.json b/jigsaw-pieces/bastion/treasure/extensions/large_bridge_0.json index ef80a4f5..8665df0a 100644 --- a/jigsaw-pieces/bastion/treasure/extensions/large_bridge_0.json +++ b/jigsaw-pieces/bastion/treasure/extensions/large_bridge_0.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/extensions/large_bridge_0" + "object": "bastion/treasure/extensions/large_bridge_0" } diff --git a/jigsaw-pieces/bastion/treasure/extensions/large_bridge_1.json b/jigsaw-pieces/bastion/treasure/extensions/large_bridge_1.json index 50ef5e12..a3e878eb 100644 --- a/jigsaw-pieces/bastion/treasure/extensions/large_bridge_1.json +++ b/jigsaw-pieces/bastion/treasure/extensions/large_bridge_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/extensions/large_bridge_1" + "object": "bastion/treasure/extensions/large_bridge_1" } diff --git a/jigsaw-pieces/bastion/treasure/extensions/large_bridge_2.json b/jigsaw-pieces/bastion/treasure/extensions/large_bridge_2.json index 6d0f687c..798704fc 100644 --- a/jigsaw-pieces/bastion/treasure/extensions/large_bridge_2.json +++ b/jigsaw-pieces/bastion/treasure/extensions/large_bridge_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/extensions/large_bridge_2" + "object": "bastion/treasure/extensions/large_bridge_2" } diff --git a/jigsaw-pieces/bastion/treasure/extensions/large_bridge_3.json b/jigsaw-pieces/bastion/treasure/extensions/large_bridge_3.json index baa392b9..36a6d836 100644 --- a/jigsaw-pieces/bastion/treasure/extensions/large_bridge_3.json +++ b/jigsaw-pieces/bastion/treasure/extensions/large_bridge_3.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/extensions/large_bridge_3" + "object": "bastion/treasure/extensions/large_bridge_3" } diff --git a/jigsaw-pieces/bastion/treasure/extensions/roofed_bridge.json b/jigsaw-pieces/bastion/treasure/extensions/roofed_bridge.json index 80fafc5d..dd8eb7ed 100644 --- a/jigsaw-pieces/bastion/treasure/extensions/roofed_bridge.json +++ b/jigsaw-pieces/bastion/treasure/extensions/roofed_bridge.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/extensions/roofed_bridge" + "object": "bastion/treasure/extensions/roofed_bridge" } diff --git a/jigsaw-pieces/bastion/treasure/extensions/small_bridge_0.json b/jigsaw-pieces/bastion/treasure/extensions/small_bridge_0.json index 886e65b1..4f1110e2 100644 --- a/jigsaw-pieces/bastion/treasure/extensions/small_bridge_0.json +++ b/jigsaw-pieces/bastion/treasure/extensions/small_bridge_0.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/extensions/small_bridge_0" + "object": "bastion/treasure/extensions/small_bridge_0" } diff --git a/jigsaw-pieces/bastion/treasure/extensions/small_bridge_1.json b/jigsaw-pieces/bastion/treasure/extensions/small_bridge_1.json index 34644931..7118be2d 100644 --- a/jigsaw-pieces/bastion/treasure/extensions/small_bridge_1.json +++ b/jigsaw-pieces/bastion/treasure/extensions/small_bridge_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/extensions/small_bridge_1" + "object": "bastion/treasure/extensions/small_bridge_1" } diff --git a/jigsaw-pieces/bastion/treasure/extensions/small_bridge_2.json b/jigsaw-pieces/bastion/treasure/extensions/small_bridge_2.json index 292f8aa9..0df96d3f 100644 --- a/jigsaw-pieces/bastion/treasure/extensions/small_bridge_2.json +++ b/jigsaw-pieces/bastion/treasure/extensions/small_bridge_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/extensions/small_bridge_2" + "object": "bastion/treasure/extensions/small_bridge_2" } diff --git a/jigsaw-pieces/bastion/treasure/extensions/small_bridge_3.json b/jigsaw-pieces/bastion/treasure/extensions/small_bridge_3.json index 50e6dee4..78564a7c 100644 --- a/jigsaw-pieces/bastion/treasure/extensions/small_bridge_3.json +++ b/jigsaw-pieces/bastion/treasure/extensions/small_bridge_3.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/extensions/small_bridge_3" + "object": "bastion/treasure/extensions/small_bridge_3" } diff --git a/jigsaw-pieces/bastion/treasure/ramparts/bottom_wall_0.json b/jigsaw-pieces/bastion/treasure/ramparts/bottom_wall_0.json index 4b857ca6..4b48a088 100644 --- a/jigsaw-pieces/bastion/treasure/ramparts/bottom_wall_0.json +++ b/jigsaw-pieces/bastion/treasure/ramparts/bottom_wall_0.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/ramparts/bottom_wall_0" + "object": "bastion/treasure/ramparts/bottom_wall_0" } diff --git a/jigsaw-pieces/bastion/treasure/ramparts/lava_basin_main.json b/jigsaw-pieces/bastion/treasure/ramparts/lava_basin_main.json index c1a9ad62..734c3a07 100644 --- a/jigsaw-pieces/bastion/treasure/ramparts/lava_basin_main.json +++ b/jigsaw-pieces/bastion/treasure/ramparts/lava_basin_main.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/ramparts/lava_basin_main" + "object": "bastion/treasure/ramparts/lava_basin_main" } diff --git a/jigsaw-pieces/bastion/treasure/ramparts/lava_basin_side.json b/jigsaw-pieces/bastion/treasure/ramparts/lava_basin_side.json index 6c949511..3a7ff24f 100644 --- a/jigsaw-pieces/bastion/treasure/ramparts/lava_basin_side.json +++ b/jigsaw-pieces/bastion/treasure/ramparts/lava_basin_side.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/ramparts/lava_basin_side" + "object": "bastion/treasure/ramparts/lava_basin_side" } diff --git a/jigsaw-pieces/bastion/treasure/ramparts/mid_wall_main.json b/jigsaw-pieces/bastion/treasure/ramparts/mid_wall_main.json index 60737a7c..8ed0967a 100644 --- a/jigsaw-pieces/bastion/treasure/ramparts/mid_wall_main.json +++ b/jigsaw-pieces/bastion/treasure/ramparts/mid_wall_main.json @@ -176,5 +176,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/ramparts/mid_wall_main" + "object": "bastion/treasure/ramparts/mid_wall_main" } diff --git a/jigsaw-pieces/bastion/treasure/ramparts/mid_wall_side.json b/jigsaw-pieces/bastion/treasure/ramparts/mid_wall_side.json index 31c321b7..9ed108bc 100644 --- a/jigsaw-pieces/bastion/treasure/ramparts/mid_wall_side.json +++ b/jigsaw-pieces/bastion/treasure/ramparts/mid_wall_side.json @@ -176,5 +176,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/ramparts/mid_wall_side" + "object": "bastion/treasure/ramparts/mid_wall_side" } diff --git a/jigsaw-pieces/bastion/treasure/ramparts/top_wall.json b/jigsaw-pieces/bastion/treasure/ramparts/top_wall.json index 64618d26..29c849d6 100644 --- a/jigsaw-pieces/bastion/treasure/ramparts/top_wall.json +++ b/jigsaw-pieces/bastion/treasure/ramparts/top_wall.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/ramparts/top_wall" + "object": "bastion/treasure/ramparts/top_wall" } diff --git a/jigsaw-pieces/bastion/treasure/roofs/center_roof.json b/jigsaw-pieces/bastion/treasure/roofs/center_roof.json index 4d7a0ba6..ff636972 100644 --- a/jigsaw-pieces/bastion/treasure/roofs/center_roof.json +++ b/jigsaw-pieces/bastion/treasure/roofs/center_roof.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/roofs/center_roof" + "object": "bastion/treasure/roofs/center_roof" } diff --git a/jigsaw-pieces/bastion/treasure/roofs/corner_roof.json b/jigsaw-pieces/bastion/treasure/roofs/corner_roof.json index 40966c82..c9223430 100644 --- a/jigsaw-pieces/bastion/treasure/roofs/corner_roof.json +++ b/jigsaw-pieces/bastion/treasure/roofs/corner_roof.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/roofs/corner_roof" + "object": "bastion/treasure/roofs/corner_roof" } diff --git a/jigsaw-pieces/bastion/treasure/roofs/wall_roof.json b/jigsaw-pieces/bastion/treasure/roofs/wall_roof.json index 4af9ead1..11696f90 100644 --- a/jigsaw-pieces/bastion/treasure/roofs/wall_roof.json +++ b/jigsaw-pieces/bastion/treasure/roofs/wall_roof.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/roofs/wall_roof" + "object": "bastion/treasure/roofs/wall_roof" } diff --git a/jigsaw-pieces/bastion/treasure/stairs/lower_stairs.json b/jigsaw-pieces/bastion/treasure/stairs/lower_stairs.json index 6c023ee7..48d577eb 100644 --- a/jigsaw-pieces/bastion/treasure/stairs/lower_stairs.json +++ b/jigsaw-pieces/bastion/treasure/stairs/lower_stairs.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/stairs/lower_stairs" + "object": "bastion/treasure/stairs/lower_stairs" } diff --git a/jigsaw-pieces/bastion/treasure/walls/bottom/wall_0.json b/jigsaw-pieces/bastion/treasure/walls/bottom/wall_0.json index 2a765c37..1e5cf165 100644 --- a/jigsaw-pieces/bastion/treasure/walls/bottom/wall_0.json +++ b/jigsaw-pieces/bastion/treasure/walls/bottom/wall_0.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/bottom/wall_0" + "object": "bastion/treasure/walls/bottom/wall_0" } diff --git a/jigsaw-pieces/bastion/treasure/walls/bottom/wall_1.json b/jigsaw-pieces/bastion/treasure/walls/bottom/wall_1.json index bf12e81f..6e897f86 100644 --- a/jigsaw-pieces/bastion/treasure/walls/bottom/wall_1.json +++ b/jigsaw-pieces/bastion/treasure/walls/bottom/wall_1.json @@ -189,5 +189,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/bottom/wall_1" + "object": "bastion/treasure/walls/bottom/wall_1" } diff --git a/jigsaw-pieces/bastion/treasure/walls/bottom/wall_2.json b/jigsaw-pieces/bastion/treasure/walls/bottom/wall_2.json index b2d000d3..40f87850 100644 --- a/jigsaw-pieces/bastion/treasure/walls/bottom/wall_2.json +++ b/jigsaw-pieces/bastion/treasure/walls/bottom/wall_2.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/bottom/wall_2" + "object": "bastion/treasure/walls/bottom/wall_2" } diff --git a/jigsaw-pieces/bastion/treasure/walls/bottom/wall_3.json b/jigsaw-pieces/bastion/treasure/walls/bottom/wall_3.json index 7b8b21c7..afe70a45 100644 --- a/jigsaw-pieces/bastion/treasure/walls/bottom/wall_3.json +++ b/jigsaw-pieces/bastion/treasure/walls/bottom/wall_3.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/bottom/wall_3" + "object": "bastion/treasure/walls/bottom/wall_3" } diff --git a/jigsaw-pieces/bastion/treasure/walls/entrance_wall.json b/jigsaw-pieces/bastion/treasure/walls/entrance_wall.json index 2ccb559e..1b5003dd 100644 --- a/jigsaw-pieces/bastion/treasure/walls/entrance_wall.json +++ b/jigsaw-pieces/bastion/treasure/walls/entrance_wall.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/entrance_wall" + "object": "bastion/treasure/walls/entrance_wall" } diff --git a/jigsaw-pieces/bastion/treasure/walls/lava_wall.json b/jigsaw-pieces/bastion/treasure/walls/lava_wall.json index a72a4a61..bc791ce7 100644 --- a/jigsaw-pieces/bastion/treasure/walls/lava_wall.json +++ b/jigsaw-pieces/bastion/treasure/walls/lava_wall.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/lava_wall" + "object": "bastion/treasure/walls/lava_wall" } diff --git a/jigsaw-pieces/bastion/treasure/walls/mid/wall_0.json b/jigsaw-pieces/bastion/treasure/walls/mid/wall_0.json index eb27739a..f7f4a33c 100644 --- a/jigsaw-pieces/bastion/treasure/walls/mid/wall_0.json +++ b/jigsaw-pieces/bastion/treasure/walls/mid/wall_0.json @@ -228,5 +228,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/mid/wall_0" + "object": "bastion/treasure/walls/mid/wall_0" } diff --git a/jigsaw-pieces/bastion/treasure/walls/mid/wall_1.json b/jigsaw-pieces/bastion/treasure/walls/mid/wall_1.json index 8fa11a71..162a817d 100644 --- a/jigsaw-pieces/bastion/treasure/walls/mid/wall_1.json +++ b/jigsaw-pieces/bastion/treasure/walls/mid/wall_1.json @@ -228,5 +228,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/mid/wall_1" + "object": "bastion/treasure/walls/mid/wall_1" } diff --git a/jigsaw-pieces/bastion/treasure/walls/mid/wall_2.json b/jigsaw-pieces/bastion/treasure/walls/mid/wall_2.json index 474835e4..ccc4a371 100644 --- a/jigsaw-pieces/bastion/treasure/walls/mid/wall_2.json +++ b/jigsaw-pieces/bastion/treasure/walls/mid/wall_2.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/mid/wall_2" + "object": "bastion/treasure/walls/mid/wall_2" } diff --git a/jigsaw-pieces/bastion/treasure/walls/outer/bottom_corner.json b/jigsaw-pieces/bastion/treasure/walls/outer/bottom_corner.json index 3890e35d..88aa1228 100644 --- a/jigsaw-pieces/bastion/treasure/walls/outer/bottom_corner.json +++ b/jigsaw-pieces/bastion/treasure/walls/outer/bottom_corner.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/outer/bottom_corner" + "object": "bastion/treasure/walls/outer/bottom_corner" } diff --git a/jigsaw-pieces/bastion/treasure/walls/outer/medium_outer_wall.json b/jigsaw-pieces/bastion/treasure/walls/outer/medium_outer_wall.json index 3bcb4098..36c0d85e 100644 --- a/jigsaw-pieces/bastion/treasure/walls/outer/medium_outer_wall.json +++ b/jigsaw-pieces/bastion/treasure/walls/outer/medium_outer_wall.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/outer/medium_outer_wall" + "object": "bastion/treasure/walls/outer/medium_outer_wall" } diff --git a/jigsaw-pieces/bastion/treasure/walls/outer/mid_corner.json b/jigsaw-pieces/bastion/treasure/walls/outer/mid_corner.json index 23489913..663cb68f 100644 --- a/jigsaw-pieces/bastion/treasure/walls/outer/mid_corner.json +++ b/jigsaw-pieces/bastion/treasure/walls/outer/mid_corner.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/outer/mid_corner" + "object": "bastion/treasure/walls/outer/mid_corner" } diff --git a/jigsaw-pieces/bastion/treasure/walls/outer/outer_wall.json b/jigsaw-pieces/bastion/treasure/walls/outer/outer_wall.json index eb778edb..335593aa 100644 --- a/jigsaw-pieces/bastion/treasure/walls/outer/outer_wall.json +++ b/jigsaw-pieces/bastion/treasure/walls/outer/outer_wall.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/outer/outer_wall" + "object": "bastion/treasure/walls/outer/outer_wall" } diff --git a/jigsaw-pieces/bastion/treasure/walls/outer/tall_outer_wall.json b/jigsaw-pieces/bastion/treasure/walls/outer/tall_outer_wall.json index 3b2e14c9..e85dd9b7 100644 --- a/jigsaw-pieces/bastion/treasure/walls/outer/tall_outer_wall.json +++ b/jigsaw-pieces/bastion/treasure/walls/outer/tall_outer_wall.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/outer/tall_outer_wall" + "object": "bastion/treasure/walls/outer/tall_outer_wall" } diff --git a/jigsaw-pieces/bastion/treasure/walls/outer/top_corner.json b/jigsaw-pieces/bastion/treasure/walls/outer/top_corner.json index 9ef929a5..2e71be9d 100644 --- a/jigsaw-pieces/bastion/treasure/walls/outer/top_corner.json +++ b/jigsaw-pieces/bastion/treasure/walls/outer/top_corner.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/outer/top_corner" + "object": "bastion/treasure/walls/outer/top_corner" } diff --git a/jigsaw-pieces/bastion/treasure/walls/top/main_entrance.json b/jigsaw-pieces/bastion/treasure/walls/top/main_entrance.json index d5286590..f10521d5 100644 --- a/jigsaw-pieces/bastion/treasure/walls/top/main_entrance.json +++ b/jigsaw-pieces/bastion/treasure/walls/top/main_entrance.json @@ -228,5 +228,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/top/main_entrance" + "object": "bastion/treasure/walls/top/main_entrance" } diff --git a/jigsaw-pieces/bastion/treasure/walls/top/wall_0.json b/jigsaw-pieces/bastion/treasure/walls/top/wall_0.json index a1680218..21c75227 100644 --- a/jigsaw-pieces/bastion/treasure/walls/top/wall_0.json +++ b/jigsaw-pieces/bastion/treasure/walls/top/wall_0.json @@ -189,5 +189,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/top/wall_0" + "object": "bastion/treasure/walls/top/wall_0" } diff --git a/jigsaw-pieces/bastion/treasure/walls/top/wall_1.json b/jigsaw-pieces/bastion/treasure/walls/top/wall_1.json index 76e3420d..6d1e5d6b 100644 --- a/jigsaw-pieces/bastion/treasure/walls/top/wall_1.json +++ b/jigsaw-pieces/bastion/treasure/walls/top/wall_1.json @@ -176,5 +176,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/treasure/walls/top/wall_1" + "object": "bastion/treasure/walls/top/wall_1" } diff --git a/jigsaw-pieces/bastion/units/air_base.json b/jigsaw-pieces/bastion/units/air_base.json index 6dadc9e3..0688bab2 100644 --- a/jigsaw-pieces/bastion/units/air_base.json +++ b/jigsaw-pieces/bastion/units/air_base.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/air_base" + "object": "bastion/units/air_base" } diff --git a/jigsaw-pieces/bastion/units/center_pieces/center_0.json b/jigsaw-pieces/bastion/units/center_pieces/center_0.json index 4b4c69c4..d933674d 100644 --- a/jigsaw-pieces/bastion/units/center_pieces/center_0.json +++ b/jigsaw-pieces/bastion/units/center_pieces/center_0.json @@ -189,5 +189,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/center_pieces/center_0" + "object": "bastion/units/center_pieces/center_0" } diff --git a/jigsaw-pieces/bastion/units/center_pieces/center_1.json b/jigsaw-pieces/bastion/units/center_pieces/center_1.json index 74283b16..ee7df0c7 100644 --- a/jigsaw-pieces/bastion/units/center_pieces/center_1.json +++ b/jigsaw-pieces/bastion/units/center_pieces/center_1.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/center_pieces/center_1" + "object": "bastion/units/center_pieces/center_1" } diff --git a/jigsaw-pieces/bastion/units/center_pieces/center_2.json b/jigsaw-pieces/bastion/units/center_pieces/center_2.json index ad91b0a6..a68ccde7 100644 --- a/jigsaw-pieces/bastion/units/center_pieces/center_2.json +++ b/jigsaw-pieces/bastion/units/center_pieces/center_2.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/center_pieces/center_2" + "object": "bastion/units/center_pieces/center_2" } diff --git a/jigsaw-pieces/bastion/units/edges/edge_0.json b/jigsaw-pieces/bastion/units/edges/edge_0.json index 407bb853..b113acf1 100644 --- a/jigsaw-pieces/bastion/units/edges/edge_0.json +++ b/jigsaw-pieces/bastion/units/edges/edge_0.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/edges/edge_0" + "object": "bastion/units/edges/edge_0" } diff --git a/jigsaw-pieces/bastion/units/fillers/stage_0.json b/jigsaw-pieces/bastion/units/fillers/stage_0.json index e416f15c..78915ed5 100644 --- a/jigsaw-pieces/bastion/units/fillers/stage_0.json +++ b/jigsaw-pieces/bastion/units/fillers/stage_0.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/fillers/stage_0" + "object": "bastion/units/fillers/stage_0" } diff --git a/jigsaw-pieces/bastion/units/pathways/pathway_0.json b/jigsaw-pieces/bastion/units/pathways/pathway_0.json index 4b6742ae..28cbaad8 100644 --- a/jigsaw-pieces/bastion/units/pathways/pathway_0.json +++ b/jigsaw-pieces/bastion/units/pathways/pathway_0.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/pathways/pathway_0" + "object": "bastion/units/pathways/pathway_0" } diff --git a/jigsaw-pieces/bastion/units/pathways/pathway_wall_0.json b/jigsaw-pieces/bastion/units/pathways/pathway_wall_0.json index c7a68ea0..e858eb17 100644 --- a/jigsaw-pieces/bastion/units/pathways/pathway_wall_0.json +++ b/jigsaw-pieces/bastion/units/pathways/pathway_wall_0.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/pathways/pathway_wall_0" + "object": "bastion/units/pathways/pathway_wall_0" } diff --git a/jigsaw-pieces/bastion/units/rampart_plates/plate_0.json b/jigsaw-pieces/bastion/units/rampart_plates/plate_0.json index 7d1508ed..3540b97c 100644 --- a/jigsaw-pieces/bastion/units/rampart_plates/plate_0.json +++ b/jigsaw-pieces/bastion/units/rampart_plates/plate_0.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/rampart_plates/plate_0" + "object": "bastion/units/rampart_plates/plate_0" } diff --git a/jigsaw-pieces/bastion/units/ramparts/ramparts_0.json b/jigsaw-pieces/bastion/units/ramparts/ramparts_0.json index d18eff1c..2add74ff 100644 --- a/jigsaw-pieces/bastion/units/ramparts/ramparts_0.json +++ b/jigsaw-pieces/bastion/units/ramparts/ramparts_0.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/ramparts/ramparts_0" + "object": "bastion/units/ramparts/ramparts_0" } diff --git a/jigsaw-pieces/bastion/units/ramparts/ramparts_1.json b/jigsaw-pieces/bastion/units/ramparts/ramparts_1.json index b7829348..d2396f59 100644 --- a/jigsaw-pieces/bastion/units/ramparts/ramparts_1.json +++ b/jigsaw-pieces/bastion/units/ramparts/ramparts_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/ramparts/ramparts_1" + "object": "bastion/units/ramparts/ramparts_1" } diff --git a/jigsaw-pieces/bastion/units/ramparts/ramparts_2.json b/jigsaw-pieces/bastion/units/ramparts/ramparts_2.json index d857c51a..f3a929e8 100644 --- a/jigsaw-pieces/bastion/units/ramparts/ramparts_2.json +++ b/jigsaw-pieces/bastion/units/ramparts/ramparts_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/ramparts/ramparts_2" + "object": "bastion/units/ramparts/ramparts_2" } diff --git a/jigsaw-pieces/bastion/units/stages/rot/stage_1_0.json b/jigsaw-pieces/bastion/units/stages/rot/stage_1_0.json index 5917e8c7..f8db607e 100644 --- a/jigsaw-pieces/bastion/units/stages/rot/stage_1_0.json +++ b/jigsaw-pieces/bastion/units/stages/rot/stage_1_0.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/stages/rot/stage_1_0" + "object": "bastion/units/stages/rot/stage_1_0" } diff --git a/jigsaw-pieces/bastion/units/stages/stage_0_0.json b/jigsaw-pieces/bastion/units/stages/stage_0_0.json index 997280d2..495e2cb7 100644 --- a/jigsaw-pieces/bastion/units/stages/stage_0_0.json +++ b/jigsaw-pieces/bastion/units/stages/stage_0_0.json @@ -176,5 +176,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/stages/stage_0_0" + "object": "bastion/units/stages/stage_0_0" } diff --git a/jigsaw-pieces/bastion/units/stages/stage_0_1.json b/jigsaw-pieces/bastion/units/stages/stage_0_1.json index e658350c..c3e7e643 100644 --- a/jigsaw-pieces/bastion/units/stages/stage_0_1.json +++ b/jigsaw-pieces/bastion/units/stages/stage_0_1.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/stages/stage_0_1" + "object": "bastion/units/stages/stage_0_1" } diff --git a/jigsaw-pieces/bastion/units/stages/stage_0_2.json b/jigsaw-pieces/bastion/units/stages/stage_0_2.json index 5f16622a..c26804c9 100644 --- a/jigsaw-pieces/bastion/units/stages/stage_0_2.json +++ b/jigsaw-pieces/bastion/units/stages/stage_0_2.json @@ -189,5 +189,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/stages/stage_0_2" + "object": "bastion/units/stages/stage_0_2" } diff --git a/jigsaw-pieces/bastion/units/stages/stage_0_3.json b/jigsaw-pieces/bastion/units/stages/stage_0_3.json index 39c08e6a..d056f849 100644 --- a/jigsaw-pieces/bastion/units/stages/stage_0_3.json +++ b/jigsaw-pieces/bastion/units/stages/stage_0_3.json @@ -176,5 +176,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/stages/stage_0_3" + "object": "bastion/units/stages/stage_0_3" } diff --git a/jigsaw-pieces/bastion/units/stages/stage_1_0.json b/jigsaw-pieces/bastion/units/stages/stage_1_0.json index 69e24acb..0b40ab9a 100644 --- a/jigsaw-pieces/bastion/units/stages/stage_1_0.json +++ b/jigsaw-pieces/bastion/units/stages/stage_1_0.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/stages/stage_1_0" + "object": "bastion/units/stages/stage_1_0" } diff --git a/jigsaw-pieces/bastion/units/stages/stage_1_1.json b/jigsaw-pieces/bastion/units/stages/stage_1_1.json index 83041788..3f2ca844 100644 --- a/jigsaw-pieces/bastion/units/stages/stage_1_1.json +++ b/jigsaw-pieces/bastion/units/stages/stage_1_1.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/stages/stage_1_1" + "object": "bastion/units/stages/stage_1_1" } diff --git a/jigsaw-pieces/bastion/units/stages/stage_1_2.json b/jigsaw-pieces/bastion/units/stages/stage_1_2.json index 897966a6..1a299294 100644 --- a/jigsaw-pieces/bastion/units/stages/stage_1_2.json +++ b/jigsaw-pieces/bastion/units/stages/stage_1_2.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/stages/stage_1_2" + "object": "bastion/units/stages/stage_1_2" } diff --git a/jigsaw-pieces/bastion/units/stages/stage_1_3.json b/jigsaw-pieces/bastion/units/stages/stage_1_3.json index f66c6e1f..646fd200 100644 --- a/jigsaw-pieces/bastion/units/stages/stage_1_3.json +++ b/jigsaw-pieces/bastion/units/stages/stage_1_3.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/stages/stage_1_3" + "object": "bastion/units/stages/stage_1_3" } diff --git a/jigsaw-pieces/bastion/units/stages/stage_2_0.json b/jigsaw-pieces/bastion/units/stages/stage_2_0.json index c16d4127..2e8e0ca0 100644 --- a/jigsaw-pieces/bastion/units/stages/stage_2_0.json +++ b/jigsaw-pieces/bastion/units/stages/stage_2_0.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/stages/stage_2_0" + "object": "bastion/units/stages/stage_2_0" } diff --git a/jigsaw-pieces/bastion/units/stages/stage_2_1.json b/jigsaw-pieces/bastion/units/stages/stage_2_1.json index ece8a031..ac9373a6 100644 --- a/jigsaw-pieces/bastion/units/stages/stage_2_1.json +++ b/jigsaw-pieces/bastion/units/stages/stage_2_1.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/stages/stage_2_1" + "object": "bastion/units/stages/stage_2_1" } diff --git a/jigsaw-pieces/bastion/units/stages/stage_3_0.json b/jigsaw-pieces/bastion/units/stages/stage_3_0.json index 6619e23f..7bd2331a 100644 --- a/jigsaw-pieces/bastion/units/stages/stage_3_0.json +++ b/jigsaw-pieces/bastion/units/stages/stage_3_0.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/stages/stage_3_0" + "object": "bastion/units/stages/stage_3_0" } diff --git a/jigsaw-pieces/bastion/units/stages/stage_3_1.json b/jigsaw-pieces/bastion/units/stages/stage_3_1.json index 4b473b22..ae8ec44b 100644 --- a/jigsaw-pieces/bastion/units/stages/stage_3_1.json +++ b/jigsaw-pieces/bastion/units/stages/stage_3_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/stages/stage_3_1" + "object": "bastion/units/stages/stage_3_1" } diff --git a/jigsaw-pieces/bastion/units/stages/stage_3_2.json b/jigsaw-pieces/bastion/units/stages/stage_3_2.json index d027c7b0..65330c41 100644 --- a/jigsaw-pieces/bastion/units/stages/stage_3_2.json +++ b/jigsaw-pieces/bastion/units/stages/stage_3_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/stages/stage_3_2" + "object": "bastion/units/stages/stage_3_2" } diff --git a/jigsaw-pieces/bastion/units/stages/stage_3_3.json b/jigsaw-pieces/bastion/units/stages/stage_3_3.json index 3091bd43..19ff5ee3 100644 --- a/jigsaw-pieces/bastion/units/stages/stage_3_3.json +++ b/jigsaw-pieces/bastion/units/stages/stage_3_3.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/stages/stage_3_3" + "object": "bastion/units/stages/stage_3_3" } diff --git a/jigsaw-pieces/bastion/units/wall_units/edge_0_large.json b/jigsaw-pieces/bastion/units/wall_units/edge_0_large.json index 8feeaf78..2101490b 100644 --- a/jigsaw-pieces/bastion/units/wall_units/edge_0_large.json +++ b/jigsaw-pieces/bastion/units/wall_units/edge_0_large.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/wall_units/edge_0_large" + "object": "bastion/units/wall_units/edge_0_large" } diff --git a/jigsaw-pieces/bastion/units/wall_units/unit_0.json b/jigsaw-pieces/bastion/units/wall_units/unit_0.json index 244909b5..6c414ed1 100644 --- a/jigsaw-pieces/bastion/units/wall_units/unit_0.json +++ b/jigsaw-pieces/bastion/units/wall_units/unit_0.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/wall_units/unit_0" + "object": "bastion/units/wall_units/unit_0" } diff --git a/jigsaw-pieces/bastion/units/walls/connected_wall.json b/jigsaw-pieces/bastion/units/walls/connected_wall.json index 05f7ac1d..77878c80 100644 --- a/jigsaw-pieces/bastion/units/walls/connected_wall.json +++ b/jigsaw-pieces/bastion/units/walls/connected_wall.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/walls/connected_wall" + "object": "bastion/units/walls/connected_wall" } diff --git a/jigsaw-pieces/bastion/units/walls/wall_base.json b/jigsaw-pieces/bastion/units/walls/wall_base.json index e637d81d..62cd8119 100644 --- a/jigsaw-pieces/bastion/units/walls/wall_base.json +++ b/jigsaw-pieces/bastion/units/walls/wall_base.json @@ -189,5 +189,5 @@ "exponent": 1 } }, - "object": "jigsaw/bastion/units/walls/wall_base" + "object": "bastion/units/walls/wall_base" } diff --git a/jigsaw-pieces/cave.json b/jigsaw-pieces/cave.json index 7433fe7f..f41642de 100644 --- a/jigsaw-pieces/cave.json +++ b/jigsaw-pieces/cave.json @@ -66,5 +66,5 @@ "exponent": 1 } }, - "object": "jigsaw/cave2" + "object": "cave2" } diff --git a/jigsaw-pieces/desert_pyramid/bottom.json b/jigsaw-pieces/desert_pyramid/bottom.json index b69fb16e..7f9466ca 100644 --- a/jigsaw-pieces/desert_pyramid/bottom.json +++ b/jigsaw-pieces/desert_pyramid/bottom.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/desert-pyramid/bottom" + "object": "desert-pyramid/bottom" } diff --git a/jigsaw-pieces/desert_pyramid/top.json b/jigsaw-pieces/desert_pyramid/top.json index 623ea97c..3838c60e 100644 --- a/jigsaw-pieces/desert_pyramid/top.json +++ b/jigsaw-pieces/desert_pyramid/top.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/desert-pyramid/top" + "object": "desert-pyramid/top" } diff --git a/jigsaw-pieces/end_city/base_floor.json b/jigsaw-pieces/end_city/base_floor.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/base_floor.json +++ b/jigsaw-pieces/end_city/base_floor.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/base_roof.json b/jigsaw-pieces/end_city/base_roof.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/base_roof.json +++ b/jigsaw-pieces/end_city/base_roof.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/bridge_end.json b/jigsaw-pieces/end_city/bridge_end.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/bridge_end.json +++ b/jigsaw-pieces/end_city/bridge_end.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/bridge_gentle_stairs.json b/jigsaw-pieces/end_city/bridge_gentle_stairs.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/bridge_gentle_stairs.json +++ b/jigsaw-pieces/end_city/bridge_gentle_stairs.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/bridge_piece.json b/jigsaw-pieces/end_city/bridge_piece.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/bridge_piece.json +++ b/jigsaw-pieces/end_city/bridge_piece.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/bridge_steep_stairs.json b/jigsaw-pieces/end_city/bridge_steep_stairs.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/bridge_steep_stairs.json +++ b/jigsaw-pieces/end_city/bridge_steep_stairs.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/fat_tower_base.json b/jigsaw-pieces/end_city/fat_tower_base.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/fat_tower_base.json +++ b/jigsaw-pieces/end_city/fat_tower_base.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/fat_tower_middle.json b/jigsaw-pieces/end_city/fat_tower_middle.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/fat_tower_middle.json +++ b/jigsaw-pieces/end_city/fat_tower_middle.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/fat_tower_top.json b/jigsaw-pieces/end_city/fat_tower_top.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/fat_tower_top.json +++ b/jigsaw-pieces/end_city/fat_tower_top.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/second_floor_1.json b/jigsaw-pieces/end_city/second_floor_1.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/second_floor_1.json +++ b/jigsaw-pieces/end_city/second_floor_1.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/second_floor_2.json b/jigsaw-pieces/end_city/second_floor_2.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/second_floor_2.json +++ b/jigsaw-pieces/end_city/second_floor_2.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/second_roof.json b/jigsaw-pieces/end_city/second_roof.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/second_roof.json +++ b/jigsaw-pieces/end_city/second_roof.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/ship.json b/jigsaw-pieces/end_city/ship.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/ship.json +++ b/jigsaw-pieces/end_city/ship.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/third_floor_1.json b/jigsaw-pieces/end_city/third_floor_1.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/third_floor_1.json +++ b/jigsaw-pieces/end_city/third_floor_1.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/third_floor_2.json b/jigsaw-pieces/end_city/third_floor_2.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/third_floor_2.json +++ b/jigsaw-pieces/end_city/third_floor_2.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/third_roof.json b/jigsaw-pieces/end_city/third_roof.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/third_roof.json +++ b/jigsaw-pieces/end_city/third_roof.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/tower_base.json b/jigsaw-pieces/end_city/tower_base.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/tower_base.json +++ b/jigsaw-pieces/end_city/tower_base.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/tower_floor.json b/jigsaw-pieces/end_city/tower_floor.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/tower_floor.json +++ b/jigsaw-pieces/end_city/tower_floor.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/tower_piece.json b/jigsaw-pieces/end_city/tower_piece.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/tower_piece.json +++ b/jigsaw-pieces/end_city/tower_piece.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/end_city/tower_top.json b/jigsaw-pieces/end_city/tower_top.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/end_city/tower_top.json +++ b/jigsaw-pieces/end_city/tower_top.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/fossil/skull_1.json b/jigsaw-pieces/fossil/skull_1.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/fossil/skull_1.json +++ b/jigsaw-pieces/fossil/skull_1.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/fossil/skull_1_coal.json b/jigsaw-pieces/fossil/skull_1_coal.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/fossil/skull_1_coal.json +++ b/jigsaw-pieces/fossil/skull_1_coal.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/fossil/skull_2.json b/jigsaw-pieces/fossil/skull_2.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/fossil/skull_2.json +++ b/jigsaw-pieces/fossil/skull_2.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/fossil/skull_2_coal.json b/jigsaw-pieces/fossil/skull_2_coal.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/fossil/skull_2_coal.json +++ b/jigsaw-pieces/fossil/skull_2_coal.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/fossil/skull_3.json b/jigsaw-pieces/fossil/skull_3.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/fossil/skull_3.json +++ b/jigsaw-pieces/fossil/skull_3.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/fossil/skull_3_coal.json b/jigsaw-pieces/fossil/skull_3_coal.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/fossil/skull_3_coal.json +++ b/jigsaw-pieces/fossil/skull_3_coal.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/fossil/skull_4.json b/jigsaw-pieces/fossil/skull_4.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/fossil/skull_4.json +++ b/jigsaw-pieces/fossil/skull_4.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/fossil/skull_4_coal.json b/jigsaw-pieces/fossil/skull_4_coal.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/fossil/skull_4_coal.json +++ b/jigsaw-pieces/fossil/skull_4_coal.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/fossil/spine_1.json b/jigsaw-pieces/fossil/spine_1.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/fossil/spine_1.json +++ b/jigsaw-pieces/fossil/spine_1.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/fossil/spine_1_coal.json b/jigsaw-pieces/fossil/spine_1_coal.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/fossil/spine_1_coal.json +++ b/jigsaw-pieces/fossil/spine_1_coal.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/fossil/spine_2.json b/jigsaw-pieces/fossil/spine_2.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/fossil/spine_2.json +++ b/jigsaw-pieces/fossil/spine_2.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/fossil/spine_2_coal.json b/jigsaw-pieces/fossil/spine_2_coal.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/fossil/spine_2_coal.json +++ b/jigsaw-pieces/fossil/spine_2_coal.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/fossil/spine_3.json b/jigsaw-pieces/fossil/spine_3.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/fossil/spine_3.json +++ b/jigsaw-pieces/fossil/spine_3.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/fossil/spine_3_coal.json b/jigsaw-pieces/fossil/spine_3_coal.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/fossil/spine_3_coal.json +++ b/jigsaw-pieces/fossil/spine_3_coal.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/fossil/spine_4.json b/jigsaw-pieces/fossil/spine_4.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/fossil/spine_4.json +++ b/jigsaw-pieces/fossil/spine_4.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/fossil/spine_4_coal.json b/jigsaw-pieces/fossil/spine_4_coal.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/fossil/spine_4_coal.json +++ b/jigsaw-pieces/fossil/spine_4_coal.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/houses/jap/j1.json b/jigsaw-pieces/houses/jap/j1.json index 2ee638e2..ff53afbc 100644 --- a/jigsaw-pieces/houses/jap/j1.json +++ b/jigsaw-pieces/houses/jap/j1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/houses/jap/j1", + "object": "houses/jap/j1", "connectors": [{ "name": "", "targetName": "*", diff --git a/jigsaw-pieces/houses/jap/j10.json b/jigsaw-pieces/houses/jap/j10.json index 647b0e5d..0e0f3d27 100644 --- a/jigsaw-pieces/houses/jap/j10.json +++ b/jigsaw-pieces/houses/jap/j10.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/houses/jap/j10", + "object": "houses/jap/j10", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/houses/jap/j2.json b/jigsaw-pieces/houses/jap/j2.json index 1fc47751..89d0c418 100644 --- a/jigsaw-pieces/houses/jap/j2.json +++ b/jigsaw-pieces/houses/jap/j2.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/houses/jap/j2", + "object": "houses/jap/j2", "connectors": [{ "name": "", "targetName": "*", diff --git a/jigsaw-pieces/houses/jap/j3.json b/jigsaw-pieces/houses/jap/j3.json index 15598fa7..9d620d2d 100644 --- a/jigsaw-pieces/houses/jap/j3.json +++ b/jigsaw-pieces/houses/jap/j3.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/houses/jap/j3", + "object": "houses/jap/j3", "connectors": [{ "name": "", "targetName": "*", diff --git a/jigsaw-pieces/houses/jap/j4.json b/jigsaw-pieces/houses/jap/j4.json index 58b3653b..9d3e5d92 100644 --- a/jigsaw-pieces/houses/jap/j4.json +++ b/jigsaw-pieces/houses/jap/j4.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/houses/jap/j4", + "object": "houses/jap/j4", "connectors": [{ "name": "", "targetName": "*", diff --git a/jigsaw-pieces/houses/jap/j5.json b/jigsaw-pieces/houses/jap/j5.json index 7010d37a..c67bff04 100644 --- a/jigsaw-pieces/houses/jap/j5.json +++ b/jigsaw-pieces/houses/jap/j5.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/houses/jap/j5", + "object": "houses/jap/j5", "connectors": [{ "name": "", "targetName": "*", diff --git a/jigsaw-pieces/houses/jap/j6.json b/jigsaw-pieces/houses/jap/j6.json index 30c73e72..4360ad47 100644 --- a/jigsaw-pieces/houses/jap/j6.json +++ b/jigsaw-pieces/houses/jap/j6.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/houses/jap/j6", + "object": "houses/jap/j6", "connectors": [{ "name": "", "targetName": "*", diff --git a/jigsaw-pieces/houses/jap/j7.json b/jigsaw-pieces/houses/jap/j7.json index 0e3c0297..2672d4cd 100644 --- a/jigsaw-pieces/houses/jap/j7.json +++ b/jigsaw-pieces/houses/jap/j7.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/houses/jap/j7", + "object": "houses/jap/j7", "connectors": [{ "name": "", "targetName": "*", diff --git a/jigsaw-pieces/houses/jap/j8.json b/jigsaw-pieces/houses/jap/j8.json index b247b42c..9a25c3c3 100644 --- a/jigsaw-pieces/houses/jap/j8.json +++ b/jigsaw-pieces/houses/jap/j8.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/houses/jap/j8", + "object": "houses/jap/j8", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/houses/jap/j9.json b/jigsaw-pieces/houses/jap/j9.json index c985bb51..000ffb8c 100644 --- a/jigsaw-pieces/houses/jap/j9.json +++ b/jigsaw-pieces/houses/jap/j9.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/houses/jap/j9", + "object": "houses/jap/j9", "connectors": [{ "name": "", "targetName": "*", diff --git a/jigsaw-pieces/houses/paths/corner1.json b/jigsaw-pieces/houses/paths/corner1.json index 97088f29..fd4a1647 100644 --- a/jigsaw-pieces/houses/paths/corner1.json +++ b/jigsaw-pieces/houses/paths/corner1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/houses/paths/corner1", + "object": "houses/paths/corner1", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/houses/paths/cross.json b/jigsaw-pieces/houses/paths/cross.json index 0e921dba..e271e00b 100644 --- a/jigsaw-pieces/houses/paths/cross.json +++ b/jigsaw-pieces/houses/paths/cross.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/houses/paths/cross", + "object": "houses/paths/cross", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/houses/paths/end1.json b/jigsaw-pieces/houses/paths/end1.json index 96d90307..e5a405b2 100644 --- a/jigsaw-pieces/houses/paths/end1.json +++ b/jigsaw-pieces/houses/paths/end1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/houses/paths/end1", + "object": "houses/paths/end1", "connectors": [{ "name": "", "targetName": "*", diff --git a/jigsaw-pieces/houses/paths/hall1.json b/jigsaw-pieces/houses/paths/hall1.json index 6e8a7605..aa7b736c 100644 --- a/jigsaw-pieces/houses/paths/hall1.json +++ b/jigsaw-pieces/houses/paths/hall1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/houses/paths/hall1", + "object": "houses/paths/hall1", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/houses/paths/tjunct.json b/jigsaw-pieces/houses/paths/tjunct.json index 78253887..4e39bbd8 100644 --- a/jigsaw-pieces/houses/paths/tjunct.json +++ b/jigsaw-pieces/houses/paths/tjunct.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/houses/paths/tjunct", + "object": "houses/paths/tjunct", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/igloo/bottom.json b/jigsaw-pieces/igloo/bottom.json index 8e45f1a4..617beda9 100644 --- a/jigsaw-pieces/igloo/bottom.json +++ b/jigsaw-pieces/igloo/bottom.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/igloo/bottom" + "object": "igloo/bottom" } diff --git a/jigsaw-pieces/igloo/middle.json b/jigsaw-pieces/igloo/middle.json index 3997b854..de74d61d 100644 --- a/jigsaw-pieces/igloo/middle.json +++ b/jigsaw-pieces/igloo/middle.json @@ -87,5 +87,5 @@ "exponent": 1 } }, - "object": "jigsaw/igloo/middle" + "object": "igloo/middle" } diff --git a/jigsaw-pieces/igloo/top1.json b/jigsaw-pieces/igloo/top1.json index b47b41e7..af71e124 100644 --- a/jigsaw-pieces/igloo/top1.json +++ b/jigsaw-pieces/igloo/top1.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/igloo/top1" + "object": "igloo/top1" } diff --git a/jigsaw-pieces/igloo/top2.json b/jigsaw-pieces/igloo/top2.json index f6267c6d..bd74f39a 100644 --- a/jigsaw-pieces/igloo/top2.json +++ b/jigsaw-pieces/igloo/top2.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/igloo/top2" + "object": "igloo/top2" } diff --git a/jigsaw-pieces/jungle_pyramid/jungle_pyramid.json b/jigsaw-pieces/jungle_pyramid/jungle_pyramid.json index a543016f..7b6acc3f 100644 --- a/jigsaw-pieces/jungle_pyramid/jungle_pyramid.json +++ b/jigsaw-pieces/jungle_pyramid/jungle_pyramid.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/jungle-pyramid/jungle_pyramid" + "object": "jungle-pyramid/jungle_pyramid" } diff --git a/jigsaw-pieces/murky_stronghold/c-n-1.json b/jigsaw-pieces/murky_stronghold/c-n-1.json index 96fdef77..fac40353 100644 --- a/jigsaw-pieces/murky_stronghold/c-n-1.json +++ b/jigsaw-pieces/murky_stronghold/c-n-1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-n-1", + "object": "murky_stronghold/c-n-1", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-n-2.json b/jigsaw-pieces/murky_stronghold/c-n-2.json index 71a13401..7bc871cf 100644 --- a/jigsaw-pieces/murky_stronghold/c-n-2.json +++ b/jigsaw-pieces/murky_stronghold/c-n-2.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-n-2", + "object": "murky_stronghold/c-n-2", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-n-3.json b/jigsaw-pieces/murky_stronghold/c-n-3.json index ab731d56..0f1d646b 100644 --- a/jigsaw-pieces/murky_stronghold/c-n-3.json +++ b/jigsaw-pieces/murky_stronghold/c-n-3.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-n-3", + "object": "murky_stronghold/c-n-3", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-n-4.json b/jigsaw-pieces/murky_stronghold/c-n-4.json index 424751af..15a904cc 100644 --- a/jigsaw-pieces/murky_stronghold/c-n-4.json +++ b/jigsaw-pieces/murky_stronghold/c-n-4.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-n-4", + "object": "murky_stronghold/c-n-4", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-ns-1.json b/jigsaw-pieces/murky_stronghold/c-ns-1.json index 2e73a328..e238e9f9 100644 --- a/jigsaw-pieces/murky_stronghold/c-ns-1.json +++ b/jigsaw-pieces/murky_stronghold/c-ns-1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-ns-1", + "object": "murky_stronghold/c-ns-1", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-ns-2.json b/jigsaw-pieces/murky_stronghold/c-ns-2.json index f8bbac53..fcdca3a2 100644 --- a/jigsaw-pieces/murky_stronghold/c-ns-2.json +++ b/jigsaw-pieces/murky_stronghold/c-ns-2.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-ns-2", + "object": "murky_stronghold/c-ns-2", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-ns-3.json b/jigsaw-pieces/murky_stronghold/c-ns-3.json index 157f253d..b28d6e30 100644 --- a/jigsaw-pieces/murky_stronghold/c-ns-3.json +++ b/jigsaw-pieces/murky_stronghold/c-ns-3.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-ns-3", + "object": "murky_stronghold/c-ns-3", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-ns-4.json b/jigsaw-pieces/murky_stronghold/c-ns-4.json index 155f1bd7..f5b8fd40 100644 --- a/jigsaw-pieces/murky_stronghold/c-ns-4.json +++ b/jigsaw-pieces/murky_stronghold/c-ns-4.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-ns-4", + "object": "murky_stronghold/c-ns-4", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-nsw-1.json b/jigsaw-pieces/murky_stronghold/c-nsw-1.json index bb116141..7a72c91d 100644 --- a/jigsaw-pieces/murky_stronghold/c-nsw-1.json +++ b/jigsaw-pieces/murky_stronghold/c-nsw-1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-nsw-1", + "object": "murky_stronghold/c-nsw-1", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-nsw-2.json b/jigsaw-pieces/murky_stronghold/c-nsw-2.json index 4e2b01c2..0701ecd6 100644 --- a/jigsaw-pieces/murky_stronghold/c-nsw-2.json +++ b/jigsaw-pieces/murky_stronghold/c-nsw-2.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-nsw-2", + "object": "murky_stronghold/c-nsw-2", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-nsw-3.json b/jigsaw-pieces/murky_stronghold/c-nsw-3.json index 22f6cf62..693652d1 100644 --- a/jigsaw-pieces/murky_stronghold/c-nsw-3.json +++ b/jigsaw-pieces/murky_stronghold/c-nsw-3.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-nsw-3", + "object": "murky_stronghold/c-nsw-3", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-nsw-4.json b/jigsaw-pieces/murky_stronghold/c-nsw-4.json index 60c31cc9..13919f25 100644 --- a/jigsaw-pieces/murky_stronghold/c-nsw-4.json +++ b/jigsaw-pieces/murky_stronghold/c-nsw-4.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-nsw-4", + "object": "murky_stronghold/c-nsw-4", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-sw-1.json b/jigsaw-pieces/murky_stronghold/c-sw-1.json index fc722295..a91977ca 100644 --- a/jigsaw-pieces/murky_stronghold/c-sw-1.json +++ b/jigsaw-pieces/murky_stronghold/c-sw-1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-sw-1", + "object": "murky_stronghold/c-sw-1", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-sw-2.json b/jigsaw-pieces/murky_stronghold/c-sw-2.json index 3d319b9e..a52ad5e8 100644 --- a/jigsaw-pieces/murky_stronghold/c-sw-2.json +++ b/jigsaw-pieces/murky_stronghold/c-sw-2.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-sw-2", + "object": "murky_stronghold/c-sw-2", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-sw-3.json b/jigsaw-pieces/murky_stronghold/c-sw-3.json index e12b8af0..74eaa719 100644 --- a/jigsaw-pieces/murky_stronghold/c-sw-3.json +++ b/jigsaw-pieces/murky_stronghold/c-sw-3.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-sw-3", + "object": "murky_stronghold/c-sw-3", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-sw-4.json b/jigsaw-pieces/murky_stronghold/c-sw-4.json index 565d93f6..ce4ebcee 100644 --- a/jigsaw-pieces/murky_stronghold/c-sw-4.json +++ b/jigsaw-pieces/murky_stronghold/c-sw-4.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-sw-4", + "object": "murky_stronghold/c-sw-4", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-x-1.json b/jigsaw-pieces/murky_stronghold/c-x-1.json index be988090..c09eb01e 100644 --- a/jigsaw-pieces/murky_stronghold/c-x-1.json +++ b/jigsaw-pieces/murky_stronghold/c-x-1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-x-1", + "object": "murky_stronghold/c-x-1", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-x-2.json b/jigsaw-pieces/murky_stronghold/c-x-2.json index 38bf3c27..7fac7a1d 100644 --- a/jigsaw-pieces/murky_stronghold/c-x-2.json +++ b/jigsaw-pieces/murky_stronghold/c-x-2.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-x-2", + "object": "murky_stronghold/c-x-2", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-x-3.json b/jigsaw-pieces/murky_stronghold/c-x-3.json index e9626495..2dc5a82b 100644 --- a/jigsaw-pieces/murky_stronghold/c-x-3.json +++ b/jigsaw-pieces/murky_stronghold/c-x-3.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-x-3", + "object": "murky_stronghold/c-x-3", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-x-4.json b/jigsaw-pieces/murky_stronghold/c-x-4.json index cefcd599..48b0aec0 100644 --- a/jigsaw-pieces/murky_stronghold/c-x-4.json +++ b/jigsaw-pieces/murky_stronghold/c-x-4.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-x-4", + "object": "murky_stronghold/c-x-4", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-x-5.json b/jigsaw-pieces/murky_stronghold/c-x-5.json index 46f91852..99d3967c 100644 --- a/jigsaw-pieces/murky_stronghold/c-x-5.json +++ b/jigsaw-pieces/murky_stronghold/c-x-5.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-x-5", + "object": "murky_stronghold/c-x-5", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/c-x-6.json b/jigsaw-pieces/murky_stronghold/c-x-6.json index d537291f..7cec5686 100644 --- a/jigsaw-pieces/murky_stronghold/c-x-6.json +++ b/jigsaw-pieces/murky_stronghold/c-x-6.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/c-x-6", + "object": "murky_stronghold/c-x-6", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-n-1.json b/jigsaw-pieces/murky_stronghold/f-n-1.json index 8b3f64ca..d87be63f 100644 --- a/jigsaw-pieces/murky_stronghold/f-n-1.json +++ b/jigsaw-pieces/murky_stronghold/f-n-1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-n-1", + "object": "murky_stronghold/f-n-1", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-n-2.json b/jigsaw-pieces/murky_stronghold/f-n-2.json index 92c0f1d0..951309c9 100644 --- a/jigsaw-pieces/murky_stronghold/f-n-2.json +++ b/jigsaw-pieces/murky_stronghold/f-n-2.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-n-2", + "object": "murky_stronghold/f-n-2", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-n-3.json b/jigsaw-pieces/murky_stronghold/f-n-3.json index 3e733b10..0e9a2ffe 100644 --- a/jigsaw-pieces/murky_stronghold/f-n-3.json +++ b/jigsaw-pieces/murky_stronghold/f-n-3.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-n-3", + "object": "murky_stronghold/f-n-3", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-n-4.json b/jigsaw-pieces/murky_stronghold/f-n-4.json index 2423641a..95f1d733 100644 --- a/jigsaw-pieces/murky_stronghold/f-n-4.json +++ b/jigsaw-pieces/murky_stronghold/f-n-4.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-n-4", + "object": "murky_stronghold/f-n-4", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-ns-1.json b/jigsaw-pieces/murky_stronghold/f-ns-1.json index e44c0a5d..cd4e5a2d 100644 --- a/jigsaw-pieces/murky_stronghold/f-ns-1.json +++ b/jigsaw-pieces/murky_stronghold/f-ns-1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-ns-1", + "object": "murky_stronghold/f-ns-1", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-ns-2.json b/jigsaw-pieces/murky_stronghold/f-ns-2.json index a19ca931..c3e62944 100644 --- a/jigsaw-pieces/murky_stronghold/f-ns-2.json +++ b/jigsaw-pieces/murky_stronghold/f-ns-2.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-ns-2", + "object": "murky_stronghold/f-ns-2", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-ns-3.json b/jigsaw-pieces/murky_stronghold/f-ns-3.json index 3fb068eb..062cedfd 100644 --- a/jigsaw-pieces/murky_stronghold/f-ns-3.json +++ b/jigsaw-pieces/murky_stronghold/f-ns-3.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-ns-3", + "object": "murky_stronghold/f-ns-3", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-ns-4.json b/jigsaw-pieces/murky_stronghold/f-ns-4.json index a1c00a84..03e4ecbf 100644 --- a/jigsaw-pieces/murky_stronghold/f-ns-4.json +++ b/jigsaw-pieces/murky_stronghold/f-ns-4.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-ns-4", + "object": "murky_stronghold/f-ns-4", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-nsw-1.json b/jigsaw-pieces/murky_stronghold/f-nsw-1.json index 31116068..a7bb7fa3 100644 --- a/jigsaw-pieces/murky_stronghold/f-nsw-1.json +++ b/jigsaw-pieces/murky_stronghold/f-nsw-1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-nsw-1", + "object": "murky_stronghold/f-nsw-1", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-nsw-2.json b/jigsaw-pieces/murky_stronghold/f-nsw-2.json index 592a1a61..769ebdfb 100644 --- a/jigsaw-pieces/murky_stronghold/f-nsw-2.json +++ b/jigsaw-pieces/murky_stronghold/f-nsw-2.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-nsw-2", + "object": "murky_stronghold/f-nsw-2", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-nsw-3.json b/jigsaw-pieces/murky_stronghold/f-nsw-3.json index c99f3fbb..3a6e3c05 100644 --- a/jigsaw-pieces/murky_stronghold/f-nsw-3.json +++ b/jigsaw-pieces/murky_stronghold/f-nsw-3.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-nsw-3", + "object": "murky_stronghold/f-nsw-3", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-nsw-4.json b/jigsaw-pieces/murky_stronghold/f-nsw-4.json index d30615a8..bf2ec6ed 100644 --- a/jigsaw-pieces/murky_stronghold/f-nsw-4.json +++ b/jigsaw-pieces/murky_stronghold/f-nsw-4.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-nsw-4", + "object": "murky_stronghold/f-nsw-4", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-sw-1.json b/jigsaw-pieces/murky_stronghold/f-sw-1.json index f5d2a711..3b3f6a77 100644 --- a/jigsaw-pieces/murky_stronghold/f-sw-1.json +++ b/jigsaw-pieces/murky_stronghold/f-sw-1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-sw-1", + "object": "murky_stronghold/f-sw-1", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-sw-2.json b/jigsaw-pieces/murky_stronghold/f-sw-2.json index f9e2a0f6..708cf05f 100644 --- a/jigsaw-pieces/murky_stronghold/f-sw-2.json +++ b/jigsaw-pieces/murky_stronghold/f-sw-2.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-sw-2", + "object": "murky_stronghold/f-sw-2", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-sw-3.json b/jigsaw-pieces/murky_stronghold/f-sw-3.json index 244d6b25..6661adff 100644 --- a/jigsaw-pieces/murky_stronghold/f-sw-3.json +++ b/jigsaw-pieces/murky_stronghold/f-sw-3.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-sw-3", + "object": "murky_stronghold/f-sw-3", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-sw-4.json b/jigsaw-pieces/murky_stronghold/f-sw-4.json index be02b916..362c61c3 100644 --- a/jigsaw-pieces/murky_stronghold/f-sw-4.json +++ b/jigsaw-pieces/murky_stronghold/f-sw-4.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-sw-4", + "object": "murky_stronghold/f-sw-4", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-x-1.json b/jigsaw-pieces/murky_stronghold/f-x-1.json index 570e19be..299d1ed5 100644 --- a/jigsaw-pieces/murky_stronghold/f-x-1.json +++ b/jigsaw-pieces/murky_stronghold/f-x-1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-x-1", + "object": "murky_stronghold/f-x-1", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-x-2.json b/jigsaw-pieces/murky_stronghold/f-x-2.json index 499a1b29..2aded3d4 100644 --- a/jigsaw-pieces/murky_stronghold/f-x-2.json +++ b/jigsaw-pieces/murky_stronghold/f-x-2.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-x-2", + "object": "murky_stronghold/f-x-2", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-x-3.json b/jigsaw-pieces/murky_stronghold/f-x-3.json index f88548be..831785a3 100644 --- a/jigsaw-pieces/murky_stronghold/f-x-3.json +++ b/jigsaw-pieces/murky_stronghold/f-x-3.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-x-3", + "object": "murky_stronghold/f-x-3", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-x-4.json b/jigsaw-pieces/murky_stronghold/f-x-4.json index eb7928ac..9bd956a0 100644 --- a/jigsaw-pieces/murky_stronghold/f-x-4.json +++ b/jigsaw-pieces/murky_stronghold/f-x-4.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-x-4", + "object": "murky_stronghold/f-x-4", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-x-5.json b/jigsaw-pieces/murky_stronghold/f-x-5.json index 13ca277b..e73efb41 100644 --- a/jigsaw-pieces/murky_stronghold/f-x-5.json +++ b/jigsaw-pieces/murky_stronghold/f-x-5.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-x-5", + "object": "murky_stronghold/f-x-5", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/f-x-6.json b/jigsaw-pieces/murky_stronghold/f-x-6.json index bc4bc74e..f9ccfce9 100644 --- a/jigsaw-pieces/murky_stronghold/f-x-6.json +++ b/jigsaw-pieces/murky_stronghold/f-x-6.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-x-6", + "object": "murky_stronghold/f-x-6", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-n-1.json b/jigsaw-pieces/murky_stronghold/fc-n-1.json index a0acaf0e..01588e55 100644 --- a/jigsaw-pieces/murky_stronghold/fc-n-1.json +++ b/jigsaw-pieces/murky_stronghold/fc-n-1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-n-1", + "object": "murky_stronghold/fc-n-1", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-n-2.json b/jigsaw-pieces/murky_stronghold/fc-n-2.json index 607df495..b9c526c7 100644 --- a/jigsaw-pieces/murky_stronghold/fc-n-2.json +++ b/jigsaw-pieces/murky_stronghold/fc-n-2.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-n-2", + "object": "murky_stronghold/fc-n-2", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-n-3.json b/jigsaw-pieces/murky_stronghold/fc-n-3.json index 265e6e91..f7e609fa 100644 --- a/jigsaw-pieces/murky_stronghold/fc-n-3.json +++ b/jigsaw-pieces/murky_stronghold/fc-n-3.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-n-3", + "object": "murky_stronghold/fc-n-3", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-n-4.json b/jigsaw-pieces/murky_stronghold/fc-n-4.json index 2f2e2e35..ae8bbc53 100644 --- a/jigsaw-pieces/murky_stronghold/fc-n-4.json +++ b/jigsaw-pieces/murky_stronghold/fc-n-4.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-n-4", + "object": "murky_stronghold/fc-n-4", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-ns-1.json b/jigsaw-pieces/murky_stronghold/fc-ns-1.json index 211cecf5..cd567fce 100644 --- a/jigsaw-pieces/murky_stronghold/fc-ns-1.json +++ b/jigsaw-pieces/murky_stronghold/fc-ns-1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-ns-1", + "object": "murky_stronghold/fc-ns-1", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-ns-2.json b/jigsaw-pieces/murky_stronghold/fc-ns-2.json index f5ebeace..3a600258 100644 --- a/jigsaw-pieces/murky_stronghold/fc-ns-2.json +++ b/jigsaw-pieces/murky_stronghold/fc-ns-2.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-ns-2", + "object": "murky_stronghold/fc-ns-2", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-ns-3.json b/jigsaw-pieces/murky_stronghold/fc-ns-3.json index d6888f92..5c87282e 100644 --- a/jigsaw-pieces/murky_stronghold/fc-ns-3.json +++ b/jigsaw-pieces/murky_stronghold/fc-ns-3.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-ns-3", + "object": "murky_stronghold/fc-ns-3", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-ns-4.json b/jigsaw-pieces/murky_stronghold/fc-ns-4.json index c0173d81..c6bc9187 100644 --- a/jigsaw-pieces/murky_stronghold/fc-ns-4.json +++ b/jigsaw-pieces/murky_stronghold/fc-ns-4.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/f-ns-4", + "object": "murky_stronghold/f-ns-4", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-nsw-1.json b/jigsaw-pieces/murky_stronghold/fc-nsw-1.json index dc0a3968..9149ff2e 100644 --- a/jigsaw-pieces/murky_stronghold/fc-nsw-1.json +++ b/jigsaw-pieces/murky_stronghold/fc-nsw-1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-nsw-1", + "object": "murky_stronghold/fc-nsw-1", "connectors": [{ "name": "", "targetName": "*", diff --git a/jigsaw-pieces/murky_stronghold/fc-nsw-2.json b/jigsaw-pieces/murky_stronghold/fc-nsw-2.json index a75f93b5..c202fe3a 100644 --- a/jigsaw-pieces/murky_stronghold/fc-nsw-2.json +++ b/jigsaw-pieces/murky_stronghold/fc-nsw-2.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-nsw-2", + "object": "murky_stronghold/fc-nsw-2", "connectors": [{ "name": "", "targetName": "*", diff --git a/jigsaw-pieces/murky_stronghold/fc-nsw-3.json b/jigsaw-pieces/murky_stronghold/fc-nsw-3.json index 9b61bf68..7ac7490c 100644 --- a/jigsaw-pieces/murky_stronghold/fc-nsw-3.json +++ b/jigsaw-pieces/murky_stronghold/fc-nsw-3.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-nsw-3", + "object": "murky_stronghold/fc-nsw-3", "connectors": [{ "name": "", "targetName": "*", diff --git a/jigsaw-pieces/murky_stronghold/fc-nsw-4.json b/jigsaw-pieces/murky_stronghold/fc-nsw-4.json index 816ac2b4..9b66cb47 100644 --- a/jigsaw-pieces/murky_stronghold/fc-nsw-4.json +++ b/jigsaw-pieces/murky_stronghold/fc-nsw-4.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-nsw-4", + "object": "murky_stronghold/fc-nsw-4", "connectors": [{ "name": "", "targetName": "*", diff --git a/jigsaw-pieces/murky_stronghold/fc-sw-1.json b/jigsaw-pieces/murky_stronghold/fc-sw-1.json index 2c4589f3..26484541 100644 --- a/jigsaw-pieces/murky_stronghold/fc-sw-1.json +++ b/jigsaw-pieces/murky_stronghold/fc-sw-1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-sw-1", + "object": "murky_stronghold/fc-sw-1", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-sw-2.json b/jigsaw-pieces/murky_stronghold/fc-sw-2.json index f9f83572..bfbed535 100644 --- a/jigsaw-pieces/murky_stronghold/fc-sw-2.json +++ b/jigsaw-pieces/murky_stronghold/fc-sw-2.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-sw-2", + "object": "murky_stronghold/fc-sw-2", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-sw-3.json b/jigsaw-pieces/murky_stronghold/fc-sw-3.json index a2f7131a..4c0cab58 100644 --- a/jigsaw-pieces/murky_stronghold/fc-sw-3.json +++ b/jigsaw-pieces/murky_stronghold/fc-sw-3.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-sw-3", + "object": "murky_stronghold/fc-sw-3", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-sw-4.json b/jigsaw-pieces/murky_stronghold/fc-sw-4.json index 1060a792..dfd1adba 100644 --- a/jigsaw-pieces/murky_stronghold/fc-sw-4.json +++ b/jigsaw-pieces/murky_stronghold/fc-sw-4.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-sw-4", + "object": "murky_stronghold/fc-sw-4", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-x-1.json b/jigsaw-pieces/murky_stronghold/fc-x-1.json index 6dce1923..f362a0d3 100644 --- a/jigsaw-pieces/murky_stronghold/fc-x-1.json +++ b/jigsaw-pieces/murky_stronghold/fc-x-1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-x-1", + "object": "murky_stronghold/fc-x-1", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-x-2.json b/jigsaw-pieces/murky_stronghold/fc-x-2.json index 1de9a7b4..af4ab1a6 100644 --- a/jigsaw-pieces/murky_stronghold/fc-x-2.json +++ b/jigsaw-pieces/murky_stronghold/fc-x-2.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-x-2", + "object": "murky_stronghold/fc-x-2", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-x-3.json b/jigsaw-pieces/murky_stronghold/fc-x-3.json index ac3f5ab8..785836c6 100644 --- a/jigsaw-pieces/murky_stronghold/fc-x-3.json +++ b/jigsaw-pieces/murky_stronghold/fc-x-3.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-x-3", + "object": "murky_stronghold/fc-x-3", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-x-4.json b/jigsaw-pieces/murky_stronghold/fc-x-4.json index 94bdbb81..446ce403 100644 --- a/jigsaw-pieces/murky_stronghold/fc-x-4.json +++ b/jigsaw-pieces/murky_stronghold/fc-x-4.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-x-4", + "object": "murky_stronghold/fc-x-4", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-x-5.json b/jigsaw-pieces/murky_stronghold/fc-x-5.json index b5309407..649c13bd 100644 --- a/jigsaw-pieces/murky_stronghold/fc-x-5.json +++ b/jigsaw-pieces/murky_stronghold/fc-x-5.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-x-5", + "object": "murky_stronghold/fc-x-5", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-x-6.json b/jigsaw-pieces/murky_stronghold/fc-x-6.json index 96f39abe..518541c2 100644 --- a/jigsaw-pieces/murky_stronghold/fc-x-6.json +++ b/jigsaw-pieces/murky_stronghold/fc-x-6.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-x-6", + "object": "murky_stronghold/fc-x-6", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-x-7.json b/jigsaw-pieces/murky_stronghold/fc-x-7.json index 1264e8c9..bde0f987 100644 --- a/jigsaw-pieces/murky_stronghold/fc-x-7.json +++ b/jigsaw-pieces/murky_stronghold/fc-x-7.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-x-7", + "object": "murky_stronghold/fc-x-7", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/fc-x-8.json b/jigsaw-pieces/murky_stronghold/fc-x-8.json index 23b9836d..84bc4e38 100644 --- a/jigsaw-pieces/murky_stronghold/fc-x-8.json +++ b/jigsaw-pieces/murky_stronghold/fc-x-8.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/murky_stronghold/fc-x-8", + "object": "murky_stronghold/fc-x-8", "connectors": [ { "name": "", diff --git a/jigsaw-pieces/murky_stronghold/void/1.json b/jigsaw-pieces/murky_stronghold/void/1.json index eb7e9e23..fa4c5924 100644 --- a/jigsaw-pieces/murky_stronghold/void/1.json +++ b/jigsaw-pieces/murky_stronghold/void/1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/void/void", + "object": "void/void", "connectors": [{ "name": "", "targetName": "*", diff --git a/jigsaw-pieces/mushhut/hut/hut1.json b/jigsaw-pieces/mushhut/hut/hut1.json index 9b5614f8..80466f08 100644 --- a/jigsaw-pieces/mushhut/hut/hut1.json +++ b/jigsaw-pieces/mushhut/hut/hut1.json @@ -74,5 +74,5 @@ "exponent": 1 } }, - "object": "jigsaw/mushhut/hut/hut1" + "object": "mushhut/hut/hut1" } diff --git a/jigsaw-pieces/mushhut/hut/hut2.json b/jigsaw-pieces/mushhut/hut/hut2.json index 7adace4f..f73439e8 100644 --- a/jigsaw-pieces/mushhut/hut/hut2.json +++ b/jigsaw-pieces/mushhut/hut/hut2.json @@ -74,5 +74,5 @@ "exponent": 1 } }, - "object": "jigsaw/mushhut/hut/hut2" + "object": "mushhut/hut/hut2" } diff --git a/jigsaw-pieces/mushhut/hut/hut3.json b/jigsaw-pieces/mushhut/hut/hut3.json index 851619ec..a74f4de7 100644 --- a/jigsaw-pieces/mushhut/hut/hut3.json +++ b/jigsaw-pieces/mushhut/hut/hut3.json @@ -74,5 +74,5 @@ "exponent": 1 } }, - "object": "jigsaw/mushhut/hut/hut3" + "object": "mushhut/hut/hut3" } diff --git a/jigsaw-pieces/mushhut/hut/hut4.json b/jigsaw-pieces/mushhut/hut/hut4.json index 529b59dd..a40462a2 100644 --- a/jigsaw-pieces/mushhut/hut/hut4.json +++ b/jigsaw-pieces/mushhut/hut/hut4.json @@ -74,5 +74,5 @@ "exponent": 1 } }, - "object": "jigsaw/mushhut/hut/hut4" + "object": "mushhut/hut/hut4" } diff --git a/jigsaw-pieces/mushhut/hut/hut5.json b/jigsaw-pieces/mushhut/hut/hut5.json index 96476f65..39e0322a 100644 --- a/jigsaw-pieces/mushhut/hut/hut5.json +++ b/jigsaw-pieces/mushhut/hut/hut5.json @@ -74,5 +74,5 @@ "exponent": 1 } }, - "object": "jigsaw/mushhut/hut/hut5" + "object": "mushhut/hut/hut5" } diff --git a/jigsaw-pieces/mushhut/hut/hut6.json b/jigsaw-pieces/mushhut/hut/hut6.json index 0110652c..9c712ae0 100644 --- a/jigsaw-pieces/mushhut/hut/hut6.json +++ b/jigsaw-pieces/mushhut/hut/hut6.json @@ -74,5 +74,5 @@ "exponent": 1 } }, - "object": "jigsaw/mushhut/hut/hut6" + "object": "mushhut/hut/hut6" } diff --git a/jigsaw-pieces/mushhut/hut/hut7.json b/jigsaw-pieces/mushhut/hut/hut7.json index 88eb5ae7..3923405c 100644 --- a/jigsaw-pieces/mushhut/hut/hut7.json +++ b/jigsaw-pieces/mushhut/hut/hut7.json @@ -74,5 +74,5 @@ "exponent": 1 } }, - "object": "jigsaw/mushhut/hut/hut7" + "object": "mushhut/hut/hut7" } diff --git a/jigsaw-pieces/mushhut/paths/path1.json b/jigsaw-pieces/mushhut/paths/path1.json index 14c5ed61..54972034 100644 --- a/jigsaw-pieces/mushhut/paths/path1.json +++ b/jigsaw-pieces/mushhut/paths/path1.json @@ -76,5 +76,5 @@ "exponent": 1 } }, - "object": "jigsaw/mushhut/paths/path1" + "object": "mushhut/paths/path1" } diff --git a/jigsaw-pieces/mushhut/paths/path2.json b/jigsaw-pieces/mushhut/paths/path2.json index 91df06ac..1603f748 100644 --- a/jigsaw-pieces/mushhut/paths/path2.json +++ b/jigsaw-pieces/mushhut/paths/path2.json @@ -94,5 +94,5 @@ "exponent": 1 } }, - "object": "jigsaw/mushhut/paths/path2" + "object": "mushhut/paths/path2" } diff --git a/jigsaw-pieces/mushhut/paths/path3.json b/jigsaw-pieces/mushhut/paths/path3.json index 6291dd4f..ea569811 100644 --- a/jigsaw-pieces/mushhut/paths/path3.json +++ b/jigsaw-pieces/mushhut/paths/path3.json @@ -96,5 +96,5 @@ "exponent": 1 } }, - "object": "jigsaw/mushhut/paths/path3" + "object": "mushhut/paths/path3" } diff --git a/jigsaw-pieces/mushhut/paths/path4.json b/jigsaw-pieces/mushhut/paths/path4.json index 777c4b32..c0a367e9 100644 --- a/jigsaw-pieces/mushhut/paths/path4.json +++ b/jigsaw-pieces/mushhut/paths/path4.json @@ -132,5 +132,5 @@ "exponent": 1 } }, - "object": "jigsaw/mushhut/paths/path4" + "object": "mushhut/paths/path4" } diff --git a/jigsaw-pieces/nether_fossils/fossil_1.json b/jigsaw-pieces/nether_fossils/fossil_1.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/nether_fossils/fossil_1.json +++ b/jigsaw-pieces/nether_fossils/fossil_1.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/nether_fossils/fossil_10.json b/jigsaw-pieces/nether_fossils/fossil_10.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/nether_fossils/fossil_10.json +++ b/jigsaw-pieces/nether_fossils/fossil_10.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/nether_fossils/fossil_11.json b/jigsaw-pieces/nether_fossils/fossil_11.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/nether_fossils/fossil_11.json +++ b/jigsaw-pieces/nether_fossils/fossil_11.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/nether_fossils/fossil_12.json b/jigsaw-pieces/nether_fossils/fossil_12.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/nether_fossils/fossil_12.json +++ b/jigsaw-pieces/nether_fossils/fossil_12.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/nether_fossils/fossil_13.json b/jigsaw-pieces/nether_fossils/fossil_13.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/nether_fossils/fossil_13.json +++ b/jigsaw-pieces/nether_fossils/fossil_13.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/nether_fossils/fossil_14.json b/jigsaw-pieces/nether_fossils/fossil_14.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/nether_fossils/fossil_14.json +++ b/jigsaw-pieces/nether_fossils/fossil_14.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/nether_fossils/fossil_2.json b/jigsaw-pieces/nether_fossils/fossil_2.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/nether_fossils/fossil_2.json +++ b/jigsaw-pieces/nether_fossils/fossil_2.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/nether_fossils/fossil_3.json b/jigsaw-pieces/nether_fossils/fossil_3.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/nether_fossils/fossil_3.json +++ b/jigsaw-pieces/nether_fossils/fossil_3.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/nether_fossils/fossil_4.json b/jigsaw-pieces/nether_fossils/fossil_4.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/nether_fossils/fossil_4.json +++ b/jigsaw-pieces/nether_fossils/fossil_4.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/nether_fossils/fossil_5.json b/jigsaw-pieces/nether_fossils/fossil_5.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/nether_fossils/fossil_5.json +++ b/jigsaw-pieces/nether_fossils/fossil_5.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/nether_fossils/fossil_6.json b/jigsaw-pieces/nether_fossils/fossil_6.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/nether_fossils/fossil_6.json +++ b/jigsaw-pieces/nether_fossils/fossil_6.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/nether_fossils/fossil_7.json b/jigsaw-pieces/nether_fossils/fossil_7.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/nether_fossils/fossil_7.json +++ b/jigsaw-pieces/nether_fossils/fossil_7.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/nether_fossils/fossil_8.json b/jigsaw-pieces/nether_fossils/fossil_8.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/nether_fossils/fossil_8.json +++ b/jigsaw-pieces/nether_fossils/fossil_8.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/nether_fossils/fossil_9.json b/jigsaw-pieces/nether_fossils/fossil_9.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/nether_fossils/fossil_9.json +++ b/jigsaw-pieces/nether_fossils/fossil_9.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/pillager_outpost/base_plate.json b/jigsaw-pieces/pillager_outpost/base_plate.json index 8a1137f7..b7d70b4a 100644 --- a/jigsaw-pieces/pillager_outpost/base_plate.json +++ b/jigsaw-pieces/pillager_outpost/base_plate.json @@ -129,5 +129,5 @@ "exponent": 1 } }, - "object": "jigsaw/pillager_outpost/base_plate" + "object": "pillager_outpost/base_plate" } diff --git a/jigsaw-pieces/pillager_outpost/feature_plate.json b/jigsaw-pieces/pillager_outpost/feature_plate.json index 00cd2eb7..88f79b47 100644 --- a/jigsaw-pieces/pillager_outpost/feature_plate.json +++ b/jigsaw-pieces/pillager_outpost/feature_plate.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/pillager_outpost/feature_plate" + "object": "pillager_outpost/feature_plate" } diff --git a/jigsaw-pieces/pillager_outpost/overgrown/cage.json b/jigsaw-pieces/pillager_outpost/overgrown/cage.json index 5a593d92..60bdaf0a 100644 --- a/jigsaw-pieces/pillager_outpost/overgrown/cage.json +++ b/jigsaw-pieces/pillager_outpost/overgrown/cage.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/pillager_outpost/overgrown/cage", + "object": "pillager_outpost/overgrown/cage", "connectors": [ { "name": "minecraft:feature", diff --git a/jigsaw-pieces/pillager_outpost/overgrown/pumpkins1.json b/jigsaw-pieces/pillager_outpost/overgrown/pumpkins1.json index bd143faf..8a4c514d 100644 --- a/jigsaw-pieces/pillager_outpost/overgrown/pumpkins1.json +++ b/jigsaw-pieces/pillager_outpost/overgrown/pumpkins1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/pillager_outpost/overgrown/pumpkins1", + "object": "pillager_outpost/overgrown/pumpkins1", "connectors": [ { "name": "minecraft:feature", diff --git a/jigsaw-pieces/pillager_outpost/overgrown/pumpkins2.json b/jigsaw-pieces/pillager_outpost/overgrown/pumpkins2.json index f587b9db..41e992cc 100644 --- a/jigsaw-pieces/pillager_outpost/overgrown/pumpkins2.json +++ b/jigsaw-pieces/pillager_outpost/overgrown/pumpkins2.json @@ -110,5 +110,5 @@ "exponent": 1 } }, - "object": "jigsaw/pillager_outpost/overgrown/pumpkins2" + "object": "pillager_outpost/overgrown/pumpkins2" } diff --git a/jigsaw-pieces/pillager_outpost/overgrown/tent.json b/jigsaw-pieces/pillager_outpost/overgrown/tent.json index bc97c605..f6d645c8 100644 --- a/jigsaw-pieces/pillager_outpost/overgrown/tent.json +++ b/jigsaw-pieces/pillager_outpost/overgrown/tent.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/pillager_outpost/overgrown/tent", + "object": "pillager_outpost/overgrown/tent", "connectors": [ { "name": "minecraft:feature", diff --git a/jigsaw-pieces/pillager_outpost/pillager.json b/jigsaw-pieces/pillager_outpost/pillager.json index f7b5eaad..20981ac9 100644 --- a/jigsaw-pieces/pillager_outpost/pillager.json +++ b/jigsaw-pieces/pillager_outpost/pillager.json @@ -12,5 +12,5 @@ "rotateConnector": false, "innerConnector": true }], - "object": "jigsaw/bastion/mobs/empty" + "object": "bastion/mobs/empty" } diff --git a/jigsaw-pieces/pillager_outpost/regular/feature_cage1.json b/jigsaw-pieces/pillager_outpost/regular/feature_cage1.json index 6c5f0a6b..fe3c9b99 100644 --- a/jigsaw-pieces/pillager_outpost/regular/feature_cage1.json +++ b/jigsaw-pieces/pillager_outpost/regular/feature_cage1.json @@ -1,5 +1,5 @@ { - "object": "jigsaw/pillager_outpost/regular/feature_cage1", + "object": "pillager_outpost/regular/feature_cage1", "connectors": [ { "name": "minecraft:feature", diff --git a/jigsaw-pieces/pillager_outpost/regular/feature_cage2.json b/jigsaw-pieces/pillager_outpost/regular/feature_cage2.json index 2a29c630..30b35f2e 100644 --- a/jigsaw-pieces/pillager_outpost/regular/feature_cage2.json +++ b/jigsaw-pieces/pillager_outpost/regular/feature_cage2.json @@ -130,5 +130,5 @@ "exponent": 1 } }, - "object": "jigsaw/pillager_outpost/regular/feature_cage2" + "object": "pillager_outpost/regular/feature_cage2" } diff --git a/jigsaw-pieces/pillager_outpost/regular/feature_logs.json b/jigsaw-pieces/pillager_outpost/regular/feature_logs.json index 3caa38b9..a88e2221 100644 --- a/jigsaw-pieces/pillager_outpost/regular/feature_logs.json +++ b/jigsaw-pieces/pillager_outpost/regular/feature_logs.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/pillager_outpost/regular/feature_logs" + "object": "pillager_outpost/regular/feature_logs" } diff --git a/jigsaw-pieces/pillager_outpost/regular/feature_targets.json b/jigsaw-pieces/pillager_outpost/regular/feature_targets.json index b9652645..ac890a54 100644 --- a/jigsaw-pieces/pillager_outpost/regular/feature_targets.json +++ b/jigsaw-pieces/pillager_outpost/regular/feature_targets.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/pillager_outpost/regular/feature_targets" + "object": "pillager_outpost/regular/feature_targets" } diff --git a/jigsaw-pieces/pillager_outpost/regular/feature_tent1.json b/jigsaw-pieces/pillager_outpost/regular/feature_tent1.json index 0c1c758d..715d837e 100644 --- a/jigsaw-pieces/pillager_outpost/regular/feature_tent1.json +++ b/jigsaw-pieces/pillager_outpost/regular/feature_tent1.json @@ -114,5 +114,5 @@ "exponent": 1 } }, - "object": "jigsaw/pillager_outpost/regular/feature_tent1" + "object": "pillager_outpost/regular/feature_tent1" } diff --git a/jigsaw-pieces/pillager_outpost/regular/feature_tent2.json b/jigsaw-pieces/pillager_outpost/regular/feature_tent2.json index fa1e449a..075221bd 100644 --- a/jigsaw-pieces/pillager_outpost/regular/feature_tent2.json +++ b/jigsaw-pieces/pillager_outpost/regular/feature_tent2.json @@ -114,5 +114,5 @@ "exponent": 1 } }, - "object": "jigsaw/pillager_outpost/regular/feature_tent2" + "object": "pillager_outpost/regular/feature_tent2" } diff --git a/jigsaw-pieces/pillager_outpost/watchtower.json b/jigsaw-pieces/pillager_outpost/watchtower.json index fc515bcc..f0db5e73 100644 --- a/jigsaw-pieces/pillager_outpost/watchtower.json +++ b/jigsaw-pieces/pillager_outpost/watchtower.json @@ -321,5 +321,5 @@ "exponent": 1 } }, - "object": "jigsaw/pillager_outpost/watchtower" + "object": "pillager_outpost/watchtower" } diff --git a/jigsaw-pieces/pillager_outpost/watchtower_overgrown.json b/jigsaw-pieces/pillager_outpost/watchtower_overgrown.json index 0063e3ca..cc0688c4 100644 --- a/jigsaw-pieces/pillager_outpost/watchtower_overgrown.json +++ b/jigsaw-pieces/pillager_outpost/watchtower_overgrown.json @@ -250,5 +250,5 @@ "exponent": 1 } }, - "object": "jigsaw/pillager_outpost/watchtower_overgrown" + "object": "pillager_outpost/watchtower_overgrown" } diff --git a/jigsaw-pieces/pirate_ship.json b/jigsaw-pieces/pirate_ship.json index e31555ed..e7afb20e 100644 --- a/jigsaw-pieces/pirate_ship.json +++ b/jigsaw-pieces/pirate_ship.json @@ -57,5 +57,5 @@ "exponent": 1 } }, - "object": "jigsaw/zzz/BarcoPirataGriffer" + "object": "zzz/BarcoPirataGriffer" } diff --git a/jigsaw-pieces/pyramid-desert.json b/jigsaw-pieces/pyramid-desert.json index a6f23cf7..3c2012f5 100644 --- a/jigsaw-pieces/pyramid-desert.json +++ b/jigsaw-pieces/pyramid-desert.json @@ -61,5 +61,5 @@ "exponent": 1 } }, - "object": "jigsaw/pyramid/pyramid1" + "object": "pyramid/pyramid1" } diff --git a/jigsaw-pieces/ruined_portal/giant_portal_1.json b/jigsaw-pieces/ruined_portal/giant_portal_1.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/ruined_portal/giant_portal_1.json +++ b/jigsaw-pieces/ruined_portal/giant_portal_1.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/ruined_portal/giant_portal_2.json b/jigsaw-pieces/ruined_portal/giant_portal_2.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/ruined_portal/giant_portal_2.json +++ b/jigsaw-pieces/ruined_portal/giant_portal_2.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/ruined_portal/giant_portal_3.json b/jigsaw-pieces/ruined_portal/giant_portal_3.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/ruined_portal/giant_portal_3.json +++ b/jigsaw-pieces/ruined_portal/giant_portal_3.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/ruined_portal/portal_1.json b/jigsaw-pieces/ruined_portal/portal_1.json index 7bffae70..ba4d01cb 100644 --- a/jigsaw-pieces/ruined_portal/portal_1.json +++ b/jigsaw-pieces/ruined_portal/portal_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/ruined_portal/portal_1" + "object": "ruined_portal/portal_1" } diff --git a/jigsaw-pieces/ruined_portal/portal_10.json b/jigsaw-pieces/ruined_portal/portal_10.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/ruined_portal/portal_10.json +++ b/jigsaw-pieces/ruined_portal/portal_10.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/ruined_portal/portal_2.json b/jigsaw-pieces/ruined_portal/portal_2.json index e8c1497e..c5aa9509 100644 --- a/jigsaw-pieces/ruined_portal/portal_2.json +++ b/jigsaw-pieces/ruined_portal/portal_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/ruined_portal/portal_2" + "object": "ruined_portal/portal_2" } diff --git a/jigsaw-pieces/ruined_portal/portal_3.json b/jigsaw-pieces/ruined_portal/portal_3.json index 8c3b1575..12d01480 100644 --- a/jigsaw-pieces/ruined_portal/portal_3.json +++ b/jigsaw-pieces/ruined_portal/portal_3.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/ruined_portal/portal_3" + "object": "ruined_portal/portal_3" } diff --git a/jigsaw-pieces/ruined_portal/portal_4.json b/jigsaw-pieces/ruined_portal/portal_4.json index a794b6ac..e8d335f5 100644 --- a/jigsaw-pieces/ruined_portal/portal_4.json +++ b/jigsaw-pieces/ruined_portal/portal_4.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/ruined_portal/portal_4" + "object": "ruined_portal/portal_4" } diff --git a/jigsaw-pieces/ruined_portal/portal_5.json b/jigsaw-pieces/ruined_portal/portal_5.json index 5f8d5861..e58dcab5 100644 --- a/jigsaw-pieces/ruined_portal/portal_5.json +++ b/jigsaw-pieces/ruined_portal/portal_5.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/ruined_portal/portal_5" + "object": "ruined_portal/portal_5" } diff --git a/jigsaw-pieces/ruined_portal/portal_6.json b/jigsaw-pieces/ruined_portal/portal_6.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/ruined_portal/portal_6.json +++ b/jigsaw-pieces/ruined_portal/portal_6.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/ruined_portal/portal_7.json b/jigsaw-pieces/ruined_portal/portal_7.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/ruined_portal/portal_7.json +++ b/jigsaw-pieces/ruined_portal/portal_7.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/ruined_portal/portal_8.json b/jigsaw-pieces/ruined_portal/portal_8.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/ruined_portal/portal_8.json +++ b/jigsaw-pieces/ruined_portal/portal_8.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/ruined_portal/portal_9.json b/jigsaw-pieces/ruined_portal/portal_9.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/ruined_portal/portal_9.json +++ b/jigsaw-pieces/ruined_portal/portal_9.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/stronghold/ceiling/5x5/bar-lamp.json b/jigsaw-pieces/stronghold/ceiling/5x5/bar-lamp.json index 797c8827..ccd575b8 100644 --- a/jigsaw-pieces/stronghold/ceiling/5x5/bar-lamp.json +++ b/jigsaw-pieces/stronghold/ceiling/5x5/bar-lamp.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/ceiling/5x5/bar-lamp" + "object": "stronghold/ceiling/5x5/bar-lamp" } diff --git a/jigsaw-pieces/stronghold/ceiling/5x5/lamp.json b/jigsaw-pieces/stronghold/ceiling/5x5/lamp.json index 7d5c939d..0afae3fa 100644 --- a/jigsaw-pieces/stronghold/ceiling/5x5/lamp.json +++ b/jigsaw-pieces/stronghold/ceiling/5x5/lamp.json @@ -24,5 +24,5 @@ "time": {}, "write": {} }, - "object": "jigsaw/stronghold/ceiling/5x5/lamp" + "object": "stronghold/ceiling/5x5/lamp" } diff --git a/jigsaw-pieces/stronghold/ceiling/5x5/wood-beams.json b/jigsaw-pieces/stronghold/ceiling/5x5/wood-beams.json index edf3a95e..4d01ca36 100644 --- a/jigsaw-pieces/stronghold/ceiling/5x5/wood-beams.json +++ b/jigsaw-pieces/stronghold/ceiling/5x5/wood-beams.json @@ -24,6 +24,6 @@ "time": {}, "write": {} }, - "object": "jigsaw/stronghold/ceiling/5x5/wood-beams", + "object": "stronghold/ceiling/5x5/wood-beams", "placementOptions": {"bore": true} } diff --git a/jigsaw-pieces/stronghold/ceiling/7x7/flat.json b/jigsaw-pieces/stronghold/ceiling/7x7/flat.json index 092083b2..65db3424 100644 --- a/jigsaw-pieces/stronghold/ceiling/7x7/flat.json +++ b/jigsaw-pieces/stronghold/ceiling/7x7/flat.json @@ -24,5 +24,5 @@ "time": {}, "write": {} }, - "object": "jigsaw/stronghold/ceiling/7x7/flat" + "object": "stronghold/ceiling/7x7/flat" } diff --git a/jigsaw-pieces/stronghold/ceiling/7x7/wood-beams.json b/jigsaw-pieces/stronghold/ceiling/7x7/wood-beams.json index bc45ef97..d9b5096f 100644 --- a/jigsaw-pieces/stronghold/ceiling/7x7/wood-beams.json +++ b/jigsaw-pieces/stronghold/ceiling/7x7/wood-beams.json @@ -39,6 +39,6 @@ "time": {}, "write": {} }, - "object": "jigsaw/stronghold/ceiling/7x7/wood-beams", + "object": "stronghold/ceiling/7x7/wood-beams", "placementOptions": {"bore": true} } diff --git a/jigsaw-pieces/stronghold/door/iron.json b/jigsaw-pieces/stronghold/door/iron.json index 8cd7fca2..d61f6e43 100644 --- a/jigsaw-pieces/stronghold/door/iron.json +++ b/jigsaw-pieces/stronghold/door/iron.json @@ -93,5 +93,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/iron-door" + "object": "stronghold/path/iron-door" } diff --git a/jigsaw-pieces/stronghold/door/iron2.json b/jigsaw-pieces/stronghold/door/iron2.json index 4a810198..5f2fbee5 100644 --- a/jigsaw-pieces/stronghold/door/iron2.json +++ b/jigsaw-pieces/stronghold/door/iron2.json @@ -93,5 +93,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/iron-door2" + "object": "stronghold/path/iron-door2" } diff --git a/jigsaw-pieces/stronghold/door/wood.json b/jigsaw-pieces/stronghold/door/wood.json index 1e5e6c45..cb361d0a 100644 --- a/jigsaw-pieces/stronghold/door/wood.json +++ b/jigsaw-pieces/stronghold/door/wood.json @@ -93,5 +93,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/wood-door" + "object": "stronghold/path/wood-door" } diff --git a/jigsaw-pieces/stronghold/door/wood2.json b/jigsaw-pieces/stronghold/door/wood2.json index 935f4b1b..831912c2 100644 --- a/jigsaw-pieces/stronghold/door/wood2.json +++ b/jigsaw-pieces/stronghold/door/wood2.json @@ -93,5 +93,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/wood-door2" + "object": "stronghold/path/wood-door2" } diff --git a/jigsaw-pieces/stronghold/floor/3x3/flat.json b/jigsaw-pieces/stronghold/floor/3x3/flat.json index 45dabb5e..5e646be3 100644 --- a/jigsaw-pieces/stronghold/floor/3x3/flat.json +++ b/jigsaw-pieces/stronghold/floor/3x3/flat.json @@ -24,6 +24,6 @@ "time": {}, "write": {} }, - "object": "jigsaw/stronghold/floor/3x3/flat", + "object": "stronghold/floor/3x3/flat", "placementOptions": {"bore": true} } diff --git a/jigsaw-pieces/stronghold/floor/3x3/tnt.json b/jigsaw-pieces/stronghold/floor/3x3/tnt.json index c9fa3d4d..3c5d8a9e 100644 --- a/jigsaw-pieces/stronghold/floor/3x3/tnt.json +++ b/jigsaw-pieces/stronghold/floor/3x3/tnt.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/floor/3x3/tnt" + "object": "stronghold/floor/3x3/tnt" } diff --git a/jigsaw-pieces/stronghold/jail/1.json b/jigsaw-pieces/stronghold/jail/1.json index 898a395c..1ad07a87 100644 --- a/jigsaw-pieces/stronghold/jail/1.json +++ b/jigsaw-pieces/stronghold/jail/1.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/jail/1" + "object": "stronghold/jail/1" } diff --git a/jigsaw-pieces/stronghold/jail/10.json b/jigsaw-pieces/stronghold/jail/10.json index 06f3048a..fccffc0a 100644 --- a/jigsaw-pieces/stronghold/jail/10.json +++ b/jigsaw-pieces/stronghold/jail/10.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/jail/10" + "object": "stronghold/jail/10" } diff --git a/jigsaw-pieces/stronghold/jail/11.json b/jigsaw-pieces/stronghold/jail/11.json index 624f44d2..b930722e 100644 --- a/jigsaw-pieces/stronghold/jail/11.json +++ b/jigsaw-pieces/stronghold/jail/11.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/jail/11" + "object": "stronghold/jail/11" } diff --git a/jigsaw-pieces/stronghold/jail/12.json b/jigsaw-pieces/stronghold/jail/12.json index f0a9709c..0ade7ffa 100644 --- a/jigsaw-pieces/stronghold/jail/12.json +++ b/jigsaw-pieces/stronghold/jail/12.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/jail/12" + "object": "stronghold/jail/12" } diff --git a/jigsaw-pieces/stronghold/jail/2.json b/jigsaw-pieces/stronghold/jail/2.json index 31cfc421..42f52d32 100644 --- a/jigsaw-pieces/stronghold/jail/2.json +++ b/jigsaw-pieces/stronghold/jail/2.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/jail/2" + "object": "stronghold/jail/2" } diff --git a/jigsaw-pieces/stronghold/jail/3.json b/jigsaw-pieces/stronghold/jail/3.json index 870bb3af..9e7a579e 100644 --- a/jigsaw-pieces/stronghold/jail/3.json +++ b/jigsaw-pieces/stronghold/jail/3.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/jail/3" + "object": "stronghold/jail/3" } diff --git a/jigsaw-pieces/stronghold/jail/4.json b/jigsaw-pieces/stronghold/jail/4.json index e353671c..a8b325c4 100644 --- a/jigsaw-pieces/stronghold/jail/4.json +++ b/jigsaw-pieces/stronghold/jail/4.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/jail/4" + "object": "stronghold/jail/4" } diff --git a/jigsaw-pieces/stronghold/jail/5.json b/jigsaw-pieces/stronghold/jail/5.json index 87bdefd8..5f5668ac 100644 --- a/jigsaw-pieces/stronghold/jail/5.json +++ b/jigsaw-pieces/stronghold/jail/5.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/jail/5" + "object": "stronghold/jail/5" } diff --git a/jigsaw-pieces/stronghold/jail/6.json b/jigsaw-pieces/stronghold/jail/6.json index 451e29e2..58d999f0 100644 --- a/jigsaw-pieces/stronghold/jail/6.json +++ b/jigsaw-pieces/stronghold/jail/6.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/jail/6" + "object": "stronghold/jail/6" } diff --git a/jigsaw-pieces/stronghold/jail/7.json b/jigsaw-pieces/stronghold/jail/7.json index 1a9a5102..13768b35 100644 --- a/jigsaw-pieces/stronghold/jail/7.json +++ b/jigsaw-pieces/stronghold/jail/7.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/jail/7" + "object": "stronghold/jail/7" } diff --git a/jigsaw-pieces/stronghold/jail/8.json b/jigsaw-pieces/stronghold/jail/8.json index 3001562b..2e0a70d1 100644 --- a/jigsaw-pieces/stronghold/jail/8.json +++ b/jigsaw-pieces/stronghold/jail/8.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/jail/8" + "object": "stronghold/jail/8" } diff --git a/jigsaw-pieces/stronghold/jail/9.json b/jigsaw-pieces/stronghold/jail/9.json index 1c4b0d8d..7332ff4d 100644 --- a/jigsaw-pieces/stronghold/jail/9.json +++ b/jigsaw-pieces/stronghold/jail/9.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/jail/9" + "object": "stronghold/jail/9" } diff --git a/jigsaw-pieces/stronghold/jail/blank.json b/jigsaw-pieces/stronghold/jail/blank.json index 05d8011e..3b6af88c 100644 --- a/jigsaw-pieces/stronghold/jail/blank.json +++ b/jigsaw-pieces/stronghold/jail/blank.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/jail/blank" + "object": "stronghold/jail/blank" } diff --git a/jigsaw-pieces/stronghold/path/4way-spiral-staircase.json b/jigsaw-pieces/stronghold/path/4way-spiral-staircase.json index f2feed0f..19ce3ba0 100644 --- a/jigsaw-pieces/stronghold/path/4way-spiral-staircase.json +++ b/jigsaw-pieces/stronghold/path/4way-spiral-staircase.json @@ -78,6 +78,6 @@ "time": {}, "write": {} }, - "object": "jigsaw/stronghold/path/4way-spiral-staircase", + "object": "stronghold/path/4way-spiral-staircase", "placementOptions": {"bore": true} } diff --git a/jigsaw-pieces/stronghold/path/cap.json b/jigsaw-pieces/stronghold/path/cap.json index 3d330262..b054ddc6 100644 --- a/jigsaw-pieces/stronghold/path/cap.json +++ b/jigsaw-pieces/stronghold/path/cap.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/cap" + "object": "stronghold/path/cap" } diff --git a/jigsaw-pieces/stronghold/path/corner-cross.json b/jigsaw-pieces/stronghold/path/corner-cross.json index 11c73cc5..599cc11f 100644 --- a/jigsaw-pieces/stronghold/path/corner-cross.json +++ b/jigsaw-pieces/stronghold/path/corner-cross.json @@ -129,5 +129,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/corner-cross" + "object": "stronghold/path/corner-cross" } diff --git a/jigsaw-pieces/stronghold/path/corridor-cross.json b/jigsaw-pieces/stronghold/path/corridor-cross.json index caaf8d12..c7eceb89 100644 --- a/jigsaw-pieces/stronghold/path/corridor-cross.json +++ b/jigsaw-pieces/stronghold/path/corridor-cross.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/corridor-cross" + "object": "stronghold/path/corridor-cross" } diff --git a/jigsaw-pieces/stronghold/path/fancy-cross.json b/jigsaw-pieces/stronghold/path/fancy-cross.json index 6f970a72..8d7d6662 100644 --- a/jigsaw-pieces/stronghold/path/fancy-cross.json +++ b/jigsaw-pieces/stronghold/path/fancy-cross.json @@ -221,5 +221,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/fancy-cross" + "object": "stronghold/path/fancy-cross" } diff --git a/jigsaw-pieces/stronghold/path/hazard-hall1.json b/jigsaw-pieces/stronghold/path/hazard-hall1.json index c4c41aae..f844d799 100644 --- a/jigsaw-pieces/stronghold/path/hazard-hall1.json +++ b/jigsaw-pieces/stronghold/path/hazard-hall1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/hazard-hall1" + "object": "stronghold/path/hazard-hall1" } diff --git a/jigsaw-pieces/stronghold/path/hazard-hall2.json b/jigsaw-pieces/stronghold/path/hazard-hall2.json index 018b5a03..1df150e7 100644 --- a/jigsaw-pieces/stronghold/path/hazard-hall2.json +++ b/jigsaw-pieces/stronghold/path/hazard-hall2.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/hazard-hall2" + "object": "stronghold/path/hazard-hall2" } diff --git a/jigsaw-pieces/stronghold/path/hazard-hall3.json b/jigsaw-pieces/stronghold/path/hazard-hall3.json index 7746620a..12c13b27 100644 --- a/jigsaw-pieces/stronghold/path/hazard-hall3.json +++ b/jigsaw-pieces/stronghold/path/hazard-hall3.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/hazard-hall3" + "object": "stronghold/path/hazard-hall3" } diff --git a/jigsaw-pieces/stronghold/path/jail-room1.json b/jigsaw-pieces/stronghold/path/jail-room1.json index 2008c867..bcdbf234 100644 --- a/jigsaw-pieces/stronghold/path/jail-room1.json +++ b/jigsaw-pieces/stronghold/path/jail-room1.json @@ -144,5 +144,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/jail-room1" + "object": "stronghold/path/jail-room1" } diff --git a/jigsaw-pieces/stronghold/path/jail-room2.json b/jigsaw-pieces/stronghold/path/jail-room2.json index 40f3de9b..a665a2c2 100644 --- a/jigsaw-pieces/stronghold/path/jail-room2.json +++ b/jigsaw-pieces/stronghold/path/jail-room2.json @@ -159,5 +159,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/jail-room2" + "object": "stronghold/path/jail-room2" } diff --git a/jigsaw-pieces/stronghold/path/large-corridor.json b/jigsaw-pieces/stronghold/path/large-corridor.json index e97b6141..ad5bca28 100644 --- a/jigsaw-pieces/stronghold/path/large-corridor.json +++ b/jigsaw-pieces/stronghold/path/large-corridor.json @@ -134,5 +134,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/large-corridor" + "object": "stronghold/path/large-corridor" } diff --git a/jigsaw-pieces/stronghold/path/large-cross-stairs.json b/jigsaw-pieces/stronghold/path/large-cross-stairs.json index 932efb37..9dee1381 100644 --- a/jigsaw-pieces/stronghold/path/large-cross-stairs.json +++ b/jigsaw-pieces/stronghold/path/large-cross-stairs.json @@ -167,5 +167,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/large-cross-stairs" + "object": "stronghold/path/large-cross-stairs" } diff --git a/jigsaw-pieces/stronghold/path/large-spiral-staircase.json b/jigsaw-pieces/stronghold/path/large-spiral-staircase.json index b5a7a195..a8550fe8 100644 --- a/jigsaw-pieces/stronghold/path/large-spiral-staircase.json +++ b/jigsaw-pieces/stronghold/path/large-spiral-staircase.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/large-spiral-staircase" + "object": "stronghold/path/large-spiral-staircase" } diff --git a/jigsaw-pieces/stronghold/path/medium-corridor.json b/jigsaw-pieces/stronghold/path/medium-corridor.json index 7a0b5c6a..504e599b 100644 --- a/jigsaw-pieces/stronghold/path/medium-corridor.json +++ b/jigsaw-pieces/stronghold/path/medium-corridor.json @@ -134,5 +134,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/medium-corridor" + "object": "stronghold/path/medium-corridor" } diff --git a/jigsaw-pieces/stronghold/path/medium-corridor2.json b/jigsaw-pieces/stronghold/path/medium-corridor2.json index ea8b8dae..5e3090c7 100644 --- a/jigsaw-pieces/stronghold/path/medium-corridor2.json +++ b/jigsaw-pieces/stronghold/path/medium-corridor2.json @@ -143,5 +143,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/medium-corridor2" + "object": "stronghold/path/medium-corridor2" } diff --git a/jigsaw-pieces/stronghold/path/medium-cross.json b/jigsaw-pieces/stronghold/path/medium-cross.json index 6026511c..1dc9a521 100644 --- a/jigsaw-pieces/stronghold/path/medium-cross.json +++ b/jigsaw-pieces/stronghold/path/medium-cross.json @@ -167,5 +167,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/medium-cross" + "object": "stronghold/path/medium-cross" } diff --git a/jigsaw-pieces/stronghold/path/medium-wide-corridor1.json b/jigsaw-pieces/stronghold/path/medium-wide-corridor1.json index 28312c85..2462ec3b 100644 --- a/jigsaw-pieces/stronghold/path/medium-wide-corridor1.json +++ b/jigsaw-pieces/stronghold/path/medium-wide-corridor1.json @@ -129,5 +129,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/medium-wide-corridor1" + "object": "stronghold/path/medium-wide-corridor1" } diff --git a/jigsaw-pieces/stronghold/path/portal-hall.json b/jigsaw-pieces/stronghold/path/portal-hall.json index 00cbfbed..1bc634e8 100644 --- a/jigsaw-pieces/stronghold/path/portal-hall.json +++ b/jigsaw-pieces/stronghold/path/portal-hall.json @@ -123,5 +123,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/portal-hall" + "object": "stronghold/path/portal-hall" } diff --git a/jigsaw-pieces/stronghold/path/small-corridor.json b/jigsaw-pieces/stronghold/path/small-corridor.json index b52da2e0..22e797d8 100644 --- a/jigsaw-pieces/stronghold/path/small-corridor.json +++ b/jigsaw-pieces/stronghold/path/small-corridor.json @@ -122,5 +122,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/small-corridor" + "object": "stronghold/path/small-corridor" } diff --git a/jigsaw-pieces/stronghold/path/small-cross.json b/jigsaw-pieces/stronghold/path/small-cross.json index dfaa1232..8ef03660 100644 --- a/jigsaw-pieces/stronghold/path/small-cross.json +++ b/jigsaw-pieces/stronghold/path/small-cross.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/small-cross" + "object": "stronghold/path/small-cross" } diff --git a/jigsaw-pieces/stronghold/path/small-spiral-staircase.json b/jigsaw-pieces/stronghold/path/small-spiral-staircase.json index 57afe9cb..2152314a 100644 --- a/jigsaw-pieces/stronghold/path/small-spiral-staircase.json +++ b/jigsaw-pieces/stronghold/path/small-spiral-staircase.json @@ -52,6 +52,6 @@ "time": {}, "write": {} }, - "object": "jigsaw/stronghold/path/small-spiral-staircase", + "object": "stronghold/path/small-spiral-staircase", "placementOptions": {"bore": true} } diff --git a/jigsaw-pieces/stronghold/path/stair-split.json b/jigsaw-pieces/stronghold/path/stair-split.json index 00fb7617..7a37d97b 100644 --- a/jigsaw-pieces/stronghold/path/stair-split.json +++ b/jigsaw-pieces/stronghold/path/stair-split.json @@ -149,5 +149,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/stair-split" + "object": "stronghold/path/stair-split" } diff --git a/jigsaw-pieces/stronghold/path/stairs1.json b/jigsaw-pieces/stronghold/path/stairs1.json index 9b65c382..ac851418 100644 --- a/jigsaw-pieces/stronghold/path/stairs1.json +++ b/jigsaw-pieces/stronghold/path/stairs1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/stairs1" + "object": "stronghold/path/stairs1" } diff --git a/jigsaw-pieces/stronghold/path/straight-staircase.json b/jigsaw-pieces/stronghold/path/straight-staircase.json index e5ba595c..e3bcc0bc 100644 --- a/jigsaw-pieces/stronghold/path/straight-staircase.json +++ b/jigsaw-pieces/stronghold/path/straight-staircase.json @@ -45,6 +45,6 @@ "time": {}, "write": {} }, - "object": "jigsaw/stronghold/path/straight-staircase", + "object": "stronghold/path/straight-staircase", "placementOptions": {"bore": true} } diff --git a/jigsaw-pieces/stronghold/path/tee-cross.json b/jigsaw-pieces/stronghold/path/tee-cross.json index e0c01b71..10e1986b 100644 --- a/jigsaw-pieces/stronghold/path/tee-cross.json +++ b/jigsaw-pieces/stronghold/path/tee-cross.json @@ -151,5 +151,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/tee-cross" + "object": "stronghold/path/tee-cross" } diff --git a/jigsaw-pieces/stronghold/path/tee-cross2.json b/jigsaw-pieces/stronghold/path/tee-cross2.json index 6f10daa1..bdc03245 100644 --- a/jigsaw-pieces/stronghold/path/tee-cross2.json +++ b/jigsaw-pieces/stronghold/path/tee-cross2.json @@ -151,5 +151,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/tee-cross2" + "object": "stronghold/path/tee-cross2" } diff --git a/jigsaw-pieces/stronghold/path/tiny-cross.json b/jigsaw-pieces/stronghold/path/tiny-cross.json index dcf71584..39c0865e 100644 --- a/jigsaw-pieces/stronghold/path/tiny-cross.json +++ b/jigsaw-pieces/stronghold/path/tiny-cross.json @@ -142,5 +142,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/path/tiny-cross" + "object": "stronghold/path/tiny-cross" } diff --git a/jigsaw-pieces/stronghold/portal/main.json b/jigsaw-pieces/stronghold/portal/main.json index 1ed8a90b..89cfa928 100644 --- a/jigsaw-pieces/stronghold/portal/main.json +++ b/jigsaw-pieces/stronghold/portal/main.json @@ -261,5 +261,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/portal/main" + "object": "stronghold/portal/main" } diff --git a/jigsaw-pieces/stronghold/portal/top.json b/jigsaw-pieces/stronghold/portal/top.json index 94c79d21..e438e252 100644 --- a/jigsaw-pieces/stronghold/portal/top.json +++ b/jigsaw-pieces/stronghold/portal/top.json @@ -288,5 +288,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/portal/top_new" + "object": "stronghold/portal/top_new" } diff --git a/jigsaw-pieces/stronghold/room/sleeping-quarters.json b/jigsaw-pieces/stronghold/room/sleeping-quarters.json index 669e6feb..79d98394 100644 --- a/jigsaw-pieces/stronghold/room/sleeping-quarters.json +++ b/jigsaw-pieces/stronghold/room/sleeping-quarters.json @@ -88,5 +88,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/room/sleeping-quarters" + "object": "stronghold/room/sleeping-quarters" } diff --git a/jigsaw-pieces/stronghold/room/small-cell.json b/jigsaw-pieces/stronghold/room/small-cell.json index d1ab0de9..61b9377c 100644 --- a/jigsaw-pieces/stronghold/room/small-cell.json +++ b/jigsaw-pieces/stronghold/room/small-cell.json @@ -24,6 +24,6 @@ "time": {}, "write": {} }, - "object": "jigsaw/stronghold/room/small-cell", + "object": "stronghold/room/small-cell", "placementOptions": {"bore": true} } diff --git a/jigsaw-pieces/stronghold/room/stairs-down.json b/jigsaw-pieces/stronghold/room/stairs-down.json index c430eab7..00c76f3d 100644 --- a/jigsaw-pieces/stronghold/room/stairs-down.json +++ b/jigsaw-pieces/stronghold/room/stairs-down.json @@ -104,5 +104,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/room/stairs-down" + "object": "stronghold/room/stairs-down" } diff --git a/jigsaw-pieces/stronghold/room/stairs-up-down.json b/jigsaw-pieces/stronghold/room/stairs-up-down.json index b66e6189..fef59e29 100644 --- a/jigsaw-pieces/stronghold/room/stairs-up-down.json +++ b/jigsaw-pieces/stronghold/room/stairs-up-down.json @@ -118,5 +118,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/room/stairs-up-down" + "object": "stronghold/room/stairs-up-down" } diff --git a/jigsaw-pieces/stronghold/room/stairs-up.json b/jigsaw-pieces/stronghold/room/stairs-up.json index e8038229..9c1d3e11 100644 --- a/jigsaw-pieces/stronghold/room/stairs-up.json +++ b/jigsaw-pieces/stronghold/room/stairs-up.json @@ -104,5 +104,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/room/stairs-up" + "object": "stronghold/room/stairs-up" } diff --git a/jigsaw-pieces/stronghold/room/study.json b/jigsaw-pieces/stronghold/room/study.json index 9c204790..8ad5ca78 100644 --- a/jigsaw-pieces/stronghold/room/study.json +++ b/jigsaw-pieces/stronghold/room/study.json @@ -88,5 +88,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/room/study" + "object": "stronghold/room/study" } diff --git a/jigsaw-pieces/stronghold/room/witch-room-end.json b/jigsaw-pieces/stronghold/room/witch-room-end.json index 65b69076..71b272da 100644 --- a/jigsaw-pieces/stronghold/room/witch-room-end.json +++ b/jigsaw-pieces/stronghold/room/witch-room-end.json @@ -101,5 +101,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/room/witch-room-end" + "object": "stronghold/room/witch-room-end" } diff --git a/jigsaw-pieces/stronghold/room/witch-room.json b/jigsaw-pieces/stronghold/room/witch-room.json index c06eb4ec..df3a9d77 100644 --- a/jigsaw-pieces/stronghold/room/witch-room.json +++ b/jigsaw-pieces/stronghold/room/witch-room.json @@ -70,5 +70,5 @@ "place": [], "chance": 0 }, - "object": "jigsaw/stronghold/room/witch-room" + "object": "stronghold/room/witch-room" } diff --git a/jigsaw-pieces/stronghold/rooms/alter1.json b/jigsaw-pieces/stronghold/rooms/alter1.json index 3fa5a276..3181f06d 100644 --- a/jigsaw-pieces/stronghold/rooms/alter1.json +++ b/jigsaw-pieces/stronghold/rooms/alter1.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/rooms/alter1" + "object": "stronghold/rooms/alter1" } diff --git a/jigsaw-pieces/stronghold/rooms/boomtube-test.json b/jigsaw-pieces/stronghold/rooms/boomtube-test.json index 1fca4ab5..cc319c6c 100644 --- a/jigsaw-pieces/stronghold/rooms/boomtube-test.json +++ b/jigsaw-pieces/stronghold/rooms/boomtube-test.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/rooms/boomtube-test" + "object": "stronghold/rooms/boomtube-test" } diff --git a/jigsaw-pieces/stronghold/rooms/chestroom1-trap.json b/jigsaw-pieces/stronghold/rooms/chestroom1-trap.json index de214b5b..8d33cb40 100644 --- a/jigsaw-pieces/stronghold/rooms/chestroom1-trap.json +++ b/jigsaw-pieces/stronghold/rooms/chestroom1-trap.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/rooms/chestroom1-trap" + "object": "stronghold/rooms/chestroom1-trap" } diff --git a/jigsaw-pieces/stronghold/rooms/chestroom1.json b/jigsaw-pieces/stronghold/rooms/chestroom1.json index 2369a540..084e4a8f 100644 --- a/jigsaw-pieces/stronghold/rooms/chestroom1.json +++ b/jigsaw-pieces/stronghold/rooms/chestroom1.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/rooms/chestroom1" + "object": "stronghold/rooms/chestroom1" } diff --git a/jigsaw-pieces/stronghold/rooms/chestroom2-trap.json b/jigsaw-pieces/stronghold/rooms/chestroom2-trap.json index 1b3a3a2e..1c0e3bb9 100644 --- a/jigsaw-pieces/stronghold/rooms/chestroom2-trap.json +++ b/jigsaw-pieces/stronghold/rooms/chestroom2-trap.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/rooms/chestroom2-trap" + "object": "stronghold/rooms/chestroom2-trap" } diff --git a/jigsaw-pieces/stronghold/rooms/chestroom2.json b/jigsaw-pieces/stronghold/rooms/chestroom2.json index a7ab739d..90592ece 100644 --- a/jigsaw-pieces/stronghold/rooms/chestroom2.json +++ b/jigsaw-pieces/stronghold/rooms/chestroom2.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/rooms/chestroom2" + "object": "stronghold/rooms/chestroom2" } diff --git a/jigsaw-pieces/stronghold/rooms/jail-complex.json b/jigsaw-pieces/stronghold/rooms/jail-complex.json index 87089e57..4de8354c 100644 --- a/jigsaw-pieces/stronghold/rooms/jail-complex.json +++ b/jigsaw-pieces/stronghold/rooms/jail-complex.json @@ -293,5 +293,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/rooms/jail-complex" + "object": "stronghold/rooms/jail-complex" } diff --git a/jigsaw-pieces/stronghold/rooms/library-large.json b/jigsaw-pieces/stronghold/rooms/library-large.json index c3fefd58..85a8d3ba 100644 --- a/jigsaw-pieces/stronghold/rooms/library-large.json +++ b/jigsaw-pieces/stronghold/rooms/library-large.json @@ -201,5 +201,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/rooms/library-large" + "object": "stronghold/rooms/library-large" } diff --git a/jigsaw-pieces/stronghold/rooms/library.json b/jigsaw-pieces/stronghold/rooms/library.json index 0e48cf5d..1c594997 100644 --- a/jigsaw-pieces/stronghold/rooms/library.json +++ b/jigsaw-pieces/stronghold/rooms/library.json @@ -193,5 +193,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/rooms/library" + "object": "stronghold/rooms/library" } diff --git a/jigsaw-pieces/stronghold/rooms/maze1.json b/jigsaw-pieces/stronghold/rooms/maze1.json index fa0ce3b4..704ffde6 100644 --- a/jigsaw-pieces/stronghold/rooms/maze1.json +++ b/jigsaw-pieces/stronghold/rooms/maze1.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/rooms/maze1" + "object": "stronghold/rooms/maze1" } diff --git a/jigsaw-pieces/stronghold/rooms/maze2.json b/jigsaw-pieces/stronghold/rooms/maze2.json index 3e0f6a4e..ac3ea299 100644 --- a/jigsaw-pieces/stronghold/rooms/maze2.json +++ b/jigsaw-pieces/stronghold/rooms/maze2.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/rooms/maze2" + "object": "stronghold/rooms/maze2" } diff --git a/jigsaw-pieces/stronghold/rooms/maze3.json b/jigsaw-pieces/stronghold/rooms/maze3.json index f60fe488..e584afcd 100644 --- a/jigsaw-pieces/stronghold/rooms/maze3.json +++ b/jigsaw-pieces/stronghold/rooms/maze3.json @@ -107,5 +107,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/rooms/maze3" + "object": "stronghold/rooms/maze3" } diff --git a/jigsaw-pieces/stronghold/rooms/oreroom.json b/jigsaw-pieces/stronghold/rooms/oreroom.json index 0f90ace8..65e45969 100644 --- a/jigsaw-pieces/stronghold/rooms/oreroom.json +++ b/jigsaw-pieces/stronghold/rooms/oreroom.json @@ -131,5 +131,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/rooms/oreroom" + "object": "stronghold/rooms/oreroom" } diff --git a/jigsaw-pieces/stronghold/stairs/casing-floor-hollow.json b/jigsaw-pieces/stronghold/stairs/casing-floor-hollow.json index 74a7faf7..724b5328 100644 --- a/jigsaw-pieces/stronghold/stairs/casing-floor-hollow.json +++ b/jigsaw-pieces/stronghold/stairs/casing-floor-hollow.json @@ -87,5 +87,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/stairs/casing-floor-hollow" + "object": "stronghold/stairs/casing-floor-hollow" } diff --git a/jigsaw-pieces/stronghold/stairs/casing-floor-solid.json b/jigsaw-pieces/stronghold/stairs/casing-floor-solid.json index b9b4c38d..612509d4 100644 --- a/jigsaw-pieces/stronghold/stairs/casing-floor-solid.json +++ b/jigsaw-pieces/stronghold/stairs/casing-floor-solid.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/stairs/casing-floor-solid" + "object": "stronghold/stairs/casing-floor-solid" } diff --git a/jigsaw-pieces/stronghold/stairs/casing-tight.json b/jigsaw-pieces/stronghold/stairs/casing-tight.json index ed6ac633..eae18a81 100644 --- a/jigsaw-pieces/stronghold/stairs/casing-tight.json +++ b/jigsaw-pieces/stronghold/stairs/casing-tight.json @@ -189,5 +189,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/stairs/casing-tight" + "object": "stronghold/stairs/casing-tight" } diff --git a/jigsaw-pieces/stronghold/stairs/casing.json b/jigsaw-pieces/stronghold/stairs/casing.json index 779adfdf..1ca97d9b 100644 --- a/jigsaw-pieces/stronghold/stairs/casing.json +++ b/jigsaw-pieces/stronghold/stairs/casing.json @@ -189,5 +189,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/stairs/casing" + "object": "stronghold/stairs/casing" } diff --git a/jigsaw-pieces/stronghold/stairs/med-vertical-complete1.json b/jigsaw-pieces/stronghold/stairs/med-vertical-complete1.json index ea6b2817..e31d0df0 100644 --- a/jigsaw-pieces/stronghold/stairs/med-vertical-complete1.json +++ b/jigsaw-pieces/stronghold/stairs/med-vertical-complete1.json @@ -207,5 +207,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/stairs/med-vertical-complete1" + "object": "stronghold/stairs/med-vertical-complete1" } diff --git a/jigsaw-pieces/stronghold/stairs/med-vertical-complete2.json b/jigsaw-pieces/stronghold/stairs/med-vertical-complete2.json index 2fa344af..06c173ee 100644 --- a/jigsaw-pieces/stronghold/stairs/med-vertical-complete2.json +++ b/jigsaw-pieces/stronghold/stairs/med-vertical-complete2.json @@ -221,5 +221,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/stairs/med-vertical-complete2" + "object": "stronghold/stairs/med-vertical-complete2" } diff --git a/jigsaw-pieces/stronghold/stairs/med-vertical-naked.json b/jigsaw-pieces/stronghold/stairs/med-vertical-naked.json index f00572c9..30f68aea 100644 --- a/jigsaw-pieces/stronghold/stairs/med-vertical-naked.json +++ b/jigsaw-pieces/stronghold/stairs/med-vertical-naked.json @@ -87,5 +87,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/stairs/med-vertical-naked" + "object": "stronghold/stairs/med-vertical-naked" } diff --git a/jigsaw-pieces/stronghold/stairs/sml-vertical-naked.json b/jigsaw-pieces/stronghold/stairs/sml-vertical-naked.json index 2a35d742..ff58d40b 100644 --- a/jigsaw-pieces/stronghold/stairs/sml-vertical-naked.json +++ b/jigsaw-pieces/stronghold/stairs/sml-vertical-naked.json @@ -87,5 +87,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/stairs/sml-vertical-naked" + "object": "stronghold/stairs/sml-vertical-naked" } diff --git a/jigsaw-pieces/stronghold/wall-fixture/5x3/anvil-furnace.json b/jigsaw-pieces/stronghold/wall-fixture/5x3/anvil-furnace.json index 05e45f8d..2cdcb64c 100644 --- a/jigsaw-pieces/stronghold/wall-fixture/5x3/anvil-furnace.json +++ b/jigsaw-pieces/stronghold/wall-fixture/5x3/anvil-furnace.json @@ -23,5 +23,5 @@ "time": {}, "write": {} }, - "object": "jigsaw/stronghold/wall-fixture/5x3/anvil-furnace" + "object": "stronghold/wall-fixture/5x3/anvil-furnace" } diff --git a/jigsaw-pieces/stronghold/wall-fixture/5x3/brew-set.json b/jigsaw-pieces/stronghold/wall-fixture/5x3/brew-set.json index a6eac961..14722506 100644 --- a/jigsaw-pieces/stronghold/wall-fixture/5x3/brew-set.json +++ b/jigsaw-pieces/stronghold/wall-fixture/5x3/brew-set.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/wall-fixture/5x3/brew-set" + "object": "stronghold/wall-fixture/5x3/brew-set" } diff --git a/jigsaw-pieces/stronghold/wall-fixture/5x3/brewing-shelf.json b/jigsaw-pieces/stronghold/wall-fixture/5x3/brewing-shelf.json index 509371be..b15bed4f 100644 --- a/jigsaw-pieces/stronghold/wall-fixture/5x3/brewing-shelf.json +++ b/jigsaw-pieces/stronghold/wall-fixture/5x3/brewing-shelf.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/wall-fixture/5x3/brewing-shelf" + "object": "stronghold/wall-fixture/5x3/brewing-shelf" } diff --git a/jigsaw-pieces/stronghold/wall-fixture/5x3/chains.json b/jigsaw-pieces/stronghold/wall-fixture/5x3/chains.json index 8b1b7eef..a50e1705 100644 --- a/jigsaw-pieces/stronghold/wall-fixture/5x3/chains.json +++ b/jigsaw-pieces/stronghold/wall-fixture/5x3/chains.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/wall-fixture/5x3/chains" + "object": "stronghold/wall-fixture/5x3/chains" } diff --git a/jigsaw-pieces/stronghold/wall-fixture/5x3/chest.json b/jigsaw-pieces/stronghold/wall-fixture/5x3/chest.json index a982c174..7c0e876a 100644 --- a/jigsaw-pieces/stronghold/wall-fixture/5x3/chest.json +++ b/jigsaw-pieces/stronghold/wall-fixture/5x3/chest.json @@ -23,5 +23,5 @@ "time": {}, "write": {} }, - "object": "jigsaw/stronghold/wall-fixture/5x3/chest" + "object": "stronghold/wall-fixture/5x3/chest" } diff --git a/jigsaw-pieces/stronghold/wall-fixture/5x3/crafting-station.json b/jigsaw-pieces/stronghold/wall-fixture/5x3/crafting-station.json index 496ba00f..57fc0c91 100644 --- a/jigsaw-pieces/stronghold/wall-fixture/5x3/crafting-station.json +++ b/jigsaw-pieces/stronghold/wall-fixture/5x3/crafting-station.json @@ -23,5 +23,5 @@ "time": {}, "write": {} }, - "object": "jigsaw/stronghold/wall-fixture/5x3/crafting-station" + "object": "stronghold/wall-fixture/5x3/crafting-station" } diff --git a/jigsaw-pieces/stronghold/wall-fixture/5x3/double-chest.json b/jigsaw-pieces/stronghold/wall-fixture/5x3/double-chest.json index 10c6915a..c1736a8c 100644 --- a/jigsaw-pieces/stronghold/wall-fixture/5x3/double-chest.json +++ b/jigsaw-pieces/stronghold/wall-fixture/5x3/double-chest.json @@ -23,5 +23,5 @@ "time": {}, "write": {} }, - "object": "jigsaw/stronghold/wall-fixture/5x3/double-chest" + "object": "stronghold/wall-fixture/5x3/double-chest" } diff --git a/jigsaw-pieces/stronghold/wall-fixture/5x3/lantern.json b/jigsaw-pieces/stronghold/wall-fixture/5x3/lantern.json index dd33800a..eadc0f5c 100644 --- a/jigsaw-pieces/stronghold/wall-fixture/5x3/lantern.json +++ b/jigsaw-pieces/stronghold/wall-fixture/5x3/lantern.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/wall-fixture/5x3/lantern" + "object": "stronghold/wall-fixture/5x3/lantern" } diff --git a/jigsaw-pieces/stronghold/wall-fixture/5x3/mixed1.json b/jigsaw-pieces/stronghold/wall-fixture/5x3/mixed1.json index 79b2ecd8..87892fd9 100644 --- a/jigsaw-pieces/stronghold/wall-fixture/5x3/mixed1.json +++ b/jigsaw-pieces/stronghold/wall-fixture/5x3/mixed1.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/wall-fixture/5x3/mixed1" + "object": "stronghold/wall-fixture/5x3/mixed1" } diff --git a/jigsaw-pieces/stronghold/wall-fixture/5x3/shelf.json b/jigsaw-pieces/stronghold/wall-fixture/5x3/shelf.json index 0c1c607c..5a6d1300 100644 --- a/jigsaw-pieces/stronghold/wall-fixture/5x3/shelf.json +++ b/jigsaw-pieces/stronghold/wall-fixture/5x3/shelf.json @@ -23,5 +23,5 @@ "time": {}, "write": {} }, - "object": "jigsaw/stronghold/wall-fixture/5x3/shelf" + "object": "stronghold/wall-fixture/5x3/shelf" } diff --git a/jigsaw-pieces/stronghold/wall-fixture/5x3/study.json b/jigsaw-pieces/stronghold/wall-fixture/5x3/study.json index 597a6040..f863a4d6 100644 --- a/jigsaw-pieces/stronghold/wall-fixture/5x3/study.json +++ b/jigsaw-pieces/stronghold/wall-fixture/5x3/study.json @@ -23,5 +23,5 @@ "time": {}, "write": {} }, - "object": "jigsaw/stronghold/wall-fixture/5x3/study" + "object": "stronghold/wall-fixture/5x3/study" } diff --git a/jigsaw-pieces/stronghold/wall-fixture/5x3x3/chains.json b/jigsaw-pieces/stronghold/wall-fixture/5x3x3/chains.json index 7a249e73..9bc93e45 100644 --- a/jigsaw-pieces/stronghold/wall-fixture/5x3x3/chains.json +++ b/jigsaw-pieces/stronghold/wall-fixture/5x3x3/chains.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold\\wall-fixture\\5x3x3\\chains" + "object": "stronghold\\wall-fixture\\5x3x3\\chains" } diff --git a/jigsaw-pieces/stronghold/wall-fixture/5x3x3/cobweb.json b/jigsaw-pieces/stronghold/wall-fixture/5x3x3/cobweb.json index ae384f0a..6c1cf451 100644 --- a/jigsaw-pieces/stronghold/wall-fixture/5x3x3/cobweb.json +++ b/jigsaw-pieces/stronghold/wall-fixture/5x3x3/cobweb.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold\\wall-fixture\\5x3x3\\cobweb" + "object": "stronghold\\wall-fixture\\5x3x3\\cobweb" } diff --git a/jigsaw-pieces/stronghold/wall-fixture/blank.json b/jigsaw-pieces/stronghold/wall-fixture/blank.json index a6c0c47c..25cc4de4 100644 --- a/jigsaw-pieces/stronghold/wall-fixture/blank.json +++ b/jigsaw-pieces/stronghold/wall-fixture/blank.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/wall-fixture/blank" + "object": "stronghold/wall-fixture/blank" } diff --git a/jigsaw-pieces/stronghold/wall/1.json b/jigsaw-pieces/stronghold/wall/1.json index 47dedcd6..e2a6381e 100644 --- a/jigsaw-pieces/stronghold/wall/1.json +++ b/jigsaw-pieces/stronghold/wall/1.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/wall/1" + "object": "stronghold/wall/1" } diff --git a/jigsaw-pieces/stronghold/wall/2.json b/jigsaw-pieces/stronghold/wall/2.json index 003c47af..901b4c0a 100644 --- a/jigsaw-pieces/stronghold/wall/2.json +++ b/jigsaw-pieces/stronghold/wall/2.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/wall/2" + "object": "stronghold/wall/2" } diff --git a/jigsaw-pieces/stronghold/wall/3.json b/jigsaw-pieces/stronghold/wall/3.json index 2d750f61..d8e91353 100644 --- a/jigsaw-pieces/stronghold/wall/3.json +++ b/jigsaw-pieces/stronghold/wall/3.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/wall/3" + "object": "stronghold/wall/3" } diff --git a/jigsaw-pieces/stronghold/wall/4.json b/jigsaw-pieces/stronghold/wall/4.json index 47dedcd6..e2a6381e 100644 --- a/jigsaw-pieces/stronghold/wall/4.json +++ b/jigsaw-pieces/stronghold/wall/4.json @@ -71,5 +71,5 @@ "exponent": 1 } }, - "object": "jigsaw/stronghold/wall/1" + "object": "stronghold/wall/1" } diff --git a/jigsaw-pieces/underwater_ruin/big_brick_1.json b/jigsaw-pieces/underwater_ruin/big_brick_1.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/big_brick_1.json +++ b/jigsaw-pieces/underwater_ruin/big_brick_1.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/big_brick_2.json b/jigsaw-pieces/underwater_ruin/big_brick_2.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/big_brick_2.json +++ b/jigsaw-pieces/underwater_ruin/big_brick_2.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/big_brick_3.json b/jigsaw-pieces/underwater_ruin/big_brick_3.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/big_brick_3.json +++ b/jigsaw-pieces/underwater_ruin/big_brick_3.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/big_brick_8.json b/jigsaw-pieces/underwater_ruin/big_brick_8.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/big_brick_8.json +++ b/jigsaw-pieces/underwater_ruin/big_brick_8.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/big_cracked_1.json b/jigsaw-pieces/underwater_ruin/big_cracked_1.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/big_cracked_1.json +++ b/jigsaw-pieces/underwater_ruin/big_cracked_1.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/big_cracked_2.json b/jigsaw-pieces/underwater_ruin/big_cracked_2.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/big_cracked_2.json +++ b/jigsaw-pieces/underwater_ruin/big_cracked_2.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/big_cracked_3.json b/jigsaw-pieces/underwater_ruin/big_cracked_3.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/big_cracked_3.json +++ b/jigsaw-pieces/underwater_ruin/big_cracked_3.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/big_cracked_8.json b/jigsaw-pieces/underwater_ruin/big_cracked_8.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/big_cracked_8.json +++ b/jigsaw-pieces/underwater_ruin/big_cracked_8.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/big_mossy_1.json b/jigsaw-pieces/underwater_ruin/big_mossy_1.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/big_mossy_1.json +++ b/jigsaw-pieces/underwater_ruin/big_mossy_1.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/big_mossy_2.json b/jigsaw-pieces/underwater_ruin/big_mossy_2.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/big_mossy_2.json +++ b/jigsaw-pieces/underwater_ruin/big_mossy_2.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/big_mossy_3.json b/jigsaw-pieces/underwater_ruin/big_mossy_3.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/big_mossy_3.json +++ b/jigsaw-pieces/underwater_ruin/big_mossy_3.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/big_mossy_8.json b/jigsaw-pieces/underwater_ruin/big_mossy_8.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/big_mossy_8.json +++ b/jigsaw-pieces/underwater_ruin/big_mossy_8.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/big_warm_4.json b/jigsaw-pieces/underwater_ruin/big_warm_4.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/big_warm_4.json +++ b/jigsaw-pieces/underwater_ruin/big_warm_4.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/big_warm_5.json b/jigsaw-pieces/underwater_ruin/big_warm_5.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/big_warm_5.json +++ b/jigsaw-pieces/underwater_ruin/big_warm_5.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/big_warm_6.json b/jigsaw-pieces/underwater_ruin/big_warm_6.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/big_warm_6.json +++ b/jigsaw-pieces/underwater_ruin/big_warm_6.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/big_warm_7.json b/jigsaw-pieces/underwater_ruin/big_warm_7.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/big_warm_7.json +++ b/jigsaw-pieces/underwater_ruin/big_warm_7.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/brick_1.json b/jigsaw-pieces/underwater_ruin/brick_1.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/brick_1.json +++ b/jigsaw-pieces/underwater_ruin/brick_1.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/brick_2.json b/jigsaw-pieces/underwater_ruin/brick_2.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/brick_2.json +++ b/jigsaw-pieces/underwater_ruin/brick_2.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/brick_3.json b/jigsaw-pieces/underwater_ruin/brick_3.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/brick_3.json +++ b/jigsaw-pieces/underwater_ruin/brick_3.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/brick_4.json b/jigsaw-pieces/underwater_ruin/brick_4.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/brick_4.json +++ b/jigsaw-pieces/underwater_ruin/brick_4.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/brick_5.json b/jigsaw-pieces/underwater_ruin/brick_5.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/brick_5.json +++ b/jigsaw-pieces/underwater_ruin/brick_5.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/brick_6.json b/jigsaw-pieces/underwater_ruin/brick_6.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/brick_6.json +++ b/jigsaw-pieces/underwater_ruin/brick_6.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/brick_7.json b/jigsaw-pieces/underwater_ruin/brick_7.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/brick_7.json +++ b/jigsaw-pieces/underwater_ruin/brick_7.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/brick_8.json b/jigsaw-pieces/underwater_ruin/brick_8.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/brick_8.json +++ b/jigsaw-pieces/underwater_ruin/brick_8.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/cracked_1.json b/jigsaw-pieces/underwater_ruin/cracked_1.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/cracked_1.json +++ b/jigsaw-pieces/underwater_ruin/cracked_1.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/cracked_2.json b/jigsaw-pieces/underwater_ruin/cracked_2.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/cracked_2.json +++ b/jigsaw-pieces/underwater_ruin/cracked_2.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/cracked_3.json b/jigsaw-pieces/underwater_ruin/cracked_3.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/cracked_3.json +++ b/jigsaw-pieces/underwater_ruin/cracked_3.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/cracked_4.json b/jigsaw-pieces/underwater_ruin/cracked_4.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/cracked_4.json +++ b/jigsaw-pieces/underwater_ruin/cracked_4.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/cracked_5.json b/jigsaw-pieces/underwater_ruin/cracked_5.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/cracked_5.json +++ b/jigsaw-pieces/underwater_ruin/cracked_5.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/cracked_6.json b/jigsaw-pieces/underwater_ruin/cracked_6.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/cracked_6.json +++ b/jigsaw-pieces/underwater_ruin/cracked_6.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/cracked_7.json b/jigsaw-pieces/underwater_ruin/cracked_7.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/cracked_7.json +++ b/jigsaw-pieces/underwater_ruin/cracked_7.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/cracked_8.json b/jigsaw-pieces/underwater_ruin/cracked_8.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/cracked_8.json +++ b/jigsaw-pieces/underwater_ruin/cracked_8.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/mossy_1.json b/jigsaw-pieces/underwater_ruin/mossy_1.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/mossy_1.json +++ b/jigsaw-pieces/underwater_ruin/mossy_1.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/mossy_2.json b/jigsaw-pieces/underwater_ruin/mossy_2.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/mossy_2.json +++ b/jigsaw-pieces/underwater_ruin/mossy_2.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/mossy_3.json b/jigsaw-pieces/underwater_ruin/mossy_3.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/mossy_3.json +++ b/jigsaw-pieces/underwater_ruin/mossy_3.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/mossy_4.json b/jigsaw-pieces/underwater_ruin/mossy_4.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/mossy_4.json +++ b/jigsaw-pieces/underwater_ruin/mossy_4.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/mossy_5.json b/jigsaw-pieces/underwater_ruin/mossy_5.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/mossy_5.json +++ b/jigsaw-pieces/underwater_ruin/mossy_5.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/mossy_6.json b/jigsaw-pieces/underwater_ruin/mossy_6.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/mossy_6.json +++ b/jigsaw-pieces/underwater_ruin/mossy_6.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/mossy_7.json b/jigsaw-pieces/underwater_ruin/mossy_7.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/mossy_7.json +++ b/jigsaw-pieces/underwater_ruin/mossy_7.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/mossy_8.json b/jigsaw-pieces/underwater_ruin/mossy_8.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/mossy_8.json +++ b/jigsaw-pieces/underwater_ruin/mossy_8.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/warm_1.json b/jigsaw-pieces/underwater_ruin/warm_1.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/warm_1.json +++ b/jigsaw-pieces/underwater_ruin/warm_1.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/warm_2.json b/jigsaw-pieces/underwater_ruin/warm_2.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/warm_2.json +++ b/jigsaw-pieces/underwater_ruin/warm_2.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/warm_3.json b/jigsaw-pieces/underwater_ruin/warm_3.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/warm_3.json +++ b/jigsaw-pieces/underwater_ruin/warm_3.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/warm_4.json b/jigsaw-pieces/underwater_ruin/warm_4.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/warm_4.json +++ b/jigsaw-pieces/underwater_ruin/warm_4.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/warm_5.json b/jigsaw-pieces/underwater_ruin/warm_5.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/warm_5.json +++ b/jigsaw-pieces/underwater_ruin/warm_5.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/warm_6.json b/jigsaw-pieces/underwater_ruin/warm_6.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/warm_6.json +++ b/jigsaw-pieces/underwater_ruin/warm_6.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/warm_7.json b/jigsaw-pieces/underwater_ruin/warm_7.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/warm_7.json +++ b/jigsaw-pieces/underwater_ruin/warm_7.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/underwater_ruin/warm_8.json b/jigsaw-pieces/underwater_ruin/warm_8.json index 6008d7ac..8e3a9ec2 100644 --- a/jigsaw-pieces/underwater_ruin/warm_8.json +++ b/jigsaw-pieces/underwater_ruin/warm_8.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/village/common/animals/cat_black.json b/jigsaw-pieces/village/common/animals/cat_black.json index e8ba44ab..c46f413e 100644 --- a/jigsaw-pieces/village/common/animals/cat_black.json +++ b/jigsaw-pieces/village/common/animals/cat_black.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/cat_black" + "object": "village/common/animals/cat_black" } diff --git a/jigsaw-pieces/village/common/animals/cat_british.json b/jigsaw-pieces/village/common/animals/cat_british.json index 7fb3c8e5..1b8ef3aa 100644 --- a/jigsaw-pieces/village/common/animals/cat_british.json +++ b/jigsaw-pieces/village/common/animals/cat_british.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/cat_british" + "object": "village/common/animals/cat_british" } diff --git a/jigsaw-pieces/village/common/animals/cat_calico.json b/jigsaw-pieces/village/common/animals/cat_calico.json index 29a5c41b..1e89d2dd 100644 --- a/jigsaw-pieces/village/common/animals/cat_calico.json +++ b/jigsaw-pieces/village/common/animals/cat_calico.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/cat_calico" + "object": "village/common/animals/cat_calico" } diff --git a/jigsaw-pieces/village/common/animals/cat_jellie.json b/jigsaw-pieces/village/common/animals/cat_jellie.json index d7248432..cb55a6ad 100644 --- a/jigsaw-pieces/village/common/animals/cat_jellie.json +++ b/jigsaw-pieces/village/common/animals/cat_jellie.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/cat_jellie" + "object": "village/common/animals/cat_jellie" } diff --git a/jigsaw-pieces/village/common/animals/cat_persian.json b/jigsaw-pieces/village/common/animals/cat_persian.json index 84125225..e6cd60c1 100644 --- a/jigsaw-pieces/village/common/animals/cat_persian.json +++ b/jigsaw-pieces/village/common/animals/cat_persian.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/cat_persian" + "object": "village/common/animals/cat_persian" } diff --git a/jigsaw-pieces/village/common/animals/cat_ragdoll.json b/jigsaw-pieces/village/common/animals/cat_ragdoll.json index 53c81404..e3347b07 100644 --- a/jigsaw-pieces/village/common/animals/cat_ragdoll.json +++ b/jigsaw-pieces/village/common/animals/cat_ragdoll.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/cat_ragdoll" + "object": "village/common/animals/cat_ragdoll" } diff --git a/jigsaw-pieces/village/common/animals/cat_red.json b/jigsaw-pieces/village/common/animals/cat_red.json index ea345fb7..256fce9f 100644 --- a/jigsaw-pieces/village/common/animals/cat_red.json +++ b/jigsaw-pieces/village/common/animals/cat_red.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/cat_red" + "object": "village/common/animals/cat_red" } diff --git a/jigsaw-pieces/village/common/animals/cat_siamese.json b/jigsaw-pieces/village/common/animals/cat_siamese.json index 23f87b83..7f7ce57e 100644 --- a/jigsaw-pieces/village/common/animals/cat_siamese.json +++ b/jigsaw-pieces/village/common/animals/cat_siamese.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/cat_siamese" + "object": "village/common/animals/cat_siamese" } diff --git a/jigsaw-pieces/village/common/animals/cat_tabby.json b/jigsaw-pieces/village/common/animals/cat_tabby.json index 5bb0195e..a7f7b45b 100644 --- a/jigsaw-pieces/village/common/animals/cat_tabby.json +++ b/jigsaw-pieces/village/common/animals/cat_tabby.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/cat_tabby" + "object": "village/common/animals/cat_tabby" } diff --git a/jigsaw-pieces/village/common/animals/cat_white.json b/jigsaw-pieces/village/common/animals/cat_white.json index eb81c44c..4a8c687e 100644 --- a/jigsaw-pieces/village/common/animals/cat_white.json +++ b/jigsaw-pieces/village/common/animals/cat_white.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/cat_white" + "object": "village/common/animals/cat_white" } diff --git a/jigsaw-pieces/village/common/animals/cows_1.json b/jigsaw-pieces/village/common/animals/cows_1.json index a9250e88..da2a6f62 100644 --- a/jigsaw-pieces/village/common/animals/cows_1.json +++ b/jigsaw-pieces/village/common/animals/cows_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/cows_1" + "object": "village/common/animals/cows_1" } diff --git a/jigsaw-pieces/village/common/animals/horses_1.json b/jigsaw-pieces/village/common/animals/horses_1.json index 38315b1c..7dd596bf 100644 --- a/jigsaw-pieces/village/common/animals/horses_1.json +++ b/jigsaw-pieces/village/common/animals/horses_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/horses_1" + "object": "village/common/animals/horses_1" } diff --git a/jigsaw-pieces/village/common/animals/horses_2.json b/jigsaw-pieces/village/common/animals/horses_2.json index a2daecd5..22c0aa75 100644 --- a/jigsaw-pieces/village/common/animals/horses_2.json +++ b/jigsaw-pieces/village/common/animals/horses_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/horses_2" + "object": "village/common/animals/horses_2" } diff --git a/jigsaw-pieces/village/common/animals/horses_3.json b/jigsaw-pieces/village/common/animals/horses_3.json index db61dd42..679168e6 100644 --- a/jigsaw-pieces/village/common/animals/horses_3.json +++ b/jigsaw-pieces/village/common/animals/horses_3.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/horses_3" + "object": "village/common/animals/horses_3" } diff --git a/jigsaw-pieces/village/common/animals/horses_4.json b/jigsaw-pieces/village/common/animals/horses_4.json index dde07c41..e98965c7 100644 --- a/jigsaw-pieces/village/common/animals/horses_4.json +++ b/jigsaw-pieces/village/common/animals/horses_4.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/horses_4" + "object": "village/common/animals/horses_4" } diff --git a/jigsaw-pieces/village/common/animals/horses_5.json b/jigsaw-pieces/village/common/animals/horses_5.json index ef14eb56..aa67dc2a 100644 --- a/jigsaw-pieces/village/common/animals/horses_5.json +++ b/jigsaw-pieces/village/common/animals/horses_5.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/horses_5" + "object": "village/common/animals/horses_5" } diff --git a/jigsaw-pieces/village/common/animals/pigs_1.json b/jigsaw-pieces/village/common/animals/pigs_1.json index 9641d727..92e5757d 100644 --- a/jigsaw-pieces/village/common/animals/pigs_1.json +++ b/jigsaw-pieces/village/common/animals/pigs_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/pigs_1" + "object": "village/common/animals/pigs_1" } diff --git a/jigsaw-pieces/village/common/animals/sheep_1.json b/jigsaw-pieces/village/common/animals/sheep_1.json index 38497860..1118b71e 100644 --- a/jigsaw-pieces/village/common/animals/sheep_1.json +++ b/jigsaw-pieces/village/common/animals/sheep_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/sheep_1" + "object": "village/common/animals/sheep_1" } diff --git a/jigsaw-pieces/village/common/animals/sheep_2.json b/jigsaw-pieces/village/common/animals/sheep_2.json index e1b27802..d810d750 100644 --- a/jigsaw-pieces/village/common/animals/sheep_2.json +++ b/jigsaw-pieces/village/common/animals/sheep_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/animals/sheep_2" + "object": "village/common/animals/sheep_2" } diff --git a/jigsaw-pieces/village/common/iron_golem.json b/jigsaw-pieces/village/common/iron_golem.json index ae290bea..e3f4fc03 100644 --- a/jigsaw-pieces/village/common/iron_golem.json +++ b/jigsaw-pieces/village/common/iron_golem.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/iron_golem" + "object": "village/common/iron_golem" } diff --git a/jigsaw-pieces/village/common/well_bottom.json b/jigsaw-pieces/village/common/well_bottom.json index c92d5f31..9acaf0df 100644 --- a/jigsaw-pieces/village/common/well_bottom.json +++ b/jigsaw-pieces/village/common/well_bottom.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/common/well_bottom" + "object": "village/common/well_bottom" } diff --git a/jigsaw-pieces/village/decays/grass_11x13.json b/jigsaw-pieces/village/decays/grass_11x13.json index 97366eba..3ebd1de9 100644 --- a/jigsaw-pieces/village/decays/grass_11x13.json +++ b/jigsaw-pieces/village/decays/grass_11x13.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/village/decays/grass_16x16.json b/jigsaw-pieces/village/decays/grass_16x16.json index 97366eba..3ebd1de9 100644 --- a/jigsaw-pieces/village/decays/grass_16x16.json +++ b/jigsaw-pieces/village/decays/grass_16x16.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/village/decays/grass_9x9.json b/jigsaw-pieces/village/decays/grass_9x9.json index 97366eba..3ebd1de9 100644 --- a/jigsaw-pieces/village/decays/grass_9x9.json +++ b/jigsaw-pieces/village/decays/grass_9x9.json @@ -58,5 +58,5 @@ "exponent": 1 } }, - "object": "jigsaw/" + "object": "" } diff --git a/jigsaw-pieces/village/desert/desert_lamp_1.json b/jigsaw-pieces/village/desert/desert_lamp_1.json index 73e55d8a..c6809a73 100644 --- a/jigsaw-pieces/village/desert/desert_lamp_1.json +++ b/jigsaw-pieces/village/desert/desert_lamp_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/desert_lamp_1" + "object": "village/desert/desert_lamp_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_animal_pen_1.json b/jigsaw-pieces/village/desert/houses/desert_animal_pen_1.json index 466085a0..c5ff8604 100644 --- a/jigsaw-pieces/village/desert/houses/desert_animal_pen_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_animal_pen_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_animal_pen_1" + "object": "village/desert/houses/desert_animal_pen_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_animal_pen_2.json b/jigsaw-pieces/village/desert/houses/desert_animal_pen_2.json index e66978c8..1b4d777c 100644 --- a/jigsaw-pieces/village/desert/houses/desert_animal_pen_2.json +++ b/jigsaw-pieces/village/desert/houses/desert_animal_pen_2.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_animal_pen_2" + "object": "village/desert/houses/desert_animal_pen_2" } diff --git a/jigsaw-pieces/village/desert/houses/desert_armorer_1.json b/jigsaw-pieces/village/desert/houses/desert_armorer_1.json index 4750a672..649724d0 100644 --- a/jigsaw-pieces/village/desert/houses/desert_armorer_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_armorer_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_armorer_1" + "object": "village/desert/houses/desert_armorer_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_butcher_shop_1.json b/jigsaw-pieces/village/desert/houses/desert_butcher_shop_1.json index 8d83fad5..8322226d 100644 --- a/jigsaw-pieces/village/desert/houses/desert_butcher_shop_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_butcher_shop_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_butcher_shop_1" + "object": "village/desert/houses/desert_butcher_shop_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_cartographer_house_1.json b/jigsaw-pieces/village/desert/houses/desert_cartographer_house_1.json index af930068..779c39a3 100644 --- a/jigsaw-pieces/village/desert/houses/desert_cartographer_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_cartographer_house_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_cartographer_house_1" + "object": "village/desert/houses/desert_cartographer_house_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_farm_1.json b/jigsaw-pieces/village/desert/houses/desert_farm_1.json index 968ec459..c7557183 100644 --- a/jigsaw-pieces/village/desert/houses/desert_farm_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_farm_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_farm_1" + "object": "village/desert/houses/desert_farm_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_farm_2.json b/jigsaw-pieces/village/desert/houses/desert_farm_2.json index 13ffcad9..66b48d76 100644 --- a/jigsaw-pieces/village/desert/houses/desert_farm_2.json +++ b/jigsaw-pieces/village/desert/houses/desert_farm_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_farm_2" + "object": "village/desert/houses/desert_farm_2" } diff --git a/jigsaw-pieces/village/desert/houses/desert_fisher_1.json b/jigsaw-pieces/village/desert/houses/desert_fisher_1.json index f3a7f227..a04886d1 100644 --- a/jigsaw-pieces/village/desert/houses/desert_fisher_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_fisher_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_fisher_1" + "object": "village/desert/houses/desert_fisher_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_fletcher_house_1.json b/jigsaw-pieces/village/desert/houses/desert_fletcher_house_1.json index f875a421..e094a25f 100644 --- a/jigsaw-pieces/village/desert/houses/desert_fletcher_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_fletcher_house_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_fletcher_house_1" + "object": "village/desert/houses/desert_fletcher_house_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_large_farm_1.json b/jigsaw-pieces/village/desert/houses/desert_large_farm_1.json index 16a1c69a..7e784e5b 100644 --- a/jigsaw-pieces/village/desert/houses/desert_large_farm_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_large_farm_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_large_farm_1" + "object": "village/desert/houses/desert_large_farm_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_library_1.json b/jigsaw-pieces/village/desert/houses/desert_library_1.json index d8ac954f..775e2748 100644 --- a/jigsaw-pieces/village/desert/houses/desert_library_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_library_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_library_1" + "object": "village/desert/houses/desert_library_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_mason_1.json b/jigsaw-pieces/village/desert/houses/desert_mason_1.json index 24a0c199..7778941e 100644 --- a/jigsaw-pieces/village/desert/houses/desert_mason_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_mason_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_mason_1" + "object": "village/desert/houses/desert_mason_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_medium_house_1.json b/jigsaw-pieces/village/desert/houses/desert_medium_house_1.json index 509f1668..e1a62bb0 100644 --- a/jigsaw-pieces/village/desert/houses/desert_medium_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_medium_house_1.json @@ -100,5 +100,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_medium_house_1" + "object": "village/desert/houses/desert_medium_house_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_medium_house_2.json b/jigsaw-pieces/village/desert/houses/desert_medium_house_2.json index 178d036f..7f2ca6a3 100644 --- a/jigsaw-pieces/village/desert/houses/desert_medium_house_2.json +++ b/jigsaw-pieces/village/desert/houses/desert_medium_house_2.json @@ -100,5 +100,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_medium_house_2" + "object": "village/desert/houses/desert_medium_house_2" } diff --git a/jigsaw-pieces/village/desert/houses/desert_shepherd_house_1.json b/jigsaw-pieces/village/desert/houses/desert_shepherd_house_1.json index 3848812e..5fcc8057 100644 --- a/jigsaw-pieces/village/desert/houses/desert_shepherd_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_shepherd_house_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_shepherd_house_1" + "object": "village/desert/houses/desert_shepherd_house_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_small_house_1.json b/jigsaw-pieces/village/desert/houses/desert_small_house_1.json index d5d1c133..e86d66f3 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_1.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_small_house_1" + "object": "village/desert/houses/desert_small_house_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_small_house_2.json b/jigsaw-pieces/village/desert/houses/desert_small_house_2.json index 28cee59a..7fce79a6 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_2.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_2.json @@ -99,5 +99,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_small_house_2" + "object": "village/desert/houses/desert_small_house_2" } diff --git a/jigsaw-pieces/village/desert/houses/desert_small_house_3.json b/jigsaw-pieces/village/desert/houses/desert_small_house_3.json index 0159ddd5..10a75231 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_3.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_3.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_small_house_3" + "object": "village/desert/houses/desert_small_house_3" } diff --git a/jigsaw-pieces/village/desert/houses/desert_small_house_4.json b/jigsaw-pieces/village/desert/houses/desert_small_house_4.json index 81e57049..527e5a39 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_4.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_4.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_small_house_4" + "object": "village/desert/houses/desert_small_house_4" } diff --git a/jigsaw-pieces/village/desert/houses/desert_small_house_5.json b/jigsaw-pieces/village/desert/houses/desert_small_house_5.json index a357fd3d..b0484f39 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_5.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_5.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_small_house_5" + "object": "village/desert/houses/desert_small_house_5" } diff --git a/jigsaw-pieces/village/desert/houses/desert_small_house_6.json b/jigsaw-pieces/village/desert/houses/desert_small_house_6.json index e39aea3b..c5c6a669 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_6.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_6.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_small_house_6" + "object": "village/desert/houses/desert_small_house_6" } diff --git a/jigsaw-pieces/village/desert/houses/desert_small_house_7.json b/jigsaw-pieces/village/desert/houses/desert_small_house_7.json index d8d8e183..76f9774e 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_7.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_7.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_small_house_7" + "object": "village/desert/houses/desert_small_house_7" } diff --git a/jigsaw-pieces/village/desert/houses/desert_small_house_8.json b/jigsaw-pieces/village/desert/houses/desert_small_house_8.json index 59bce1c3..792c1400 100644 --- a/jigsaw-pieces/village/desert/houses/desert_small_house_8.json +++ b/jigsaw-pieces/village/desert/houses/desert_small_house_8.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_small_house_8" + "object": "village/desert/houses/desert_small_house_8" } diff --git a/jigsaw-pieces/village/desert/houses/desert_tannery_1.json b/jigsaw-pieces/village/desert/houses/desert_tannery_1.json index 4169333e..197d3803 100644 --- a/jigsaw-pieces/village/desert/houses/desert_tannery_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_tannery_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_tannery_1" + "object": "village/desert/houses/desert_tannery_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_temple_1.json b/jigsaw-pieces/village/desert/houses/desert_temple_1.json index 848661c8..a9438089 100644 --- a/jigsaw-pieces/village/desert/houses/desert_temple_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_temple_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_temple_1" + "object": "village/desert/houses/desert_temple_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_temple_2.json b/jigsaw-pieces/village/desert/houses/desert_temple_2.json index c3ee1b54..a7df537e 100644 --- a/jigsaw-pieces/village/desert/houses/desert_temple_2.json +++ b/jigsaw-pieces/village/desert/houses/desert_temple_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_temple_2" + "object": "village/desert/houses/desert_temple_2" } diff --git a/jigsaw-pieces/village/desert/houses/desert_tool_smith_1.json b/jigsaw-pieces/village/desert/houses/desert_tool_smith_1.json index 8c596094..5b6701f0 100644 --- a/jigsaw-pieces/village/desert/houses/desert_tool_smith_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_tool_smith_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_tool_smith_1" + "object": "village/desert/houses/desert_tool_smith_1" } diff --git a/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json b/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json index 5dba6a0f..77677a0a 100644 --- a/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json +++ b/jigsaw-pieces/village/desert/houses/desert_weaponsmith_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/houses/desert_weaponsmith_1" + "object": "village/desert/houses/desert_weaponsmith_1" } diff --git a/jigsaw-pieces/village/desert/streets/corner_01.json b/jigsaw-pieces/village/desert/streets/corner_01.json index ba84c66d..5bf14112 100644 --- a/jigsaw-pieces/village/desert/streets/corner_01.json +++ b/jigsaw-pieces/village/desert/streets/corner_01.json @@ -126,5 +126,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/streets/corner_01" + "object": "village/desert/streets/corner_01" } diff --git a/jigsaw-pieces/village/desert/streets/corner_02.json b/jigsaw-pieces/village/desert/streets/corner_02.json index d8251275..8bb67d8a 100644 --- a/jigsaw-pieces/village/desert/streets/corner_02.json +++ b/jigsaw-pieces/village/desert/streets/corner_02.json @@ -113,5 +113,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/streets/corner_02" + "object": "village/desert/streets/corner_02" } diff --git a/jigsaw-pieces/village/desert/streets/crossroad_01.json b/jigsaw-pieces/village/desert/streets/crossroad_01.json index d21759e7..87108f4c 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_01.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_01.json @@ -230,5 +230,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/streets/crossroad_01" + "object": "village/desert/streets/crossroad_01" } diff --git a/jigsaw-pieces/village/desert/streets/crossroad_02.json b/jigsaw-pieces/village/desert/streets/crossroad_02.json index 778b8cf0..f005aaa8 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_02.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_02.json @@ -165,5 +165,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/streets/crossroad_02" + "object": "village/desert/streets/crossroad_02" } diff --git a/jigsaw-pieces/village/desert/streets/crossroad_03.json b/jigsaw-pieces/village/desert/streets/crossroad_03.json index bc34e0fd..11f8b975 100644 --- a/jigsaw-pieces/village/desert/streets/crossroad_03.json +++ b/jigsaw-pieces/village/desert/streets/crossroad_03.json @@ -126,5 +126,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/streets/crossroad_03" + "object": "village/desert/streets/crossroad_03" } diff --git a/jigsaw-pieces/village/desert/streets/square_01.json b/jigsaw-pieces/village/desert/streets/square_01.json index 3c632a0f..38675691 100644 --- a/jigsaw-pieces/village/desert/streets/square_01.json +++ b/jigsaw-pieces/village/desert/streets/square_01.json @@ -319,5 +319,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/streets/square_01" + "object": "village/desert/streets/square_01" } diff --git a/jigsaw-pieces/village/desert/streets/square_02.json b/jigsaw-pieces/village/desert/streets/square_02.json index e195a008..5159ba02 100644 --- a/jigsaw-pieces/village/desert/streets/square_02.json +++ b/jigsaw-pieces/village/desert/streets/square_02.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/streets/square_02" + "object": "village/desert/streets/square_02" } diff --git a/jigsaw-pieces/village/desert/streets/straight_01.json b/jigsaw-pieces/village/desert/streets/straight_01.json index ad9bab0d..50bfa9db 100644 --- a/jigsaw-pieces/village/desert/streets/straight_01.json +++ b/jigsaw-pieces/village/desert/streets/straight_01.json @@ -165,5 +165,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/streets/straight_01" + "object": "village/desert/streets/straight_01" } diff --git a/jigsaw-pieces/village/desert/streets/straight_02.json b/jigsaw-pieces/village/desert/streets/straight_02.json index 62f41505..43d71021 100644 --- a/jigsaw-pieces/village/desert/streets/straight_02.json +++ b/jigsaw-pieces/village/desert/streets/straight_02.json @@ -165,5 +165,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/streets/straight_02" + "object": "village/desert/streets/straight_02" } diff --git a/jigsaw-pieces/village/desert/streets/straight_03.json b/jigsaw-pieces/village/desert/streets/straight_03.json index fb17b3df..4f887837 100644 --- a/jigsaw-pieces/village/desert/streets/straight_03.json +++ b/jigsaw-pieces/village/desert/streets/straight_03.json @@ -100,5 +100,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/streets/straight_03" + "object": "village/desert/streets/straight_03" } diff --git a/jigsaw-pieces/village/desert/streets/turn_01.json b/jigsaw-pieces/village/desert/streets/turn_01.json index 39cd0236..915636d6 100644 --- a/jigsaw-pieces/village/desert/streets/turn_01.json +++ b/jigsaw-pieces/village/desert/streets/turn_01.json @@ -113,5 +113,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/streets/turn_01" + "object": "village/desert/streets/turn_01" } diff --git a/jigsaw-pieces/village/desert/terminators/terminator_01.json b/jigsaw-pieces/village/desert/terminators/terminator_01.json index 505d26a6..a879283b 100644 --- a/jigsaw-pieces/village/desert/terminators/terminator_01.json +++ b/jigsaw-pieces/village/desert/terminators/terminator_01.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/terminators/terminator_01" + "object": "village/desert/terminators/terminator_01" } diff --git a/jigsaw-pieces/village/desert/terminators/terminator_02.json b/jigsaw-pieces/village/desert/terminators/terminator_02.json index 3966d402..f9413360 100644 --- a/jigsaw-pieces/village/desert/terminators/terminator_02.json +++ b/jigsaw-pieces/village/desert/terminators/terminator_02.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/terminators/terminator_02" + "object": "village/desert/terminators/terminator_02" } diff --git a/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_1.json b/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_1.json index c8a81b40..92544f2b 100644 --- a/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_1.json +++ b/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_1.json @@ -231,5 +231,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/town_centers/desert_meeting_point_1" + "object": "village/desert/town_centers/desert_meeting_point_1" } diff --git a/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_2.json b/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_2.json index ad63b01f..cb348a2b 100644 --- a/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_2.json +++ b/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_2.json @@ -192,5 +192,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/town_centers/desert_meeting_point_2" + "object": "village/desert/town_centers/desert_meeting_point_2" } diff --git a/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_3.json b/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_3.json index 5be0252b..12fe4cff 100644 --- a/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_3.json +++ b/jigsaw-pieces/village/desert/town_centers/desert_meeting_point_3.json @@ -218,5 +218,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/town_centers/desert_meeting_point_3" + "object": "village/desert/town_centers/desert_meeting_point_3" } diff --git a/jigsaw-pieces/village/desert/villagers/baby.json b/jigsaw-pieces/village/desert/villagers/baby.json index f3b4ddde..db159f7e 100644 --- a/jigsaw-pieces/village/desert/villagers/baby.json +++ b/jigsaw-pieces/village/desert/villagers/baby.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/villagers/baby" + "object": "village/desert/villagers/baby" } diff --git a/jigsaw-pieces/village/desert/villagers/nitwit.json b/jigsaw-pieces/village/desert/villagers/nitwit.json index 429dd9c6..646e2548 100644 --- a/jigsaw-pieces/village/desert/villagers/nitwit.json +++ b/jigsaw-pieces/village/desert/villagers/nitwit.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/villagers/nitwit" + "object": "village/desert/villagers/nitwit" } diff --git a/jigsaw-pieces/village/desert/villagers/unemployed.json b/jigsaw-pieces/village/desert/villagers/unemployed.json index 9c0d781c..ea36b594 100644 --- a/jigsaw-pieces/village/desert/villagers/unemployed.json +++ b/jigsaw-pieces/village/desert/villagers/unemployed.json @@ -76,5 +76,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/villagers/unemployed" + "object": "village/desert/villagers/unemployed" } diff --git a/jigsaw-pieces/village/desert/zombie/houses/desert_medium_house_1.json b/jigsaw-pieces/village/desert/zombie/houses/desert_medium_house_1.json index 89f02c50..3865399e 100644 --- a/jigsaw-pieces/village/desert/zombie/houses/desert_medium_house_1.json +++ b/jigsaw-pieces/village/desert/zombie/houses/desert_medium_house_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/houses/desert_medium_house_1" + "object": "village/desert/zombie/houses/desert_medium_house_1" } diff --git a/jigsaw-pieces/village/desert/zombie/houses/desert_medium_house_2.json b/jigsaw-pieces/village/desert/zombie/houses/desert_medium_house_2.json index 0640b9ef..b2813d35 100644 --- a/jigsaw-pieces/village/desert/zombie/houses/desert_medium_house_2.json +++ b/jigsaw-pieces/village/desert/zombie/houses/desert_medium_house_2.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/houses/desert_medium_house_2" + "object": "village/desert/zombie/houses/desert_medium_house_2" } diff --git a/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_1.json b/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_1.json index cefcbdb1..9540db7a 100644 --- a/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_1.json +++ b/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/houses/desert_small_house_1" + "object": "village/desert/zombie/houses/desert_small_house_1" } diff --git a/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_2.json b/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_2.json index 3166ca59..9e9af6df 100644 --- a/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_2.json +++ b/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_2.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/houses/desert_small_house_2" + "object": "village/desert/zombie/houses/desert_small_house_2" } diff --git a/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_3.json b/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_3.json index 83585271..e58ae6e0 100644 --- a/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_3.json +++ b/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_3.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/houses/desert_small_house_3" + "object": "village/desert/zombie/houses/desert_small_house_3" } diff --git a/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_4.json b/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_4.json index 3e19b28d..d91cffcf 100644 --- a/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_4.json +++ b/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_4.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/houses/desert_small_house_4" + "object": "village/desert/zombie/houses/desert_small_house_4" } diff --git a/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_5.json b/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_5.json index db0fdad7..ba925dd4 100644 --- a/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_5.json +++ b/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_5.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/houses/desert_small_house_5" + "object": "village/desert/zombie/houses/desert_small_house_5" } diff --git a/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_6.json b/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_6.json index 0460d3b0..36c16ea1 100644 --- a/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_6.json +++ b/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_6.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/houses/desert_small_house_6" + "object": "village/desert/zombie/houses/desert_small_house_6" } diff --git a/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_7.json b/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_7.json index 7901e196..ffd8dda9 100644 --- a/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_7.json +++ b/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_7.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/houses/desert_small_house_7" + "object": "village/desert/zombie/houses/desert_small_house_7" } diff --git a/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_8.json b/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_8.json index b97553dd..52226679 100644 --- a/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_8.json +++ b/jigsaw-pieces/village/desert/zombie/houses/desert_small_house_8.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/houses/desert_small_house_8" + "object": "village/desert/zombie/houses/desert_small_house_8" } diff --git a/jigsaw-pieces/village/desert/zombie/streets/corner_01.json b/jigsaw-pieces/village/desert/zombie/streets/corner_01.json index e6d75624..4f0e2827 100644 --- a/jigsaw-pieces/village/desert/zombie/streets/corner_01.json +++ b/jigsaw-pieces/village/desert/zombie/streets/corner_01.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/streets/corner_01" + "object": "village/desert/zombie/streets/corner_01" } diff --git a/jigsaw-pieces/village/desert/zombie/streets/corner_02.json b/jigsaw-pieces/village/desert/zombie/streets/corner_02.json index 56cedfbb..60e8de51 100644 --- a/jigsaw-pieces/village/desert/zombie/streets/corner_02.json +++ b/jigsaw-pieces/village/desert/zombie/streets/corner_02.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/streets/corner_02" + "object": "village/desert/zombie/streets/corner_02" } diff --git a/jigsaw-pieces/village/desert/zombie/streets/crossroad_01.json b/jigsaw-pieces/village/desert/zombie/streets/crossroad_01.json index 32209085..1025cc4c 100644 --- a/jigsaw-pieces/village/desert/zombie/streets/crossroad_01.json +++ b/jigsaw-pieces/village/desert/zombie/streets/crossroad_01.json @@ -215,5 +215,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/streets/crossroad_01" + "object": "village/desert/zombie/streets/crossroad_01" } diff --git a/jigsaw-pieces/village/desert/zombie/streets/crossroad_02.json b/jigsaw-pieces/village/desert/zombie/streets/crossroad_02.json index 3af3edac..6487d9ef 100644 --- a/jigsaw-pieces/village/desert/zombie/streets/crossroad_02.json +++ b/jigsaw-pieces/village/desert/zombie/streets/crossroad_02.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/streets/crossroad_02" + "object": "village/desert/zombie/streets/crossroad_02" } diff --git a/jigsaw-pieces/village/desert/zombie/streets/crossroad_03.json b/jigsaw-pieces/village/desert/zombie/streets/crossroad_03.json index 4c774dfd..a56084a6 100644 --- a/jigsaw-pieces/village/desert/zombie/streets/crossroad_03.json +++ b/jigsaw-pieces/village/desert/zombie/streets/crossroad_03.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/streets/crossroad_03" + "object": "village/desert/zombie/streets/crossroad_03" } diff --git a/jigsaw-pieces/village/desert/zombie/streets/square_01.json b/jigsaw-pieces/village/desert/zombie/streets/square_01.json index 370496de..5bb37f52 100644 --- a/jigsaw-pieces/village/desert/zombie/streets/square_01.json +++ b/jigsaw-pieces/village/desert/zombie/streets/square_01.json @@ -319,5 +319,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/streets/square_01" + "object": "village/desert/zombie/streets/square_01" } diff --git a/jigsaw-pieces/village/desert/zombie/streets/square_02.json b/jigsaw-pieces/village/desert/zombie/streets/square_02.json index 091acf65..4d195984 100644 --- a/jigsaw-pieces/village/desert/zombie/streets/square_02.json +++ b/jigsaw-pieces/village/desert/zombie/streets/square_02.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/streets/square_02" + "object": "village/desert/zombie/streets/square_02" } diff --git a/jigsaw-pieces/village/desert/zombie/streets/straight_01.json b/jigsaw-pieces/village/desert/zombie/streets/straight_01.json index 7f7d0fe5..19e34aed 100644 --- a/jigsaw-pieces/village/desert/zombie/streets/straight_01.json +++ b/jigsaw-pieces/village/desert/zombie/streets/straight_01.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/streets/straight_01" + "object": "village/desert/zombie/streets/straight_01" } diff --git a/jigsaw-pieces/village/desert/zombie/streets/straight_02.json b/jigsaw-pieces/village/desert/zombie/streets/straight_02.json index 79e184fd..22177c9f 100644 --- a/jigsaw-pieces/village/desert/zombie/streets/straight_02.json +++ b/jigsaw-pieces/village/desert/zombie/streets/straight_02.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/streets/straight_02" + "object": "village/desert/zombie/streets/straight_02" } diff --git a/jigsaw-pieces/village/desert/zombie/streets/straight_03.json b/jigsaw-pieces/village/desert/zombie/streets/straight_03.json index 2a211999..6279c82f 100644 --- a/jigsaw-pieces/village/desert/zombie/streets/straight_03.json +++ b/jigsaw-pieces/village/desert/zombie/streets/straight_03.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/streets/straight_03" + "object": "village/desert/zombie/streets/straight_03" } diff --git a/jigsaw-pieces/village/desert/zombie/streets/turn_01.json b/jigsaw-pieces/village/desert/zombie/streets/turn_01.json index 94325bc0..faf1032d 100644 --- a/jigsaw-pieces/village/desert/zombie/streets/turn_01.json +++ b/jigsaw-pieces/village/desert/zombie/streets/turn_01.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/streets/turn_01" + "object": "village/desert/zombie/streets/turn_01" } diff --git a/jigsaw-pieces/village/desert/zombie/terminators/terminator_02.json b/jigsaw-pieces/village/desert/zombie/terminators/terminator_02.json index 27094664..b02586be 100644 --- a/jigsaw-pieces/village/desert/zombie/terminators/terminator_02.json +++ b/jigsaw-pieces/village/desert/zombie/terminators/terminator_02.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/terminators/terminator_02" + "object": "village/desert/zombie/terminators/terminator_02" } diff --git a/jigsaw-pieces/village/desert/zombie/town_centers/desert_meeting_point_1.json b/jigsaw-pieces/village/desert/zombie/town_centers/desert_meeting_point_1.json index 082678a4..c027bf07 100644 --- a/jigsaw-pieces/village/desert/zombie/town_centers/desert_meeting_point_1.json +++ b/jigsaw-pieces/village/desert/zombie/town_centers/desert_meeting_point_1.json @@ -176,5 +176,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/town_centers/desert_meeting_point_1" + "object": "village/desert/zombie/town_centers/desert_meeting_point_1" } diff --git a/jigsaw-pieces/village/desert/zombie/town_centers/desert_meeting_point_2.json b/jigsaw-pieces/village/desert/zombie/town_centers/desert_meeting_point_2.json index 1658e661..68a5cf82 100644 --- a/jigsaw-pieces/village/desert/zombie/town_centers/desert_meeting_point_2.json +++ b/jigsaw-pieces/village/desert/zombie/town_centers/desert_meeting_point_2.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/town_centers/desert_meeting_point_2" + "object": "village/desert/zombie/town_centers/desert_meeting_point_2" } diff --git a/jigsaw-pieces/village/desert/zombie/town_centers/desert_meeting_point_3.json b/jigsaw-pieces/village/desert/zombie/town_centers/desert_meeting_point_3.json index db3af5ee..57682677 100644 --- a/jigsaw-pieces/village/desert/zombie/town_centers/desert_meeting_point_3.json +++ b/jigsaw-pieces/village/desert/zombie/town_centers/desert_meeting_point_3.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/town_centers/desert_meeting_point_3" + "object": "village/desert/zombie/town_centers/desert_meeting_point_3" } diff --git a/jigsaw-pieces/village/desert/zombie/villagers/nitwit.json b/jigsaw-pieces/village/desert/zombie/villagers/nitwit.json index 9794f345..9b71e1d5 100644 --- a/jigsaw-pieces/village/desert/zombie/villagers/nitwit.json +++ b/jigsaw-pieces/village/desert/zombie/villagers/nitwit.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/villagers/nitwit" + "object": "village/desert/zombie/villagers/nitwit" } diff --git a/jigsaw-pieces/village/desert/zombie/villagers/unemployed.json b/jigsaw-pieces/village/desert/zombie/villagers/unemployed.json index 1cbcfed2..8f96af7b 100644 --- a/jigsaw-pieces/village/desert/zombie/villagers/unemployed.json +++ b/jigsaw-pieces/village/desert/zombie/villagers/unemployed.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/desert/zombie/villagers/unemployed" + "object": "village/desert/zombie/villagers/unemployed" } diff --git a/jigsaw-pieces/village/plains/houses/plains_accessory_1.json b/jigsaw-pieces/village/plains/houses/plains_accessory_1.json index 19544597..fd72bc8e 100644 --- a/jigsaw-pieces/village/plains/houses/plains_accessory_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_accessory_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_accessory_1" + "object": "village/plains/houses/plains_accessory_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_animal_pen_1.json b/jigsaw-pieces/village/plains/houses/plains_animal_pen_1.json index c3fe2566..0729d524 100644 --- a/jigsaw-pieces/village/plains/houses/plains_animal_pen_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_animal_pen_1.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_animal_pen_1" + "object": "village/plains/houses/plains_animal_pen_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_animal_pen_2.json b/jigsaw-pieces/village/plains/houses/plains_animal_pen_2.json index 32fa4dba..0dca51af 100644 --- a/jigsaw-pieces/village/plains/houses/plains_animal_pen_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_animal_pen_2.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_animal_pen_2" + "object": "village/plains/houses/plains_animal_pen_2" } diff --git a/jigsaw-pieces/village/plains/houses/plains_animal_pen_3.json b/jigsaw-pieces/village/plains/houses/plains_animal_pen_3.json index 91adfa14..4fd2b504 100644 --- a/jigsaw-pieces/village/plains/houses/plains_animal_pen_3.json +++ b/jigsaw-pieces/village/plains/houses/plains_animal_pen_3.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_animal_pen_3" + "object": "village/plains/houses/plains_animal_pen_3" } diff --git a/jigsaw-pieces/village/plains/houses/plains_armorer_house_1.json b/jigsaw-pieces/village/plains/houses/plains_armorer_house_1.json index 23a8da11..58a2e18a 100644 --- a/jigsaw-pieces/village/plains/houses/plains_armorer_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_armorer_house_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_armorer_house_1" + "object": "village/plains/houses/plains_armorer_house_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_big_house_1.json b/jigsaw-pieces/village/plains/houses/plains_big_house_1.json index 0c045c63..021cd938 100644 --- a/jigsaw-pieces/village/plains/houses/plains_big_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_big_house_1.json @@ -128,5 +128,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_big_house_1" + "object": "village/plains/houses/plains_big_house_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_butcher_shop_1.json b/jigsaw-pieces/village/plains/houses/plains_butcher_shop_1.json index d295f9f8..486ae3b7 100644 --- a/jigsaw-pieces/village/plains/houses/plains_butcher_shop_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_butcher_shop_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_butcher_shop_1" + "object": "village/plains/houses/plains_butcher_shop_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_butcher_shop_2.json b/jigsaw-pieces/village/plains/houses/plains_butcher_shop_2.json index 8c73010c..d8a6f41c 100644 --- a/jigsaw-pieces/village/plains/houses/plains_butcher_shop_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_butcher_shop_2.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_butcher_shop_2" + "object": "village/plains/houses/plains_butcher_shop_2" } diff --git a/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json b/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json index 8809bc9a..6f0a2942 100644 --- a/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_cartographer_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_cartographer_1" + "object": "village/plains/houses/plains_cartographer_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_fisher_cottage_1.json b/jigsaw-pieces/village/plains/houses/plains_fisher_cottage_1.json index b4b89bef..bd482b45 100644 --- a/jigsaw-pieces/village/plains/houses/plains_fisher_cottage_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_fisher_cottage_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_fisher_cottage_1" + "object": "village/plains/houses/plains_fisher_cottage_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_fletcher_house_1.json b/jigsaw-pieces/village/plains/houses/plains_fletcher_house_1.json index 59a2561e..ac985764 100644 --- a/jigsaw-pieces/village/plains/houses/plains_fletcher_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_fletcher_house_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_fletcher_house_1" + "object": "village/plains/houses/plains_fletcher_house_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_large_farm_1.json b/jigsaw-pieces/village/plains/houses/plains_large_farm_1.json index 11648b22..e2f0d450 100644 --- a/jigsaw-pieces/village/plains/houses/plains_large_farm_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_large_farm_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_large_farm_1" + "object": "village/plains/houses/plains_large_farm_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_library_1.json b/jigsaw-pieces/village/plains/houses/plains_library_1.json index 00ca30c4..abf272be 100644 --- a/jigsaw-pieces/village/plains/houses/plains_library_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_library_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_library_1" + "object": "village/plains/houses/plains_library_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_library_2.json b/jigsaw-pieces/village/plains/houses/plains_library_2.json index b52beb32..d7d8cc36 100644 --- a/jigsaw-pieces/village/plains/houses/plains_library_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_library_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_library_2" + "object": "village/plains/houses/plains_library_2" } diff --git a/jigsaw-pieces/village/plains/houses/plains_masons_house_1.json b/jigsaw-pieces/village/plains/houses/plains_masons_house_1.json index b4461438..928b0967 100644 --- a/jigsaw-pieces/village/plains/houses/plains_masons_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_masons_house_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_masons_house_1" + "object": "village/plains/houses/plains_masons_house_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_medium_house_1.json b/jigsaw-pieces/village/plains/houses/plains_medium_house_1.json index e779d907..ce7b10c0 100644 --- a/jigsaw-pieces/village/plains/houses/plains_medium_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_medium_house_1.json @@ -113,5 +113,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_medium_house_1" + "object": "village/plains/houses/plains_medium_house_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_medium_house_2.json b/jigsaw-pieces/village/plains/houses/plains_medium_house_2.json index a341136b..6b505e21 100644 --- a/jigsaw-pieces/village/plains/houses/plains_medium_house_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_medium_house_2.json @@ -100,5 +100,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_medium_house_2" + "object": "village/plains/houses/plains_medium_house_2" } diff --git a/jigsaw-pieces/village/plains/houses/plains_meeting_point_4.json b/jigsaw-pieces/village/plains/houses/plains_meeting_point_4.json index 83e7bbb6..76b2d5a2 100644 --- a/jigsaw-pieces/village/plains/houses/plains_meeting_point_4.json +++ b/jigsaw-pieces/village/plains/houses/plains_meeting_point_4.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_meeting_point_4" + "object": "village/plains/houses/plains_meeting_point_4" } diff --git a/jigsaw-pieces/village/plains/houses/plains_meeting_point_5.json b/jigsaw-pieces/village/plains/houses/plains_meeting_point_5.json index 8d033a46..0f657cf2 100644 --- a/jigsaw-pieces/village/plains/houses/plains_meeting_point_5.json +++ b/jigsaw-pieces/village/plains/houses/plains_meeting_point_5.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_meeting_point_5" + "object": "village/plains/houses/plains_meeting_point_5" } diff --git a/jigsaw-pieces/village/plains/houses/plains_shepherds_house_1.json b/jigsaw-pieces/village/plains/houses/plains_shepherds_house_1.json index 03163b0c..3c1f3c92 100644 --- a/jigsaw-pieces/village/plains/houses/plains_shepherds_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_shepherds_house_1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_shepherds_house_1" + "object": "village/plains/houses/plains_shepherds_house_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_small_farm_1.json b/jigsaw-pieces/village/plains/houses/plains_small_farm_1.json index 1ef3e0d7..695ed137 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_farm_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_farm_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_small_farm_1" + "object": "village/plains/houses/plains_small_farm_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_small_house_1.json b/jigsaw-pieces/village/plains/houses/plains_small_house_1.json index 6bb2476e..a6c08ef7 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_1.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_small_house_1" + "object": "village/plains/houses/plains_small_house_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_small_house_2.json b/jigsaw-pieces/village/plains/houses/plains_small_house_2.json index 63f4a60a..aa8c3d2e 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_2.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_small_house_2" + "object": "village/plains/houses/plains_small_house_2" } diff --git a/jigsaw-pieces/village/plains/houses/plains_small_house_3.json b/jigsaw-pieces/village/plains/houses/plains_small_house_3.json index 84551634..c2a92d24 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_3.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_3.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_small_house_3" + "object": "village/plains/houses/plains_small_house_3" } diff --git a/jigsaw-pieces/village/plains/houses/plains_small_house_4.json b/jigsaw-pieces/village/plains/houses/plains_small_house_4.json index 0c394812..c15eaa74 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_4.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_4.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_small_house_4" + "object": "village/plains/houses/plains_small_house_4" } diff --git a/jigsaw-pieces/village/plains/houses/plains_small_house_5.json b/jigsaw-pieces/village/plains/houses/plains_small_house_5.json index d5cdd602..1608fb5b 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_5.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_5.json @@ -125,5 +125,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_small_house_5" + "object": "village/plains/houses/plains_small_house_5" } diff --git a/jigsaw-pieces/village/plains/houses/plains_small_house_6.json b/jigsaw-pieces/village/plains/houses/plains_small_house_6.json index 5d922568..4c62cc3a 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_6.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_6.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_small_house_6" + "object": "village/plains/houses/plains_small_house_6" } diff --git a/jigsaw-pieces/village/plains/houses/plains_small_house_7.json b/jigsaw-pieces/village/plains/houses/plains_small_house_7.json index e9e2ddcc..2e5f0673 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_7.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_7.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_small_house_7" + "object": "village/plains/houses/plains_small_house_7" } diff --git a/jigsaw-pieces/village/plains/houses/plains_small_house_8.json b/jigsaw-pieces/village/plains/houses/plains_small_house_8.json index 7b635b2b..66e1e2f8 100644 --- a/jigsaw-pieces/village/plains/houses/plains_small_house_8.json +++ b/jigsaw-pieces/village/plains/houses/plains_small_house_8.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_small_house_8" + "object": "village/plains/houses/plains_small_house_8" } diff --git a/jigsaw-pieces/village/plains/houses/plains_stable_1.json b/jigsaw-pieces/village/plains/houses/plains_stable_1.json index d0dc7fe7..39fc0e5d 100644 --- a/jigsaw-pieces/village/plains/houses/plains_stable_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_stable_1.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_stable_1" + "object": "village/plains/houses/plains_stable_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_stable_2.json b/jigsaw-pieces/village/plains/houses/plains_stable_2.json index 1f52be41..b64a2435 100644 --- a/jigsaw-pieces/village/plains/houses/plains_stable_2.json +++ b/jigsaw-pieces/village/plains/houses/plains_stable_2.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_stable_2" + "object": "village/plains/houses/plains_stable_2" } diff --git a/jigsaw-pieces/village/plains/houses/plains_tannery_1.json b/jigsaw-pieces/village/plains/houses/plains_tannery_1.json index 6000f630..be93ccce 100644 --- a/jigsaw-pieces/village/plains/houses/plains_tannery_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_tannery_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_tannery_1" + "object": "village/plains/houses/plains_tannery_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_temple_3.json b/jigsaw-pieces/village/plains/houses/plains_temple_3.json index 30f0e8db..afbefc1a 100644 --- a/jigsaw-pieces/village/plains/houses/plains_temple_3.json +++ b/jigsaw-pieces/village/plains/houses/plains_temple_3.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_temple_3" + "object": "village/plains/houses/plains_temple_3" } diff --git a/jigsaw-pieces/village/plains/houses/plains_temple_4.json b/jigsaw-pieces/village/plains/houses/plains_temple_4.json index fa751405..eb87c55b 100644 --- a/jigsaw-pieces/village/plains/houses/plains_temple_4.json +++ b/jigsaw-pieces/village/plains/houses/plains_temple_4.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_temple_4" + "object": "village/plains/houses/plains_temple_4" } diff --git a/jigsaw-pieces/village/plains/houses/plains_tool_smith_1.json b/jigsaw-pieces/village/plains/houses/plains_tool_smith_1.json index d39f79f4..e8ee426e 100644 --- a/jigsaw-pieces/village/plains/houses/plains_tool_smith_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_tool_smith_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_tool_smith_1" + "object": "village/plains/houses/plains_tool_smith_1" } diff --git a/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json b/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json index 4520062f..10b97b9e 100644 --- a/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json +++ b/jigsaw-pieces/village/plains/houses/plains_weaponsmith_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/houses/plains_weaponsmith_1" + "object": "village/plains/houses/plains_weaponsmith_1" } diff --git a/jigsaw-pieces/village/plains/plains_lamp_1.json b/jigsaw-pieces/village/plains/plains_lamp_1.json index 052880a6..c128c0e6 100644 --- a/jigsaw-pieces/village/plains/plains_lamp_1.json +++ b/jigsaw-pieces/village/plains/plains_lamp_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/plains_lamp_1" + "object": "village/plains/plains_lamp_1" } diff --git a/jigsaw-pieces/village/plains/streets/corner_01.json b/jigsaw-pieces/village/plains/streets/corner_01.json index 1038709b..b367ebf3 100644 --- a/jigsaw-pieces/village/plains/streets/corner_01.json +++ b/jigsaw-pieces/village/plains/streets/corner_01.json @@ -178,5 +178,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/streets/corner_01" + "object": "village/plains/streets/corner_01" } diff --git a/jigsaw-pieces/village/plains/streets/corner_02.json b/jigsaw-pieces/village/plains/streets/corner_02.json index 3f305cb7..a71a6d99 100644 --- a/jigsaw-pieces/village/plains/streets/corner_02.json +++ b/jigsaw-pieces/village/plains/streets/corner_02.json @@ -113,5 +113,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/streets/corner_02" + "object": "village/plains/streets/corner_02" } diff --git a/jigsaw-pieces/village/plains/streets/corner_03.json b/jigsaw-pieces/village/plains/streets/corner_03.json index 71b62c06..3d69d6c4 100644 --- a/jigsaw-pieces/village/plains/streets/corner_03.json +++ b/jigsaw-pieces/village/plains/streets/corner_03.json @@ -100,5 +100,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/streets/corner_03" + "object": "village/plains/streets/corner_03" } diff --git a/jigsaw-pieces/village/plains/streets/crossroad_01.json b/jigsaw-pieces/village/plains/streets/crossroad_01.json index d2fa3e8a..4625b140 100644 --- a/jigsaw-pieces/village/plains/streets/crossroad_01.json +++ b/jigsaw-pieces/village/plains/streets/crossroad_01.json @@ -228,5 +228,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/streets/crossroad_01" + "object": "village/plains/streets/crossroad_01" } diff --git a/jigsaw-pieces/village/plains/streets/crossroad_02.json b/jigsaw-pieces/village/plains/streets/crossroad_02.json index 0a5b456e..9dd6468b 100644 --- a/jigsaw-pieces/village/plains/streets/crossroad_02.json +++ b/jigsaw-pieces/village/plains/streets/crossroad_02.json @@ -176,5 +176,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/streets/crossroad_02" + "object": "village/plains/streets/crossroad_02" } diff --git a/jigsaw-pieces/village/plains/streets/crossroad_03.json b/jigsaw-pieces/village/plains/streets/crossroad_03.json index 386fdb83..26c1bd74 100644 --- a/jigsaw-pieces/village/plains/streets/crossroad_03.json +++ b/jigsaw-pieces/village/plains/streets/crossroad_03.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/streets/crossroad_03" + "object": "village/plains/streets/crossroad_03" } diff --git a/jigsaw-pieces/village/plains/streets/crossroad_04.json b/jigsaw-pieces/village/plains/streets/crossroad_04.json index f2cecdd8..0c7f7f16 100644 --- a/jigsaw-pieces/village/plains/streets/crossroad_04.json +++ b/jigsaw-pieces/village/plains/streets/crossroad_04.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/streets/crossroad_04" + "object": "village/plains/streets/crossroad_04" } diff --git a/jigsaw-pieces/village/plains/streets/crossroad_05.json b/jigsaw-pieces/village/plains/streets/crossroad_05.json index 04353649..cfc4d855 100644 --- a/jigsaw-pieces/village/plains/streets/crossroad_05.json +++ b/jigsaw-pieces/village/plains/streets/crossroad_05.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/streets/crossroad_05" + "object": "village/plains/streets/crossroad_05" } diff --git a/jigsaw-pieces/village/plains/streets/crossroad_06.json b/jigsaw-pieces/village/plains/streets/crossroad_06.json index 0386d62e..446bdfb3 100644 --- a/jigsaw-pieces/village/plains/streets/crossroad_06.json +++ b/jigsaw-pieces/village/plains/streets/crossroad_06.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/streets/crossroad_06" + "object": "village/plains/streets/crossroad_06" } diff --git a/jigsaw-pieces/village/plains/streets/straight_01.json b/jigsaw-pieces/village/plains/streets/straight_01.json index b7e449e9..baf05f72 100644 --- a/jigsaw-pieces/village/plains/streets/straight_01.json +++ b/jigsaw-pieces/village/plains/streets/straight_01.json @@ -165,5 +165,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/streets/straight_01" + "object": "village/plains/streets/straight_01" } diff --git a/jigsaw-pieces/village/plains/streets/straight_02.json b/jigsaw-pieces/village/plains/streets/straight_02.json index bcf61586..d1c1b180 100644 --- a/jigsaw-pieces/village/plains/streets/straight_02.json +++ b/jigsaw-pieces/village/plains/streets/straight_02.json @@ -113,5 +113,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/streets/straight_02" + "object": "village/plains/streets/straight_02" } diff --git a/jigsaw-pieces/village/plains/streets/straight_03.json b/jigsaw-pieces/village/plains/streets/straight_03.json index fd3f71be..fc3d220d 100644 --- a/jigsaw-pieces/village/plains/streets/straight_03.json +++ b/jigsaw-pieces/village/plains/streets/straight_03.json @@ -165,5 +165,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/streets/straight_03" + "object": "village/plains/streets/straight_03" } diff --git a/jigsaw-pieces/village/plains/streets/straight_04.json b/jigsaw-pieces/village/plains/streets/straight_04.json index ec518b4e..6b29e15e 100644 --- a/jigsaw-pieces/village/plains/streets/straight_04.json +++ b/jigsaw-pieces/village/plains/streets/straight_04.json @@ -113,5 +113,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/streets/straight_04" + "object": "village/plains/streets/straight_04" } diff --git a/jigsaw-pieces/village/plains/streets/straight_05.json b/jigsaw-pieces/village/plains/streets/straight_05.json index b521e7ce..11b00dd3 100644 --- a/jigsaw-pieces/village/plains/streets/straight_05.json +++ b/jigsaw-pieces/village/plains/streets/straight_05.json @@ -152,5 +152,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/streets/straight_05" + "object": "village/plains/streets/straight_05" } diff --git a/jigsaw-pieces/village/plains/streets/straight_06.json b/jigsaw-pieces/village/plains/streets/straight_06.json index 6ecc4f8f..d25d122b 100644 --- a/jigsaw-pieces/village/plains/streets/straight_06.json +++ b/jigsaw-pieces/village/plains/streets/straight_06.json @@ -321,5 +321,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/streets/straight_06" + "object": "village/plains/streets/straight_06" } diff --git a/jigsaw-pieces/village/plains/streets/turn_01.json b/jigsaw-pieces/village/plains/streets/turn_01.json index fddad95f..bf7fcd69 100644 --- a/jigsaw-pieces/village/plains/streets/turn_01.json +++ b/jigsaw-pieces/village/plains/streets/turn_01.json @@ -126,5 +126,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/streets/turn_01" + "object": "village/plains/streets/turn_01" } diff --git a/jigsaw-pieces/village/plains/terminators/terminator_01.json b/jigsaw-pieces/village/plains/terminators/terminator_01.json index d0a89ef7..9c9b0517 100644 --- a/jigsaw-pieces/village/plains/terminators/terminator_01.json +++ b/jigsaw-pieces/village/plains/terminators/terminator_01.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/terminators/terminator_01" + "object": "village/plains/terminators/terminator_01" } diff --git a/jigsaw-pieces/village/plains/terminators/terminator_02.json b/jigsaw-pieces/village/plains/terminators/terminator_02.json index c45ce1c2..95a02eaf 100644 --- a/jigsaw-pieces/village/plains/terminators/terminator_02.json +++ b/jigsaw-pieces/village/plains/terminators/terminator_02.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/terminators/terminator_02" + "object": "village/plains/terminators/terminator_02" } diff --git a/jigsaw-pieces/village/plains/terminators/terminator_03.json b/jigsaw-pieces/village/plains/terminators/terminator_03.json index 8c74f1ba..cd2864ff 100644 --- a/jigsaw-pieces/village/plains/terminators/terminator_03.json +++ b/jigsaw-pieces/village/plains/terminators/terminator_03.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/terminators/terminator_03" + "object": "village/plains/terminators/terminator_03" } diff --git a/jigsaw-pieces/village/plains/terminators/terminator_04.json b/jigsaw-pieces/village/plains/terminators/terminator_04.json index 4d81ccc9..5ca238b1 100644 --- a/jigsaw-pieces/village/plains/terminators/terminator_04.json +++ b/jigsaw-pieces/village/plains/terminators/terminator_04.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/terminators/terminator_04" + "object": "village/plains/terminators/terminator_04" } diff --git a/jigsaw-pieces/village/plains/town_centers/plains_fountain_01.json b/jigsaw-pieces/village/plains/town_centers/plains_fountain_01.json index 17180857..748e71a4 100644 --- a/jigsaw-pieces/village/plains/town_centers/plains_fountain_01.json +++ b/jigsaw-pieces/village/plains/town_centers/plains_fountain_01.json @@ -192,5 +192,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/town_centers/plains_fountain_01" + "object": "village/plains/town_centers/plains_fountain_01" } diff --git a/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_1.json b/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_1.json index 04ea90e1..7061b265 100644 --- a/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_1.json +++ b/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_1.json @@ -204,5 +204,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/town_centers/plains_meeting_point_1" + "object": "village/plains/town_centers/plains_meeting_point_1" } diff --git a/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_2.json b/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_2.json index c9e80eda..c9f7fd4c 100644 --- a/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_2.json +++ b/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_2.json @@ -205,5 +205,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/town_centers/plains_meeting_point_2" + "object": "village/plains/town_centers/plains_meeting_point_2" } diff --git a/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_3.json b/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_3.json index 83afb72c..e751c015 100644 --- a/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_3.json +++ b/jigsaw-pieces/village/plains/town_centers/plains_meeting_point_3.json @@ -165,5 +165,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/town_centers/plains_meeting_point_3" + "object": "village/plains/town_centers/plains_meeting_point_3" } diff --git a/jigsaw-pieces/village/plains/villagers/baby.json b/jigsaw-pieces/village/plains/villagers/baby.json index 16ac5bf5..742c0981 100644 --- a/jigsaw-pieces/village/plains/villagers/baby.json +++ b/jigsaw-pieces/village/plains/villagers/baby.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/villagers/baby" + "object": "village/plains/villagers/baby" } diff --git a/jigsaw-pieces/village/plains/villagers/nitwit.json b/jigsaw-pieces/village/plains/villagers/nitwit.json index 11a5ae02..b3b67e3a 100644 --- a/jigsaw-pieces/village/plains/villagers/nitwit.json +++ b/jigsaw-pieces/village/plains/villagers/nitwit.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/villagers/nitwit" + "object": "village/plains/villagers/nitwit" } diff --git a/jigsaw-pieces/village/plains/villagers/unemployed.json b/jigsaw-pieces/village/plains/villagers/unemployed.json index 7d922ce1..403f4966 100644 --- a/jigsaw-pieces/village/plains/villagers/unemployed.json +++ b/jigsaw-pieces/village/plains/villagers/unemployed.json @@ -76,5 +76,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/villagers/unemployed" + "object": "village/plains/villagers/unemployed" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_animal_pen_3.json b/jigsaw-pieces/village/plains/zombie/houses/plains_animal_pen_3.json index c2809b3e..fdf7f8f5 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_animal_pen_3.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_animal_pen_3.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_animal_pen_3" + "object": "village/plains/zombie/houses/plains_animal_pen_3" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_big_house_1.json b/jigsaw-pieces/village/plains/zombie/houses/plains_big_house_1.json index a1c83afa..0587ff62 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_big_house_1.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_big_house_1.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_big_house_1" + "object": "village/plains/zombie/houses/plains_big_house_1" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_butcher_shop_2.json b/jigsaw-pieces/village/plains/zombie/houses/plains_butcher_shop_2.json index 7830c2f0..cddfe1ac 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_butcher_shop_2.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_butcher_shop_2.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_butcher_shop_2" + "object": "village/plains/zombie/houses/plains_butcher_shop_2" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_fletcher_house_1.json b/jigsaw-pieces/village/plains/zombie/houses/plains_fletcher_house_1.json index 9a9f3754..33af46d8 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_fletcher_house_1.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_fletcher_house_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_fletcher_house_1" + "object": "village/plains/zombie/houses/plains_fletcher_house_1" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_medium_house_1.json b/jigsaw-pieces/village/plains/zombie/houses/plains_medium_house_1.json index 3f075613..a013b45d 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_medium_house_1.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_medium_house_1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_medium_house_1" + "object": "village/plains/zombie/houses/plains_medium_house_1" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_medium_house_2.json b/jigsaw-pieces/village/plains/zombie/houses/plains_medium_house_2.json index 76fad16d..74f1d685 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_medium_house_2.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_medium_house_2.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_medium_house_2" + "object": "village/plains/zombie/houses/plains_medium_house_2" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_meeting_point_4.json b/jigsaw-pieces/village/plains/zombie/houses/plains_meeting_point_4.json index 97d525ea..b27f24e3 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_meeting_point_4.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_meeting_point_4.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_meeting_point_4" + "object": "village/plains/zombie/houses/plains_meeting_point_4" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_meeting_point_5.json b/jigsaw-pieces/village/plains/zombie/houses/plains_meeting_point_5.json index f05bb026..3c5ce786 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_meeting_point_5.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_meeting_point_5.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_meeting_point_5" + "object": "village/plains/zombie/houses/plains_meeting_point_5" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_shepherds_house_1.json b/jigsaw-pieces/village/plains/zombie/houses/plains_shepherds_house_1.json index aa728ddc..fe3c3323 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_shepherds_house_1.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_shepherds_house_1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_shepherds_house_1" + "object": "village/plains/zombie/houses/plains_shepherds_house_1" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_1.json b/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_1.json index f3d3e2e3..fa5ce9a5 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_1.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_small_house_1" + "object": "village/plains/zombie/houses/plains_small_house_1" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_2.json b/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_2.json index 71f2c799..932b12a8 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_2.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_2.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_small_house_2" + "object": "village/plains/zombie/houses/plains_small_house_2" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_3.json b/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_3.json index e2ec8a5b..b6512cd2 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_3.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_3.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_small_house_3" + "object": "village/plains/zombie/houses/plains_small_house_3" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_4.json b/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_4.json index 9b3499a0..1554ceba 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_4.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_4.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_small_house_4" + "object": "village/plains/zombie/houses/plains_small_house_4" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_5.json b/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_5.json index e9ccd27b..c7924756 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_5.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_5.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_small_house_5" + "object": "village/plains/zombie/houses/plains_small_house_5" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_6.json b/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_6.json index 983b9023..03cdef61 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_6.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_6.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_small_house_6" + "object": "village/plains/zombie/houses/plains_small_house_6" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_7.json b/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_7.json index 0dd8b5f5..aa0a71c3 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_7.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_7.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_small_house_7" + "object": "village/plains/zombie/houses/plains_small_house_7" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_8.json b/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_8.json index d9f26b87..a625b2a5 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_8.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_small_house_8.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_small_house_8" + "object": "village/plains/zombie/houses/plains_small_house_8" } diff --git a/jigsaw-pieces/village/plains/zombie/houses/plains_stable_1.json b/jigsaw-pieces/village/plains/zombie/houses/plains_stable_1.json index 5257b12b..0a320d2a 100644 --- a/jigsaw-pieces/village/plains/zombie/houses/plains_stable_1.json +++ b/jigsaw-pieces/village/plains/zombie/houses/plains_stable_1.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/houses/plains_stable_1" + "object": "village/plains/zombie/houses/plains_stable_1" } diff --git a/jigsaw-pieces/village/plains/zombie/streets/corner_01.json b/jigsaw-pieces/village/plains/zombie/streets/corner_01.json index 983489f7..0b756190 100644 --- a/jigsaw-pieces/village/plains/zombie/streets/corner_01.json +++ b/jigsaw-pieces/village/plains/zombie/streets/corner_01.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/streets/corner_01" + "object": "village/plains/zombie/streets/corner_01" } diff --git a/jigsaw-pieces/village/plains/zombie/streets/corner_02.json b/jigsaw-pieces/village/plains/zombie/streets/corner_02.json index 7937c14e..5cae0594 100644 --- a/jigsaw-pieces/village/plains/zombie/streets/corner_02.json +++ b/jigsaw-pieces/village/plains/zombie/streets/corner_02.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/streets/corner_02" + "object": "village/plains/zombie/streets/corner_02" } diff --git a/jigsaw-pieces/village/plains/zombie/streets/corner_03.json b/jigsaw-pieces/village/plains/zombie/streets/corner_03.json index 685ddbdc..c5aeea92 100644 --- a/jigsaw-pieces/village/plains/zombie/streets/corner_03.json +++ b/jigsaw-pieces/village/plains/zombie/streets/corner_03.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/streets/corner_03" + "object": "village/plains/zombie/streets/corner_03" } diff --git a/jigsaw-pieces/village/plains/zombie/streets/crossroad_01.json b/jigsaw-pieces/village/plains/zombie/streets/crossroad_01.json index c6ce5c7d..2c165e53 100644 --- a/jigsaw-pieces/village/plains/zombie/streets/crossroad_01.json +++ b/jigsaw-pieces/village/plains/zombie/streets/crossroad_01.json @@ -228,5 +228,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/streets/crossroad_01" + "object": "village/plains/zombie/streets/crossroad_01" } diff --git a/jigsaw-pieces/village/plains/zombie/streets/crossroad_02.json b/jigsaw-pieces/village/plains/zombie/streets/crossroad_02.json index 071f190c..47678b07 100644 --- a/jigsaw-pieces/village/plains/zombie/streets/crossroad_02.json +++ b/jigsaw-pieces/village/plains/zombie/streets/crossroad_02.json @@ -176,5 +176,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/streets/crossroad_02" + "object": "village/plains/zombie/streets/crossroad_02" } diff --git a/jigsaw-pieces/village/plains/zombie/streets/crossroad_03.json b/jigsaw-pieces/village/plains/zombie/streets/crossroad_03.json index 2357ab72..3c1ba0b8 100644 --- a/jigsaw-pieces/village/plains/zombie/streets/crossroad_03.json +++ b/jigsaw-pieces/village/plains/zombie/streets/crossroad_03.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/streets/crossroad_03" + "object": "village/plains/zombie/streets/crossroad_03" } diff --git a/jigsaw-pieces/village/plains/zombie/streets/crossroad_04.json b/jigsaw-pieces/village/plains/zombie/streets/crossroad_04.json index 323509ad..cf2cc6a4 100644 --- a/jigsaw-pieces/village/plains/zombie/streets/crossroad_04.json +++ b/jigsaw-pieces/village/plains/zombie/streets/crossroad_04.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/streets/crossroad_04" + "object": "village/plains/zombie/streets/crossroad_04" } diff --git a/jigsaw-pieces/village/plains/zombie/streets/crossroad_05.json b/jigsaw-pieces/village/plains/zombie/streets/crossroad_05.json index 17765e0d..d8095338 100644 --- a/jigsaw-pieces/village/plains/zombie/streets/crossroad_05.json +++ b/jigsaw-pieces/village/plains/zombie/streets/crossroad_05.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/streets/crossroad_05" + "object": "village/plains/zombie/streets/crossroad_05" } diff --git a/jigsaw-pieces/village/plains/zombie/streets/crossroad_06.json b/jigsaw-pieces/village/plains/zombie/streets/crossroad_06.json index 12eb896a..800ebd31 100644 --- a/jigsaw-pieces/village/plains/zombie/streets/crossroad_06.json +++ b/jigsaw-pieces/village/plains/zombie/streets/crossroad_06.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/streets/crossroad_06" + "object": "village/plains/zombie/streets/crossroad_06" } diff --git a/jigsaw-pieces/village/plains/zombie/streets/straight_01.json b/jigsaw-pieces/village/plains/zombie/streets/straight_01.json index 1b58ba6a..34598655 100644 --- a/jigsaw-pieces/village/plains/zombie/streets/straight_01.json +++ b/jigsaw-pieces/village/plains/zombie/streets/straight_01.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/streets/straight_01" + "object": "village/plains/zombie/streets/straight_01" } diff --git a/jigsaw-pieces/village/plains/zombie/streets/straight_02.json b/jigsaw-pieces/village/plains/zombie/streets/straight_02.json index 81a28789..29b8af33 100644 --- a/jigsaw-pieces/village/plains/zombie/streets/straight_02.json +++ b/jigsaw-pieces/village/plains/zombie/streets/straight_02.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/streets/straight_02" + "object": "village/plains/zombie/streets/straight_02" } diff --git a/jigsaw-pieces/village/plains/zombie/streets/straight_03.json b/jigsaw-pieces/village/plains/zombie/streets/straight_03.json index 7e71e852..3890ff01 100644 --- a/jigsaw-pieces/village/plains/zombie/streets/straight_03.json +++ b/jigsaw-pieces/village/plains/zombie/streets/straight_03.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/streets/straight_03" + "object": "village/plains/zombie/streets/straight_03" } diff --git a/jigsaw-pieces/village/plains/zombie/streets/straight_04.json b/jigsaw-pieces/village/plains/zombie/streets/straight_04.json index 1349a1b2..37309760 100644 --- a/jigsaw-pieces/village/plains/zombie/streets/straight_04.json +++ b/jigsaw-pieces/village/plains/zombie/streets/straight_04.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/streets/straight_04" + "object": "village/plains/zombie/streets/straight_04" } diff --git a/jigsaw-pieces/village/plains/zombie/streets/straight_05.json b/jigsaw-pieces/village/plains/zombie/streets/straight_05.json index 0a762ade..7b978655 100644 --- a/jigsaw-pieces/village/plains/zombie/streets/straight_05.json +++ b/jigsaw-pieces/village/plains/zombie/streets/straight_05.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/streets/straight_05" + "object": "village/plains/zombie/streets/straight_05" } diff --git a/jigsaw-pieces/village/plains/zombie/streets/straight_06.json b/jigsaw-pieces/village/plains/zombie/streets/straight_06.json index 972daad4..1970e0c4 100644 --- a/jigsaw-pieces/village/plains/zombie/streets/straight_06.json +++ b/jigsaw-pieces/village/plains/zombie/streets/straight_06.json @@ -306,5 +306,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/streets/straight_06" + "object": "village/plains/zombie/streets/straight_06" } diff --git a/jigsaw-pieces/village/plains/zombie/streets/turn_01.json b/jigsaw-pieces/village/plains/zombie/streets/turn_01.json index e2093616..0a6c54a0 100644 --- a/jigsaw-pieces/village/plains/zombie/streets/turn_01.json +++ b/jigsaw-pieces/village/plains/zombie/streets/turn_01.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/streets/turn_01" + "object": "village/plains/zombie/streets/turn_01" } diff --git a/jigsaw-pieces/village/plains/zombie/town_centers/plains_fountain_01.json b/jigsaw-pieces/village/plains/zombie/town_centers/plains_fountain_01.json index bd33b247..a0148a45 100644 --- a/jigsaw-pieces/village/plains/zombie/town_centers/plains_fountain_01.json +++ b/jigsaw-pieces/village/plains/zombie/town_centers/plains_fountain_01.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/town_centers/plains_fountain_01" + "object": "village/plains/zombie/town_centers/plains_fountain_01" } diff --git a/jigsaw-pieces/village/plains/zombie/town_centers/plains_meeting_point_1.json b/jigsaw-pieces/village/plains/zombie/town_centers/plains_meeting_point_1.json index 08118d4c..dbc5de57 100644 --- a/jigsaw-pieces/village/plains/zombie/town_centers/plains_meeting_point_1.json +++ b/jigsaw-pieces/village/plains/zombie/town_centers/plains_meeting_point_1.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/town_centers/plains_meeting_point_1" + "object": "village/plains/zombie/town_centers/plains_meeting_point_1" } diff --git a/jigsaw-pieces/village/plains/zombie/town_centers/plains_meeting_point_2.json b/jigsaw-pieces/village/plains/zombie/town_centers/plains_meeting_point_2.json index 4632a919..796021bc 100644 --- a/jigsaw-pieces/village/plains/zombie/town_centers/plains_meeting_point_2.json +++ b/jigsaw-pieces/village/plains/zombie/town_centers/plains_meeting_point_2.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/town_centers/plains_meeting_point_2" + "object": "village/plains/zombie/town_centers/plains_meeting_point_2" } diff --git a/jigsaw-pieces/village/plains/zombie/town_centers/plains_meeting_point_3.json b/jigsaw-pieces/village/plains/zombie/town_centers/plains_meeting_point_3.json index 884bb79f..74a41485 100644 --- a/jigsaw-pieces/village/plains/zombie/town_centers/plains_meeting_point_3.json +++ b/jigsaw-pieces/village/plains/zombie/town_centers/plains_meeting_point_3.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/town_centers/plains_meeting_point_3" + "object": "village/plains/zombie/town_centers/plains_meeting_point_3" } diff --git a/jigsaw-pieces/village/plains/zombie/villagers/nitwit.json b/jigsaw-pieces/village/plains/zombie/villagers/nitwit.json index 31bdadbc..576a274f 100644 --- a/jigsaw-pieces/village/plains/zombie/villagers/nitwit.json +++ b/jigsaw-pieces/village/plains/zombie/villagers/nitwit.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/villagers/nitwit" + "object": "village/plains/zombie/villagers/nitwit" } diff --git a/jigsaw-pieces/village/plains/zombie/villagers/unemployed.json b/jigsaw-pieces/village/plains/zombie/villagers/unemployed.json index ba6e8cc1..c2b20569 100644 --- a/jigsaw-pieces/village/plains/zombie/villagers/unemployed.json +++ b/jigsaw-pieces/village/plains/zombie/villagers/unemployed.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/plains/zombie/villagers/unemployed" + "object": "village/plains/zombie/villagers/unemployed" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_1.json b/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_1.json index 8727d91f..6d4cca8e 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_animal_pen_1" + "object": "village/savanna/houses/savanna_animal_pen_1" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_2.json b/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_2.json index 56aca500..a4f70f65 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_2.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_2.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_animal_pen_2" + "object": "village/savanna/houses/savanna_animal_pen_2" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_3.json b/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_3.json index 10826f9a..59ed821a 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_3.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_animal_pen_3.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_animal_pen_3" + "object": "village/savanna/houses/savanna_animal_pen_3" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_armorer_1.json b/jigsaw-pieces/village/savanna/houses/savanna_armorer_1.json index b79fbb6d..f884c905 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_armorer_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_armorer_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_armorer_1" + "object": "village/savanna/houses/savanna_armorer_1" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_butchers_shop_1.json b/jigsaw-pieces/village/savanna/houses/savanna_butchers_shop_1.json index 54777354..4aceabbb 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_butchers_shop_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_butchers_shop_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_butchers_shop_1" + "object": "village/savanna/houses/savanna_butchers_shop_1" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_butchers_shop_2.json b/jigsaw-pieces/village/savanna/houses/savanna_butchers_shop_2.json index e3df9b4d..7fc065d9 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_butchers_shop_2.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_butchers_shop_2.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_butchers_shop_2" + "object": "village/savanna/houses/savanna_butchers_shop_2" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_cartographer_1.json b/jigsaw-pieces/village/savanna/houses/savanna_cartographer_1.json index 484f532a..d4632b3d 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_cartographer_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_cartographer_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_cartographer_1" + "object": "village/savanna/houses/savanna_cartographer_1" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_fisher_cottage_1.json b/jigsaw-pieces/village/savanna/houses/savanna_fisher_cottage_1.json index 0e67d2ae..907e0a36 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_fisher_cottage_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_fisher_cottage_1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_fisher_cottage_1" + "object": "village/savanna/houses/savanna_fisher_cottage_1" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_fletcher_house_1.json b/jigsaw-pieces/village/savanna/houses/savanna_fletcher_house_1.json index 490c87af..078c141f 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_fletcher_house_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_fletcher_house_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_fletcher_house_1" + "object": "village/savanna/houses/savanna_fletcher_house_1" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_large_farm_1.json b/jigsaw-pieces/village/savanna/houses/savanna_large_farm_1.json index 184faf12..851a130c 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_large_farm_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_large_farm_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_large_farm_1" + "object": "village/savanna/houses/savanna_large_farm_1" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_large_farm_2.json b/jigsaw-pieces/village/savanna/houses/savanna_large_farm_2.json index b64ede7f..9e673dee 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_large_farm_2.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_large_farm_2.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_large_farm_2" + "object": "village/savanna/houses/savanna_large_farm_2" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_library_1.json b/jigsaw-pieces/village/savanna/houses/savanna_library_1.json index 496d0ea6..bbbb8227 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_library_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_library_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_library_1" + "object": "village/savanna/houses/savanna_library_1" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_mason_1.json b/jigsaw-pieces/village/savanna/houses/savanna_mason_1.json index 17c8df9e..3f2d2a27 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_mason_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_mason_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_mason_1" + "object": "village/savanna/houses/savanna_mason_1" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_medium_house_1.json b/jigsaw-pieces/village/savanna/houses/savanna_medium_house_1.json index 0697b5b4..abfab954 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_medium_house_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_medium_house_1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_medium_house_1" + "object": "village/savanna/houses/savanna_medium_house_1" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_medium_house_2.json b/jigsaw-pieces/village/savanna/houses/savanna_medium_house_2.json index 15ce0cc0..52b90632 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_medium_house_2.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_medium_house_2.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_medium_house_2" + "object": "village/savanna/houses/savanna_medium_house_2" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_shepherd_1.json b/jigsaw-pieces/village/savanna/houses/savanna_shepherd_1.json index bc697d95..8e60d69b 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_shepherd_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_shepherd_1.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_shepherd_1" + "object": "village/savanna/houses/savanna_shepherd_1" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_farm.json b/jigsaw-pieces/village/savanna/houses/savanna_small_farm.json index 13cd545b..5c22efd2 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_farm.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_farm.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_small_farm" + "object": "village/savanna/houses/savanna_small_farm" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_house_1.json b/jigsaw-pieces/village/savanna/houses/savanna_small_house_1.json index 28ec2c57..87683ee2 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_house_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_house_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_small_house_1" + "object": "village/savanna/houses/savanna_small_house_1" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_house_2.json b/jigsaw-pieces/village/savanna/houses/savanna_small_house_2.json index 4737a2e3..abc5bf33 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_house_2.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_house_2.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_small_house_2" + "object": "village/savanna/houses/savanna_small_house_2" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_house_3.json b/jigsaw-pieces/village/savanna/houses/savanna_small_house_3.json index a44164dd..e2f986e6 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_house_3.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_house_3.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_small_house_3" + "object": "village/savanna/houses/savanna_small_house_3" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_house_4.json b/jigsaw-pieces/village/savanna/houses/savanna_small_house_4.json index a32a68d6..95c46f35 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_house_4.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_house_4.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_small_house_4" + "object": "village/savanna/houses/savanna_small_house_4" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_house_5.json b/jigsaw-pieces/village/savanna/houses/savanna_small_house_5.json index ed444a25..600ff232 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_house_5.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_house_5.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_small_house_5" + "object": "village/savanna/houses/savanna_small_house_5" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_house_6.json b/jigsaw-pieces/village/savanna/houses/savanna_small_house_6.json index 276a10b1..a0dfc657 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_house_6.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_house_6.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_small_house_6" + "object": "village/savanna/houses/savanna_small_house_6" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_house_7.json b/jigsaw-pieces/village/savanna/houses/savanna_small_house_7.json index 9291ea2e..8c11a6b4 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_house_7.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_house_7.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_small_house_7" + "object": "village/savanna/houses/savanna_small_house_7" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_small_house_8.json b/jigsaw-pieces/village/savanna/houses/savanna_small_house_8.json index 724cf7f1..faad4c4f 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_small_house_8.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_small_house_8.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_small_house_8" + "object": "village/savanna/houses/savanna_small_house_8" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_tannery_1.json b/jigsaw-pieces/village/savanna/houses/savanna_tannery_1.json index 6b677c83..c4e77081 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_tannery_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_tannery_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_tannery_1" + "object": "village/savanna/houses/savanna_tannery_1" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_temple_1.json b/jigsaw-pieces/village/savanna/houses/savanna_temple_1.json index 17787518..9d609e75 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_temple_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_temple_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_temple_1" + "object": "village/savanna/houses/savanna_temple_1" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_temple_2.json b/jigsaw-pieces/village/savanna/houses/savanna_temple_2.json index 78886361..69e8138b 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_temple_2.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_temple_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_temple_2" + "object": "village/savanna/houses/savanna_temple_2" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_tool_smith_1.json b/jigsaw-pieces/village/savanna/houses/savanna_tool_smith_1.json index 9021eb24..2cb69245 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_tool_smith_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_tool_smith_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_tool_smith_1" + "object": "village/savanna/houses/savanna_tool_smith_1" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_weaponsmith_1.json b/jigsaw-pieces/village/savanna/houses/savanna_weaponsmith_1.json index f162cc9f..d359730d 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_weaponsmith_1.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_weaponsmith_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_weaponsmith_1" + "object": "village/savanna/houses/savanna_weaponsmith_1" } diff --git a/jigsaw-pieces/village/savanna/houses/savanna_weaponsmith_2.json b/jigsaw-pieces/village/savanna/houses/savanna_weaponsmith_2.json index 0494d6e6..fb8b1bff 100644 --- a/jigsaw-pieces/village/savanna/houses/savanna_weaponsmith_2.json +++ b/jigsaw-pieces/village/savanna/houses/savanna_weaponsmith_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/houses/savanna_weaponsmith_2" + "object": "village/savanna/houses/savanna_weaponsmith_2" } diff --git a/jigsaw-pieces/village/savanna/savanna_lamp_post_01.json b/jigsaw-pieces/village/savanna/savanna_lamp_post_01.json index 772ae49b..90d8f4e3 100644 --- a/jigsaw-pieces/village/savanna/savanna_lamp_post_01.json +++ b/jigsaw-pieces/village/savanna/savanna_lamp_post_01.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagesavanna_lamp_post_01" + "object": "village/savanna/villagesavanna_lamp_post_01" } diff --git a/jigsaw-pieces/village/savanna/streets/corner_01.json b/jigsaw-pieces/village/savanna/streets/corner_01.json index 33208b7a..47054e47 100644 --- a/jigsaw-pieces/village/savanna/streets/corner_01.json +++ b/jigsaw-pieces/village/savanna/streets/corner_01.json @@ -165,5 +165,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/corner_01" + "object": "village/savanna/streets/corner_01" } diff --git a/jigsaw-pieces/village/savanna/streets/corner_03.json b/jigsaw-pieces/village/savanna/streets/corner_03.json index 089c9df7..91118ceb 100644 --- a/jigsaw-pieces/village/savanna/streets/corner_03.json +++ b/jigsaw-pieces/village/savanna/streets/corner_03.json @@ -100,5 +100,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/corner_03" + "object": "village/savanna/streets/corner_03" } diff --git a/jigsaw-pieces/village/savanna/streets/crossroad_02.json b/jigsaw-pieces/village/savanna/streets/crossroad_02.json index 9020a3d8..bc0dc817 100644 --- a/jigsaw-pieces/village/savanna/streets/crossroad_02.json +++ b/jigsaw-pieces/village/savanna/streets/crossroad_02.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/crossroad_02" + "object": "village/savanna/streets/crossroad_02" } diff --git a/jigsaw-pieces/village/savanna/streets/crossroad_03.json b/jigsaw-pieces/village/savanna/streets/crossroad_03.json index 06933ad1..564875cb 100644 --- a/jigsaw-pieces/village/savanna/streets/crossroad_03.json +++ b/jigsaw-pieces/village/savanna/streets/crossroad_03.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/crossroad_03" + "object": "village/savanna/streets/crossroad_03" } diff --git a/jigsaw-pieces/village/savanna/streets/crossroad_04.json b/jigsaw-pieces/village/savanna/streets/crossroad_04.json index 55541135..0420fa42 100644 --- a/jigsaw-pieces/village/savanna/streets/crossroad_04.json +++ b/jigsaw-pieces/village/savanna/streets/crossroad_04.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/crossroad_04" + "object": "village/savanna/streets/crossroad_04" } diff --git a/jigsaw-pieces/village/savanna/streets/crossroad_05.json b/jigsaw-pieces/village/savanna/streets/crossroad_05.json index c6dd6131..bac19f7b 100644 --- a/jigsaw-pieces/village/savanna/streets/crossroad_05.json +++ b/jigsaw-pieces/village/savanna/streets/crossroad_05.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/crossroad_05" + "object": "village/savanna/streets/crossroad_05" } diff --git a/jigsaw-pieces/village/savanna/streets/crossroad_06.json b/jigsaw-pieces/village/savanna/streets/crossroad_06.json index 685482cb..2cb0aa86 100644 --- a/jigsaw-pieces/village/savanna/streets/crossroad_06.json +++ b/jigsaw-pieces/village/savanna/streets/crossroad_06.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/crossroad_06" + "object": "village/savanna/streets/crossroad_06" } diff --git a/jigsaw-pieces/village/savanna/streets/crossroad_07.json b/jigsaw-pieces/village/savanna/streets/crossroad_07.json index 04dc32cb..2e44a83b 100644 --- a/jigsaw-pieces/village/savanna/streets/crossroad_07.json +++ b/jigsaw-pieces/village/savanna/streets/crossroad_07.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/crossroad_07" + "object": "village/savanna/streets/crossroad_07" } diff --git a/jigsaw-pieces/village/savanna/streets/split_01.json b/jigsaw-pieces/village/savanna/streets/split_01.json index cf2a6ffb..f840dcce 100644 --- a/jigsaw-pieces/village/savanna/streets/split_01.json +++ b/jigsaw-pieces/village/savanna/streets/split_01.json @@ -126,5 +126,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/split_01" + "object": "village/savanna/streets/split_01" } diff --git a/jigsaw-pieces/village/savanna/streets/split_02.json b/jigsaw-pieces/village/savanna/streets/split_02.json index a09cb3de..a79bfa90 100644 --- a/jigsaw-pieces/village/savanna/streets/split_02.json +++ b/jigsaw-pieces/village/savanna/streets/split_02.json @@ -126,5 +126,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/split_02" + "object": "village/savanna/streets/split_02" } diff --git a/jigsaw-pieces/village/savanna/streets/straight_02.json b/jigsaw-pieces/village/savanna/streets/straight_02.json index 8006ebf9..50f030d0 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_02.json +++ b/jigsaw-pieces/village/savanna/streets/straight_02.json @@ -178,5 +178,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/straight_02" + "object": "village/savanna/streets/straight_02" } diff --git a/jigsaw-pieces/village/savanna/streets/straight_04.json b/jigsaw-pieces/village/savanna/streets/straight_04.json index 7a5075df..1929b7ee 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_04.json +++ b/jigsaw-pieces/village/savanna/streets/straight_04.json @@ -113,5 +113,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/straight_04" + "object": "village/savanna/streets/straight_04" } diff --git a/jigsaw-pieces/village/savanna/streets/straight_05.json b/jigsaw-pieces/village/savanna/streets/straight_05.json index da6833f4..b7f76f77 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_05.json +++ b/jigsaw-pieces/village/savanna/streets/straight_05.json @@ -152,5 +152,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/straight_05" + "object": "village/savanna/streets/straight_05" } diff --git a/jigsaw-pieces/village/savanna/streets/straight_06.json b/jigsaw-pieces/village/savanna/streets/straight_06.json index be5c42b2..d635ee47 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_06.json +++ b/jigsaw-pieces/village/savanna/streets/straight_06.json @@ -126,5 +126,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/straight_06" + "object": "village/savanna/streets/straight_06" } diff --git a/jigsaw-pieces/village/savanna/streets/straight_08.json b/jigsaw-pieces/village/savanna/streets/straight_08.json index f2cb511d..924ee12f 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_08.json +++ b/jigsaw-pieces/village/savanna/streets/straight_08.json @@ -126,5 +126,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/straight_08" + "object": "village/savanna/streets/straight_08" } diff --git a/jigsaw-pieces/village/savanna/streets/straight_09.json b/jigsaw-pieces/village/savanna/streets/straight_09.json index dd0792b4..cc72e610 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_09.json +++ b/jigsaw-pieces/village/savanna/streets/straight_09.json @@ -178,5 +178,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/straight_09" + "object": "village/savanna/streets/straight_09" } diff --git a/jigsaw-pieces/village/savanna/streets/straight_10.json b/jigsaw-pieces/village/savanna/streets/straight_10.json index 81d89505..63332b28 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_10.json +++ b/jigsaw-pieces/village/savanna/streets/straight_10.json @@ -100,5 +100,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/straight_10" + "object": "village/savanna/streets/straight_10" } diff --git a/jigsaw-pieces/village/savanna/streets/straight_11.json b/jigsaw-pieces/village/savanna/streets/straight_11.json index 91578d90..3098411a 100644 --- a/jigsaw-pieces/village/savanna/streets/straight_11.json +++ b/jigsaw-pieces/village/savanna/streets/straight_11.json @@ -113,5 +113,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/straight_11" + "object": "village/savanna/streets/straight_11" } diff --git a/jigsaw-pieces/village/savanna/streets/turn_01.json b/jigsaw-pieces/village/savanna/streets/turn_01.json index 7f3f0f5e..d9f1ea8e 100644 --- a/jigsaw-pieces/village/savanna/streets/turn_01.json +++ b/jigsaw-pieces/village/savanna/streets/turn_01.json @@ -126,5 +126,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/streets/turn_01" + "object": "village/savanna/streets/turn_01" } diff --git a/jigsaw-pieces/village/savanna/terminators/terminator_05.json b/jigsaw-pieces/village/savanna/terminators/terminator_05.json index e4a72d2b..9177f202 100644 --- a/jigsaw-pieces/village/savanna/terminators/terminator_05.json +++ b/jigsaw-pieces/village/savanna/terminators/terminator_05.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villageterminators/terminator_05" + "object": "village/savanna/villageterminators/terminator_05" } diff --git a/jigsaw-pieces/village/savanna/town_centers/savanna_meeting_point_1.json b/jigsaw-pieces/village/savanna/town_centers/savanna_meeting_point_1.json index ea33d408..06662299 100644 --- a/jigsaw-pieces/village/savanna/town_centers/savanna_meeting_point_1.json +++ b/jigsaw-pieces/village/savanna/town_centers/savanna_meeting_point_1.json @@ -189,5 +189,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/town_centers/savanna_meeting_point_1" + "object": "village/savanna/town_centers/savanna_meeting_point_1" } diff --git a/jigsaw-pieces/village/savanna/town_centers/savanna_meeting_point_2.json b/jigsaw-pieces/village/savanna/town_centers/savanna_meeting_point_2.json index 07bb0609..9604cdbb 100644 --- a/jigsaw-pieces/village/savanna/town_centers/savanna_meeting_point_2.json +++ b/jigsaw-pieces/village/savanna/town_centers/savanna_meeting_point_2.json @@ -189,5 +189,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/town_centers/savanna_meeting_point_2" + "object": "village/savanna/town_centers/savanna_meeting_point_2" } diff --git a/jigsaw-pieces/village/savanna/town_centers/savanna_meeting_point_3.json b/jigsaw-pieces/village/savanna/town_centers/savanna_meeting_point_3.json index a10b5b2e..4f67c084 100644 --- a/jigsaw-pieces/village/savanna/town_centers/savanna_meeting_point_3.json +++ b/jigsaw-pieces/village/savanna/town_centers/savanna_meeting_point_3.json @@ -189,5 +189,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/town_centers/savanna_meeting_point_3" + "object": "village/savanna/town_centers/savanna_meeting_point_3" } diff --git a/jigsaw-pieces/village/savanna/town_centers/savanna_meeting_point_4.json b/jigsaw-pieces/village/savanna/town_centers/savanna_meeting_point_4.json index 90cd966b..cd61495b 100644 --- a/jigsaw-pieces/village/savanna/town_centers/savanna_meeting_point_4.json +++ b/jigsaw-pieces/village/savanna/town_centers/savanna_meeting_point_4.json @@ -176,5 +176,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/town_centers/savanna_meeting_point_4" + "object": "village/savanna/town_centers/savanna_meeting_point_4" } diff --git a/jigsaw-pieces/village/savanna/villagers/baby.json b/jigsaw-pieces/village/savanna/villagers/baby.json index 7d97b263..92057fc6 100644 --- a/jigsaw-pieces/village/savanna/villagers/baby.json +++ b/jigsaw-pieces/village/savanna/villagers/baby.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagers/baby" + "object": "village/savanna/villagers/baby" } diff --git a/jigsaw-pieces/village/savanna/villagers/nitwit.json b/jigsaw-pieces/village/savanna/villagers/nitwit.json index b668278d..49341825 100644 --- a/jigsaw-pieces/village/savanna/villagers/nitwit.json +++ b/jigsaw-pieces/village/savanna/villagers/nitwit.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagers/nitwit" + "object": "village/savanna/villagers/nitwit" } diff --git a/jigsaw-pieces/village/savanna/villagers/unemployed.json b/jigsaw-pieces/village/savanna/villagers/unemployed.json index e1597c69..0bfed0f6 100644 --- a/jigsaw-pieces/village/savanna/villagers/unemployed.json +++ b/jigsaw-pieces/village/savanna/villagers/unemployed.json @@ -76,5 +76,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagers/unemployed" + "object": "village/savanna/villagers/unemployed" } diff --git a/jigsaw-pieces/village/savanna/zombie/houses/savanna_animal_pen_2.json b/jigsaw-pieces/village/savanna/zombie/houses/savanna_animal_pen_2.json index 02622adf..69ddb7ef 100644 --- a/jigsaw-pieces/village/savanna/zombie/houses/savanna_animal_pen_2.json +++ b/jigsaw-pieces/village/savanna/zombie/houses/savanna_animal_pen_2.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/houses/savanna_animal_pen_2" + "object": "village/savanna/villagezombie/houses/savanna_animal_pen_2" } diff --git a/jigsaw-pieces/village/savanna/zombie/houses/savanna_animal_pen_3.json b/jigsaw-pieces/village/savanna/zombie/houses/savanna_animal_pen_3.json index 7afa1723..f66cdc28 100644 --- a/jigsaw-pieces/village/savanna/zombie/houses/savanna_animal_pen_3.json +++ b/jigsaw-pieces/village/savanna/zombie/houses/savanna_animal_pen_3.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/houses/savanna_animal_pen_3" + "object": "village/savanna/villagezombie/houses/savanna_animal_pen_3" } diff --git a/jigsaw-pieces/village/savanna/zombie/houses/savanna_large_farm_2.json b/jigsaw-pieces/village/savanna/zombie/houses/savanna_large_farm_2.json index 8569ad20..fb10fc47 100644 --- a/jigsaw-pieces/village/savanna/zombie/houses/savanna_large_farm_2.json +++ b/jigsaw-pieces/village/savanna/zombie/houses/savanna_large_farm_2.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/houses/savanna_large_farm_2" + "object": "village/savanna/villagezombie/houses/savanna_large_farm_2" } diff --git a/jigsaw-pieces/village/savanna/zombie/houses/savanna_medium_house_1.json b/jigsaw-pieces/village/savanna/zombie/houses/savanna_medium_house_1.json index b0f5fec4..dffe897e 100644 --- a/jigsaw-pieces/village/savanna/zombie/houses/savanna_medium_house_1.json +++ b/jigsaw-pieces/village/savanna/zombie/houses/savanna_medium_house_1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/houses/savanna_medium_house_1" + "object": "village/savanna/villagezombie/houses/savanna_medium_house_1" } diff --git a/jigsaw-pieces/village/savanna/zombie/houses/savanna_medium_house_2.json b/jigsaw-pieces/village/savanna/zombie/houses/savanna_medium_house_2.json index 4585cf42..c3e69fdb 100644 --- a/jigsaw-pieces/village/savanna/zombie/houses/savanna_medium_house_2.json +++ b/jigsaw-pieces/village/savanna/zombie/houses/savanna_medium_house_2.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/houses/savanna_medium_house_2" + "object": "village/savanna/villagezombie/houses/savanna_medium_house_2" } diff --git a/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_1.json b/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_1.json index 84856e61..0cc1a616 100644 --- a/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_1.json +++ b/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/houses/savanna_small_house_1" + "object": "village/savanna/villagezombie/houses/savanna_small_house_1" } diff --git a/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_2.json b/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_2.json index 38252447..f6e60076 100644 --- a/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_2.json +++ b/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_2.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/houses/savanna_small_house_2" + "object": "village/savanna/villagezombie/houses/savanna_small_house_2" } diff --git a/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_3.json b/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_3.json index 7884d98e..85889596 100644 --- a/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_3.json +++ b/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_3.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/houses/savanna_small_house_3" + "object": "village/savanna/villagezombie/houses/savanna_small_house_3" } diff --git a/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_4.json b/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_4.json index 5bfe2e50..55bb7823 100644 --- a/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_4.json +++ b/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_4.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/houses/savanna_small_house_4" + "object": "village/savanna/villagezombie/houses/savanna_small_house_4" } diff --git a/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_5.json b/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_5.json index 60e3925b..3ef30252 100644 --- a/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_5.json +++ b/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_5.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/houses/savanna_small_house_5" + "object": "village/savanna/villagezombie/houses/savanna_small_house_5" } diff --git a/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_6.json b/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_6.json index 5160eb72..e44565fa 100644 --- a/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_6.json +++ b/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_6.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/houses/savanna_small_house_6" + "object": "village/savanna/villagezombie/houses/savanna_small_house_6" } diff --git a/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_7.json b/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_7.json index ad8d4014..155f459b 100644 --- a/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_7.json +++ b/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_7.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/houses/savanna_small_house_7" + "object": "village/savanna/villagezombie/houses/savanna_small_house_7" } diff --git a/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_8.json b/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_8.json index 40a38dfc..d5df1073 100644 --- a/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_8.json +++ b/jigsaw-pieces/village/savanna/zombie/houses/savanna_small_house_8.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/houses/savanna_small_house_8" + "object": "village/savanna/villagezombie/houses/savanna_small_house_8" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/corner_01.json b/jigsaw-pieces/village/savanna/zombie/streets/corner_01.json index 476cc079..ec8761a0 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/corner_01.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/corner_01.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/corner_01" + "object": "village/savanna/villagezombie/streets/corner_01" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/corner_03.json b/jigsaw-pieces/village/savanna/zombie/streets/corner_03.json index 647e07e6..1225dc90 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/corner_03.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/corner_03.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/corner_03" + "object": "village/savanna/villagezombie/streets/corner_03" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/crossroad_02.json b/jigsaw-pieces/village/savanna/zombie/streets/crossroad_02.json index f2a9f716..7a9979b5 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/crossroad_02.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/crossroad_02.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/crossroad_02" + "object": "village/savanna/villagezombie/streets/crossroad_02" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/crossroad_03.json b/jigsaw-pieces/village/savanna/zombie/streets/crossroad_03.json index b16be209..5430f9dd 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/crossroad_03.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/crossroad_03.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/crossroad_03" + "object": "village/savanna/villagezombie/streets/crossroad_03" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/crossroad_04.json b/jigsaw-pieces/village/savanna/zombie/streets/crossroad_04.json index 16fa12df..6ef0306f 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/crossroad_04.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/crossroad_04.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/crossroad_04" + "object": "village/savanna/villagezombie/streets/crossroad_04" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/crossroad_05.json b/jigsaw-pieces/village/savanna/zombie/streets/crossroad_05.json index b113e0c6..f473c29a 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/crossroad_05.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/crossroad_05.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/crossroad_05" + "object": "village/savanna/villagezombie/streets/crossroad_05" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/crossroad_06.json b/jigsaw-pieces/village/savanna/zombie/streets/crossroad_06.json index 5ccbfc50..fa7c7de0 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/crossroad_06.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/crossroad_06.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/crossroad_06" + "object": "village/savanna/villagezombie/streets/crossroad_06" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/crossroad_07.json b/jigsaw-pieces/village/savanna/zombie/streets/crossroad_07.json index 7a6b525f..cddf568f 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/crossroad_07.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/crossroad_07.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/crossroad_07" + "object": "village/savanna/villagezombie/streets/crossroad_07" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/split_01.json b/jigsaw-pieces/village/savanna/zombie/streets/split_01.json index 9a90284a..6b8f24c3 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/split_01.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/split_01.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/split_01" + "object": "village/savanna/villagezombie/streets/split_01" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/split_02.json b/jigsaw-pieces/village/savanna/zombie/streets/split_02.json index fec26871..c1d8da44 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/split_02.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/split_02.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/split_02" + "object": "village/savanna/villagezombie/streets/split_02" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/straight_02.json b/jigsaw-pieces/village/savanna/zombie/streets/straight_02.json index 8950549c..5a6b5190 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/straight_02.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/straight_02.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/straight_02" + "object": "village/savanna/villagezombie/streets/straight_02" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/straight_04.json b/jigsaw-pieces/village/savanna/zombie/streets/straight_04.json index 6e7ad8e2..e45e655e 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/straight_04.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/straight_04.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/straight_04" + "object": "village/savanna/villagezombie/streets/straight_04" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/straight_05.json b/jigsaw-pieces/village/savanna/zombie/streets/straight_05.json index 6e322614..70ac93dd 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/straight_05.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/straight_05.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/straight_05" + "object": "village/savanna/villagezombie/streets/straight_05" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/straight_06.json b/jigsaw-pieces/village/savanna/zombie/streets/straight_06.json index 99e8686b..3043d1f6 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/straight_06.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/straight_06.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/straight_06" + "object": "village/savanna/villagezombie/streets/straight_06" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/straight_08.json b/jigsaw-pieces/village/savanna/zombie/streets/straight_08.json index 1dec5849..3e70796f 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/straight_08.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/straight_08.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/straight_08" + "object": "village/savanna/villagezombie/streets/straight_08" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/straight_09.json b/jigsaw-pieces/village/savanna/zombie/streets/straight_09.json index 3f2184c7..b78dc45e 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/straight_09.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/straight_09.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/straight_09" + "object": "village/savanna/villagezombie/streets/straight_09" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/straight_10.json b/jigsaw-pieces/village/savanna/zombie/streets/straight_10.json index 953fb734..e63c2380 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/straight_10.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/straight_10.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/straight_10" + "object": "village/savanna/villagezombie/streets/straight_10" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/straight_11.json b/jigsaw-pieces/village/savanna/zombie/streets/straight_11.json index 1539b4be..db1bc986 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/straight_11.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/straight_11.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/straight_11" + "object": "village/savanna/villagezombie/streets/straight_11" } diff --git a/jigsaw-pieces/village/savanna/zombie/streets/turn_01.json b/jigsaw-pieces/village/savanna/zombie/streets/turn_01.json index 7168db84..6d11256a 100644 --- a/jigsaw-pieces/village/savanna/zombie/streets/turn_01.json +++ b/jigsaw-pieces/village/savanna/zombie/streets/turn_01.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/streets/turn_01" + "object": "village/savanna/villagezombie/streets/turn_01" } diff --git a/jigsaw-pieces/village/savanna/zombie/terminators/terminator_05.json b/jigsaw-pieces/village/savanna/zombie/terminators/terminator_05.json index 78d2a406..82692657 100644 --- a/jigsaw-pieces/village/savanna/zombie/terminators/terminator_05.json +++ b/jigsaw-pieces/village/savanna/zombie/terminators/terminator_05.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/terminators/terminator_05" + "object": "village/savanna/villagezombie/terminators/terminator_05" } diff --git a/jigsaw-pieces/village/savanna/zombie/town_centers/savanna_meeting_point_1.json b/jigsaw-pieces/village/savanna/zombie/town_centers/savanna_meeting_point_1.json index f4161f0a..06469e2f 100644 --- a/jigsaw-pieces/village/savanna/zombie/town_centers/savanna_meeting_point_1.json +++ b/jigsaw-pieces/village/savanna/zombie/town_centers/savanna_meeting_point_1.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/town_centers/savanna_meeting_point_1" + "object": "village/savanna/villagezombie/town_centers/savanna_meeting_point_1" } diff --git a/jigsaw-pieces/village/savanna/zombie/town_centers/savanna_meeting_point_2.json b/jigsaw-pieces/village/savanna/zombie/town_centers/savanna_meeting_point_2.json index d3f3121c..3f520ca2 100644 --- a/jigsaw-pieces/village/savanna/zombie/town_centers/savanna_meeting_point_2.json +++ b/jigsaw-pieces/village/savanna/zombie/town_centers/savanna_meeting_point_2.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/town_centers/savanna_meeting_point_2" + "object": "village/savanna/villagezombie/town_centers/savanna_meeting_point_2" } diff --git a/jigsaw-pieces/village/savanna/zombie/town_centers/savanna_meeting_point_3.json b/jigsaw-pieces/village/savanna/zombie/town_centers/savanna_meeting_point_3.json index cddf1b33..9d9a031f 100644 --- a/jigsaw-pieces/village/savanna/zombie/town_centers/savanna_meeting_point_3.json +++ b/jigsaw-pieces/village/savanna/zombie/town_centers/savanna_meeting_point_3.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/town_centers/savanna_meeting_point_3" + "object": "village/savanna/villagezombie/town_centers/savanna_meeting_point_3" } diff --git a/jigsaw-pieces/village/savanna/zombie/town_centers/savanna_meeting_point_4.json b/jigsaw-pieces/village/savanna/zombie/town_centers/savanna_meeting_point_4.json index 2b0a3fe0..81034d10 100644 --- a/jigsaw-pieces/village/savanna/zombie/town_centers/savanna_meeting_point_4.json +++ b/jigsaw-pieces/village/savanna/zombie/town_centers/savanna_meeting_point_4.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/town_centers/savanna_meeting_point_4" + "object": "village/savanna/villagezombie/town_centers/savanna_meeting_point_4" } diff --git a/jigsaw-pieces/village/savanna/zombie/villagers/nitwit.json b/jigsaw-pieces/village/savanna/zombie/villagers/nitwit.json index 4ecc9aa7..f56e2024 100644 --- a/jigsaw-pieces/village/savanna/zombie/villagers/nitwit.json +++ b/jigsaw-pieces/village/savanna/zombie/villagers/nitwit.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/villagers/nitwit" + "object": "village/savanna/villagezombie/villagers/nitwit" } diff --git a/jigsaw-pieces/village/savanna/zombie/villagers/unemployed.json b/jigsaw-pieces/village/savanna/zombie/villagers/unemployed.json index 25aa612e..ceae3eb2 100644 --- a/jigsaw-pieces/village/savanna/zombie/villagers/unemployed.json +++ b/jigsaw-pieces/village/savanna/zombie/villagers/unemployed.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/savanna/villagezombie/villagers/unemployed" + "object": "village/savanna/villagezombie/villagers/unemployed" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_animal_pen_1.json b/jigsaw-pieces/village/snowy/houses/snowy_animal_pen_1.json index feb03f3d..f303a68c 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_animal_pen_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_animal_pen_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_animal_pen_1" + "object": "village/snowy/houses/snowy_animal_pen_1" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_animal_pen_2.json b/jigsaw-pieces/village/snowy/houses/snowy_animal_pen_2.json index 58031fd1..0d4b7426 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_animal_pen_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_animal_pen_2.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_animal_pen_2" + "object": "village/snowy/houses/snowy_animal_pen_2" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_armorer_house_1.json b/jigsaw-pieces/village/snowy/houses/snowy_armorer_house_1.json index 071c9230..a019ae06 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_armorer_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_armorer_house_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_armorer_house_1" + "object": "village/snowy/houses/snowy_armorer_house_1" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_armorer_house_2.json b/jigsaw-pieces/village/snowy/houses/snowy_armorer_house_2.json index cda51775..969f407a 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_armorer_house_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_armorer_house_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_armorer_house_2" + "object": "village/snowy/houses/snowy_armorer_house_2" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_butchers_shop_1.json b/jigsaw-pieces/village/snowy/houses/snowy_butchers_shop_1.json index 645932e9..8b757689 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_butchers_shop_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_butchers_shop_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_butchers_shop_1" + "object": "village/snowy/houses/snowy_butchers_shop_1" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_butchers_shop_2.json b/jigsaw-pieces/village/snowy/houses/snowy_butchers_shop_2.json index ce546aca..d0ecb974 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_butchers_shop_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_butchers_shop_2.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_butchers_shop_2" + "object": "village/snowy/houses/snowy_butchers_shop_2" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_cartographer_house_1.json b/jigsaw-pieces/village/snowy/houses/snowy_cartographer_house_1.json index 92e2a753..0d9de6c2 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_cartographer_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_cartographer_house_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_cartographer_house_1" + "object": "village/snowy/houses/snowy_cartographer_house_1" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_farm_1.json b/jigsaw-pieces/village/snowy/houses/snowy_farm_1.json index 1f59b697..fa7c63aa 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_farm_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_farm_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_farm_1" + "object": "village/snowy/houses/snowy_farm_1" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_farm_2.json b/jigsaw-pieces/village/snowy/houses/snowy_farm_2.json index cbc13ac0..2a61fda4 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_farm_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_farm_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_farm_2" + "object": "village/snowy/houses/snowy_farm_2" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_fisher_cottage.json b/jigsaw-pieces/village/snowy/houses/snowy_fisher_cottage.json index 84ff96d5..9fcc1dfc 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_fisher_cottage.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_fisher_cottage.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_fisher_cottage" + "object": "village/snowy/houses/snowy_fisher_cottage" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_fletcher_house_1.json b/jigsaw-pieces/village/snowy/houses/snowy_fletcher_house_1.json index 527c651c..278bf434 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_fletcher_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_fletcher_house_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_fletcher_house_1" + "object": "village/snowy/houses/snowy_fletcher_house_1" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_library_1.json b/jigsaw-pieces/village/snowy/houses/snowy_library_1.json index 6a0abda5..52094742 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_library_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_library_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_library_1" + "object": "village/snowy/houses/snowy_library_1" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_masons_house_1.json b/jigsaw-pieces/village/snowy/houses/snowy_masons_house_1.json index e3c88824..8ee15c89 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_masons_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_masons_house_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_masons_house_1" + "object": "village/snowy/houses/snowy_masons_house_1" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_masons_house_2.json b/jigsaw-pieces/village/snowy/houses/snowy_masons_house_2.json index eab5154d..91231954 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_masons_house_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_masons_house_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_masons_house_2" + "object": "village/snowy/houses/snowy_masons_house_2" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_1.json b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_1.json index 6c455734..cede836d 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_1.json @@ -100,5 +100,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_medium_house_1" + "object": "village/snowy/houses/snowy_medium_house_1" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_2.json b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_2.json index 5e2b705a..8deccfb9 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_2.json @@ -100,5 +100,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_medium_house_2" + "object": "village/snowy/houses/snowy_medium_house_2" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_3.json b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_3.json index 2f66b275..92ba5e13 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_medium_house_3.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_medium_house_3.json @@ -100,5 +100,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_medium_house_3" + "object": "village/snowy/houses/snowy_medium_house_3" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_shepherds_house_1.json b/jigsaw-pieces/village/snowy/houses/snowy_shepherds_house_1.json index 4287e1de..f5702de3 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_shepherds_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_shepherds_house_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_shepherds_house_1" + "object": "village/snowy/houses/snowy_shepherds_house_1" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_small_house_1.json b/jigsaw-pieces/village/snowy/houses/snowy_small_house_1.json index 7f38cc83..da0075c3 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_1.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_small_house_1" + "object": "village/snowy/houses/snowy_small_house_1" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_small_house_2.json b/jigsaw-pieces/village/snowy/houses/snowy_small_house_2.json index 009c663c..3c954de0 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_2.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_2.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_small_house_2" + "object": "village/snowy/houses/snowy_small_house_2" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_small_house_3.json b/jigsaw-pieces/village/snowy/houses/snowy_small_house_3.json index ffe8258b..15fa4aa4 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_3.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_3.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_small_house_3" + "object": "village/snowy/houses/snowy_small_house_3" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_small_house_4.json b/jigsaw-pieces/village/snowy/houses/snowy_small_house_4.json index fe889334..74b4e4a8 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_4.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_4.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_small_house_4" + "object": "village/snowy/houses/snowy_small_house_4" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_small_house_5.json b/jigsaw-pieces/village/snowy/houses/snowy_small_house_5.json index ed8052c9..f6c6fef2 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_5.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_5.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_small_house_5" + "object": "village/snowy/houses/snowy_small_house_5" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_small_house_6.json b/jigsaw-pieces/village/snowy/houses/snowy_small_house_6.json index 416ab283..8409cfc7 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_6.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_6.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_small_house_6" + "object": "village/snowy/houses/snowy_small_house_6" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_small_house_7.json b/jigsaw-pieces/village/snowy/houses/snowy_small_house_7.json index 8668389d..56464654 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_7.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_7.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_small_house_7" + "object": "village/snowy/houses/snowy_small_house_7" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_small_house_8.json b/jigsaw-pieces/village/snowy/houses/snowy_small_house_8.json index c3026650..dd265b52 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_small_house_8.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_small_house_8.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_small_house_8" + "object": "village/snowy/houses/snowy_small_house_8" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_tannery_1.json b/jigsaw-pieces/village/snowy/houses/snowy_tannery_1.json index f32d5046..5e2c3051 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_tannery_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_tannery_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_tannery_1" + "object": "village/snowy/houses/snowy_tannery_1" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_temple_1.json b/jigsaw-pieces/village/snowy/houses/snowy_temple_1.json index c765d0a7..b1b4bcfc 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_temple_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_temple_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_temple_1" + "object": "village/snowy/houses/snowy_temple_1" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_tool_smith_1.json b/jigsaw-pieces/village/snowy/houses/snowy_tool_smith_1.json index 04884b98..4863ebda 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_tool_smith_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_tool_smith_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_tool_smith_1" + "object": "village/snowy/houses/snowy_tool_smith_1" } diff --git a/jigsaw-pieces/village/snowy/houses/snowy_weapon_smith_1.json b/jigsaw-pieces/village/snowy/houses/snowy_weapon_smith_1.json index ae079acd..c72dc0e1 100644 --- a/jigsaw-pieces/village/snowy/houses/snowy_weapon_smith_1.json +++ b/jigsaw-pieces/village/snowy/houses/snowy_weapon_smith_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/houses/snowy_weapon_smith_1" + "object": "village/snowy/houses/snowy_weapon_smith_1" } diff --git a/jigsaw-pieces/village/snowy/snowy_lamp_post_01.json b/jigsaw-pieces/village/snowy/snowy_lamp_post_01.json index 2f67f4a6..710469fe 100644 --- a/jigsaw-pieces/village/snowy/snowy_lamp_post_01.json +++ b/jigsaw-pieces/village/snowy/snowy_lamp_post_01.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/snowy_lamp_post_01" + "object": "village/snowy/snowy_lamp_post_01" } diff --git a/jigsaw-pieces/village/snowy/snowy_lamp_post_02.json b/jigsaw-pieces/village/snowy/snowy_lamp_post_02.json index 84ce16de..de820a17 100644 --- a/jigsaw-pieces/village/snowy/snowy_lamp_post_02.json +++ b/jigsaw-pieces/village/snowy/snowy_lamp_post_02.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/snowy_lamp_post_02" + "object": "village/snowy/snowy_lamp_post_02" } diff --git a/jigsaw-pieces/village/snowy/snowy_lamp_post_03.json b/jigsaw-pieces/village/snowy/snowy_lamp_post_03.json index 771522f3..2a69c8b1 100644 --- a/jigsaw-pieces/village/snowy/snowy_lamp_post_03.json +++ b/jigsaw-pieces/village/snowy/snowy_lamp_post_03.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/snowy_lamp_post_03" + "object": "village/snowy/snowy_lamp_post_03" } diff --git a/jigsaw-pieces/village/snowy/streets/corner_01.json b/jigsaw-pieces/village/snowy/streets/corner_01.json index 6c05953a..eea8caa0 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_01.json +++ b/jigsaw-pieces/village/snowy/streets/corner_01.json @@ -191,5 +191,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/corner_01" + "object": "village/snowy/streets/corner_01" } diff --git a/jigsaw-pieces/village/snowy/streets/corner_02.json b/jigsaw-pieces/village/snowy/streets/corner_02.json index dd9563e7..7ead99b3 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_02.json +++ b/jigsaw-pieces/village/snowy/streets/corner_02.json @@ -113,5 +113,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/corner_02" + "object": "village/snowy/streets/corner_02" } diff --git a/jigsaw-pieces/village/snowy/streets/corner_03.json b/jigsaw-pieces/village/snowy/streets/corner_03.json index 2396efb5..f9538ed5 100644 --- a/jigsaw-pieces/village/snowy/streets/corner_03.json +++ b/jigsaw-pieces/village/snowy/streets/corner_03.json @@ -100,5 +100,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/corner_03" + "object": "village/snowy/streets/corner_03" } diff --git a/jigsaw-pieces/village/snowy/streets/crossroad_01.json b/jigsaw-pieces/village/snowy/streets/crossroad_01.json index d142ffd3..dd51dce1 100644 --- a/jigsaw-pieces/village/snowy/streets/crossroad_01.json +++ b/jigsaw-pieces/village/snowy/streets/crossroad_01.json @@ -228,5 +228,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/crossroad_01" + "object": "village/snowy/streets/crossroad_01" } diff --git a/jigsaw-pieces/village/snowy/streets/crossroad_02.json b/jigsaw-pieces/village/snowy/streets/crossroad_02.json index fa0e3023..eee7a8db 100644 --- a/jigsaw-pieces/village/snowy/streets/crossroad_02.json +++ b/jigsaw-pieces/village/snowy/streets/crossroad_02.json @@ -176,5 +176,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/crossroad_02" + "object": "village/snowy/streets/crossroad_02" } diff --git a/jigsaw-pieces/village/snowy/streets/crossroad_03.json b/jigsaw-pieces/village/snowy/streets/crossroad_03.json index 35ead3d7..2acaf5a6 100644 --- a/jigsaw-pieces/village/snowy/streets/crossroad_03.json +++ b/jigsaw-pieces/village/snowy/streets/crossroad_03.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/crossroad_03" + "object": "village/snowy/streets/crossroad_03" } diff --git a/jigsaw-pieces/village/snowy/streets/crossroad_04.json b/jigsaw-pieces/village/snowy/streets/crossroad_04.json index c2353a5d..482dc49b 100644 --- a/jigsaw-pieces/village/snowy/streets/crossroad_04.json +++ b/jigsaw-pieces/village/snowy/streets/crossroad_04.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/crossroad_04" + "object": "village/snowy/streets/crossroad_04" } diff --git a/jigsaw-pieces/village/snowy/streets/crossroad_05.json b/jigsaw-pieces/village/snowy/streets/crossroad_05.json index 4bdeb83d..7a7b2f51 100644 --- a/jigsaw-pieces/village/snowy/streets/crossroad_05.json +++ b/jigsaw-pieces/village/snowy/streets/crossroad_05.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/crossroad_05" + "object": "village/snowy/streets/crossroad_05" } diff --git a/jigsaw-pieces/village/snowy/streets/crossroad_06.json b/jigsaw-pieces/village/snowy/streets/crossroad_06.json index 6f1b7ef2..cd0877ef 100644 --- a/jigsaw-pieces/village/snowy/streets/crossroad_06.json +++ b/jigsaw-pieces/village/snowy/streets/crossroad_06.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/crossroad_06" + "object": "village/snowy/streets/crossroad_06" } diff --git a/jigsaw-pieces/village/snowy/streets/square_01.json b/jigsaw-pieces/village/snowy/streets/square_01.json index 9ed48b6e..b5f6c844 100644 --- a/jigsaw-pieces/village/snowy/streets/square_01.json +++ b/jigsaw-pieces/village/snowy/streets/square_01.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/square_01" + "object": "village/snowy/streets/square_01" } diff --git a/jigsaw-pieces/village/snowy/streets/straight_01.json b/jigsaw-pieces/village/snowy/streets/straight_01.json index 5a248144..a54206a6 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_01.json +++ b/jigsaw-pieces/village/snowy/streets/straight_01.json @@ -165,5 +165,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/straight_01" + "object": "village/snowy/streets/straight_01" } diff --git a/jigsaw-pieces/village/snowy/streets/straight_02.json b/jigsaw-pieces/village/snowy/streets/straight_02.json index 155194da..bc01350b 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_02.json +++ b/jigsaw-pieces/village/snowy/streets/straight_02.json @@ -113,5 +113,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/straight_02" + "object": "village/snowy/streets/straight_02" } diff --git a/jigsaw-pieces/village/snowy/streets/straight_03.json b/jigsaw-pieces/village/snowy/streets/straight_03.json index 83030311..c7bc9434 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_03.json +++ b/jigsaw-pieces/village/snowy/streets/straight_03.json @@ -191,5 +191,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/straight_03" + "object": "village/snowy/streets/straight_03" } diff --git a/jigsaw-pieces/village/snowy/streets/straight_04.json b/jigsaw-pieces/village/snowy/streets/straight_04.json index c8d4105f..c984dc4b 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_04.json +++ b/jigsaw-pieces/village/snowy/streets/straight_04.json @@ -139,5 +139,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/straight_04" + "object": "village/snowy/streets/straight_04" } diff --git a/jigsaw-pieces/village/snowy/streets/straight_06.json b/jigsaw-pieces/village/snowy/streets/straight_06.json index bc7181a5..8166638b 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_06.json +++ b/jigsaw-pieces/village/snowy/streets/straight_06.json @@ -321,5 +321,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/straight_06" + "object": "village/snowy/streets/straight_06" } diff --git a/jigsaw-pieces/village/snowy/streets/straight_08.json b/jigsaw-pieces/village/snowy/streets/straight_08.json index 67f75c3b..520800fa 100644 --- a/jigsaw-pieces/village/snowy/streets/straight_08.json +++ b/jigsaw-pieces/village/snowy/streets/straight_08.json @@ -178,5 +178,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/straight_08" + "object": "village/snowy/streets/straight_08" } diff --git a/jigsaw-pieces/village/snowy/streets/turn_01.json b/jigsaw-pieces/village/snowy/streets/turn_01.json index c7d59299..bd0317a5 100644 --- a/jigsaw-pieces/village/snowy/streets/turn_01.json +++ b/jigsaw-pieces/village/snowy/streets/turn_01.json @@ -139,5 +139,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/streets/turn_01" + "object": "village/snowy/streets/turn_01" } diff --git a/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_1.json b/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_1.json index 744d825b..44439ba5 100644 --- a/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_1.json +++ b/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_1.json @@ -217,5 +217,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/town_centers/snowy_meeting_point_1" + "object": "village/snowy/town_centers/snowy_meeting_point_1" } diff --git a/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_2.json b/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_2.json index e9524102..ba64c8a6 100644 --- a/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_2.json +++ b/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_2.json @@ -178,5 +178,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/town_centers/snowy_meeting_point_2" + "object": "village/snowy/town_centers/snowy_meeting_point_2" } diff --git a/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_3.json b/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_3.json index 58f636da..de045651 100644 --- a/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_3.json +++ b/jigsaw-pieces/village/snowy/town_centers/snowy_meeting_point_3.json @@ -178,5 +178,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/town_centers/snowy_meeting_point_3" + "object": "village/snowy/town_centers/snowy_meeting_point_3" } diff --git a/jigsaw-pieces/village/snowy/villagers/baby.json b/jigsaw-pieces/village/snowy/villagers/baby.json index 1a934956..09ec6a2d 100644 --- a/jigsaw-pieces/village/snowy/villagers/baby.json +++ b/jigsaw-pieces/village/snowy/villagers/baby.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/villagers/baby" + "object": "village/snowy/villagers/baby" } diff --git a/jigsaw-pieces/village/snowy/villagers/nitwit.json b/jigsaw-pieces/village/snowy/villagers/nitwit.json index a93292fa..3c6d0db5 100644 --- a/jigsaw-pieces/village/snowy/villagers/nitwit.json +++ b/jigsaw-pieces/village/snowy/villagers/nitwit.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/villagers/nitwit" + "object": "village/snowy/villagers/nitwit" } diff --git a/jigsaw-pieces/village/snowy/villagers/unemployed.json b/jigsaw-pieces/village/snowy/villagers/unemployed.json index 0be358f3..0617e4b3 100644 --- a/jigsaw-pieces/village/snowy/villagers/unemployed.json +++ b/jigsaw-pieces/village/snowy/villagers/unemployed.json @@ -76,5 +76,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/villagers/unemployed" + "object": "village/snowy/villagers/unemployed" } diff --git a/jigsaw-pieces/village/snowy/zombie/houses/snowy_medium_house_1.json b/jigsaw-pieces/village/snowy/zombie/houses/snowy_medium_house_1.json index 448df648..79af30f7 100644 --- a/jigsaw-pieces/village/snowy/zombie/houses/snowy_medium_house_1.json +++ b/jigsaw-pieces/village/snowy/zombie/houses/snowy_medium_house_1.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/houses/snowy_medium_house_1" + "object": "village/snowy/zombie/houses/snowy_medium_house_1" } diff --git a/jigsaw-pieces/village/snowy/zombie/houses/snowy_medium_house_2.json b/jigsaw-pieces/village/snowy/zombie/houses/snowy_medium_house_2.json index e3bc7d33..d4672737 100644 --- a/jigsaw-pieces/village/snowy/zombie/houses/snowy_medium_house_2.json +++ b/jigsaw-pieces/village/snowy/zombie/houses/snowy_medium_house_2.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/houses/snowy_medium_house_2" + "object": "village/snowy/zombie/houses/snowy_medium_house_2" } diff --git a/jigsaw-pieces/village/snowy/zombie/houses/snowy_medium_house_3.json b/jigsaw-pieces/village/snowy/zombie/houses/snowy_medium_house_3.json index 41551438..edf3ae02 100644 --- a/jigsaw-pieces/village/snowy/zombie/houses/snowy_medium_house_3.json +++ b/jigsaw-pieces/village/snowy/zombie/houses/snowy_medium_house_3.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/houses/snowy_medium_house_3" + "object": "village/snowy/zombie/houses/snowy_medium_house_3" } diff --git a/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_1.json b/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_1.json index 44dab0c3..b0956928 100644 --- a/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_1.json +++ b/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/houses/snowy_small_house_1" + "object": "village/snowy/zombie/houses/snowy_small_house_1" } diff --git a/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_2.json b/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_2.json index bc7ae4b4..84e2e479 100644 --- a/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_2.json +++ b/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_2.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/houses/snowy_small_house_2" + "object": "village/snowy/zombie/houses/snowy_small_house_2" } diff --git a/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_3.json b/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_3.json index fbec6c39..a82dfaea 100644 --- a/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_3.json +++ b/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_3.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/houses/snowy_small_house_3" + "object": "village/snowy/zombie/houses/snowy_small_house_3" } diff --git a/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_4.json b/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_4.json index 596fb293..36ec8623 100644 --- a/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_4.json +++ b/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_4.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/houses/snowy_small_house_4" + "object": "village/snowy/zombie/houses/snowy_small_house_4" } diff --git a/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_5.json b/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_5.json index 232545a6..d83896f1 100644 --- a/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_5.json +++ b/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_5.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/houses/snowy_small_house_5" + "object": "village/snowy/zombie/houses/snowy_small_house_5" } diff --git a/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_6.json b/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_6.json index b5b0a05c..91e72a0e 100644 --- a/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_6.json +++ b/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_6.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/houses/snowy_small_house_6" + "object": "village/snowy/zombie/houses/snowy_small_house_6" } diff --git a/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_7.json b/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_7.json index 679581ec..874f1821 100644 --- a/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_7.json +++ b/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_7.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/houses/snowy_small_house_7" + "object": "village/snowy/zombie/houses/snowy_small_house_7" } diff --git a/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_8.json b/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_8.json index be22de99..98ea9169 100644 --- a/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_8.json +++ b/jigsaw-pieces/village/snowy/zombie/houses/snowy_small_house_8.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/houses/snowy_small_house_8" + "object": "village/snowy/zombie/houses/snowy_small_house_8" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/corner_01.json b/jigsaw-pieces/village/snowy/zombie/streets/corner_01.json index cd70c8e2..be1b762d 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/corner_01.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/corner_01.json @@ -176,5 +176,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/corner_01" + "object": "village/snowy/zombie/streets/corner_01" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/corner_02.json b/jigsaw-pieces/village/snowy/zombie/streets/corner_02.json index 72f4b588..4de43039 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/corner_02.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/corner_02.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/corner_02" + "object": "village/snowy/zombie/streets/corner_02" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/corner_03.json b/jigsaw-pieces/village/snowy/zombie/streets/corner_03.json index 82fb2353..8378783d 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/corner_03.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/corner_03.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/corner_03" + "object": "village/snowy/zombie/streets/corner_03" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/crossroad_01.json b/jigsaw-pieces/village/snowy/zombie/streets/crossroad_01.json index 9db98e2e..35ed4494 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/crossroad_01.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/crossroad_01.json @@ -228,5 +228,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/crossroad_01" + "object": "village/snowy/zombie/streets/crossroad_01" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/crossroad_02.json b/jigsaw-pieces/village/snowy/zombie/streets/crossroad_02.json index bb6f72b5..11903f3e 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/crossroad_02.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/crossroad_02.json @@ -176,5 +176,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/crossroad_02" + "object": "village/snowy/zombie/streets/crossroad_02" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/crossroad_03.json b/jigsaw-pieces/village/snowy/zombie/streets/crossroad_03.json index 66f959b2..023d02e4 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/crossroad_03.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/crossroad_03.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/crossroad_03" + "object": "village/snowy/zombie/streets/crossroad_03" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/crossroad_04.json b/jigsaw-pieces/village/snowy/zombie/streets/crossroad_04.json index c5a9cc20..e027eda7 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/crossroad_04.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/crossroad_04.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/crossroad_04" + "object": "village/snowy/zombie/streets/crossroad_04" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/crossroad_05.json b/jigsaw-pieces/village/snowy/zombie/streets/crossroad_05.json index 095e8436..1bcd30c8 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/crossroad_05.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/crossroad_05.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/crossroad_05" + "object": "village/snowy/zombie/streets/crossroad_05" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/crossroad_06.json b/jigsaw-pieces/village/snowy/zombie/streets/crossroad_06.json index b10d7810..cee1ecfb 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/crossroad_06.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/crossroad_06.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/crossroad_06" + "object": "village/snowy/zombie/streets/crossroad_06" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/square_01.json b/jigsaw-pieces/village/snowy/zombie/streets/square_01.json index 728312d9..ec5c2a6c 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/square_01.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/square_01.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/square_01" + "object": "village/snowy/zombie/streets/square_01" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/straight_01.json b/jigsaw-pieces/village/snowy/zombie/streets/straight_01.json index 0a6d9c32..d873ed68 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/straight_01.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/straight_01.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/straight_01" + "object": "village/snowy/zombie/streets/straight_01" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/straight_02.json b/jigsaw-pieces/village/snowy/zombie/streets/straight_02.json index 9cb7e13e..85990f73 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/straight_02.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/straight_02.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/straight_02" + "object": "village/snowy/zombie/streets/straight_02" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/straight_03.json b/jigsaw-pieces/village/snowy/zombie/streets/straight_03.json index 6f7e6334..e74e4ec8 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/straight_03.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/straight_03.json @@ -176,5 +176,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/straight_03" + "object": "village/snowy/zombie/streets/straight_03" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/straight_04.json b/jigsaw-pieces/village/snowy/zombie/streets/straight_04.json index 221efae3..5865dadf 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/straight_04.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/straight_04.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/straight_04" + "object": "village/snowy/zombie/streets/straight_04" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/straight_06.json b/jigsaw-pieces/village/snowy/zombie/streets/straight_06.json index 6ad7a2ee..af2ead41 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/straight_06.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/straight_06.json @@ -306,5 +306,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/straight_06" + "object": "village/snowy/zombie/streets/straight_06" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/straight_08.json b/jigsaw-pieces/village/snowy/zombie/streets/straight_08.json index caeb6af1..a783d0ab 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/straight_08.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/straight_08.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/straight_08" + "object": "village/snowy/zombie/streets/straight_08" } diff --git a/jigsaw-pieces/village/snowy/zombie/streets/turn_01.json b/jigsaw-pieces/village/snowy/zombie/streets/turn_01.json index 5fb233b4..56a7f2eb 100644 --- a/jigsaw-pieces/village/snowy/zombie/streets/turn_01.json +++ b/jigsaw-pieces/village/snowy/zombie/streets/turn_01.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/streets/turn_01" + "object": "village/snowy/zombie/streets/turn_01" } diff --git a/jigsaw-pieces/village/snowy/zombie/town_centers/snowy_meeting_point_1.json b/jigsaw-pieces/village/snowy/zombie/town_centers/snowy_meeting_point_1.json index 19159879..29ef0ed9 100644 --- a/jigsaw-pieces/village/snowy/zombie/town_centers/snowy_meeting_point_1.json +++ b/jigsaw-pieces/village/snowy/zombie/town_centers/snowy_meeting_point_1.json @@ -176,5 +176,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_1" + "object": "village/snowy/zombie/town_centers/snowy_meeting_point_1" } diff --git a/jigsaw-pieces/village/snowy/zombie/town_centers/snowy_meeting_point_2.json b/jigsaw-pieces/village/snowy/zombie/town_centers/snowy_meeting_point_2.json index 4926f1a5..0ae5cd48 100644 --- a/jigsaw-pieces/village/snowy/zombie/town_centers/snowy_meeting_point_2.json +++ b/jigsaw-pieces/village/snowy/zombie/town_centers/snowy_meeting_point_2.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_2" + "object": "village/snowy/zombie/town_centers/snowy_meeting_point_2" } diff --git a/jigsaw-pieces/village/snowy/zombie/town_centers/snowy_meeting_point_3.json b/jigsaw-pieces/village/snowy/zombie/town_centers/snowy_meeting_point_3.json index 7d091d04..0acada51 100644 --- a/jigsaw-pieces/village/snowy/zombie/town_centers/snowy_meeting_point_3.json +++ b/jigsaw-pieces/village/snowy/zombie/town_centers/snowy_meeting_point_3.json @@ -137,5 +137,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_3" + "object": "village/snowy/zombie/town_centers/snowy_meeting_point_3" } diff --git a/jigsaw-pieces/village/snowy/zombie/villagers/nitwit.json b/jigsaw-pieces/village/snowy/zombie/villagers/nitwit.json index 3347b9c6..77337e43 100644 --- a/jigsaw-pieces/village/snowy/zombie/villagers/nitwit.json +++ b/jigsaw-pieces/village/snowy/zombie/villagers/nitwit.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/villagers/nitwit" + "object": "village/snowy/zombie/villagers/nitwit" } diff --git a/jigsaw-pieces/village/snowy/zombie/villagers/unemployed.json b/jigsaw-pieces/village/snowy/zombie/villagers/unemployed.json index 3d0e0d77..aae611de 100644 --- a/jigsaw-pieces/village/snowy/zombie/villagers/unemployed.json +++ b/jigsaw-pieces/village/snowy/zombie/villagers/unemployed.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/snowy/zombie/villagers/unemployed" + "object": "village/snowy/zombie/villagers/unemployed" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_animal_pen_1.json b/jigsaw-pieces/village/taiga/houses/taiga_animal_pen_1.json index efb874d0..0f6ea9a0 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_animal_pen_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_animal_pen_1.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_animal_pen_1" + "object": "village/taiga/houses/taiga_animal_pen_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_armorer_2.json b/jigsaw-pieces/village/taiga/houses/taiga_armorer_2.json index 58b8b27b..2429b104 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_armorer_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_armorer_2.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_armorer_2" + "object": "village/taiga/houses/taiga_armorer_2" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_armorer_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_armorer_house_1.json index dbe1009f..7748b597 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_armorer_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_armorer_house_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_armorer_house_1" + "object": "village/taiga/houses/taiga_armorer_house_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_butcher_shop_1.json b/jigsaw-pieces/village/taiga/houses/taiga_butcher_shop_1.json index febd48d9..b9c3932d 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_butcher_shop_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_butcher_shop_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_butcher_shop_1" + "object": "village/taiga/houses/taiga_butcher_shop_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_cartographer_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_cartographer_house_1.json index b4dee98a..091dceb9 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_cartographer_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_cartographer_house_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_cartographer_house_1" + "object": "village/taiga/houses/taiga_cartographer_house_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_fisher_cottage_1.json b/jigsaw-pieces/village/taiga/houses/taiga_fisher_cottage_1.json index 44dcee75..b4274825 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_fisher_cottage_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_fisher_cottage_1.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_fisher_cottage_1" + "object": "village/taiga/houses/taiga_fisher_cottage_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_fletcher_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_fletcher_house_1.json index 8394d197..60cba3c3 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_fletcher_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_fletcher_house_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_fletcher_house_1" + "object": "village/taiga/houses/taiga_fletcher_house_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_large_farm_1.json b/jigsaw-pieces/village/taiga/houses/taiga_large_farm_1.json index ba63203a..32468008 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_large_farm_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_large_farm_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_large_farm_1" + "object": "village/taiga/houses/taiga_large_farm_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_large_farm_2.json b/jigsaw-pieces/village/taiga/houses/taiga_large_farm_2.json index 01687027..daa1d5a0 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_large_farm_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_large_farm_2.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_large_farm_2" + "object": "village/taiga/houses/taiga_large_farm_2" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_library_1.json b/jigsaw-pieces/village/taiga/houses/taiga_library_1.json index 96a4924d..0662f888 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_library_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_library_1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_library_1" + "object": "village/taiga/houses/taiga_library_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_masons_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_masons_house_1.json index 81ac063e..81935946 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_masons_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_masons_house_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_masons_house_1" + "object": "village/taiga/houses/taiga_masons_house_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json index 2608f554..3562dd21 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_1.json @@ -100,5 +100,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_medium_house_1" + "object": "village/taiga/houses/taiga_medium_house_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json index 2a920d6c..78b780c9 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_2.json @@ -100,5 +100,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_medium_house_2" + "object": "village/taiga/houses/taiga_medium_house_2" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json index 1b1fa342..6d4072f5 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_3.json @@ -126,5 +126,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_medium_house_3" + "object": "village/taiga/houses/taiga_medium_house_3" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json index d5913af9..81827632 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_medium_house_4.json @@ -100,5 +100,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_medium_house_4" + "object": "village/taiga/houses/taiga_medium_house_4" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_shepherds_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_shepherds_house_1.json index 4f7efc72..a676de83 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_shepherds_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_shepherds_house_1.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_shepherds_house_1" + "object": "village/taiga/houses/taiga_shepherds_house_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_farm_1.json b/jigsaw-pieces/village/taiga/houses/taiga_small_farm_1.json index 94753d20..ded8d3bf 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_farm_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_farm_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_small_farm_1" + "object": "village/taiga/houses/taiga_small_farm_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json b/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json index 573b88be..87f1fc57 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_1.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_small_house_1" + "object": "village/taiga/houses/taiga_small_house_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json b/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json index b41e5b1b..cd134950 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_2.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_small_house_2" + "object": "village/taiga/houses/taiga_small_house_2" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json b/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json index 4a39bbfb..2708132b 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_3.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_small_house_3" + "object": "village/taiga/houses/taiga_small_house_3" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json b/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json index b6ff9e07..fb77a40d 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_4.json @@ -99,5 +99,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_small_house_4" + "object": "village/taiga/houses/taiga_small_house_4" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json b/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json index 468c7946..9a684c93 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_small_house_5.json @@ -86,5 +86,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_small_house_5" + "object": "village/taiga/houses/taiga_small_house_5" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_tannery_1.json b/jigsaw-pieces/village/taiga/houses/taiga_tannery_1.json index c00cac47..5f52d40d 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_tannery_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_tannery_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_tannery_1" + "object": "village/taiga/houses/taiga_tannery_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_temple_1.json b/jigsaw-pieces/village/taiga/houses/taiga_temple_1.json index 21ac9035..887afeb1 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_temple_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_temple_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_temple_1" + "object": "village/taiga/houses/taiga_temple_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_tool_smith_1.json b/jigsaw-pieces/village/taiga/houses/taiga_tool_smith_1.json index 89c5848c..542edbda 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_tool_smith_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_tool_smith_1.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_tool_smith_1" + "object": "village/taiga/houses/taiga_tool_smith_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_1.json b/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_1.json index 36bee9e9..c6ba347f 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_1.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_weaponsmith_1" + "object": "village/taiga/houses/taiga_weaponsmith_1" } diff --git a/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_2.json b/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_2.json index 55d73a64..bd8941f7 100644 --- a/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_2.json +++ b/jigsaw-pieces/village/taiga/houses/taiga_weaponsmith_2.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/houses/taiga_weaponsmith_2" + "object": "village/taiga/houses/taiga_weaponsmith_2" } diff --git a/jigsaw-pieces/village/taiga/streets/corner_01.json b/jigsaw-pieces/village/taiga/streets/corner_01.json index aa5031db..f4e383d6 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_01.json +++ b/jigsaw-pieces/village/taiga/streets/corner_01.json @@ -188,5 +188,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/streets/corner_01" + "object": "village/taiga/streets/corner_01" } diff --git a/jigsaw-pieces/village/taiga/streets/corner_02.json b/jigsaw-pieces/village/taiga/streets/corner_02.json index 5e64ed61..6395d35f 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_02.json +++ b/jigsaw-pieces/village/taiga/streets/corner_02.json @@ -149,5 +149,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/streets/corner_02" + "object": "village/taiga/streets/corner_02" } diff --git a/jigsaw-pieces/village/taiga/streets/corner_03.json b/jigsaw-pieces/village/taiga/streets/corner_03.json index a8828f19..a147faf4 100644 --- a/jigsaw-pieces/village/taiga/streets/corner_03.json +++ b/jigsaw-pieces/village/taiga/streets/corner_03.json @@ -110,5 +110,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/streets/corner_03" + "object": "village/taiga/streets/corner_03" } diff --git a/jigsaw-pieces/village/taiga/streets/crossroad_01.json b/jigsaw-pieces/village/taiga/streets/crossroad_01.json index 1654950e..8f1c5ddd 100644 --- a/jigsaw-pieces/village/taiga/streets/crossroad_01.json +++ b/jigsaw-pieces/village/taiga/streets/crossroad_01.json @@ -238,5 +238,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/streets/crossroad_01" + "object": "village/taiga/streets/crossroad_01" } diff --git a/jigsaw-pieces/village/taiga/streets/crossroad_02.json b/jigsaw-pieces/village/taiga/streets/crossroad_02.json index a604a1d9..e730400f 100644 --- a/jigsaw-pieces/village/taiga/streets/crossroad_02.json +++ b/jigsaw-pieces/village/taiga/streets/crossroad_02.json @@ -186,5 +186,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/streets/crossroad_02" + "object": "village/taiga/streets/crossroad_02" } diff --git a/jigsaw-pieces/village/taiga/streets/crossroad_03.json b/jigsaw-pieces/village/taiga/streets/crossroad_03.json index 99dc4456..43b786b3 100644 --- a/jigsaw-pieces/village/taiga/streets/crossroad_03.json +++ b/jigsaw-pieces/village/taiga/streets/crossroad_03.json @@ -160,5 +160,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/streets/crossroad_03" + "object": "village/taiga/streets/crossroad_03" } diff --git a/jigsaw-pieces/village/taiga/streets/crossroad_04.json b/jigsaw-pieces/village/taiga/streets/crossroad_04.json index c08a5459..bd83f851 100644 --- a/jigsaw-pieces/village/taiga/streets/crossroad_04.json +++ b/jigsaw-pieces/village/taiga/streets/crossroad_04.json @@ -121,5 +121,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/streets/crossroad_04" + "object": "village/taiga/streets/crossroad_04" } diff --git a/jigsaw-pieces/village/taiga/streets/crossroad_05.json b/jigsaw-pieces/village/taiga/streets/crossroad_05.json index 1dd64e2d..13e9771f 100644 --- a/jigsaw-pieces/village/taiga/streets/crossroad_05.json +++ b/jigsaw-pieces/village/taiga/streets/crossroad_05.json @@ -121,5 +121,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/streets/crossroad_05" + "object": "village/taiga/streets/crossroad_05" } diff --git a/jigsaw-pieces/village/taiga/streets/crossroad_06.json b/jigsaw-pieces/village/taiga/streets/crossroad_06.json index cc47c883..882981d5 100644 --- a/jigsaw-pieces/village/taiga/streets/crossroad_06.json +++ b/jigsaw-pieces/village/taiga/streets/crossroad_06.json @@ -134,5 +134,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/streets/crossroad_06" + "object": "village/taiga/streets/crossroad_06" } diff --git a/jigsaw-pieces/village/taiga/streets/straight_01.json b/jigsaw-pieces/village/taiga/streets/straight_01.json index 7f6f1cc7..41b8f4e4 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_01.json +++ b/jigsaw-pieces/village/taiga/streets/straight_01.json @@ -175,5 +175,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/streets/straight_01" + "object": "village/taiga/streets/straight_01" } diff --git a/jigsaw-pieces/village/taiga/streets/straight_02.json b/jigsaw-pieces/village/taiga/streets/straight_02.json index 4e46cf82..b118ba96 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_02.json +++ b/jigsaw-pieces/village/taiga/streets/straight_02.json @@ -149,5 +149,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/streets/straight_02" + "object": "village/taiga/streets/straight_02" } diff --git a/jigsaw-pieces/village/taiga/streets/straight_03.json b/jigsaw-pieces/village/taiga/streets/straight_03.json index 8799588c..9af27a48 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_03.json +++ b/jigsaw-pieces/village/taiga/streets/straight_03.json @@ -175,5 +175,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/streets/straight_03" + "object": "village/taiga/streets/straight_03" } diff --git a/jigsaw-pieces/village/taiga/streets/straight_04.json b/jigsaw-pieces/village/taiga/streets/straight_04.json index 33b5e1fd..28947927 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_04.json +++ b/jigsaw-pieces/village/taiga/streets/straight_04.json @@ -136,5 +136,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/streets/straight_04" + "object": "village/taiga/streets/straight_04" } diff --git a/jigsaw-pieces/village/taiga/streets/straight_05.json b/jigsaw-pieces/village/taiga/streets/straight_05.json index 27c61769..a5110523 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_05.json +++ b/jigsaw-pieces/village/taiga/streets/straight_05.json @@ -188,5 +188,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/streets/straight_05" + "object": "village/taiga/streets/straight_05" } diff --git a/jigsaw-pieces/village/taiga/streets/straight_06.json b/jigsaw-pieces/village/taiga/streets/straight_06.json index acc54350..e407b58c 100644 --- a/jigsaw-pieces/village/taiga/streets/straight_06.json +++ b/jigsaw-pieces/village/taiga/streets/straight_06.json @@ -331,5 +331,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/streets/straight_06" + "object": "village/taiga/streets/straight_06" } diff --git a/jigsaw-pieces/village/taiga/streets/turn_01.json b/jigsaw-pieces/village/taiga/streets/turn_01.json index 7768a5fc..d2ef3513 100644 --- a/jigsaw-pieces/village/taiga/streets/turn_01.json +++ b/jigsaw-pieces/village/taiga/streets/turn_01.json @@ -136,5 +136,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/streets/turn_01" + "object": "village/taiga/streets/turn_01" } diff --git a/jigsaw-pieces/village/taiga/taiga_decoration_1.json b/jigsaw-pieces/village/taiga/taiga_decoration_1.json index 6f63870d..8abcf295 100644 --- a/jigsaw-pieces/village/taiga/taiga_decoration_1.json +++ b/jigsaw-pieces/village/taiga/taiga_decoration_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/taiga_decoration_1" + "object": "village/taiga/taiga_decoration_1" } diff --git a/jigsaw-pieces/village/taiga/taiga_decoration_2.json b/jigsaw-pieces/village/taiga/taiga_decoration_2.json index ab563101..8314f43c 100644 --- a/jigsaw-pieces/village/taiga/taiga_decoration_2.json +++ b/jigsaw-pieces/village/taiga/taiga_decoration_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/taiga_decoration_2" + "object": "village/taiga/taiga_decoration_2" } diff --git a/jigsaw-pieces/village/taiga/taiga_decoration_3.json b/jigsaw-pieces/village/taiga/taiga_decoration_3.json index bc8a6b5b..703340b9 100644 --- a/jigsaw-pieces/village/taiga/taiga_decoration_3.json +++ b/jigsaw-pieces/village/taiga/taiga_decoration_3.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/taiga_decoration_3" + "object": "village/taiga/taiga_decoration_3" } diff --git a/jigsaw-pieces/village/taiga/taiga_decoration_4.json b/jigsaw-pieces/village/taiga/taiga_decoration_4.json index e10e9981..3ce41684 100644 --- a/jigsaw-pieces/village/taiga/taiga_decoration_4.json +++ b/jigsaw-pieces/village/taiga/taiga_decoration_4.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/taiga_decoration_4" + "object": "village/taiga/taiga_decoration_4" } diff --git a/jigsaw-pieces/village/taiga/taiga_decoration_5.json b/jigsaw-pieces/village/taiga/taiga_decoration_5.json index f46bc7ed..e23c118a 100644 --- a/jigsaw-pieces/village/taiga/taiga_decoration_5.json +++ b/jigsaw-pieces/village/taiga/taiga_decoration_5.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/taiga_decoration_5" + "object": "village/taiga/taiga_decoration_5" } diff --git a/jigsaw-pieces/village/taiga/taiga_decoration_6.json b/jigsaw-pieces/village/taiga/taiga_decoration_6.json index 177d7aee..f6bedaa9 100644 --- a/jigsaw-pieces/village/taiga/taiga_decoration_6.json +++ b/jigsaw-pieces/village/taiga/taiga_decoration_6.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/taiga_decoration_6" + "object": "village/taiga/taiga_decoration_6" } diff --git a/jigsaw-pieces/village/taiga/taiga_lamp_post_1.json b/jigsaw-pieces/village/taiga/taiga_lamp_post_1.json index 32aa68b9..1ab1a2af 100644 --- a/jigsaw-pieces/village/taiga/taiga_lamp_post_1.json +++ b/jigsaw-pieces/village/taiga/taiga_lamp_post_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/taiga_lamp_post_1" + "object": "village/taiga/taiga_lamp_post_1" } diff --git a/jigsaw-pieces/village/taiga/town_centers/taiga_meeting_point_1.json b/jigsaw-pieces/village/taiga/town_centers/taiga_meeting_point_1.json index 06d3ebad..16367a20 100644 --- a/jigsaw-pieces/village/taiga/town_centers/taiga_meeting_point_1.json +++ b/jigsaw-pieces/village/taiga/town_centers/taiga_meeting_point_1.json @@ -296,5 +296,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/town_centers/taiga_meeting_point_1" + "object": "village/taiga/town_centers/taiga_meeting_point_1" } diff --git a/jigsaw-pieces/village/taiga/town_centers/taiga_meeting_point_2.json b/jigsaw-pieces/village/taiga/town_centers/taiga_meeting_point_2.json index 0004c1e4..e232f726 100644 --- a/jigsaw-pieces/village/taiga/town_centers/taiga_meeting_point_2.json +++ b/jigsaw-pieces/village/taiga/town_centers/taiga_meeting_point_2.json @@ -218,5 +218,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/town_centers/taiga_meeting_point_2" + "object": "village/taiga/town_centers/taiga_meeting_point_2" } diff --git a/jigsaw-pieces/village/taiga/villagers/baby.json b/jigsaw-pieces/village/taiga/villagers/baby.json index d9144ea6..c5144ac4 100644 --- a/jigsaw-pieces/village/taiga/villagers/baby.json +++ b/jigsaw-pieces/village/taiga/villagers/baby.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/villagers/baby" + "object": "village/taiga/villagers/baby" } diff --git a/jigsaw-pieces/village/taiga/villagers/nitwit.json b/jigsaw-pieces/village/taiga/villagers/nitwit.json index 41ad1f35..3a893b9a 100644 --- a/jigsaw-pieces/village/taiga/villagers/nitwit.json +++ b/jigsaw-pieces/village/taiga/villagers/nitwit.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/villagers/nitwit" + "object": "village/taiga/villagers/nitwit" } diff --git a/jigsaw-pieces/village/taiga/villagers/unemployed.json b/jigsaw-pieces/village/taiga/villagers/unemployed.json index f193030e..83daa186 100644 --- a/jigsaw-pieces/village/taiga/villagers/unemployed.json +++ b/jigsaw-pieces/village/taiga/villagers/unemployed.json @@ -76,5 +76,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/villagers/unemployed" + "object": "village/taiga/villagers/unemployed" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_cartographer_house_1.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_cartographer_house_1.json index 4bc32e76..a33bbeca 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_cartographer_house_1.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_cartographer_house_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_cartographer_house_1" + "object": "village/taiga/zombie/houses/taiga_cartographer_house_1" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_fisher_cottage_1.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_fisher_cottage_1.json index 3f54c20a..189cdd18 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_fisher_cottage_1.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_fisher_cottage_1.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_fisher_cottage_1" + "object": "village/taiga/zombie/houses/taiga_fisher_cottage_1" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_large_farm_2.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_large_farm_2.json index 109674ca..f59f2e1d 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_large_farm_2.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_large_farm_2.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_large_farm_2" + "object": "village/taiga/zombie/houses/taiga_large_farm_2" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_library_1.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_library_1.json index 7ff1b00c..b9a44ddc 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_library_1.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_library_1.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_library_1" + "object": "village/taiga/zombie/houses/taiga_library_1" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_medium_house_1.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_medium_house_1.json index eff2c955..5dd053fa 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_medium_house_1.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_medium_house_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_medium_house_1" + "object": "village/taiga/zombie/houses/taiga_medium_house_1" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_medium_house_2.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_medium_house_2.json index 0038e96e..32d43b38 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_medium_house_2.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_medium_house_2.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_medium_house_2" + "object": "village/taiga/zombie/houses/taiga_medium_house_2" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_medium_house_3.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_medium_house_3.json index 6e937fe4..4cd532c5 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_medium_house_3.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_medium_house_3.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_medium_house_3" + "object": "village/taiga/zombie/houses/taiga_medium_house_3" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_medium_house_4.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_medium_house_4.json index 240d31fc..aba5037d 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_medium_house_4.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_medium_house_4.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_medium_house_4" + "object": "village/taiga/zombie/houses/taiga_medium_house_4" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_shepherds_house_1.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_shepherds_house_1.json index d642cf25..50d25a24 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_shepherds_house_1.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_shepherds_house_1.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_shepherds_house_1" + "object": "village/taiga/zombie/houses/taiga_shepherds_house_1" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_1.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_1.json index d309d55d..b820fd57 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_1.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_1.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_small_house_1" + "object": "village/taiga/zombie/houses/taiga_small_house_1" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_2.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_2.json index c8a8fe8e..b3c2c2ce 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_2.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_2.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_small_house_2" + "object": "village/taiga/zombie/houses/taiga_small_house_2" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_3.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_3.json index 66c9c399..1d539f9e 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_3.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_3.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_small_house_3" + "object": "village/taiga/zombie/houses/taiga_small_house_3" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_4.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_4.json index d7b3584e..60ca97a1 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_4.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_4.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_small_house_4" + "object": "village/taiga/zombie/houses/taiga_small_house_4" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_5.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_5.json index fd5cb4e6..997e4961 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_5.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_small_house_5.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_small_house_5" + "object": "village/taiga/zombie/houses/taiga_small_house_5" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_temple_1.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_temple_1.json index 4b682bf5..11690df2 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_temple_1.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_temple_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_temple_1" + "object": "village/taiga/zombie/houses/taiga_temple_1" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_tool_smith_1.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_tool_smith_1.json index bd747793..15e0af3b 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_tool_smith_1.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_tool_smith_1.json @@ -98,5 +98,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_tool_smith_1" + "object": "village/taiga/zombie/houses/taiga_tool_smith_1" } diff --git a/jigsaw-pieces/village/taiga/zombie/houses/taiga_weaponsmith_2.json b/jigsaw-pieces/village/taiga/zombie/houses/taiga_weaponsmith_2.json index 4b69a7d2..7eb9b7ae 100644 --- a/jigsaw-pieces/village/taiga/zombie/houses/taiga_weaponsmith_2.json +++ b/jigsaw-pieces/village/taiga/zombie/houses/taiga_weaponsmith_2.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/houses/taiga_weaponsmith_2" + "object": "village/taiga/zombie/houses/taiga_weaponsmith_2" } diff --git a/jigsaw-pieces/village/taiga/zombie/streets/corner_01.json b/jigsaw-pieces/village/taiga/zombie/streets/corner_01.json index e7d358b8..208d16f3 100644 --- a/jigsaw-pieces/village/taiga/zombie/streets/corner_01.json +++ b/jigsaw-pieces/village/taiga/zombie/streets/corner_01.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/streets/corner_01" + "object": "village/taiga/zombie/streets/corner_01" } diff --git a/jigsaw-pieces/village/taiga/zombie/streets/corner_02.json b/jigsaw-pieces/village/taiga/zombie/streets/corner_02.json index 1ef0ec63..9a92a66b 100644 --- a/jigsaw-pieces/village/taiga/zombie/streets/corner_02.json +++ b/jigsaw-pieces/village/taiga/zombie/streets/corner_02.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/streets/corner_02" + "object": "village/taiga/zombie/streets/corner_02" } diff --git a/jigsaw-pieces/village/taiga/zombie/streets/corner_03.json b/jigsaw-pieces/village/taiga/zombie/streets/corner_03.json index 68e9f408..12f7fad4 100644 --- a/jigsaw-pieces/village/taiga/zombie/streets/corner_03.json +++ b/jigsaw-pieces/village/taiga/zombie/streets/corner_03.json @@ -85,5 +85,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/streets/corner_03" + "object": "village/taiga/zombie/streets/corner_03" } diff --git a/jigsaw-pieces/village/taiga/zombie/streets/crossroad_01.json b/jigsaw-pieces/village/taiga/zombie/streets/crossroad_01.json index 2321009d..e64e679a 100644 --- a/jigsaw-pieces/village/taiga/zombie/streets/crossroad_01.json +++ b/jigsaw-pieces/village/taiga/zombie/streets/crossroad_01.json @@ -228,5 +228,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/streets/crossroad_01" + "object": "village/taiga/zombie/streets/crossroad_01" } diff --git a/jigsaw-pieces/village/taiga/zombie/streets/crossroad_02.json b/jigsaw-pieces/village/taiga/zombie/streets/crossroad_02.json index f16036bd..682aa1a0 100644 --- a/jigsaw-pieces/village/taiga/zombie/streets/crossroad_02.json +++ b/jigsaw-pieces/village/taiga/zombie/streets/crossroad_02.json @@ -176,5 +176,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/streets/crossroad_02" + "object": "village/taiga/zombie/streets/crossroad_02" } diff --git a/jigsaw-pieces/village/taiga/zombie/streets/crossroad_03.json b/jigsaw-pieces/village/taiga/zombie/streets/crossroad_03.json index 26af48ff..48d1e451 100644 --- a/jigsaw-pieces/village/taiga/zombie/streets/crossroad_03.json +++ b/jigsaw-pieces/village/taiga/zombie/streets/crossroad_03.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/streets/crossroad_03" + "object": "village/taiga/zombie/streets/crossroad_03" } diff --git a/jigsaw-pieces/village/taiga/zombie/streets/crossroad_04.json b/jigsaw-pieces/village/taiga/zombie/streets/crossroad_04.json index 0f4813d7..5eee5db1 100644 --- a/jigsaw-pieces/village/taiga/zombie/streets/crossroad_04.json +++ b/jigsaw-pieces/village/taiga/zombie/streets/crossroad_04.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/streets/crossroad_04" + "object": "village/taiga/zombie/streets/crossroad_04" } diff --git a/jigsaw-pieces/village/taiga/zombie/streets/crossroad_05.json b/jigsaw-pieces/village/taiga/zombie/streets/crossroad_05.json index 9728a0e7..b23466f6 100644 --- a/jigsaw-pieces/village/taiga/zombie/streets/crossroad_05.json +++ b/jigsaw-pieces/village/taiga/zombie/streets/crossroad_05.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/streets/crossroad_05" + "object": "village/taiga/zombie/streets/crossroad_05" } diff --git a/jigsaw-pieces/village/taiga/zombie/streets/crossroad_06.json b/jigsaw-pieces/village/taiga/zombie/streets/crossroad_06.json index 161219ea..f9aaaad9 100644 --- a/jigsaw-pieces/village/taiga/zombie/streets/crossroad_06.json +++ b/jigsaw-pieces/village/taiga/zombie/streets/crossroad_06.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/streets/crossroad_06" + "object": "village/taiga/zombie/streets/crossroad_06" } diff --git a/jigsaw-pieces/village/taiga/zombie/streets/straight_01.json b/jigsaw-pieces/village/taiga/zombie/streets/straight_01.json index 4f0f5a02..2dd4a6fe 100644 --- a/jigsaw-pieces/village/taiga/zombie/streets/straight_01.json +++ b/jigsaw-pieces/village/taiga/zombie/streets/straight_01.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/streets/straight_01" + "object": "village/taiga/zombie/streets/straight_01" } diff --git a/jigsaw-pieces/village/taiga/zombie/streets/straight_02.json b/jigsaw-pieces/village/taiga/zombie/streets/straight_02.json index b6225290..d8b309a3 100644 --- a/jigsaw-pieces/village/taiga/zombie/streets/straight_02.json +++ b/jigsaw-pieces/village/taiga/zombie/streets/straight_02.json @@ -124,5 +124,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/streets/straight_02" + "object": "village/taiga/zombie/streets/straight_02" } diff --git a/jigsaw-pieces/village/taiga/zombie/streets/straight_03.json b/jigsaw-pieces/village/taiga/zombie/streets/straight_03.json index cd6d6b9a..6f431d41 100644 --- a/jigsaw-pieces/village/taiga/zombie/streets/straight_03.json +++ b/jigsaw-pieces/village/taiga/zombie/streets/straight_03.json @@ -150,5 +150,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/streets/straight_03" + "object": "village/taiga/zombie/streets/straight_03" } diff --git a/jigsaw-pieces/village/taiga/zombie/streets/straight_04.json b/jigsaw-pieces/village/taiga/zombie/streets/straight_04.json index a587db2d..e42812dc 100644 --- a/jigsaw-pieces/village/taiga/zombie/streets/straight_04.json +++ b/jigsaw-pieces/village/taiga/zombie/streets/straight_04.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/streets/straight_04" + "object": "village/taiga/zombie/streets/straight_04" } diff --git a/jigsaw-pieces/village/taiga/zombie/streets/straight_05.json b/jigsaw-pieces/village/taiga/zombie/streets/straight_05.json index d73eded0..c708b28a 100644 --- a/jigsaw-pieces/village/taiga/zombie/streets/straight_05.json +++ b/jigsaw-pieces/village/taiga/zombie/streets/straight_05.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/streets/straight_05" + "object": "village/taiga/zombie/streets/straight_05" } diff --git a/jigsaw-pieces/village/taiga/zombie/streets/straight_06.json b/jigsaw-pieces/village/taiga/zombie/streets/straight_06.json index aeb4bb1b..9f3af019 100644 --- a/jigsaw-pieces/village/taiga/zombie/streets/straight_06.json +++ b/jigsaw-pieces/village/taiga/zombie/streets/straight_06.json @@ -306,5 +306,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/streets/straight_06" + "object": "village/taiga/zombie/streets/straight_06" } diff --git a/jigsaw-pieces/village/taiga/zombie/streets/turn_01.json b/jigsaw-pieces/village/taiga/zombie/streets/turn_01.json index 904122ea..d1e06303 100644 --- a/jigsaw-pieces/village/taiga/zombie/streets/turn_01.json +++ b/jigsaw-pieces/village/taiga/zombie/streets/turn_01.json @@ -111,5 +111,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/streets/turn_01" + "object": "village/taiga/zombie/streets/turn_01" } diff --git a/jigsaw-pieces/village/taiga/zombie/town_centers/taiga_meeting_point_1.json b/jigsaw-pieces/village/taiga/zombie/town_centers/taiga_meeting_point_1.json index 32b8c1bd..78405671 100644 --- a/jigsaw-pieces/village/taiga/zombie/town_centers/taiga_meeting_point_1.json +++ b/jigsaw-pieces/village/taiga/zombie/town_centers/taiga_meeting_point_1.json @@ -241,5 +241,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/town_centers/taiga_meeting_point_1" + "object": "village/taiga/zombie/town_centers/taiga_meeting_point_1" } diff --git a/jigsaw-pieces/village/taiga/zombie/town_centers/taiga_meeting_point_2.json b/jigsaw-pieces/village/taiga/zombie/town_centers/taiga_meeting_point_2.json index 5b75b6c4..3a18a60f 100644 --- a/jigsaw-pieces/village/taiga/zombie/town_centers/taiga_meeting_point_2.json +++ b/jigsaw-pieces/village/taiga/zombie/town_centers/taiga_meeting_point_2.json @@ -163,5 +163,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/town_centers/taiga_meeting_point_2" + "object": "village/taiga/zombie/town_centers/taiga_meeting_point_2" } diff --git a/jigsaw-pieces/village/taiga/zombie/villagers/nitwit.json b/jigsaw-pieces/village/taiga/zombie/villagers/nitwit.json index f9b58b02..4d475439 100644 --- a/jigsaw-pieces/village/taiga/zombie/villagers/nitwit.json +++ b/jigsaw-pieces/village/taiga/zombie/villagers/nitwit.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/villagers/nitwit" + "object": "village/taiga/zombie/villagers/nitwit" } diff --git a/jigsaw-pieces/village/taiga/zombie/villagers/unemployed.json b/jigsaw-pieces/village/taiga/zombie/villagers/unemployed.json index 3df6076b..0c9b3704 100644 --- a/jigsaw-pieces/village/taiga/zombie/villagers/unemployed.json +++ b/jigsaw-pieces/village/taiga/zombie/villagers/unemployed.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/village/taiga/zombie/villagers/unemployed" + "object": "village/taiga/zombie/villagers/unemployed" } diff --git a/objects/structures/FloatIsle/f-1.iob b/objects/FloatIsle/f-1.iob similarity index 100% rename from objects/structures/FloatIsle/f-1.iob rename to objects/FloatIsle/f-1.iob diff --git a/objects/trees/acacia/denmyre1.iob b/objects/acacia-medium/acacia-denmyre-1.iob similarity index 100% rename from objects/trees/acacia/denmyre1.iob rename to objects/acacia-medium/acacia-denmyre-1.iob diff --git a/objects/trees/acacia/denmyre2.iob b/objects/acacia-medium/acacia-denmyre-10.iob similarity index 100% rename from objects/trees/acacia/denmyre2.iob rename to objects/acacia-medium/acacia-denmyre-10.iob diff --git a/objects/trees/acacia/denmyre3.iob b/objects/acacia-medium/acacia-denmyre-11.iob similarity index 100% rename from objects/trees/acacia/denmyre3.iob rename to objects/acacia-medium/acacia-denmyre-11.iob diff --git a/objects/trees/acacia/denmyre4.iob b/objects/acacia-medium/acacia-denmyre-12.iob similarity index 100% rename from objects/trees/acacia/denmyre4.iob rename to objects/acacia-medium/acacia-denmyre-12.iob diff --git a/objects/trees/acacia/denmyre5.iob b/objects/acacia-medium/acacia-denmyre-13.iob similarity index 100% rename from objects/trees/acacia/denmyre5.iob rename to objects/acacia-medium/acacia-denmyre-13.iob diff --git a/objects/trees/acacia/denmyre6.iob b/objects/acacia-medium/acacia-denmyre-14.iob similarity index 100% rename from objects/trees/acacia/denmyre6.iob rename to objects/acacia-medium/acacia-denmyre-14.iob diff --git a/objects/trees/acacia/denmyre7.iob b/objects/acacia-medium/acacia-denmyre-15.iob similarity index 100% rename from objects/trees/acacia/denmyre7.iob rename to objects/acacia-medium/acacia-denmyre-15.iob diff --git a/objects/trees/acacia/denmyre8.iob b/objects/acacia-medium/acacia-denmyre-16.iob similarity index 100% rename from objects/trees/acacia/denmyre8.iob rename to objects/acacia-medium/acacia-denmyre-16.iob diff --git a/objects/trees/acacia/denmyre9.iob b/objects/acacia-medium/acacia-denmyre-2.iob similarity index 100% rename from objects/trees/acacia/denmyre9.iob rename to objects/acacia-medium/acacia-denmyre-2.iob diff --git a/objects/trees/acacia/denmyre10.iob b/objects/acacia-medium/acacia-denmyre-3.iob similarity index 100% rename from objects/trees/acacia/denmyre10.iob rename to objects/acacia-medium/acacia-denmyre-3.iob diff --git a/objects/trees/acacia/denmyre11.iob b/objects/acacia-medium/acacia-denmyre-4.iob similarity index 100% rename from objects/trees/acacia/denmyre11.iob rename to objects/acacia-medium/acacia-denmyre-4.iob diff --git a/objects/trees/acacia/denmyre12.iob b/objects/acacia-medium/acacia-denmyre-5.iob similarity index 100% rename from objects/trees/acacia/denmyre12.iob rename to objects/acacia-medium/acacia-denmyre-5.iob diff --git a/objects/trees/acacia/denmyre13.iob b/objects/acacia-medium/acacia-denmyre-6.iob similarity index 100% rename from objects/trees/acacia/denmyre13.iob rename to objects/acacia-medium/acacia-denmyre-6.iob diff --git a/objects/trees/acacia/denmyre14.iob b/objects/acacia-medium/acacia-denmyre-7.iob similarity index 100% rename from objects/trees/acacia/denmyre14.iob rename to objects/acacia-medium/acacia-denmyre-7.iob diff --git a/objects/trees/acacia/denmyre15.iob b/objects/acacia-medium/acacia-denmyre-8.iob similarity index 100% rename from objects/trees/acacia/denmyre15.iob rename to objects/acacia-medium/acacia-denmyre-8.iob diff --git a/objects/trees/acacia/denmyre16.iob b/objects/acacia-medium/acacia-denmyre-9.iob similarity index 100% rename from objects/trees/acacia/denmyre16.iob rename to objects/acacia-medium/acacia-denmyre-9.iob diff --git a/objects/structures/amethyst/ame1.iob b/objects/amethyst/ame1.iob similarity index 100% rename from objects/structures/amethyst/ame1.iob rename to objects/amethyst/ame1.iob diff --git a/objects/structures/amethyst/ame2.iob b/objects/amethyst/ame2.iob similarity index 100% rename from objects/structures/amethyst/ame2.iob rename to objects/amethyst/ame2.iob diff --git a/objects/structures/amethyst/ame3.iob b/objects/amethyst/ame3.iob similarity index 100% rename from objects/structures/amethyst/ame3.iob rename to objects/amethyst/ame3.iob diff --git a/objects/structures/amethyst/ame4.iob b/objects/amethyst/ame4.iob similarity index 100% rename from objects/structures/amethyst/ame4.iob rename to objects/amethyst/ame4.iob diff --git a/objects/structures/amethyst/ame5.iob b/objects/amethyst/ame5.iob similarity index 100% rename from objects/structures/amethyst/ame5.iob rename to objects/amethyst/ame5.iob diff --git a/objects/structures/amethyst/ame6.iob b/objects/amethyst/ame6.iob similarity index 100% rename from objects/structures/amethyst/ame6.iob rename to objects/amethyst/ame6.iob diff --git a/objects/trees/birch/arid1.iob b/objects/arid-birch/arid-birch1.iob similarity index 100% rename from objects/trees/birch/arid1.iob rename to objects/arid-birch/arid-birch1.iob diff --git a/objects/trees/birch/arid2.iob b/objects/arid-birch/arid-birch2.iob similarity index 100% rename from objects/trees/birch/arid2.iob rename to objects/arid-birch/arid-birch2.iob diff --git a/objects/trees/birch/arid3.iob b/objects/arid-birch/arid-birch3.iob similarity index 100% rename from objects/trees/birch/arid3.iob rename to objects/arid-birch/arid-birch3.iob diff --git a/objects/trees/birch/arid4.iob b/objects/arid-birch/arid-birch4.iob similarity index 100% rename from objects/trees/birch/arid4.iob rename to objects/arid-birch/arid-birch4.iob diff --git a/objects/trees/birch/arid5.iob b/objects/arid-birch/arid-birch5.iob similarity index 100% rename from objects/trees/birch/arid5.iob rename to objects/arid-birch/arid-birch5.iob diff --git a/objects/trees/birch/arid6.iob b/objects/arid-birch/arid-birch6.iob similarity index 100% rename from objects/trees/birch/arid6.iob rename to objects/arid-birch/arid-birch6.iob diff --git a/objects/trees/birch/arid7.iob b/objects/arid-birch/arid-birch7.iob similarity index 100% rename from objects/trees/birch/arid7.iob rename to objects/arid-birch/arid-birch7.iob diff --git a/objects/trees/oak/arid1.iob b/objects/arid-oak/arid-oak1.iob similarity index 100% rename from objects/trees/oak/arid1.iob rename to objects/arid-oak/arid-oak1.iob diff --git a/objects/trees/oak/arid2.iob b/objects/arid-oak/arid-oak2.iob similarity index 100% rename from objects/trees/oak/arid2.iob rename to objects/arid-oak/arid-oak2.iob diff --git a/objects/trees/oak/arid3.iob b/objects/arid-oak/arid-oak3.iob similarity index 100% rename from objects/trees/oak/arid3.iob rename to objects/arid-oak/arid-oak3.iob diff --git a/objects/trees/oak/arid4.iob b/objects/arid-oak/arid-oak4.iob similarity index 100% rename from objects/trees/oak/arid4.iob rename to objects/arid-oak/arid-oak4.iob diff --git a/objects/trees/oak/arid5.iob b/objects/arid-oak/arid-oak5.iob similarity index 100% rename from objects/trees/oak/arid5.iob rename to objects/arid-oak/arid-oak5.iob diff --git a/objects/trees/oak/arid6.iob b/objects/arid-oak/arid-oak6.iob similarity index 100% rename from objects/trees/oak/arid6.iob rename to objects/arid-oak/arid-oak6.iob diff --git a/objects/trees/oak/arid7.iob b/objects/arid-oak/arid-oak7.iob similarity index 100% rename from objects/trees/oak/arid7.iob rename to objects/arid-oak/arid-oak7.iob diff --git a/objects/trees/spruce/aridpine1.iob b/objects/arid-pine/arid-pine1.iob similarity index 100% rename from objects/trees/spruce/aridpine1.iob rename to objects/arid-pine/arid-pine1.iob diff --git a/objects/trees/spruce/aridpine2.iob b/objects/arid-pine/arid-pine2.iob similarity index 100% rename from objects/trees/spruce/aridpine2.iob rename to objects/arid-pine/arid-pine2.iob diff --git a/objects/trees/spruce/aridpine3.iob b/objects/arid-pine/arid-pine3.iob similarity index 100% rename from objects/trees/spruce/aridpine3.iob rename to objects/arid-pine/arid-pine3.iob diff --git a/objects/trees/spruce/aridpine4.iob b/objects/arid-pine/arid-pine4.iob similarity index 100% rename from objects/trees/spruce/aridpine4.iob rename to objects/arid-pine/arid-pine4.iob diff --git a/objects/trees/spruce/aridpine5.iob b/objects/arid-pine/arid-pine5.iob similarity index 100% rename from objects/trees/spruce/aridpine5.iob rename to objects/arid-pine/arid-pine5.iob diff --git a/objects/trees/spruce/aridgeneric1.iob b/objects/arid-spruce/arid-spruce1.iob similarity index 100% rename from objects/trees/spruce/aridgeneric1.iob rename to objects/arid-spruce/arid-spruce1.iob diff --git a/objects/trees/spruce/aridgeneric2.iob b/objects/arid-spruce/arid-spruce2.iob similarity index 100% rename from objects/trees/spruce/aridgeneric2.iob rename to objects/arid-spruce/arid-spruce2.iob diff --git a/objects/trees/spruce/aridgeneric3.iob b/objects/arid-spruce/arid-spruce3.iob similarity index 100% rename from objects/trees/spruce/aridgeneric3.iob rename to objects/arid-spruce/arid-spruce3.iob diff --git a/objects/trees/spruce/aridgeneric4.iob b/objects/arid-spruce/arid-spruce4.iob similarity index 100% rename from objects/trees/spruce/aridgeneric4.iob rename to objects/arid-spruce/arid-spruce4.iob diff --git a/objects/trees/spruce/aridgeneric5.iob b/objects/arid-spruce/arid-spruce5.iob similarity index 100% rename from objects/trees/spruce/aridgeneric5.iob rename to objects/arid-spruce/arid-spruce5.iob diff --git a/objects/jigsaw/bastion/blocks/air.iob b/objects/bastion/blocks/air.iob similarity index 100% rename from objects/jigsaw/bastion/blocks/air.iob rename to objects/bastion/blocks/air.iob diff --git a/objects/jigsaw/bastion/blocks/gold.iob b/objects/bastion/blocks/gold.iob similarity index 100% rename from objects/jigsaw/bastion/blocks/gold.iob rename to objects/bastion/blocks/gold.iob diff --git a/objects/jigsaw/bastion/bridge/bridge_pieces/bridge.iob b/objects/bastion/bridge/bridge_pieces/bridge.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/bridge_pieces/bridge.iob rename to objects/bastion/bridge/bridge_pieces/bridge.iob diff --git a/objects/jigsaw/bastion/bridge/connectors/back_bridge_bottom.iob b/objects/bastion/bridge/connectors/back_bridge_bottom.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/connectors/back_bridge_bottom.iob rename to objects/bastion/bridge/connectors/back_bridge_bottom.iob diff --git a/objects/jigsaw/bastion/bridge/connectors/back_bridge_top.iob b/objects/bastion/bridge/connectors/back_bridge_top.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/connectors/back_bridge_top.iob rename to objects/bastion/bridge/connectors/back_bridge_top.iob diff --git a/objects/jigsaw/bastion/bridge/legs/leg_0.iob b/objects/bastion/bridge/legs/leg_0.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/legs/leg_0.iob rename to objects/bastion/bridge/legs/leg_0.iob diff --git a/objects/jigsaw/bastion/bridge/legs/leg_1.iob b/objects/bastion/bridge/legs/leg_1.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/legs/leg_1.iob rename to objects/bastion/bridge/legs/leg_1.iob diff --git a/objects/jigsaw/bastion/bridge/rampart_plates/plate_0.iob b/objects/bastion/bridge/rampart_plates/plate_0.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/rampart_plates/plate_0.iob rename to objects/bastion/bridge/rampart_plates/plate_0.iob diff --git a/objects/jigsaw/bastion/bridge/ramparts/rampart_0.iob b/objects/bastion/bridge/ramparts/rampart_0.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/ramparts/rampart_0.iob rename to objects/bastion/bridge/ramparts/rampart_0.iob diff --git a/objects/jigsaw/bastion/bridge/ramparts/rampart_1.iob b/objects/bastion/bridge/ramparts/rampart_1.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/ramparts/rampart_1.iob rename to objects/bastion/bridge/ramparts/rampart_1.iob diff --git a/objects/jigsaw/bastion/bridge/starting_pieces/entrance.iob b/objects/bastion/bridge/starting_pieces/entrance.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/starting_pieces/entrance.iob rename to objects/bastion/bridge/starting_pieces/entrance.iob diff --git a/objects/jigsaw/bastion/bridge/starting_pieces/entrance_base.iob b/objects/bastion/bridge/starting_pieces/entrance_base.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/starting_pieces/entrance_base.iob rename to objects/bastion/bridge/starting_pieces/entrance_base.iob diff --git a/objects/jigsaw/bastion/bridge/starting_pieces/entrance_face.iob b/objects/bastion/bridge/starting_pieces/entrance_face.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/starting_pieces/entrance_face.iob rename to objects/bastion/bridge/starting_pieces/entrance_face.iob diff --git a/objects/jigsaw/bastion/bridge/walls/wall_base_0.iob b/objects/bastion/bridge/walls/wall_base_0.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/walls/wall_base_0.iob rename to objects/bastion/bridge/walls/wall_base_0.iob diff --git a/objects/jigsaw/bastion/bridge/walls/wall_base_1.iob b/objects/bastion/bridge/walls/wall_base_1.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/walls/wall_base_1.iob rename to objects/bastion/bridge/walls/wall_base_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/air_base.iob b/objects/bastion/hoglin_stable/air_base.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/air_base.iob rename to objects/bastion/hoglin_stable/air_base.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/connectors/end_post_connector.iob b/objects/bastion/hoglin_stable/connectors/end_post_connector.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/connectors/end_post_connector.iob rename to objects/bastion/hoglin_stable/connectors/end_post_connector.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/inner_0.iob b/objects/bastion/hoglin_stable/large_stables/inner_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/inner_0.iob rename to objects/bastion/hoglin_stable/large_stables/inner_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/inner_1.iob b/objects/bastion/hoglin_stable/large_stables/inner_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/inner_1.iob rename to objects/bastion/hoglin_stable/large_stables/inner_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/inner_2.iob b/objects/bastion/hoglin_stable/large_stables/inner_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/inner_2.iob rename to objects/bastion/hoglin_stable/large_stables/inner_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/inner_3.iob b/objects/bastion/hoglin_stable/large_stables/inner_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/inner_3.iob rename to objects/bastion/hoglin_stable/large_stables/inner_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/inner_4.iob b/objects/bastion/hoglin_stable/large_stables/inner_4.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/inner_4.iob rename to objects/bastion/hoglin_stable/large_stables/inner_4.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/outer_0.iob b/objects/bastion/hoglin_stable/large_stables/outer_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/outer_0.iob rename to objects/bastion/hoglin_stable/large_stables/outer_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/outer_1.iob b/objects/bastion/hoglin_stable/large_stables/outer_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/outer_1.iob rename to objects/bastion/hoglin_stable/large_stables/outer_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/outer_2.iob b/objects/bastion/hoglin_stable/large_stables/outer_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/outer_2.iob rename to objects/bastion/hoglin_stable/large_stables/outer_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/outer_3.iob b/objects/bastion/hoglin_stable/large_stables/outer_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/outer_3.iob rename to objects/bastion/hoglin_stable/large_stables/outer_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/outer_4.iob b/objects/bastion/hoglin_stable/large_stables/outer_4.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/outer_4.iob rename to objects/bastion/hoglin_stable/large_stables/outer_4.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/posts/end_post.iob b/objects/bastion/hoglin_stable/posts/end_post.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/posts/end_post.iob rename to objects/bastion/hoglin_stable/posts/end_post.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/posts/stair_post.iob b/objects/bastion/hoglin_stable/posts/stair_post.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/posts/stair_post.iob rename to objects/bastion/hoglin_stable/posts/stair_post.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/rampart_plates/rampart_plate_1.iob b/objects/bastion/hoglin_stable/rampart_plates/rampart_plate_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/rampart_plates/rampart_plate_1.iob rename to objects/bastion/hoglin_stable/rampart_plates/rampart_plate_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_1.iob b/objects/bastion/hoglin_stable/ramparts/ramparts_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_1.iob rename to objects/bastion/hoglin_stable/ramparts/ramparts_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_2.iob b/objects/bastion/hoglin_stable/ramparts/ramparts_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_2.iob rename to objects/bastion/hoglin_stable/ramparts/ramparts_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_3.iob b/objects/bastion/hoglin_stable/ramparts/ramparts_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_3.iob rename to objects/bastion/hoglin_stable/ramparts/ramparts_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/small_stables/inner_0.iob b/objects/bastion/hoglin_stable/small_stables/inner_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/small_stables/inner_0.iob rename to objects/bastion/hoglin_stable/small_stables/inner_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/small_stables/inner_1.iob b/objects/bastion/hoglin_stable/small_stables/inner_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/small_stables/inner_1.iob rename to objects/bastion/hoglin_stable/small_stables/inner_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/small_stables/inner_2.iob b/objects/bastion/hoglin_stable/small_stables/inner_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/small_stables/inner_2.iob rename to objects/bastion/hoglin_stable/small_stables/inner_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/small_stables/inner_3.iob b/objects/bastion/hoglin_stable/small_stables/inner_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/small_stables/inner_3.iob rename to objects/bastion/hoglin_stable/small_stables/inner_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/small_stables/outer_0.iob b/objects/bastion/hoglin_stable/small_stables/outer_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/small_stables/outer_0.iob rename to objects/bastion/hoglin_stable/small_stables/outer_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/small_stables/outer_1.iob b/objects/bastion/hoglin_stable/small_stables/outer_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/small_stables/outer_1.iob rename to objects/bastion/hoglin_stable/small_stables/outer_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/small_stables/outer_2.iob b/objects/bastion/hoglin_stable/small_stables/outer_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/small_stables/outer_2.iob rename to objects/bastion/hoglin_stable/small_stables/outer_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/small_stables/outer_3.iob b/objects/bastion/hoglin_stable/small_stables/outer_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/small_stables/outer_3.iob rename to objects/bastion/hoglin_stable/small_stables/outer_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_0.iob b/objects/bastion/hoglin_stable/stairs/stairs_1_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_0.iob rename to objects/bastion/hoglin_stable/stairs/stairs_1_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_1.iob b/objects/bastion/hoglin_stable/stairs/stairs_1_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_1.iob rename to objects/bastion/hoglin_stable/stairs/stairs_1_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_2.iob b/objects/bastion/hoglin_stable/stairs/stairs_1_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_2.iob rename to objects/bastion/hoglin_stable/stairs/stairs_1_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_3.iob b/objects/bastion/hoglin_stable/stairs/stairs_1_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_3.iob rename to objects/bastion/hoglin_stable/stairs/stairs_1_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_4.iob b/objects/bastion/hoglin_stable/stairs/stairs_1_4.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_4.iob rename to objects/bastion/hoglin_stable/stairs/stairs_1_4.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_0.iob b/objects/bastion/hoglin_stable/stairs/stairs_2_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_0.iob rename to objects/bastion/hoglin_stable/stairs/stairs_2_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_1.iob b/objects/bastion/hoglin_stable/stairs/stairs_2_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_1.iob rename to objects/bastion/hoglin_stable/stairs/stairs_2_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_2.iob b/objects/bastion/hoglin_stable/stairs/stairs_2_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_2.iob rename to objects/bastion/hoglin_stable/stairs/stairs_2_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_3.iob b/objects/bastion/hoglin_stable/stairs/stairs_2_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_3.iob rename to objects/bastion/hoglin_stable/stairs/stairs_2_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_4.iob b/objects/bastion/hoglin_stable/stairs/stairs_2_4.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_4.iob rename to objects/bastion/hoglin_stable/stairs/stairs_2_4.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_0.iob b/objects/bastion/hoglin_stable/stairs/stairs_3_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_0.iob rename to objects/bastion/hoglin_stable/stairs/stairs_3_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_1.iob b/objects/bastion/hoglin_stable/stairs/stairs_3_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_1.iob rename to objects/bastion/hoglin_stable/stairs/stairs_3_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_2.iob b/objects/bastion/hoglin_stable/stairs/stairs_3_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_2.iob rename to objects/bastion/hoglin_stable/stairs/stairs_3_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_3.iob b/objects/bastion/hoglin_stable/stairs/stairs_3_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_3.iob rename to objects/bastion/hoglin_stable/stairs/stairs_3_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_4.iob b/objects/bastion/hoglin_stable/stairs/stairs_3_4.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_4.iob rename to objects/bastion/hoglin_stable/stairs/stairs_3_4.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.iob b/objects/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.iob rename to objects/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.iob b/objects/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.iob rename to objects/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.iob b/objects/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.iob rename to objects/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.iob b/objects/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.iob rename to objects/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.iob b/objects/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.iob rename to objects/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_0.iob b/objects/bastion/hoglin_stable/starting_pieces/starting_stairs_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_0.iob rename to objects/bastion/hoglin_stable/starting_pieces/starting_stairs_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_1.iob b/objects/bastion/hoglin_stable/starting_pieces/starting_stairs_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_1.iob rename to objects/bastion/hoglin_stable/starting_pieces/starting_stairs_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_2.iob b/objects/bastion/hoglin_stable/starting_pieces/starting_stairs_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_2.iob rename to objects/bastion/hoglin_stable/starting_pieces/starting_stairs_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_3.iob b/objects/bastion/hoglin_stable/starting_pieces/starting_stairs_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_3.iob rename to objects/bastion/hoglin_stable/starting_pieces/starting_stairs_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_4.iob b/objects/bastion/hoglin_stable/starting_pieces/starting_stairs_4.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_4.iob rename to objects/bastion/hoglin_stable/starting_pieces/starting_stairs_4.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/walls/side_wall_0.iob b/objects/bastion/hoglin_stable/walls/side_wall_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/walls/side_wall_0.iob rename to objects/bastion/hoglin_stable/walls/side_wall_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/walls/side_wall_1.iob b/objects/bastion/hoglin_stable/walls/side_wall_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/walls/side_wall_1.iob rename to objects/bastion/hoglin_stable/walls/side_wall_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/walls/wall_base.iob b/objects/bastion/hoglin_stable/walls/wall_base.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/walls/wall_base.iob rename to objects/bastion/hoglin_stable/walls/wall_base.iob diff --git a/objects/jigsaw/bastion/mobs/crossbow_piglin.iob b/objects/bastion/mobs/crossbow_piglin.iob similarity index 100% rename from objects/jigsaw/bastion/mobs/crossbow_piglin.iob rename to objects/bastion/mobs/crossbow_piglin.iob diff --git a/objects/jigsaw/bastion/mobs/empty.iob b/objects/bastion/mobs/empty.iob similarity index 100% rename from objects/jigsaw/bastion/mobs/empty.iob rename to objects/bastion/mobs/empty.iob diff --git a/objects/jigsaw/bastion/mobs/hoglin.iob b/objects/bastion/mobs/hoglin.iob similarity index 100% rename from objects/jigsaw/bastion/mobs/hoglin.iob rename to objects/bastion/mobs/hoglin.iob diff --git a/objects/jigsaw/bastion/mobs/melee_piglin.iob b/objects/bastion/mobs/melee_piglin.iob similarity index 100% rename from objects/jigsaw/bastion/mobs/melee_piglin.iob rename to objects/bastion/mobs/melee_piglin.iob diff --git a/objects/jigsaw/bastion/mobs/melee_piglin_always.iob b/objects/bastion/mobs/melee_piglin_always.iob similarity index 100% rename from objects/jigsaw/bastion/mobs/melee_piglin_always.iob rename to objects/bastion/mobs/melee_piglin_always.iob diff --git a/objects/jigsaw/bastion/mobs/sword_piglin.iob b/objects/bastion/mobs/sword_piglin.iob similarity index 100% rename from objects/jigsaw/bastion/mobs/sword_piglin.iob rename to objects/bastion/mobs/sword_piglin.iob diff --git a/objects/jigsaw/bastion/treasure/bases/centers/center_0.iob b/objects/bastion/treasure/bases/centers/center_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/bases/centers/center_0.iob rename to objects/bastion/treasure/bases/centers/center_0.iob diff --git a/objects/jigsaw/bastion/treasure/bases/centers/center_1.iob b/objects/bastion/treasure/bases/centers/center_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/bases/centers/center_1.iob rename to objects/bastion/treasure/bases/centers/center_1.iob diff --git a/objects/jigsaw/bastion/treasure/bases/centers/center_2.iob b/objects/bastion/treasure/bases/centers/center_2.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/bases/centers/center_2.iob rename to objects/bastion/treasure/bases/centers/center_2.iob diff --git a/objects/jigsaw/bastion/treasure/bases/centers/center_3.iob b/objects/bastion/treasure/bases/centers/center_3.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/bases/centers/center_3.iob rename to objects/bastion/treasure/bases/centers/center_3.iob diff --git a/objects/jigsaw/bastion/treasure/bases/lava_basin.iob b/objects/bastion/treasure/bases/lava_basin.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/bases/lava_basin.iob rename to objects/bastion/treasure/bases/lava_basin.iob diff --git a/objects/jigsaw/bastion/treasure/big_air_full.iob b/objects/bastion/treasure/big_air_full.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/big_air_full.iob rename to objects/bastion/treasure/big_air_full.iob diff --git a/objects/jigsaw/bastion/treasure/brains/center_brain.iob b/objects/bastion/treasure/brains/center_brain.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/brains/center_brain.iob rename to objects/bastion/treasure/brains/center_brain.iob diff --git a/objects/jigsaw/bastion/treasure/connectors/center_to_wall_middle.iob b/objects/bastion/treasure/connectors/center_to_wall_middle.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/connectors/center_to_wall_middle.iob rename to objects/bastion/treasure/connectors/center_to_wall_middle.iob diff --git a/objects/jigsaw/bastion/treasure/connectors/center_to_wall_top.iob b/objects/bastion/treasure/connectors/center_to_wall_top.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/connectors/center_to_wall_top.iob rename to objects/bastion/treasure/connectors/center_to_wall_top.iob diff --git a/objects/jigsaw/bastion/treasure/connectors/center_to_wall_top_entrance.iob b/objects/bastion/treasure/connectors/center_to_wall_top_entrance.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/connectors/center_to_wall_top_entrance.iob rename to objects/bastion/treasure/connectors/center_to_wall_top_entrance.iob diff --git a/objects/jigsaw/bastion/treasure/corners/bottom/corner_0.iob b/objects/bastion/treasure/corners/bottom/corner_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/bottom/corner_0.iob rename to objects/bastion/treasure/corners/bottom/corner_0.iob diff --git a/objects/jigsaw/bastion/treasure/corners/bottom/corner_1.iob b/objects/bastion/treasure/corners/bottom/corner_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/bottom/corner_1.iob rename to objects/bastion/treasure/corners/bottom/corner_1.iob diff --git a/objects/jigsaw/bastion/treasure/corners/edges/bottom.iob b/objects/bastion/treasure/corners/edges/bottom.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/edges/bottom.iob rename to objects/bastion/treasure/corners/edges/bottom.iob diff --git a/objects/jigsaw/bastion/treasure/corners/edges/middle.iob b/objects/bastion/treasure/corners/edges/middle.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/edges/middle.iob rename to objects/bastion/treasure/corners/edges/middle.iob diff --git a/objects/jigsaw/bastion/treasure/corners/edges/top.iob b/objects/bastion/treasure/corners/edges/top.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/edges/top.iob rename to objects/bastion/treasure/corners/edges/top.iob diff --git a/objects/jigsaw/bastion/treasure/corners/middle/corner_0.iob b/objects/bastion/treasure/corners/middle/corner_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/middle/corner_0.iob rename to objects/bastion/treasure/corners/middle/corner_0.iob diff --git a/objects/jigsaw/bastion/treasure/corners/middle/corner_1.iob b/objects/bastion/treasure/corners/middle/corner_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/middle/corner_1.iob rename to objects/bastion/treasure/corners/middle/corner_1.iob diff --git a/objects/jigsaw/bastion/treasure/corners/top/corner_0.iob b/objects/bastion/treasure/corners/top/corner_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/top/corner_0.iob rename to objects/bastion/treasure/corners/top/corner_0.iob diff --git a/objects/jigsaw/bastion/treasure/corners/top/corner_1.iob b/objects/bastion/treasure/corners/top/corner_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/top/corner_1.iob rename to objects/bastion/treasure/corners/top/corner_1.iob diff --git a/objects/jigsaw/bastion/treasure/entrances/entrance_0.iob b/objects/bastion/treasure/entrances/entrance_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/entrances/entrance_0.iob rename to objects/bastion/treasure/entrances/entrance_0.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/empty.iob b/objects/bastion/treasure/extensions/empty.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/empty.iob rename to objects/bastion/treasure/extensions/empty.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/fire_room.iob b/objects/bastion/treasure/extensions/fire_room.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/fire_room.iob rename to objects/bastion/treasure/extensions/fire_room.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/house_0.iob b/objects/bastion/treasure/extensions/house_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/house_0.iob rename to objects/bastion/treasure/extensions/house_0.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/house_1.iob b/objects/bastion/treasure/extensions/house_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/house_1.iob rename to objects/bastion/treasure/extensions/house_1.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/large_bridge_0.iob b/objects/bastion/treasure/extensions/large_bridge_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/large_bridge_0.iob rename to objects/bastion/treasure/extensions/large_bridge_0.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/large_bridge_1.iob b/objects/bastion/treasure/extensions/large_bridge_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/large_bridge_1.iob rename to objects/bastion/treasure/extensions/large_bridge_1.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/large_bridge_2.iob b/objects/bastion/treasure/extensions/large_bridge_2.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/large_bridge_2.iob rename to objects/bastion/treasure/extensions/large_bridge_2.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/large_bridge_3.iob b/objects/bastion/treasure/extensions/large_bridge_3.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/large_bridge_3.iob rename to objects/bastion/treasure/extensions/large_bridge_3.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/roofed_bridge.iob b/objects/bastion/treasure/extensions/roofed_bridge.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/roofed_bridge.iob rename to objects/bastion/treasure/extensions/roofed_bridge.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/small_bridge_0.iob b/objects/bastion/treasure/extensions/small_bridge_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/small_bridge_0.iob rename to objects/bastion/treasure/extensions/small_bridge_0.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/small_bridge_1.iob b/objects/bastion/treasure/extensions/small_bridge_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/small_bridge_1.iob rename to objects/bastion/treasure/extensions/small_bridge_1.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/small_bridge_2.iob b/objects/bastion/treasure/extensions/small_bridge_2.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/small_bridge_2.iob rename to objects/bastion/treasure/extensions/small_bridge_2.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/small_bridge_3.iob b/objects/bastion/treasure/extensions/small_bridge_3.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/small_bridge_3.iob rename to objects/bastion/treasure/extensions/small_bridge_3.iob diff --git a/objects/jigsaw/bastion/treasure/ramparts/bottom_wall_0.iob b/objects/bastion/treasure/ramparts/bottom_wall_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/ramparts/bottom_wall_0.iob rename to objects/bastion/treasure/ramparts/bottom_wall_0.iob diff --git a/objects/jigsaw/bastion/treasure/ramparts/lava_basin_main.iob b/objects/bastion/treasure/ramparts/lava_basin_main.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/ramparts/lava_basin_main.iob rename to objects/bastion/treasure/ramparts/lava_basin_main.iob diff --git a/objects/jigsaw/bastion/treasure/ramparts/lava_basin_side.iob b/objects/bastion/treasure/ramparts/lava_basin_side.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/ramparts/lava_basin_side.iob rename to objects/bastion/treasure/ramparts/lava_basin_side.iob diff --git a/objects/jigsaw/bastion/treasure/ramparts/mid_wall_main.iob b/objects/bastion/treasure/ramparts/mid_wall_main.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/ramparts/mid_wall_main.iob rename to objects/bastion/treasure/ramparts/mid_wall_main.iob diff --git a/objects/jigsaw/bastion/treasure/ramparts/mid_wall_side.iob b/objects/bastion/treasure/ramparts/mid_wall_side.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/ramparts/mid_wall_side.iob rename to objects/bastion/treasure/ramparts/mid_wall_side.iob diff --git a/objects/jigsaw/bastion/treasure/ramparts/top_wall.iob b/objects/bastion/treasure/ramparts/top_wall.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/ramparts/top_wall.iob rename to objects/bastion/treasure/ramparts/top_wall.iob diff --git a/objects/jigsaw/bastion/treasure/roofs/center_roof.iob b/objects/bastion/treasure/roofs/center_roof.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/roofs/center_roof.iob rename to objects/bastion/treasure/roofs/center_roof.iob diff --git a/objects/jigsaw/bastion/treasure/roofs/corner_roof.iob b/objects/bastion/treasure/roofs/corner_roof.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/roofs/corner_roof.iob rename to objects/bastion/treasure/roofs/corner_roof.iob diff --git a/objects/jigsaw/bastion/treasure/roofs/wall_roof.iob b/objects/bastion/treasure/roofs/wall_roof.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/roofs/wall_roof.iob rename to objects/bastion/treasure/roofs/wall_roof.iob diff --git a/objects/jigsaw/bastion/treasure/stairs/lower_stairs.iob b/objects/bastion/treasure/stairs/lower_stairs.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/stairs/lower_stairs.iob rename to objects/bastion/treasure/stairs/lower_stairs.iob diff --git a/objects/jigsaw/bastion/treasure/walls/bottom/wall_0.iob b/objects/bastion/treasure/walls/bottom/wall_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/bottom/wall_0.iob rename to objects/bastion/treasure/walls/bottom/wall_0.iob diff --git a/objects/jigsaw/bastion/treasure/walls/bottom/wall_1.iob b/objects/bastion/treasure/walls/bottom/wall_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/bottom/wall_1.iob rename to objects/bastion/treasure/walls/bottom/wall_1.iob diff --git a/objects/jigsaw/bastion/treasure/walls/bottom/wall_2.iob b/objects/bastion/treasure/walls/bottom/wall_2.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/bottom/wall_2.iob rename to objects/bastion/treasure/walls/bottom/wall_2.iob diff --git a/objects/jigsaw/bastion/treasure/walls/bottom/wall_3.iob b/objects/bastion/treasure/walls/bottom/wall_3.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/bottom/wall_3.iob rename to objects/bastion/treasure/walls/bottom/wall_3.iob diff --git a/objects/jigsaw/bastion/treasure/walls/entrance_wall.iob b/objects/bastion/treasure/walls/entrance_wall.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/entrance_wall.iob rename to objects/bastion/treasure/walls/entrance_wall.iob diff --git a/objects/jigsaw/bastion/treasure/walls/lava_wall.iob b/objects/bastion/treasure/walls/lava_wall.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/lava_wall.iob rename to objects/bastion/treasure/walls/lava_wall.iob diff --git a/objects/jigsaw/bastion/treasure/walls/mid/wall_0.iob b/objects/bastion/treasure/walls/mid/wall_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/mid/wall_0.iob rename to objects/bastion/treasure/walls/mid/wall_0.iob diff --git a/objects/jigsaw/bastion/treasure/walls/mid/wall_1.iob b/objects/bastion/treasure/walls/mid/wall_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/mid/wall_1.iob rename to objects/bastion/treasure/walls/mid/wall_1.iob diff --git a/objects/jigsaw/bastion/treasure/walls/mid/wall_2.iob b/objects/bastion/treasure/walls/mid/wall_2.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/mid/wall_2.iob rename to objects/bastion/treasure/walls/mid/wall_2.iob diff --git a/objects/jigsaw/bastion/treasure/walls/outer/bottom_corner.iob b/objects/bastion/treasure/walls/outer/bottom_corner.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/outer/bottom_corner.iob rename to objects/bastion/treasure/walls/outer/bottom_corner.iob diff --git a/objects/jigsaw/bastion/treasure/walls/outer/medium_outer_wall.iob b/objects/bastion/treasure/walls/outer/medium_outer_wall.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/outer/medium_outer_wall.iob rename to objects/bastion/treasure/walls/outer/medium_outer_wall.iob diff --git a/objects/jigsaw/bastion/treasure/walls/outer/mid_corner.iob b/objects/bastion/treasure/walls/outer/mid_corner.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/outer/mid_corner.iob rename to objects/bastion/treasure/walls/outer/mid_corner.iob diff --git a/objects/jigsaw/bastion/treasure/walls/outer/outer_wall.iob b/objects/bastion/treasure/walls/outer/outer_wall.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/outer/outer_wall.iob rename to objects/bastion/treasure/walls/outer/outer_wall.iob diff --git a/objects/jigsaw/bastion/treasure/walls/outer/tall_outer_wall.iob b/objects/bastion/treasure/walls/outer/tall_outer_wall.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/outer/tall_outer_wall.iob rename to objects/bastion/treasure/walls/outer/tall_outer_wall.iob diff --git a/objects/jigsaw/bastion/treasure/walls/outer/top_corner.iob b/objects/bastion/treasure/walls/outer/top_corner.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/outer/top_corner.iob rename to objects/bastion/treasure/walls/outer/top_corner.iob diff --git a/objects/jigsaw/bastion/treasure/walls/top/main_entrance.iob b/objects/bastion/treasure/walls/top/main_entrance.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/top/main_entrance.iob rename to objects/bastion/treasure/walls/top/main_entrance.iob diff --git a/objects/jigsaw/bastion/treasure/walls/top/wall_0.iob b/objects/bastion/treasure/walls/top/wall_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/top/wall_0.iob rename to objects/bastion/treasure/walls/top/wall_0.iob diff --git a/objects/jigsaw/bastion/treasure/walls/top/wall_1.iob b/objects/bastion/treasure/walls/top/wall_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/top/wall_1.iob rename to objects/bastion/treasure/walls/top/wall_1.iob diff --git a/objects/jigsaw/bastion/units/air_base.iob b/objects/bastion/units/air_base.iob similarity index 100% rename from objects/jigsaw/bastion/units/air_base.iob rename to objects/bastion/units/air_base.iob diff --git a/objects/jigsaw/bastion/units/center_pieces/center_0.iob b/objects/bastion/units/center_pieces/center_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/center_pieces/center_0.iob rename to objects/bastion/units/center_pieces/center_0.iob diff --git a/objects/jigsaw/bastion/units/center_pieces/center_1.iob b/objects/bastion/units/center_pieces/center_1.iob similarity index 100% rename from objects/jigsaw/bastion/units/center_pieces/center_1.iob rename to objects/bastion/units/center_pieces/center_1.iob diff --git a/objects/jigsaw/bastion/units/center_pieces/center_2.iob b/objects/bastion/units/center_pieces/center_2.iob similarity index 100% rename from objects/jigsaw/bastion/units/center_pieces/center_2.iob rename to objects/bastion/units/center_pieces/center_2.iob diff --git a/objects/jigsaw/bastion/units/edges/edge_0.iob b/objects/bastion/units/edges/edge_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/edges/edge_0.iob rename to objects/bastion/units/edges/edge_0.iob diff --git a/objects/jigsaw/bastion/units/fillers/stage_0.iob b/objects/bastion/units/fillers/stage_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/fillers/stage_0.iob rename to objects/bastion/units/fillers/stage_0.iob diff --git a/objects/jigsaw/bastion/units/pathways/pathway_0.iob b/objects/bastion/units/pathways/pathway_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/pathways/pathway_0.iob rename to objects/bastion/units/pathways/pathway_0.iob diff --git a/objects/jigsaw/bastion/units/pathways/pathway_wall_0.iob b/objects/bastion/units/pathways/pathway_wall_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/pathways/pathway_wall_0.iob rename to objects/bastion/units/pathways/pathway_wall_0.iob diff --git a/objects/jigsaw/bastion/units/rampart_plates/plate_0.iob b/objects/bastion/units/rampart_plates/plate_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/rampart_plates/plate_0.iob rename to objects/bastion/units/rampart_plates/plate_0.iob diff --git a/objects/jigsaw/bastion/units/ramparts/ramparts_0.iob b/objects/bastion/units/ramparts/ramparts_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/ramparts/ramparts_0.iob rename to objects/bastion/units/ramparts/ramparts_0.iob diff --git a/objects/jigsaw/bastion/units/ramparts/ramparts_1.iob b/objects/bastion/units/ramparts/ramparts_1.iob similarity index 100% rename from objects/jigsaw/bastion/units/ramparts/ramparts_1.iob rename to objects/bastion/units/ramparts/ramparts_1.iob diff --git a/objects/jigsaw/bastion/units/ramparts/ramparts_2.iob b/objects/bastion/units/ramparts/ramparts_2.iob similarity index 100% rename from objects/jigsaw/bastion/units/ramparts/ramparts_2.iob rename to objects/bastion/units/ramparts/ramparts_2.iob diff --git a/objects/jigsaw/bastion/units/stages/rot/stage_1_0.iob b/objects/bastion/units/stages/rot/stage_1_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/rot/stage_1_0.iob rename to objects/bastion/units/stages/rot/stage_1_0.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_0_0.iob b/objects/bastion/units/stages/stage_0_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_0_0.iob rename to objects/bastion/units/stages/stage_0_0.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_0_1.iob b/objects/bastion/units/stages/stage_0_1.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_0_1.iob rename to objects/bastion/units/stages/stage_0_1.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_0_2.iob b/objects/bastion/units/stages/stage_0_2.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_0_2.iob rename to objects/bastion/units/stages/stage_0_2.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_0_3.iob b/objects/bastion/units/stages/stage_0_3.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_0_3.iob rename to objects/bastion/units/stages/stage_0_3.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_1_0.iob b/objects/bastion/units/stages/stage_1_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_1_0.iob rename to objects/bastion/units/stages/stage_1_0.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_1_1.iob b/objects/bastion/units/stages/stage_1_1.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_1_1.iob rename to objects/bastion/units/stages/stage_1_1.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_1_2.iob b/objects/bastion/units/stages/stage_1_2.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_1_2.iob rename to objects/bastion/units/stages/stage_1_2.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_1_3.iob b/objects/bastion/units/stages/stage_1_3.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_1_3.iob rename to objects/bastion/units/stages/stage_1_3.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_2_0.iob b/objects/bastion/units/stages/stage_2_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_2_0.iob rename to objects/bastion/units/stages/stage_2_0.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_2_1.iob b/objects/bastion/units/stages/stage_2_1.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_2_1.iob rename to objects/bastion/units/stages/stage_2_1.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_3_0.iob b/objects/bastion/units/stages/stage_3_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_3_0.iob rename to objects/bastion/units/stages/stage_3_0.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_3_1.iob b/objects/bastion/units/stages/stage_3_1.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_3_1.iob rename to objects/bastion/units/stages/stage_3_1.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_3_2.iob b/objects/bastion/units/stages/stage_3_2.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_3_2.iob rename to objects/bastion/units/stages/stage_3_2.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_3_3.iob b/objects/bastion/units/stages/stage_3_3.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_3_3.iob rename to objects/bastion/units/stages/stage_3_3.iob diff --git a/objects/jigsaw/bastion/units/wall_units/edge_0_large.iob b/objects/bastion/units/wall_units/edge_0_large.iob similarity index 100% rename from objects/jigsaw/bastion/units/wall_units/edge_0_large.iob rename to objects/bastion/units/wall_units/edge_0_large.iob diff --git a/objects/jigsaw/bastion/units/wall_units/unit_0.iob b/objects/bastion/units/wall_units/unit_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/wall_units/unit_0.iob rename to objects/bastion/units/wall_units/unit_0.iob diff --git a/objects/jigsaw/bastion/units/walls/connected_wall.iob b/objects/bastion/units/walls/connected_wall.iob similarity index 100% rename from objects/jigsaw/bastion/units/walls/connected_wall.iob rename to objects/bastion/units/walls/connected_wall.iob diff --git a/objects/jigsaw/bastion/units/walls/wall_base.iob b/objects/bastion/units/walls/wall_base.iob similarity index 100% rename from objects/jigsaw/bastion/units/walls/wall_base.iob rename to objects/bastion/units/walls/wall_base.iob diff --git a/objects/structures/beach-islander/easterHead1.iob b/objects/beach-islander/easterHead1.iob similarity index 100% rename from objects/structures/beach-islander/easterHead1.iob rename to objects/beach-islander/easterHead1.iob diff --git a/objects/clutter/bee/hive.iob b/objects/bee/hive.iob similarity index 100% rename from objects/clutter/bee/hive.iob rename to objects/bee/hive.iob diff --git a/objects/clutter/bee/hive1.iob b/objects/bee/hive1.iob similarity index 100% rename from objects/clutter/bee/hive1.iob rename to objects/bee/hive1.iob diff --git a/objects/trees/sakura/vlarge1.iob b/objects/big-blossom/big-1.iob similarity index 100% rename from objects/trees/sakura/vlarge1.iob rename to objects/big-blossom/big-1.iob diff --git a/objects/trees/sakura/vlarge2.iob b/objects/big-blossom/big-2.iob similarity index 100% rename from objects/trees/sakura/vlarge2.iob rename to objects/big-blossom/big-2.iob diff --git a/objects/trees/sakura/vlarge3.iob b/objects/big-blossom/big-3.iob similarity index 100% rename from objects/trees/sakura/vlarge3.iob rename to objects/big-blossom/big-3.iob diff --git a/objects/trees/birch/antioch1.iob b/objects/birch-antioch/antioch-1.iob similarity index 100% rename from objects/trees/birch/antioch1.iob rename to objects/birch-antioch/antioch-1.iob diff --git a/objects/trees/birch/antioch10.iob b/objects/birch-antioch/antioch-10.iob similarity index 100% rename from objects/trees/birch/antioch10.iob rename to objects/birch-antioch/antioch-10.iob diff --git a/objects/trees/birch/antioch11.iob b/objects/birch-antioch/antioch-11.iob similarity index 100% rename from objects/trees/birch/antioch11.iob rename to objects/birch-antioch/antioch-11.iob diff --git a/objects/trees/birch/antioch12.iob b/objects/birch-antioch/antioch-12.iob similarity index 100% rename from objects/trees/birch/antioch12.iob rename to objects/birch-antioch/antioch-12.iob diff --git a/objects/trees/birch/antioch13.iob b/objects/birch-antioch/antioch-13.iob similarity index 100% rename from objects/trees/birch/antioch13.iob rename to objects/birch-antioch/antioch-13.iob diff --git a/objects/trees/birch/antioch2.iob b/objects/birch-antioch/antioch-2.iob similarity index 100% rename from objects/trees/birch/antioch2.iob rename to objects/birch-antioch/antioch-2.iob diff --git a/objects/trees/birch/antioch3b.iob b/objects/birch-antioch/antioch-3-b.iob similarity index 100% rename from objects/trees/birch/antioch3b.iob rename to objects/birch-antioch/antioch-3-b.iob diff --git a/objects/trees/birch/antioch3.iob b/objects/birch-antioch/antioch-3.iob similarity index 100% rename from objects/trees/birch/antioch3.iob rename to objects/birch-antioch/antioch-3.iob diff --git a/objects/trees/birch/antioch4b.iob b/objects/birch-antioch/antioch-4-b.iob similarity index 100% rename from objects/trees/birch/antioch4b.iob rename to objects/birch-antioch/antioch-4-b.iob diff --git a/objects/trees/birch/antioch4.iob b/objects/birch-antioch/antioch-4.iob similarity index 100% rename from objects/trees/birch/antioch4.iob rename to objects/birch-antioch/antioch-4.iob diff --git a/objects/trees/birch/antioch5b.iob b/objects/birch-antioch/antioch-5-b.iob similarity index 100% rename from objects/trees/birch/antioch5b.iob rename to objects/birch-antioch/antioch-5-b.iob diff --git a/objects/trees/birch/antioch5.iob b/objects/birch-antioch/antioch-5.iob similarity index 100% rename from objects/trees/birch/antioch5.iob rename to objects/birch-antioch/antioch-5.iob diff --git a/objects/trees/birch/antioch6b.iob b/objects/birch-antioch/antioch-6-b.iob similarity index 100% rename from objects/trees/birch/antioch6b.iob rename to objects/birch-antioch/antioch-6-b.iob diff --git a/objects/trees/birch/antioch6.iob b/objects/birch-antioch/antioch-6.iob similarity index 100% rename from objects/trees/birch/antioch6.iob rename to objects/birch-antioch/antioch-6.iob diff --git a/objects/trees/birch/antioch7.iob b/objects/birch-antioch/antioch-7.iob similarity index 100% rename from objects/trees/birch/antioch7.iob rename to objects/birch-antioch/antioch-7.iob diff --git a/objects/trees/birch/antioch8.iob b/objects/birch-antioch/antioch-8.iob similarity index 100% rename from objects/trees/birch/antioch8.iob rename to objects/birch-antioch/antioch-8.iob diff --git a/objects/trees/birch/antioch9.iob b/objects/birch-antioch/antioch-9.iob similarity index 100% rename from objects/trees/birch/antioch9.iob rename to objects/birch-antioch/antioch-9.iob diff --git a/objects/trees/birch/largegeneric1.iob b/objects/birch-large/birch1.iob similarity index 100% rename from objects/trees/birch/largegeneric1.iob rename to objects/birch-large/birch1.iob diff --git a/objects/trees/birch/largegeneric2.iob b/objects/birch-large/birch10.iob similarity index 100% rename from objects/trees/birch/largegeneric2.iob rename to objects/birch-large/birch10.iob diff --git a/objects/trees/birch/largegeneric3.iob b/objects/birch-large/birch11.iob similarity index 100% rename from objects/trees/birch/largegeneric3.iob rename to objects/birch-large/birch11.iob diff --git a/objects/trees/birch/largegeneric4.iob b/objects/birch-large/birch12.iob similarity index 100% rename from objects/trees/birch/largegeneric4.iob rename to objects/birch-large/birch12.iob diff --git a/objects/trees/birch/largegeneric5.iob b/objects/birch-large/birch13.iob similarity index 100% rename from objects/trees/birch/largegeneric5.iob rename to objects/birch-large/birch13.iob diff --git a/objects/trees/birch/largegeneric6.iob b/objects/birch-large/birch14.iob similarity index 100% rename from objects/trees/birch/largegeneric6.iob rename to objects/birch-large/birch14.iob diff --git a/objects/trees/birch/largegeneric7.iob b/objects/birch-large/birch15.iob similarity index 100% rename from objects/trees/birch/largegeneric7.iob rename to objects/birch-large/birch15.iob diff --git a/objects/trees/birch/largegeneric8.iob b/objects/birch-large/birch16.iob similarity index 100% rename from objects/trees/birch/largegeneric8.iob rename to objects/birch-large/birch16.iob diff --git a/objects/trees/birch/largegeneric9.iob b/objects/birch-large/birch17.iob similarity index 100% rename from objects/trees/birch/largegeneric9.iob rename to objects/birch-large/birch17.iob diff --git a/objects/trees/birch/largegeneric10.iob b/objects/birch-large/birch18.iob similarity index 100% rename from objects/trees/birch/largegeneric10.iob rename to objects/birch-large/birch18.iob diff --git a/objects/trees/birch/largegeneric11.iob b/objects/birch-large/birch19.iob similarity index 100% rename from objects/trees/birch/largegeneric11.iob rename to objects/birch-large/birch19.iob diff --git a/objects/trees/birch/largegeneric12.iob b/objects/birch-large/birch2.iob similarity index 100% rename from objects/trees/birch/largegeneric12.iob rename to objects/birch-large/birch2.iob diff --git a/objects/trees/birch/largegeneric13.iob b/objects/birch-large/birch20.iob similarity index 100% rename from objects/trees/birch/largegeneric13.iob rename to objects/birch-large/birch20.iob diff --git a/objects/trees/birch/largegeneric14.iob b/objects/birch-large/birch3.iob similarity index 100% rename from objects/trees/birch/largegeneric14.iob rename to objects/birch-large/birch3.iob diff --git a/objects/trees/birch/largegeneric15.iob b/objects/birch-large/birch4.iob similarity index 100% rename from objects/trees/birch/largegeneric15.iob rename to objects/birch-large/birch4.iob diff --git a/objects/trees/birch/largegeneric16.iob b/objects/birch-large/birch5.iob similarity index 100% rename from objects/trees/birch/largegeneric16.iob rename to objects/birch-large/birch5.iob diff --git a/objects/trees/birch/largegeneric17.iob b/objects/birch-large/birch6.iob similarity index 100% rename from objects/trees/birch/largegeneric17.iob rename to objects/birch-large/birch6.iob diff --git a/objects/trees/birch/largegeneric18.iob b/objects/birch-large/birch7.iob similarity index 100% rename from objects/trees/birch/largegeneric18.iob rename to objects/birch-large/birch7.iob diff --git a/objects/trees/birch/largegeneric19.iob b/objects/birch-large/birch8.iob similarity index 100% rename from objects/trees/birch/largegeneric19.iob rename to objects/birch-large/birch8.iob diff --git a/objects/trees/birch/largegeneric20.iob b/objects/birch-large/birch9.iob similarity index 100% rename from objects/trees/birch/largegeneric20.iob rename to objects/birch-large/birch9.iob diff --git a/objects/trees/birch/denmyre1.iob b/objects/birch-medium/birch-denmyre-1.iob similarity index 100% rename from objects/trees/birch/denmyre1.iob rename to objects/birch-medium/birch-denmyre-1.iob diff --git a/objects/trees/birch/denmyre2.iob b/objects/birch-medium/birch-denmyre-10.iob similarity index 100% rename from objects/trees/birch/denmyre2.iob rename to objects/birch-medium/birch-denmyre-10.iob diff --git a/objects/trees/birch/denmyre3.iob b/objects/birch-medium/birch-denmyre-11.iob similarity index 100% rename from objects/trees/birch/denmyre3.iob rename to objects/birch-medium/birch-denmyre-11.iob diff --git a/objects/trees/birch/denmyre4.iob b/objects/birch-medium/birch-denmyre-12.iob similarity index 100% rename from objects/trees/birch/denmyre4.iob rename to objects/birch-medium/birch-denmyre-12.iob diff --git a/objects/trees/birch/denmyre5.iob b/objects/birch-medium/birch-denmyre-13.iob similarity index 100% rename from objects/trees/birch/denmyre5.iob rename to objects/birch-medium/birch-denmyre-13.iob diff --git a/objects/trees/birch/denmyre6.iob b/objects/birch-medium/birch-denmyre-14.iob similarity index 100% rename from objects/trees/birch/denmyre6.iob rename to objects/birch-medium/birch-denmyre-14.iob diff --git a/objects/trees/birch/denmyre7.iob b/objects/birch-medium/birch-denmyre-15.iob similarity index 100% rename from objects/trees/birch/denmyre7.iob rename to objects/birch-medium/birch-denmyre-15.iob diff --git a/objects/trees/birch/denmyre8.iob b/objects/birch-medium/birch-denmyre-16.iob similarity index 100% rename from objects/trees/birch/denmyre8.iob rename to objects/birch-medium/birch-denmyre-16.iob diff --git a/objects/trees/birch/denmyre9.iob b/objects/birch-medium/birch-denmyre-2.iob similarity index 100% rename from objects/trees/birch/denmyre9.iob rename to objects/birch-medium/birch-denmyre-2.iob diff --git a/objects/trees/birch/denmyre10.iob b/objects/birch-medium/birch-denmyre-3.iob similarity index 100% rename from objects/trees/birch/denmyre10.iob rename to objects/birch-medium/birch-denmyre-3.iob diff --git a/objects/trees/birch/denmyre11.iob b/objects/birch-medium/birch-denmyre-4.iob similarity index 100% rename from objects/trees/birch/denmyre11.iob rename to objects/birch-medium/birch-denmyre-4.iob diff --git a/objects/trees/birch/denmyre12.iob b/objects/birch-medium/birch-denmyre-5.iob similarity index 100% rename from objects/trees/birch/denmyre12.iob rename to objects/birch-medium/birch-denmyre-5.iob diff --git a/objects/trees/birch/denmyre13.iob b/objects/birch-medium/birch-denmyre-6.iob similarity index 100% rename from objects/trees/birch/denmyre13.iob rename to objects/birch-medium/birch-denmyre-6.iob diff --git a/objects/trees/birch/denmyre14.iob b/objects/birch-medium/birch-denmyre-7.iob similarity index 100% rename from objects/trees/birch/denmyre14.iob rename to objects/birch-medium/birch-denmyre-7.iob diff --git a/objects/trees/birch/denmyre15.iob b/objects/birch-medium/birch-denmyre-8.iob similarity index 100% rename from objects/trees/birch/denmyre15.iob rename to objects/birch-medium/birch-denmyre-8.iob diff --git a/objects/trees/birch/denmyre16.iob b/objects/birch-medium/birch-denmyre-9.iob similarity index 100% rename from objects/trees/birch/denmyre16.iob rename to objects/birch-medium/birch-denmyre-9.iob diff --git a/objects/trees/birch/mediumgeneric1.iob b/objects/birch-medium/birch2.iob similarity index 100% rename from objects/trees/birch/mediumgeneric1.iob rename to objects/birch-medium/birch2.iob diff --git a/objects/trees/birch/mediumgeneric2.iob b/objects/birch-medium/birch3.iob similarity index 100% rename from objects/trees/birch/mediumgeneric2.iob rename to objects/birch-medium/birch3.iob diff --git a/objects/trees/birch/mediumgeneric3.iob b/objects/birch-medium/birch4.iob similarity index 100% rename from objects/trees/birch/mediumgeneric3.iob rename to objects/birch-medium/birch4.iob diff --git a/objects/trees/birch/largeponderosa1.iob b/objects/birch-ponderosa/large-1.iob similarity index 100% rename from objects/trees/birch/largeponderosa1.iob rename to objects/birch-ponderosa/large-1.iob diff --git a/objects/trees/birch/largeponderosa2.iob b/objects/birch-ponderosa/large-10.iob similarity index 100% rename from objects/trees/birch/largeponderosa2.iob rename to objects/birch-ponderosa/large-10.iob diff --git a/objects/trees/birch/largeponderosa3.iob b/objects/birch-ponderosa/large-11.iob similarity index 100% rename from objects/trees/birch/largeponderosa3.iob rename to objects/birch-ponderosa/large-11.iob diff --git a/objects/trees/birch/largeponderosa4.iob b/objects/birch-ponderosa/large-12.iob similarity index 100% rename from objects/trees/birch/largeponderosa4.iob rename to objects/birch-ponderosa/large-12.iob diff --git a/objects/trees/birch/largeponderosa5.iob b/objects/birch-ponderosa/large-13.iob similarity index 100% rename from objects/trees/birch/largeponderosa5.iob rename to objects/birch-ponderosa/large-13.iob diff --git a/objects/trees/birch/largeponderosa6.iob b/objects/birch-ponderosa/large-14.iob similarity index 100% rename from objects/trees/birch/largeponderosa6.iob rename to objects/birch-ponderosa/large-14.iob diff --git a/objects/trees/birch/largeponderosa7.iob b/objects/birch-ponderosa/large-15.iob similarity index 100% rename from objects/trees/birch/largeponderosa7.iob rename to objects/birch-ponderosa/large-15.iob diff --git a/objects/trees/birch/largeponderosa8.iob b/objects/birch-ponderosa/large-16.iob similarity index 100% rename from objects/trees/birch/largeponderosa8.iob rename to objects/birch-ponderosa/large-16.iob diff --git a/objects/trees/birch/largeponderosa9.iob b/objects/birch-ponderosa/large-17.iob similarity index 100% rename from objects/trees/birch/largeponderosa9.iob rename to objects/birch-ponderosa/large-17.iob diff --git a/objects/trees/birch/largeponderosa10.iob b/objects/birch-ponderosa/large-18.iob similarity index 100% rename from objects/trees/birch/largeponderosa10.iob rename to objects/birch-ponderosa/large-18.iob diff --git a/objects/trees/birch/largeponderosa11.iob b/objects/birch-ponderosa/large-19.iob similarity index 100% rename from objects/trees/birch/largeponderosa11.iob rename to objects/birch-ponderosa/large-19.iob diff --git a/objects/trees/birch/largeponderosa12.iob b/objects/birch-ponderosa/large-2.iob similarity index 100% rename from objects/trees/birch/largeponderosa12.iob rename to objects/birch-ponderosa/large-2.iob diff --git a/objects/trees/birch/largeponderosa13.iob b/objects/birch-ponderosa/large-20.iob similarity index 100% rename from objects/trees/birch/largeponderosa13.iob rename to objects/birch-ponderosa/large-20.iob diff --git a/objects/trees/birch/largeponderosa14.iob b/objects/birch-ponderosa/large-3.iob similarity index 100% rename from objects/trees/birch/largeponderosa14.iob rename to objects/birch-ponderosa/large-3.iob diff --git a/objects/trees/birch/largeponderosa15.iob b/objects/birch-ponderosa/large-4.iob similarity index 100% rename from objects/trees/birch/largeponderosa15.iob rename to objects/birch-ponderosa/large-4.iob diff --git a/objects/trees/birch/largeponderosa16.iob b/objects/birch-ponderosa/large-5.iob similarity index 100% rename from objects/trees/birch/largeponderosa16.iob rename to objects/birch-ponderosa/large-5.iob diff --git a/objects/trees/birch/largeponderosa17.iob b/objects/birch-ponderosa/large-6.iob similarity index 100% rename from objects/trees/birch/largeponderosa17.iob rename to objects/birch-ponderosa/large-6.iob diff --git a/objects/trees/birch/largeponderosa18.iob b/objects/birch-ponderosa/large-7.iob similarity index 100% rename from objects/trees/birch/largeponderosa18.iob rename to objects/birch-ponderosa/large-7.iob diff --git a/objects/trees/birch/largeponderosa19.iob b/objects/birch-ponderosa/large-8.iob similarity index 100% rename from objects/trees/birch/largeponderosa19.iob rename to objects/birch-ponderosa/large-8.iob diff --git a/objects/trees/birch/largeponderosa20.iob b/objects/birch-ponderosa/large-9.iob similarity index 100% rename from objects/trees/birch/largeponderosa20.iob rename to objects/birch-ponderosa/large-9.iob diff --git a/objects/trees/birch/medponderosa1.iob b/objects/birch-ponderosa/med-1.iob similarity index 100% rename from objects/trees/birch/medponderosa1.iob rename to objects/birch-ponderosa/med-1.iob diff --git a/objects/trees/birch/medponderosa2.iob b/objects/birch-ponderosa/med-10.iob similarity index 100% rename from objects/trees/birch/medponderosa2.iob rename to objects/birch-ponderosa/med-10.iob diff --git a/objects/trees/birch/medponderosa3.iob b/objects/birch-ponderosa/med-11.iob similarity index 100% rename from objects/trees/birch/medponderosa3.iob rename to objects/birch-ponderosa/med-11.iob diff --git a/objects/trees/birch/medponderosa4.iob b/objects/birch-ponderosa/med-12.iob similarity index 100% rename from objects/trees/birch/medponderosa4.iob rename to objects/birch-ponderosa/med-12.iob diff --git a/objects/trees/birch/medponderosa5.iob b/objects/birch-ponderosa/med-13.iob similarity index 100% rename from objects/trees/birch/medponderosa5.iob rename to objects/birch-ponderosa/med-13.iob diff --git a/objects/trees/birch/medponderosa6.iob b/objects/birch-ponderosa/med-14.iob similarity index 100% rename from objects/trees/birch/medponderosa6.iob rename to objects/birch-ponderosa/med-14.iob diff --git a/objects/trees/birch/medponderosa7.iob b/objects/birch-ponderosa/med-15.iob similarity index 100% rename from objects/trees/birch/medponderosa7.iob rename to objects/birch-ponderosa/med-15.iob diff --git a/objects/trees/birch/medponderosa8.iob b/objects/birch-ponderosa/med-2.iob similarity index 100% rename from objects/trees/birch/medponderosa8.iob rename to objects/birch-ponderosa/med-2.iob diff --git a/objects/trees/birch/medponderosa9.iob b/objects/birch-ponderosa/med-3.iob similarity index 100% rename from objects/trees/birch/medponderosa9.iob rename to objects/birch-ponderosa/med-3.iob diff --git a/objects/trees/birch/medponderosa10.iob b/objects/birch-ponderosa/med-4.iob similarity index 100% rename from objects/trees/birch/medponderosa10.iob rename to objects/birch-ponderosa/med-4.iob diff --git a/objects/trees/birch/medponderosa11.iob b/objects/birch-ponderosa/med-5.iob similarity index 100% rename from objects/trees/birch/medponderosa11.iob rename to objects/birch-ponderosa/med-5.iob diff --git a/objects/trees/birch/medponderosa12.iob b/objects/birch-ponderosa/med-6.iob similarity index 100% rename from objects/trees/birch/medponderosa12.iob rename to objects/birch-ponderosa/med-6.iob diff --git a/objects/trees/birch/medponderosa13.iob b/objects/birch-ponderosa/med-7.iob similarity index 100% rename from objects/trees/birch/medponderosa13.iob rename to objects/birch-ponderosa/med-7.iob diff --git a/objects/trees/birch/medponderosa14.iob b/objects/birch-ponderosa/med-8.iob similarity index 100% rename from objects/trees/birch/medponderosa14.iob rename to objects/birch-ponderosa/med-8.iob diff --git a/objects/trees/birch/medponderosa15.iob b/objects/birch-ponderosa/med-9.iob similarity index 100% rename from objects/trees/birch/medponderosa15.iob rename to objects/birch-ponderosa/med-9.iob diff --git a/objects/trees/birch/smolponderosa1.iob b/objects/birch-ponderosa/smol-1.iob similarity index 100% rename from objects/trees/birch/smolponderosa1.iob rename to objects/birch-ponderosa/smol-1.iob diff --git a/objects/trees/birch/smolponderosa2.iob b/objects/birch-ponderosa/smol-10.iob similarity index 100% rename from objects/trees/birch/smolponderosa2.iob rename to objects/birch-ponderosa/smol-10.iob diff --git a/objects/trees/birch/smolponderosa3.iob b/objects/birch-ponderosa/smol-11.iob similarity index 100% rename from objects/trees/birch/smolponderosa3.iob rename to objects/birch-ponderosa/smol-11.iob diff --git a/objects/trees/birch/smolponderosa4.iob b/objects/birch-ponderosa/smol-12.iob similarity index 100% rename from objects/trees/birch/smolponderosa4.iob rename to objects/birch-ponderosa/smol-12.iob diff --git a/objects/trees/birch/smolponderosa5.iob b/objects/birch-ponderosa/smol-13.iob similarity index 100% rename from objects/trees/birch/smolponderosa5.iob rename to objects/birch-ponderosa/smol-13.iob diff --git a/objects/trees/birch/smolponderosa6.iob b/objects/birch-ponderosa/smol-14.iob similarity index 100% rename from objects/trees/birch/smolponderosa6.iob rename to objects/birch-ponderosa/smol-14.iob diff --git a/objects/trees/birch/smolponderosa7.iob b/objects/birch-ponderosa/smol-15.iob similarity index 100% rename from objects/trees/birch/smolponderosa7.iob rename to objects/birch-ponderosa/smol-15.iob diff --git a/objects/trees/birch/smolponderosa8.iob b/objects/birch-ponderosa/smol-2.iob similarity index 100% rename from objects/trees/birch/smolponderosa8.iob rename to objects/birch-ponderosa/smol-2.iob diff --git a/objects/trees/birch/smolponderosa9.iob b/objects/birch-ponderosa/smol-3.iob similarity index 100% rename from objects/trees/birch/smolponderosa9.iob rename to objects/birch-ponderosa/smol-3.iob diff --git a/objects/trees/birch/smolponderosa10.iob b/objects/birch-ponderosa/smol-4.iob similarity index 100% rename from objects/trees/birch/smolponderosa10.iob rename to objects/birch-ponderosa/smol-4.iob diff --git a/objects/trees/birch/smolponderosa11.iob b/objects/birch-ponderosa/smol-5.iob similarity index 100% rename from objects/trees/birch/smolponderosa11.iob rename to objects/birch-ponderosa/smol-5.iob diff --git a/objects/trees/birch/smolponderosa12.iob b/objects/birch-ponderosa/smol-6.iob similarity index 100% rename from objects/trees/birch/smolponderosa12.iob rename to objects/birch-ponderosa/smol-6.iob diff --git a/objects/trees/birch/smolponderosa13.iob b/objects/birch-ponderosa/smol-7.iob similarity index 100% rename from objects/trees/birch/smolponderosa13.iob rename to objects/birch-ponderosa/smol-7.iob diff --git a/objects/trees/birch/smolponderosa14.iob b/objects/birch-ponderosa/smol-8.iob similarity index 100% rename from objects/trees/birch/smolponderosa14.iob rename to objects/birch-ponderosa/smol-8.iob diff --git a/objects/trees/birch/smolponderosa15.iob b/objects/birch-ponderosa/smol-9.iob similarity index 100% rename from objects/trees/birch/smolponderosa15.iob rename to objects/birch-ponderosa/smol-9.iob diff --git a/objects/trees/birch/forest1.iob b/objects/birch-remade/b1.iob similarity index 100% rename from objects/trees/birch/forest1.iob rename to objects/birch-remade/b1.iob diff --git a/objects/trees/birch/forest2.iob b/objects/birch-remade/b2.iob similarity index 100% rename from objects/trees/birch/forest2.iob rename to objects/birch-remade/b2.iob diff --git a/objects/trees/birch/forest3.iob b/objects/birch-remade/b3.iob similarity index 100% rename from objects/trees/birch/forest3.iob rename to objects/birch-remade/b3.iob diff --git a/objects/trees/birch/forest4.iob b/objects/birch-remade/b4.iob similarity index 100% rename from objects/trees/birch/forest4.iob rename to objects/birch-remade/b4.iob diff --git a/objects/trees/birch/variantforest1.iob b/objects/birch-sespire/altbirch-1.iob similarity index 100% rename from objects/trees/birch/variantforest1.iob rename to objects/birch-sespire/altbirch-1.iob diff --git a/objects/trees/birch/variantforest2.iob b/objects/birch-sespire/altbirch-10.iob similarity index 100% rename from objects/trees/birch/variantforest2.iob rename to objects/birch-sespire/altbirch-10.iob diff --git a/objects/trees/birch/variantforest3.iob b/objects/birch-sespire/altbirch-11.iob similarity index 100% rename from objects/trees/birch/variantforest3.iob rename to objects/birch-sespire/altbirch-11.iob diff --git a/objects/trees/birch/variantforest4.iob b/objects/birch-sespire/altbirch-12.iob similarity index 100% rename from objects/trees/birch/variantforest4.iob rename to objects/birch-sespire/altbirch-12.iob diff --git a/objects/trees/birch/variantforest5.iob b/objects/birch-sespire/altbirch-13.iob similarity index 100% rename from objects/trees/birch/variantforest5.iob rename to objects/birch-sespire/altbirch-13.iob diff --git a/objects/trees/birch/variantforest6.iob b/objects/birch-sespire/altbirch-14.iob similarity index 100% rename from objects/trees/birch/variantforest6.iob rename to objects/birch-sespire/altbirch-14.iob diff --git a/objects/trees/birch/variantforest7.iob b/objects/birch-sespire/altbirch-15.iob similarity index 100% rename from objects/trees/birch/variantforest7.iob rename to objects/birch-sespire/altbirch-15.iob diff --git a/objects/trees/birch/variantforest8.iob b/objects/birch-sespire/altbirch-16.iob similarity index 100% rename from objects/trees/birch/variantforest8.iob rename to objects/birch-sespire/altbirch-16.iob diff --git a/objects/trees/birch/variantforest9.iob b/objects/birch-sespire/altbirch-17.iob similarity index 100% rename from objects/trees/birch/variantforest9.iob rename to objects/birch-sespire/altbirch-17.iob diff --git a/objects/trees/birch/variantforest10.iob b/objects/birch-sespire/altbirch-18.iob similarity index 100% rename from objects/trees/birch/variantforest10.iob rename to objects/birch-sespire/altbirch-18.iob diff --git a/objects/trees/birch/variantforest11.iob b/objects/birch-sespire/altbirch-19.iob similarity index 100% rename from objects/trees/birch/variantforest11.iob rename to objects/birch-sespire/altbirch-19.iob diff --git a/objects/trees/birch/variantforest12.iob b/objects/birch-sespire/altbirch-2.iob similarity index 100% rename from objects/trees/birch/variantforest12.iob rename to objects/birch-sespire/altbirch-2.iob diff --git a/objects/trees/birch/variantforest13.iob b/objects/birch-sespire/altbirch-20.iob similarity index 100% rename from objects/trees/birch/variantforest13.iob rename to objects/birch-sespire/altbirch-20.iob diff --git a/objects/trees/birch/variantforest14.iob b/objects/birch-sespire/altbirch-3.iob similarity index 100% rename from objects/trees/birch/variantforest14.iob rename to objects/birch-sespire/altbirch-3.iob diff --git a/objects/trees/birch/variantforest15.iob b/objects/birch-sespire/altbirch-4.iob similarity index 100% rename from objects/trees/birch/variantforest15.iob rename to objects/birch-sespire/altbirch-4.iob diff --git a/objects/trees/birch/variantforest16.iob b/objects/birch-sespire/altbirch-5.iob similarity index 100% rename from objects/trees/birch/variantforest16.iob rename to objects/birch-sespire/altbirch-5.iob diff --git a/objects/trees/birch/variantforest17.iob b/objects/birch-sespire/altbirch-6.iob similarity index 100% rename from objects/trees/birch/variantforest17.iob rename to objects/birch-sespire/altbirch-6.iob diff --git a/objects/trees/birch/variantforest18.iob b/objects/birch-sespire/altbirch-7.iob similarity index 100% rename from objects/trees/birch/variantforest18.iob rename to objects/birch-sespire/altbirch-7.iob diff --git a/objects/trees/birch/variantforest19.iob b/objects/birch-sespire/altbirch-8.iob similarity index 100% rename from objects/trees/birch/variantforest19.iob rename to objects/birch-sespire/altbirch-8.iob diff --git a/objects/trees/birch/variantforest20.iob b/objects/birch-sespire/altbirch-9.iob similarity index 100% rename from objects/trees/birch/variantforest20.iob rename to objects/birch-sespire/altbirch-9.iob diff --git a/objects/trees/birch/generic9.iob b/objects/birch-sespire/birch-1.iob similarity index 100% rename from objects/trees/birch/generic9.iob rename to objects/birch-sespire/birch-1.iob diff --git a/objects/trees/birch/generic10.iob b/objects/birch-sespire/birch-2.iob similarity index 100% rename from objects/trees/birch/generic10.iob rename to objects/birch-sespire/birch-2.iob diff --git a/objects/trees/birch/generic11.iob b/objects/birch-sespire/birch-3.iob similarity index 100% rename from objects/trees/birch/generic11.iob rename to objects/birch-sespire/birch-3.iob diff --git a/objects/trees/birch/generic12.iob b/objects/birch-sespire/birch-4.iob similarity index 100% rename from objects/trees/birch/generic12.iob rename to objects/birch-sespire/birch-4.iob diff --git a/objects/trees/birch/generic13.iob b/objects/birch-sespire/birch-5.iob similarity index 100% rename from objects/trees/birch/generic13.iob rename to objects/birch-sespire/birch-5.iob diff --git a/objects/trees/birch/generic14.iob b/objects/birch-sespire/birch-6.iob similarity index 100% rename from objects/trees/birch/generic14.iob rename to objects/birch-sespire/birch-6.iob diff --git a/objects/trees/birch/generic15.iob b/objects/birch-sespire/birch-7.iob similarity index 100% rename from objects/trees/birch/generic15.iob rename to objects/birch-sespire/birch-7.iob diff --git a/objects/trees/birch/generic16.iob b/objects/birch-sespire/birch-8.iob similarity index 100% rename from objects/trees/birch/generic16.iob rename to objects/birch-sespire/birch-8.iob diff --git a/objects/trees/birch/generic17.iob b/objects/birch-small/birch1.iob similarity index 100% rename from objects/trees/birch/generic17.iob rename to objects/birch-small/birch1.iob diff --git a/objects/trees/birch/generic24.iob b/objects/birch-small/birch10.iob similarity index 100% rename from objects/trees/birch/generic24.iob rename to objects/birch-small/birch10.iob diff --git a/objects/trees/birch/generic25.iob b/objects/birch-small/birch11.iob similarity index 100% rename from objects/trees/birch/generic25.iob rename to objects/birch-small/birch11.iob diff --git a/objects/trees/birch/generic26.iob b/objects/birch-small/birch12.iob similarity index 100% rename from objects/trees/birch/generic26.iob rename to objects/birch-small/birch12.iob diff --git a/objects/trees/birch/generic27.iob b/objects/birch-small/birch13.iob similarity index 100% rename from objects/trees/birch/generic27.iob rename to objects/birch-small/birch13.iob diff --git a/objects/trees/birch/generic28.iob b/objects/birch-small/birch14.iob similarity index 100% rename from objects/trees/birch/generic28.iob rename to objects/birch-small/birch14.iob diff --git a/objects/trees/birch/generic29.iob b/objects/birch-small/birch15.iob similarity index 100% rename from objects/trees/birch/generic29.iob rename to objects/birch-small/birch15.iob diff --git a/objects/trees/birch/generic30.iob b/objects/birch-small/birch2.iob similarity index 100% rename from objects/trees/birch/generic30.iob rename to objects/birch-small/birch2.iob diff --git a/objects/trees/birch/generic31.iob b/objects/birch-small/birch3.iob similarity index 100% rename from objects/trees/birch/generic31.iob rename to objects/birch-small/birch3.iob diff --git a/objects/trees/birch/generic18.iob b/objects/birch-small/birch4.iob similarity index 100% rename from objects/trees/birch/generic18.iob rename to objects/birch-small/birch4.iob diff --git a/objects/trees/birch/generic19.iob b/objects/birch-small/birch5.iob similarity index 100% rename from objects/trees/birch/generic19.iob rename to objects/birch-small/birch5.iob diff --git a/objects/trees/birch/generic20.iob b/objects/birch-small/birch6.iob similarity index 100% rename from objects/trees/birch/generic20.iob rename to objects/birch-small/birch6.iob diff --git a/objects/trees/birch/generic21.iob b/objects/birch-small/birch7.iob similarity index 100% rename from objects/trees/birch/generic21.iob rename to objects/birch-small/birch7.iob diff --git a/objects/trees/birch/generic22.iob b/objects/birch-small/birch8.iob similarity index 100% rename from objects/trees/birch/generic22.iob rename to objects/birch-small/birch8.iob diff --git a/objects/trees/birch/generic23.iob b/objects/birch-small/birch9.iob similarity index 100% rename from objects/trees/birch/generic23.iob rename to objects/birch-small/birch9.iob diff --git a/objects/trees/birch/generic1.iob b/objects/birch/birch1.iob similarity index 100% rename from objects/trees/birch/generic1.iob rename to objects/birch/birch1.iob diff --git a/objects/trees/birch/generic2.iob b/objects/birch/birch2.iob similarity index 100% rename from objects/trees/birch/generic2.iob rename to objects/birch/birch2.iob diff --git a/objects/trees/birch/generic3.iob b/objects/birch/birch3.iob similarity index 100% rename from objects/trees/birch/generic3.iob rename to objects/birch/birch3.iob diff --git a/objects/trees/birch/generic4.iob b/objects/birch/birch4.iob similarity index 100% rename from objects/trees/birch/generic4.iob rename to objects/birch/birch4.iob diff --git a/objects/trees/birch/generic5.iob b/objects/birch/birch5.iob similarity index 100% rename from objects/trees/birch/generic5.iob rename to objects/birch/birch5.iob diff --git a/objects/trees/birch/generic6.iob b/objects/birch/birch6.iob similarity index 100% rename from objects/trees/birch/generic6.iob rename to objects/birch/birch6.iob diff --git a/objects/trees/birch/generic7.iob b/objects/birch/birch7.iob similarity index 100% rename from objects/trees/birch/generic7.iob rename to objects/birch/birch7.iob diff --git a/objects/trees/birch/generic8.iob b/objects/birch/birch8.iob similarity index 100% rename from objects/trees/birch/generic8.iob rename to objects/birch/birch8.iob diff --git a/objects/trees/sakura/ogbase2.iob b/objects/blosom-superlarge/blossom1.iob similarity index 100% rename from objects/trees/sakura/ogbase2.iob rename to objects/blosom-superlarge/blossom1.iob diff --git a/objects/trees/bonsai/smfallen1.iob b/objects/blossom-fallen/blossom1.iob similarity index 100% rename from objects/trees/bonsai/smfallen1.iob rename to objects/blossom-fallen/blossom1.iob diff --git a/objects/trees/sakura/mlarge9.iob b/objects/blossom-massive/blossom1.iob similarity index 100% rename from objects/trees/sakura/mlarge9.iob rename to objects/blossom-massive/blossom1.iob diff --git a/objects/trees/sakura/mlarge10.iob b/objects/blossom-massive/blossom2.iob similarity index 100% rename from objects/trees/sakura/mlarge10.iob rename to objects/blossom-massive/blossom2.iob diff --git a/objects/trees/sakura/mlarge11.iob b/objects/blossom-massive/blossom3.iob similarity index 100% rename from objects/trees/sakura/mlarge11.iob rename to objects/blossom-massive/blossom3.iob diff --git a/objects/trees/bonsai/smbase1.iob b/objects/blossom-supermassive/blossom1.iob similarity index 100% rename from objects/trees/bonsai/smbase1.iob rename to objects/blossom-supermassive/blossom1.iob diff --git a/objects/trees/sakura/smtaint1.iob b/objects/blossom-tainted/blossom1.iob similarity index 100% rename from objects/trees/sakura/smtaint1.iob rename to objects/blossom-tainted/blossom1.iob diff --git a/objects/trees/sakura/smwilt1.iob b/objects/blossom-wilted-supermassive/blossom1.iob similarity index 100% rename from objects/trees/sakura/smwilt1.iob rename to objects/blossom-wilted-supermassive/blossom1.iob diff --git a/objects/clutter/bombs/bomb.iob b/objects/bombs/bomb.iob similarity index 100% rename from objects/clutter/bombs/bomb.iob rename to objects/bombs/bomb.iob diff --git a/objects/clutter/bone-spire/BoneSpire1.iob b/objects/bone-spire/BoneSpire1.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire1.iob rename to objects/bone-spire/BoneSpire1.iob diff --git a/objects/clutter/bone-spire/BoneSpire10.iob b/objects/bone-spire/BoneSpire10.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire10.iob rename to objects/bone-spire/BoneSpire10.iob diff --git a/objects/clutter/bone-spire/BoneSpire11.iob b/objects/bone-spire/BoneSpire11.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire11.iob rename to objects/bone-spire/BoneSpire11.iob diff --git a/objects/clutter/bone-spire/BoneSpire12.iob b/objects/bone-spire/BoneSpire12.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire12.iob rename to objects/bone-spire/BoneSpire12.iob diff --git a/objects/clutter/bone-spire/BoneSpire13.iob b/objects/bone-spire/BoneSpire13.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire13.iob rename to objects/bone-spire/BoneSpire13.iob diff --git a/objects/clutter/bone-spire/BoneSpire14.iob b/objects/bone-spire/BoneSpire14.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire14.iob rename to objects/bone-spire/BoneSpire14.iob diff --git a/objects/clutter/bone-spire/BoneSpire15.iob b/objects/bone-spire/BoneSpire15.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire15.iob rename to objects/bone-spire/BoneSpire15.iob diff --git a/objects/clutter/bone-spire/BoneSpire16.iob b/objects/bone-spire/BoneSpire16.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire16.iob rename to objects/bone-spire/BoneSpire16.iob diff --git a/objects/clutter/bone-spire/BoneSpire17.iob b/objects/bone-spire/BoneSpire17.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire17.iob rename to objects/bone-spire/BoneSpire17.iob diff --git a/objects/clutter/bone-spire/BoneSpire18.iob b/objects/bone-spire/BoneSpire18.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire18.iob rename to objects/bone-spire/BoneSpire18.iob diff --git a/objects/clutter/bone-spire/BoneSpire19.iob b/objects/bone-spire/BoneSpire19.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire19.iob rename to objects/bone-spire/BoneSpire19.iob diff --git a/objects/clutter/bone-spire/BoneSpire2.iob b/objects/bone-spire/BoneSpire2.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire2.iob rename to objects/bone-spire/BoneSpire2.iob diff --git a/objects/clutter/bone-spire/BoneSpire20.iob b/objects/bone-spire/BoneSpire20.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire20.iob rename to objects/bone-spire/BoneSpire20.iob diff --git a/objects/clutter/bone-spire/BoneSpire3.iob b/objects/bone-spire/BoneSpire3.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire3.iob rename to objects/bone-spire/BoneSpire3.iob diff --git a/objects/clutter/bone-spire/BoneSpire4.iob b/objects/bone-spire/BoneSpire4.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire4.iob rename to objects/bone-spire/BoneSpire4.iob diff --git a/objects/clutter/bone-spire/BoneSpire5.iob b/objects/bone-spire/BoneSpire5.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire5.iob rename to objects/bone-spire/BoneSpire5.iob diff --git a/objects/clutter/bone-spire/BoneSpire6.iob b/objects/bone-spire/BoneSpire6.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire6.iob rename to objects/bone-spire/BoneSpire6.iob diff --git a/objects/clutter/bone-spire/BoneSpire7.iob b/objects/bone-spire/BoneSpire7.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire7.iob rename to objects/bone-spire/BoneSpire7.iob diff --git a/objects/clutter/bone-spire/BoneSpire8.iob b/objects/bone-spire/BoneSpire8.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire8.iob rename to objects/bone-spire/BoneSpire8.iob diff --git a/objects/clutter/bone-spire/BoneSpire9.iob b/objects/bone-spire/BoneSpire9.iob similarity index 100% rename from objects/clutter/bone-spire/BoneSpire9.iob rename to objects/bone-spire/BoneSpire9.iob diff --git a/objects/clutter/bones/Bone1.iob b/objects/bones/Bone1.iob similarity index 100% rename from objects/clutter/bones/Bone1.iob rename to objects/bones/Bone1.iob diff --git a/objects/clutter/bones/Bone2.iob b/objects/bones/Bone2.iob similarity index 100% rename from objects/clutter/bones/Bone2.iob rename to objects/bones/Bone2.iob diff --git a/objects/clutter/bones/Bone3.iob b/objects/bones/Bone3.iob similarity index 100% rename from objects/clutter/bones/Bone3.iob rename to objects/bones/Bone3.iob diff --git a/objects/clutter/bones/Bone4.iob b/objects/bones/Bone4.iob similarity index 100% rename from objects/clutter/bones/Bone4.iob rename to objects/bones/Bone4.iob diff --git a/objects/clutter/bones/Bone5.iob b/objects/bones/Bone5.iob similarity index 100% rename from objects/clutter/bones/Bone5.iob rename to objects/bones/Bone5.iob diff --git a/objects/clutter/bones/Bone6.iob b/objects/bones/Bone6.iob similarity index 100% rename from objects/clutter/bones/Bone6.iob rename to objects/bones/Bone6.iob diff --git a/objects/clutter/bones/Bone7.iob b/objects/bones/Bone7.iob similarity index 100% rename from objects/clutter/bones/Bone7.iob rename to objects/bones/Bone7.iob diff --git a/objects/trees/bonsai/frolow1.iob b/objects/bonsai-ice/IcePadBonsai1.iob similarity index 100% rename from objects/trees/bonsai/frolow1.iob rename to objects/bonsai-ice/IcePadBonsai1.iob diff --git a/objects/trees/bonsai/frolow2.iob b/objects/bonsai-ice/IcePadBonsai10.iob similarity index 100% rename from objects/trees/bonsai/frolow2.iob rename to objects/bonsai-ice/IcePadBonsai10.iob diff --git a/objects/trees/bonsai/frolow3.iob b/objects/bonsai-ice/IcePadBonsai11.iob similarity index 100% rename from objects/trees/bonsai/frolow3.iob rename to objects/bonsai-ice/IcePadBonsai11.iob diff --git a/objects/trees/bonsai/frolow4.iob b/objects/bonsai-ice/IcePadBonsai12.iob similarity index 100% rename from objects/trees/bonsai/frolow4.iob rename to objects/bonsai-ice/IcePadBonsai12.iob diff --git a/objects/trees/bonsai/frolow5.iob b/objects/bonsai-ice/IcePadBonsai13.iob similarity index 100% rename from objects/trees/bonsai/frolow5.iob rename to objects/bonsai-ice/IcePadBonsai13.iob diff --git a/objects/trees/bonsai/frolow6.iob b/objects/bonsai-ice/IcePadBonsai14.iob similarity index 100% rename from objects/trees/bonsai/frolow6.iob rename to objects/bonsai-ice/IcePadBonsai14.iob diff --git a/objects/trees/bonsai/frolow7.iob b/objects/bonsai-ice/IcePadBonsai15.iob similarity index 100% rename from objects/trees/bonsai/frolow7.iob rename to objects/bonsai-ice/IcePadBonsai15.iob diff --git a/objects/trees/bonsai/frolow8.iob b/objects/bonsai-ice/IcePadBonsai16.iob similarity index 100% rename from objects/trees/bonsai/frolow8.iob rename to objects/bonsai-ice/IcePadBonsai16.iob diff --git a/objects/trees/bonsai/frolow9.iob b/objects/bonsai-ice/IcePadBonsai2.iob similarity index 100% rename from objects/trees/bonsai/frolow9.iob rename to objects/bonsai-ice/IcePadBonsai2.iob diff --git a/objects/trees/bonsai/frolow10.iob b/objects/bonsai-ice/IcePadBonsai3.iob similarity index 100% rename from objects/trees/bonsai/frolow10.iob rename to objects/bonsai-ice/IcePadBonsai3.iob diff --git a/objects/trees/bonsai/frolow11.iob b/objects/bonsai-ice/IcePadBonsai4.iob similarity index 100% rename from objects/trees/bonsai/frolow11.iob rename to objects/bonsai-ice/IcePadBonsai4.iob diff --git a/objects/trees/bonsai/frolow12.iob b/objects/bonsai-ice/IcePadBonsai5.iob similarity index 100% rename from objects/trees/bonsai/frolow12.iob rename to objects/bonsai-ice/IcePadBonsai5.iob diff --git a/objects/trees/bonsai/frolow13.iob b/objects/bonsai-ice/IcePadBonsai6.iob similarity index 100% rename from objects/trees/bonsai/frolow13.iob rename to objects/bonsai-ice/IcePadBonsai6.iob diff --git a/objects/trees/bonsai/frolow14.iob b/objects/bonsai-ice/IcePadBonsai7.iob similarity index 100% rename from objects/trees/bonsai/frolow14.iob rename to objects/bonsai-ice/IcePadBonsai7.iob diff --git a/objects/trees/bonsai/frolow15.iob b/objects/bonsai-ice/IcePadBonsai8.iob similarity index 100% rename from objects/trees/bonsai/frolow15.iob rename to objects/bonsai-ice/IcePadBonsai8.iob diff --git a/objects/trees/bonsai/frolow16.iob b/objects/bonsai-ice/IcePadBonsai9.iob similarity index 100% rename from objects/trees/bonsai/frolow16.iob rename to objects/bonsai-ice/IcePadBonsai9.iob diff --git a/objects/trees/bonsai/smbon1.iob b/objects/bonsai-massive/bonsai1.iob similarity index 100% rename from objects/trees/bonsai/smbon1.iob rename to objects/bonsai-massive/bonsai1.iob diff --git a/objects/trees/bonsai/smbon2.iob b/objects/bonsai-massive/bonsai2.iob similarity index 100% rename from objects/trees/bonsai/smbon2.iob rename to objects/bonsai-massive/bonsai2.iob diff --git a/objects/trees/bonsai/smbon3.iob b/objects/bonsai-massive/bonsai3.iob similarity index 100% rename from objects/trees/bonsai/smbon3.iob rename to objects/bonsai-massive/bonsai3.iob diff --git a/objects/trees/bonsai/big-1.iob b/objects/bonsai/big-1.iob similarity index 100% rename from objects/trees/bonsai/big-1.iob rename to objects/bonsai/big-1.iob diff --git a/objects/trees/bonsai/big-2.iob b/objects/bonsai/big-2.iob similarity index 100% rename from objects/trees/bonsai/big-2.iob rename to objects/bonsai/big-2.iob diff --git a/objects/trees/bonsai/big-3.iob b/objects/bonsai/big-3.iob similarity index 100% rename from objects/trees/bonsai/big-3.iob rename to objects/bonsai/big-3.iob diff --git a/objects/trees/bonsai/big-4.iob b/objects/bonsai/big-4.iob similarity index 100% rename from objects/trees/bonsai/big-4.iob rename to objects/bonsai/big-4.iob diff --git a/objects/trees/bonsai/big-5.iob b/objects/bonsai/big-5.iob similarity index 100% rename from objects/trees/bonsai/big-5.iob rename to objects/bonsai/big-5.iob diff --git a/objects/trees/bonsai/big-6.iob b/objects/bonsai/big-6.iob similarity index 100% rename from objects/trees/bonsai/big-6.iob rename to objects/bonsai/big-6.iob diff --git a/objects/trees/bonsai/big-7.iob b/objects/bonsai/big-7.iob similarity index 100% rename from objects/trees/bonsai/big-7.iob rename to objects/bonsai/big-7.iob diff --git a/objects/trees/bonsai/med-1.iob b/objects/bonsai/med-1.iob similarity index 100% rename from objects/trees/bonsai/med-1.iob rename to objects/bonsai/med-1.iob diff --git a/objects/trees/bonsai/med-2.iob b/objects/bonsai/med-2.iob similarity index 100% rename from objects/trees/bonsai/med-2.iob rename to objects/bonsai/med-2.iob diff --git a/objects/trees/bonsai/med-3.iob b/objects/bonsai/med-3.iob similarity index 100% rename from objects/trees/bonsai/med-3.iob rename to objects/bonsai/med-3.iob diff --git a/objects/trees/bonsai/med-4.iob b/objects/bonsai/med-4.iob similarity index 100% rename from objects/trees/bonsai/med-4.iob rename to objects/bonsai/med-4.iob diff --git a/objects/clutter/boulder-stone/boulder1.iob b/objects/boulder-stone/boulder1.iob similarity index 100% rename from objects/clutter/boulder-stone/boulder1.iob rename to objects/boulder-stone/boulder1.iob diff --git a/objects/clutter/boulder-stone/boulder10.iob b/objects/boulder-stone/boulder10.iob similarity index 100% rename from objects/clutter/boulder-stone/boulder10.iob rename to objects/boulder-stone/boulder10.iob diff --git a/objects/clutter/boulder-stone/boulder11.iob b/objects/boulder-stone/boulder11.iob similarity index 100% rename from objects/clutter/boulder-stone/boulder11.iob rename to objects/boulder-stone/boulder11.iob diff --git a/objects/clutter/boulder-stone/boulder12.iob b/objects/boulder-stone/boulder12.iob similarity index 100% rename from objects/clutter/boulder-stone/boulder12.iob rename to objects/boulder-stone/boulder12.iob diff --git a/objects/clutter/boulder-stone/boulder13.iob b/objects/boulder-stone/boulder13.iob similarity index 100% rename from objects/clutter/boulder-stone/boulder13.iob rename to objects/boulder-stone/boulder13.iob diff --git a/objects/clutter/boulder-stone/boulder14.iob b/objects/boulder-stone/boulder14.iob similarity index 100% rename from objects/clutter/boulder-stone/boulder14.iob rename to objects/boulder-stone/boulder14.iob diff --git a/objects/clutter/boulder-stone/boulder15.iob b/objects/boulder-stone/boulder15.iob similarity index 100% rename from objects/clutter/boulder-stone/boulder15.iob rename to objects/boulder-stone/boulder15.iob diff --git a/objects/clutter/boulder-stone/boulder2.iob b/objects/boulder-stone/boulder2.iob similarity index 100% rename from objects/clutter/boulder-stone/boulder2.iob rename to objects/boulder-stone/boulder2.iob diff --git a/objects/clutter/boulder-stone/boulder3.iob b/objects/boulder-stone/boulder3.iob similarity index 100% rename from objects/clutter/boulder-stone/boulder3.iob rename to objects/boulder-stone/boulder3.iob diff --git a/objects/clutter/boulder-stone/boulder4.iob b/objects/boulder-stone/boulder4.iob similarity index 100% rename from objects/clutter/boulder-stone/boulder4.iob rename to objects/boulder-stone/boulder4.iob diff --git a/objects/clutter/boulder-stone/boulder5.iob b/objects/boulder-stone/boulder5.iob similarity index 100% rename from objects/clutter/boulder-stone/boulder5.iob rename to objects/boulder-stone/boulder5.iob diff --git a/objects/clutter/boulder-stone/boulder6.iob b/objects/boulder-stone/boulder6.iob similarity index 100% rename from objects/clutter/boulder-stone/boulder6.iob rename to objects/boulder-stone/boulder6.iob diff --git a/objects/clutter/boulder-stone/boulder7.iob b/objects/boulder-stone/boulder7.iob similarity index 100% rename from objects/clutter/boulder-stone/boulder7.iob rename to objects/boulder-stone/boulder7.iob diff --git a/objects/clutter/boulder-stone/boulder8.iob b/objects/boulder-stone/boulder8.iob similarity index 100% rename from objects/clutter/boulder-stone/boulder8.iob rename to objects/boulder-stone/boulder8.iob diff --git a/objects/clutter/boulder-stone/boulder9.iob b/objects/boulder-stone/boulder9.iob similarity index 100% rename from objects/clutter/boulder-stone/boulder9.iob rename to objects/boulder-stone/boulder9.iob diff --git a/objects/clutter/boulder/boulder1.iob b/objects/boulder/boulder1.iob similarity index 100% rename from objects/clutter/boulder/boulder1.iob rename to objects/boulder/boulder1.iob diff --git a/objects/clutter/boulder/boulder10.iob b/objects/boulder/boulder10.iob similarity index 100% rename from objects/clutter/boulder/boulder10.iob rename to objects/boulder/boulder10.iob diff --git a/objects/clutter/boulder/boulder11.iob b/objects/boulder/boulder11.iob similarity index 100% rename from objects/clutter/boulder/boulder11.iob rename to objects/boulder/boulder11.iob diff --git a/objects/clutter/boulder/boulder12.iob b/objects/boulder/boulder12.iob similarity index 100% rename from objects/clutter/boulder/boulder12.iob rename to objects/boulder/boulder12.iob diff --git a/objects/clutter/boulder/boulder13.iob b/objects/boulder/boulder13.iob similarity index 100% rename from objects/clutter/boulder/boulder13.iob rename to objects/boulder/boulder13.iob diff --git a/objects/clutter/boulder/boulder14.iob b/objects/boulder/boulder14.iob similarity index 100% rename from objects/clutter/boulder/boulder14.iob rename to objects/boulder/boulder14.iob diff --git a/objects/clutter/boulder/boulder15.iob b/objects/boulder/boulder15.iob similarity index 100% rename from objects/clutter/boulder/boulder15.iob rename to objects/boulder/boulder15.iob diff --git a/objects/clutter/boulder/boulder2.iob b/objects/boulder/boulder2.iob similarity index 100% rename from objects/clutter/boulder/boulder2.iob rename to objects/boulder/boulder2.iob diff --git a/objects/clutter/boulder/boulder3.iob b/objects/boulder/boulder3.iob similarity index 100% rename from objects/clutter/boulder/boulder3.iob rename to objects/boulder/boulder3.iob diff --git a/objects/clutter/boulder/boulder4.iob b/objects/boulder/boulder4.iob similarity index 100% rename from objects/clutter/boulder/boulder4.iob rename to objects/boulder/boulder4.iob diff --git a/objects/clutter/boulder/boulder5.iob b/objects/boulder/boulder5.iob similarity index 100% rename from objects/clutter/boulder/boulder5.iob rename to objects/boulder/boulder5.iob diff --git a/objects/clutter/boulder/boulder6.iob b/objects/boulder/boulder6.iob similarity index 100% rename from objects/clutter/boulder/boulder6.iob rename to objects/boulder/boulder6.iob diff --git a/objects/clutter/boulder/boulder7.iob b/objects/boulder/boulder7.iob similarity index 100% rename from objects/clutter/boulder/boulder7.iob rename to objects/boulder/boulder7.iob diff --git a/objects/clutter/boulder/boulder8.iob b/objects/boulder/boulder8.iob similarity index 100% rename from objects/clutter/boulder/boulder8.iob rename to objects/boulder/boulder8.iob diff --git a/objects/clutter/boulder/boulder9.iob b/objects/boulder/boulder9.iob similarity index 100% rename from objects/clutter/boulder/boulder9.iob rename to objects/boulder/boulder9.iob diff --git a/objects/clutter/bush/small/1.iob b/objects/bush/small/1.iob similarity index 100% rename from objects/clutter/bush/small/1.iob rename to objects/bush/small/1.iob diff --git a/objects/clutter/bush/small/2.iob b/objects/bush/small/2.iob similarity index 100% rename from objects/clutter/bush/small/2.iob rename to objects/bush/small/2.iob diff --git a/objects/clutter/bush/small/3.iob b/objects/bush/small/3.iob similarity index 100% rename from objects/clutter/bush/small/3.iob rename to objects/bush/small/3.iob diff --git a/objects/clutter/cactus-white/c1.iob b/objects/cactus-white/c1.iob similarity index 100% rename from objects/clutter/cactus-white/c1.iob rename to objects/cactus-white/c1.iob diff --git a/objects/clutter/cactus-white/c2.iob b/objects/cactus-white/c2.iob similarity index 100% rename from objects/clutter/cactus-white/c2.iob rename to objects/cactus-white/c2.iob diff --git a/objects/clutter/cactus-white/c3.iob b/objects/cactus-white/c3.iob similarity index 100% rename from objects/clutter/cactus-white/c3.iob rename to objects/cactus-white/c3.iob diff --git a/objects/clutter/cactus-white/c4.iob b/objects/cactus-white/c4.iob similarity index 100% rename from objects/clutter/cactus-white/c4.iob rename to objects/cactus-white/c4.iob diff --git a/objects/trees/darkoak/talldrift1.iob b/objects/cambian-drift/cambian-drift-3.iob similarity index 100% rename from objects/trees/darkoak/talldrift1.iob rename to objects/cambian-drift/cambian-drift-3.iob diff --git a/objects/trees/darkoak/talldrift2.iob b/objects/cambian-drift/cambian-drift-4.iob similarity index 100% rename from objects/trees/darkoak/talldrift2.iob rename to objects/cambian-drift/cambian-drift-4.iob diff --git a/objects/trees/darkoak/talldrift3.iob b/objects/cambian-drift/cambian-drift-5.iob similarity index 100% rename from objects/trees/darkoak/talldrift3.iob rename to objects/cambian-drift/cambian-drift-5.iob diff --git a/objects/trees/darkoak/talldrift4.iob b/objects/cambian-drift/cambian-drift-6.iob similarity index 100% rename from objects/trees/darkoak/talldrift4.iob rename to objects/cambian-drift/cambian-drift-6.iob diff --git a/objects/trees/darkoak/talldrift5.iob b/objects/cambian-drift/cambian-drift-7.iob similarity index 100% rename from objects/trees/darkoak/talldrift5.iob rename to objects/cambian-drift/cambian-drift-7.iob diff --git a/objects/trees/darkoak/talldrift6.iob b/objects/cambian-drift/cambian-drift-8.iob similarity index 100% rename from objects/trees/darkoak/talldrift6.iob rename to objects/cambian-drift/cambian-drift-8.iob diff --git a/objects/trees/darkoak/talldrift7.iob b/objects/cambian-drift/cambian-drift-9.iob similarity index 100% rename from objects/trees/darkoak/talldrift7.iob rename to objects/cambian-drift/cambian-drift-9.iob diff --git a/objects/trees/darkoak/talldrift8.iob b/objects/cambian-drift/cambian_drift-1.iob similarity index 100% rename from objects/trees/darkoak/talldrift8.iob rename to objects/cambian-drift/cambian_drift-1.iob diff --git a/objects/trees/darkoak/talldrift9.iob b/objects/cambian-drift/cambian_drift-2.iob similarity index 100% rename from objects/trees/darkoak/talldrift9.iob rename to objects/cambian-drift/cambian_drift-2.iob diff --git a/objects/clutter/camp/barrel-bin.iob b/objects/camp/barrel-bin.iob similarity index 100% rename from objects/clutter/camp/barrel-bin.iob rename to objects/camp/barrel-bin.iob diff --git a/objects/clutter/camp/camp.iob b/objects/camp/camp.iob similarity index 100% rename from objects/clutter/camp/camp.iob rename to objects/camp/camp.iob diff --git a/objects/clutter/camp/camp2.iob b/objects/camp/camp2.iob similarity index 100% rename from objects/clutter/camp/camp2.iob rename to objects/camp/camp2.iob diff --git a/objects/clutter/camp/camp3.iob b/objects/camp/camp3.iob similarity index 100% rename from objects/clutter/camp/camp3.iob rename to objects/camp/camp3.iob diff --git a/objects/clutter/camp/camp4.iob b/objects/camp/camp4.iob similarity index 100% rename from objects/clutter/camp/camp4.iob rename to objects/camp/camp4.iob diff --git a/objects/clutter/camp/camp5.iob b/objects/camp/camp5.iob similarity index 100% rename from objects/clutter/camp/camp5.iob rename to objects/camp/camp5.iob diff --git a/objects/clutter/camp/soul-camp.iob b/objects/camp/soul-camp.iob similarity index 100% rename from objects/clutter/camp/soul-camp.iob rename to objects/camp/soul-camp.iob diff --git a/objects/structures/caves/cave1.iob b/objects/caves/cave1.iob similarity index 100% rename from objects/structures/caves/cave1.iob rename to objects/caves/cave1.iob diff --git a/objects/structures/caves/cave2.iob b/objects/caves/cave2.iob similarity index 100% rename from objects/structures/caves/cave2.iob rename to objects/caves/cave2.iob diff --git a/objects/structures/caves/cave3.iob b/objects/caves/cave3.iob similarity index 100% rename from objects/structures/caves/cave3.iob rename to objects/caves/cave3.iob diff --git a/objects/structures/caves/cave4.iob b/objects/caves/cave4.iob similarity index 100% rename from objects/structures/caves/cave4.iob rename to objects/caves/cave4.iob diff --git a/objects/structures/caves/cave5.iob b/objects/caves/cave5.iob similarity index 100% rename from objects/structures/caves/cave5.iob rename to objects/caves/cave5.iob diff --git a/objects/structures/caves/cave6.iob b/objects/caves/cave6.iob similarity index 100% rename from objects/structures/caves/cave6.iob rename to objects/caves/cave6.iob diff --git a/objects/clutter/clutter/JClutter1.iob b/objects/clutter/JClutter1.iob similarity index 100% rename from objects/clutter/clutter/JClutter1.iob rename to objects/clutter/JClutter1.iob diff --git a/objects/clutter/clutter/JClutter10.iob b/objects/clutter/JClutter10.iob similarity index 100% rename from objects/clutter/clutter/JClutter10.iob rename to objects/clutter/JClutter10.iob diff --git a/objects/clutter/clutter/JClutter11.iob b/objects/clutter/JClutter11.iob similarity index 100% rename from objects/clutter/clutter/JClutter11.iob rename to objects/clutter/JClutter11.iob diff --git a/objects/clutter/clutter/JClutter12.iob b/objects/clutter/JClutter12.iob similarity index 100% rename from objects/clutter/clutter/JClutter12.iob rename to objects/clutter/JClutter12.iob diff --git a/objects/clutter/clutter/JClutter13.iob b/objects/clutter/JClutter13.iob similarity index 100% rename from objects/clutter/clutter/JClutter13.iob rename to objects/clutter/JClutter13.iob diff --git a/objects/clutter/clutter/JClutter2.iob b/objects/clutter/JClutter2.iob similarity index 100% rename from objects/clutter/clutter/JClutter2.iob rename to objects/clutter/JClutter2.iob diff --git a/objects/clutter/clutter/JClutter3.iob b/objects/clutter/JClutter3.iob similarity index 100% rename from objects/clutter/clutter/JClutter3.iob rename to objects/clutter/JClutter3.iob diff --git a/objects/clutter/clutter/JClutter4.iob b/objects/clutter/JClutter4.iob similarity index 100% rename from objects/clutter/clutter/JClutter4.iob rename to objects/clutter/JClutter4.iob diff --git a/objects/clutter/clutter/JClutter5.iob b/objects/clutter/JClutter5.iob similarity index 100% rename from objects/clutter/clutter/JClutter5.iob rename to objects/clutter/JClutter5.iob diff --git a/objects/clutter/clutter/JClutter6.iob b/objects/clutter/JClutter6.iob similarity index 100% rename from objects/clutter/clutter/JClutter6.iob rename to objects/clutter/JClutter6.iob diff --git a/objects/clutter/clutter/JClutter7.iob b/objects/clutter/JClutter7.iob similarity index 100% rename from objects/clutter/clutter/JClutter7.iob rename to objects/clutter/JClutter7.iob diff --git a/objects/clutter/clutter/JClutter8.iob b/objects/clutter/JClutter8.iob similarity index 100% rename from objects/clutter/clutter/JClutter8.iob rename to objects/clutter/JClutter8.iob diff --git a/objects/clutter/clutter/JClutter9.iob b/objects/clutter/JClutter9.iob similarity index 100% rename from objects/clutter/clutter/JClutter9.iob rename to objects/clutter/JClutter9.iob diff --git a/objects/clutter/clutter/Jstone1.iob b/objects/clutter/Jstone1.iob similarity index 100% rename from objects/clutter/clutter/Jstone1.iob rename to objects/clutter/Jstone1.iob diff --git a/objects/clutter/clutter/Jstone2.iob b/objects/clutter/Jstone2.iob similarity index 100% rename from objects/clutter/clutter/Jstone2.iob rename to objects/clutter/Jstone2.iob diff --git a/objects/clutter/clutter/birch-clutt-1.iob b/objects/clutter/birch-clutt-1.iob similarity index 100% rename from objects/clutter/clutter/birch-clutt-1.iob rename to objects/clutter/birch-clutt-1.iob diff --git a/objects/clutter/clutter/birch-clutt-2.iob b/objects/clutter/birch-clutt-2.iob similarity index 100% rename from objects/clutter/clutter/birch-clutt-2.iob rename to objects/clutter/birch-clutt-2.iob diff --git a/objects/clutter/clutter/birch-clutt-3.iob b/objects/clutter/birch-clutt-3.iob similarity index 100% rename from objects/clutter/clutter/birch-clutt-3.iob rename to objects/clutter/birch-clutt-3.iob diff --git a/objects/clutter/clutter/birch-clutt-4.iob b/objects/clutter/birch-clutt-4.iob similarity index 100% rename from objects/clutter/clutter/birch-clutt-4.iob rename to objects/clutter/birch-clutt-4.iob diff --git a/objects/clutter/clutter/birch-clutt-5.iob b/objects/clutter/birch-clutt-5.iob similarity index 100% rename from objects/clutter/clutter/birch-clutt-5.iob rename to objects/clutter/birch-clutt-5.iob diff --git a/objects/clutter/clutter/desert-post1.iob b/objects/clutter/desert-post1.iob similarity index 100% rename from objects/clutter/clutter/desert-post1.iob rename to objects/clutter/desert-post1.iob diff --git a/objects/clutter/clutter/desert-post2.iob b/objects/clutter/desert-post2.iob similarity index 100% rename from objects/clutter/clutter/desert-post2.iob rename to objects/clutter/desert-post2.iob diff --git a/objects/clutter/clutter/desert-post3.iob b/objects/clutter/desert-post3.iob similarity index 100% rename from objects/clutter/clutter/desert-post3.iob rename to objects/clutter/desert-post3.iob diff --git a/objects/clutter/clutter/doak-spec-1.iob b/objects/clutter/doak-spec-1.iob similarity index 100% rename from objects/clutter/clutter/doak-spec-1.iob rename to objects/clutter/doak-spec-1.iob diff --git a/objects/clutter/clutter/doak-spec-2.iob b/objects/clutter/doak-spec-2.iob similarity index 100% rename from objects/clutter/clutter/doak-spec-2.iob rename to objects/clutter/doak-spec-2.iob diff --git a/objects/clutter/clutter/doak-spec-3.iob b/objects/clutter/doak-spec-3.iob similarity index 100% rename from objects/clutter/clutter/doak-spec-3.iob rename to objects/clutter/doak-spec-3.iob diff --git a/objects/clutter/clutter/oak-clutt-1.iob b/objects/clutter/oak-clutt-1.iob similarity index 100% rename from objects/clutter/clutter/oak-clutt-1.iob rename to objects/clutter/oak-clutt-1.iob diff --git a/objects/clutter/clutter/oak-clutt-2.iob b/objects/clutter/oak-clutt-2.iob similarity index 100% rename from objects/clutter/clutter/oak-clutt-2.iob rename to objects/clutter/oak-clutt-2.iob diff --git a/objects/clutter/clutter/oak-clutt-3.iob b/objects/clutter/oak-clutt-3.iob similarity index 100% rename from objects/clutter/clutter/oak-clutt-3.iob rename to objects/clutter/oak-clutt-3.iob diff --git a/objects/clutter/clutter/oak-clutt-4.iob b/objects/clutter/oak-clutt-4.iob similarity index 100% rename from objects/clutter/clutter/oak-clutt-4.iob rename to objects/clutter/oak-clutt-4.iob diff --git a/objects/clutter/clutter/oak-clutt-5.iob b/objects/clutter/oak-clutt-5.iob similarity index 100% rename from objects/clutter/clutter/oak-clutt-5.iob rename to objects/clutter/oak-clutt-5.iob diff --git a/objects/clutter/clutter/spruce-clutt-1.iob b/objects/clutter/spruce-clutt-1.iob similarity index 100% rename from objects/clutter/clutter/spruce-clutt-1.iob rename to objects/clutter/spruce-clutt-1.iob diff --git a/objects/clutter/clutter/spruce-clutt-2.iob b/objects/clutter/spruce-clutt-2.iob similarity index 100% rename from objects/clutter/clutter/spruce-clutt-2.iob rename to objects/clutter/spruce-clutt-2.iob diff --git a/objects/clutter/clutter/spruce-clutt-3.iob b/objects/clutter/spruce-clutt-3.iob similarity index 100% rename from objects/clutter/clutter/spruce-clutt-3.iob rename to objects/clutter/spruce-clutt-3.iob diff --git a/objects/clutter/clutter/spruce-clutt-4.iob b/objects/clutter/spruce-clutt-4.iob similarity index 100% rename from objects/clutter/clutter/spruce-clutt-4.iob rename to objects/clutter/spruce-clutt-4.iob diff --git a/objects/clutter/clutter/spruce-clutt-5.iob b/objects/clutter/spruce-clutt-5.iob similarity index 100% rename from objects/clutter/clutter/spruce-clutt-5.iob rename to objects/clutter/spruce-clutt-5.iob diff --git a/objects/clutter/clutter/spruce-clutter.iob b/objects/clutter/spruce-clutter.iob similarity index 100% rename from objects/clutter/clutter/spruce-clutter.iob rename to objects/clutter/spruce-clutter.iob diff --git a/objects/clutter/clutter/stone-clutt-1.iob b/objects/clutter/stone-clutt-1.iob similarity index 100% rename from objects/clutter/clutter/stone-clutt-1.iob rename to objects/clutter/stone-clutt-1.iob diff --git a/objects/clutter/clutter/stone-clutt-2.iob b/objects/clutter/stone-clutt-2.iob similarity index 100% rename from objects/clutter/clutter/stone-clutt-2.iob rename to objects/clutter/stone-clutt-2.iob diff --git a/objects/clutter/clutter/stone-clutt-3.iob b/objects/clutter/stone-clutt-3.iob similarity index 100% rename from objects/clutter/clutter/stone-clutt-3.iob rename to objects/clutter/stone-clutt-3.iob diff --git a/objects/clutter/clutter/stone-clutt-4.iob b/objects/clutter/stone-clutt-4.iob similarity index 100% rename from objects/clutter/clutter/stone-clutt-4.iob rename to objects/clutter/stone-clutt-4.iob diff --git a/objects/clutter/clutter/stone-clutt-5.iob b/objects/clutter/stone-clutt-5.iob similarity index 100% rename from objects/clutter/clutter/stone-clutt-5.iob rename to objects/clutter/stone-clutt-5.iob diff --git a/objects/clutter/clutter/stone-clutt-6.iob b/objects/clutter/stone-clutt-6.iob similarity index 100% rename from objects/clutter/clutter/stone-clutt-6.iob rename to objects/clutter/stone-clutt-6.iob diff --git a/objects/clutter/clutter/stone-clutt-7.iob b/objects/clutter/stone-clutt-7.iob similarity index 100% rename from objects/clutter/clutter/stone-clutt-7.iob rename to objects/clutter/stone-clutt-7.iob diff --git a/objects/clutter/clutter/subporta.iob b/objects/clutter/subporta.iob similarity index 100% rename from objects/clutter/clutter/subporta.iob rename to objects/clutter/subporta.iob diff --git a/objects/clutter/coral-rgb/coral-by-1.iob b/objects/coral-rgb/coral-by-1.iob similarity index 100% rename from objects/clutter/coral-rgb/coral-by-1.iob rename to objects/coral-rgb/coral-by-1.iob diff --git a/objects/clutter/coral-rgb/coral-by-2.iob b/objects/coral-rgb/coral-by-2.iob similarity index 100% rename from objects/clutter/coral-rgb/coral-by-2.iob rename to objects/coral-rgb/coral-by-2.iob diff --git a/objects/clutter/coral-rgb/coral-by-3.iob b/objects/coral-rgb/coral-by-3.iob similarity index 100% rename from objects/clutter/coral-rgb/coral-by-3.iob rename to objects/coral-rgb/coral-by-3.iob diff --git a/objects/clutter/coral-rgb/coral-by-4.iob b/objects/coral-rgb/coral-by-4.iob similarity index 100% rename from objects/clutter/coral-rgb/coral-by-4.iob rename to objects/coral-rgb/coral-by-4.iob diff --git a/objects/clutter/coral-rgb/coral-pink-1.iob b/objects/coral-rgb/coral-pink-1.iob similarity index 100% rename from objects/clutter/coral-rgb/coral-pink-1.iob rename to objects/coral-rgb/coral-pink-1.iob diff --git a/objects/clutter/coral-rgb/coral-pink-2.iob b/objects/coral-rgb/coral-pink-2.iob similarity index 100% rename from objects/clutter/coral-rgb/coral-pink-2.iob rename to objects/coral-rgb/coral-pink-2.iob diff --git a/objects/clutter/coral-rgb/coral-pink-3.iob b/objects/coral-rgb/coral-pink-3.iob similarity index 100% rename from objects/clutter/coral-rgb/coral-pink-3.iob rename to objects/coral-rgb/coral-pink-3.iob diff --git a/objects/clutter/coral-rgb/coral-pink-4.iob b/objects/coral-rgb/coral-pink-4.iob similarity index 100% rename from objects/clutter/coral-rgb/coral-pink-4.iob rename to objects/coral-rgb/coral-pink-4.iob diff --git a/objects/clutter/coral-rgb/coral-purp-1.iob b/objects/coral-rgb/coral-purp-1.iob similarity index 100% rename from objects/clutter/coral-rgb/coral-purp-1.iob rename to objects/coral-rgb/coral-purp-1.iob diff --git a/objects/clutter/coral-rgb/coral-purp-2.iob b/objects/coral-rgb/coral-purp-2.iob similarity index 100% rename from objects/clutter/coral-rgb/coral-purp-2.iob rename to objects/coral-rgb/coral-purp-2.iob diff --git a/objects/clutter/coral-rgb/coral-purp-3.iob b/objects/coral-rgb/coral-purp-3.iob similarity index 100% rename from objects/clutter/coral-rgb/coral-purp-3.iob rename to objects/coral-rgb/coral-purp-3.iob diff --git a/objects/clutter/coral-rgb/coral-red-1.iob b/objects/coral-rgb/coral-red-1.iob similarity index 100% rename from objects/clutter/coral-rgb/coral-red-1.iob rename to objects/coral-rgb/coral-red-1.iob diff --git a/objects/clutter/coral-rgb/coral-yellow-3.iob b/objects/coral-rgb/coral-yellow-3.iob similarity index 100% rename from objects/clutter/coral-rgb/coral-yellow-3.iob rename to objects/coral-rgb/coral-yellow-3.iob diff --git a/objects/clutter/coral/coral-by-1.iob b/objects/coral/coral-by-1.iob similarity index 100% rename from objects/clutter/coral/coral-by-1.iob rename to objects/coral/coral-by-1.iob diff --git a/objects/clutter/coral/coral-by-2.iob b/objects/coral/coral-by-2.iob similarity index 100% rename from objects/clutter/coral/coral-by-2.iob rename to objects/coral/coral-by-2.iob diff --git a/objects/clutter/coral/coral-by-3.iob b/objects/coral/coral-by-3.iob similarity index 100% rename from objects/clutter/coral/coral-by-3.iob rename to objects/coral/coral-by-3.iob diff --git a/objects/clutter/coral/coral-by-4.iob b/objects/coral/coral-by-4.iob similarity index 100% rename from objects/clutter/coral/coral-by-4.iob rename to objects/coral/coral-by-4.iob diff --git a/objects/clutter/coral/coral-pink-1.iob b/objects/coral/coral-pink-1.iob similarity index 100% rename from objects/clutter/coral/coral-pink-1.iob rename to objects/coral/coral-pink-1.iob diff --git a/objects/clutter/coral/coral-pink-2.iob b/objects/coral/coral-pink-2.iob similarity index 100% rename from objects/clutter/coral/coral-pink-2.iob rename to objects/coral/coral-pink-2.iob diff --git a/objects/clutter/coral/coral-pink-3.iob b/objects/coral/coral-pink-3.iob similarity index 100% rename from objects/clutter/coral/coral-pink-3.iob rename to objects/coral/coral-pink-3.iob diff --git a/objects/clutter/coral/coral-pink-4.iob b/objects/coral/coral-pink-4.iob similarity index 100% rename from objects/clutter/coral/coral-pink-4.iob rename to objects/coral/coral-pink-4.iob diff --git a/objects/clutter/coral/coral-purp-1.iob b/objects/coral/coral-purp-1.iob similarity index 100% rename from objects/clutter/coral/coral-purp-1.iob rename to objects/coral/coral-purp-1.iob diff --git a/objects/clutter/coral/coral-purp-2.iob b/objects/coral/coral-purp-2.iob similarity index 100% rename from objects/clutter/coral/coral-purp-2.iob rename to objects/coral/coral-purp-2.iob diff --git a/objects/clutter/coral/coral-purp-3.iob b/objects/coral/coral-purp-3.iob similarity index 100% rename from objects/clutter/coral/coral-purp-3.iob rename to objects/coral/coral-purp-3.iob diff --git a/objects/clutter/coral/coral-red-1.iob b/objects/coral/coral-red-1.iob similarity index 100% rename from objects/clutter/coral/coral-red-1.iob rename to objects/coral/coral-red-1.iob diff --git a/objects/clutter/coral/stonedirtsetter-1.iob b/objects/coral/stonedirtsetter-1.iob similarity index 100% rename from objects/clutter/coral/stonedirtsetter-1.iob rename to objects/coral/stonedirtsetter-1.iob diff --git a/objects/clutter/coral/stonedirtsetter-2.iob b/objects/coral/stonedirtsetter-2.iob similarity index 100% rename from objects/clutter/coral/stonedirtsetter-2.iob rename to objects/coral/stonedirtsetter-2.iob diff --git a/objects/clutter/coral/stonedirtsetter-3.iob b/objects/coral/stonedirtsetter-3.iob similarity index 100% rename from objects/clutter/coral/stonedirtsetter-3.iob rename to objects/coral/stonedirtsetter-3.iob diff --git a/objects/clutter/coral/stonedirtsetter-4.iob b/objects/coral/stonedirtsetter-4.iob similarity index 100% rename from objects/clutter/coral/stonedirtsetter-4.iob rename to objects/coral/stonedirtsetter-4.iob diff --git a/objects/clutter/coral/stonedirtsetter-5.iob b/objects/coral/stonedirtsetter-5.iob similarity index 100% rename from objects/clutter/coral/stonedirtsetter-5.iob rename to objects/coral/stonedirtsetter-5.iob diff --git a/objects/clutter/coral/stonedirtsetter-6.iob b/objects/coral/stonedirtsetter-6.iob similarity index 100% rename from objects/clutter/coral/stonedirtsetter-6.iob rename to objects/coral/stonedirtsetter-6.iob diff --git a/objects/clutter/coral/stonedirtsetter-7.iob b/objects/coral/stonedirtsetter-7.iob similarity index 100% rename from objects/clutter/coral/stonedirtsetter-7.iob rename to objects/coral/stonedirtsetter-7.iob diff --git a/objects/trees/mushroom/crimsonwood-1.iob b/objects/corrupted/crimsonwood-1.iob similarity index 100% rename from objects/trees/mushroom/crimsonwood-1.iob rename to objects/corrupted/crimsonwood-1.iob diff --git a/objects/trees/mushroom/crimsonwood-2.iob b/objects/corrupted/crimsonwood-2.iob similarity index 100% rename from objects/trees/mushroom/crimsonwood-2.iob rename to objects/corrupted/crimsonwood-2.iob diff --git a/objects/trees/mushroom/crimsonwood-3.iob b/objects/corrupted/crimsonwood-3.iob similarity index 100% rename from objects/trees/mushroom/crimsonwood-3.iob rename to objects/corrupted/crimsonwood-3.iob diff --git a/objects/trees/mushroom/crimsonwood-4.iob b/objects/corrupted/crimsonwood-4.iob similarity index 100% rename from objects/trees/mushroom/crimsonwood-4.iob rename to objects/corrupted/crimsonwood-4.iob diff --git a/objects/trees/mushroom/crimsonwood-5.iob b/objects/corrupted/crimsonwood-5.iob similarity index 100% rename from objects/trees/mushroom/crimsonwood-5.iob rename to objects/corrupted/crimsonwood-5.iob diff --git a/objects/trees/mushroom/warped1.iob b/objects/corrupted/warpedwood-1.iob similarity index 100% rename from objects/trees/mushroom/warped1.iob rename to objects/corrupted/warpedwood-1.iob diff --git a/objects/trees/mushroom/warped2.iob b/objects/corrupted/warpedwood-2.iob similarity index 100% rename from objects/trees/mushroom/warped2.iob rename to objects/corrupted/warpedwood-2.iob diff --git a/objects/trees/mushroom/warped3.iob b/objects/corrupted/warpedwood-3.iob similarity index 100% rename from objects/trees/mushroom/warped3.iob rename to objects/corrupted/warpedwood-3.iob diff --git a/objects/trees/mushroom/warped4.iob b/objects/corrupted/warpedwood-4.iob similarity index 100% rename from objects/trees/mushroom/warped4.iob rename to objects/corrupted/warpedwood-4.iob diff --git a/objects/trees/mushroom/warped5.iob b/objects/corrupted/warpedwood-5.iob similarity index 100% rename from objects/trees/mushroom/warped5.iob rename to objects/corrupted/warpedwood-5.iob diff --git a/objects/trees/mushroom/warped6.iob b/objects/corrupted/warpedwood-6.iob similarity index 100% rename from objects/trees/mushroom/warped6.iob rename to objects/corrupted/warpedwood-6.iob diff --git a/objects/trees/oak/croak1.iob b/objects/creepy-oak/FantasyOak1.iob similarity index 100% rename from objects/trees/oak/croak1.iob rename to objects/creepy-oak/FantasyOak1.iob diff --git a/objects/trees/oak/croak2.iob b/objects/creepy-oak/FantasyOak10.iob similarity index 100% rename from objects/trees/oak/croak2.iob rename to objects/creepy-oak/FantasyOak10.iob diff --git a/objects/trees/oak/croak3.iob b/objects/creepy-oak/FantasyOak11.iob similarity index 100% rename from objects/trees/oak/croak3.iob rename to objects/creepy-oak/FantasyOak11.iob diff --git a/objects/trees/oak/croak4.iob b/objects/creepy-oak/FantasyOak12.iob similarity index 100% rename from objects/trees/oak/croak4.iob rename to objects/creepy-oak/FantasyOak12.iob diff --git a/objects/trees/oak/croak5.iob b/objects/creepy-oak/FantasyOak13.iob similarity index 100% rename from objects/trees/oak/croak5.iob rename to objects/creepy-oak/FantasyOak13.iob diff --git a/objects/trees/oak/croak6.iob b/objects/creepy-oak/FantasyOak14.iob similarity index 100% rename from objects/trees/oak/croak6.iob rename to objects/creepy-oak/FantasyOak14.iob diff --git a/objects/trees/oak/croak7.iob b/objects/creepy-oak/FantasyOak15.iob similarity index 100% rename from objects/trees/oak/croak7.iob rename to objects/creepy-oak/FantasyOak15.iob diff --git a/objects/trees/oak/croak8.iob b/objects/creepy-oak/FantasyOak16.iob similarity index 100% rename from objects/trees/oak/croak8.iob rename to objects/creepy-oak/FantasyOak16.iob diff --git a/objects/trees/oak/croak9.iob b/objects/creepy-oak/FantasyOak17.iob similarity index 100% rename from objects/trees/oak/croak9.iob rename to objects/creepy-oak/FantasyOak17.iob diff --git a/objects/trees/oak/croak10.iob b/objects/creepy-oak/FantasyOak18.iob similarity index 100% rename from objects/trees/oak/croak10.iob rename to objects/creepy-oak/FantasyOak18.iob diff --git a/objects/trees/oak/croak11.iob b/objects/creepy-oak/FantasyOak19.iob similarity index 100% rename from objects/trees/oak/croak11.iob rename to objects/creepy-oak/FantasyOak19.iob diff --git a/objects/trees/oak/croak12.iob b/objects/creepy-oak/FantasyOak2.iob similarity index 100% rename from objects/trees/oak/croak12.iob rename to objects/creepy-oak/FantasyOak2.iob diff --git a/objects/trees/oak/croak13.iob b/objects/creepy-oak/FantasyOak3.iob similarity index 100% rename from objects/trees/oak/croak13.iob rename to objects/creepy-oak/FantasyOak3.iob diff --git a/objects/trees/oak/croak14.iob b/objects/creepy-oak/FantasyOak4.iob similarity index 100% rename from objects/trees/oak/croak14.iob rename to objects/creepy-oak/FantasyOak4.iob diff --git a/objects/trees/oak/croak15.iob b/objects/creepy-oak/FantasyOak5.iob similarity index 100% rename from objects/trees/oak/croak15.iob rename to objects/creepy-oak/FantasyOak5.iob diff --git a/objects/trees/oak/croak16.iob b/objects/creepy-oak/FantasyOak6.iob similarity index 100% rename from objects/trees/oak/croak16.iob rename to objects/creepy-oak/FantasyOak6.iob diff --git a/objects/trees/oak/croak17.iob b/objects/creepy-oak/FantasyOak7.iob similarity index 100% rename from objects/trees/oak/croak17.iob rename to objects/creepy-oak/FantasyOak7.iob diff --git a/objects/trees/oak/croak18.iob b/objects/creepy-oak/FantasyOak8.iob similarity index 100% rename from objects/trees/oak/croak18.iob rename to objects/creepy-oak/FantasyOak8.iob diff --git a/objects/trees/oak/croak19.iob b/objects/creepy-oak/FantasyOak9.iob similarity index 100% rename from objects/trees/oak/croak19.iob rename to objects/creepy-oak/FantasyOak9.iob diff --git a/objects/structures/crystal/crystal-1.iob b/objects/crystal/crystal-1.iob similarity index 100% rename from objects/structures/crystal/crystal-1.iob rename to objects/crystal/crystal-1.iob diff --git a/objects/structures/crystal/crystal-10.iob b/objects/crystal/crystal-10.iob similarity index 100% rename from objects/structures/crystal/crystal-10.iob rename to objects/crystal/crystal-10.iob diff --git a/objects/structures/crystal/crystal-2.iob b/objects/crystal/crystal-2.iob similarity index 100% rename from objects/structures/crystal/crystal-2.iob rename to objects/crystal/crystal-2.iob diff --git a/objects/structures/crystal/crystal-3.iob b/objects/crystal/crystal-3.iob similarity index 100% rename from objects/structures/crystal/crystal-3.iob rename to objects/crystal/crystal-3.iob diff --git a/objects/structures/crystal/crystal-4.iob b/objects/crystal/crystal-4.iob similarity index 100% rename from objects/structures/crystal/crystal-4.iob rename to objects/crystal/crystal-4.iob diff --git a/objects/structures/crystal/crystal-5.iob b/objects/crystal/crystal-5.iob similarity index 100% rename from objects/structures/crystal/crystal-5.iob rename to objects/crystal/crystal-5.iob diff --git a/objects/structures/crystal/crystal-6.iob b/objects/crystal/crystal-6.iob similarity index 100% rename from objects/structures/crystal/crystal-6.iob rename to objects/crystal/crystal-6.iob diff --git a/objects/structures/crystal/crystal-7.iob b/objects/crystal/crystal-7.iob similarity index 100% rename from objects/structures/crystal/crystal-7.iob rename to objects/crystal/crystal-7.iob diff --git a/objects/structures/crystal/crystal-8.iob b/objects/crystal/crystal-8.iob similarity index 100% rename from objects/structures/crystal/crystal-8.iob rename to objects/crystal/crystal-8.iob diff --git a/objects/structures/crystal/crystal-9.iob b/objects/crystal/crystal-9.iob similarity index 100% rename from objects/structures/crystal/crystal-9.iob rename to objects/crystal/crystal-9.iob diff --git a/objects/trees/darkoak/denmyre1.iob b/objects/dark-oak-medium/dark-oak-denmyre-1.iob similarity index 100% rename from objects/trees/darkoak/denmyre1.iob rename to objects/dark-oak-medium/dark-oak-denmyre-1.iob diff --git a/objects/trees/darkoak/denmyre2.iob b/objects/dark-oak-medium/dark-oak-denmyre-10.iob similarity index 100% rename from objects/trees/darkoak/denmyre2.iob rename to objects/dark-oak-medium/dark-oak-denmyre-10.iob diff --git a/objects/trees/darkoak/denmyre3.iob b/objects/dark-oak-medium/dark-oak-denmyre-11.iob similarity index 100% rename from objects/trees/darkoak/denmyre3.iob rename to objects/dark-oak-medium/dark-oak-denmyre-11.iob diff --git a/objects/trees/darkoak/denmyre4.iob b/objects/dark-oak-medium/dark-oak-denmyre-12.iob similarity index 100% rename from objects/trees/darkoak/denmyre4.iob rename to objects/dark-oak-medium/dark-oak-denmyre-12.iob diff --git a/objects/trees/darkoak/denmyre5.iob b/objects/dark-oak-medium/dark-oak-denmyre-13.iob similarity index 100% rename from objects/trees/darkoak/denmyre5.iob rename to objects/dark-oak-medium/dark-oak-denmyre-13.iob diff --git a/objects/trees/darkoak/denmyre6.iob b/objects/dark-oak-medium/dark-oak-denmyre-14.iob similarity index 100% rename from objects/trees/darkoak/denmyre6.iob rename to objects/dark-oak-medium/dark-oak-denmyre-14.iob diff --git a/objects/trees/darkoak/denmyre7.iob b/objects/dark-oak-medium/dark-oak-denmyre-15.iob similarity index 100% rename from objects/trees/darkoak/denmyre7.iob rename to objects/dark-oak-medium/dark-oak-denmyre-15.iob diff --git a/objects/trees/darkoak/denmyre8.iob b/objects/dark-oak-medium/dark-oak-denmyre-16.iob similarity index 100% rename from objects/trees/darkoak/denmyre8.iob rename to objects/dark-oak-medium/dark-oak-denmyre-16.iob diff --git a/objects/trees/darkoak/denmyre9.iob b/objects/dark-oak-medium/dark-oak-denmyre-2.iob similarity index 100% rename from objects/trees/darkoak/denmyre9.iob rename to objects/dark-oak-medium/dark-oak-denmyre-2.iob diff --git a/objects/trees/darkoak/denmyre10.iob b/objects/dark-oak-medium/dark-oak-denmyre-3.iob similarity index 100% rename from objects/trees/darkoak/denmyre10.iob rename to objects/dark-oak-medium/dark-oak-denmyre-3.iob diff --git a/objects/trees/darkoak/denmyre11.iob b/objects/dark-oak-medium/dark-oak-denmyre-4.iob similarity index 100% rename from objects/trees/darkoak/denmyre11.iob rename to objects/dark-oak-medium/dark-oak-denmyre-4.iob diff --git a/objects/trees/darkoak/denmyre12.iob b/objects/dark-oak-medium/dark-oak-denmyre-5.iob similarity index 100% rename from objects/trees/darkoak/denmyre12.iob rename to objects/dark-oak-medium/dark-oak-denmyre-5.iob diff --git a/objects/trees/darkoak/denmyre13.iob b/objects/dark-oak-medium/dark-oak-denmyre-6.iob similarity index 100% rename from objects/trees/darkoak/denmyre13.iob rename to objects/dark-oak-medium/dark-oak-denmyre-6.iob diff --git a/objects/trees/darkoak/denmyre14.iob b/objects/dark-oak-medium/dark-oak-denmyre-7.iob similarity index 100% rename from objects/trees/darkoak/denmyre14.iob rename to objects/dark-oak-medium/dark-oak-denmyre-7.iob diff --git a/objects/trees/darkoak/denmyre15.iob b/objects/dark-oak-medium/dark-oak-denmyre-8.iob similarity index 100% rename from objects/trees/darkoak/denmyre15.iob rename to objects/dark-oak-medium/dark-oak-denmyre-8.iob diff --git a/objects/trees/darkoak/denmyre16.iob b/objects/dark-oak-medium/dark-oak-denmyre-9.iob similarity index 100% rename from objects/trees/darkoak/denmyre16.iob rename to objects/dark-oak-medium/dark-oak-denmyre-9.iob diff --git a/objects/trees/darkoak/tallgeneric1.iob b/objects/dark-oak-medium/r1.iob similarity index 100% rename from objects/trees/darkoak/tallgeneric1.iob rename to objects/dark-oak-medium/r1.iob diff --git a/objects/trees/darkoak/tallgeneric2.iob b/objects/dark-oak-medium/r2.iob similarity index 100% rename from objects/trees/darkoak/tallgeneric2.iob rename to objects/dark-oak-medium/r2.iob diff --git a/objects/trees/jungle/vgeneric1.iob b/objects/darkjungle-large/JunLarge1.iob similarity index 100% rename from objects/trees/jungle/vgeneric1.iob rename to objects/darkjungle-large/JunLarge1.iob diff --git a/objects/trees/jungle/vgeneric2.iob b/objects/darkjungle-large/JunLarge2.iob similarity index 100% rename from objects/trees/jungle/vgeneric2.iob rename to objects/darkjungle-large/JunLarge2.iob diff --git a/objects/trees/jungle/vgeneric3.iob b/objects/darkjungle-large/JunLarge3.iob similarity index 100% rename from objects/trees/jungle/vgeneric3.iob rename to objects/darkjungle-large/JunLarge3.iob diff --git a/objects/trees/jungle/vgeneric4.iob b/objects/darkjungle-large/JunLarge4.iob similarity index 100% rename from objects/trees/jungle/vgeneric4.iob rename to objects/darkjungle-large/JunLarge4.iob diff --git a/objects/trees/jungle/vgeneric5.iob b/objects/darkjungle-medium/J11.iob similarity index 100% rename from objects/trees/jungle/vgeneric5.iob rename to objects/darkjungle-medium/J11.iob diff --git a/objects/trees/jungle/vgeneric8.iob b/objects/darkjungle-medium/J12.iob similarity index 100% rename from objects/trees/jungle/vgeneric8.iob rename to objects/darkjungle-medium/J12.iob diff --git a/objects/trees/jungle/vgeneric9.iob b/objects/darkjungle-medium/J13.iob similarity index 100% rename from objects/trees/jungle/vgeneric9.iob rename to objects/darkjungle-medium/J13.iob diff --git a/objects/trees/jungle/vgeneric12.iob b/objects/darkjungle-medium/J4.iob similarity index 100% rename from objects/trees/jungle/vgeneric12.iob rename to objects/darkjungle-medium/J4.iob diff --git a/objects/trees/jungle/vgeneric13.iob b/objects/darkjungle-medium/J5.iob similarity index 100% rename from objects/trees/jungle/vgeneric13.iob rename to objects/darkjungle-medium/J5.iob diff --git a/objects/trees/jungle/vgeneric14.iob b/objects/darkjungle-medium/J6.iob similarity index 100% rename from objects/trees/jungle/vgeneric14.iob rename to objects/darkjungle-medium/J6.iob diff --git a/objects/trees/jungle/vgeneric15.iob b/objects/darkjungle-medium/J7.iob similarity index 100% rename from objects/trees/jungle/vgeneric15.iob rename to objects/darkjungle-medium/J7.iob diff --git a/objects/trees/jungle/vgeneric6.iob b/objects/darkjungle-medium/J8.iob similarity index 100% rename from objects/trees/jungle/vgeneric6.iob rename to objects/darkjungle-medium/J8.iob diff --git a/objects/trees/jungle/vgeneric7.iob b/objects/darkjungle-medium/J9.iob similarity index 100% rename from objects/trees/jungle/vgeneric7.iob rename to objects/darkjungle-medium/J9.iob diff --git a/objects/trees/jungle/vgeneric10.iob b/objects/darkjungle-medium/j2.iob similarity index 100% rename from objects/trees/jungle/vgeneric10.iob rename to objects/darkjungle-medium/j2.iob diff --git a/objects/trees/jungle/vgeneric11.iob b/objects/darkjungle-medium/j3.iob similarity index 100% rename from objects/trees/jungle/vgeneric11.iob rename to objects/darkjungle-medium/j3.iob diff --git a/objects/trees/darkoak/floral1.iob b/objects/darkoak-large/j1.iob similarity index 100% rename from objects/trees/darkoak/floral1.iob rename to objects/darkoak-large/j1.iob diff --git a/objects/trees/darkoak/smolgeneric1.iob b/objects/darkoak-small/oak1.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric1.iob rename to objects/darkoak-small/oak1.iob diff --git a/objects/trees/darkoak/smolgeneric2.iob b/objects/darkoak-small/oak10.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric2.iob rename to objects/darkoak-small/oak10.iob diff --git a/objects/trees/darkoak/smolgeneric3.iob b/objects/darkoak-small/oak11.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric3.iob rename to objects/darkoak-small/oak11.iob diff --git a/objects/trees/darkoak/smolgeneric4.iob b/objects/darkoak-small/oak12.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric4.iob rename to objects/darkoak-small/oak12.iob diff --git a/objects/trees/darkoak/smolgeneric5.iob b/objects/darkoak-small/oak13.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric5.iob rename to objects/darkoak-small/oak13.iob diff --git a/objects/trees/darkoak/smolgeneric6.iob b/objects/darkoak-small/oak14.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric6.iob rename to objects/darkoak-small/oak14.iob diff --git a/objects/trees/darkoak/smolgeneric7.iob b/objects/darkoak-small/oak15.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric7.iob rename to objects/darkoak-small/oak15.iob diff --git a/objects/trees/darkoak/smolgeneric8.iob b/objects/darkoak-small/oak2.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric8.iob rename to objects/darkoak-small/oak2.iob diff --git a/objects/trees/darkoak/smolgeneric9.iob b/objects/darkoak-small/oak3.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric9.iob rename to objects/darkoak-small/oak3.iob diff --git a/objects/trees/darkoak/smolgeneric10.iob b/objects/darkoak-small/oak4.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric10.iob rename to objects/darkoak-small/oak4.iob diff --git a/objects/trees/darkoak/smolgeneric11.iob b/objects/darkoak-small/oak5.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric11.iob rename to objects/darkoak-small/oak5.iob diff --git a/objects/trees/darkoak/smolgeneric12.iob b/objects/darkoak-small/oak6.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric12.iob rename to objects/darkoak-small/oak6.iob diff --git a/objects/trees/darkoak/smolgeneric13.iob b/objects/darkoak-small/oak7.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric13.iob rename to objects/darkoak-small/oak7.iob diff --git a/objects/trees/darkoak/smolgeneric14.iob b/objects/darkoak-small/oak8.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric14.iob rename to objects/darkoak-small/oak8.iob diff --git a/objects/trees/darkoak/smolgeneric15.iob b/objects/darkoak-small/oak9.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric15.iob rename to objects/darkoak-small/oak9.iob diff --git a/objects/trees/oak/deadfallen1.iob b/objects/deadwood-fallen/dead1.iob similarity index 100% rename from objects/trees/oak/deadfallen1.iob rename to objects/deadwood-fallen/dead1.iob diff --git a/objects/trees/oak/mdeadwood1.iob b/objects/deadwood-massive/dead1.iob similarity index 100% rename from objects/trees/oak/mdeadwood1.iob rename to objects/deadwood-massive/dead1.iob diff --git a/objects/trees/oak/mdeadwood2.iob b/objects/deadwood-massive/dead2.iob similarity index 100% rename from objects/trees/oak/mdeadwood2.iob rename to objects/deadwood-massive/dead2.iob diff --git a/objects/trees/oak/mdeadwood3.iob b/objects/deadwood-massive/dead3.iob similarity index 100% rename from objects/trees/oak/mdeadwood3.iob rename to objects/deadwood-massive/dead3.iob diff --git a/objects/trees/oak/smdeadwood1.iob b/objects/deadwood-supermassive/dead1.iob similarity index 100% rename from objects/trees/oak/smdeadwood1.iob rename to objects/deadwood-supermassive/dead1.iob diff --git a/objects/trees/oak/smdeadwood2.iob b/objects/deadwood-supermassive/dead2.iob similarity index 100% rename from objects/trees/oak/smdeadwood2.iob rename to objects/deadwood-supermassive/dead2.iob diff --git a/objects/trees/oak/smdeadwood3.iob b/objects/deadwood-supermassive/dead3.iob similarity index 100% rename from objects/trees/oak/smdeadwood3.iob rename to objects/deadwood-supermassive/dead3.iob diff --git a/objects/trees/mixed/deadwood-tainted/dead1.iob b/objects/deadwood-tainted/dead1.iob similarity index 100% rename from objects/trees/mixed/deadwood-tainted/dead1.iob rename to objects/deadwood-tainted/dead1.iob diff --git a/objects/trees/oak/smdeadwilt1.iob b/objects/deadwood-wilted-supermassive/dead1.iob similarity index 100% rename from objects/trees/oak/smdeadwilt1.iob rename to objects/deadwood-wilted-supermassive/dead1.iob diff --git a/objects/trees/oak/dadwood1.iob b/objects/deadwood/dadwood1.iob similarity index 100% rename from objects/trees/oak/dadwood1.iob rename to objects/deadwood/dadwood1.iob diff --git a/objects/trees/oak/dadwood2.iob b/objects/deadwood/dadwood2.iob similarity index 100% rename from objects/trees/oak/dadwood2.iob rename to objects/deadwood/dadwood2.iob diff --git a/objects/trees/oak/dadwood3.iob b/objects/deadwood/dadwood3.iob similarity index 100% rename from objects/trees/oak/dadwood3.iob rename to objects/deadwood/dadwood3.iob diff --git a/objects/trees/oak/dadwood4.iob b/objects/deadwood/dadwood4.iob similarity index 100% rename from objects/trees/oak/dadwood4.iob rename to objects/deadwood/dadwood4.iob diff --git a/objects/trees/oak/dadwood5.iob b/objects/deadwood/dadwood5.iob similarity index 100% rename from objects/trees/oak/dadwood5.iob rename to objects/deadwood/dadwood5.iob diff --git a/objects/trees/oak/dadwood6.iob b/objects/deadwood/dadwood6.iob similarity index 100% rename from objects/trees/oak/dadwood6.iob rename to objects/deadwood/dadwood6.iob diff --git a/objects/trees/oak/dead-6.iob b/objects/deadwood/deadwood1.iob similarity index 100% rename from objects/trees/oak/dead-6.iob rename to objects/deadwood/deadwood1.iob diff --git a/objects/trees/oak/dead-5.iob b/objects/deadwood/deadwood2.iob similarity index 100% rename from objects/trees/oak/dead-5.iob rename to objects/deadwood/deadwood2.iob diff --git a/objects/trees/oak/dead-4.iob b/objects/deadwood/deadwood3.iob similarity index 100% rename from objects/trees/oak/dead-4.iob rename to objects/deadwood/deadwood3.iob diff --git a/objects/trees/oak/dead-3.iob b/objects/deadwood/deadwood4.iob similarity index 100% rename from objects/trees/oak/dead-3.iob rename to objects/deadwood/deadwood4.iob diff --git a/objects/trees/oak/dead-2.iob b/objects/deadwood/deadwood5.iob similarity index 100% rename from objects/trees/oak/dead-2.iob rename to objects/deadwood/deadwood5.iob diff --git a/objects/trees/oak/dead-1.iob b/objects/deadwood/deadwood6.iob similarity index 100% rename from objects/trees/oak/dead-1.iob rename to objects/deadwood/deadwood6.iob diff --git a/objects/structures/deepslate/ds1.iob b/objects/deepslate/ds1.iob similarity index 100% rename from objects/structures/deepslate/ds1.iob rename to objects/deepslate/ds1.iob diff --git a/objects/structures/deepslate/ds2.iob b/objects/deepslate/ds2.iob similarity index 100% rename from objects/structures/deepslate/ds2.iob rename to objects/deepslate/ds2.iob diff --git a/objects/structures/deepslate/ds3.iob b/objects/deepslate/ds3.iob similarity index 100% rename from objects/structures/deepslate/ds3.iob rename to objects/deepslate/ds3.iob diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-1.iob b/objects/denmyre/oak-denmyre-clutter-1.iob similarity index 100% rename from objects/clutter/denmyre/oak-denmyre-clutter-1.iob rename to objects/denmyre/oak-denmyre-clutter-1.iob diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-10.iob b/objects/denmyre/oak-denmyre-clutter-10.iob similarity index 100% rename from objects/clutter/denmyre/oak-denmyre-clutter-10.iob rename to objects/denmyre/oak-denmyre-clutter-10.iob diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-2.iob b/objects/denmyre/oak-denmyre-clutter-2.iob similarity index 100% rename from objects/clutter/denmyre/oak-denmyre-clutter-2.iob rename to objects/denmyre/oak-denmyre-clutter-2.iob diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-3.iob b/objects/denmyre/oak-denmyre-clutter-3.iob similarity index 100% rename from objects/clutter/denmyre/oak-denmyre-clutter-3.iob rename to objects/denmyre/oak-denmyre-clutter-3.iob diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-4.iob b/objects/denmyre/oak-denmyre-clutter-4.iob similarity index 100% rename from objects/clutter/denmyre/oak-denmyre-clutter-4.iob rename to objects/denmyre/oak-denmyre-clutter-4.iob diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-5.iob b/objects/denmyre/oak-denmyre-clutter-5.iob similarity index 100% rename from objects/clutter/denmyre/oak-denmyre-clutter-5.iob rename to objects/denmyre/oak-denmyre-clutter-5.iob diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-6.iob b/objects/denmyre/oak-denmyre-clutter-6.iob similarity index 100% rename from objects/clutter/denmyre/oak-denmyre-clutter-6.iob rename to objects/denmyre/oak-denmyre-clutter-6.iob diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-7.iob b/objects/denmyre/oak-denmyre-clutter-7.iob similarity index 100% rename from objects/clutter/denmyre/oak-denmyre-clutter-7.iob rename to objects/denmyre/oak-denmyre-clutter-7.iob diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-8.iob b/objects/denmyre/oak-denmyre-clutter-8.iob similarity index 100% rename from objects/clutter/denmyre/oak-denmyre-clutter-8.iob rename to objects/denmyre/oak-denmyre-clutter-8.iob diff --git a/objects/clutter/denmyre/oak-denmyre-clutter-9.iob b/objects/denmyre/oak-denmyre-clutter-9.iob similarity index 100% rename from objects/clutter/denmyre/oak-denmyre-clutter-9.iob rename to objects/denmyre/oak-denmyre-clutter-9.iob diff --git a/objects/jigsaw/desert-pyramid/bottom.iob b/objects/desert-pyramid/bottom.iob similarity index 100% rename from objects/jigsaw/desert-pyramid/bottom.iob rename to objects/desert-pyramid/bottom.iob diff --git a/objects/jigsaw/desert-pyramid/top.iob b/objects/desert-pyramid/top.iob similarity index 100% rename from objects/jigsaw/desert-pyramid/top.iob rename to objects/desert-pyramid/top.iob diff --git a/objects/structures/hut.iob b/objects/desert/hut.iob similarity index 100% rename from objects/structures/hut.iob rename to objects/desert/hut.iob diff --git a/objects/structures/tower-twin.iob b/objects/desert/tower-twin.iob similarity index 100% rename from objects/structures/tower-twin.iob rename to objects/desert/tower-twin.iob diff --git a/objects/structures/tower.iob b/objects/desert/tower.iob similarity index 100% rename from objects/structures/tower.iob rename to objects/desert/tower.iob diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-1.iob b/objects/dual-tree/corrupted-swamp-1.iob similarity index 100% rename from objects/trees/mixed/dual-tree/corrupted-swamp-1.iob rename to objects/dual-tree/corrupted-swamp-1.iob diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-10.iob b/objects/dual-tree/corrupted-swamp-10.iob similarity index 100% rename from objects/trees/mixed/dual-tree/corrupted-swamp-10.iob rename to objects/dual-tree/corrupted-swamp-10.iob diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-2.iob b/objects/dual-tree/corrupted-swamp-2.iob similarity index 100% rename from objects/trees/mixed/dual-tree/corrupted-swamp-2.iob rename to objects/dual-tree/corrupted-swamp-2.iob diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-3.iob b/objects/dual-tree/corrupted-swamp-3.iob similarity index 100% rename from objects/trees/mixed/dual-tree/corrupted-swamp-3.iob rename to objects/dual-tree/corrupted-swamp-3.iob diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-4.iob b/objects/dual-tree/corrupted-swamp-4.iob similarity index 100% rename from objects/trees/mixed/dual-tree/corrupted-swamp-4.iob rename to objects/dual-tree/corrupted-swamp-4.iob diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-5.iob b/objects/dual-tree/corrupted-swamp-5.iob similarity index 100% rename from objects/trees/mixed/dual-tree/corrupted-swamp-5.iob rename to objects/dual-tree/corrupted-swamp-5.iob diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-6.iob b/objects/dual-tree/corrupted-swamp-6.iob similarity index 100% rename from objects/trees/mixed/dual-tree/corrupted-swamp-6.iob rename to objects/dual-tree/corrupted-swamp-6.iob diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-7.iob b/objects/dual-tree/corrupted-swamp-7.iob similarity index 100% rename from objects/trees/mixed/dual-tree/corrupted-swamp-7.iob rename to objects/dual-tree/corrupted-swamp-7.iob diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-8.iob b/objects/dual-tree/corrupted-swamp-8.iob similarity index 100% rename from objects/trees/mixed/dual-tree/corrupted-swamp-8.iob rename to objects/dual-tree/corrupted-swamp-8.iob diff --git a/objects/trees/mixed/dual-tree/corrupted-swamp-9.iob b/objects/dual-tree/corrupted-swamp-9.iob similarity index 100% rename from objects/trees/mixed/dual-tree/corrupted-swamp-9.iob rename to objects/dual-tree/corrupted-swamp-9.iob diff --git a/objects/trees/mixed/dual-tree/infested-palm-1.iob b/objects/dual-tree/infested-palm-1.iob similarity index 100% rename from objects/trees/mixed/dual-tree/infested-palm-1.iob rename to objects/dual-tree/infested-palm-1.iob diff --git a/objects/trees/mixed/dual-tree/infested-palm-2.iob b/objects/dual-tree/infested-palm-2.iob similarity index 100% rename from objects/trees/mixed/dual-tree/infested-palm-2.iob rename to objects/dual-tree/infested-palm-2.iob diff --git a/objects/trees/mixed/dual-tree/infested-palm-3.iob b/objects/dual-tree/infested-palm-3.iob similarity index 100% rename from objects/trees/mixed/dual-tree/infested-palm-3.iob rename to objects/dual-tree/infested-palm-3.iob diff --git a/objects/trees/mixed/dual-tree/infested-palm-4.iob b/objects/dual-tree/infested-palm-4.iob similarity index 100% rename from objects/trees/mixed/dual-tree/infested-palm-4.iob rename to objects/dual-tree/infested-palm-4.iob diff --git a/objects/trees/mixed/dual-tree/infested-palm-5.iob b/objects/dual-tree/infested-palm-5.iob similarity index 100% rename from objects/trees/mixed/dual-tree/infested-palm-5.iob rename to objects/dual-tree/infested-palm-5.iob diff --git a/objects/trees/mixed/dual-tree/sandy-jungle-1.iob b/objects/dual-tree/sandy-jungle-1.iob similarity index 100% rename from objects/trees/mixed/dual-tree/sandy-jungle-1.iob rename to objects/dual-tree/sandy-jungle-1.iob diff --git a/objects/trees/mixed/dual-tree/sandy-jungle-2.iob b/objects/dual-tree/sandy-jungle-2.iob similarity index 100% rename from objects/trees/mixed/dual-tree/sandy-jungle-2.iob rename to objects/dual-tree/sandy-jungle-2.iob diff --git a/objects/trees/mixed/dual-tree/sandy-jungle-3.iob b/objects/dual-tree/sandy-jungle-3.iob similarity index 100% rename from objects/trees/mixed/dual-tree/sandy-jungle-3.iob rename to objects/dual-tree/sandy-jungle-3.iob diff --git a/objects/trees/mixed/dual-tree/sandy-jungle-4.iob b/objects/dual-tree/sandy-jungle-4.iob similarity index 100% rename from objects/trees/mixed/dual-tree/sandy-jungle-4.iob rename to objects/dual-tree/sandy-jungle-4.iob diff --git a/objects/jigsaw/dungeon/spawner-room.iob b/objects/dungeon/spawner-room.iob similarity index 100% rename from objects/jigsaw/dungeon/spawner-room.iob rename to objects/dungeon/spawner-room.iob diff --git a/objects/trees/mixed/elder-wood/ElderRedwood1.iob b/objects/elder-wood/ElderRedwood1.iob similarity index 100% rename from objects/trees/mixed/elder-wood/ElderRedwood1.iob rename to objects/elder-wood/ElderRedwood1.iob diff --git a/objects/trees/mixed/elder-wood/ElderRedwood10.iob b/objects/elder-wood/ElderRedwood10.iob similarity index 100% rename from objects/trees/mixed/elder-wood/ElderRedwood10.iob rename to objects/elder-wood/ElderRedwood10.iob diff --git a/objects/trees/mixed/elder-wood/ElderRedwood2.iob b/objects/elder-wood/ElderRedwood2.iob similarity index 100% rename from objects/trees/mixed/elder-wood/ElderRedwood2.iob rename to objects/elder-wood/ElderRedwood2.iob diff --git a/objects/trees/mixed/elder-wood/ElderRedwood3.iob b/objects/elder-wood/ElderRedwood3.iob similarity index 100% rename from objects/trees/mixed/elder-wood/ElderRedwood3.iob rename to objects/elder-wood/ElderRedwood3.iob diff --git a/objects/trees/mixed/elder-wood/ElderRedwood4.iob b/objects/elder-wood/ElderRedwood4.iob similarity index 100% rename from objects/trees/mixed/elder-wood/ElderRedwood4.iob rename to objects/elder-wood/ElderRedwood4.iob diff --git a/objects/trees/mixed/elder-wood/ElderRedwood5.iob b/objects/elder-wood/ElderRedwood5.iob similarity index 100% rename from objects/trees/mixed/elder-wood/ElderRedwood5.iob rename to objects/elder-wood/ElderRedwood5.iob diff --git a/objects/trees/mixed/elder-wood/ElderRedwood6.iob b/objects/elder-wood/ElderRedwood6.iob similarity index 100% rename from objects/trees/mixed/elder-wood/ElderRedwood6.iob rename to objects/elder-wood/ElderRedwood6.iob diff --git a/objects/trees/mixed/elder-wood/ElderRedwood7.iob b/objects/elder-wood/ElderRedwood7.iob similarity index 100% rename from objects/trees/mixed/elder-wood/ElderRedwood7.iob rename to objects/elder-wood/ElderRedwood7.iob diff --git a/objects/trees/mixed/elder-wood/ElderRedwood8.iob b/objects/elder-wood/ElderRedwood8.iob similarity index 100% rename from objects/trees/mixed/elder-wood/ElderRedwood8.iob rename to objects/elder-wood/ElderRedwood8.iob diff --git a/objects/trees/mixed/elder-wood/ElderRedwood9.iob b/objects/elder-wood/ElderRedwood9.iob similarity index 100% rename from objects/trees/mixed/elder-wood/ElderRedwood9.iob rename to objects/elder-wood/ElderRedwood9.iob diff --git a/objects/jigsaw/end_city/base_floor.iob b/objects/end_city/base_floor.iob similarity index 100% rename from objects/jigsaw/end_city/base_floor.iob rename to objects/end_city/base_floor.iob diff --git a/objects/jigsaw/end_city/base_roof.iob b/objects/end_city/base_roof.iob similarity index 100% rename from objects/jigsaw/end_city/base_roof.iob rename to objects/end_city/base_roof.iob diff --git a/objects/jigsaw/end_city/bridge_end.iob b/objects/end_city/bridge_end.iob similarity index 100% rename from objects/jigsaw/end_city/bridge_end.iob rename to objects/end_city/bridge_end.iob diff --git a/objects/jigsaw/end_city/bridge_gentle_stairs.iob b/objects/end_city/bridge_gentle_stairs.iob similarity index 100% rename from objects/jigsaw/end_city/bridge_gentle_stairs.iob rename to objects/end_city/bridge_gentle_stairs.iob diff --git a/objects/jigsaw/end_city/bridge_piece.iob b/objects/end_city/bridge_piece.iob similarity index 100% rename from objects/jigsaw/end_city/bridge_piece.iob rename to objects/end_city/bridge_piece.iob diff --git a/objects/jigsaw/end_city/bridge_steep_stairs.iob b/objects/end_city/bridge_steep_stairs.iob similarity index 100% rename from objects/jigsaw/end_city/bridge_steep_stairs.iob rename to objects/end_city/bridge_steep_stairs.iob diff --git a/objects/jigsaw/end_city/fat_tower_base.iob b/objects/end_city/fat_tower_base.iob similarity index 100% rename from objects/jigsaw/end_city/fat_tower_base.iob rename to objects/end_city/fat_tower_base.iob diff --git a/objects/jigsaw/end_city/fat_tower_middle.iob b/objects/end_city/fat_tower_middle.iob similarity index 100% rename from objects/jigsaw/end_city/fat_tower_middle.iob rename to objects/end_city/fat_tower_middle.iob diff --git a/objects/jigsaw/end_city/fat_tower_top.iob b/objects/end_city/fat_tower_top.iob similarity index 100% rename from objects/jigsaw/end_city/fat_tower_top.iob rename to objects/end_city/fat_tower_top.iob diff --git a/objects/jigsaw/end_city/second_floor_1.iob b/objects/end_city/second_floor_1.iob similarity index 100% rename from objects/jigsaw/end_city/second_floor_1.iob rename to objects/end_city/second_floor_1.iob diff --git a/objects/jigsaw/end_city/second_floor_2.iob b/objects/end_city/second_floor_2.iob similarity index 100% rename from objects/jigsaw/end_city/second_floor_2.iob rename to objects/end_city/second_floor_2.iob diff --git a/objects/jigsaw/end_city/second_roof.iob b/objects/end_city/second_roof.iob similarity index 100% rename from objects/jigsaw/end_city/second_roof.iob rename to objects/end_city/second_roof.iob diff --git a/objects/jigsaw/end_city/ship.iob b/objects/end_city/ship.iob similarity index 100% rename from objects/jigsaw/end_city/ship.iob rename to objects/end_city/ship.iob diff --git a/objects/jigsaw/end_city/third_floor_1.iob b/objects/end_city/third_floor_1.iob similarity index 100% rename from objects/jigsaw/end_city/third_floor_1.iob rename to objects/end_city/third_floor_1.iob diff --git a/objects/jigsaw/end_city/third_floor_2.iob b/objects/end_city/third_floor_2.iob similarity index 100% rename from objects/jigsaw/end_city/third_floor_2.iob rename to objects/end_city/third_floor_2.iob diff --git a/objects/jigsaw/end_city/third_roof.iob b/objects/end_city/third_roof.iob similarity index 100% rename from objects/jigsaw/end_city/third_roof.iob rename to objects/end_city/third_roof.iob diff --git a/objects/jigsaw/end_city/tower_base.iob b/objects/end_city/tower_base.iob similarity index 100% rename from objects/jigsaw/end_city/tower_base.iob rename to objects/end_city/tower_base.iob diff --git a/objects/jigsaw/end_city/tower_floor.iob b/objects/end_city/tower_floor.iob similarity index 100% rename from objects/jigsaw/end_city/tower_floor.iob rename to objects/end_city/tower_floor.iob diff --git a/objects/jigsaw/end_city/tower_piece.iob b/objects/end_city/tower_piece.iob similarity index 100% rename from objects/jigsaw/end_city/tower_piece.iob rename to objects/end_city/tower_piece.iob diff --git a/objects/jigsaw/end_city/tower_top.iob b/objects/end_city/tower_top.iob similarity index 100% rename from objects/jigsaw/end_city/tower_top.iob rename to objects/end_city/tower_top.iob diff --git a/objects/trees/spruce/levergreen1.iob b/objects/evergreen/fantasy_evergreen_large1.iob similarity index 100% rename from objects/trees/spruce/levergreen1.iob rename to objects/evergreen/fantasy_evergreen_large1.iob diff --git a/objects/trees/spruce/levergreen2.iob b/objects/evergreen/fantasy_evergreen_large2.iob similarity index 100% rename from objects/trees/spruce/levergreen2.iob rename to objects/evergreen/fantasy_evergreen_large2.iob diff --git a/objects/trees/spruce/levergreen3.iob b/objects/evergreen/fantasy_evergreen_large3.iob similarity index 100% rename from objects/trees/spruce/levergreen3.iob rename to objects/evergreen/fantasy_evergreen_large3.iob diff --git a/objects/trees/spruce/levergreen4.iob b/objects/evergreen/fantasy_evergreen_large4.iob similarity index 100% rename from objects/trees/spruce/levergreen4.iob rename to objects/evergreen/fantasy_evergreen_large4.iob diff --git a/objects/trees/spruce/levergreen5.iob b/objects/evergreen/fantasy_evergreen_large5.iob similarity index 100% rename from objects/trees/spruce/levergreen5.iob rename to objects/evergreen/fantasy_evergreen_large5.iob diff --git a/objects/trees/spruce/levergreen6.iob b/objects/evergreen/fantasy_evergreen_large6.iob similarity index 100% rename from objects/trees/spruce/levergreen6.iob rename to objects/evergreen/fantasy_evergreen_large6.iob diff --git a/objects/trees/spruce/mevergreen1.iob b/objects/evergreen/fantasy_evergreen_medium1.iob similarity index 100% rename from objects/trees/spruce/mevergreen1.iob rename to objects/evergreen/fantasy_evergreen_medium1.iob diff --git a/objects/trees/spruce/mevergreen2.iob b/objects/evergreen/fantasy_evergreen_medium2.iob similarity index 100% rename from objects/trees/spruce/mevergreen2.iob rename to objects/evergreen/fantasy_evergreen_medium2.iob diff --git a/objects/trees/spruce/mevergreen3.iob b/objects/evergreen/fantasy_evergreen_medium3.iob similarity index 100% rename from objects/trees/spruce/mevergreen3.iob rename to objects/evergreen/fantasy_evergreen_medium3.iob diff --git a/objects/trees/spruce/severgreen1.iob b/objects/evergreen/fantasy_evergreen_small1.iob similarity index 100% rename from objects/trees/spruce/severgreen1.iob rename to objects/evergreen/fantasy_evergreen_small1.iob diff --git a/objects/trees/spruce/severgreen2.iob b/objects/evergreen/fantasy_evergreen_small2.iob similarity index 100% rename from objects/trees/spruce/severgreen2.iob rename to objects/evergreen/fantasy_evergreen_small2.iob diff --git a/objects/trees/oak/foak1.iob b/objects/fantasyoak-large/fantasy_oak_large1.iob similarity index 100% rename from objects/trees/oak/foak1.iob rename to objects/fantasyoak-large/fantasy_oak_large1.iob diff --git a/objects/trees/oak/foakm1.iob b/objects/fantasyoak-medium/fantasy_oak_medium1.iob similarity index 100% rename from objects/trees/oak/foakm1.iob rename to objects/fantasyoak-medium/fantasy_oak_medium1.iob diff --git a/objects/trees/oak/foakm2.iob b/objects/fantasyoak-medium/fantasy_oak_medium2.iob similarity index 100% rename from objects/trees/oak/foakm2.iob rename to objects/fantasyoak-medium/fantasy_oak_medium2.iob diff --git a/objects/trees/oak/foakm3.iob b/objects/fantasyoak-medium/fantasy_oak_medium3.iob similarity index 100% rename from objects/trees/oak/foakm3.iob rename to objects/fantasyoak-medium/fantasy_oak_medium3.iob diff --git a/objects/trees/oak/foakm4.iob b/objects/fantasyoak-medium/fantasy_oak_medium4.iob similarity index 100% rename from objects/trees/oak/foakm4.iob rename to objects/fantasyoak-medium/fantasy_oak_medium4.iob diff --git a/objects/clutter/fossil/skull_1.iob b/objects/fossil/skull_1.iob similarity index 100% rename from objects/clutter/fossil/skull_1.iob rename to objects/fossil/skull_1.iob diff --git a/objects/clutter/fossil/skull_1_coal.iob b/objects/fossil/skull_1_coal.iob similarity index 100% rename from objects/clutter/fossil/skull_1_coal.iob rename to objects/fossil/skull_1_coal.iob diff --git a/objects/clutter/fossil/skull_2.iob b/objects/fossil/skull_2.iob similarity index 100% rename from objects/clutter/fossil/skull_2.iob rename to objects/fossil/skull_2.iob diff --git a/objects/clutter/fossil/skull_2_coal.iob b/objects/fossil/skull_2_coal.iob similarity index 100% rename from objects/clutter/fossil/skull_2_coal.iob rename to objects/fossil/skull_2_coal.iob diff --git a/objects/clutter/fossil/skull_3.iob b/objects/fossil/skull_3.iob similarity index 100% rename from objects/clutter/fossil/skull_3.iob rename to objects/fossil/skull_3.iob diff --git a/objects/clutter/fossil/skull_3_coal.iob b/objects/fossil/skull_3_coal.iob similarity index 100% rename from objects/clutter/fossil/skull_3_coal.iob rename to objects/fossil/skull_3_coal.iob diff --git a/objects/clutter/fossil/skull_4.iob b/objects/fossil/skull_4.iob similarity index 100% rename from objects/clutter/fossil/skull_4.iob rename to objects/fossil/skull_4.iob diff --git a/objects/clutter/fossil/skull_4_coal.iob b/objects/fossil/skull_4_coal.iob similarity index 100% rename from objects/clutter/fossil/skull_4_coal.iob rename to objects/fossil/skull_4_coal.iob diff --git a/objects/clutter/fossil/spine_1.iob b/objects/fossil/spine_1.iob similarity index 100% rename from objects/clutter/fossil/spine_1.iob rename to objects/fossil/spine_1.iob diff --git a/objects/clutter/fossil/spine_1_coal.iob b/objects/fossil/spine_1_coal.iob similarity index 100% rename from objects/clutter/fossil/spine_1_coal.iob rename to objects/fossil/spine_1_coal.iob diff --git a/objects/clutter/fossil/spine_2.iob b/objects/fossil/spine_2.iob similarity index 100% rename from objects/clutter/fossil/spine_2.iob rename to objects/fossil/spine_2.iob diff --git a/objects/clutter/fossil/spine_2_coal.iob b/objects/fossil/spine_2_coal.iob similarity index 100% rename from objects/clutter/fossil/spine_2_coal.iob rename to objects/fossil/spine_2_coal.iob diff --git a/objects/clutter/fossil/spine_3.iob b/objects/fossil/spine_3.iob similarity index 100% rename from objects/clutter/fossil/spine_3.iob rename to objects/fossil/spine_3.iob diff --git a/objects/clutter/fossil/spine_3_coal.iob b/objects/fossil/spine_3_coal.iob similarity index 100% rename from objects/clutter/fossil/spine_3_coal.iob rename to objects/fossil/spine_3_coal.iob diff --git a/objects/clutter/fossil/spine_4.iob b/objects/fossil/spine_4.iob similarity index 100% rename from objects/clutter/fossil/spine_4.iob rename to objects/fossil/spine_4.iob diff --git a/objects/clutter/fossil/spine_4_coal.iob b/objects/fossil/spine_4_coal.iob similarity index 100% rename from objects/clutter/fossil/spine_4_coal.iob rename to objects/fossil/spine_4_coal.iob diff --git a/objects/trees/sproak/generic1.iob b/objects/frosted-sproak/med-1.iob similarity index 100% rename from objects/trees/sproak/generic1.iob rename to objects/frosted-sproak/med-1.iob diff --git a/objects/trees/sproak/generic2.iob b/objects/frosted-sproak/med-10.iob similarity index 100% rename from objects/trees/sproak/generic2.iob rename to objects/frosted-sproak/med-10.iob diff --git a/objects/trees/sproak/generic3.iob b/objects/frosted-sproak/med-11.iob similarity index 100% rename from objects/trees/sproak/generic3.iob rename to objects/frosted-sproak/med-11.iob diff --git a/objects/trees/sproak/generic4.iob b/objects/frosted-sproak/med-12.iob similarity index 100% rename from objects/trees/sproak/generic4.iob rename to objects/frosted-sproak/med-12.iob diff --git a/objects/trees/sproak/generic5.iob b/objects/frosted-sproak/med-13.iob similarity index 100% rename from objects/trees/sproak/generic5.iob rename to objects/frosted-sproak/med-13.iob diff --git a/objects/trees/sproak/generic6.iob b/objects/frosted-sproak/med-2.iob similarity index 100% rename from objects/trees/sproak/generic6.iob rename to objects/frosted-sproak/med-2.iob diff --git a/objects/trees/sproak/generic7.iob b/objects/frosted-sproak/med-3.iob similarity index 100% rename from objects/trees/sproak/generic7.iob rename to objects/frosted-sproak/med-3.iob diff --git a/objects/trees/sproak/generic8.iob b/objects/frosted-sproak/med-4.iob similarity index 100% rename from objects/trees/sproak/generic8.iob rename to objects/frosted-sproak/med-4.iob diff --git a/objects/trees/sproak/generic9.iob b/objects/frosted-sproak/med-5.iob similarity index 100% rename from objects/trees/sproak/generic9.iob rename to objects/frosted-sproak/med-5.iob diff --git a/objects/trees/sproak/generic10.iob b/objects/frosted-sproak/med-7.iob similarity index 100% rename from objects/trees/sproak/generic10.iob rename to objects/frosted-sproak/med-7.iob diff --git a/objects/trees/sproak/generic11.iob b/objects/frosted-sproak/med-8.iob similarity index 100% rename from objects/trees/sproak/generic11.iob rename to objects/frosted-sproak/med-8.iob diff --git a/objects/trees/sproak/generic12.iob b/objects/frosted-sproak/med-9.iob similarity index 100% rename from objects/trees/sproak/generic12.iob rename to objects/frosted-sproak/med-9.iob diff --git a/objects/trees/spruce/sfrostgeneric1.iob b/objects/frosted-spruce/[Iced Variants]/smol-1.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric1.iob rename to objects/frosted-spruce/[Iced Variants]/smol-1.iob diff --git a/objects/trees/spruce/sfrostgeneric2.iob b/objects/frosted-spruce/[Iced Variants]/smol-10.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric2.iob rename to objects/frosted-spruce/[Iced Variants]/smol-10.iob diff --git a/objects/trees/spruce/sfrostgeneric3.iob b/objects/frosted-spruce/[Iced Variants]/smol-11.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric3.iob rename to objects/frosted-spruce/[Iced Variants]/smol-11.iob diff --git a/objects/trees/spruce/sfrostgeneric4.iob b/objects/frosted-spruce/[Iced Variants]/smol-12.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric4.iob rename to objects/frosted-spruce/[Iced Variants]/smol-12.iob diff --git a/objects/trees/spruce/sfrostgeneric5.iob b/objects/frosted-spruce/[Iced Variants]/smol-13.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric5.iob rename to objects/frosted-spruce/[Iced Variants]/smol-13.iob diff --git a/objects/trees/spruce/sfrostgeneric6.iob b/objects/frosted-spruce/[Iced Variants]/smol-14.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric6.iob rename to objects/frosted-spruce/[Iced Variants]/smol-14.iob diff --git a/objects/trees/spruce/sfrostgeneric7.iob b/objects/frosted-spruce/[Iced Variants]/smol-15.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric7.iob rename to objects/frosted-spruce/[Iced Variants]/smol-15.iob diff --git a/objects/trees/spruce/sfrostgeneric8.iob b/objects/frosted-spruce/[Iced Variants]/smol-16.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric8.iob rename to objects/frosted-spruce/[Iced Variants]/smol-16.iob diff --git a/objects/trees/spruce/sfrostgeneric9.iob b/objects/frosted-spruce/[Iced Variants]/smol-17.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric9.iob rename to objects/frosted-spruce/[Iced Variants]/smol-17.iob diff --git a/objects/trees/spruce/sfrostgeneric10.iob b/objects/frosted-spruce/[Iced Variants]/smol-18.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric10.iob rename to objects/frosted-spruce/[Iced Variants]/smol-18.iob diff --git a/objects/trees/spruce/sfrostgeneric11.iob b/objects/frosted-spruce/[Iced Variants]/smol-19.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric11.iob rename to objects/frosted-spruce/[Iced Variants]/smol-19.iob diff --git a/objects/trees/spruce/sfrostgeneric12.iob b/objects/frosted-spruce/[Iced Variants]/smol-2.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric12.iob rename to objects/frosted-spruce/[Iced Variants]/smol-2.iob diff --git a/objects/trees/spruce/sfrostgeneric13.iob b/objects/frosted-spruce/[Iced Variants]/smol-20.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric13.iob rename to objects/frosted-spruce/[Iced Variants]/smol-20.iob diff --git a/objects/trees/spruce/sfrostgeneric14.iob b/objects/frosted-spruce/[Iced Variants]/smol-3.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric14.iob rename to objects/frosted-spruce/[Iced Variants]/smol-3.iob diff --git a/objects/trees/spruce/sfrostgeneric15.iob b/objects/frosted-spruce/[Iced Variants]/smol-4.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric15.iob rename to objects/frosted-spruce/[Iced Variants]/smol-4.iob diff --git a/objects/trees/spruce/sfrostgeneric16.iob b/objects/frosted-spruce/[Iced Variants]/smol-5.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric16.iob rename to objects/frosted-spruce/[Iced Variants]/smol-5.iob diff --git a/objects/trees/spruce/sfrostgeneric17.iob b/objects/frosted-spruce/[Iced Variants]/smol-6.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric17.iob rename to objects/frosted-spruce/[Iced Variants]/smol-6.iob diff --git a/objects/trees/spruce/sfrostgeneric18.iob b/objects/frosted-spruce/[Iced Variants]/smol-7.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric18.iob rename to objects/frosted-spruce/[Iced Variants]/smol-7.iob diff --git a/objects/trees/spruce/sfrostgeneric19.iob b/objects/frosted-spruce/[Iced Variants]/smol-8.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric19.iob rename to objects/frosted-spruce/[Iced Variants]/smol-8.iob diff --git a/objects/trees/spruce/sfrostgeneric20.iob b/objects/frosted-spruce/[Iced Variants]/smol-9.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric20.iob rename to objects/frosted-spruce/[Iced Variants]/smol-9.iob diff --git a/objects/trees/spruce/lfrostgeneric1.iob b/objects/frosted-spruce/large-10..iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric1.iob rename to objects/frosted-spruce/large-10..iob diff --git a/objects/trees/spruce/lfrostgeneric2.iob b/objects/frosted-spruce/large-10.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric2.iob rename to objects/frosted-spruce/large-10.iob diff --git a/objects/trees/spruce/lfrostgeneric3.iob b/objects/frosted-spruce/large-11.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric3.iob rename to objects/frosted-spruce/large-11.iob diff --git a/objects/trees/spruce/lfrostgeneric4.iob b/objects/frosted-spruce/large-12.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric4.iob rename to objects/frosted-spruce/large-12.iob diff --git a/objects/trees/spruce/lfrostgeneric5.iob b/objects/frosted-spruce/large-13.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric5.iob rename to objects/frosted-spruce/large-13.iob diff --git a/objects/trees/spruce/lfrostgeneric6.iob b/objects/frosted-spruce/large-14.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric6.iob rename to objects/frosted-spruce/large-14.iob diff --git a/objects/trees/spruce/lfrostgeneric7.iob b/objects/frosted-spruce/large-15.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric7.iob rename to objects/frosted-spruce/large-15.iob diff --git a/objects/trees/spruce/lfrostgeneric8.iob b/objects/frosted-spruce/large-16.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric8.iob rename to objects/frosted-spruce/large-16.iob diff --git a/objects/trees/spruce/lfrostgeneric9.iob b/objects/frosted-spruce/large-17.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric9.iob rename to objects/frosted-spruce/large-17.iob diff --git a/objects/trees/spruce/lfrostgeneric10.iob b/objects/frosted-spruce/large-18.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric10.iob rename to objects/frosted-spruce/large-18.iob diff --git a/objects/trees/spruce/lfrostgeneric11.iob b/objects/frosted-spruce/large-19.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric11.iob rename to objects/frosted-spruce/large-19.iob diff --git a/objects/trees/spruce/lfrostgeneric12.iob b/objects/frosted-spruce/large-20.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric12.iob rename to objects/frosted-spruce/large-20.iob diff --git a/objects/trees/spruce/lfrostgeneric13.iob b/objects/frosted-spruce/large-21.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric13.iob rename to objects/frosted-spruce/large-21.iob diff --git a/objects/trees/spruce/lfrostgeneric14.iob b/objects/frosted-spruce/large-22-b.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric14.iob rename to objects/frosted-spruce/large-22-b.iob diff --git a/objects/trees/spruce/lfrostgeneric15.iob b/objects/frosted-spruce/large-22.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric15.iob rename to objects/frosted-spruce/large-22.iob diff --git a/objects/trees/spruce/lfrostgeneric16.iob b/objects/frosted-spruce/large-23-b.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric16.iob rename to objects/frosted-spruce/large-23-b.iob diff --git a/objects/trees/spruce/lfrostgeneric17.iob b/objects/frosted-spruce/large-23.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric17.iob rename to objects/frosted-spruce/large-23.iob diff --git a/objects/trees/spruce/lfrostgeneric18.iob b/objects/frosted-spruce/large-24-b.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric18.iob rename to objects/frosted-spruce/large-24-b.iob diff --git a/objects/trees/spruce/lfrostgeneric19.iob b/objects/frosted-spruce/large-24.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric19.iob rename to objects/frosted-spruce/large-24.iob diff --git a/objects/trees/spruce/lfrostgeneric20.iob b/objects/frosted-spruce/large-25-b.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric20.iob rename to objects/frosted-spruce/large-25-b.iob diff --git a/objects/trees/spruce/lfrostgeneric21.iob b/objects/frosted-spruce/large-25.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric21.iob rename to objects/frosted-spruce/large-25.iob diff --git a/objects/trees/spruce/lfrostgeneric22.iob b/objects/frosted-spruce/large-5.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric22.iob rename to objects/frosted-spruce/large-5.iob diff --git a/objects/trees/spruce/lfrostgeneric23.iob b/objects/frosted-spruce/large-6.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric23.iob rename to objects/frosted-spruce/large-6.iob diff --git a/objects/trees/spruce/lfrostgeneric24.iob b/objects/frosted-spruce/large-7.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric24.iob rename to objects/frosted-spruce/large-7.iob diff --git a/objects/trees/spruce/lfrostgeneric25.iob b/objects/frosted-spruce/large-8.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric25.iob rename to objects/frosted-spruce/large-8.iob diff --git a/objects/trees/spruce/lfrostgeneric26.iob b/objects/frosted-spruce/large-9.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric26.iob rename to objects/frosted-spruce/large-9.iob diff --git a/objects/clutter/garbage/clutter-1.iob b/objects/garbage/clutter-1.iob similarity index 100% rename from objects/clutter/garbage/clutter-1.iob rename to objects/garbage/clutter-1.iob diff --git a/objects/clutter/garbage/clutter-2.iob b/objects/garbage/clutter-2.iob similarity index 100% rename from objects/clutter/garbage/clutter-2.iob rename to objects/garbage/clutter-2.iob diff --git a/objects/clutter/garbage/clutter-3.iob b/objects/garbage/clutter-3.iob similarity index 100% rename from objects/clutter/garbage/clutter-3.iob rename to objects/garbage/clutter-3.iob diff --git a/objects/clutter/garbage/clutter-4.iob b/objects/garbage/clutter-4.iob similarity index 100% rename from objects/clutter/garbage/clutter-4.iob rename to objects/garbage/clutter-4.iob diff --git a/objects/structures/gifts/blue-a.iob b/objects/gifts/blue-a.iob similarity index 100% rename from objects/structures/gifts/blue-a.iob rename to objects/gifts/blue-a.iob diff --git a/objects/structures/gifts/blue.iob b/objects/gifts/blue.iob similarity index 100% rename from objects/structures/gifts/blue.iob rename to objects/gifts/blue.iob diff --git a/objects/structures/gifts/medium-blue-a.iob b/objects/gifts/medium-blue-a.iob similarity index 100% rename from objects/structures/gifts/medium-blue-a.iob rename to objects/gifts/medium-blue-a.iob diff --git a/objects/structures/gifts/medium-blue.iob b/objects/gifts/medium-blue.iob similarity index 100% rename from objects/structures/gifts/medium-blue.iob rename to objects/gifts/medium-blue.iob diff --git a/objects/structures/gifts/medium-red-a.iob b/objects/gifts/medium-red-a.iob similarity index 100% rename from objects/structures/gifts/medium-red-a.iob rename to objects/gifts/medium-red-a.iob diff --git a/objects/structures/gifts/medium-red.iob b/objects/gifts/medium-red.iob similarity index 100% rename from objects/structures/gifts/medium-red.iob rename to objects/gifts/medium-red.iob diff --git a/objects/structures/gifts/red-a.iob b/objects/gifts/red-a.iob similarity index 100% rename from objects/structures/gifts/red-a.iob rename to objects/gifts/red-a.iob diff --git a/objects/structures/gifts/red.iob b/objects/gifts/red.iob similarity index 100% rename from objects/structures/gifts/red.iob rename to objects/gifts/red.iob diff --git a/objects/structures/gifts/supermassive-blue-a.iob b/objects/gifts/supermassive-blue-a.iob similarity index 100% rename from objects/structures/gifts/supermassive-blue-a.iob rename to objects/gifts/supermassive-blue-a.iob diff --git a/objects/structures/gifts/supermassive-blue.iob b/objects/gifts/supermassive-blue.iob similarity index 100% rename from objects/structures/gifts/supermassive-blue.iob rename to objects/gifts/supermassive-blue.iob diff --git a/objects/structures/gifts/supermassive-green-a.iob b/objects/gifts/supermassive-green-a.iob similarity index 100% rename from objects/structures/gifts/supermassive-green-a.iob rename to objects/gifts/supermassive-green-a.iob diff --git a/objects/structures/gifts/supermassive-green.iob b/objects/gifts/supermassive-green.iob similarity index 100% rename from objects/structures/gifts/supermassive-green.iob rename to objects/gifts/supermassive-green.iob diff --git a/objects/structures/gifts/supermassive-orange-a.iob b/objects/gifts/supermassive-orange-a.iob similarity index 100% rename from objects/structures/gifts/supermassive-orange-a.iob rename to objects/gifts/supermassive-orange-a.iob diff --git a/objects/structures/gifts/supermassive-orange.iob b/objects/gifts/supermassive-orange.iob similarity index 100% rename from objects/structures/gifts/supermassive-orange.iob rename to objects/gifts/supermassive-orange.iob diff --git a/objects/structures/gifts/supermassive-purple-a.iob b/objects/gifts/supermassive-purple-a.iob similarity index 100% rename from objects/structures/gifts/supermassive-purple-a.iob rename to objects/gifts/supermassive-purple-a.iob diff --git a/objects/structures/gifts/supermassive-purple.iob b/objects/gifts/supermassive-purple.iob similarity index 100% rename from objects/structures/gifts/supermassive-purple.iob rename to objects/gifts/supermassive-purple.iob diff --git a/objects/structures/gifts/supermassive-red-a.iob b/objects/gifts/supermassive-red-a.iob similarity index 100% rename from objects/structures/gifts/supermassive-red-a.iob rename to objects/gifts/supermassive-red-a.iob diff --git a/objects/structures/gifts/supermassive-red.iob b/objects/gifts/supermassive-red.iob similarity index 100% rename from objects/structures/gifts/supermassive-red.iob rename to objects/gifts/supermassive-red.iob diff --git a/objects/structures/gifts/supermassive-yellow-a.iob b/objects/gifts/supermassive-yellow-a.iob similarity index 100% rename from objects/structures/gifts/supermassive-yellow-a.iob rename to objects/gifts/supermassive-yellow-a.iob diff --git a/objects/structures/gifts/supermassive-yellow.iob b/objects/gifts/supermassive-yellow.iob similarity index 100% rename from objects/structures/gifts/supermassive-yellow.iob rename to objects/gifts/supermassive-yellow.iob diff --git a/objects/clutter/global-clutter/BigSwordPortal-lit-1.iob b/objects/global-clutter/BigSwordPortal-lit-1.iob similarity index 100% rename from objects/clutter/global-clutter/BigSwordPortal-lit-1.iob rename to objects/global-clutter/BigSwordPortal-lit-1.iob diff --git a/objects/clutter/global-clutter/BigSwordPortal-unlit-1.iob b/objects/global-clutter/BigSwordPortal-unlit-1.iob similarity index 100% rename from objects/clutter/global-clutter/BigSwordPortal-unlit-1.iob rename to objects/global-clutter/BigSwordPortal-unlit-1.iob diff --git a/objects/clutter/global-clutter/BigSwordPortalSTR-lit-2.iob b/objects/global-clutter/BigSwordPortalSTR-lit-2.iob similarity index 100% rename from objects/clutter/global-clutter/BigSwordPortalSTR-lit-2.iob rename to objects/global-clutter/BigSwordPortalSTR-lit-2.iob diff --git a/objects/clutter/global-clutter/BigSwordPortalSTR-unlit-2.iob b/objects/global-clutter/BigSwordPortalSTR-unlit-2.iob similarity index 100% rename from objects/clutter/global-clutter/BigSwordPortalSTR-unlit-2.iob rename to objects/global-clutter/BigSwordPortalSTR-unlit-2.iob diff --git a/objects/clutter/global-clutter/BrokSphinxToomb-1.iob b/objects/global-clutter/BrokSphinxToomb-1.iob similarity index 100% rename from objects/clutter/global-clutter/BrokSphinxToomb-1.iob rename to objects/global-clutter/BrokSphinxToomb-1.iob diff --git a/objects/clutter/global-clutter/sphinxToomb-1.iob b/objects/global-clutter/sphinxToomb-1.iob similarity index 100% rename from objects/clutter/global-clutter/sphinxToomb-1.iob rename to objects/global-clutter/sphinxToomb-1.iob diff --git a/objects/clutter/grave/grave.iob b/objects/grave/grave.iob similarity index 100% rename from objects/clutter/grave/grave.iob rename to objects/grave/grave.iob diff --git a/objects/structures/hand-bone/boneHand1.iob b/objects/hand-bone/boneHand1.iob similarity index 100% rename from objects/structures/hand-bone/boneHand1.iob rename to objects/hand-bone/boneHand1.iob diff --git a/objects/structures/hand-bone/boneHand2.iob b/objects/hand-bone/boneHand2.iob similarity index 100% rename from objects/structures/hand-bone/boneHand2.iob rename to objects/hand-bone/boneHand2.iob diff --git a/objects/structures/hand-bone/boneHand3.iob b/objects/hand-bone/boneHand3.iob similarity index 100% rename from objects/structures/hand-bone/boneHand3.iob rename to objects/hand-bone/boneHand3.iob diff --git a/objects/structures/hand-wood/HandJung1.iob b/objects/hand-wood/HandJung1.iob similarity index 100% rename from objects/structures/hand-wood/HandJung1.iob rename to objects/hand-wood/HandJung1.iob diff --git a/objects/structures/hand-wood/HandJung2.iob b/objects/hand-wood/HandJung2.iob similarity index 100% rename from objects/structures/hand-wood/HandJung2.iob rename to objects/hand-wood/HandJung2.iob diff --git a/objects/structures/hand-wood/HandJung3.iob b/objects/hand-wood/HandJung3.iob similarity index 100% rename from objects/structures/hand-wood/HandJung3.iob rename to objects/hand-wood/HandJung3.iob diff --git a/objects/clutter/haybale/hay1.iob b/objects/haybale/hay1.iob similarity index 100% rename from objects/clutter/haybale/hay1.iob rename to objects/haybale/hay1.iob diff --git a/objects/clutter/haybale/hay2.iob b/objects/haybale/hay2.iob similarity index 100% rename from objects/clutter/haybale/hay2.iob rename to objects/haybale/hay2.iob diff --git a/objects/clutter/haybale/hay3.iob b/objects/haybale/hay3.iob similarity index 100% rename from objects/clutter/haybale/hay3.iob rename to objects/haybale/hay3.iob diff --git a/objects/trees/oak/hoakgeneric1.iob b/objects/hazel-oak/hoak-1.iob similarity index 100% rename from objects/trees/oak/hoakgeneric1.iob rename to objects/hazel-oak/hoak-1.iob diff --git a/objects/trees/oak/hoakgeneric2.iob b/objects/hazel-oak/hoak-2.iob similarity index 100% rename from objects/trees/oak/hoakgeneric2.iob rename to objects/hazel-oak/hoak-2.iob diff --git a/objects/trees/oak/hoakgeneric3.iob b/objects/hazel-oak/hoak-3.iob similarity index 100% rename from objects/trees/oak/hoakgeneric3.iob rename to objects/hazel-oak/hoak-3.iob diff --git a/objects/trees/oak/hoakgeneric4.iob b/objects/hazel-oak/hoak-4.iob similarity index 100% rename from objects/trees/oak/hoakgeneric4.iob rename to objects/hazel-oak/hoak-4.iob diff --git a/objects/trees/oak/hoakgeneric5.iob b/objects/hazel-oak/hoak-5.iob similarity index 100% rename from objects/trees/oak/hoakgeneric5.iob rename to objects/hazel-oak/hoak-5.iob diff --git a/objects/trees/oak/hoakgeneric6.iob b/objects/hazel-oak/hoak-6.iob similarity index 100% rename from objects/trees/oak/hoakgeneric6.iob rename to objects/hazel-oak/hoak-6.iob diff --git a/objects/trees/oak/hoakgeneric7.iob b/objects/hazel-oak/hoak-7.iob similarity index 100% rename from objects/trees/oak/hoakgeneric7.iob rename to objects/hazel-oak/hoak-7.iob diff --git a/objects/trees/oak/hoakgeneric8.iob b/objects/hazel-oak/hoak-8.iob similarity index 100% rename from objects/trees/oak/hoakgeneric8.iob rename to objects/hazel-oak/hoak-8.iob diff --git a/objects/trees/oak/hoakgeneric9.iob b/objects/hazel-oak/hoak-9.iob similarity index 100% rename from objects/trees/oak/hoakgeneric9.iob rename to objects/hazel-oak/hoak-9.iob diff --git a/objects/trees/oak/shoakgeneric1.iob b/objects/hazel-oak/s-hoak-1.iob similarity index 100% rename from objects/trees/oak/shoakgeneric1.iob rename to objects/hazel-oak/s-hoak-1.iob diff --git a/objects/trees/oak/shoakgeneric2.iob b/objects/hazel-oak/s-hoak-10.iob similarity index 100% rename from objects/trees/oak/shoakgeneric2.iob rename to objects/hazel-oak/s-hoak-10.iob diff --git a/objects/trees/oak/shoakgeneric3.iob b/objects/hazel-oak/s-hoak-2.iob similarity index 100% rename from objects/trees/oak/shoakgeneric3.iob rename to objects/hazel-oak/s-hoak-2.iob diff --git a/objects/trees/oak/shoakgeneric4.iob b/objects/hazel-oak/s-hoak-3.iob similarity index 100% rename from objects/trees/oak/shoakgeneric4.iob rename to objects/hazel-oak/s-hoak-3.iob diff --git a/objects/trees/oak/shoakgeneric5.iob b/objects/hazel-oak/s-hoak-4.iob similarity index 100% rename from objects/trees/oak/shoakgeneric5.iob rename to objects/hazel-oak/s-hoak-4.iob diff --git a/objects/trees/oak/shoakgeneric6.iob b/objects/hazel-oak/s-hoak-5.iob similarity index 100% rename from objects/trees/oak/shoakgeneric6.iob rename to objects/hazel-oak/s-hoak-5.iob diff --git a/objects/trees/oak/shoakgeneric7.iob b/objects/hazel-oak/s-hoak-6.iob similarity index 100% rename from objects/trees/oak/shoakgeneric7.iob rename to objects/hazel-oak/s-hoak-6.iob diff --git a/objects/trees/oak/shoakgeneric8.iob b/objects/hazel-oak/s-hoak-7.iob similarity index 100% rename from objects/trees/oak/shoakgeneric8.iob rename to objects/hazel-oak/s-hoak-7.iob diff --git a/objects/trees/oak/shoakgeneric9.iob b/objects/hazel-oak/s-hoak-8.iob similarity index 100% rename from objects/trees/oak/shoakgeneric9.iob rename to objects/hazel-oak/s-hoak-8.iob diff --git a/objects/trees/oak/shoakgeneric10.iob b/objects/hazel-oak/s-hoak-9.iob similarity index 100% rename from objects/trees/oak/shoakgeneric10.iob rename to objects/hazel-oak/s-hoak-9.iob diff --git a/objects/trees/oak/thoakgeneric1.iob b/objects/hazel-oak/taller-oak-1.iob similarity index 100% rename from objects/trees/oak/thoakgeneric1.iob rename to objects/hazel-oak/taller-oak-1.iob diff --git a/objects/trees/oak/thoakgeneric2.iob b/objects/hazel-oak/taller-oak-10.iob similarity index 100% rename from objects/trees/oak/thoakgeneric2.iob rename to objects/hazel-oak/taller-oak-10.iob diff --git a/objects/trees/oak/thoakgeneric3.iob b/objects/hazel-oak/taller-oak-2.iob similarity index 100% rename from objects/trees/oak/thoakgeneric3.iob rename to objects/hazel-oak/taller-oak-2.iob diff --git a/objects/trees/oak/thoakgeneric4.iob b/objects/hazel-oak/taller-oak-3.iob similarity index 100% rename from objects/trees/oak/thoakgeneric4.iob rename to objects/hazel-oak/taller-oak-3.iob diff --git a/objects/trees/oak/thoakgeneric5.iob b/objects/hazel-oak/taller-oak-4.iob similarity index 100% rename from objects/trees/oak/thoakgeneric5.iob rename to objects/hazel-oak/taller-oak-4.iob diff --git a/objects/trees/oak/thoakgeneric6.iob b/objects/hazel-oak/taller-oak-5.iob similarity index 100% rename from objects/trees/oak/thoakgeneric6.iob rename to objects/hazel-oak/taller-oak-5.iob diff --git a/objects/trees/oak/thoakgeneric7.iob b/objects/hazel-oak/taller-oak-6.iob similarity index 100% rename from objects/trees/oak/thoakgeneric7.iob rename to objects/hazel-oak/taller-oak-6.iob diff --git a/objects/trees/oak/thoakgeneric8.iob b/objects/hazel-oak/taller-oak-7.iob similarity index 100% rename from objects/trees/oak/thoakgeneric8.iob rename to objects/hazel-oak/taller-oak-7.iob diff --git a/objects/trees/oak/thoakgeneric9.iob b/objects/hazel-oak/taller-oak-8.iob similarity index 100% rename from objects/trees/oak/thoakgeneric9.iob rename to objects/hazel-oak/taller-oak-8.iob diff --git a/objects/trees/oak/thoakgeneric10.iob b/objects/hazel-oak/taller-oak-9.iob similarity index 100% rename from objects/trees/oak/thoakgeneric10.iob rename to objects/hazel-oak/taller-oak-9.iob diff --git a/objects/clutter/hive/honey-nest-1.iob b/objects/hive/honey-nest-1.iob similarity index 100% rename from objects/clutter/hive/honey-nest-1.iob rename to objects/hive/honey-nest-1.iob diff --git a/objects/clutter/hive/honey-nest-10.iob b/objects/hive/honey-nest-10.iob similarity index 100% rename from objects/clutter/hive/honey-nest-10.iob rename to objects/hive/honey-nest-10.iob diff --git a/objects/clutter/hive/honey-nest-2.iob b/objects/hive/honey-nest-2.iob similarity index 100% rename from objects/clutter/hive/honey-nest-2.iob rename to objects/hive/honey-nest-2.iob diff --git a/objects/clutter/hive/honey-nest-3.iob b/objects/hive/honey-nest-3.iob similarity index 100% rename from objects/clutter/hive/honey-nest-3.iob rename to objects/hive/honey-nest-3.iob diff --git a/objects/clutter/hive/honey-nest-4.iob b/objects/hive/honey-nest-4.iob similarity index 100% rename from objects/clutter/hive/honey-nest-4.iob rename to objects/hive/honey-nest-4.iob diff --git a/objects/clutter/hive/honey-nest-5.iob b/objects/hive/honey-nest-5.iob similarity index 100% rename from objects/clutter/hive/honey-nest-5.iob rename to objects/hive/honey-nest-5.iob diff --git a/objects/clutter/hive/honey-nest-6.iob b/objects/hive/honey-nest-6.iob similarity index 100% rename from objects/clutter/hive/honey-nest-6.iob rename to objects/hive/honey-nest-6.iob diff --git a/objects/clutter/hive/honey-nest-7.iob b/objects/hive/honey-nest-7.iob similarity index 100% rename from objects/clutter/hive/honey-nest-7.iob rename to objects/hive/honey-nest-7.iob diff --git a/objects/clutter/hive/honey-nest-8.iob b/objects/hive/honey-nest-8.iob similarity index 100% rename from objects/clutter/hive/honey-nest-8.iob rename to objects/hive/honey-nest-8.iob diff --git a/objects/clutter/hive/honey-nest-9.iob b/objects/hive/honey-nest-9.iob similarity index 100% rename from objects/clutter/hive/honey-nest-9.iob rename to objects/hive/honey-nest-9.iob diff --git a/objects/trees/mixed/honey-tree/honey-1.iob b/objects/honey-tree/honey-1.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-1.iob rename to objects/honey-tree/honey-1.iob diff --git a/objects/trees/mixed/honey-tree/honey-10.iob b/objects/honey-tree/honey-10.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-10.iob rename to objects/honey-tree/honey-10.iob diff --git a/objects/trees/mixed/honey-tree/honey-11.iob b/objects/honey-tree/honey-11.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-11.iob rename to objects/honey-tree/honey-11.iob diff --git a/objects/trees/mixed/honey-tree/honey-12.iob b/objects/honey-tree/honey-12.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-12.iob rename to objects/honey-tree/honey-12.iob diff --git a/objects/trees/mixed/honey-tree/honey-13.iob b/objects/honey-tree/honey-13.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-13.iob rename to objects/honey-tree/honey-13.iob diff --git a/objects/trees/mixed/honey-tree/honey-14.iob b/objects/honey-tree/honey-14.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-14.iob rename to objects/honey-tree/honey-14.iob diff --git a/objects/trees/mixed/honey-tree/honey-15.iob b/objects/honey-tree/honey-15.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-15.iob rename to objects/honey-tree/honey-15.iob diff --git a/objects/trees/mixed/honey-tree/honey-16.iob b/objects/honey-tree/honey-16.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-16.iob rename to objects/honey-tree/honey-16.iob diff --git a/objects/trees/mixed/honey-tree/honey-17.iob b/objects/honey-tree/honey-17.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-17.iob rename to objects/honey-tree/honey-17.iob diff --git a/objects/trees/mixed/honey-tree/honey-18.iob b/objects/honey-tree/honey-18.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-18.iob rename to objects/honey-tree/honey-18.iob diff --git a/objects/trees/mixed/honey-tree/honey-19.iob b/objects/honey-tree/honey-19.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-19.iob rename to objects/honey-tree/honey-19.iob diff --git a/objects/trees/mixed/honey-tree/honey-2.iob b/objects/honey-tree/honey-2.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-2.iob rename to objects/honey-tree/honey-2.iob diff --git a/objects/trees/mixed/honey-tree/honey-20.iob b/objects/honey-tree/honey-20.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-20.iob rename to objects/honey-tree/honey-20.iob diff --git a/objects/trees/mixed/honey-tree/honey-3.iob b/objects/honey-tree/honey-3.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-3.iob rename to objects/honey-tree/honey-3.iob diff --git a/objects/trees/mixed/honey-tree/honey-4.iob b/objects/honey-tree/honey-4.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-4.iob rename to objects/honey-tree/honey-4.iob diff --git a/objects/trees/mixed/honey-tree/honey-5.iob b/objects/honey-tree/honey-5.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-5.iob rename to objects/honey-tree/honey-5.iob diff --git a/objects/trees/mixed/honey-tree/honey-6.iob b/objects/honey-tree/honey-6.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-6.iob rename to objects/honey-tree/honey-6.iob diff --git a/objects/trees/mixed/honey-tree/honey-7.iob b/objects/honey-tree/honey-7.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-7.iob rename to objects/honey-tree/honey-7.iob diff --git a/objects/trees/mixed/honey-tree/honey-8.iob b/objects/honey-tree/honey-8.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-8.iob rename to objects/honey-tree/honey-8.iob diff --git a/objects/trees/mixed/honey-tree/honey-9.iob b/objects/honey-tree/honey-9.iob similarity index 100% rename from objects/trees/mixed/honey-tree/honey-9.iob rename to objects/honey-tree/honey-9.iob diff --git a/objects/house-jap/MedJap1.iob b/objects/house-jap/MedJap1.iob new file mode 100644 index 00000000..fe0da7fa Binary files /dev/null and b/objects/house-jap/MedJap1.iob differ diff --git a/objects/house-jap/MedJap10.iob b/objects/house-jap/MedJap10.iob new file mode 100644 index 00000000..a7f99377 Binary files /dev/null and b/objects/house-jap/MedJap10.iob differ diff --git a/objects/house-jap/MedJap2.iob b/objects/house-jap/MedJap2.iob new file mode 100644 index 00000000..5d4e4f37 Binary files /dev/null and b/objects/house-jap/MedJap2.iob differ diff --git a/objects/house-jap/MedJap3.iob b/objects/house-jap/MedJap3.iob new file mode 100644 index 00000000..8d3fa82b Binary files /dev/null and b/objects/house-jap/MedJap3.iob differ diff --git a/objects/house-jap/MedJap4.iob b/objects/house-jap/MedJap4.iob new file mode 100644 index 00000000..390f3d11 Binary files /dev/null and b/objects/house-jap/MedJap4.iob differ diff --git a/objects/house-jap/MedJap5.iob b/objects/house-jap/MedJap5.iob new file mode 100644 index 00000000..1e527139 Binary files /dev/null and b/objects/house-jap/MedJap5.iob differ diff --git a/objects/house-jap/MedJap6.iob b/objects/house-jap/MedJap6.iob new file mode 100644 index 00000000..430d042b Binary files /dev/null and b/objects/house-jap/MedJap6.iob differ diff --git a/objects/house-jap/MedJap7.iob b/objects/house-jap/MedJap7.iob new file mode 100644 index 00000000..0a47d1ea Binary files /dev/null and b/objects/house-jap/MedJap7.iob differ diff --git a/objects/house-jap/MedJap8.iob b/objects/house-jap/MedJap8.iob new file mode 100644 index 00000000..312df849 Binary files /dev/null and b/objects/house-jap/MedJap8.iob differ diff --git a/objects/house-jap/MedJap9.iob b/objects/house-jap/MedJap9.iob new file mode 100644 index 00000000..1aa3f3b2 Binary files /dev/null and b/objects/house-jap/MedJap9.iob differ diff --git a/objects/jigsaw/house-norm/Med1.iob b/objects/house-norm/Med1.iob similarity index 100% rename from objects/jigsaw/house-norm/Med1.iob rename to objects/house-norm/Med1.iob diff --git a/objects/jigsaw/house-norm/Med10.iob b/objects/house-norm/Med10.iob similarity index 100% rename from objects/jigsaw/house-norm/Med10.iob rename to objects/house-norm/Med10.iob diff --git a/objects/jigsaw/house-norm/Med2.iob b/objects/house-norm/Med2.iob similarity index 100% rename from objects/jigsaw/house-norm/Med2.iob rename to objects/house-norm/Med2.iob diff --git a/objects/jigsaw/house-norm/Med3.iob b/objects/house-norm/Med3.iob similarity index 100% rename from objects/jigsaw/house-norm/Med3.iob rename to objects/house-norm/Med3.iob diff --git a/objects/jigsaw/house-norm/Med4.iob b/objects/house-norm/Med4.iob similarity index 100% rename from objects/jigsaw/house-norm/Med4.iob rename to objects/house-norm/Med4.iob diff --git a/objects/jigsaw/house-norm/Med5.iob b/objects/house-norm/Med5.iob similarity index 100% rename from objects/jigsaw/house-norm/Med5.iob rename to objects/house-norm/Med5.iob diff --git a/objects/jigsaw/house-norm/Med6.iob b/objects/house-norm/Med6.iob similarity index 100% rename from objects/jigsaw/house-norm/Med6.iob rename to objects/house-norm/Med6.iob diff --git a/objects/jigsaw/house-norm/Med7.iob b/objects/house-norm/Med7.iob similarity index 100% rename from objects/jigsaw/house-norm/Med7.iob rename to objects/house-norm/Med7.iob diff --git a/objects/jigsaw/house-norm/Med8.iob b/objects/house-norm/Med8.iob similarity index 100% rename from objects/jigsaw/house-norm/Med8.iob rename to objects/house-norm/Med8.iob diff --git a/objects/jigsaw/house-norm/Med9.iob b/objects/house-norm/Med9.iob similarity index 100% rename from objects/jigsaw/house-norm/Med9.iob rename to objects/house-norm/Med9.iob diff --git a/objects/jigsaw/house-purjap/PurJap1.iob b/objects/house-purjap/PurJap1.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap1.iob rename to objects/house-purjap/PurJap1.iob diff --git a/objects/jigsaw/house-purjap/PurJap10.iob b/objects/house-purjap/PurJap10.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap10.iob rename to objects/house-purjap/PurJap10.iob diff --git a/objects/jigsaw/house-purjap/PurJap2.iob b/objects/house-purjap/PurJap2.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap2.iob rename to objects/house-purjap/PurJap2.iob diff --git a/objects/jigsaw/house-purjap/PurJap3.iob b/objects/house-purjap/PurJap3.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap3.iob rename to objects/house-purjap/PurJap3.iob diff --git a/objects/jigsaw/house-purjap/PurJap4.iob b/objects/house-purjap/PurJap4.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap4.iob rename to objects/house-purjap/PurJap4.iob diff --git a/objects/jigsaw/house-purjap/PurJap5.iob b/objects/house-purjap/PurJap5.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap5.iob rename to objects/house-purjap/PurJap5.iob diff --git a/objects/jigsaw/house-purjap/PurJap6.iob b/objects/house-purjap/PurJap6.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap6.iob rename to objects/house-purjap/PurJap6.iob diff --git a/objects/jigsaw/house-purjap/PurJap7.iob b/objects/house-purjap/PurJap7.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap7.iob rename to objects/house-purjap/PurJap7.iob diff --git a/objects/jigsaw/house-purjap/PurJap8.iob b/objects/house-purjap/PurJap8.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap8.iob rename to objects/house-purjap/PurJap8.iob diff --git a/objects/jigsaw/house-purjap/PurJap9.iob b/objects/house-purjap/PurJap9.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap9.iob rename to objects/house-purjap/PurJap9.iob diff --git a/objects/structures/rustic4.iob b/objects/house-rustic/rustic4.iob similarity index 100% rename from objects/structures/rustic4.iob rename to objects/house-rustic/rustic4.iob diff --git a/objects/jigsaw/houses/jap/j1.iob b/objects/houses/jap/j1.iob similarity index 100% rename from objects/jigsaw/houses/jap/j1.iob rename to objects/houses/jap/j1.iob diff --git a/objects/jigsaw/houses/jap/j10.iob b/objects/houses/jap/j10.iob similarity index 100% rename from objects/jigsaw/houses/jap/j10.iob rename to objects/houses/jap/j10.iob diff --git a/objects/jigsaw/houses/jap/j2.iob b/objects/houses/jap/j2.iob similarity index 100% rename from objects/jigsaw/houses/jap/j2.iob rename to objects/houses/jap/j2.iob diff --git a/objects/jigsaw/houses/jap/j3.iob b/objects/houses/jap/j3.iob similarity index 100% rename from objects/jigsaw/houses/jap/j3.iob rename to objects/houses/jap/j3.iob diff --git a/objects/jigsaw/houses/jap/j4.iob b/objects/houses/jap/j4.iob similarity index 100% rename from objects/jigsaw/houses/jap/j4.iob rename to objects/houses/jap/j4.iob diff --git a/objects/jigsaw/houses/jap/j5.iob b/objects/houses/jap/j5.iob similarity index 100% rename from objects/jigsaw/houses/jap/j5.iob rename to objects/houses/jap/j5.iob diff --git a/objects/jigsaw/houses/jap/j6.iob b/objects/houses/jap/j6.iob similarity index 100% rename from objects/jigsaw/houses/jap/j6.iob rename to objects/houses/jap/j6.iob diff --git a/objects/jigsaw/houses/jap/j7.iob b/objects/houses/jap/j7.iob similarity index 100% rename from objects/jigsaw/houses/jap/j7.iob rename to objects/houses/jap/j7.iob diff --git a/objects/jigsaw/houses/jap/j8.iob b/objects/houses/jap/j8.iob similarity index 100% rename from objects/jigsaw/houses/jap/j8.iob rename to objects/houses/jap/j8.iob diff --git a/objects/jigsaw/houses/jap/j9.iob b/objects/houses/jap/j9.iob similarity index 100% rename from objects/jigsaw/houses/jap/j9.iob rename to objects/houses/jap/j9.iob diff --git a/objects/jigsaw/houses/paths/corner1.iob b/objects/houses/paths/corner1.iob similarity index 100% rename from objects/jigsaw/houses/paths/corner1.iob rename to objects/houses/paths/corner1.iob diff --git a/objects/jigsaw/houses/paths/cross.iob b/objects/houses/paths/cross.iob similarity index 100% rename from objects/jigsaw/houses/paths/cross.iob rename to objects/houses/paths/cross.iob diff --git a/objects/jigsaw/houses/paths/end1.iob b/objects/houses/paths/end1.iob similarity index 100% rename from objects/jigsaw/houses/paths/end1.iob rename to objects/houses/paths/end1.iob diff --git a/objects/jigsaw/houses/paths/hall1.iob b/objects/houses/paths/hall1.iob similarity index 100% rename from objects/jigsaw/houses/paths/hall1.iob rename to objects/houses/paths/hall1.iob diff --git a/objects/jigsaw/houses/paths/tjunct.iob b/objects/houses/paths/tjunct.iob similarity index 100% rename from objects/jigsaw/houses/paths/tjunct.iob rename to objects/houses/paths/tjunct.iob diff --git a/objects/clutter/ice-spikes/ic-1.iob b/objects/ice-spikes/ic-1.iob similarity index 100% rename from objects/clutter/ice-spikes/ic-1.iob rename to objects/ice-spikes/ic-1.iob diff --git a/objects/clutter/ice-spikes/ic-10.iob b/objects/ice-spikes/ic-10.iob similarity index 100% rename from objects/clutter/ice-spikes/ic-10.iob rename to objects/ice-spikes/ic-10.iob diff --git a/objects/clutter/ice-spikes/ic-11.iob b/objects/ice-spikes/ic-11.iob similarity index 100% rename from objects/clutter/ice-spikes/ic-11.iob rename to objects/ice-spikes/ic-11.iob diff --git a/objects/clutter/ice-spikes/ic-2.iob b/objects/ice-spikes/ic-2.iob similarity index 100% rename from objects/clutter/ice-spikes/ic-2.iob rename to objects/ice-spikes/ic-2.iob diff --git a/objects/clutter/ice-spikes/ic-3.iob b/objects/ice-spikes/ic-3.iob similarity index 100% rename from objects/clutter/ice-spikes/ic-3.iob rename to objects/ice-spikes/ic-3.iob diff --git a/objects/clutter/ice-spikes/ic-4.iob b/objects/ice-spikes/ic-4.iob similarity index 100% rename from objects/clutter/ice-spikes/ic-4.iob rename to objects/ice-spikes/ic-4.iob diff --git a/objects/clutter/ice-spikes/ic-5.iob b/objects/ice-spikes/ic-5.iob similarity index 100% rename from objects/clutter/ice-spikes/ic-5.iob rename to objects/ice-spikes/ic-5.iob diff --git a/objects/clutter/ice-spikes/ic-6.iob b/objects/ice-spikes/ic-6.iob similarity index 100% rename from objects/clutter/ice-spikes/ic-6.iob rename to objects/ice-spikes/ic-6.iob diff --git a/objects/clutter/ice-spikes/ic-7.iob b/objects/ice-spikes/ic-7.iob similarity index 100% rename from objects/clutter/ice-spikes/ic-7.iob rename to objects/ice-spikes/ic-7.iob diff --git a/objects/clutter/ice-spikes/ic-8.iob b/objects/ice-spikes/ic-8.iob similarity index 100% rename from objects/clutter/ice-spikes/ic-8.iob rename to objects/ice-spikes/ic-8.iob diff --git a/objects/clutter/ice-spikes/ic-9.iob b/objects/ice-spikes/ic-9.iob similarity index 100% rename from objects/clutter/ice-spikes/ic-9.iob rename to objects/ice-spikes/ic-9.iob diff --git a/objects/clutter/ice-spikes/ice-spec-1.iob b/objects/ice-spikes/ice-spec-1.iob similarity index 100% rename from objects/clutter/ice-spikes/ice-spec-1.iob rename to objects/ice-spikes/ice-spec-1.iob diff --git a/objects/clutter/ice-spikes/ice-spec-2.iob b/objects/ice-spikes/ice-spec-2.iob similarity index 100% rename from objects/clutter/ice-spikes/ice-spec-2.iob rename to objects/ice-spikes/ice-spec-2.iob diff --git a/objects/clutter/ice-spikes/ice-spec-3.iob b/objects/ice-spikes/ice-spec-3.iob similarity index 100% rename from objects/clutter/ice-spikes/ice-spec-3.iob rename to objects/ice-spikes/ice-spec-3.iob diff --git a/objects/clutter/ice-spikes/ice-spec-4.iob b/objects/ice-spikes/ice-spec-4.iob similarity index 100% rename from objects/clutter/ice-spikes/ice-spec-4.iob rename to objects/ice-spikes/ice-spec-4.iob diff --git a/objects/clutter/ice-spikes/ice-spec-5.iob b/objects/ice-spikes/ice-spec-5.iob similarity index 100% rename from objects/clutter/ice-spikes/ice-spec-5.iob rename to objects/ice-spikes/ice-spec-5.iob diff --git a/objects/clutter/ice-spikes/smol-ice-spike-1.iob b/objects/ice-spikes/smol-ice-spike-1.iob similarity index 100% rename from objects/clutter/ice-spikes/smol-ice-spike-1.iob rename to objects/ice-spikes/smol-ice-spike-1.iob diff --git a/objects/clutter/ice-spikes/smol-ice-spike-2.iob b/objects/ice-spikes/smol-ice-spike-2.iob similarity index 100% rename from objects/clutter/ice-spikes/smol-ice-spike-2.iob rename to objects/ice-spikes/smol-ice-spike-2.iob diff --git a/objects/clutter/ice-spikes/smol-ice-spike-3.iob b/objects/ice-spikes/smol-ice-spike-3.iob similarity index 100% rename from objects/clutter/ice-spikes/smol-ice-spike-3.iob rename to objects/ice-spikes/smol-ice-spike-3.iob diff --git a/objects/clutter/ice-spikes/smol-ice-spike-4.iob b/objects/ice-spikes/smol-ice-spike-4.iob similarity index 100% rename from objects/clutter/ice-spikes/smol-ice-spike-4.iob rename to objects/ice-spikes/smol-ice-spike-4.iob diff --git a/objects/clutter/ice-spikes/smol-ice-spike-5.iob b/objects/ice-spikes/smol-ice-spike-5.iob similarity index 100% rename from objects/clutter/ice-spikes/smol-ice-spike-5.iob rename to objects/ice-spikes/smol-ice-spike-5.iob diff --git a/objects/clutter/ice-spikes/smol-ice-spike-6.iob b/objects/ice-spikes/smol-ice-spike-6.iob similarity index 100% rename from objects/clutter/ice-spikes/smol-ice-spike-6.iob rename to objects/ice-spikes/smol-ice-spike-6.iob diff --git a/objects/clutter/ice-spikes/smol-ice-spike-7.iob b/objects/ice-spikes/smol-ice-spike-7.iob similarity index 100% rename from objects/clutter/ice-spikes/smol-ice-spike-7.iob rename to objects/ice-spikes/smol-ice-spike-7.iob diff --git a/objects/clutter/ice-spikes/smol-ice-spike-8.iob b/objects/ice-spikes/smol-ice-spike-8.iob similarity index 100% rename from objects/clutter/ice-spikes/smol-ice-spike-8.iob rename to objects/ice-spikes/smol-ice-spike-8.iob diff --git a/objects/clutter/ice-spikes/smol-ice-spike-9.iob b/objects/ice-spikes/smol-ice-spike-9.iob similarity index 100% rename from objects/clutter/ice-spikes/smol-ice-spike-9.iob rename to objects/ice-spikes/smol-ice-spike-9.iob diff --git a/objects/clutter/ice-spikes/sp-1.iob b/objects/ice-spikes/sp-1.iob similarity index 100% rename from objects/clutter/ice-spikes/sp-1.iob rename to objects/ice-spikes/sp-1.iob diff --git a/objects/clutter/ice-spikes/sp-2.iob b/objects/ice-spikes/sp-2.iob similarity index 100% rename from objects/clutter/ice-spikes/sp-2.iob rename to objects/ice-spikes/sp-2.iob diff --git a/objects/clutter/ice-spikes/sp-3.iob b/objects/ice-spikes/sp-3.iob similarity index 100% rename from objects/clutter/ice-spikes/sp-3.iob rename to objects/ice-spikes/sp-3.iob diff --git a/objects/clutter/ice-spikes/sp-4.iob b/objects/ice-spikes/sp-4.iob similarity index 100% rename from objects/clutter/ice-spikes/sp-4.iob rename to objects/ice-spikes/sp-4.iob diff --git a/objects/clutter/ice-spikes/sp-5.iob b/objects/ice-spikes/sp-5.iob similarity index 100% rename from objects/clutter/ice-spikes/sp-5.iob rename to objects/ice-spikes/sp-5.iob diff --git a/objects/clutter/ice-spikes/tp-1.iob b/objects/ice-spikes/tp-1.iob similarity index 100% rename from objects/clutter/ice-spikes/tp-1.iob rename to objects/ice-spikes/tp-1.iob diff --git a/objects/clutter/ice-spikes/tp-2.iob b/objects/ice-spikes/tp-2.iob similarity index 100% rename from objects/clutter/ice-spikes/tp-2.iob rename to objects/ice-spikes/tp-2.iob diff --git a/objects/clutter/ice-spikes/tp-3.iob b/objects/ice-spikes/tp-3.iob similarity index 100% rename from objects/clutter/ice-spikes/tp-3.iob rename to objects/ice-spikes/tp-3.iob diff --git a/objects/clutter/ice-spikes/tp-4.iob b/objects/ice-spikes/tp-4.iob similarity index 100% rename from objects/clutter/ice-spikes/tp-4.iob rename to objects/ice-spikes/tp-4.iob diff --git a/objects/jigsaw/igloo/bottom.iob b/objects/igloo/bottom.iob similarity index 100% rename from objects/jigsaw/igloo/bottom.iob rename to objects/igloo/bottom.iob diff --git a/objects/jigsaw/igloo/middle.iob b/objects/igloo/middle.iob similarity index 100% rename from objects/jigsaw/igloo/middle.iob rename to objects/igloo/middle.iob diff --git a/objects/jigsaw/igloo/top1.iob b/objects/igloo/top1.iob similarity index 100% rename from objects/jigsaw/igloo/top1.iob rename to objects/igloo/top1.iob diff --git a/objects/jigsaw/igloo/top2.iob b/objects/igloo/top2.iob similarity index 100% rename from objects/jigsaw/igloo/top2.iob rename to objects/igloo/top2.iob diff --git a/objects/trees/jungle/denmyre1.iob b/objects/jungle-medium/jungle-denmyre-1.iob similarity index 100% rename from objects/trees/jungle/denmyre1.iob rename to objects/jungle-medium/jungle-denmyre-1.iob diff --git a/objects/trees/jungle/denmyre2.iob b/objects/jungle-medium/jungle-denmyre-10.iob similarity index 100% rename from objects/trees/jungle/denmyre2.iob rename to objects/jungle-medium/jungle-denmyre-10.iob diff --git a/objects/trees/jungle/denmyre3.iob b/objects/jungle-medium/jungle-denmyre-11.iob similarity index 100% rename from objects/trees/jungle/denmyre3.iob rename to objects/jungle-medium/jungle-denmyre-11.iob diff --git a/objects/trees/jungle/denmyre4.iob b/objects/jungle-medium/jungle-denmyre-12.iob similarity index 100% rename from objects/trees/jungle/denmyre4.iob rename to objects/jungle-medium/jungle-denmyre-12.iob diff --git a/objects/trees/jungle/denmyre5.iob b/objects/jungle-medium/jungle-denmyre-13.iob similarity index 100% rename from objects/trees/jungle/denmyre5.iob rename to objects/jungle-medium/jungle-denmyre-13.iob diff --git a/objects/trees/jungle/denmyre6.iob b/objects/jungle-medium/jungle-denmyre-14.iob similarity index 100% rename from objects/trees/jungle/denmyre6.iob rename to objects/jungle-medium/jungle-denmyre-14.iob diff --git a/objects/trees/jungle/denmyre7.iob b/objects/jungle-medium/jungle-denmyre-15.iob similarity index 100% rename from objects/trees/jungle/denmyre7.iob rename to objects/jungle-medium/jungle-denmyre-15.iob diff --git a/objects/trees/jungle/denmyre8.iob b/objects/jungle-medium/jungle-denmyre-16.iob similarity index 100% rename from objects/trees/jungle/denmyre8.iob rename to objects/jungle-medium/jungle-denmyre-16.iob diff --git a/objects/trees/jungle/denmyre9.iob b/objects/jungle-medium/jungle-denmyre-2.iob similarity index 100% rename from objects/trees/jungle/denmyre9.iob rename to objects/jungle-medium/jungle-denmyre-2.iob diff --git a/objects/trees/jungle/denmyre10.iob b/objects/jungle-medium/jungle-denmyre-3.iob similarity index 100% rename from objects/trees/jungle/denmyre10.iob rename to objects/jungle-medium/jungle-denmyre-3.iob diff --git a/objects/trees/jungle/denmyre11.iob b/objects/jungle-medium/jungle-denmyre-4.iob similarity index 100% rename from objects/trees/jungle/denmyre11.iob rename to objects/jungle-medium/jungle-denmyre-4.iob diff --git a/objects/trees/jungle/denmyre12.iob b/objects/jungle-medium/jungle-denmyre-5.iob similarity index 100% rename from objects/trees/jungle/denmyre12.iob rename to objects/jungle-medium/jungle-denmyre-5.iob diff --git a/objects/trees/jungle/denmyre13.iob b/objects/jungle-medium/jungle-denmyre-6.iob similarity index 100% rename from objects/trees/jungle/denmyre13.iob rename to objects/jungle-medium/jungle-denmyre-6.iob diff --git a/objects/trees/jungle/denmyre14.iob b/objects/jungle-medium/jungle-denmyre-7.iob similarity index 100% rename from objects/trees/jungle/denmyre14.iob rename to objects/jungle-medium/jungle-denmyre-7.iob diff --git a/objects/trees/jungle/denmyre15.iob b/objects/jungle-medium/jungle-denmyre-8.iob similarity index 100% rename from objects/trees/jungle/denmyre15.iob rename to objects/jungle-medium/jungle-denmyre-8.iob diff --git a/objects/trees/jungle/denmyre16.iob b/objects/jungle-medium/jungle-denmyre-9.iob similarity index 100% rename from objects/trees/jungle/denmyre16.iob rename to objects/jungle-medium/jungle-denmyre-9.iob diff --git a/objects/jigsaw/jungle-pyramid/jungle_pyramid.iob b/objects/jungle-pyramid/jungle_pyramid.iob similarity index 100% rename from objects/jigsaw/jungle-pyramid/jungle_pyramid.iob rename to objects/jungle-pyramid/jungle_pyramid.iob diff --git a/objects/trees/jungle/lgeneric1.iob b/objects/jungle-remade/J11.iob similarity index 100% rename from objects/trees/jungle/lgeneric1.iob rename to objects/jungle-remade/J11.iob diff --git a/objects/trees/jungle/lgeneric2.iob b/objects/jungle-remade/J12.iob similarity index 100% rename from objects/trees/jungle/lgeneric2.iob rename to objects/jungle-remade/J12.iob diff --git a/objects/trees/jungle/lgeneric3.iob b/objects/jungle-remade/J13.iob similarity index 100% rename from objects/trees/jungle/lgeneric3.iob rename to objects/jungle-remade/J13.iob diff --git a/objects/trees/jungle/lgeneric4.iob b/objects/jungle-remade/J4.iob similarity index 100% rename from objects/trees/jungle/lgeneric4.iob rename to objects/jungle-remade/J4.iob diff --git a/objects/trees/jungle/lgeneric5.iob b/objects/jungle-remade/J5.iob similarity index 100% rename from objects/trees/jungle/lgeneric5.iob rename to objects/jungle-remade/J5.iob diff --git a/objects/trees/jungle/lgeneric6.iob b/objects/jungle-remade/J6.iob similarity index 100% rename from objects/trees/jungle/lgeneric6.iob rename to objects/jungle-remade/J6.iob diff --git a/objects/trees/jungle/lgeneric7.iob b/objects/jungle-remade/J7.iob similarity index 100% rename from objects/trees/jungle/lgeneric7.iob rename to objects/jungle-remade/J7.iob diff --git a/objects/trees/jungle/lgeneric8.iob b/objects/jungle-remade/J8.iob similarity index 100% rename from objects/trees/jungle/lgeneric8.iob rename to objects/jungle-remade/J8.iob diff --git a/objects/trees/jungle/lgeneric9.iob b/objects/jungle-remade/J9.iob similarity index 100% rename from objects/trees/jungle/lgeneric9.iob rename to objects/jungle-remade/J9.iob diff --git a/objects/jungle-remade/bbjungle-1.iob b/objects/jungle-remade/bbjungle-1.iob new file mode 100644 index 00000000..bd9c4e90 Binary files /dev/null and b/objects/jungle-remade/bbjungle-1.iob differ diff --git a/objects/trees/jungle/largegeneric1.iob b/objects/jungle-remade/bjungle-1.iob similarity index 100% rename from objects/trees/jungle/largegeneric1.iob rename to objects/jungle-remade/bjungle-1.iob diff --git a/objects/trees/jungle/largegeneric2.iob b/objects/jungle-remade/bjungle-2.iob similarity index 100% rename from objects/trees/jungle/largegeneric2.iob rename to objects/jungle-remade/bjungle-2.iob diff --git a/objects/trees/jungle/largegeneric3.iob b/objects/jungle-remade/bjungle-3.iob similarity index 100% rename from objects/trees/jungle/largegeneric3.iob rename to objects/jungle-remade/bjungle-3.iob diff --git a/objects/trees/jungle/largegeneric4.iob b/objects/jungle-remade/bjungle-4.iob similarity index 100% rename from objects/trees/jungle/largegeneric4.iob rename to objects/jungle-remade/bjungle-4.iob diff --git a/objects/trees/jungle/largegeneric5.iob b/objects/jungle-remade/bjungle-5.iob similarity index 100% rename from objects/trees/jungle/largegeneric5.iob rename to objects/jungle-remade/bjungle-5.iob diff --git a/objects/trees/jungle/bmbogeneric1.iob b/objects/jungle-remade/bmbo-1.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric1.iob rename to objects/jungle-remade/bmbo-1.iob diff --git a/objects/trees/jungle/bmbogeneric2.iob b/objects/jungle-remade/bmbo-2.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric2.iob rename to objects/jungle-remade/bmbo-2.iob diff --git a/objects/trees/jungle/bmbogeneric3.iob b/objects/jungle-remade/bmbo-3.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric3.iob rename to objects/jungle-remade/bmbo-3.iob diff --git a/objects/trees/jungle/bmbogeneric4.iob b/objects/jungle-remade/bmbo-4.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric4.iob rename to objects/jungle-remade/bmbo-4.iob diff --git a/objects/trees/jungle/bmbogeneric5.iob b/objects/jungle-remade/bmbo-5.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric5.iob rename to objects/jungle-remade/bmbo-5.iob diff --git a/objects/trees/jungle/bmbogeneric6.iob b/objects/jungle-remade/bmbo-6.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric6.iob rename to objects/jungle-remade/bmbo-6.iob diff --git a/objects/trees/jungle/bmbogeneric7.iob b/objects/jungle-remade/bmbo-7.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric7.iob rename to objects/jungle-remade/bmbo-7.iob diff --git a/objects/trees/jungle/bmbogeneric8.iob b/objects/jungle-remade/bmbo-8.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric8.iob rename to objects/jungle-remade/bmbo-8.iob diff --git a/objects/trees/jungle/bmbogeneric9.iob b/objects/jungle-remade/bmbo-9.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric9.iob rename to objects/jungle-remade/bmbo-9.iob diff --git a/objects/trees/jungle/mgeneric4.iob b/objects/jungle-remade/j2.iob similarity index 100% rename from objects/trees/jungle/mgeneric4.iob rename to objects/jungle-remade/j2.iob diff --git a/objects/trees/jungle/mgeneric3.iob b/objects/jungle-remade/j3.iob similarity index 100% rename from objects/trees/jungle/mgeneric3.iob rename to objects/jungle-remade/j3.iob diff --git a/objects/trees/jungle/cocogeneric1.iob b/objects/jungle-remade/jcoco-1.iob similarity index 100% rename from objects/trees/jungle/cocogeneric1.iob rename to objects/jungle-remade/jcoco-1.iob diff --git a/objects/trees/jungle/cocogeneric2.iob b/objects/jungle-remade/jcoco-2.iob similarity index 100% rename from objects/trees/jungle/cocogeneric2.iob rename to objects/jungle-remade/jcoco-2.iob diff --git a/objects/trees/jungle/cocogeneric3.iob b/objects/jungle-remade/jcoco-3.iob similarity index 100% rename from objects/trees/jungle/cocogeneric3.iob rename to objects/jungle-remade/jcoco-3.iob diff --git a/objects/trees/jungle/cocogeneric4.iob b/objects/jungle-remade/jcoco-4.iob similarity index 100% rename from objects/trees/jungle/cocogeneric4.iob rename to objects/jungle-remade/jcoco-4.iob diff --git a/objects/trees/jungle/cocogeneric5.iob b/objects/jungle-remade/jcoco-5.iob similarity index 100% rename from objects/trees/jungle/cocogeneric5.iob rename to objects/jungle-remade/jcoco-5.iob diff --git a/objects/trees/jungle/spire1.iob b/objects/jungle-remade/jspire-1.iob similarity index 100% rename from objects/trees/jungle/spire1.iob rename to objects/jungle-remade/jspire-1.iob diff --git a/objects/trees/jungle/spire2.iob b/objects/jungle-remade/jspire-2.iob similarity index 100% rename from objects/trees/jungle/spire2.iob rename to objects/jungle-remade/jspire-2.iob diff --git a/objects/trees/jungle/spire3.iob b/objects/jungle-remade/jspire-3.iob similarity index 100% rename from objects/trees/jungle/spire3.iob rename to objects/jungle-remade/jspire-3.iob diff --git a/objects/trees/jungle/spire4.iob b/objects/jungle-remade/jspire-4.iob similarity index 100% rename from objects/trees/jungle/spire4.iob rename to objects/jungle-remade/jspire-4.iob diff --git a/objects/trees/jungle/spire5.iob b/objects/jungle-remade/jspire-5.iob similarity index 100% rename from objects/trees/jungle/spire5.iob rename to objects/jungle-remade/jspire-5.iob diff --git a/objects/trees/jungle/spire6.iob b/objects/jungle-remade/jspire-6.iob similarity index 100% rename from objects/trees/jungle/spire6.iob rename to objects/jungle-remade/jspire-6.iob diff --git a/objects/trees/jungle/spire7.iob b/objects/jungle-remade/jspire-7.iob similarity index 100% rename from objects/trees/jungle/spire7.iob rename to objects/jungle-remade/jspire-7.iob diff --git a/objects/trees/jungle/sgeneric1.iob b/objects/jungle-remade/sjungle-1.iob similarity index 100% rename from objects/trees/jungle/sgeneric1.iob rename to objects/jungle-remade/sjungle-1.iob diff --git a/objects/trees/jungle/sgeneric2.iob b/objects/jungle-remade/sjungle-2.iob similarity index 100% rename from objects/trees/jungle/sgeneric2.iob rename to objects/jungle-remade/sjungle-2.iob diff --git a/objects/trees/jungle/sgeneric3.iob b/objects/jungle-remade/sjungle-3.iob similarity index 100% rename from objects/trees/jungle/sgeneric3.iob rename to objects/jungle-remade/sjungle-3.iob diff --git a/objects/trees/jungle/sgeneric4.iob b/objects/jungle-remade/sjungle-4.iob similarity index 100% rename from objects/trees/jungle/sgeneric4.iob rename to objects/jungle-remade/sjungle-4.iob diff --git a/objects/trees/jungle/smgeneric1.iob b/objects/jungle-remade/ssmjungle1.iob similarity index 100% rename from objects/trees/jungle/smgeneric1.iob rename to objects/jungle-remade/ssmjungle1.iob diff --git a/objects/structures/landform/spikes/1.iob b/objects/landform/spikes/1.iob similarity index 100% rename from objects/structures/landform/spikes/1.iob rename to objects/landform/spikes/1.iob diff --git a/objects/structures/landform/spikes/2.iob b/objects/landform/spikes/2.iob similarity index 100% rename from objects/structures/landform/spikes/2.iob rename to objects/landform/spikes/2.iob diff --git a/objects/structures/landform/spikes/3.iob b/objects/landform/spikes/3.iob similarity index 100% rename from objects/structures/landform/spikes/3.iob rename to objects/landform/spikes/3.iob diff --git a/objects/structures/landform/stone/1.iob b/objects/landform/stone/1.iob similarity index 100% rename from objects/structures/landform/stone/1.iob rename to objects/landform/stone/1.iob diff --git a/objects/structures/landform/stone/2.iob b/objects/landform/stone/2.iob similarity index 100% rename from objects/structures/landform/stone/2.iob rename to objects/landform/stone/2.iob diff --git a/objects/structures/landform/stone/3.iob b/objects/landform/stone/3.iob similarity index 100% rename from objects/structures/landform/stone/3.iob rename to objects/landform/stone/3.iob diff --git a/objects/structures/landform/stone/4.iob b/objects/landform/stone/4.iob similarity index 100% rename from objects/structures/landform/stone/4.iob rename to objects/landform/stone/4.iob diff --git a/objects/structures/landform/stone/5.iob b/objects/landform/stone/5.iob similarity index 100% rename from objects/structures/landform/stone/5.iob rename to objects/landform/stone/5.iob diff --git a/objects/structures/landform/underwater/ellipsoid-1.iob b/objects/landform/underwater/ellipsoid-1.iob similarity index 100% rename from objects/structures/landform/underwater/ellipsoid-1.iob rename to objects/landform/underwater/ellipsoid-1.iob diff --git a/objects/clutter/lith/concrete-lith-1.iob b/objects/lith/concrete-lith-1.iob similarity index 100% rename from objects/clutter/lith/concrete-lith-1.iob rename to objects/lith/concrete-lith-1.iob diff --git a/objects/clutter/lith/concrete-lith-2.iob b/objects/lith/concrete-lith-2.iob similarity index 100% rename from objects/clutter/lith/concrete-lith-2.iob rename to objects/lith/concrete-lith-2.iob diff --git a/objects/clutter/lith/concrete-lith-3.iob b/objects/lith/concrete-lith-3.iob similarity index 100% rename from objects/clutter/lith/concrete-lith-3.iob rename to objects/lith/concrete-lith-3.iob diff --git a/objects/clutter/lith/concrete-lith-4.iob b/objects/lith/concrete-lith-4.iob similarity index 100% rename from objects/clutter/lith/concrete-lith-4.iob rename to objects/lith/concrete-lith-4.iob diff --git a/objects/clutter/lith/concrete-lith-5.iob b/objects/lith/concrete-lith-5.iob similarity index 100% rename from objects/clutter/lith/concrete-lith-5.iob rename to objects/lith/concrete-lith-5.iob diff --git a/objects/clutter/lith/concrete-lith-6.iob b/objects/lith/concrete-lith-6.iob similarity index 100% rename from objects/clutter/lith/concrete-lith-6.iob rename to objects/lith/concrete-lith-6.iob diff --git a/objects/clutter/lith/concrete-lith-7.iob b/objects/lith/concrete-lith-7.iob similarity index 100% rename from objects/clutter/lith/concrete-lith-7.iob rename to objects/lith/concrete-lith-7.iob diff --git a/objects/trees/mushroom/lumo1.iob b/objects/lumoshroom/subnauti-1.iob similarity index 100% rename from objects/trees/mushroom/lumo1.iob rename to objects/lumoshroom/subnauti-1.iob diff --git a/objects/trees/mushroom/lumo10.iob b/objects/lumoshroom/subnauti-10.iob similarity index 100% rename from objects/trees/mushroom/lumo10.iob rename to objects/lumoshroom/subnauti-10.iob diff --git a/objects/trees/mushroom/lumo2.iob b/objects/lumoshroom/subnauti-2.iob similarity index 100% rename from objects/trees/mushroom/lumo2.iob rename to objects/lumoshroom/subnauti-2.iob diff --git a/objects/trees/mushroom/lumo3.iob b/objects/lumoshroom/subnauti-3.iob similarity index 100% rename from objects/trees/mushroom/lumo3.iob rename to objects/lumoshroom/subnauti-3.iob diff --git a/objects/trees/mushroom/lumo4.iob b/objects/lumoshroom/subnauti-4.iob similarity index 100% rename from objects/trees/mushroom/lumo4.iob rename to objects/lumoshroom/subnauti-4.iob diff --git a/objects/trees/mushroom/lumo5.iob b/objects/lumoshroom/subnauti-5.iob similarity index 100% rename from objects/trees/mushroom/lumo5.iob rename to objects/lumoshroom/subnauti-5.iob diff --git a/objects/trees/mushroom/lumo6.iob b/objects/lumoshroom/subnauti-6.iob similarity index 100% rename from objects/trees/mushroom/lumo6.iob rename to objects/lumoshroom/subnauti-6.iob diff --git a/objects/trees/mushroom/lumo7.iob b/objects/lumoshroom/subnauti-7.iob similarity index 100% rename from objects/trees/mushroom/lumo7.iob rename to objects/lumoshroom/subnauti-7.iob diff --git a/objects/trees/mushroom/lumo8.iob b/objects/lumoshroom/subnauti-8.iob similarity index 100% rename from objects/trees/mushroom/lumo8.iob rename to objects/lumoshroom/subnauti-8.iob diff --git a/objects/trees/mushroom/lumo9.iob b/objects/lumoshroom/subnauti-9.iob similarity index 100% rename from objects/trees/mushroom/lumo9.iob rename to objects/lumoshroom/subnauti-9.iob diff --git a/objects/trees/spruce/lushgenericpine1.iob b/objects/lush-pine/lush-pine1.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine1.iob rename to objects/lush-pine/lush-pine1.iob diff --git a/objects/trees/spruce/lushgenericpine2.iob b/objects/lush-pine/lush-pine10.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine2.iob rename to objects/lush-pine/lush-pine10.iob diff --git a/objects/trees/spruce/lushgenericpine3.iob b/objects/lush-pine/lush-pine2.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine3.iob rename to objects/lush-pine/lush-pine2.iob diff --git a/objects/trees/spruce/lushgenericpine4.iob b/objects/lush-pine/lush-pine3.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine4.iob rename to objects/lush-pine/lush-pine3.iob diff --git a/objects/trees/spruce/lushgenericpine5.iob b/objects/lush-pine/lush-pine4.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine5.iob rename to objects/lush-pine/lush-pine4.iob diff --git a/objects/trees/spruce/lushgenericpine6.iob b/objects/lush-pine/lush-pine5.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine6.iob rename to objects/lush-pine/lush-pine5.iob diff --git a/objects/trees/spruce/lushgenericpine7.iob b/objects/lush-pine/lush-pine6.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine7.iob rename to objects/lush-pine/lush-pine6.iob diff --git a/objects/trees/spruce/lushgenericpine8.iob b/objects/lush-pine/lush-pine7.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine8.iob rename to objects/lush-pine/lush-pine7.iob diff --git a/objects/trees/spruce/lushgenericpine9.iob b/objects/lush-pine/lush-pine8.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine9.iob rename to objects/lush-pine/lush-pine8.iob diff --git a/objects/trees/spruce/lushgenericpine10.iob b/objects/lush-pine/lush-pine9.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine10.iob rename to objects/lush-pine/lush-pine9.iob diff --git a/objects/clutter/misc/shrub-1.iob b/objects/misc/shrub-1.iob similarity index 100% rename from objects/clutter/misc/shrub-1.iob rename to objects/misc/shrub-1.iob diff --git a/objects/clutter/misc/shrub-10.iob b/objects/misc/shrub-10.iob similarity index 100% rename from objects/clutter/misc/shrub-10.iob rename to objects/misc/shrub-10.iob diff --git a/objects/clutter/misc/shrub-11.iob b/objects/misc/shrub-11.iob similarity index 100% rename from objects/clutter/misc/shrub-11.iob rename to objects/misc/shrub-11.iob diff --git a/objects/clutter/misc/shrub-13.iob b/objects/misc/shrub-13.iob similarity index 100% rename from objects/clutter/misc/shrub-13.iob rename to objects/misc/shrub-13.iob diff --git a/objects/clutter/misc/shrub-2.iob b/objects/misc/shrub-2.iob similarity index 100% rename from objects/clutter/misc/shrub-2.iob rename to objects/misc/shrub-2.iob diff --git a/objects/clutter/misc/shrub-3.iob b/objects/misc/shrub-3.iob similarity index 100% rename from objects/clutter/misc/shrub-3.iob rename to objects/misc/shrub-3.iob diff --git a/objects/clutter/misc/shrub-4.iob b/objects/misc/shrub-4.iob similarity index 100% rename from objects/clutter/misc/shrub-4.iob rename to objects/misc/shrub-4.iob diff --git a/objects/clutter/misc/shrub-5.iob b/objects/misc/shrub-5.iob similarity index 100% rename from objects/clutter/misc/shrub-5.iob rename to objects/misc/shrub-5.iob diff --git a/objects/clutter/misc/shrub-6.iob b/objects/misc/shrub-6.iob similarity index 100% rename from objects/clutter/misc/shrub-6.iob rename to objects/misc/shrub-6.iob diff --git a/objects/clutter/misc/shrub-7.iob b/objects/misc/shrub-7.iob similarity index 100% rename from objects/clutter/misc/shrub-7.iob rename to objects/misc/shrub-7.iob diff --git a/objects/clutter/misc/shrub-8.iob b/objects/misc/shrub-8.iob similarity index 100% rename from objects/clutter/misc/shrub-8.iob rename to objects/misc/shrub-8.iob diff --git a/objects/clutter/misc/shrub-9.iob b/objects/misc/shrub-9.iob similarity index 100% rename from objects/clutter/misc/shrub-9.iob rename to objects/misc/shrub-9.iob diff --git a/objects/clutter/misc/tntower-1.iob b/objects/misc/tntower-1.iob similarity index 100% rename from objects/clutter/misc/tntower-1.iob rename to objects/misc/tntower-1.iob diff --git a/objects/structures/monolith/black-1.iob b/objects/monolith/black-1.iob similarity index 100% rename from objects/structures/monolith/black-1.iob rename to objects/monolith/black-1.iob diff --git a/objects/structures/monolith/black-2.iob b/objects/monolith/black-2.iob similarity index 100% rename from objects/structures/monolith/black-2.iob rename to objects/monolith/black-2.iob diff --git a/objects/structures/monolith/black-3.iob b/objects/monolith/black-3.iob similarity index 100% rename from objects/structures/monolith/black-3.iob rename to objects/monolith/black-3.iob diff --git a/objects/structures/monolith/black-4.iob b/objects/monolith/black-4.iob similarity index 100% rename from objects/structures/monolith/black-4.iob rename to objects/monolith/black-4.iob diff --git a/objects/structures/monolith/black-5.iob b/objects/monolith/black-5.iob similarity index 100% rename from objects/structures/monolith/black-5.iob rename to objects/monolith/black-5.iob diff --git a/objects/structures/monolith/black-6.iob b/objects/monolith/black-6.iob similarity index 100% rename from objects/structures/monolith/black-6.iob rename to objects/monolith/black-6.iob diff --git a/objects/structures/mrock/mrock-1.iob b/objects/mrock/mrock-1.iob similarity index 100% rename from objects/structures/mrock/mrock-1.iob rename to objects/mrock/mrock-1.iob diff --git a/objects/structures/mrock/mrock-2.iob b/objects/mrock/mrock-2.iob similarity index 100% rename from objects/structures/mrock/mrock-2.iob rename to objects/mrock/mrock-2.iob diff --git a/objects/structures/mrock/mrock-3.iob b/objects/mrock/mrock-3.iob similarity index 100% rename from objects/structures/mrock/mrock-3.iob rename to objects/mrock/mrock-3.iob diff --git a/objects/structures/mrock/mrock-4.iob b/objects/mrock/mrock-4.iob similarity index 100% rename from objects/structures/mrock/mrock-4.iob rename to objects/mrock/mrock-4.iob diff --git a/objects/structures/mrock/mrock-5.iob b/objects/mrock/mrock-5.iob similarity index 100% rename from objects/structures/mrock/mrock-5.iob rename to objects/mrock/mrock-5.iob diff --git a/objects/jigsaw/murky_stronghold/c-n-1.iob b/objects/murky_stronghold/c-n-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-n-1.iob rename to objects/murky_stronghold/c-n-1.iob diff --git a/objects/jigsaw/murky_stronghold/c-n-2.iob b/objects/murky_stronghold/c-n-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-n-2.iob rename to objects/murky_stronghold/c-n-2.iob diff --git a/objects/jigsaw/murky_stronghold/c-n-3.iob b/objects/murky_stronghold/c-n-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-n-3.iob rename to objects/murky_stronghold/c-n-3.iob diff --git a/objects/jigsaw/murky_stronghold/c-n-4.iob b/objects/murky_stronghold/c-n-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-n-4.iob rename to objects/murky_stronghold/c-n-4.iob diff --git a/objects/jigsaw/murky_stronghold/c-ns-1.iob b/objects/murky_stronghold/c-ns-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-ns-1.iob rename to objects/murky_stronghold/c-ns-1.iob diff --git a/objects/jigsaw/murky_stronghold/c-ns-2.iob b/objects/murky_stronghold/c-ns-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-ns-2.iob rename to objects/murky_stronghold/c-ns-2.iob diff --git a/objects/jigsaw/murky_stronghold/c-ns-3.iob b/objects/murky_stronghold/c-ns-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-ns-3.iob rename to objects/murky_stronghold/c-ns-3.iob diff --git a/objects/jigsaw/murky_stronghold/c-ns-4.iob b/objects/murky_stronghold/c-ns-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-ns-4.iob rename to objects/murky_stronghold/c-ns-4.iob diff --git a/objects/jigsaw/murky_stronghold/c-nsw-1.iob b/objects/murky_stronghold/c-nsw-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-nsw-1.iob rename to objects/murky_stronghold/c-nsw-1.iob diff --git a/objects/jigsaw/murky_stronghold/c-nsw-2.iob b/objects/murky_stronghold/c-nsw-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-nsw-2.iob rename to objects/murky_stronghold/c-nsw-2.iob diff --git a/objects/jigsaw/murky_stronghold/c-nsw-3.iob b/objects/murky_stronghold/c-nsw-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-nsw-3.iob rename to objects/murky_stronghold/c-nsw-3.iob diff --git a/objects/jigsaw/murky_stronghold/c-nsw-4.iob b/objects/murky_stronghold/c-nsw-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-nsw-4.iob rename to objects/murky_stronghold/c-nsw-4.iob diff --git a/objects/jigsaw/murky_stronghold/c-sw-1.iob b/objects/murky_stronghold/c-sw-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-sw-1.iob rename to objects/murky_stronghold/c-sw-1.iob diff --git a/objects/jigsaw/murky_stronghold/c-sw-2.iob b/objects/murky_stronghold/c-sw-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-sw-2.iob rename to objects/murky_stronghold/c-sw-2.iob diff --git a/objects/jigsaw/murky_stronghold/c-sw-3.iob b/objects/murky_stronghold/c-sw-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-sw-3.iob rename to objects/murky_stronghold/c-sw-3.iob diff --git a/objects/jigsaw/murky_stronghold/c-sw-4.iob b/objects/murky_stronghold/c-sw-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-sw-4.iob rename to objects/murky_stronghold/c-sw-4.iob diff --git a/objects/jigsaw/murky_stronghold/c-x-1.iob b/objects/murky_stronghold/c-x-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-x-1.iob rename to objects/murky_stronghold/c-x-1.iob diff --git a/objects/jigsaw/murky_stronghold/c-x-2.iob b/objects/murky_stronghold/c-x-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-x-2.iob rename to objects/murky_stronghold/c-x-2.iob diff --git a/objects/jigsaw/murky_stronghold/c-x-3.iob b/objects/murky_stronghold/c-x-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-x-3.iob rename to objects/murky_stronghold/c-x-3.iob diff --git a/objects/jigsaw/murky_stronghold/c-x-4.iob b/objects/murky_stronghold/c-x-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-x-4.iob rename to objects/murky_stronghold/c-x-4.iob diff --git a/objects/jigsaw/murky_stronghold/c-x-5.iob b/objects/murky_stronghold/c-x-5.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-x-5.iob rename to objects/murky_stronghold/c-x-5.iob diff --git a/objects/jigsaw/murky_stronghold/c-x-6.iob b/objects/murky_stronghold/c-x-6.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-x-6.iob rename to objects/murky_stronghold/c-x-6.iob diff --git a/objects/jigsaw/murky_stronghold/f-n-1.iob b/objects/murky_stronghold/f-n-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-n-1.iob rename to objects/murky_stronghold/f-n-1.iob diff --git a/objects/jigsaw/murky_stronghold/f-n-2.iob b/objects/murky_stronghold/f-n-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-n-2.iob rename to objects/murky_stronghold/f-n-2.iob diff --git a/objects/jigsaw/murky_stronghold/f-n-3.iob b/objects/murky_stronghold/f-n-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-n-3.iob rename to objects/murky_stronghold/f-n-3.iob diff --git a/objects/jigsaw/murky_stronghold/f-n-4.iob b/objects/murky_stronghold/f-n-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-n-4.iob rename to objects/murky_stronghold/f-n-4.iob diff --git a/objects/jigsaw/murky_stronghold/f-ns-1.iob b/objects/murky_stronghold/f-ns-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-ns-1.iob rename to objects/murky_stronghold/f-ns-1.iob diff --git a/objects/jigsaw/murky_stronghold/f-ns-2.iob b/objects/murky_stronghold/f-ns-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-ns-2.iob rename to objects/murky_stronghold/f-ns-2.iob diff --git a/objects/jigsaw/murky_stronghold/f-ns-3.iob b/objects/murky_stronghold/f-ns-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-ns-3.iob rename to objects/murky_stronghold/f-ns-3.iob diff --git a/objects/jigsaw/murky_stronghold/f-ns-4.iob b/objects/murky_stronghold/f-ns-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-ns-4.iob rename to objects/murky_stronghold/f-ns-4.iob diff --git a/objects/jigsaw/murky_stronghold/f-nsw-1.iob b/objects/murky_stronghold/f-nsw-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-nsw-1.iob rename to objects/murky_stronghold/f-nsw-1.iob diff --git a/objects/jigsaw/murky_stronghold/f-nsw-2.iob b/objects/murky_stronghold/f-nsw-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-nsw-2.iob rename to objects/murky_stronghold/f-nsw-2.iob diff --git a/objects/jigsaw/murky_stronghold/f-nsw-3.iob b/objects/murky_stronghold/f-nsw-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-nsw-3.iob rename to objects/murky_stronghold/f-nsw-3.iob diff --git a/objects/jigsaw/murky_stronghold/f-nsw-4.iob b/objects/murky_stronghold/f-nsw-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-nsw-4.iob rename to objects/murky_stronghold/f-nsw-4.iob diff --git a/objects/jigsaw/murky_stronghold/f-sw-1.iob b/objects/murky_stronghold/f-sw-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-sw-1.iob rename to objects/murky_stronghold/f-sw-1.iob diff --git a/objects/jigsaw/murky_stronghold/f-sw-2.iob b/objects/murky_stronghold/f-sw-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-sw-2.iob rename to objects/murky_stronghold/f-sw-2.iob diff --git a/objects/jigsaw/murky_stronghold/f-sw-3.iob b/objects/murky_stronghold/f-sw-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-sw-3.iob rename to objects/murky_stronghold/f-sw-3.iob diff --git a/objects/jigsaw/murky_stronghold/f-sw-4.iob b/objects/murky_stronghold/f-sw-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-sw-4.iob rename to objects/murky_stronghold/f-sw-4.iob diff --git a/objects/jigsaw/murky_stronghold/f-x-1.iob b/objects/murky_stronghold/f-x-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-x-1.iob rename to objects/murky_stronghold/f-x-1.iob diff --git a/objects/jigsaw/murky_stronghold/f-x-2.iob b/objects/murky_stronghold/f-x-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-x-2.iob rename to objects/murky_stronghold/f-x-2.iob diff --git a/objects/jigsaw/murky_stronghold/f-x-3.iob b/objects/murky_stronghold/f-x-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-x-3.iob rename to objects/murky_stronghold/f-x-3.iob diff --git a/objects/jigsaw/murky_stronghold/f-x-4.iob b/objects/murky_stronghold/f-x-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-x-4.iob rename to objects/murky_stronghold/f-x-4.iob diff --git a/objects/jigsaw/murky_stronghold/f-x-5.iob b/objects/murky_stronghold/f-x-5.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-x-5.iob rename to objects/murky_stronghold/f-x-5.iob diff --git a/objects/jigsaw/murky_stronghold/f-x-6.iob b/objects/murky_stronghold/f-x-6.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-x-6.iob rename to objects/murky_stronghold/f-x-6.iob diff --git a/objects/jigsaw/murky_stronghold/fc-n-1.iob b/objects/murky_stronghold/fc-n-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-n-1.iob rename to objects/murky_stronghold/fc-n-1.iob diff --git a/objects/jigsaw/murky_stronghold/fc-n-2.iob b/objects/murky_stronghold/fc-n-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-n-2.iob rename to objects/murky_stronghold/fc-n-2.iob diff --git a/objects/jigsaw/murky_stronghold/fc-n-3.iob b/objects/murky_stronghold/fc-n-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-n-3.iob rename to objects/murky_stronghold/fc-n-3.iob diff --git a/objects/jigsaw/murky_stronghold/fc-n-4.iob b/objects/murky_stronghold/fc-n-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-n-4.iob rename to objects/murky_stronghold/fc-n-4.iob diff --git a/objects/jigsaw/murky_stronghold/fc-ns-1.iob b/objects/murky_stronghold/fc-ns-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-ns-1.iob rename to objects/murky_stronghold/fc-ns-1.iob diff --git a/objects/jigsaw/murky_stronghold/fc-ns-2.iob b/objects/murky_stronghold/fc-ns-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-ns-2.iob rename to objects/murky_stronghold/fc-ns-2.iob diff --git a/objects/jigsaw/murky_stronghold/fc-ns-3.iob b/objects/murky_stronghold/fc-ns-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-ns-3.iob rename to objects/murky_stronghold/fc-ns-3.iob diff --git a/objects/jigsaw/murky_stronghold/fc-ns-4.iob b/objects/murky_stronghold/fc-ns-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-ns-4.iob rename to objects/murky_stronghold/fc-ns-4.iob diff --git a/objects/jigsaw/murky_stronghold/fc-nsw-1.iob b/objects/murky_stronghold/fc-nsw-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-nsw-1.iob rename to objects/murky_stronghold/fc-nsw-1.iob diff --git a/objects/jigsaw/murky_stronghold/fc-nsw-2.iob b/objects/murky_stronghold/fc-nsw-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-nsw-2.iob rename to objects/murky_stronghold/fc-nsw-2.iob diff --git a/objects/jigsaw/murky_stronghold/fc-nsw-3.iob b/objects/murky_stronghold/fc-nsw-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-nsw-3.iob rename to objects/murky_stronghold/fc-nsw-3.iob diff --git a/objects/jigsaw/murky_stronghold/fc-nsw-4.iob b/objects/murky_stronghold/fc-nsw-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-nsw-4.iob rename to objects/murky_stronghold/fc-nsw-4.iob diff --git a/objects/jigsaw/murky_stronghold/fc-sw-1.iob b/objects/murky_stronghold/fc-sw-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-sw-1.iob rename to objects/murky_stronghold/fc-sw-1.iob diff --git a/objects/jigsaw/murky_stronghold/fc-sw-2.iob b/objects/murky_stronghold/fc-sw-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-sw-2.iob rename to objects/murky_stronghold/fc-sw-2.iob diff --git a/objects/jigsaw/murky_stronghold/fc-sw-3.iob b/objects/murky_stronghold/fc-sw-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-sw-3.iob rename to objects/murky_stronghold/fc-sw-3.iob diff --git a/objects/jigsaw/murky_stronghold/fc-sw-4.iob b/objects/murky_stronghold/fc-sw-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-sw-4.iob rename to objects/murky_stronghold/fc-sw-4.iob diff --git a/objects/jigsaw/murky_stronghold/fc-x-1.iob b/objects/murky_stronghold/fc-x-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-x-1.iob rename to objects/murky_stronghold/fc-x-1.iob diff --git a/objects/jigsaw/murky_stronghold/fc-x-2.iob b/objects/murky_stronghold/fc-x-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-x-2.iob rename to objects/murky_stronghold/fc-x-2.iob diff --git a/objects/jigsaw/murky_stronghold/fc-x-3.iob b/objects/murky_stronghold/fc-x-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-x-3.iob rename to objects/murky_stronghold/fc-x-3.iob diff --git a/objects/jigsaw/murky_stronghold/fc-x-4.iob b/objects/murky_stronghold/fc-x-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-x-4.iob rename to objects/murky_stronghold/fc-x-4.iob diff --git a/objects/jigsaw/murky_stronghold/fc-x-5.iob b/objects/murky_stronghold/fc-x-5.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-x-5.iob rename to objects/murky_stronghold/fc-x-5.iob diff --git a/objects/jigsaw/murky_stronghold/fc-x-6.iob b/objects/murky_stronghold/fc-x-6.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-x-6.iob rename to objects/murky_stronghold/fc-x-6.iob diff --git a/objects/jigsaw/murky_stronghold/fc-x-7.iob b/objects/murky_stronghold/fc-x-7.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-x-7.iob rename to objects/murky_stronghold/fc-x-7.iob diff --git a/objects/jigsaw/murky_stronghold/fc-x-8.iob b/objects/murky_stronghold/fc-x-8.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-x-8.iob rename to objects/murky_stronghold/fc-x-8.iob diff --git a/objects/jigsaw/mushhut/hut/hut1.iob b/objects/mushhut/hut/hut1.iob similarity index 100% rename from objects/jigsaw/mushhut/hut/hut1.iob rename to objects/mushhut/hut/hut1.iob diff --git a/objects/jigsaw/mushhut/hut/hut2.iob b/objects/mushhut/hut/hut2.iob similarity index 100% rename from objects/jigsaw/mushhut/hut/hut2.iob rename to objects/mushhut/hut/hut2.iob diff --git a/objects/jigsaw/mushhut/hut/hut3.iob b/objects/mushhut/hut/hut3.iob similarity index 100% rename from objects/jigsaw/mushhut/hut/hut3.iob rename to objects/mushhut/hut/hut3.iob diff --git a/objects/jigsaw/mushhut/hut/hut4.iob b/objects/mushhut/hut/hut4.iob similarity index 100% rename from objects/jigsaw/mushhut/hut/hut4.iob rename to objects/mushhut/hut/hut4.iob diff --git a/objects/jigsaw/mushhut/hut/hut5.iob b/objects/mushhut/hut/hut5.iob similarity index 100% rename from objects/jigsaw/mushhut/hut/hut5.iob rename to objects/mushhut/hut/hut5.iob diff --git a/objects/jigsaw/mushhut/hut/hut6.iob b/objects/mushhut/hut/hut6.iob similarity index 100% rename from objects/jigsaw/mushhut/hut/hut6.iob rename to objects/mushhut/hut/hut6.iob diff --git a/objects/jigsaw/mushhut/hut/hut7.iob b/objects/mushhut/hut/hut7.iob similarity index 100% rename from objects/jigsaw/mushhut/hut/hut7.iob rename to objects/mushhut/hut/hut7.iob diff --git a/objects/jigsaw/mushhut/paths/path1.iob b/objects/mushhut/paths/path1.iob similarity index 100% rename from objects/jigsaw/mushhut/paths/path1.iob rename to objects/mushhut/paths/path1.iob diff --git a/objects/jigsaw/mushhut/paths/path2.iob b/objects/mushhut/paths/path2.iob similarity index 100% rename from objects/jigsaw/mushhut/paths/path2.iob rename to objects/mushhut/paths/path2.iob diff --git a/objects/jigsaw/mushhut/paths/path3.iob b/objects/mushhut/paths/path3.iob similarity index 100% rename from objects/jigsaw/mushhut/paths/path3.iob rename to objects/mushhut/paths/path3.iob diff --git a/objects/jigsaw/mushhut/paths/path4.iob b/objects/mushhut/paths/path4.iob similarity index 100% rename from objects/jigsaw/mushhut/paths/path4.iob rename to objects/mushhut/paths/path4.iob diff --git a/objects/trees/mushroom/blackgeneric1.iob b/objects/mushroom-black/BMush1.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric1.iob rename to objects/mushroom-black/BMush1.iob diff --git a/objects/trees/mushroom/blackgeneric2.iob b/objects/mushroom-black/BMush10.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric2.iob rename to objects/mushroom-black/BMush10.iob diff --git a/objects/trees/mushroom/blackgeneric3.iob b/objects/mushroom-black/BMush2.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric3.iob rename to objects/mushroom-black/BMush2.iob diff --git a/objects/trees/mushroom/blackgeneric4.iob b/objects/mushroom-black/BMush3.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric4.iob rename to objects/mushroom-black/BMush3.iob diff --git a/objects/trees/mushroom/blackgeneric5.iob b/objects/mushroom-black/BMush4.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric5.iob rename to objects/mushroom-black/BMush4.iob diff --git a/objects/trees/mushroom/blackgeneric6.iob b/objects/mushroom-black/BMush5.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric6.iob rename to objects/mushroom-black/BMush5.iob diff --git a/objects/trees/mushroom/blackgeneric7.iob b/objects/mushroom-black/BMush6.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric7.iob rename to objects/mushroom-black/BMush6.iob diff --git a/objects/trees/mushroom/blackgeneric8.iob b/objects/mushroom-black/BMush7.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric8.iob rename to objects/mushroom-black/BMush7.iob diff --git a/objects/trees/mushroom/blackgeneric9.iob b/objects/mushroom-black/BMush8.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric9.iob rename to objects/mushroom-black/BMush8.iob diff --git a/objects/trees/mushroom/blackgeneric10.iob b/objects/mushroom-black/BMush9.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric10.iob rename to objects/mushroom-black/BMush9.iob diff --git a/objects/trees/mushroom/greygeneric1.iob b/objects/mushroom-gray/GMush1.iob similarity index 100% rename from objects/trees/mushroom/greygeneric1.iob rename to objects/mushroom-gray/GMush1.iob diff --git a/objects/trees/mushroom/greygeneric2.iob b/objects/mushroom-gray/GMush2.iob similarity index 100% rename from objects/trees/mushroom/greygeneric2.iob rename to objects/mushroom-gray/GMush2.iob diff --git a/objects/trees/mushroom/greygeneric3.iob b/objects/mushroom-gray/GMush3.iob similarity index 100% rename from objects/trees/mushroom/greygeneric3.iob rename to objects/mushroom-gray/GMush3.iob diff --git a/objects/trees/mushroom/greygeneric4.iob b/objects/mushroom-gray/GMush4.iob similarity index 100% rename from objects/trees/mushroom/greygeneric4.iob rename to objects/mushroom-gray/GMush4.iob diff --git a/objects/trees/mushroom/greygeneric5.iob b/objects/mushroom-gray/GMush5.iob similarity index 100% rename from objects/trees/mushroom/greygeneric5.iob rename to objects/mushroom-gray/GMush5.iob diff --git a/objects/trees/mushroom/greygeneric6.iob b/objects/mushroom-gray/GMush6.iob similarity index 100% rename from objects/trees/mushroom/greygeneric6.iob rename to objects/mushroom-gray/GMush6.iob diff --git a/objects/trees/mushroom/greygeneric7.iob b/objects/mushroom-gray/GMush8.iob similarity index 100% rename from objects/trees/mushroom/greygeneric7.iob rename to objects/mushroom-gray/GMush8.iob diff --git a/objects/trees/mushroom/greygeneric8.iob b/objects/mushroom-gray/GMush9.iob similarity index 100% rename from objects/trees/mushroom/greygeneric8.iob rename to objects/mushroom-gray/GMush9.iob diff --git a/objects/trees/mushroom/ice1.iob b/objects/mushroom-ice/ICEMush1.iob similarity index 100% rename from objects/trees/mushroom/ice1.iob rename to objects/mushroom-ice/ICEMush1.iob diff --git a/objects/trees/mushroom/ice2.iob b/objects/mushroom-ice/ICEMush2.iob similarity index 100% rename from objects/trees/mushroom/ice2.iob rename to objects/mushroom-ice/ICEMush2.iob diff --git a/objects/trees/mushroom/ice3.iob b/objects/mushroom-ice/ICEMush3.iob similarity index 100% rename from objects/trees/mushroom/ice3.iob rename to objects/mushroom-ice/ICEMush3.iob diff --git a/objects/trees/mushroom/ice4.iob b/objects/mushroom-ice/ICEMush4.iob similarity index 100% rename from objects/trees/mushroom/ice4.iob rename to objects/mushroom-ice/ICEMush4.iob diff --git a/objects/trees/mushroom/ice5.iob b/objects/mushroom-ice/ICEMush5.iob similarity index 100% rename from objects/trees/mushroom/ice5.iob rename to objects/mushroom-ice/ICEMush5.iob diff --git a/objects/trees/mushroom/ice6.iob b/objects/mushroom-ice/ICEMush6.iob similarity index 100% rename from objects/trees/mushroom/ice6.iob rename to objects/mushroom-ice/ICEMush6.iob diff --git a/objects/trees/mushroom/ice7.iob b/objects/mushroom-ice/ICEMush7.iob similarity index 100% rename from objects/trees/mushroom/ice7.iob rename to objects/mushroom-ice/ICEMush7.iob diff --git a/objects/trees/mushroom/ice8.iob b/objects/mushroom-ice/ICEMush8.iob similarity index 100% rename from objects/trees/mushroom/ice8.iob rename to objects/mushroom-ice/ICEMush8.iob diff --git a/objects/trees/mushroom/ice9.iob b/objects/mushroom-ice/ICEMush9.iob similarity index 100% rename from objects/trees/mushroom/ice9.iob rename to objects/mushroom-ice/ICEMush9.iob diff --git a/objects/trees/mushroom/purplegeneric1.iob b/objects/mushroom-purple/PMush1.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric1.iob rename to objects/mushroom-purple/PMush1.iob diff --git a/objects/trees/mushroom/purplegeneric2.iob b/objects/mushroom-purple/PMush10.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric2.iob rename to objects/mushroom-purple/PMush10.iob diff --git a/objects/trees/mushroom/purplegeneric3.iob b/objects/mushroom-purple/PMush2.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric3.iob rename to objects/mushroom-purple/PMush2.iob diff --git a/objects/trees/mushroom/purplegeneric4.iob b/objects/mushroom-purple/PMush3.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric4.iob rename to objects/mushroom-purple/PMush3.iob diff --git a/objects/trees/mushroom/purplegeneric5.iob b/objects/mushroom-purple/PMush4.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric5.iob rename to objects/mushroom-purple/PMush4.iob diff --git a/objects/trees/mushroom/purplegeneric6.iob b/objects/mushroom-purple/PMush5.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric6.iob rename to objects/mushroom-purple/PMush5.iob diff --git a/objects/trees/mushroom/purplegeneric7.iob b/objects/mushroom-purple/PMush6.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric7.iob rename to objects/mushroom-purple/PMush6.iob diff --git a/objects/trees/mushroom/purplegeneric8.iob b/objects/mushroom-purple/PMush7.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric8.iob rename to objects/mushroom-purple/PMush7.iob diff --git a/objects/trees/mushroom/purplegeneric9.iob b/objects/mushroom-purple/PMush8.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric9.iob rename to objects/mushroom-purple/PMush8.iob diff --git a/objects/trees/mushroom/purplegeneric10.iob b/objects/mushroom-purple/PMush9.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric10.iob rename to objects/mushroom-purple/PMush9.iob diff --git a/objects/trees/mushroom/xredgeneric1.iob b/objects/mushroom-red/RMush1.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric1.iob rename to objects/mushroom-red/RMush1.iob diff --git a/objects/trees/mushroom/xredgeneric2.iob b/objects/mushroom-red/RMush10.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric2.iob rename to objects/mushroom-red/RMush10.iob diff --git a/objects/trees/mushroom/xredgeneric3.iob b/objects/mushroom-red/RMush2.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric3.iob rename to objects/mushroom-red/RMush2.iob diff --git a/objects/trees/mushroom/xredgeneric4.iob b/objects/mushroom-red/RMush3.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric4.iob rename to objects/mushroom-red/RMush3.iob diff --git a/objects/trees/mushroom/xredgeneric5.iob b/objects/mushroom-red/RMush4.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric5.iob rename to objects/mushroom-red/RMush4.iob diff --git a/objects/trees/mushroom/xredgeneric6.iob b/objects/mushroom-red/RMush5.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric6.iob rename to objects/mushroom-red/RMush5.iob diff --git a/objects/trees/mushroom/xredgeneric7.iob b/objects/mushroom-red/RMush6.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric7.iob rename to objects/mushroom-red/RMush6.iob diff --git a/objects/trees/mushroom/xredgeneric8.iob b/objects/mushroom-red/RMush7.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric8.iob rename to objects/mushroom-red/RMush7.iob diff --git a/objects/trees/mushroom/xredgeneric9.iob b/objects/mushroom-red/RMush8.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric9.iob rename to objects/mushroom-red/RMush8.iob diff --git a/objects/trees/mushroom/xredgeneric10.iob b/objects/mushroom-red/RMush9.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric10.iob rename to objects/mushroom-red/RMush9.iob diff --git a/objects/trees/mushroom/fantasygenericred1.iob b/objects/mushroom-red/fantasy_mushroom_red1.iob similarity index 100% rename from objects/trees/mushroom/fantasygenericred1.iob rename to objects/mushroom-red/fantasy_mushroom_red1.iob diff --git a/objects/trees/mushroom/fantasygenericred2.iob b/objects/mushroom-red/fantasy_mushroom_red2.iob similarity index 100% rename from objects/trees/mushroom/fantasygenericred2.iob rename to objects/mushroom-red/fantasy_mushroom_red2.iob diff --git a/objects/trees/mushroom/fantasygenericred3.iob b/objects/mushroom-red/fantasy_mushroom_red3.iob similarity index 100% rename from objects/trees/mushroom/fantasygenericred3.iob rename to objects/mushroom-red/fantasy_mushroom_red3.iob diff --git a/objects/trees/mushroom/fantasygenericred4.iob b/objects/mushroom-red/fantasy_mushroom_red4.iob similarity index 100% rename from objects/trees/mushroom/fantasygenericred4.iob rename to objects/mushroom-red/fantasy_mushroom_red4.iob diff --git a/objects/trees/mushroom/redlumotall1.iob b/objects/mushroom-red/illuminorganell-r-1.iob similarity index 100% rename from objects/trees/mushroom/redlumotall1.iob rename to objects/mushroom-red/illuminorganell-r-1.iob diff --git a/objects/trees/mushroom/redlumotall2.iob b/objects/mushroom-red/illuminorganell-r-10.iob similarity index 100% rename from objects/trees/mushroom/redlumotall2.iob rename to objects/mushroom-red/illuminorganell-r-10.iob diff --git a/objects/trees/mushroom/redlumotall3.iob b/objects/mushroom-red/illuminorganell-r-11.iob similarity index 100% rename from objects/trees/mushroom/redlumotall3.iob rename to objects/mushroom-red/illuminorganell-r-11.iob diff --git a/objects/trees/mushroom/redlumotall4.iob b/objects/mushroom-red/illuminorganell-r-2.iob similarity index 100% rename from objects/trees/mushroom/redlumotall4.iob rename to objects/mushroom-red/illuminorganell-r-2.iob diff --git a/objects/trees/mushroom/redlumotall5.iob b/objects/mushroom-red/illuminorganell-r-3.iob similarity index 100% rename from objects/trees/mushroom/redlumotall5.iob rename to objects/mushroom-red/illuminorganell-r-3.iob diff --git a/objects/trees/mushroom/redlumotall6.iob b/objects/mushroom-red/illuminorganell-r-4.iob similarity index 100% rename from objects/trees/mushroom/redlumotall6.iob rename to objects/mushroom-red/illuminorganell-r-4.iob diff --git a/objects/trees/mushroom/redlumotall7.iob b/objects/mushroom-red/illuminorganell-r-5.iob similarity index 100% rename from objects/trees/mushroom/redlumotall7.iob rename to objects/mushroom-red/illuminorganell-r-5.iob diff --git a/objects/trees/mushroom/redlumotall8.iob b/objects/mushroom-red/illuminorganell-r-6.iob similarity index 100% rename from objects/trees/mushroom/redlumotall8.iob rename to objects/mushroom-red/illuminorganell-r-6.iob diff --git a/objects/trees/mushroom/redlumotall9.iob b/objects/mushroom-red/illuminorganell-r-7.iob similarity index 100% rename from objects/trees/mushroom/redlumotall9.iob rename to objects/mushroom-red/illuminorganell-r-7.iob diff --git a/objects/trees/mushroom/redlumotall10.iob b/objects/mushroom-red/illuminorganell-r-8.iob similarity index 100% rename from objects/trees/mushroom/redlumotall10.iob rename to objects/mushroom-red/illuminorganell-r-8.iob diff --git a/objects/trees/mushroom/redlumotall11.iob b/objects/mushroom-red/illuminorganell-r-9.iob similarity index 100% rename from objects/trees/mushroom/redlumotall11.iob rename to objects/mushroom-red/illuminorganell-r-9.iob diff --git a/objects/trees/mushroom/browngeneric1.iob b/objects/mushroom-red/organell-b-1.iob similarity index 100% rename from objects/trees/mushroom/browngeneric1.iob rename to objects/mushroom-red/organell-b-1.iob diff --git a/objects/trees/mushroom/browngeneric2.iob b/objects/mushroom-red/organell-b-2.iob similarity index 100% rename from objects/trees/mushroom/browngeneric2.iob rename to objects/mushroom-red/organell-b-2.iob diff --git a/objects/trees/mushroom/redgeneric1.iob b/objects/mushroom-red/organell-r-1.iob similarity index 100% rename from objects/trees/mushroom/redgeneric1.iob rename to objects/mushroom-red/organell-r-1.iob diff --git a/objects/trees/mushroom/redgeneric2.iob b/objects/mushroom-red/organell-r-10.iob similarity index 100% rename from objects/trees/mushroom/redgeneric2.iob rename to objects/mushroom-red/organell-r-10.iob diff --git a/objects/trees/mushroom/redgeneric3.iob b/objects/mushroom-red/organell-r-11.iob similarity index 100% rename from objects/trees/mushroom/redgeneric3.iob rename to objects/mushroom-red/organell-r-11.iob diff --git a/objects/trees/mushroom/redgeneric4.iob b/objects/mushroom-red/organell-r-2.iob similarity index 100% rename from objects/trees/mushroom/redgeneric4.iob rename to objects/mushroom-red/organell-r-2.iob diff --git a/objects/trees/mushroom/redgeneric5.iob b/objects/mushroom-red/organell-r-3.iob similarity index 100% rename from objects/trees/mushroom/redgeneric5.iob rename to objects/mushroom-red/organell-r-3.iob diff --git a/objects/trees/mushroom/redgeneric6.iob b/objects/mushroom-red/organell-r-4.iob similarity index 100% rename from objects/trees/mushroom/redgeneric6.iob rename to objects/mushroom-red/organell-r-4.iob diff --git a/objects/trees/mushroom/redgeneric7.iob b/objects/mushroom-red/organell-r-5.iob similarity index 100% rename from objects/trees/mushroom/redgeneric7.iob rename to objects/mushroom-red/organell-r-5.iob diff --git a/objects/trees/mushroom/redgeneric8.iob b/objects/mushroom-red/organell-r-6.iob similarity index 100% rename from objects/trees/mushroom/redgeneric8.iob rename to objects/mushroom-red/organell-r-6.iob diff --git a/objects/trees/mushroom/redgeneric9.iob b/objects/mushroom-red/organell-r-7.iob similarity index 100% rename from objects/trees/mushroom/redgeneric9.iob rename to objects/mushroom-red/organell-r-7.iob diff --git a/objects/trees/mushroom/redgeneric10.iob b/objects/mushroom-red/organell-r-8.iob similarity index 100% rename from objects/trees/mushroom/redgeneric10.iob rename to objects/mushroom-red/organell-r-8.iob diff --git a/objects/trees/mushroom/redgeneric11.iob b/objects/mushroom-red/organell-r-9.iob similarity index 100% rename from objects/trees/mushroom/redgeneric11.iob rename to objects/mushroom-red/organell-r-9.iob diff --git a/objects/trees/mushroom/mushclut1.iob b/objects/mushroom-red/small-organell-r-1.iob similarity index 100% rename from objects/trees/mushroom/mushclut1.iob rename to objects/mushroom-red/small-organell-r-1.iob diff --git a/objects/trees/mushroom/mushclut2.iob b/objects/mushroom-red/small-organell-r-10.iob similarity index 100% rename from objects/trees/mushroom/mushclut2.iob rename to objects/mushroom-red/small-organell-r-10.iob diff --git a/objects/trees/mushroom/mushclut3.iob b/objects/mushroom-red/small-organell-r-2.iob similarity index 100% rename from objects/trees/mushroom/mushclut3.iob rename to objects/mushroom-red/small-organell-r-2.iob diff --git a/objects/trees/mushroom/mushclut4.iob b/objects/mushroom-red/small-organell-r-3.iob similarity index 100% rename from objects/trees/mushroom/mushclut4.iob rename to objects/mushroom-red/small-organell-r-3.iob diff --git a/objects/trees/mushroom/mushclut5.iob b/objects/mushroom-red/small-organell-r-4.iob similarity index 100% rename from objects/trees/mushroom/mushclut5.iob rename to objects/mushroom-red/small-organell-r-4.iob diff --git a/objects/trees/mushroom/mushclut6.iob b/objects/mushroom-red/small-organell-r-5.iob similarity index 100% rename from objects/trees/mushroom/mushclut6.iob rename to objects/mushroom-red/small-organell-r-5.iob diff --git a/objects/trees/mushroom/mushclut7.iob b/objects/mushroom-red/small-organell-r-6.iob similarity index 100% rename from objects/trees/mushroom/mushclut7.iob rename to objects/mushroom-red/small-organell-r-6.iob diff --git a/objects/trees/mushroom/mushclut8.iob b/objects/mushroom-red/small-organell-r-7.iob similarity index 100% rename from objects/trees/mushroom/mushclut8.iob rename to objects/mushroom-red/small-organell-r-7.iob diff --git a/objects/trees/mushroom/mushclut9.iob b/objects/mushroom-red/small-organell-r-8.iob similarity index 100% rename from objects/trees/mushroom/mushclut9.iob rename to objects/mushroom-red/small-organell-r-8.iob diff --git a/objects/trees/mushroom/mushclut10.iob b/objects/mushroom-red/small-organell-r-9.iob similarity index 100% rename from objects/trees/mushroom/mushclut10.iob rename to objects/mushroom-red/small-organell-r-9.iob diff --git a/objects/trees/mixed/mystic-trees/dotree1.iob b/objects/mystic-trees/dotree1.iob similarity index 100% rename from objects/trees/mixed/mystic-trees/dotree1.iob rename to objects/mystic-trees/dotree1.iob diff --git a/objects/trees/mixed/mystic-trees/dotree10.iob b/objects/mystic-trees/dotree10.iob similarity index 100% rename from objects/trees/mixed/mystic-trees/dotree10.iob rename to objects/mystic-trees/dotree10.iob diff --git a/objects/trees/mixed/mystic-trees/dotree2.iob b/objects/mystic-trees/dotree2.iob similarity index 100% rename from objects/trees/mixed/mystic-trees/dotree2.iob rename to objects/mystic-trees/dotree2.iob diff --git a/objects/trees/mixed/mystic-trees/dotree3.iob b/objects/mystic-trees/dotree3.iob similarity index 100% rename from objects/trees/mixed/mystic-trees/dotree3.iob rename to objects/mystic-trees/dotree3.iob diff --git a/objects/trees/mixed/mystic-trees/dotree4.iob b/objects/mystic-trees/dotree4.iob similarity index 100% rename from objects/trees/mixed/mystic-trees/dotree4.iob rename to objects/mystic-trees/dotree4.iob diff --git a/objects/trees/mixed/mystic-trees/dotree5.iob b/objects/mystic-trees/dotree5.iob similarity index 100% rename from objects/trees/mixed/mystic-trees/dotree5.iob rename to objects/mystic-trees/dotree5.iob diff --git a/objects/trees/mixed/mystic-trees/dotree6.iob b/objects/mystic-trees/dotree6.iob similarity index 100% rename from objects/trees/mixed/mystic-trees/dotree6.iob rename to objects/mystic-trees/dotree6.iob diff --git a/objects/trees/mixed/mystic-trees/dotree7.iob b/objects/mystic-trees/dotree7.iob similarity index 100% rename from objects/trees/mixed/mystic-trees/dotree7.iob rename to objects/mystic-trees/dotree7.iob diff --git a/objects/trees/mixed/mystic-trees/dotree8.iob b/objects/mystic-trees/dotree8.iob similarity index 100% rename from objects/trees/mixed/mystic-trees/dotree8.iob rename to objects/mystic-trees/dotree8.iob diff --git a/objects/trees/mixed/mystic-trees/dotree9.iob b/objects/mystic-trees/dotree9.iob similarity index 100% rename from objects/trees/mixed/mystic-trees/dotree9.iob rename to objects/mystic-trees/dotree9.iob diff --git a/objects/clutter/nether_fossils/fossil_1.iob b/objects/nether_fossils/fossil_1.iob similarity index 100% rename from objects/clutter/nether_fossils/fossil_1.iob rename to objects/nether_fossils/fossil_1.iob diff --git a/objects/clutter/nether_fossils/fossil_10.iob b/objects/nether_fossils/fossil_10.iob similarity index 100% rename from objects/clutter/nether_fossils/fossil_10.iob rename to objects/nether_fossils/fossil_10.iob diff --git a/objects/clutter/nether_fossils/fossil_11.iob b/objects/nether_fossils/fossil_11.iob similarity index 100% rename from objects/clutter/nether_fossils/fossil_11.iob rename to objects/nether_fossils/fossil_11.iob diff --git a/objects/clutter/nether_fossils/fossil_12.iob b/objects/nether_fossils/fossil_12.iob similarity index 100% rename from objects/clutter/nether_fossils/fossil_12.iob rename to objects/nether_fossils/fossil_12.iob diff --git a/objects/clutter/nether_fossils/fossil_13.iob b/objects/nether_fossils/fossil_13.iob similarity index 100% rename from objects/clutter/nether_fossils/fossil_13.iob rename to objects/nether_fossils/fossil_13.iob diff --git a/objects/clutter/nether_fossils/fossil_14.iob b/objects/nether_fossils/fossil_14.iob similarity index 100% rename from objects/clutter/nether_fossils/fossil_14.iob rename to objects/nether_fossils/fossil_14.iob diff --git a/objects/clutter/nether_fossils/fossil_2.iob b/objects/nether_fossils/fossil_2.iob similarity index 100% rename from objects/clutter/nether_fossils/fossil_2.iob rename to objects/nether_fossils/fossil_2.iob diff --git a/objects/clutter/nether_fossils/fossil_3.iob b/objects/nether_fossils/fossil_3.iob similarity index 100% rename from objects/clutter/nether_fossils/fossil_3.iob rename to objects/nether_fossils/fossil_3.iob diff --git a/objects/clutter/nether_fossils/fossil_4.iob b/objects/nether_fossils/fossil_4.iob similarity index 100% rename from objects/clutter/nether_fossils/fossil_4.iob rename to objects/nether_fossils/fossil_4.iob diff --git a/objects/clutter/nether_fossils/fossil_5.iob b/objects/nether_fossils/fossil_5.iob similarity index 100% rename from objects/clutter/nether_fossils/fossil_5.iob rename to objects/nether_fossils/fossil_5.iob diff --git a/objects/clutter/nether_fossils/fossil_6.iob b/objects/nether_fossils/fossil_6.iob similarity index 100% rename from objects/clutter/nether_fossils/fossil_6.iob rename to objects/nether_fossils/fossil_6.iob diff --git a/objects/clutter/nether_fossils/fossil_7.iob b/objects/nether_fossils/fossil_7.iob similarity index 100% rename from objects/clutter/nether_fossils/fossil_7.iob rename to objects/nether_fossils/fossil_7.iob diff --git a/objects/clutter/nether_fossils/fossil_8.iob b/objects/nether_fossils/fossil_8.iob similarity index 100% rename from objects/clutter/nether_fossils/fossil_8.iob rename to objects/nether_fossils/fossil_8.iob diff --git a/objects/clutter/nether_fossils/fossil_9.iob b/objects/nether_fossils/fossil_9.iob similarity index 100% rename from objects/clutter/nether_fossils/fossil_9.iob rename to objects/nether_fossils/fossil_9.iob diff --git a/objects/clutter/oak-bush/bush1.iob b/objects/oak-bush/bush1.iob similarity index 100% rename from objects/clutter/oak-bush/bush1.iob rename to objects/oak-bush/bush1.iob diff --git a/objects/clutter/oak-bush/bush2.iob b/objects/oak-bush/bush2.iob similarity index 100% rename from objects/clutter/oak-bush/bush2.iob rename to objects/oak-bush/bush2.iob diff --git a/objects/clutter/oak-bush/bush3.iob b/objects/oak-bush/bush3.iob similarity index 100% rename from objects/clutter/oak-bush/bush3.iob rename to objects/oak-bush/bush3.iob diff --git a/objects/clutter/oak-bush/bush4.iob b/objects/oak-bush/bush4.iob similarity index 100% rename from objects/clutter/oak-bush/bush4.iob rename to objects/oak-bush/bush4.iob diff --git a/objects/trees/oak/smfallen1.iob b/objects/oak-fallen-massive/oak1.iob similarity index 100% rename from objects/trees/oak/smfallen1.iob rename to objects/oak-fallen-massive/oak1.iob diff --git a/objects/clutter/oak-log/log1.iob b/objects/oak-log/log1.iob similarity index 100% rename from objects/clutter/oak-log/log1.iob rename to objects/oak-log/log1.iob diff --git a/objects/clutter/oak-log/log2.iob b/objects/oak-log/log2.iob similarity index 100% rename from objects/clutter/oak-log/log2.iob rename to objects/oak-log/log2.iob diff --git a/objects/clutter/oak-log/log3.iob b/objects/oak-log/log3.iob similarity index 100% rename from objects/clutter/oak-log/log3.iob rename to objects/oak-log/log3.iob diff --git a/objects/trees/oak/massivegeneric1.iob b/objects/oak-massive/oak1.iob similarity index 100% rename from objects/trees/oak/massivegeneric1.iob rename to objects/oak-massive/oak1.iob diff --git a/objects/trees/oak/massivegeneric2.iob b/objects/oak-massive/oak2.iob similarity index 100% rename from objects/trees/oak/massivegeneric2.iob rename to objects/oak-massive/oak2.iob diff --git a/objects/trees/oak/massivegeneric3.iob b/objects/oak-massive/oak3.iob similarity index 100% rename from objects/trees/oak/massivegeneric3.iob rename to objects/oak-massive/oak3.iob diff --git a/objects/trees/oak/denmyre1.iob b/objects/oak-medium/oak-denmyre-1.iob similarity index 100% rename from objects/trees/oak/denmyre1.iob rename to objects/oak-medium/oak-denmyre-1.iob diff --git a/objects/trees/oak/denmyre2.iob b/objects/oak-medium/oak-denmyre-10.iob similarity index 100% rename from objects/trees/oak/denmyre2.iob rename to objects/oak-medium/oak-denmyre-10.iob diff --git a/objects/trees/oak/denmyre3.iob b/objects/oak-medium/oak-denmyre-11.iob similarity index 100% rename from objects/trees/oak/denmyre3.iob rename to objects/oak-medium/oak-denmyre-11.iob diff --git a/objects/trees/oak/denmyre4.iob b/objects/oak-medium/oak-denmyre-12.iob similarity index 100% rename from objects/trees/oak/denmyre4.iob rename to objects/oak-medium/oak-denmyre-12.iob diff --git a/objects/trees/oak/denmyre5.iob b/objects/oak-medium/oak-denmyre-13.iob similarity index 100% rename from objects/trees/oak/denmyre5.iob rename to objects/oak-medium/oak-denmyre-13.iob diff --git a/objects/trees/oak/denmyre6.iob b/objects/oak-medium/oak-denmyre-14.iob similarity index 100% rename from objects/trees/oak/denmyre6.iob rename to objects/oak-medium/oak-denmyre-14.iob diff --git a/objects/trees/oak/denmyre7.iob b/objects/oak-medium/oak-denmyre-15.iob similarity index 100% rename from objects/trees/oak/denmyre7.iob rename to objects/oak-medium/oak-denmyre-15.iob diff --git a/objects/trees/oak/denmyre8.iob b/objects/oak-medium/oak-denmyre-16.iob similarity index 100% rename from objects/trees/oak/denmyre8.iob rename to objects/oak-medium/oak-denmyre-16.iob diff --git a/objects/trees/oak/denmyre9.iob b/objects/oak-medium/oak-denmyre-2.iob similarity index 100% rename from objects/trees/oak/denmyre9.iob rename to objects/oak-medium/oak-denmyre-2.iob diff --git a/objects/trees/oak/denmyre10.iob b/objects/oak-medium/oak-denmyre-3.iob similarity index 100% rename from objects/trees/oak/denmyre10.iob rename to objects/oak-medium/oak-denmyre-3.iob diff --git a/objects/trees/oak/denmyre11.iob b/objects/oak-medium/oak-denmyre-4.iob similarity index 100% rename from objects/trees/oak/denmyre11.iob rename to objects/oak-medium/oak-denmyre-4.iob diff --git a/objects/trees/oak/denmyre12.iob b/objects/oak-medium/oak-denmyre-5.iob similarity index 100% rename from objects/trees/oak/denmyre12.iob rename to objects/oak-medium/oak-denmyre-5.iob diff --git a/objects/trees/oak/denmyre13.iob b/objects/oak-medium/oak-denmyre-6.iob similarity index 100% rename from objects/trees/oak/denmyre13.iob rename to objects/oak-medium/oak-denmyre-6.iob diff --git a/objects/trees/oak/denmyre14.iob b/objects/oak-medium/oak-denmyre-7.iob similarity index 100% rename from objects/trees/oak/denmyre14.iob rename to objects/oak-medium/oak-denmyre-7.iob diff --git a/objects/trees/oak/denmyre15.iob b/objects/oak-medium/oak-denmyre-8.iob similarity index 100% rename from objects/trees/oak/denmyre15.iob rename to objects/oak-medium/oak-denmyre-8.iob diff --git a/objects/trees/oak/denmyre16.iob b/objects/oak-medium/oak-denmyre-9.iob similarity index 100% rename from objects/trees/oak/denmyre16.iob rename to objects/oak-medium/oak-denmyre-9.iob diff --git a/objects/trees/oak/truegeneric21.iob b/objects/oak-medium/oak1.iob similarity index 100% rename from objects/trees/oak/truegeneric21.iob rename to objects/oak-medium/oak1.iob diff --git a/objects/trees/oak/truegeneric22.iob b/objects/oak-medium/oak2.iob similarity index 100% rename from objects/trees/oak/truegeneric22.iob rename to objects/oak-medium/oak2.iob diff --git a/objects/trees/oak/truegeneric23.iob b/objects/oak-medium/oak3.iob similarity index 100% rename from objects/trees/oak/truegeneric23.iob rename to objects/oak-medium/oak3.iob diff --git a/objects/trees/oak/truegeneric24.iob b/objects/oak-medium/oak5.iob similarity index 100% rename from objects/trees/oak/truegeneric24.iob rename to objects/oak-medium/oak5.iob diff --git a/objects/trees/oak/lponderosa1.iob b/objects/oak-ponderosa/large-1.iob similarity index 100% rename from objects/trees/oak/lponderosa1.iob rename to objects/oak-ponderosa/large-1.iob diff --git a/objects/trees/oak/lponderosa2.iob b/objects/oak-ponderosa/large-10.iob similarity index 100% rename from objects/trees/oak/lponderosa2.iob rename to objects/oak-ponderosa/large-10.iob diff --git a/objects/trees/oak/lponderosa3.iob b/objects/oak-ponderosa/large-11.iob similarity index 100% rename from objects/trees/oak/lponderosa3.iob rename to objects/oak-ponderosa/large-11.iob diff --git a/objects/trees/oak/lponderosa4.iob b/objects/oak-ponderosa/large-12.iob similarity index 100% rename from objects/trees/oak/lponderosa4.iob rename to objects/oak-ponderosa/large-12.iob diff --git a/objects/trees/oak/lponderosa5.iob b/objects/oak-ponderosa/large-13.iob similarity index 100% rename from objects/trees/oak/lponderosa5.iob rename to objects/oak-ponderosa/large-13.iob diff --git a/objects/trees/oak/lponderosa6.iob b/objects/oak-ponderosa/large-14..iob similarity index 100% rename from objects/trees/oak/lponderosa6.iob rename to objects/oak-ponderosa/large-14..iob diff --git a/objects/trees/oak/lponderosa7.iob b/objects/oak-ponderosa/large-15.iob similarity index 100% rename from objects/trees/oak/lponderosa7.iob rename to objects/oak-ponderosa/large-15.iob diff --git a/objects/trees/oak/lponderosa8.iob b/objects/oak-ponderosa/large-2.iob similarity index 100% rename from objects/trees/oak/lponderosa8.iob rename to objects/oak-ponderosa/large-2.iob diff --git a/objects/trees/oak/lponderosa9.iob b/objects/oak-ponderosa/large-3.iob similarity index 100% rename from objects/trees/oak/lponderosa9.iob rename to objects/oak-ponderosa/large-3.iob diff --git a/objects/trees/oak/lponderosa10.iob b/objects/oak-ponderosa/large-4.iob similarity index 100% rename from objects/trees/oak/lponderosa10.iob rename to objects/oak-ponderosa/large-4.iob diff --git a/objects/trees/oak/lponderosa11.iob b/objects/oak-ponderosa/large-5.iob similarity index 100% rename from objects/trees/oak/lponderosa11.iob rename to objects/oak-ponderosa/large-5.iob diff --git a/objects/trees/oak/lponderosa12.iob b/objects/oak-ponderosa/large-6.iob similarity index 100% rename from objects/trees/oak/lponderosa12.iob rename to objects/oak-ponderosa/large-6.iob diff --git a/objects/trees/oak/lponderosa13.iob b/objects/oak-ponderosa/large-7.iob similarity index 100% rename from objects/trees/oak/lponderosa13.iob rename to objects/oak-ponderosa/large-7.iob diff --git a/objects/trees/oak/lponderosa14.iob b/objects/oak-ponderosa/large-8.iob similarity index 100% rename from objects/trees/oak/lponderosa14.iob rename to objects/oak-ponderosa/large-8.iob diff --git a/objects/trees/oak/lponderosa15.iob b/objects/oak-ponderosa/large-9.iob similarity index 100% rename from objects/trees/oak/lponderosa15.iob rename to objects/oak-ponderosa/large-9.iob diff --git a/objects/trees/oak/mponderosa1.iob b/objects/oak-ponderosa/med-1.iob similarity index 100% rename from objects/trees/oak/mponderosa1.iob rename to objects/oak-ponderosa/med-1.iob diff --git a/objects/trees/oak/mponderosa2.iob b/objects/oak-ponderosa/med-10.iob similarity index 100% rename from objects/trees/oak/mponderosa2.iob rename to objects/oak-ponderosa/med-10.iob diff --git a/objects/trees/oak/mponderosa3.iob b/objects/oak-ponderosa/med-11.iob similarity index 100% rename from objects/trees/oak/mponderosa3.iob rename to objects/oak-ponderosa/med-11.iob diff --git a/objects/trees/oak/mponderosa4.iob b/objects/oak-ponderosa/med-12.iob similarity index 100% rename from objects/trees/oak/mponderosa4.iob rename to objects/oak-ponderosa/med-12.iob diff --git a/objects/trees/oak/mponderosa5.iob b/objects/oak-ponderosa/med-13.iob similarity index 100% rename from objects/trees/oak/mponderosa5.iob rename to objects/oak-ponderosa/med-13.iob diff --git a/objects/trees/oak/mponderosa6.iob b/objects/oak-ponderosa/med-14.iob similarity index 100% rename from objects/trees/oak/mponderosa6.iob rename to objects/oak-ponderosa/med-14.iob diff --git a/objects/trees/oak/mponderosa7.iob b/objects/oak-ponderosa/med-15.iob similarity index 100% rename from objects/trees/oak/mponderosa7.iob rename to objects/oak-ponderosa/med-15.iob diff --git a/objects/trees/oak/mponderosa8.iob b/objects/oak-ponderosa/med-16.iob similarity index 100% rename from objects/trees/oak/mponderosa8.iob rename to objects/oak-ponderosa/med-16.iob diff --git a/objects/trees/oak/mponderosa9.iob b/objects/oak-ponderosa/med-17.iob similarity index 100% rename from objects/trees/oak/mponderosa9.iob rename to objects/oak-ponderosa/med-17.iob diff --git a/objects/trees/oak/mponderosa10.iob b/objects/oak-ponderosa/med-18.iob similarity index 100% rename from objects/trees/oak/mponderosa10.iob rename to objects/oak-ponderosa/med-18.iob diff --git a/objects/trees/oak/mponderosa11.iob b/objects/oak-ponderosa/med-19.iob similarity index 100% rename from objects/trees/oak/mponderosa11.iob rename to objects/oak-ponderosa/med-19.iob diff --git a/objects/trees/oak/mponderosa12.iob b/objects/oak-ponderosa/med-2.iob similarity index 100% rename from objects/trees/oak/mponderosa12.iob rename to objects/oak-ponderosa/med-2.iob diff --git a/objects/trees/oak/mponderosa13.iob b/objects/oak-ponderosa/med-20.iob similarity index 100% rename from objects/trees/oak/mponderosa13.iob rename to objects/oak-ponderosa/med-20.iob diff --git a/objects/trees/oak/mponderosa14.iob b/objects/oak-ponderosa/med-3.iob similarity index 100% rename from objects/trees/oak/mponderosa14.iob rename to objects/oak-ponderosa/med-3.iob diff --git a/objects/trees/oak/mponderosa15.iob b/objects/oak-ponderosa/med-4.iob similarity index 100% rename from objects/trees/oak/mponderosa15.iob rename to objects/oak-ponderosa/med-4.iob diff --git a/objects/trees/oak/mponderosa16.iob b/objects/oak-ponderosa/med-5.iob similarity index 100% rename from objects/trees/oak/mponderosa16.iob rename to objects/oak-ponderosa/med-5.iob diff --git a/objects/trees/oak/mponderosa17.iob b/objects/oak-ponderosa/med-6.iob similarity index 100% rename from objects/trees/oak/mponderosa17.iob rename to objects/oak-ponderosa/med-6.iob diff --git a/objects/trees/oak/mponderosa18.iob b/objects/oak-ponderosa/med-7.iob similarity index 100% rename from objects/trees/oak/mponderosa18.iob rename to objects/oak-ponderosa/med-7.iob diff --git a/objects/trees/oak/mponderosa19.iob b/objects/oak-ponderosa/med-8.iob similarity index 100% rename from objects/trees/oak/mponderosa19.iob rename to objects/oak-ponderosa/med-8.iob diff --git a/objects/trees/oak/mponderosa20.iob b/objects/oak-ponderosa/med-9.iob similarity index 100% rename from objects/trees/oak/mponderosa20.iob rename to objects/oak-ponderosa/med-9.iob diff --git a/objects/trees/oak/sponderosa1.iob b/objects/oak-ponderosa/smol-1.iob similarity index 100% rename from objects/trees/oak/sponderosa1.iob rename to objects/oak-ponderosa/smol-1.iob diff --git a/objects/trees/oak/sponderosa2.iob b/objects/oak-ponderosa/smol-10.iob similarity index 100% rename from objects/trees/oak/sponderosa2.iob rename to objects/oak-ponderosa/smol-10.iob diff --git a/objects/trees/oak/sponderosa3.iob b/objects/oak-ponderosa/smol-11.iob similarity index 100% rename from objects/trees/oak/sponderosa3.iob rename to objects/oak-ponderosa/smol-11.iob diff --git a/objects/trees/oak/sponderosa4.iob b/objects/oak-ponderosa/smol-12.iob similarity index 100% rename from objects/trees/oak/sponderosa4.iob rename to objects/oak-ponderosa/smol-12.iob diff --git a/objects/trees/oak/sponderosa5.iob b/objects/oak-ponderosa/smol-13.iob similarity index 100% rename from objects/trees/oak/sponderosa5.iob rename to objects/oak-ponderosa/smol-13.iob diff --git a/objects/trees/oak/sponderosa6.iob b/objects/oak-ponderosa/smol-14.iob similarity index 100% rename from objects/trees/oak/sponderosa6.iob rename to objects/oak-ponderosa/smol-14.iob diff --git a/objects/trees/oak/sponderosa7.iob b/objects/oak-ponderosa/smol-15.iob similarity index 100% rename from objects/trees/oak/sponderosa7.iob rename to objects/oak-ponderosa/smol-15.iob diff --git a/objects/trees/oak/sponderosa8.iob b/objects/oak-ponderosa/smol-2.iob similarity index 100% rename from objects/trees/oak/sponderosa8.iob rename to objects/oak-ponderosa/smol-2.iob diff --git a/objects/trees/oak/sponderosa9.iob b/objects/oak-ponderosa/smol-3.iob similarity index 100% rename from objects/trees/oak/sponderosa9.iob rename to objects/oak-ponderosa/smol-3.iob diff --git a/objects/trees/oak/sponderosa10.iob b/objects/oak-ponderosa/smol-4.iob similarity index 100% rename from objects/trees/oak/sponderosa10.iob rename to objects/oak-ponderosa/smol-4.iob diff --git a/objects/trees/oak/sponderosa11.iob b/objects/oak-ponderosa/smol-5.iob similarity index 100% rename from objects/trees/oak/sponderosa11.iob rename to objects/oak-ponderosa/smol-5.iob diff --git a/objects/trees/oak/sponderosa12.iob b/objects/oak-ponderosa/smol-6.iob similarity index 100% rename from objects/trees/oak/sponderosa12.iob rename to objects/oak-ponderosa/smol-6.iob diff --git a/objects/trees/oak/sponderosa13.iob b/objects/oak-ponderosa/smol-7.iob similarity index 100% rename from objects/trees/oak/sponderosa13.iob rename to objects/oak-ponderosa/smol-7.iob diff --git a/objects/trees/oak/sponderosa14.iob b/objects/oak-ponderosa/smol-8.iob similarity index 100% rename from objects/trees/oak/sponderosa14.iob rename to objects/oak-ponderosa/smol-8.iob diff --git a/objects/trees/oak/sponderosa15.iob b/objects/oak-ponderosa/smol-9.iob similarity index 100% rename from objects/trees/oak/sponderosa15.iob rename to objects/oak-ponderosa/smol-9.iob diff --git a/objects/trees/oak/smol1.iob b/objects/oak-small/oak1.iob similarity index 100% rename from objects/trees/oak/smol1.iob rename to objects/oak-small/oak1.iob diff --git a/objects/trees/oak/smol2.iob b/objects/oak-small/oak10.iob similarity index 100% rename from objects/trees/oak/smol2.iob rename to objects/oak-small/oak10.iob diff --git a/objects/trees/oak/smol3.iob b/objects/oak-small/oak11.iob similarity index 100% rename from objects/trees/oak/smol3.iob rename to objects/oak-small/oak11.iob diff --git a/objects/trees/oak/smol4.iob b/objects/oak-small/oak12.iob similarity index 100% rename from objects/trees/oak/smol4.iob rename to objects/oak-small/oak12.iob diff --git a/objects/trees/oak/smol5.iob b/objects/oak-small/oak13.iob similarity index 100% rename from objects/trees/oak/smol5.iob rename to objects/oak-small/oak13.iob diff --git a/objects/trees/oak/smol6.iob b/objects/oak-small/oak14.iob similarity index 100% rename from objects/trees/oak/smol6.iob rename to objects/oak-small/oak14.iob diff --git a/objects/trees/oak/smol7.iob b/objects/oak-small/oak15.iob similarity index 100% rename from objects/trees/oak/smol7.iob rename to objects/oak-small/oak15.iob diff --git a/objects/trees/oak/smol8.iob b/objects/oak-small/oak2.iob similarity index 100% rename from objects/trees/oak/smol8.iob rename to objects/oak-small/oak2.iob diff --git a/objects/trees/oak/smol9.iob b/objects/oak-small/oak3.iob similarity index 100% rename from objects/trees/oak/smol9.iob rename to objects/oak-small/oak3.iob diff --git a/objects/trees/oak/smol10.iob b/objects/oak-small/oak4.iob similarity index 100% rename from objects/trees/oak/smol10.iob rename to objects/oak-small/oak4.iob diff --git a/objects/trees/oak/smol11.iob b/objects/oak-small/oak5.iob similarity index 100% rename from objects/trees/oak/smol11.iob rename to objects/oak-small/oak5.iob diff --git a/objects/trees/oak/smol12.iob b/objects/oak-small/oak6.iob similarity index 100% rename from objects/trees/oak/smol12.iob rename to objects/oak-small/oak6.iob diff --git a/objects/trees/oak/smol13.iob b/objects/oak-small/oak7.iob similarity index 100% rename from objects/trees/oak/smol13.iob rename to objects/oak-small/oak7.iob diff --git a/objects/trees/oak/smol14.iob b/objects/oak-small/oak8.iob similarity index 100% rename from objects/trees/oak/smol14.iob rename to objects/oak-small/oak8.iob diff --git a/objects/trees/oak/smol15.iob b/objects/oak-small/oak9.iob similarity index 100% rename from objects/trees/oak/smol15.iob rename to objects/oak-small/oak9.iob diff --git a/objects/trees/oak/sloak1.iob b/objects/oak-superlarge/oak1.iob similarity index 100% rename from objects/trees/oak/sloak1.iob rename to objects/oak-superlarge/oak1.iob diff --git a/objects/trees/oak/smoak1.iob b/objects/oak-supermassive/oak1.iob similarity index 100% rename from objects/trees/oak/smoak1.iob rename to objects/oak-supermassive/oak1.iob diff --git a/objects/trees/oak/smtoak1.iob b/objects/oak-tainted-massive/oak1.iob similarity index 100% rename from objects/trees/oak/smtoak1.iob rename to objects/oak-tainted-massive/oak1.iob diff --git a/objects/trees/oak/toak1.iob b/objects/oak-tall/tall-oak1.iob similarity index 100% rename from objects/trees/oak/toak1.iob rename to objects/oak-tall/tall-oak1.iob diff --git a/objects/trees/oak/toak2.iob b/objects/oak-tall/tall-oak10.iob similarity index 100% rename from objects/trees/oak/toak2.iob rename to objects/oak-tall/tall-oak10.iob diff --git a/objects/trees/oak/toak3.iob b/objects/oak-tall/tall-oak11.iob similarity index 100% rename from objects/trees/oak/toak3.iob rename to objects/oak-tall/tall-oak11.iob diff --git a/objects/trees/oak/toak4.iob b/objects/oak-tall/tall-oak2.iob similarity index 100% rename from objects/trees/oak/toak4.iob rename to objects/oak-tall/tall-oak2.iob diff --git a/objects/trees/oak/toak5.iob b/objects/oak-tall/tall-oak3.iob similarity index 100% rename from objects/trees/oak/toak5.iob rename to objects/oak-tall/tall-oak3.iob diff --git a/objects/trees/oak/toak6.iob b/objects/oak-tall/tall-oak4.iob similarity index 100% rename from objects/trees/oak/toak6.iob rename to objects/oak-tall/tall-oak4.iob diff --git a/objects/trees/oak/toak7.iob b/objects/oak-tall/tall-oak5.iob similarity index 100% rename from objects/trees/oak/toak7.iob rename to objects/oak-tall/tall-oak5.iob diff --git a/objects/trees/oak/toak8.iob b/objects/oak-tall/tall-oak6.iob similarity index 100% rename from objects/trees/oak/toak8.iob rename to objects/oak-tall/tall-oak6.iob diff --git a/objects/trees/oak/toak9.iob b/objects/oak-tall/tall-oak7.iob similarity index 100% rename from objects/trees/oak/toak9.iob rename to objects/oak-tall/tall-oak7.iob diff --git a/objects/trees/oak/toak10.iob b/objects/oak-tall/tall-oak8.iob similarity index 100% rename from objects/trees/oak/toak10.iob rename to objects/oak-tall/tall-oak8.iob diff --git a/objects/trees/oak/toak11.iob b/objects/oak-tall/tall-oak9.iob similarity index 100% rename from objects/trees/oak/toak11.iob rename to objects/oak-tall/tall-oak9.iob diff --git a/objects/trees/oak/smwiltedoak1.iob b/objects/oak-wilted-supermassive/oak1.iob similarity index 100% rename from objects/trees/oak/smwiltedoak1.iob rename to objects/oak-wilted-supermassive/oak1.iob diff --git a/objects/trees/oak/truegeneric1.iob b/objects/oak/oak1.iob similarity index 100% rename from objects/trees/oak/truegeneric1.iob rename to objects/oak/oak1.iob diff --git a/objects/trees/oak/truegeneric18.iob b/objects/oak/oak10.iob similarity index 100% rename from objects/trees/oak/truegeneric18.iob rename to objects/oak/oak10.iob diff --git a/objects/trees/oak/truegeneric19.iob b/objects/oak/oak11.iob similarity index 100% rename from objects/trees/oak/truegeneric19.iob rename to objects/oak/oak11.iob diff --git a/objects/trees/oak/truegeneric20.iob b/objects/oak/oak12.iob similarity index 100% rename from objects/trees/oak/truegeneric20.iob rename to objects/oak/oak12.iob diff --git a/objects/trees/oak/truegeneric2.iob b/objects/oak/oak2.iob similarity index 100% rename from objects/trees/oak/truegeneric2.iob rename to objects/oak/oak2.iob diff --git a/objects/trees/oak/truegeneric3.iob b/objects/oak/oak3.iob similarity index 100% rename from objects/trees/oak/truegeneric3.iob rename to objects/oak/oak3.iob diff --git a/objects/trees/oak/truegeneric4.iob b/objects/oak/oak4.iob similarity index 100% rename from objects/trees/oak/truegeneric4.iob rename to objects/oak/oak4.iob diff --git a/objects/trees/oak/truegeneric5.iob b/objects/oak/oak5.iob similarity index 100% rename from objects/trees/oak/truegeneric5.iob rename to objects/oak/oak5.iob diff --git a/objects/trees/oak/truegeneric6.iob b/objects/oak/oak6.iob similarity index 100% rename from objects/trees/oak/truegeneric6.iob rename to objects/oak/oak6.iob diff --git a/objects/trees/oak/truegeneric12.iob b/objects/oak/oak7.iob similarity index 100% rename from objects/trees/oak/truegeneric12.iob rename to objects/oak/oak7.iob diff --git a/objects/trees/oak/truegeneric14.iob b/objects/oak/oak8.iob similarity index 100% rename from objects/trees/oak/truegeneric14.iob rename to objects/oak/oak8.iob diff --git a/objects/trees/oak/truegeneric15.iob b/objects/oak/oak9.iob similarity index 100% rename from objects/trees/oak/truegeneric15.iob rename to objects/oak/oak9.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter1.iob b/objects/oakbush-tclutter/TClutter1.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter1.iob rename to objects/oakbush-tclutter/TClutter1.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter10.iob b/objects/oakbush-tclutter/TClutter10.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter10.iob rename to objects/oakbush-tclutter/TClutter10.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter11.iob b/objects/oakbush-tclutter/TClutter11.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter11.iob rename to objects/oakbush-tclutter/TClutter11.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter12.iob b/objects/oakbush-tclutter/TClutter12.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter12.iob rename to objects/oakbush-tclutter/TClutter12.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter13.iob b/objects/oakbush-tclutter/TClutter13.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter13.iob rename to objects/oakbush-tclutter/TClutter13.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter14.iob b/objects/oakbush-tclutter/TClutter14.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter14.iob rename to objects/oakbush-tclutter/TClutter14.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter15.iob b/objects/oakbush-tclutter/TClutter15.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter15.iob rename to objects/oakbush-tclutter/TClutter15.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter16.iob b/objects/oakbush-tclutter/TClutter16.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter16.iob rename to objects/oakbush-tclutter/TClutter16.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter17.iob b/objects/oakbush-tclutter/TClutter17.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter17.iob rename to objects/oakbush-tclutter/TClutter17.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter18.iob b/objects/oakbush-tclutter/TClutter18.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter18.iob rename to objects/oakbush-tclutter/TClutter18.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter19.iob b/objects/oakbush-tclutter/TClutter19.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter19.iob rename to objects/oakbush-tclutter/TClutter19.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter2.iob b/objects/oakbush-tclutter/TClutter2.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter2.iob rename to objects/oakbush-tclutter/TClutter2.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter20.iob b/objects/oakbush-tclutter/TClutter20.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter20.iob rename to objects/oakbush-tclutter/TClutter20.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter21.iob b/objects/oakbush-tclutter/TClutter21.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter21.iob rename to objects/oakbush-tclutter/TClutter21.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter22.iob b/objects/oakbush-tclutter/TClutter22.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter22.iob rename to objects/oakbush-tclutter/TClutter22.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter23.iob b/objects/oakbush-tclutter/TClutter23.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter23.iob rename to objects/oakbush-tclutter/TClutter23.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter24.iob b/objects/oakbush-tclutter/TClutter24.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter24.iob rename to objects/oakbush-tclutter/TClutter24.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter25.iob b/objects/oakbush-tclutter/TClutter25.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter25.iob rename to objects/oakbush-tclutter/TClutter25.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter3.iob b/objects/oakbush-tclutter/TClutter3.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter3.iob rename to objects/oakbush-tclutter/TClutter3.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter4.iob b/objects/oakbush-tclutter/TClutter4.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter4.iob rename to objects/oakbush-tclutter/TClutter4.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter5.iob b/objects/oakbush-tclutter/TClutter5.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter5.iob rename to objects/oakbush-tclutter/TClutter5.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter6.iob b/objects/oakbush-tclutter/TClutter6.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter6.iob rename to objects/oakbush-tclutter/TClutter6.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter7.iob b/objects/oakbush-tclutter/TClutter7.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter7.iob rename to objects/oakbush-tclutter/TClutter7.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter8.iob b/objects/oakbush-tclutter/TClutter8.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter8.iob rename to objects/oakbush-tclutter/TClutter8.iob diff --git a/objects/clutter/oakbush-tclutter/TClutter9.iob b/objects/oakbush-tclutter/TClutter9.iob similarity index 100% rename from objects/clutter/oakbush-tclutter/TClutter9.iob rename to objects/oakbush-tclutter/TClutter9.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb1.iob b/objects/oakbush-tgarb/TGarb1.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb1.iob rename to objects/oakbush-tgarb/TGarb1.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb10.iob b/objects/oakbush-tgarb/TGarb10.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb10.iob rename to objects/oakbush-tgarb/TGarb10.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb11.iob b/objects/oakbush-tgarb/TGarb11.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb11.iob rename to objects/oakbush-tgarb/TGarb11.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb12.iob b/objects/oakbush-tgarb/TGarb12.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb12.iob rename to objects/oakbush-tgarb/TGarb12.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb13.iob b/objects/oakbush-tgarb/TGarb13.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb13.iob rename to objects/oakbush-tgarb/TGarb13.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb14.iob b/objects/oakbush-tgarb/TGarb14.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb14.iob rename to objects/oakbush-tgarb/TGarb14.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb15.iob b/objects/oakbush-tgarb/TGarb15.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb15.iob rename to objects/oakbush-tgarb/TGarb15.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb16.iob b/objects/oakbush-tgarb/TGarb16.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb16.iob rename to objects/oakbush-tgarb/TGarb16.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb17.iob b/objects/oakbush-tgarb/TGarb17.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb17.iob rename to objects/oakbush-tgarb/TGarb17.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb18.iob b/objects/oakbush-tgarb/TGarb18.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb18.iob rename to objects/oakbush-tgarb/TGarb18.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb19.iob b/objects/oakbush-tgarb/TGarb19.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb19.iob rename to objects/oakbush-tgarb/TGarb19.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb2.iob b/objects/oakbush-tgarb/TGarb2.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb2.iob rename to objects/oakbush-tgarb/TGarb2.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb20.iob b/objects/oakbush-tgarb/TGarb20.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb20.iob rename to objects/oakbush-tgarb/TGarb20.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb3.iob b/objects/oakbush-tgarb/TGarb3.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb3.iob rename to objects/oakbush-tgarb/TGarb3.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb4.iob b/objects/oakbush-tgarb/TGarb4.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb4.iob rename to objects/oakbush-tgarb/TGarb4.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb5.iob b/objects/oakbush-tgarb/TGarb5.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb5.iob rename to objects/oakbush-tgarb/TGarb5.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb6.iob b/objects/oakbush-tgarb/TGarb6.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb6.iob rename to objects/oakbush-tgarb/TGarb6.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb7.iob b/objects/oakbush-tgarb/TGarb7.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb7.iob rename to objects/oakbush-tgarb/TGarb7.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb8.iob b/objects/oakbush-tgarb/TGarb8.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb8.iob rename to objects/oakbush-tgarb/TGarb8.iob diff --git a/objects/clutter/oakbush-tgarb/TGarb9.iob b/objects/oakbush-tgarb/TGarb9.iob similarity index 100% rename from objects/clutter/oakbush-tgarb/TGarb9.iob rename to objects/oakbush-tgarb/TGarb9.iob diff --git a/objects/trees/sakura/genericsak1.iob b/objects/ob-sakura/sakura1.iob similarity index 100% rename from objects/trees/sakura/genericsak1.iob rename to objects/ob-sakura/sakura1.iob diff --git a/objects/trees/sakura/genericsak2.iob b/objects/ob-sakura/sakura2.iob similarity index 100% rename from objects/trees/sakura/genericsak2.iob rename to objects/ob-sakura/sakura2.iob diff --git a/objects/trees/sakura/genericsak3.iob b/objects/ob-sakura/sakura3.iob similarity index 100% rename from objects/trees/sakura/genericsak3.iob rename to objects/ob-sakura/sakura3.iob diff --git a/objects/trees/sakura/genericsak4.iob b/objects/ob-sakura/sakura4.iob similarity index 100% rename from objects/trees/sakura/genericsak4.iob rename to objects/ob-sakura/sakura4.iob diff --git a/objects/trees/sakura/genericsak5.iob b/objects/ob-sakura/sakura5.iob similarity index 100% rename from objects/trees/sakura/genericsak5.iob rename to objects/ob-sakura/sakura5.iob diff --git a/objects/structures/ocean-ruins/ruin1.iob b/objects/ocean-ruins/ruin1.iob similarity index 100% rename from objects/structures/ocean-ruins/ruin1.iob rename to objects/ocean-ruins/ruin1.iob diff --git a/objects/structures/ocean-ruins/ruin2.iob b/objects/ocean-ruins/ruin2.iob similarity index 100% rename from objects/structures/ocean-ruins/ruin2.iob rename to objects/ocean-ruins/ruin2.iob diff --git a/objects/structures/ocean-ruins/ruin3.iob b/objects/ocean-ruins/ruin3.iob similarity index 100% rename from objects/structures/ocean-ruins/ruin3.iob rename to objects/ocean-ruins/ruin3.iob diff --git a/objects/clutter/ice/ICEMush1.ish b/objects/other/ICEMush1.ish similarity index 100% rename from objects/clutter/ice/ICEMush1.ish rename to objects/other/ICEMush1.ish diff --git a/objects/clutter/ice/ICEMush2.ish b/objects/other/ICEMush2.ish similarity index 100% rename from objects/clutter/ice/ICEMush2.ish rename to objects/other/ICEMush2.ish diff --git a/objects/clutter/ice/ICEMush3.ish b/objects/other/ICEMush3.ish similarity index 100% rename from objects/clutter/ice/ICEMush3.ish rename to objects/other/ICEMush3.ish diff --git a/objects/clutter/ice/ICEMush4.ish b/objects/other/ICEMush4.ish similarity index 100% rename from objects/clutter/ice/ICEMush4.ish rename to objects/other/ICEMush4.ish diff --git a/objects/clutter/ice/ICEMush5.ish b/objects/other/ICEMush5.ish similarity index 100% rename from objects/clutter/ice/ICEMush5.ish rename to objects/other/ICEMush5.ish diff --git a/objects/clutter/ice/ICEMush6.ish b/objects/other/ICEMush6.ish similarity index 100% rename from objects/clutter/ice/ICEMush6.ish rename to objects/other/ICEMush6.ish diff --git a/objects/clutter/ice/ICEMush7.ish b/objects/other/ICEMush7.ish similarity index 100% rename from objects/clutter/ice/ICEMush7.ish rename to objects/other/ICEMush7.ish diff --git a/objects/clutter/ice/ICEMush8.ish b/objects/other/ICEMush8.ish similarity index 100% rename from objects/clutter/ice/ICEMush8.ish rename to objects/other/ICEMush8.ish diff --git a/objects/clutter/ice/ICEMush9.ish b/objects/other/ICEMush9.ish similarity index 100% rename from objects/clutter/ice/ICEMush9.ish rename to objects/other/ICEMush9.ish diff --git a/objects/clutter/ice/IceSpire1.ish b/objects/other/IceSpire1.ish similarity index 100% rename from objects/clutter/ice/IceSpire1.ish rename to objects/other/IceSpire1.ish diff --git a/objects/clutter/ice/IceSpire2.ish b/objects/other/IceSpire2.ish similarity index 100% rename from objects/clutter/ice/IceSpire2.ish rename to objects/other/IceSpire2.ish diff --git a/objects/clutter/ice/IceSpire3.ish b/objects/other/IceSpire3.ish similarity index 100% rename from objects/clutter/ice/IceSpire3.ish rename to objects/other/IceSpire3.ish diff --git a/objects/clutter/ice/IceSpire4.ish b/objects/other/IceSpire4.ish similarity index 100% rename from objects/clutter/ice/IceSpire4.ish rename to objects/other/IceSpire4.ish diff --git a/objects/clutter/ice/IceSpire5.ish b/objects/other/IceSpire5.ish similarity index 100% rename from objects/clutter/ice/IceSpire5.ish rename to objects/other/IceSpire5.ish diff --git a/objects/clutter/ice/IceSpire6.ish b/objects/other/IceSpire6.ish similarity index 100% rename from objects/clutter/ice/IceSpire6.ish rename to objects/other/IceSpire6.ish diff --git a/objects/trees/jungle/spalm1.iob b/objects/palm-small/palm1.iob similarity index 100% rename from objects/trees/jungle/spalm1.iob rename to objects/palm-small/palm1.iob diff --git a/objects/trees/jungle/spalm2.iob b/objects/palm-small/palm2.iob similarity index 100% rename from objects/trees/jungle/spalm2.iob rename to objects/palm-small/palm2.iob diff --git a/objects/trees/jungle/spalm3.iob b/objects/palm-small/palm3.iob similarity index 100% rename from objects/trees/jungle/spalm3.iob rename to objects/palm-small/palm3.iob diff --git a/objects/trees/jungle/spalm4.iob b/objects/palm-small/palm4.iob similarity index 100% rename from objects/trees/jungle/spalm4.iob rename to objects/palm-small/palm4.iob diff --git a/objects/trees/jungle/spalm5.iob b/objects/palm-small/palm5.iob similarity index 100% rename from objects/trees/jungle/spalm5.iob rename to objects/palm-small/palm5.iob diff --git a/objects/trees/jungle/palm12.iob b/objects/palm/palm-4.iob similarity index 100% rename from objects/trees/jungle/palm12.iob rename to objects/palm/palm-4.iob diff --git a/objects/trees/jungle/palm13.iob b/objects/palm/palm-5.iob similarity index 100% rename from objects/trees/jungle/palm13.iob rename to objects/palm/palm-5.iob diff --git a/objects/trees/jungle/palm11.iob b/objects/palm/palm-6.iob similarity index 100% rename from objects/trees/jungle/palm11.iob rename to objects/palm/palm-6.iob diff --git a/objects/trees/jungle/palm10.iob b/objects/palm/palm-7.iob similarity index 100% rename from objects/trees/jungle/palm10.iob rename to objects/palm/palm-7.iob diff --git a/objects/trees/jungle/palm9.iob b/objects/palm/palm-8.iob similarity index 100% rename from objects/trees/jungle/palm9.iob rename to objects/palm/palm-8.iob diff --git a/objects/trees/jungle/palm1.iob b/objects/palm/palm1.iob similarity index 100% rename from objects/trees/jungle/palm1.iob rename to objects/palm/palm1.iob diff --git a/objects/trees/jungle/palm2.iob b/objects/palm/palm2.iob similarity index 100% rename from objects/trees/jungle/palm2.iob rename to objects/palm/palm2.iob diff --git a/objects/trees/jungle/palm3.iob b/objects/palm/palm3.iob similarity index 100% rename from objects/trees/jungle/palm3.iob rename to objects/palm/palm3.iob diff --git a/objects/trees/jungle/palm4.iob b/objects/palm/palm4.iob similarity index 100% rename from objects/trees/jungle/palm4.iob rename to objects/palm/palm4.iob diff --git a/objects/trees/jungle/palm5.iob b/objects/palm/palm5.iob similarity index 100% rename from objects/trees/jungle/palm5.iob rename to objects/palm/palm5.iob diff --git a/objects/trees/jungle/palm6.iob b/objects/palm/palm6.iob similarity index 100% rename from objects/trees/jungle/palm6.iob rename to objects/palm/palm6.iob diff --git a/objects/trees/jungle/palm7.iob b/objects/palm/palm7.iob similarity index 100% rename from objects/trees/jungle/palm7.iob rename to objects/palm/palm7.iob diff --git a/objects/trees/jungle/palm8.iob b/objects/palm/palm8.iob similarity index 100% rename from objects/trees/jungle/palm8.iob rename to objects/palm/palm8.iob diff --git a/objects/clutter/patch/graveldirt1.iob b/objects/patch/graveldirt1.iob similarity index 100% rename from objects/clutter/patch/graveldirt1.iob rename to objects/patch/graveldirt1.iob diff --git a/objects/clutter/patch/graveldirt2.iob b/objects/patch/graveldirt2.iob similarity index 100% rename from objects/clutter/patch/graveldirt2.iob rename to objects/patch/graveldirt2.iob diff --git a/objects/clutter/patch/graveldirt3.iob b/objects/patch/graveldirt3.iob similarity index 100% rename from objects/clutter/patch/graveldirt3.iob rename to objects/patch/graveldirt3.iob diff --git a/objects/clutter/patch/graveldirt4.iob b/objects/patch/graveldirt4.iob similarity index 100% rename from objects/clutter/patch/graveldirt4.iob rename to objects/patch/graveldirt4.iob diff --git a/objects/clutter/peaks/p1.iob b/objects/peaks/p1.iob similarity index 100% rename from objects/clutter/peaks/p1.iob rename to objects/peaks/p1.iob diff --git a/objects/clutter/peaks/p2.iob b/objects/peaks/p2.iob similarity index 100% rename from objects/clutter/peaks/p2.iob rename to objects/peaks/p2.iob diff --git a/objects/clutter/peaks/p3.iob b/objects/peaks/p3.iob similarity index 100% rename from objects/clutter/peaks/p3.iob rename to objects/peaks/p3.iob diff --git a/objects/clutter/peaks/p4.iob b/objects/peaks/p4.iob similarity index 100% rename from objects/clutter/peaks/p4.iob rename to objects/peaks/p4.iob diff --git a/objects/clutter/peaks/p5.iob b/objects/peaks/p5.iob similarity index 100% rename from objects/clutter/peaks/p5.iob rename to objects/peaks/p5.iob diff --git a/objects/clutter/peaks/p6.iob b/objects/peaks/p6.iob similarity index 100% rename from objects/clutter/peaks/p6.iob rename to objects/peaks/p6.iob diff --git a/objects/jigsaw/pillager_outpost/base_plate.iob b/objects/pillager_outpost/base_plate.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/base_plate.iob rename to objects/pillager_outpost/base_plate.iob diff --git a/objects/jigsaw/pillager_outpost/feature_plate.iob b/objects/pillager_outpost/feature_plate.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/feature_plate.iob rename to objects/pillager_outpost/feature_plate.iob diff --git a/objects/jigsaw/pillager_outpost/overgrown/cage.iob b/objects/pillager_outpost/overgrown/cage.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/overgrown/cage.iob rename to objects/pillager_outpost/overgrown/cage.iob diff --git a/objects/jigsaw/pillager_outpost/overgrown/pumpkins1.iob b/objects/pillager_outpost/overgrown/pumpkins1.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/overgrown/pumpkins1.iob rename to objects/pillager_outpost/overgrown/pumpkins1.iob diff --git a/objects/jigsaw/pillager_outpost/overgrown/pumpkins2.iob b/objects/pillager_outpost/overgrown/pumpkins2.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/overgrown/pumpkins2.iob rename to objects/pillager_outpost/overgrown/pumpkins2.iob diff --git a/objects/jigsaw/pillager_outpost/overgrown/tent.iob b/objects/pillager_outpost/overgrown/tent.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/overgrown/tent.iob rename to objects/pillager_outpost/overgrown/tent.iob diff --git a/objects/jigsaw/pillager_outpost/regular/feature_cage1.iob b/objects/pillager_outpost/regular/feature_cage1.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/regular/feature_cage1.iob rename to objects/pillager_outpost/regular/feature_cage1.iob diff --git a/objects/jigsaw/pillager_outpost/regular/feature_cage2.iob b/objects/pillager_outpost/regular/feature_cage2.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/regular/feature_cage2.iob rename to objects/pillager_outpost/regular/feature_cage2.iob diff --git a/objects/jigsaw/pillager_outpost/regular/feature_logs.iob b/objects/pillager_outpost/regular/feature_logs.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/regular/feature_logs.iob rename to objects/pillager_outpost/regular/feature_logs.iob diff --git a/objects/jigsaw/pillager_outpost/regular/feature_targets.iob b/objects/pillager_outpost/regular/feature_targets.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/regular/feature_targets.iob rename to objects/pillager_outpost/regular/feature_targets.iob diff --git a/objects/jigsaw/pillager_outpost/regular/feature_tent1.iob b/objects/pillager_outpost/regular/feature_tent1.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/regular/feature_tent1.iob rename to objects/pillager_outpost/regular/feature_tent1.iob diff --git a/objects/jigsaw/pillager_outpost/regular/feature_tent2.iob b/objects/pillager_outpost/regular/feature_tent2.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/regular/feature_tent2.iob rename to objects/pillager_outpost/regular/feature_tent2.iob diff --git a/objects/jigsaw/pillager_outpost/watchtower.iob b/objects/pillager_outpost/watchtower.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/watchtower.iob rename to objects/pillager_outpost/watchtower.iob diff --git a/objects/jigsaw/pillager_outpost/watchtower_overgrown.iob b/objects/pillager_outpost/watchtower_overgrown.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/watchtower_overgrown.iob rename to objects/pillager_outpost/watchtower_overgrown.iob diff --git a/objects/trees/spruce/pine1.iob b/objects/pine/pine1.iob similarity index 100% rename from objects/trees/spruce/pine1.iob rename to objects/pine/pine1.iob diff --git a/objects/trees/spruce/pine10.iob b/objects/pine/pine10.iob similarity index 100% rename from objects/trees/spruce/pine10.iob rename to objects/pine/pine10.iob diff --git a/objects/trees/spruce/pine11.iob b/objects/pine/pine11.iob similarity index 100% rename from objects/trees/spruce/pine11.iob rename to objects/pine/pine11.iob diff --git a/objects/trees/spruce/pine12.iob b/objects/pine/pine12.iob similarity index 100% rename from objects/trees/spruce/pine12.iob rename to objects/pine/pine12.iob diff --git a/objects/trees/spruce/pine2.iob b/objects/pine/pine2.iob similarity index 100% rename from objects/trees/spruce/pine2.iob rename to objects/pine/pine2.iob diff --git a/objects/trees/spruce/pine3.iob b/objects/pine/pine3.iob similarity index 100% rename from objects/trees/spruce/pine3.iob rename to objects/pine/pine3.iob diff --git a/objects/trees/spruce/pine4.iob b/objects/pine/pine4.iob similarity index 100% rename from objects/trees/spruce/pine4.iob rename to objects/pine/pine4.iob diff --git a/objects/trees/spruce/pine5.iob b/objects/pine/pine5.iob similarity index 100% rename from objects/trees/spruce/pine5.iob rename to objects/pine/pine5.iob diff --git a/objects/trees/spruce/pine6.iob b/objects/pine/pine6.iob similarity index 100% rename from objects/trees/spruce/pine6.iob rename to objects/pine/pine6.iob diff --git a/objects/trees/spruce/pine7.iob b/objects/pine/pine7.iob similarity index 100% rename from objects/trees/spruce/pine7.iob rename to objects/pine/pine7.iob diff --git a/objects/trees/spruce/pine8.iob b/objects/pine/pine8.iob similarity index 100% rename from objects/trees/spruce/pine8.iob rename to objects/pine/pine8.iob diff --git a/objects/trees/spruce/pine9.iob b/objects/pine/pine9.iob similarity index 100% rename from objects/trees/spruce/pine9.iob rename to objects/pine/pine9.iob diff --git a/objects/trees/spruce/sup-pine-1.iob b/objects/pine/sup-pine-1.iob similarity index 100% rename from objects/trees/spruce/sup-pine-1.iob rename to objects/pine/sup-pine-1.iob diff --git a/objects/trees/spruce/sup-pine-10.iob b/objects/pine/sup-pine-10.iob similarity index 100% rename from objects/trees/spruce/sup-pine-10.iob rename to objects/pine/sup-pine-10.iob diff --git a/objects/trees/spruce/sup-pine-11.iob b/objects/pine/sup-pine-11.iob similarity index 100% rename from objects/trees/spruce/sup-pine-11.iob rename to objects/pine/sup-pine-11.iob diff --git a/objects/trees/spruce/sup-pine-12.iob b/objects/pine/sup-pine-12.iob similarity index 100% rename from objects/trees/spruce/sup-pine-12.iob rename to objects/pine/sup-pine-12.iob diff --git a/objects/trees/spruce/sup-pine-13.iob b/objects/pine/sup-pine-13.iob similarity index 100% rename from objects/trees/spruce/sup-pine-13.iob rename to objects/pine/sup-pine-13.iob diff --git a/objects/trees/spruce/sup-pine-2.iob b/objects/pine/sup-pine-2.iob similarity index 100% rename from objects/trees/spruce/sup-pine-2.iob rename to objects/pine/sup-pine-2.iob diff --git a/objects/trees/spruce/sup-pine-3.iob b/objects/pine/sup-pine-3.iob similarity index 100% rename from objects/trees/spruce/sup-pine-3.iob rename to objects/pine/sup-pine-3.iob diff --git a/objects/trees/spruce/sup-pine-4.iob b/objects/pine/sup-pine-4.iob similarity index 100% rename from objects/trees/spruce/sup-pine-4.iob rename to objects/pine/sup-pine-4.iob diff --git a/objects/trees/spruce/sup-pine-5.iob b/objects/pine/sup-pine-5.iob similarity index 100% rename from objects/trees/spruce/sup-pine-5.iob rename to objects/pine/sup-pine-5.iob diff --git a/objects/trees/spruce/sup-pine-6.iob b/objects/pine/sup-pine-6.iob similarity index 100% rename from objects/trees/spruce/sup-pine-6.iob rename to objects/pine/sup-pine-6.iob diff --git a/objects/trees/spruce/sup-pine-7.iob b/objects/pine/sup-pine-7.iob similarity index 100% rename from objects/trees/spruce/sup-pine-7.iob rename to objects/pine/sup-pine-7.iob diff --git a/objects/trees/spruce/sup-pine-8.iob b/objects/pine/sup-pine-8.iob similarity index 100% rename from objects/trees/spruce/sup-pine-8.iob rename to objects/pine/sup-pine-8.iob diff --git a/objects/trees/spruce/sup-pine-9.iob b/objects/pine/sup-pine-9.iob similarity index 100% rename from objects/trees/spruce/sup-pine-9.iob rename to objects/pine/sup-pine-9.iob diff --git a/objects/trees/oak/truegeneric16.iob b/objects/plains/tree1.iob similarity index 100% rename from objects/trees/oak/truegeneric16.iob rename to objects/plains/tree1.iob diff --git a/objects/trees/oak/truegeneric17.iob b/objects/plains/tree2.iob similarity index 100% rename from objects/trees/oak/truegeneric17.iob rename to objects/plains/tree2.iob diff --git a/objects/jigsaw/pyramid/py.iob b/objects/pyramid/py.iob similarity index 100% rename from objects/jigsaw/pyramid/py.iob rename to objects/pyramid/py.iob diff --git a/objects/jigsaw/pyramid/pyramid-extreme.iob b/objects/pyramid/pyramid-extreme.iob similarity index 100% rename from objects/jigsaw/pyramid/pyramid-extreme.iob rename to objects/pyramid/pyramid-extreme.iob diff --git a/objects/jigsaw/pyramid/pyramid1.iob b/objects/pyramid/pyramid1.iob similarity index 100% rename from objects/jigsaw/pyramid/pyramid1.iob rename to objects/pyramid/pyramid1.iob diff --git a/objects/trees/mixed/redwood-recluse/large-1.iob b/objects/redwood-recluse/large-1.iob similarity index 100% rename from objects/trees/mixed/redwood-recluse/large-1.iob rename to objects/redwood-recluse/large-1.iob diff --git a/objects/trees/mixed/redwood-recluse/large-10.iob b/objects/redwood-recluse/large-10.iob similarity index 100% rename from objects/trees/mixed/redwood-recluse/large-10.iob rename to objects/redwood-recluse/large-10.iob diff --git a/objects/trees/mixed/redwood-recluse/large-2.iob b/objects/redwood-recluse/large-2.iob similarity index 100% rename from objects/trees/mixed/redwood-recluse/large-2.iob rename to objects/redwood-recluse/large-2.iob diff --git a/objects/trees/mixed/redwood-recluse/large-3.iob b/objects/redwood-recluse/large-3.iob similarity index 100% rename from objects/trees/mixed/redwood-recluse/large-3.iob rename to objects/redwood-recluse/large-3.iob diff --git a/objects/trees/mixed/redwood-recluse/large-4.iob b/objects/redwood-recluse/large-4.iob similarity index 100% rename from objects/trees/mixed/redwood-recluse/large-4.iob rename to objects/redwood-recluse/large-4.iob diff --git a/objects/trees/mixed/redwood-recluse/large-5.iob b/objects/redwood-recluse/large-5.iob similarity index 100% rename from objects/trees/mixed/redwood-recluse/large-5.iob rename to objects/redwood-recluse/large-5.iob diff --git a/objects/trees/mixed/redwood-recluse/large-6.iob b/objects/redwood-recluse/large-6.iob similarity index 100% rename from objects/trees/mixed/redwood-recluse/large-6.iob rename to objects/redwood-recluse/large-6.iob diff --git a/objects/trees/mixed/redwood-recluse/large-7.iob b/objects/redwood-recluse/large-7.iob similarity index 100% rename from objects/trees/mixed/redwood-recluse/large-7.iob rename to objects/redwood-recluse/large-7.iob diff --git a/objects/trees/mixed/redwood-recluse/large-8.iob b/objects/redwood-recluse/large-8.iob similarity index 100% rename from objects/trees/mixed/redwood-recluse/large-8.iob rename to objects/redwood-recluse/large-8.iob diff --git a/objects/trees/mixed/redwood-recluse/large-9.iob b/objects/redwood-recluse/large-9.iob similarity index 100% rename from objects/trees/mixed/redwood-recluse/large-9.iob rename to objects/redwood-recluse/large-9.iob diff --git a/objects/clutter/redwood/bush-1.iob b/objects/redwood/bush-1.iob similarity index 100% rename from objects/clutter/redwood/bush-1.iob rename to objects/redwood/bush-1.iob diff --git a/objects/clutter/redwood/bush-2.iob b/objects/redwood/bush-2.iob similarity index 100% rename from objects/clutter/redwood/bush-2.iob rename to objects/redwood/bush-2.iob diff --git a/objects/clutter/redwood/rock-1.iob b/objects/redwood/rock-1.iob similarity index 100% rename from objects/clutter/redwood/rock-1.iob rename to objects/redwood/rock-1.iob diff --git a/objects/clutter/redwood/rock-2.iob b/objects/redwood/rock-2.iob similarity index 100% rename from objects/clutter/redwood/rock-2.iob rename to objects/redwood/rock-2.iob diff --git a/objects/clutter/redwood/small-redwood-1.iob b/objects/redwood/small-redwood-1.iob similarity index 100% rename from objects/clutter/redwood/small-redwood-1.iob rename to objects/redwood/small-redwood-1.iob diff --git a/objects/clutter/redwood/small-redwood-2.iob b/objects/redwood/small-redwood-2.iob similarity index 100% rename from objects/clutter/redwood/small-redwood-2.iob rename to objects/redwood/small-redwood-2.iob diff --git a/objects/clutter/redwood/small-redwood-3.iob b/objects/redwood/small-redwood-3.iob similarity index 100% rename from objects/clutter/redwood/small-redwood-3.iob rename to objects/redwood/small-redwood-3.iob diff --git a/objects/clutter/redwood/small-redwood.iob b/objects/redwood/small-redwood.iob similarity index 100% rename from objects/clutter/redwood/small-redwood.iob rename to objects/redwood/small-redwood.iob diff --git a/objects/clutter/rocks/r1.iob b/objects/rocks/r1.iob similarity index 100% rename from objects/clutter/rocks/r1.iob rename to objects/rocks/r1.iob diff --git a/objects/clutter/rocks/r2.iob b/objects/rocks/r2.iob similarity index 100% rename from objects/clutter/rocks/r2.iob rename to objects/rocks/r2.iob diff --git a/objects/clutter/rocks/r3.iob b/objects/rocks/r3.iob similarity index 100% rename from objects/clutter/rocks/r3.iob rename to objects/rocks/r3.iob diff --git a/objects/clutter/rocks/r4.iob b/objects/rocks/r4.iob similarity index 100% rename from objects/clutter/rocks/r4.iob rename to objects/rocks/r4.iob diff --git a/objects/trees/oak/mroofed1.iob b/objects/roofed-wayward/med-1.iob similarity index 100% rename from objects/trees/oak/mroofed1.iob rename to objects/roofed-wayward/med-1.iob diff --git a/objects/trees/oak/mroofed2.iob b/objects/roofed-wayward/med-10.iob similarity index 100% rename from objects/trees/oak/mroofed2.iob rename to objects/roofed-wayward/med-10.iob diff --git a/objects/trees/oak/mroofed3.iob b/objects/roofed-wayward/med-11.iob similarity index 100% rename from objects/trees/oak/mroofed3.iob rename to objects/roofed-wayward/med-11.iob diff --git a/objects/trees/oak/mroofed4.iob b/objects/roofed-wayward/med-12.iob similarity index 100% rename from objects/trees/oak/mroofed4.iob rename to objects/roofed-wayward/med-12.iob diff --git a/objects/trees/oak/mroofed5.iob b/objects/roofed-wayward/med-2.iob similarity index 100% rename from objects/trees/oak/mroofed5.iob rename to objects/roofed-wayward/med-2.iob diff --git a/objects/trees/oak/mroofed6.iob b/objects/roofed-wayward/med-3.iob similarity index 100% rename from objects/trees/oak/mroofed6.iob rename to objects/roofed-wayward/med-3.iob diff --git a/objects/trees/oak/mroofed7.iob b/objects/roofed-wayward/med-4.iob similarity index 100% rename from objects/trees/oak/mroofed7.iob rename to objects/roofed-wayward/med-4.iob diff --git a/objects/trees/oak/mroofed8.iob b/objects/roofed-wayward/med-5.iob similarity index 100% rename from objects/trees/oak/mroofed8.iob rename to objects/roofed-wayward/med-5.iob diff --git a/objects/trees/oak/mroofed9.iob b/objects/roofed-wayward/med-6.iob similarity index 100% rename from objects/trees/oak/mroofed9.iob rename to objects/roofed-wayward/med-6.iob diff --git a/objects/trees/oak/mroofed10.iob b/objects/roofed-wayward/med-7.iob similarity index 100% rename from objects/trees/oak/mroofed10.iob rename to objects/roofed-wayward/med-7.iob diff --git a/objects/trees/oak/mroofed11.iob b/objects/roofed-wayward/med-8.iob similarity index 100% rename from objects/trees/oak/mroofed11.iob rename to objects/roofed-wayward/med-8.iob diff --git a/objects/trees/oak/mroofed12.iob b/objects/roofed-wayward/med-9.iob similarity index 100% rename from objects/trees/oak/mroofed12.iob rename to objects/roofed-wayward/med-9.iob diff --git a/objects/trees/oak/troofed1.iob b/objects/roofed-wayward/taller-roof-1.iob similarity index 100% rename from objects/trees/oak/troofed1.iob rename to objects/roofed-wayward/taller-roof-1.iob diff --git a/objects/trees/oak/troofed2.iob b/objects/roofed-wayward/taller-roof-10.iob similarity index 100% rename from objects/trees/oak/troofed2.iob rename to objects/roofed-wayward/taller-roof-10.iob diff --git a/objects/trees/oak/troofed3.iob b/objects/roofed-wayward/taller-roof-2.iob similarity index 100% rename from objects/trees/oak/troofed3.iob rename to objects/roofed-wayward/taller-roof-2.iob diff --git a/objects/trees/oak/troofed4.iob b/objects/roofed-wayward/taller-roof-3.iob similarity index 100% rename from objects/trees/oak/troofed4.iob rename to objects/roofed-wayward/taller-roof-3.iob diff --git a/objects/trees/oak/troofed5.iob b/objects/roofed-wayward/taller-roof-4.iob similarity index 100% rename from objects/trees/oak/troofed5.iob rename to objects/roofed-wayward/taller-roof-4.iob diff --git a/objects/trees/oak/troofed6.iob b/objects/roofed-wayward/taller-roof-5.iob similarity index 100% rename from objects/trees/oak/troofed6.iob rename to objects/roofed-wayward/taller-roof-5.iob diff --git a/objects/trees/oak/troofed7.iob b/objects/roofed-wayward/taller-roof-6.iob similarity index 100% rename from objects/trees/oak/troofed7.iob rename to objects/roofed-wayward/taller-roof-6.iob diff --git a/objects/trees/oak/troofed8.iob b/objects/roofed-wayward/taller-roof-7.iob similarity index 100% rename from objects/trees/oak/troofed8.iob rename to objects/roofed-wayward/taller-roof-7.iob diff --git a/objects/trees/oak/troofed9.iob b/objects/roofed-wayward/taller-roof-8.iob similarity index 100% rename from objects/trees/oak/troofed9.iob rename to objects/roofed-wayward/taller-roof-8.iob diff --git a/objects/trees/oak/troofed10.iob b/objects/roofed-wayward/taller-roof-9.iob similarity index 100% rename from objects/trees/oak/troofed10.iob rename to objects/roofed-wayward/taller-roof-9.iob diff --git a/objects/trees/oak/troofedroot1.iob b/objects/roofed-wayward/taller-roof-rooted-1.iob similarity index 100% rename from objects/trees/oak/troofedroot1.iob rename to objects/roofed-wayward/taller-roof-rooted-1.iob diff --git a/objects/trees/oak/troofedroot2.iob b/objects/roofed-wayward/taller-roof-rooted-10.iob similarity index 100% rename from objects/trees/oak/troofedroot2.iob rename to objects/roofed-wayward/taller-roof-rooted-10.iob diff --git a/objects/trees/oak/troofedroot3.iob b/objects/roofed-wayward/taller-roof-rooted-2.iob similarity index 100% rename from objects/trees/oak/troofedroot3.iob rename to objects/roofed-wayward/taller-roof-rooted-2.iob diff --git a/objects/trees/oak/troofedroot4.iob b/objects/roofed-wayward/taller-roof-rooted-3.iob similarity index 100% rename from objects/trees/oak/troofedroot4.iob rename to objects/roofed-wayward/taller-roof-rooted-3.iob diff --git a/objects/trees/oak/troofedroot5.iob b/objects/roofed-wayward/taller-roof-rooted-4.iob similarity index 100% rename from objects/trees/oak/troofedroot5.iob rename to objects/roofed-wayward/taller-roof-rooted-4.iob diff --git a/objects/trees/oak/troofedroot6.iob b/objects/roofed-wayward/taller-roof-rooted-5.iob similarity index 100% rename from objects/trees/oak/troofedroot6.iob rename to objects/roofed-wayward/taller-roof-rooted-5.iob diff --git a/objects/trees/oak/troofedroot7.iob b/objects/roofed-wayward/taller-roof-rooted-6.iob similarity index 100% rename from objects/trees/oak/troofedroot7.iob rename to objects/roofed-wayward/taller-roof-rooted-6.iob diff --git a/objects/trees/oak/troofedroot8.iob b/objects/roofed-wayward/taller-roof-rooted-7.iob similarity index 100% rename from objects/trees/oak/troofedroot8.iob rename to objects/roofed-wayward/taller-roof-rooted-7.iob diff --git a/objects/trees/oak/troofedroot9.iob b/objects/roofed-wayward/taller-roof-rooted-8.iob similarity index 100% rename from objects/trees/oak/troofedroot9.iob rename to objects/roofed-wayward/taller-roof-rooted-8.iob diff --git a/objects/trees/oak/troofedroot10.iob b/objects/roofed-wayward/taller-roof-rooted-9.iob similarity index 100% rename from objects/trees/oak/troofedroot10.iob rename to objects/roofed-wayward/taller-roof-rooted-9.iob diff --git a/objects/jigsaw/ruined_portal/giant_portal_1.iob b/objects/ruined_portal/giant_portal_1.iob similarity index 100% rename from objects/jigsaw/ruined_portal/giant_portal_1.iob rename to objects/ruined_portal/giant_portal_1.iob diff --git a/objects/jigsaw/ruined_portal/giant_portal_2.iob b/objects/ruined_portal/giant_portal_2.iob similarity index 100% rename from objects/jigsaw/ruined_portal/giant_portal_2.iob rename to objects/ruined_portal/giant_portal_2.iob diff --git a/objects/jigsaw/ruined_portal/giant_portal_3.iob b/objects/ruined_portal/giant_portal_3.iob similarity index 100% rename from objects/jigsaw/ruined_portal/giant_portal_3.iob rename to objects/ruined_portal/giant_portal_3.iob diff --git a/objects/jigsaw/ruined_portal/portal_1.iob b/objects/ruined_portal/portal_1.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_1.iob rename to objects/ruined_portal/portal_1.iob diff --git a/objects/jigsaw/ruined_portal/portal_10.iob b/objects/ruined_portal/portal_10.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_10.iob rename to objects/ruined_portal/portal_10.iob diff --git a/objects/jigsaw/ruined_portal/portal_2.iob b/objects/ruined_portal/portal_2.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_2.iob rename to objects/ruined_portal/portal_2.iob diff --git a/objects/jigsaw/ruined_portal/portal_3.iob b/objects/ruined_portal/portal_3.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_3.iob rename to objects/ruined_portal/portal_3.iob diff --git a/objects/jigsaw/ruined_portal/portal_4.iob b/objects/ruined_portal/portal_4.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_4.iob rename to objects/ruined_portal/portal_4.iob diff --git a/objects/jigsaw/ruined_portal/portal_5.iob b/objects/ruined_portal/portal_5.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_5.iob rename to objects/ruined_portal/portal_5.iob diff --git a/objects/jigsaw/ruined_portal/portal_6.iob b/objects/ruined_portal/portal_6.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_6.iob rename to objects/ruined_portal/portal_6.iob diff --git a/objects/jigsaw/ruined_portal/portal_7.iob b/objects/ruined_portal/portal_7.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_7.iob rename to objects/ruined_portal/portal_7.iob diff --git a/objects/jigsaw/ruined_portal/portal_8.iob b/objects/ruined_portal/portal_8.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_8.iob rename to objects/ruined_portal/portal_8.iob diff --git a/objects/jigsaw/ruined_portal/portal_9.iob b/objects/ruined_portal/portal_9.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_9.iob rename to objects/ruined_portal/portal_9.iob diff --git a/objects/structures/BROKEN WINDMILL/ruin1.iob b/objects/ruins/ruin1.iob similarity index 100% rename from objects/structures/BROKEN WINDMILL/ruin1.iob rename to objects/ruins/ruin1.iob diff --git a/objects/trees/sakura/ogabsurd2.iob b/objects/sacred-bonsai/OGabsurd-1.iob similarity index 100% rename from objects/trees/sakura/ogabsurd2.iob rename to objects/sacred-bonsai/OGabsurd-1.iob diff --git a/objects/trees/sakura/ogabsurd1.iob b/objects/sacred-bonsai/absurd-1.iob similarity index 100% rename from objects/trees/sakura/ogabsurd1.iob rename to objects/sacred-bonsai/absurd-1.iob diff --git a/objects/trees/bonsai/medtilt1.iob b/objects/sacred-bonsai/med-1.iob similarity index 100% rename from objects/trees/bonsai/medtilt1.iob rename to objects/sacred-bonsai/med-1.iob diff --git a/objects/trees/bonsai/medtilt2.iob b/objects/sacred-bonsai/med-2.iob similarity index 100% rename from objects/trees/bonsai/medtilt2.iob rename to objects/sacred-bonsai/med-2.iob diff --git a/objects/trees/bonsai/medtilt3.iob b/objects/sacred-bonsai/med-3.iob similarity index 100% rename from objects/trees/bonsai/medtilt3.iob rename to objects/sacred-bonsai/med-3.iob diff --git a/objects/trees/bonsai/medtilt4.iob b/objects/sacred-bonsai/med-4.iob similarity index 100% rename from objects/trees/bonsai/medtilt4.iob rename to objects/sacred-bonsai/med-4.iob diff --git a/objects/trees/bonsai/medtilt5.iob b/objects/sacred-bonsai/med-5.iob similarity index 100% rename from objects/trees/bonsai/medtilt5.iob rename to objects/sacred-bonsai/med-5.iob diff --git a/objects/trees/sakura/ogabsurdfallen1.iob b/objects/sakura-fallen/sakura1.iob similarity index 100% rename from objects/trees/sakura/ogabsurdfallen1.iob rename to objects/sakura-fallen/sakura1.iob diff --git a/objects/trees/sakura/mlarge1.iob b/objects/sakura-massive/sakura1.iob similarity index 100% rename from objects/trees/sakura/mlarge1.iob rename to objects/sakura-massive/sakura1.iob diff --git a/objects/trees/sakura/mlarge2.iob b/objects/sakura-massive/sakura2.iob similarity index 100% rename from objects/trees/sakura/mlarge2.iob rename to objects/sakura-massive/sakura2.iob diff --git a/objects/trees/sakura/mlarge3.iob b/objects/sakura-massive/sakura3.iob similarity index 100% rename from objects/trees/sakura/mlarge3.iob rename to objects/sakura-massive/sakura3.iob diff --git a/objects/trees/sakura/ogbase1.iob b/objects/sakura-superlarge/sakura1.iob similarity index 100% rename from objects/trees/sakura/ogbase1.iob rename to objects/sakura-superlarge/sakura1.iob diff --git a/objects/trees/sakura/smtaint2.iob b/objects/sakura-tainted-supermassive/sakura1.iob similarity index 100% rename from objects/trees/sakura/smtaint2.iob rename to objects/sakura-tainted-supermassive/sakura1.iob diff --git a/objects/trees/sakura/smwilt2.iob b/objects/sakura-wilted-supermassive/sakura1.iob similarity index 100% rename from objects/trees/sakura/smwilt2.iob rename to objects/sakura-wilted-supermassive/sakura1.iob diff --git a/objects/clutter/arbusto1.iob b/objects/sakura/arbusto1.iob similarity index 100% rename from objects/clutter/arbusto1.iob rename to objects/sakura/arbusto1.iob diff --git a/objects/clutter/arbusto2.iob b/objects/sakura/arbusto2.iob similarity index 100% rename from objects/clutter/arbusto2.iob rename to objects/sakura/arbusto2.iob diff --git a/objects/clutter/arbusto3.iob b/objects/sakura/arbusto3.iob similarity index 100% rename from objects/clutter/arbusto3.iob rename to objects/sakura/arbusto3.iob diff --git a/objects/clutter/arbusto4.iob b/objects/sakura/arbusto4.iob similarity index 100% rename from objects/clutter/arbusto4.iob rename to objects/sakura/arbusto4.iob diff --git a/objects/clutter/arbusto5.iob b/objects/sakura/arbusto5.iob similarity index 100% rename from objects/clutter/arbusto5.iob rename to objects/sakura/arbusto5.iob diff --git a/objects/clutter/corazoncaido.iob b/objects/sakura/corazoncaido.iob similarity index 100% rename from objects/clutter/corazoncaido.iob rename to objects/sakura/corazoncaido.iob diff --git a/objects/clutter/corazoncristal.iob b/objects/sakura/corazoncristal.iob similarity index 100% rename from objects/clutter/corazoncristal.iob rename to objects/sakura/corazoncristal.iob diff --git a/objects/clutter/pond.iob b/objects/sakura/manantial.iob similarity index 100% rename from objects/clutter/pond.iob rename to objects/sakura/manantial.iob diff --git a/objects/trees/sakura/mlarge4.iob b/objects/sakura/sakura1.iob similarity index 100% rename from objects/trees/sakura/mlarge4.iob rename to objects/sakura/sakura1.iob diff --git a/objects/trees/sakura/mlarge5.iob b/objects/sakura/sakura2.iob similarity index 100% rename from objects/trees/sakura/mlarge5.iob rename to objects/sakura/sakura2.iob diff --git a/objects/trees/sakura/mlarge6.iob b/objects/sakura/sakura3.iob similarity index 100% rename from objects/trees/sakura/mlarge6.iob rename to objects/sakura/sakura3.iob diff --git a/objects/trees/sakura/mlarge7.iob b/objects/sakura/sakura4.iob similarity index 100% rename from objects/trees/sakura/mlarge7.iob rename to objects/sakura/sakura4.iob diff --git a/objects/trees/sakura/mlarge8.iob b/objects/sakura/sakura5.iob similarity index 100% rename from objects/trees/sakura/mlarge8.iob rename to objects/sakura/sakura5.iob diff --git a/objects/clutter/log.iob b/objects/sakura/tronco.iob similarity index 100% rename from objects/clutter/log.iob rename to objects/sakura/tronco.iob diff --git a/objects/clutter/savanna-clutter/SavanaClutter1.iob b/objects/savanna-clutter/SavanaClutter1.iob similarity index 100% rename from objects/clutter/savanna-clutter/SavanaClutter1.iob rename to objects/savanna-clutter/SavanaClutter1.iob diff --git a/objects/clutter/savanna-clutter/SavanaClutter2.iob b/objects/savanna-clutter/SavanaClutter2.iob similarity index 100% rename from objects/clutter/savanna-clutter/SavanaClutter2.iob rename to objects/savanna-clutter/SavanaClutter2.iob diff --git a/objects/clutter/savanna-clutter/SavanaClutter3.iob b/objects/savanna-clutter/SavanaClutter3.iob similarity index 100% rename from objects/clutter/savanna-clutter/SavanaClutter3.iob rename to objects/savanna-clutter/SavanaClutter3.iob diff --git a/objects/clutter/savanna-clutter/SavanaClutter4.iob b/objects/savanna-clutter/SavanaClutter4.iob similarity index 100% rename from objects/clutter/savanna-clutter/SavanaClutter4.iob rename to objects/savanna-clutter/SavanaClutter4.iob diff --git a/objects/clutter/savanna-clutter/SavanaClutter5.iob b/objects/savanna-clutter/SavanaClutter5.iob similarity index 100% rename from objects/clutter/savanna-clutter/SavanaClutter5.iob rename to objects/savanna-clutter/SavanaClutter5.iob diff --git a/objects/clutter/savanna-clutter/SavanaClutter6.iob b/objects/savanna-clutter/SavanaClutter6.iob similarity index 100% rename from objects/clutter/savanna-clutter/SavanaClutter6.iob rename to objects/savanna-clutter/SavanaClutter6.iob diff --git a/objects/clutter/savanna-clutter/SavanaClutter7.iob b/objects/savanna-clutter/SavanaClutter7.iob similarity index 100% rename from objects/clutter/savanna-clutter/SavanaClutter7.iob rename to objects/savanna-clutter/SavanaClutter7.iob diff --git a/objects/clutter/savanna-clutter/SavanaClutter8.iob b/objects/savanna-clutter/SavanaClutter8.iob similarity index 100% rename from objects/clutter/savanna-clutter/SavanaClutter8.iob rename to objects/savanna-clutter/SavanaClutter8.iob diff --git a/objects/trees/acacia/savannaD1.iob b/objects/savanna-gen/savannaD-1.iob similarity index 100% rename from objects/trees/acacia/savannaD1.iob rename to objects/savanna-gen/savannaD-1.iob diff --git a/objects/trees/acacia/savannaD2.iob b/objects/savanna-gen/savannaD-2.iob similarity index 100% rename from objects/trees/acacia/savannaD2.iob rename to objects/savanna-gen/savannaD-2.iob diff --git a/objects/trees/acacia/savannaD3.iob b/objects/savanna-gen/savannaD-3.iob similarity index 100% rename from objects/trees/acacia/savannaD3.iob rename to objects/savanna-gen/savannaD-3.iob diff --git a/objects/trees/acacia/savannaF1.iob b/objects/savanna-gen/savannaF-1.iob similarity index 100% rename from objects/trees/acacia/savannaF1.iob rename to objects/savanna-gen/savannaF-1.iob diff --git a/objects/trees/acacia/savannaF10.iob b/objects/savanna-gen/savannaF-10.iob similarity index 100% rename from objects/trees/acacia/savannaF10.iob rename to objects/savanna-gen/savannaF-10.iob diff --git a/objects/trees/acacia/savannaF11.iob b/objects/savanna-gen/savannaF-11.iob similarity index 100% rename from objects/trees/acacia/savannaF11.iob rename to objects/savanna-gen/savannaF-11.iob diff --git a/objects/trees/acacia/savannaF13.iob b/objects/savanna-gen/savannaF-13.iob similarity index 100% rename from objects/trees/acacia/savannaF13.iob rename to objects/savanna-gen/savannaF-13.iob diff --git a/objects/trees/acacia/savannaF14.iob b/objects/savanna-gen/savannaF-14.iob similarity index 100% rename from objects/trees/acacia/savannaF14.iob rename to objects/savanna-gen/savannaF-14.iob diff --git a/objects/trees/acacia/savannaF15.iob b/objects/savanna-gen/savannaF-15.iob similarity index 100% rename from objects/trees/acacia/savannaF15.iob rename to objects/savanna-gen/savannaF-15.iob diff --git a/objects/trees/acacia/savannaF16.iob b/objects/savanna-gen/savannaF-16.iob similarity index 100% rename from objects/trees/acacia/savannaF16.iob rename to objects/savanna-gen/savannaF-16.iob diff --git a/objects/trees/acacia/savannaF17.iob b/objects/savanna-gen/savannaF-17.iob similarity index 100% rename from objects/trees/acacia/savannaF17.iob rename to objects/savanna-gen/savannaF-17.iob diff --git a/objects/trees/acacia/savannaF2.iob b/objects/savanna-gen/savannaF-2.iob similarity index 100% rename from objects/trees/acacia/savannaF2.iob rename to objects/savanna-gen/savannaF-2.iob diff --git a/objects/trees/acacia/savannaF3.iob b/objects/savanna-gen/savannaF-3.iob similarity index 100% rename from objects/trees/acacia/savannaF3.iob rename to objects/savanna-gen/savannaF-3.iob diff --git a/objects/trees/acacia/savannaF4.iob b/objects/savanna-gen/savannaF-4.iob similarity index 100% rename from objects/trees/acacia/savannaF4.iob rename to objects/savanna-gen/savannaF-4.iob diff --git a/objects/trees/acacia/savannaF5.iob b/objects/savanna-gen/savannaF-5.iob similarity index 100% rename from objects/trees/acacia/savannaF5.iob rename to objects/savanna-gen/savannaF-5.iob diff --git a/objects/trees/acacia/savannaF6.iob b/objects/savanna-gen/savannaF-6.iob similarity index 100% rename from objects/trees/acacia/savannaF6.iob rename to objects/savanna-gen/savannaF-6.iob diff --git a/objects/trees/acacia/savannaF7.iob b/objects/savanna-gen/savannaF-7.iob similarity index 100% rename from objects/trees/acacia/savannaF7.iob rename to objects/savanna-gen/savannaF-7.iob diff --git a/objects/trees/acacia/savannaF8.iob b/objects/savanna-gen/savannaF-8.iob similarity index 100% rename from objects/trees/acacia/savannaF8.iob rename to objects/savanna-gen/savannaF-8.iob diff --git a/objects/trees/acacia/savannaF9.iob b/objects/savanna-gen/savannaF-9.iob similarity index 100% rename from objects/trees/acacia/savannaF9.iob rename to objects/savanna-gen/savannaF-9.iob diff --git a/objects/trees/acacia/savannaS1.iob b/objects/savanna-gen/savannaS-1.iob similarity index 100% rename from objects/trees/acacia/savannaS1.iob rename to objects/savanna-gen/savannaS-1.iob diff --git a/objects/trees/acacia/savannaS2.iob b/objects/savanna-gen/savannaS-2.iob similarity index 100% rename from objects/trees/acacia/savannaS2.iob rename to objects/savanna-gen/savannaS-2.iob diff --git a/objects/trees/acacia/savannaS3.iob b/objects/savanna-gen/savannaS-3.iob similarity index 100% rename from objects/trees/acacia/savannaS3.iob rename to objects/savanna-gen/savannaS-3.iob diff --git a/objects/trees/acacia/savannaS4.iob b/objects/savanna-gen/savannaS-4.iob similarity index 100% rename from objects/trees/acacia/savannaS4.iob rename to objects/savanna-gen/savannaS-4.iob diff --git a/objects/trees/acacia/savannaS5.iob b/objects/savanna-gen/savannaS-5.iob similarity index 100% rename from objects/trees/acacia/savannaS5.iob rename to objects/savanna-gen/savannaS-5.iob diff --git a/objects/trees/acacia/savannaS6.iob b/objects/savanna-gen/savannaS-6.iob similarity index 100% rename from objects/trees/acacia/savannaS6.iob rename to objects/savanna-gen/savannaS-6.iob diff --git a/objects/trees/acacia/savannaS7.iob b/objects/savanna-gen/savannaS-7.iob similarity index 100% rename from objects/trees/acacia/savannaS7.iob rename to objects/savanna-gen/savannaS-7.iob diff --git a/objects/trees/acacia/savannaS8.iob b/objects/savanna-gen/savannaS-8.iob similarity index 100% rename from objects/trees/acacia/savannaS8.iob rename to objects/savanna-gen/savannaS-8.iob diff --git a/objects/trees/acacia/savannas10.iob b/objects/savanna-gen/savannas-10.iob similarity index 100% rename from objects/trees/acacia/savannas10.iob rename to objects/savanna-gen/savannas-10.iob diff --git a/objects/trees/acacia/savannas11.iob b/objects/savanna-gen/savannas-11.iob similarity index 100% rename from objects/trees/acacia/savannas11.iob rename to objects/savanna-gen/savannas-11.iob diff --git a/objects/trees/acacia/savannas12.iob b/objects/savanna-gen/savannas-12.iob similarity index 100% rename from objects/trees/acacia/savannas12.iob rename to objects/savanna-gen/savannas-12.iob diff --git a/objects/trees/acacia/savannas9.iob b/objects/savanna-gen/savannas-9.iob similarity index 100% rename from objects/trees/acacia/savannas9.iob rename to objects/savanna-gen/savannas-9.iob diff --git a/objects/clutter/savanna-rock/SavanaRock1.iob b/objects/savanna-rock/SavanaRock1.iob similarity index 100% rename from objects/clutter/savanna-rock/SavanaRock1.iob rename to objects/savanna-rock/SavanaRock1.iob diff --git a/objects/clutter/savanna-rock/SavanaRock2.iob b/objects/savanna-rock/SavanaRock2.iob similarity index 100% rename from objects/clutter/savanna-rock/SavanaRock2.iob rename to objects/savanna-rock/SavanaRock2.iob diff --git a/objects/clutter/savanna-rock/SavanaRock3.iob b/objects/savanna-rock/SavanaRock3.iob similarity index 100% rename from objects/clutter/savanna-rock/SavanaRock3.iob rename to objects/savanna-rock/SavanaRock3.iob diff --git a/objects/clutter/savanna-rock/SavanaRock4.iob b/objects/savanna-rock/SavanaRock4.iob similarity index 100% rename from objects/clutter/savanna-rock/SavanaRock4.iob rename to objects/savanna-rock/SavanaRock4.iob diff --git a/objects/clutter/savanna-rock/SavanaRock5.iob b/objects/savanna-rock/SavanaRock5.iob similarity index 100% rename from objects/clutter/savanna-rock/SavanaRock5.iob rename to objects/savanna-rock/SavanaRock5.iob diff --git a/objects/clutter/savanna-rock/SavanaRock6.iob b/objects/savanna-rock/SavanaRock6.iob similarity index 100% rename from objects/clutter/savanna-rock/SavanaRock6.iob rename to objects/savanna-rock/SavanaRock6.iob diff --git a/objects/clutter/savanna-rock/SavanaRock7.iob b/objects/savanna-rock/SavanaRock7.iob similarity index 100% rename from objects/clutter/savanna-rock/SavanaRock7.iob rename to objects/savanna-rock/SavanaRock7.iob diff --git a/objects/clutter/savanna-rock/SavanaRock8.iob b/objects/savanna-rock/SavanaRock8.iob similarity index 100% rename from objects/clutter/savanna-rock/SavanaRock8.iob rename to objects/savanna-rock/SavanaRock8.iob diff --git a/objects/trees/acacia/thin1.iob b/objects/savanna-small/SavanaNimble1.iob similarity index 100% rename from objects/trees/acacia/thin1.iob rename to objects/savanna-small/SavanaNimble1.iob diff --git a/objects/trees/acacia/thin10.iob b/objects/savanna-small/SavanaNimble10.iob similarity index 100% rename from objects/trees/acacia/thin10.iob rename to objects/savanna-small/SavanaNimble10.iob diff --git a/objects/trees/acacia/thin11.iob b/objects/savanna-small/SavanaNimble11.iob similarity index 100% rename from objects/trees/acacia/thin11.iob rename to objects/savanna-small/SavanaNimble11.iob diff --git a/objects/trees/acacia/thin12.iob b/objects/savanna-small/SavanaNimble12.iob similarity index 100% rename from objects/trees/acacia/thin12.iob rename to objects/savanna-small/SavanaNimble12.iob diff --git a/objects/trees/acacia/thin13.iob b/objects/savanna-small/SavanaNimble13.iob similarity index 100% rename from objects/trees/acacia/thin13.iob rename to objects/savanna-small/SavanaNimble13.iob diff --git a/objects/trees/acacia/thin14.iob b/objects/savanna-small/SavanaNimble14.iob similarity index 100% rename from objects/trees/acacia/thin14.iob rename to objects/savanna-small/SavanaNimble14.iob diff --git a/objects/trees/acacia/thin15.iob b/objects/savanna-small/SavanaNimble15.iob similarity index 100% rename from objects/trees/acacia/thin15.iob rename to objects/savanna-small/SavanaNimble15.iob diff --git a/objects/trees/acacia/thin16.iob b/objects/savanna-small/SavanaNimble16.iob similarity index 100% rename from objects/trees/acacia/thin16.iob rename to objects/savanna-small/SavanaNimble16.iob diff --git a/objects/trees/acacia/thin2.iob b/objects/savanna-small/SavanaNimble2.iob similarity index 100% rename from objects/trees/acacia/thin2.iob rename to objects/savanna-small/SavanaNimble2.iob diff --git a/objects/trees/acacia/thin3.iob b/objects/savanna-small/SavanaNimble3.iob similarity index 100% rename from objects/trees/acacia/thin3.iob rename to objects/savanna-small/SavanaNimble3.iob diff --git a/objects/trees/acacia/thin4.iob b/objects/savanna-small/SavanaNimble4.iob similarity index 100% rename from objects/trees/acacia/thin4.iob rename to objects/savanna-small/SavanaNimble4.iob diff --git a/objects/trees/acacia/thin5.iob b/objects/savanna-small/SavanaNimble5.iob similarity index 100% rename from objects/trees/acacia/thin5.iob rename to objects/savanna-small/SavanaNimble5.iob diff --git a/objects/trees/acacia/thin6.iob b/objects/savanna-small/SavanaNimble6.iob similarity index 100% rename from objects/trees/acacia/thin6.iob rename to objects/savanna-small/SavanaNimble6.iob diff --git a/objects/trees/acacia/thin7.iob b/objects/savanna-small/SavanaNimble7.iob similarity index 100% rename from objects/trees/acacia/thin7.iob rename to objects/savanna-small/SavanaNimble7.iob diff --git a/objects/trees/acacia/thin8.iob b/objects/savanna-small/SavanaNimble8.iob similarity index 100% rename from objects/trees/acacia/thin8.iob rename to objects/savanna-small/SavanaNimble8.iob diff --git a/objects/trees/acacia/thin9.iob b/objects/savanna-small/SavanaNimble9.iob similarity index 100% rename from objects/trees/acacia/thin9.iob rename to objects/savanna-small/SavanaNimble9.iob diff --git a/objects/trees/acacia/savana1.iob b/objects/savanna/SavanaTree1.iob similarity index 100% rename from objects/trees/acacia/savana1.iob rename to objects/savanna/SavanaTree1.iob diff --git a/objects/trees/acacia/savana2.iob b/objects/savanna/SavanaTree2.iob similarity index 100% rename from objects/trees/acacia/savana2.iob rename to objects/savanna/SavanaTree2.iob diff --git a/objects/trees/acacia/savana3.iob b/objects/savanna/SavanaTree3.iob similarity index 100% rename from objects/trees/acacia/savana3.iob rename to objects/savanna/SavanaTree3.iob diff --git a/objects/trees/acacia/savana4.iob b/objects/savanna/SavanaTree4.iob similarity index 100% rename from objects/trees/acacia/savana4.iob rename to objects/savanna/SavanaTree4.iob diff --git a/objects/trees/acacia/savana5.iob b/objects/savanna/SavanaTree5.iob similarity index 100% rename from objects/trees/acacia/savana5.iob rename to objects/savanna/SavanaTree5.iob diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed1.iob b/objects/serrulata-bleeding-alt/ableed1.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-alt/ableed1.iob rename to objects/serrulata-bleeding-alt/ableed1.iob diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed10.iob b/objects/serrulata-bleeding-alt/ableed10.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-alt/ableed10.iob rename to objects/serrulata-bleeding-alt/ableed10.iob diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed2.iob b/objects/serrulata-bleeding-alt/ableed2.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-alt/ableed2.iob rename to objects/serrulata-bleeding-alt/ableed2.iob diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed3.iob b/objects/serrulata-bleeding-alt/ableed3.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-alt/ableed3.iob rename to objects/serrulata-bleeding-alt/ableed3.iob diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed4.iob b/objects/serrulata-bleeding-alt/ableed4.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-alt/ableed4.iob rename to objects/serrulata-bleeding-alt/ableed4.iob diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed5.iob b/objects/serrulata-bleeding-alt/ableed5.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-alt/ableed5.iob rename to objects/serrulata-bleeding-alt/ableed5.iob diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed6.iob b/objects/serrulata-bleeding-alt/ableed6.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-alt/ableed6.iob rename to objects/serrulata-bleeding-alt/ableed6.iob diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed7.iob b/objects/serrulata-bleeding-alt/ableed7.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-alt/ableed7.iob rename to objects/serrulata-bleeding-alt/ableed7.iob diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed8.iob b/objects/serrulata-bleeding-alt/ableed8.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-alt/ableed8.iob rename to objects/serrulata-bleeding-alt/ableed8.iob diff --git a/objects/trees/mixed/serrulata-bleeding-alt/ableed9.iob b/objects/serrulata-bleeding-alt/ableed9.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-alt/ableed9.iob rename to objects/serrulata-bleeding-alt/ableed9.iob diff --git a/objects/trees/mixed/serrulata-bleeding-large/T-bleed1.iob b/objects/serrulata-bleeding-large/T-bleed1.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-large/T-bleed1.iob rename to objects/serrulata-bleeding-large/T-bleed1.iob diff --git a/objects/trees/mixed/serrulata-bleeding-large/T-bleed2.iob b/objects/serrulata-bleeding-large/T-bleed2.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-large/T-bleed2.iob rename to objects/serrulata-bleeding-large/T-bleed2.iob diff --git a/objects/trees/mixed/serrulata-bleeding-large/T-bleed3.iob b/objects/serrulata-bleeding-large/T-bleed3.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-large/T-bleed3.iob rename to objects/serrulata-bleeding-large/T-bleed3.iob diff --git a/objects/trees/mixed/serrulata-bleeding-large/T-bleed4.iob b/objects/serrulata-bleeding-large/T-bleed4.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-large/T-bleed4.iob rename to objects/serrulata-bleeding-large/T-bleed4.iob diff --git a/objects/trees/mixed/serrulata-bleeding-large/T-bleed5.iob b/objects/serrulata-bleeding-large/T-bleed5.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-large/T-bleed5.iob rename to objects/serrulata-bleeding-large/T-bleed5.iob diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed1.iob b/objects/serrulata-bleeding-medium/bleed1.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-medium/bleed1.iob rename to objects/serrulata-bleeding-medium/bleed1.iob diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed10.iob b/objects/serrulata-bleeding-medium/bleed10.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-medium/bleed10.iob rename to objects/serrulata-bleeding-medium/bleed10.iob diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed2.iob b/objects/serrulata-bleeding-medium/bleed2.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-medium/bleed2.iob rename to objects/serrulata-bleeding-medium/bleed2.iob diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed3.iob b/objects/serrulata-bleeding-medium/bleed3.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-medium/bleed3.iob rename to objects/serrulata-bleeding-medium/bleed3.iob diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed4.iob b/objects/serrulata-bleeding-medium/bleed4.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-medium/bleed4.iob rename to objects/serrulata-bleeding-medium/bleed4.iob diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed5.iob b/objects/serrulata-bleeding-medium/bleed5.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-medium/bleed5.iob rename to objects/serrulata-bleeding-medium/bleed5.iob diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed6.iob b/objects/serrulata-bleeding-medium/bleed6.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-medium/bleed6.iob rename to objects/serrulata-bleeding-medium/bleed6.iob diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed7.iob b/objects/serrulata-bleeding-medium/bleed7.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-medium/bleed7.iob rename to objects/serrulata-bleeding-medium/bleed7.iob diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed8.iob b/objects/serrulata-bleeding-medium/bleed8.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-medium/bleed8.iob rename to objects/serrulata-bleeding-medium/bleed8.iob diff --git a/objects/trees/mixed/serrulata-bleeding-medium/bleed9.iob b/objects/serrulata-bleeding-medium/bleed9.iob similarity index 100% rename from objects/trees/mixed/serrulata-bleeding-medium/bleed9.iob rename to objects/serrulata-bleeding-medium/bleed9.iob diff --git a/objects/trees/mixed/serrulata/nb-bleed1.iob b/objects/serrulata/nb-bleed1.iob similarity index 100% rename from objects/trees/mixed/serrulata/nb-bleed1.iob rename to objects/serrulata/nb-bleed1.iob diff --git a/objects/trees/mixed/serrulata/nb-bleed10.iob b/objects/serrulata/nb-bleed10.iob similarity index 100% rename from objects/trees/mixed/serrulata/nb-bleed10.iob rename to objects/serrulata/nb-bleed10.iob diff --git a/objects/trees/mixed/serrulata/nb-bleed2.iob b/objects/serrulata/nb-bleed2.iob similarity index 100% rename from objects/trees/mixed/serrulata/nb-bleed2.iob rename to objects/serrulata/nb-bleed2.iob diff --git a/objects/trees/mixed/serrulata/nb-bleed3.iob b/objects/serrulata/nb-bleed3.iob similarity index 100% rename from objects/trees/mixed/serrulata/nb-bleed3.iob rename to objects/serrulata/nb-bleed3.iob diff --git a/objects/trees/mixed/serrulata/nb-bleed4.iob b/objects/serrulata/nb-bleed4.iob similarity index 100% rename from objects/trees/mixed/serrulata/nb-bleed4.iob rename to objects/serrulata/nb-bleed4.iob diff --git a/objects/trees/mixed/serrulata/nb-bleed5.iob b/objects/serrulata/nb-bleed5.iob similarity index 100% rename from objects/trees/mixed/serrulata/nb-bleed5.iob rename to objects/serrulata/nb-bleed5.iob diff --git a/objects/trees/mixed/serrulata/nb-bleed6.iob b/objects/serrulata/nb-bleed6.iob similarity index 100% rename from objects/trees/mixed/serrulata/nb-bleed6.iob rename to objects/serrulata/nb-bleed6.iob diff --git a/objects/trees/mixed/serrulata/nb-bleed7.iob b/objects/serrulata/nb-bleed7.iob similarity index 100% rename from objects/trees/mixed/serrulata/nb-bleed7.iob rename to objects/serrulata/nb-bleed7.iob diff --git a/objects/trees/mixed/serrulata/nb-bleed8.iob b/objects/serrulata/nb-bleed8.iob similarity index 100% rename from objects/trees/mixed/serrulata/nb-bleed8.iob rename to objects/serrulata/nb-bleed8.iob diff --git a/objects/trees/mixed/serrulata/nb-bleed9.iob b/objects/serrulata/nb-bleed9.iob similarity index 100% rename from objects/trees/mixed/serrulata/nb-bleed9.iob rename to objects/serrulata/nb-bleed9.iob diff --git a/objects/clutter/shack/wornWorkshop.iob b/objects/shack/wornWorkshop.iob similarity index 100% rename from objects/clutter/shack/wornWorkshop.iob rename to objects/shack/wornWorkshop.iob diff --git a/objects/structures/ships/gall-1.iob b/objects/ships/gall-1.iob similarity index 100% rename from objects/structures/ships/gall-1.iob rename to objects/ships/gall-1.iob diff --git a/objects/structures/ships/gall-2.iob b/objects/ships/gall-2.iob similarity index 100% rename from objects/structures/ships/gall-2.iob rename to objects/ships/gall-2.iob diff --git a/objects/structures/ships/gall-3.iob b/objects/ships/gall-3.iob similarity index 100% rename from objects/structures/ships/gall-3.iob rename to objects/ships/gall-3.iob diff --git a/objects/structures/ships/generic-c.iob b/objects/ships/generic-c.iob similarity index 100% rename from objects/structures/ships/generic-c.iob rename to objects/ships/generic-c.iob diff --git a/objects/structures/ships/generic-g.iob b/objects/ships/generic-g.iob similarity index 100% rename from objects/structures/ships/generic-g.iob rename to objects/ships/generic-g.iob diff --git a/objects/structures/ships/generic-r.iob b/objects/ships/generic-r.iob similarity index 100% rename from objects/structures/ships/generic-r.iob rename to objects/ships/generic-r.iob diff --git a/objects/structures/ships/generic-u.iob b/objects/ships/generic-u.iob similarity index 100% rename from objects/structures/ships/generic-u.iob rename to objects/ships/generic-u.iob diff --git a/objects/structures/ships/generic-w.iob b/objects/ships/generic-w.iob similarity index 100% rename from objects/structures/ships/generic-w.iob rename to objects/ships/generic-w.iob diff --git a/objects/structures/ships/generic.iob b/objects/ships/generic.iob similarity index 100% rename from objects/structures/ships/generic.iob rename to objects/ships/generic.iob diff --git a/objects/structures/ships/ship-1.iob b/objects/ships/ship-1.iob similarity index 100% rename from objects/structures/ships/ship-1.iob rename to objects/ships/ship-1.iob diff --git a/objects/structures/ships/ship-2.iob b/objects/ships/ship-2.iob similarity index 100% rename from objects/structures/ships/ship-2.iob rename to objects/ships/ship-2.iob diff --git a/objects/structures/ships/swreck-1.iob b/objects/ships/swreck-1.iob similarity index 100% rename from objects/structures/ships/swreck-1.iob rename to objects/ships/swreck-1.iob diff --git a/objects/structures/ships/usd-ship-1.iob b/objects/ships/usd-ship-1.iob similarity index 100% rename from objects/structures/ships/usd-ship-1.iob rename to objects/ships/usd-ship-1.iob diff --git a/objects/structures/ships/usd-ship-2.iob b/objects/ships/usd-ship-2.iob similarity index 100% rename from objects/structures/ships/usd-ship-2.iob rename to objects/ships/usd-ship-2.iob diff --git a/objects/structures/shipwreck/rightsideup-backhalf-degraded.iob b/objects/shipwreck/rightsideup-backhalf-degraded.iob similarity index 100% rename from objects/structures/shipwreck/rightsideup-backhalf-degraded.iob rename to objects/shipwreck/rightsideup-backhalf-degraded.iob diff --git a/objects/structures/shipwreck/rightsideup-backhalf.iob b/objects/shipwreck/rightsideup-backhalf.iob similarity index 100% rename from objects/structures/shipwreck/rightsideup-backhalf.iob rename to objects/shipwreck/rightsideup-backhalf.iob diff --git a/objects/structures/shipwreck/rightsideup-fronthalf-degraded.iob b/objects/shipwreck/rightsideup-fronthalf-degraded.iob similarity index 100% rename from objects/structures/shipwreck/rightsideup-fronthalf-degraded.iob rename to objects/shipwreck/rightsideup-fronthalf-degraded.iob diff --git a/objects/structures/shipwreck/rightsideup-fronthalf.iob b/objects/shipwreck/rightsideup-fronthalf.iob similarity index 100% rename from objects/structures/shipwreck/rightsideup-fronthalf.iob rename to objects/shipwreck/rightsideup-fronthalf.iob diff --git a/objects/structures/shipwreck/rightsideup-full-degraded.iob b/objects/shipwreck/rightsideup-full-degraded.iob similarity index 100% rename from objects/structures/shipwreck/rightsideup-full-degraded.iob rename to objects/shipwreck/rightsideup-full-degraded.iob diff --git a/objects/structures/shipwreck/rightsideup-full.iob b/objects/shipwreck/rightsideup-full.iob similarity index 100% rename from objects/structures/shipwreck/rightsideup-full.iob rename to objects/shipwreck/rightsideup-full.iob diff --git a/objects/structures/shipwreck/sideways-backhalf-degraded.iob b/objects/shipwreck/sideways-backhalf-degraded.iob similarity index 100% rename from objects/structures/shipwreck/sideways-backhalf-degraded.iob rename to objects/shipwreck/sideways-backhalf-degraded.iob diff --git a/objects/structures/shipwreck/sideways-backhalf.iob b/objects/shipwreck/sideways-backhalf.iob similarity index 100% rename from objects/structures/shipwreck/sideways-backhalf.iob rename to objects/shipwreck/sideways-backhalf.iob diff --git a/objects/structures/shipwreck/sideways-fronthalf-degraded.iob b/objects/shipwreck/sideways-fronthalf-degraded.iob similarity index 100% rename from objects/structures/shipwreck/sideways-fronthalf-degraded.iob rename to objects/shipwreck/sideways-fronthalf-degraded.iob diff --git a/objects/structures/shipwreck/sideways-fronthalf.iob b/objects/shipwreck/sideways-fronthalf.iob similarity index 100% rename from objects/structures/shipwreck/sideways-fronthalf.iob rename to objects/shipwreck/sideways-fronthalf.iob diff --git a/objects/structures/shipwreck/sideways-full-degraded.iob b/objects/shipwreck/sideways-full-degraded.iob similarity index 100% rename from objects/structures/shipwreck/sideways-full-degraded.iob rename to objects/shipwreck/sideways-full-degraded.iob diff --git a/objects/structures/shipwreck/sideways-full.iob b/objects/shipwreck/sideways-full.iob similarity index 100% rename from objects/structures/shipwreck/sideways-full.iob rename to objects/shipwreck/sideways-full.iob diff --git a/objects/structures/shipwreck/upsidedown-backhalf-degraded.iob b/objects/shipwreck/upsidedown-backhalf-degraded.iob similarity index 100% rename from objects/structures/shipwreck/upsidedown-backhalf-degraded.iob rename to objects/shipwreck/upsidedown-backhalf-degraded.iob diff --git a/objects/structures/shipwreck/upsidedown-backhalf.iob b/objects/shipwreck/upsidedown-backhalf.iob similarity index 100% rename from objects/structures/shipwreck/upsidedown-backhalf.iob rename to objects/shipwreck/upsidedown-backhalf.iob diff --git a/objects/structures/shipwreck/upsidedown-fronthalf-degraded.iob b/objects/shipwreck/upsidedown-fronthalf-degraded.iob similarity index 100% rename from objects/structures/shipwreck/upsidedown-fronthalf-degraded.iob rename to objects/shipwreck/upsidedown-fronthalf-degraded.iob diff --git a/objects/structures/shipwreck/upsidedown-fronthalf.iob b/objects/shipwreck/upsidedown-fronthalf.iob similarity index 100% rename from objects/structures/shipwreck/upsidedown-fronthalf.iob rename to objects/shipwreck/upsidedown-fronthalf.iob diff --git a/objects/structures/shipwreck/upsidedown-full-degraded.iob b/objects/shipwreck/upsidedown-full-degraded.iob similarity index 100% rename from objects/structures/shipwreck/upsidedown-full-degraded.iob rename to objects/shipwreck/upsidedown-full-degraded.iob diff --git a/objects/structures/shipwreck/upsidedown-full.iob b/objects/shipwreck/upsidedown-full.iob similarity index 100% rename from objects/structures/shipwreck/upsidedown-full.iob rename to objects/shipwreck/upsidedown-full.iob diff --git a/objects/structures/shipwreck/with-mast-degraded.iob b/objects/shipwreck/with-mast-degraded.iob similarity index 100% rename from objects/structures/shipwreck/with-mast-degraded.iob rename to objects/shipwreck/with-mast-degraded.iob diff --git a/objects/structures/shipwreck/with-mast.iob b/objects/shipwreck/with-mast.iob similarity index 100% rename from objects/structures/shipwreck/with-mast.iob rename to objects/shipwreck/with-mast.iob diff --git a/objects/trees/mushroom/smolshroom1.iob b/objects/shroom/mushclutt1.iob similarity index 100% rename from objects/trees/mushroom/smolshroom1.iob rename to objects/shroom/mushclutt1.iob diff --git a/objects/trees/mushroom/smolshroom2.iob b/objects/shroom/mushclutt2.iob similarity index 100% rename from objects/trees/mushroom/smolshroom2.iob rename to objects/shroom/mushclutt2.iob diff --git a/objects/trees/mushroom/smolshroom3.iob b/objects/shroom/mushclutt3.iob similarity index 100% rename from objects/trees/mushroom/smolshroom3.iob rename to objects/shroom/mushclutt3.iob diff --git a/objects/trees/mushroom/smolshroom4.iob b/objects/shroom/mushclutt4.iob similarity index 100% rename from objects/trees/mushroom/smolshroom4.iob rename to objects/shroom/mushclutt4.iob diff --git a/objects/trees/mushroom/smolshroom5.iob b/objects/shroom/mushclutt5.iob similarity index 100% rename from objects/trees/mushroom/smolshroom5.iob rename to objects/shroom/mushclutt5.iob diff --git a/objects/clutter/shrub/shrub1.iob b/objects/shrub/shrub1.iob similarity index 100% rename from objects/clutter/shrub/shrub1.iob rename to objects/shrub/shrub1.iob diff --git a/objects/clutter/shrub/shrub2.iob b/objects/shrub/shrub2.iob similarity index 100% rename from objects/clutter/shrub/shrub2.iob rename to objects/shrub/shrub2.iob diff --git a/objects/clutter/shrub/shrub3.iob b/objects/shrub/shrub3.iob similarity index 100% rename from objects/clutter/shrub/shrub3.iob rename to objects/shrub/shrub3.iob diff --git a/objects/clutter/skulls/giant-skull.iob b/objects/skulls/giant-skull.iob similarity index 100% rename from objects/clutter/skulls/giant-skull.iob rename to objects/skulls/giant-skull.iob diff --git a/objects/trees/mixed/sm-tree/oakw-oakl-160.iob b/objects/sm-tree/oakw-oakl-160.iob similarity index 100% rename from objects/trees/mixed/sm-tree/oakw-oakl-160.iob rename to objects/sm-tree/oakw-oakl-160.iob diff --git a/objects/trees/mixed/sm-tree/oakw-oakl-80.iob b/objects/sm-tree/oakw-oakl-80.iob similarity index 100% rename from objects/trees/mixed/sm-tree/oakw-oakl-80.iob rename to objects/sm-tree/oakw-oakl-80.iob diff --git a/objects/trees/mixed/sm-tree/oakw-oakl.iob b/objects/sm-tree/oakw-oakl.iob similarity index 100% rename from objects/trees/mixed/sm-tree/oakw-oakl.iob rename to objects/sm-tree/oakw-oakl.iob diff --git a/objects/trees/birch/smallgeneric1.iob b/objects/small-birch/small-birch1.iob similarity index 100% rename from objects/trees/birch/smallgeneric1.iob rename to objects/small-birch/small-birch1.iob diff --git a/objects/trees/birch/smallgeneric2.iob b/objects/small-birch/small-birch10.iob similarity index 100% rename from objects/trees/birch/smallgeneric2.iob rename to objects/small-birch/small-birch10.iob diff --git a/objects/trees/birch/smallgeneric3.iob b/objects/small-birch/small-birch11.iob similarity index 100% rename from objects/trees/birch/smallgeneric3.iob rename to objects/small-birch/small-birch11.iob diff --git a/objects/trees/birch/smallgeneric4.iob b/objects/small-birch/small-birch2.iob similarity index 100% rename from objects/trees/birch/smallgeneric4.iob rename to objects/small-birch/small-birch2.iob diff --git a/objects/trees/birch/smallgeneric5.iob b/objects/small-birch/small-birch3.iob similarity index 100% rename from objects/trees/birch/smallgeneric5.iob rename to objects/small-birch/small-birch3.iob diff --git a/objects/trees/birch/smallgeneric6.iob b/objects/small-birch/small-birch4.iob similarity index 100% rename from objects/trees/birch/smallgeneric6.iob rename to objects/small-birch/small-birch4.iob diff --git a/objects/trees/birch/smallgeneric7.iob b/objects/small-birch/small-birch5.iob similarity index 100% rename from objects/trees/birch/smallgeneric7.iob rename to objects/small-birch/small-birch5.iob diff --git a/objects/trees/birch/smallgeneric8.iob b/objects/small-birch/small-birch6.iob similarity index 100% rename from objects/trees/birch/smallgeneric8.iob rename to objects/small-birch/small-birch6.iob diff --git a/objects/trees/birch/smallgeneric9.iob b/objects/small-birch/small-birch7.iob similarity index 100% rename from objects/trees/birch/smallgeneric9.iob rename to objects/small-birch/small-birch7.iob diff --git a/objects/trees/birch/smallgeneric10.iob b/objects/small-birch/small-birch8.iob similarity index 100% rename from objects/trees/birch/smallgeneric10.iob rename to objects/small-birch/small-birch8.iob diff --git a/objects/trees/birch/smallgeneric11.iob b/objects/small-birch/small-birch9.iob similarity index 100% rename from objects/trees/birch/smallgeneric11.iob rename to objects/small-birch/small-birch9.iob diff --git a/objects/trees/oak/smoak2.iob b/objects/small-oak/small-oak1.iob similarity index 100% rename from objects/trees/oak/smoak2.iob rename to objects/small-oak/small-oak1.iob diff --git a/objects/trees/oak/smoak13.iob b/objects/small-oak/small-oak10.iob similarity index 100% rename from objects/trees/oak/smoak13.iob rename to objects/small-oak/small-oak10.iob diff --git a/objects/trees/oak/smoak15.iob b/objects/small-oak/small-oak11.iob similarity index 100% rename from objects/trees/oak/smoak15.iob rename to objects/small-oak/small-oak11.iob diff --git a/objects/trees/oak/smoak16.iob b/objects/small-oak/small-oak12.iob similarity index 100% rename from objects/trees/oak/smoak16.iob rename to objects/small-oak/small-oak12.iob diff --git a/objects/trees/oak/smoak17.iob b/objects/small-oak/small-oak13.iob similarity index 100% rename from objects/trees/oak/smoak17.iob rename to objects/small-oak/small-oak13.iob diff --git a/objects/trees/oak/smoak18.iob b/objects/small-oak/small-oak14.iob similarity index 100% rename from objects/trees/oak/smoak18.iob rename to objects/small-oak/small-oak14.iob diff --git a/objects/trees/oak/smoak19.iob b/objects/small-oak/small-oak15.iob similarity index 100% rename from objects/trees/oak/smoak19.iob rename to objects/small-oak/small-oak15.iob diff --git a/objects/trees/oak/smoak20.iob b/objects/small-oak/small-oak16.iob similarity index 100% rename from objects/trees/oak/smoak20.iob rename to objects/small-oak/small-oak16.iob diff --git a/objects/trees/oak/smoak21.iob b/objects/small-oak/small-oak17.iob similarity index 100% rename from objects/trees/oak/smoak21.iob rename to objects/small-oak/small-oak17.iob diff --git a/objects/trees/oak/smoak3.iob b/objects/small-oak/small-oak18.iob similarity index 100% rename from objects/trees/oak/smoak3.iob rename to objects/small-oak/small-oak18.iob diff --git a/objects/trees/oak/smoak4.iob b/objects/small-oak/small-oak19.iob similarity index 100% rename from objects/trees/oak/smoak4.iob rename to objects/small-oak/small-oak19.iob diff --git a/objects/trees/oak/smoak5.iob b/objects/small-oak/small-oak2.iob similarity index 100% rename from objects/trees/oak/smoak5.iob rename to objects/small-oak/small-oak2.iob diff --git a/objects/trees/oak/smoak6.iob b/objects/small-oak/small-oak20.iob similarity index 100% rename from objects/trees/oak/smoak6.iob rename to objects/small-oak/small-oak20.iob diff --git a/objects/trees/oak/smoak7.iob b/objects/small-oak/small-oak3.iob similarity index 100% rename from objects/trees/oak/smoak7.iob rename to objects/small-oak/small-oak3.iob diff --git a/objects/trees/oak/smoak8.iob b/objects/small-oak/small-oak4.iob similarity index 100% rename from objects/trees/oak/smoak8.iob rename to objects/small-oak/small-oak4.iob diff --git a/objects/trees/oak/smoak9.iob b/objects/small-oak/small-oak5.iob similarity index 100% rename from objects/trees/oak/smoak9.iob rename to objects/small-oak/small-oak5.iob diff --git a/objects/trees/oak/smoak10.iob b/objects/small-oak/small-oak6.iob similarity index 100% rename from objects/trees/oak/smoak10.iob rename to objects/small-oak/small-oak6.iob diff --git a/objects/trees/oak/smoak11.iob b/objects/small-oak/small-oak7.iob similarity index 100% rename from objects/trees/oak/smoak11.iob rename to objects/small-oak/small-oak7.iob diff --git a/objects/trees/oak/smoak12.iob b/objects/small-oak/small-oak8.iob similarity index 100% rename from objects/trees/oak/smoak12.iob rename to objects/small-oak/small-oak8.iob diff --git a/objects/trees/oak/smoak14.iob b/objects/small-oak/small-oak9.iob similarity index 100% rename from objects/trees/oak/smoak14.iob rename to objects/small-oak/small-oak9.iob diff --git a/objects/structures/snowulder.iob b/objects/snowy/snowulder.iob similarity index 100% rename from objects/structures/snowulder.iob rename to objects/snowy/snowulder.iob diff --git a/objects/clutter/spire-ice-medium/IceSpire4.iob b/objects/spire-ice-medium/IceSpire4.iob similarity index 100% rename from objects/clutter/spire-ice-medium/IceSpire4.iob rename to objects/spire-ice-medium/IceSpire4.iob diff --git a/objects/clutter/spire-ice-medium/IceSpire5.iob b/objects/spire-ice-medium/IceSpire5.iob similarity index 100% rename from objects/clutter/spire-ice-medium/IceSpire5.iob rename to objects/spire-ice-medium/IceSpire5.iob diff --git a/objects/clutter/spire-ice-medium/IceSpire6.iob b/objects/spire-ice-medium/IceSpire6.iob similarity index 100% rename from objects/clutter/spire-ice-medium/IceSpire6.iob rename to objects/spire-ice-medium/IceSpire6.iob diff --git a/objects/clutter/spire-ice-small/IceSpire1.iob b/objects/spire-ice-small/IceSpire1.iob similarity index 100% rename from objects/clutter/spire-ice-small/IceSpire1.iob rename to objects/spire-ice-small/IceSpire1.iob diff --git a/objects/clutter/spire-ice-small/IceSpire2.iob b/objects/spire-ice-small/IceSpire2.iob similarity index 100% rename from objects/clutter/spire-ice-small/IceSpire2.iob rename to objects/spire-ice-small/IceSpire2.iob diff --git a/objects/clutter/spire-ice-small/IceSpire3.iob b/objects/spire-ice-small/IceSpire3.iob similarity index 100% rename from objects/clutter/spire-ice-small/IceSpire3.iob rename to objects/spire-ice-small/IceSpire3.iob diff --git a/objects/clutter/spire-magma/MagmaSpire1.iob b/objects/spire-magma/MagmaSpire1.iob similarity index 100% rename from objects/clutter/spire-magma/MagmaSpire1.iob rename to objects/spire-magma/MagmaSpire1.iob diff --git a/objects/clutter/spire-magma/MagmaSpire2.iob b/objects/spire-magma/MagmaSpire2.iob similarity index 100% rename from objects/clutter/spire-magma/MagmaSpire2.iob rename to objects/spire-magma/MagmaSpire2.iob diff --git a/objects/clutter/spire-magma/MagmaSpire3.iob b/objects/spire-magma/MagmaSpire3.iob similarity index 100% rename from objects/clutter/spire-magma/MagmaSpire3.iob rename to objects/spire-magma/MagmaSpire3.iob diff --git a/objects/trees/spruce/genericdead1.iob b/objects/spruce-dead/spruce_dead1.iob similarity index 100% rename from objects/trees/spruce/genericdead1.iob rename to objects/spruce-dead/spruce_dead1.iob diff --git a/objects/trees/spruce/genericdead2.iob b/objects/spruce-dead/spruce_dead2.iob similarity index 100% rename from objects/trees/spruce/genericdead2.iob rename to objects/spruce-dead/spruce_dead2.iob diff --git a/objects/trees/spruce/genericdead3.iob b/objects/spruce-dead/spruce_dead3.iob similarity index 100% rename from objects/trees/spruce/genericdead3.iob rename to objects/spruce-dead/spruce_dead3.iob diff --git a/objects/trees/spruce/denmyre1.iob b/objects/spruce-medium/spruce-denmyre-1.iob similarity index 100% rename from objects/trees/spruce/denmyre1.iob rename to objects/spruce-medium/spruce-denmyre-1.iob diff --git a/objects/trees/spruce/denmyre2.iob b/objects/spruce-medium/spruce-denmyre-10.iob similarity index 100% rename from objects/trees/spruce/denmyre2.iob rename to objects/spruce-medium/spruce-denmyre-10.iob diff --git a/objects/trees/spruce/denmyre3.iob b/objects/spruce-medium/spruce-denmyre-11.iob similarity index 100% rename from objects/trees/spruce/denmyre3.iob rename to objects/spruce-medium/spruce-denmyre-11.iob diff --git a/objects/trees/spruce/denmyre4.iob b/objects/spruce-medium/spruce-denmyre-12.iob similarity index 100% rename from objects/trees/spruce/denmyre4.iob rename to objects/spruce-medium/spruce-denmyre-12.iob diff --git a/objects/trees/spruce/denmyre5.iob b/objects/spruce-medium/spruce-denmyre-13.iob similarity index 100% rename from objects/trees/spruce/denmyre5.iob rename to objects/spruce-medium/spruce-denmyre-13.iob diff --git a/objects/trees/spruce/denmyre6.iob b/objects/spruce-medium/spruce-denmyre-14.iob similarity index 100% rename from objects/trees/spruce/denmyre6.iob rename to objects/spruce-medium/spruce-denmyre-14.iob diff --git a/objects/trees/spruce/denmyre7.iob b/objects/spruce-medium/spruce-denmyre-15.iob similarity index 100% rename from objects/trees/spruce/denmyre7.iob rename to objects/spruce-medium/spruce-denmyre-15.iob diff --git a/objects/trees/spruce/denmyre8.iob b/objects/spruce-medium/spruce-denmyre-16.iob similarity index 100% rename from objects/trees/spruce/denmyre8.iob rename to objects/spruce-medium/spruce-denmyre-16.iob diff --git a/objects/trees/spruce/denmyre9.iob b/objects/spruce-medium/spruce-denmyre-2.iob similarity index 100% rename from objects/trees/spruce/denmyre9.iob rename to objects/spruce-medium/spruce-denmyre-2.iob diff --git a/objects/trees/spruce/denmyre10.iob b/objects/spruce-medium/spruce-denmyre-3.iob similarity index 100% rename from objects/trees/spruce/denmyre10.iob rename to objects/spruce-medium/spruce-denmyre-3.iob diff --git a/objects/trees/spruce/denmyre11.iob b/objects/spruce-medium/spruce-denmyre-4.iob similarity index 100% rename from objects/trees/spruce/denmyre11.iob rename to objects/spruce-medium/spruce-denmyre-4.iob diff --git a/objects/trees/spruce/denmyre12.iob b/objects/spruce-medium/spruce-denmyre-5.iob similarity index 100% rename from objects/trees/spruce/denmyre12.iob rename to objects/spruce-medium/spruce-denmyre-5.iob diff --git a/objects/trees/spruce/denmyre13.iob b/objects/spruce-medium/spruce-denmyre-6.iob similarity index 100% rename from objects/trees/spruce/denmyre13.iob rename to objects/spruce-medium/spruce-denmyre-6.iob diff --git a/objects/trees/spruce/denmyre14.iob b/objects/spruce-medium/spruce-denmyre-7.iob similarity index 100% rename from objects/trees/spruce/denmyre14.iob rename to objects/spruce-medium/spruce-denmyre-7.iob diff --git a/objects/trees/spruce/denmyre15.iob b/objects/spruce-medium/spruce-denmyre-8.iob similarity index 100% rename from objects/trees/spruce/denmyre15.iob rename to objects/spruce-medium/spruce-denmyre-8.iob diff --git a/objects/trees/spruce/denmyre16.iob b/objects/spruce-medium/spruce-denmyre-9.iob similarity index 100% rename from objects/trees/spruce/denmyre16.iob rename to objects/spruce-medium/spruce-denmyre-9.iob diff --git a/objects/trees/spruce/vgeneric1.iob b/objects/spruce-medium/spruce1.iob similarity index 100% rename from objects/trees/spruce/vgeneric1.iob rename to objects/spruce-medium/spruce1.iob diff --git a/objects/trees/spruce/vgeneric2.iob b/objects/spruce-medium/spruce10.iob similarity index 100% rename from objects/trees/spruce/vgeneric2.iob rename to objects/spruce-medium/spruce10.iob diff --git a/objects/trees/spruce/vgeneric3.iob b/objects/spruce-medium/spruce11.iob similarity index 100% rename from objects/trees/spruce/vgeneric3.iob rename to objects/spruce-medium/spruce11.iob diff --git a/objects/trees/spruce/vgeneric4.iob b/objects/spruce-medium/spruce12.iob similarity index 100% rename from objects/trees/spruce/vgeneric4.iob rename to objects/spruce-medium/spruce12.iob diff --git a/objects/trees/spruce/vgeneric5.iob b/objects/spruce-medium/spruce13.iob similarity index 100% rename from objects/trees/spruce/vgeneric5.iob rename to objects/spruce-medium/spruce13.iob diff --git a/objects/trees/spruce/vgeneric6.iob b/objects/spruce-medium/spruce14.iob similarity index 100% rename from objects/trees/spruce/vgeneric6.iob rename to objects/spruce-medium/spruce14.iob diff --git a/objects/trees/spruce/vgeneric7.iob b/objects/spruce-medium/spruce16.iob similarity index 100% rename from objects/trees/spruce/vgeneric7.iob rename to objects/spruce-medium/spruce16.iob diff --git a/objects/trees/spruce/vgeneric8.iob b/objects/spruce-medium/spruce17.iob similarity index 100% rename from objects/trees/spruce/vgeneric8.iob rename to objects/spruce-medium/spruce17.iob diff --git a/objects/trees/spruce/vgeneric9.iob b/objects/spruce-medium/spruce18.iob similarity index 100% rename from objects/trees/spruce/vgeneric9.iob rename to objects/spruce-medium/spruce18.iob diff --git a/objects/trees/spruce/vgeneric10.iob b/objects/spruce-medium/spruce19.iob similarity index 100% rename from objects/trees/spruce/vgeneric10.iob rename to objects/spruce-medium/spruce19.iob diff --git a/objects/trees/spruce/vgeneric11.iob b/objects/spruce-medium/spruce2.iob similarity index 100% rename from objects/trees/spruce/vgeneric11.iob rename to objects/spruce-medium/spruce2.iob diff --git a/objects/trees/spruce/vgeneric12.iob b/objects/spruce-medium/spruce20.iob similarity index 100% rename from objects/trees/spruce/vgeneric12.iob rename to objects/spruce-medium/spruce20.iob diff --git a/objects/trees/spruce/vgeneric13.iob b/objects/spruce-medium/spruce27.iob similarity index 100% rename from objects/trees/spruce/vgeneric13.iob rename to objects/spruce-medium/spruce27.iob diff --git a/objects/trees/spruce/vgeneric14.iob b/objects/spruce-medium/spruce28.iob similarity index 100% rename from objects/trees/spruce/vgeneric14.iob rename to objects/spruce-medium/spruce28.iob diff --git a/objects/trees/spruce/vgeneric15.iob b/objects/spruce-medium/spruce29.iob similarity index 100% rename from objects/trees/spruce/vgeneric15.iob rename to objects/spruce-medium/spruce29.iob diff --git a/objects/trees/spruce/vgeneric16.iob b/objects/spruce-medium/spruce3.iob similarity index 100% rename from objects/trees/spruce/vgeneric16.iob rename to objects/spruce-medium/spruce3.iob diff --git a/objects/trees/spruce/vgeneric17.iob b/objects/spruce-medium/spruce30.iob similarity index 100% rename from objects/trees/spruce/vgeneric17.iob rename to objects/spruce-medium/spruce30.iob diff --git a/objects/trees/spruce/vgeneric18.iob b/objects/spruce-medium/spruce31.iob similarity index 100% rename from objects/trees/spruce/vgeneric18.iob rename to objects/spruce-medium/spruce31.iob diff --git a/objects/trees/spruce/vgeneric19.iob b/objects/spruce-medium/spruce32.iob similarity index 100% rename from objects/trees/spruce/vgeneric19.iob rename to objects/spruce-medium/spruce32.iob diff --git a/objects/trees/spruce/vgeneric20.iob b/objects/spruce-medium/spruce33.iob similarity index 100% rename from objects/trees/spruce/vgeneric20.iob rename to objects/spruce-medium/spruce33.iob diff --git a/objects/trees/spruce/vgeneric21.iob b/objects/spruce-medium/spruce34.iob similarity index 100% rename from objects/trees/spruce/vgeneric21.iob rename to objects/spruce-medium/spruce34.iob diff --git a/objects/trees/spruce/vgeneric22.iob b/objects/spruce-medium/spruce37.iob similarity index 100% rename from objects/trees/spruce/vgeneric22.iob rename to objects/spruce-medium/spruce37.iob diff --git a/objects/trees/spruce/vgeneric23.iob b/objects/spruce-medium/spruce39.iob similarity index 100% rename from objects/trees/spruce/vgeneric23.iob rename to objects/spruce-medium/spruce39.iob diff --git a/objects/trees/spruce/vgeneric24.iob b/objects/spruce-medium/spruce4.iob similarity index 100% rename from objects/trees/spruce/vgeneric24.iob rename to objects/spruce-medium/spruce4.iob diff --git a/objects/trees/spruce/vgeneric25.iob b/objects/spruce-medium/spruce41.iob similarity index 100% rename from objects/trees/spruce/vgeneric25.iob rename to objects/spruce-medium/spruce41.iob diff --git a/objects/trees/spruce/vgeneric26.iob b/objects/spruce-medium/spruce42.iob similarity index 100% rename from objects/trees/spruce/vgeneric26.iob rename to objects/spruce-medium/spruce42.iob diff --git a/objects/trees/spruce/vgeneric27.iob b/objects/spruce-medium/spruce43.iob similarity index 100% rename from objects/trees/spruce/vgeneric27.iob rename to objects/spruce-medium/spruce43.iob diff --git a/objects/trees/spruce/vgeneric28.iob b/objects/spruce-medium/spruce5.iob similarity index 100% rename from objects/trees/spruce/vgeneric28.iob rename to objects/spruce-medium/spruce5.iob diff --git a/objects/trees/spruce/vgeneric29.iob b/objects/spruce-medium/spruce6.iob similarity index 100% rename from objects/trees/spruce/vgeneric29.iob rename to objects/spruce-medium/spruce6.iob diff --git a/objects/trees/spruce/vgeneric30.iob b/objects/spruce-medium/spruce7.iob similarity index 100% rename from objects/trees/spruce/vgeneric30.iob rename to objects/spruce-medium/spruce7.iob diff --git a/objects/trees/spruce/vgeneric31.iob b/objects/spruce-medium/spruce8.iob similarity index 100% rename from objects/trees/spruce/vgeneric31.iob rename to objects/spruce-medium/spruce8.iob diff --git a/objects/trees/spruce/vgeneric32.iob b/objects/spruce-medium/spruce9.iob similarity index 100% rename from objects/trees/spruce/vgeneric32.iob rename to objects/spruce-medium/spruce9.iob diff --git a/objects/trees/spruce/smol1.iob b/objects/spruce-small/spruce1.iob similarity index 100% rename from objects/trees/spruce/smol1.iob rename to objects/spruce-small/spruce1.iob diff --git a/objects/trees/spruce/smol2.iob b/objects/spruce-small/spruce10.iob similarity index 100% rename from objects/trees/spruce/smol2.iob rename to objects/spruce-small/spruce10.iob diff --git a/objects/trees/spruce/smol3.iob b/objects/spruce-small/spruce11.iob similarity index 100% rename from objects/trees/spruce/smol3.iob rename to objects/spruce-small/spruce11.iob diff --git a/objects/trees/spruce/smol4.iob b/objects/spruce-small/spruce12.iob similarity index 100% rename from objects/trees/spruce/smol4.iob rename to objects/spruce-small/spruce12.iob diff --git a/objects/trees/spruce/smol5.iob b/objects/spruce-small/spruce13.iob similarity index 100% rename from objects/trees/spruce/smol5.iob rename to objects/spruce-small/spruce13.iob diff --git a/objects/trees/spruce/smol6.iob b/objects/spruce-small/spruce2.iob similarity index 100% rename from objects/trees/spruce/smol6.iob rename to objects/spruce-small/spruce2.iob diff --git a/objects/trees/spruce/smol7.iob b/objects/spruce-small/spruce3.iob similarity index 100% rename from objects/trees/spruce/smol7.iob rename to objects/spruce-small/spruce3.iob diff --git a/objects/trees/spruce/smol8.iob b/objects/spruce-small/spruce4.iob similarity index 100% rename from objects/trees/spruce/smol8.iob rename to objects/spruce-small/spruce4.iob diff --git a/objects/trees/spruce/smol9.iob b/objects/spruce-small/spruce5.iob similarity index 100% rename from objects/trees/spruce/smol9.iob rename to objects/spruce-small/spruce5.iob diff --git a/objects/trees/spruce/smol10.iob b/objects/spruce-small/spruce6.iob similarity index 100% rename from objects/trees/spruce/smol10.iob rename to objects/spruce-small/spruce6.iob diff --git a/objects/trees/spruce/smol11.iob b/objects/spruce-small/spruce7.iob similarity index 100% rename from objects/trees/spruce/smol11.iob rename to objects/spruce-small/spruce7.iob diff --git a/objects/trees/spruce/smol12.iob b/objects/spruce-small/spruce8.iob similarity index 100% rename from objects/trees/spruce/smol12.iob rename to objects/spruce-small/spruce8.iob diff --git a/objects/trees/spruce/smol13.iob b/objects/spruce-small/spruce9.iob similarity index 100% rename from objects/trees/spruce/smol13.iob rename to objects/spruce-small/spruce9.iob diff --git a/objects/clutter/statue/sub-stat-1.iob b/objects/statue/sub-stat-1.iob similarity index 100% rename from objects/clutter/statue/sub-stat-1.iob rename to objects/statue/sub-stat-1.iob diff --git a/objects/clutter/statue/sub-stat-2.iob b/objects/statue/sub-stat-2.iob similarity index 100% rename from objects/clutter/statue/sub-stat-2.iob rename to objects/statue/sub-stat-2.iob diff --git a/objects/clutter/statue/sub-stat-3.iob b/objects/statue/sub-stat-3.iob similarity index 100% rename from objects/clutter/statue/sub-stat-3.iob rename to objects/statue/sub-stat-3.iob diff --git a/objects/clutter/statue/sub-stat-4.iob b/objects/statue/sub-stat-4.iob similarity index 100% rename from objects/clutter/statue/sub-stat-4.iob rename to objects/statue/sub-stat-4.iob diff --git a/objects/clutter/statue/sub-stat-5.iob b/objects/statue/sub-stat-5.iob similarity index 100% rename from objects/clutter/statue/sub-stat-5.iob rename to objects/statue/sub-stat-5.iob diff --git a/objects/clutter/stone-clutt/obelisk-1.iob b/objects/stone-clutt/obelisk-1.iob similarity index 100% rename from objects/clutter/stone-clutt/obelisk-1.iob rename to objects/stone-clutt/obelisk-1.iob diff --git a/objects/clutter/stone-clutt/obelisk-2.iob b/objects/stone-clutt/obelisk-2.iob similarity index 100% rename from objects/clutter/stone-clutt/obelisk-2.iob rename to objects/stone-clutt/obelisk-2.iob diff --git a/objects/clutter/stone-clutt/obelisk-3.iob b/objects/stone-clutt/obelisk-3.iob similarity index 100% rename from objects/clutter/stone-clutt/obelisk-3.iob rename to objects/stone-clutt/obelisk-3.iob diff --git a/objects/clutter/stone-clutt/obelisk-4.iob b/objects/stone-clutt/obelisk-4.iob similarity index 100% rename from objects/clutter/stone-clutt/obelisk-4.iob rename to objects/stone-clutt/obelisk-4.iob diff --git a/objects/clutter/stone-clutt/obelisk-5.iob b/objects/stone-clutt/obelisk-5.iob similarity index 100% rename from objects/clutter/stone-clutt/obelisk-5.iob rename to objects/stone-clutt/obelisk-5.iob diff --git a/objects/clutter/stone-clutt/obelisk-6.iob b/objects/stone-clutt/obelisk-6.iob similarity index 100% rename from objects/clutter/stone-clutt/obelisk-6.iob rename to objects/stone-clutt/obelisk-6.iob diff --git a/objects/clutter/stone-clutt/obelisk-7.iob b/objects/stone-clutt/obelisk-7.iob similarity index 100% rename from objects/clutter/stone-clutt/obelisk-7.iob rename to objects/stone-clutt/obelisk-7.iob diff --git a/objects/clutter/stone-clutt/stone-spike-1.iob b/objects/stone-clutt/stone-spike-1.iob similarity index 100% rename from objects/clutter/stone-clutt/stone-spike-1.iob rename to objects/stone-clutt/stone-spike-1.iob diff --git a/objects/clutter/stone-clutt/stone-spike-2.iob b/objects/stone-clutt/stone-spike-2.iob similarity index 100% rename from objects/clutter/stone-clutt/stone-spike-2.iob rename to objects/stone-clutt/stone-spike-2.iob diff --git a/objects/clutter/stone-clutt/stone-spike-3.iob b/objects/stone-clutt/stone-spike-3.iob similarity index 100% rename from objects/clutter/stone-clutt/stone-spike-3.iob rename to objects/stone-clutt/stone-spike-3.iob diff --git a/objects/clutter/stone-clutt/stone-spike-4.iob b/objects/stone-clutt/stone-spike-4.iob similarity index 100% rename from objects/clutter/stone-clutt/stone-spike-4.iob rename to objects/stone-clutt/stone-spike-4.iob diff --git a/objects/clutter/stone-clutt/stone-spike-5.iob b/objects/stone-clutt/stone-spike-5.iob similarity index 100% rename from objects/clutter/stone-clutt/stone-spike-5.iob rename to objects/stone-clutt/stone-spike-5.iob diff --git a/objects/clutter/stone-clutt/stone-spike-6.iob b/objects/stone-clutt/stone-spike-6.iob similarity index 100% rename from objects/clutter/stone-clutt/stone-spike-6.iob rename to objects/stone-clutt/stone-spike-6.iob diff --git a/objects/clutter/stone-clutt/stone-spike-7.iob b/objects/stone-clutt/stone-spike-7.iob similarity index 100% rename from objects/clutter/stone-clutt/stone-spike-7.iob rename to objects/stone-clutt/stone-spike-7.iob diff --git a/objects/clutter/stone-clutt/stone-spike-8.iob b/objects/stone-clutt/stone-spike-8.iob similarity index 100% rename from objects/clutter/stone-clutt/stone-spike-8.iob rename to objects/stone-clutt/stone-spike-8.iob diff --git a/objects/jigsaw/stronghold/ceiling/5x5/bar-lamp.iob b/objects/stronghold/ceiling/5x5/bar-lamp.iob similarity index 100% rename from objects/jigsaw/stronghold/ceiling/5x5/bar-lamp.iob rename to objects/stronghold/ceiling/5x5/bar-lamp.iob diff --git a/objects/jigsaw/stronghold/ceiling/5x5/lamp.iob b/objects/stronghold/ceiling/5x5/lamp.iob similarity index 100% rename from objects/jigsaw/stronghold/ceiling/5x5/lamp.iob rename to objects/stronghold/ceiling/5x5/lamp.iob diff --git a/objects/jigsaw/stronghold/ceiling/5x5/wood-beams.iob b/objects/stronghold/ceiling/5x5/wood-beams.iob similarity index 100% rename from objects/jigsaw/stronghold/ceiling/5x5/wood-beams.iob rename to objects/stronghold/ceiling/5x5/wood-beams.iob diff --git a/objects/jigsaw/stronghold/ceiling/7x7/flat.iob b/objects/stronghold/ceiling/7x7/flat.iob similarity index 100% rename from objects/jigsaw/stronghold/ceiling/7x7/flat.iob rename to objects/stronghold/ceiling/7x7/flat.iob diff --git a/objects/jigsaw/stronghold/ceiling/7x7/wood-beams.iob b/objects/stronghold/ceiling/7x7/wood-beams.iob similarity index 100% rename from objects/jigsaw/stronghold/ceiling/7x7/wood-beams.iob rename to objects/stronghold/ceiling/7x7/wood-beams.iob diff --git a/objects/jigsaw/stronghold/floor/3x3/flat.iob b/objects/stronghold/floor/3x3/flat.iob similarity index 100% rename from objects/jigsaw/stronghold/floor/3x3/flat.iob rename to objects/stronghold/floor/3x3/flat.iob diff --git a/objects/jigsaw/stronghold/floor/3x3/tnt.iob b/objects/stronghold/floor/3x3/tnt.iob similarity index 100% rename from objects/jigsaw/stronghold/floor/3x3/tnt.iob rename to objects/stronghold/floor/3x3/tnt.iob diff --git a/objects/jigsaw/stronghold/jail/1.iob b/objects/stronghold/jail/1.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/1.iob rename to objects/stronghold/jail/1.iob diff --git a/objects/jigsaw/stronghold/jail/10.iob b/objects/stronghold/jail/10.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/10.iob rename to objects/stronghold/jail/10.iob diff --git a/objects/jigsaw/stronghold/jail/11.iob b/objects/stronghold/jail/11.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/11.iob rename to objects/stronghold/jail/11.iob diff --git a/objects/jigsaw/stronghold/jail/12.iob b/objects/stronghold/jail/12.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/12.iob rename to objects/stronghold/jail/12.iob diff --git a/objects/jigsaw/stronghold/jail/2.iob b/objects/stronghold/jail/2.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/2.iob rename to objects/stronghold/jail/2.iob diff --git a/objects/jigsaw/stronghold/jail/3.iob b/objects/stronghold/jail/3.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/3.iob rename to objects/stronghold/jail/3.iob diff --git a/objects/jigsaw/stronghold/jail/4.iob b/objects/stronghold/jail/4.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/4.iob rename to objects/stronghold/jail/4.iob diff --git a/objects/jigsaw/stronghold/jail/5.iob b/objects/stronghold/jail/5.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/5.iob rename to objects/stronghold/jail/5.iob diff --git a/objects/jigsaw/stronghold/jail/6.iob b/objects/stronghold/jail/6.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/6.iob rename to objects/stronghold/jail/6.iob diff --git a/objects/jigsaw/stronghold/jail/7.iob b/objects/stronghold/jail/7.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/7.iob rename to objects/stronghold/jail/7.iob diff --git a/objects/jigsaw/stronghold/jail/8.iob b/objects/stronghold/jail/8.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/8.iob rename to objects/stronghold/jail/8.iob diff --git a/objects/jigsaw/stronghold/jail/9.iob b/objects/stronghold/jail/9.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/9.iob rename to objects/stronghold/jail/9.iob diff --git a/objects/jigsaw/stronghold/jail/blank.iob b/objects/stronghold/jail/blank.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/blank.iob rename to objects/stronghold/jail/blank.iob diff --git a/objects/jigsaw/stronghold/path/4way-spiral-staircase.iob b/objects/stronghold/path/4way-spiral-staircase.iob similarity index 100% rename from objects/jigsaw/stronghold/path/4way-spiral-staircase.iob rename to objects/stronghold/path/4way-spiral-staircase.iob diff --git a/objects/jigsaw/stronghold/path/cap.iob b/objects/stronghold/path/cap.iob similarity index 100% rename from objects/jigsaw/stronghold/path/cap.iob rename to objects/stronghold/path/cap.iob diff --git a/objects/jigsaw/stronghold/path/corner-cross.iob b/objects/stronghold/path/corner-cross.iob similarity index 100% rename from objects/jigsaw/stronghold/path/corner-cross.iob rename to objects/stronghold/path/corner-cross.iob diff --git a/objects/jigsaw/stronghold/path/corner-cross.iob.bak b/objects/stronghold/path/corner-cross.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/path/corner-cross.iob.bak rename to objects/stronghold/path/corner-cross.iob.bak diff --git a/objects/jigsaw/stronghold/path/corridor-cross.iob b/objects/stronghold/path/corridor-cross.iob similarity index 100% rename from objects/jigsaw/stronghold/path/corridor-cross.iob rename to objects/stronghold/path/corridor-cross.iob diff --git a/objects/jigsaw/stronghold/path/fancy-cross.iob b/objects/stronghold/path/fancy-cross.iob similarity index 100% rename from objects/jigsaw/stronghold/path/fancy-cross.iob rename to objects/stronghold/path/fancy-cross.iob diff --git a/objects/jigsaw/stronghold/path/hall-5x7x5.iob b/objects/stronghold/path/hall-5x7x5.iob similarity index 100% rename from objects/jigsaw/stronghold/path/hall-5x7x5.iob rename to objects/stronghold/path/hall-5x7x5.iob diff --git a/objects/jigsaw/stronghold/path/hazard-hall1.iob b/objects/stronghold/path/hazard-hall1.iob similarity index 100% rename from objects/jigsaw/stronghold/path/hazard-hall1.iob rename to objects/stronghold/path/hazard-hall1.iob diff --git a/objects/jigsaw/stronghold/path/hazard-hall2.iob b/objects/stronghold/path/hazard-hall2.iob similarity index 100% rename from objects/jigsaw/stronghold/path/hazard-hall2.iob rename to objects/stronghold/path/hazard-hall2.iob diff --git a/objects/jigsaw/stronghold/path/hazard-hall3.iob b/objects/stronghold/path/hazard-hall3.iob similarity index 100% rename from objects/jigsaw/stronghold/path/hazard-hall3.iob rename to objects/stronghold/path/hazard-hall3.iob diff --git a/objects/jigsaw/stronghold/path/iron-door.iob b/objects/stronghold/path/iron-door.iob similarity index 100% rename from objects/jigsaw/stronghold/path/iron-door.iob rename to objects/stronghold/path/iron-door.iob diff --git a/objects/jigsaw/stronghold/path/iron-door2.iob b/objects/stronghold/path/iron-door2.iob similarity index 100% rename from objects/jigsaw/stronghold/path/iron-door2.iob rename to objects/stronghold/path/iron-door2.iob diff --git a/objects/jigsaw/stronghold/path/jail-room1.iob b/objects/stronghold/path/jail-room1.iob similarity index 100% rename from objects/jigsaw/stronghold/path/jail-room1.iob rename to objects/stronghold/path/jail-room1.iob diff --git a/objects/jigsaw/stronghold/path/jail-room1.iob.bak b/objects/stronghold/path/jail-room1.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/path/jail-room1.iob.bak rename to objects/stronghold/path/jail-room1.iob.bak diff --git a/objects/jigsaw/stronghold/path/jail-room2.iob b/objects/stronghold/path/jail-room2.iob similarity index 100% rename from objects/jigsaw/stronghold/path/jail-room2.iob rename to objects/stronghold/path/jail-room2.iob diff --git a/objects/jigsaw/stronghold/path/jail-room2.iob.bak b/objects/stronghold/path/jail-room2.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/path/jail-room2.iob.bak rename to objects/stronghold/path/jail-room2.iob.bak diff --git a/objects/jigsaw/stronghold/path/large-corridor.iob b/objects/stronghold/path/large-corridor.iob similarity index 100% rename from objects/jigsaw/stronghold/path/large-corridor.iob rename to objects/stronghold/path/large-corridor.iob diff --git a/objects/jigsaw/stronghold/path/large-cross-stairs.iob b/objects/stronghold/path/large-cross-stairs.iob similarity index 100% rename from objects/jigsaw/stronghold/path/large-cross-stairs.iob rename to objects/stronghold/path/large-cross-stairs.iob diff --git a/objects/jigsaw/stronghold/path/large-cross-stairs.iob.old b/objects/stronghold/path/large-cross-stairs.iob.old similarity index 100% rename from objects/jigsaw/stronghold/path/large-cross-stairs.iob.old rename to objects/stronghold/path/large-cross-stairs.iob.old diff --git a/objects/jigsaw/stronghold/path/large-spiral-staircase.iob b/objects/stronghold/path/large-spiral-staircase.iob similarity index 100% rename from objects/jigsaw/stronghold/path/large-spiral-staircase.iob rename to objects/stronghold/path/large-spiral-staircase.iob diff --git a/objects/jigsaw/stronghold/path/long-corridor.iob b/objects/stronghold/path/long-corridor.iob similarity index 100% rename from objects/jigsaw/stronghold/path/long-corridor.iob rename to objects/stronghold/path/long-corridor.iob diff --git a/objects/jigsaw/stronghold/path/medium-corridor.iob b/objects/stronghold/path/medium-corridor.iob similarity index 100% rename from objects/jigsaw/stronghold/path/medium-corridor.iob rename to objects/stronghold/path/medium-corridor.iob diff --git a/objects/jigsaw/stronghold/path/medium-corridor2.iob b/objects/stronghold/path/medium-corridor2.iob similarity index 100% rename from objects/jigsaw/stronghold/path/medium-corridor2.iob rename to objects/stronghold/path/medium-corridor2.iob diff --git a/objects/jigsaw/stronghold/path/medium-cross.iob b/objects/stronghold/path/medium-cross.iob similarity index 100% rename from objects/jigsaw/stronghold/path/medium-cross.iob rename to objects/stronghold/path/medium-cross.iob diff --git a/objects/jigsaw/stronghold/path/medium-wide-corridor1.iob b/objects/stronghold/path/medium-wide-corridor1.iob similarity index 100% rename from objects/jigsaw/stronghold/path/medium-wide-corridor1.iob rename to objects/stronghold/path/medium-wide-corridor1.iob diff --git a/objects/jigsaw/stronghold/path/portal-hall.iob b/objects/stronghold/path/portal-hall.iob similarity index 100% rename from objects/jigsaw/stronghold/path/portal-hall.iob rename to objects/stronghold/path/portal-hall.iob diff --git a/objects/jigsaw/stronghold/path/small-corridor.iob b/objects/stronghold/path/small-corridor.iob similarity index 100% rename from objects/jigsaw/stronghold/path/small-corridor.iob rename to objects/stronghold/path/small-corridor.iob diff --git a/objects/jigsaw/stronghold/path/small-corridor2.iob b/objects/stronghold/path/small-corridor2.iob similarity index 100% rename from objects/jigsaw/stronghold/path/small-corridor2.iob rename to objects/stronghold/path/small-corridor2.iob diff --git a/objects/jigsaw/stronghold/path/small-cross.iob b/objects/stronghold/path/small-cross.iob similarity index 100% rename from objects/jigsaw/stronghold/path/small-cross.iob rename to objects/stronghold/path/small-cross.iob diff --git a/objects/jigsaw/stronghold/path/small-spiral-staircase.iob b/objects/stronghold/path/small-spiral-staircase.iob similarity index 100% rename from objects/jigsaw/stronghold/path/small-spiral-staircase.iob rename to objects/stronghold/path/small-spiral-staircase.iob diff --git a/objects/jigsaw/stronghold/path/stair-split.iob b/objects/stronghold/path/stair-split.iob similarity index 100% rename from objects/jigsaw/stronghold/path/stair-split.iob rename to objects/stronghold/path/stair-split.iob diff --git a/objects/jigsaw/stronghold/path/stairs1.iob b/objects/stronghold/path/stairs1.iob similarity index 100% rename from objects/jigsaw/stronghold/path/stairs1.iob rename to objects/stronghold/path/stairs1.iob diff --git a/objects/jigsaw/stronghold/path/straight-staircase.iob b/objects/stronghold/path/straight-staircase.iob similarity index 100% rename from objects/jigsaw/stronghold/path/straight-staircase.iob rename to objects/stronghold/path/straight-staircase.iob diff --git a/objects/jigsaw/stronghold/path/tee-cross.iob b/objects/stronghold/path/tee-cross.iob similarity index 100% rename from objects/jigsaw/stronghold/path/tee-cross.iob rename to objects/stronghold/path/tee-cross.iob diff --git a/objects/jigsaw/stronghold/path/tee-cross.iob.bak b/objects/stronghold/path/tee-cross.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/path/tee-cross.iob.bak rename to objects/stronghold/path/tee-cross.iob.bak diff --git a/objects/jigsaw/stronghold/path/tee-cross2.iob b/objects/stronghold/path/tee-cross2.iob similarity index 100% rename from objects/jigsaw/stronghold/path/tee-cross2.iob rename to objects/stronghold/path/tee-cross2.iob diff --git a/objects/jigsaw/stronghold/path/tee-cross2.iob.bak b/objects/stronghold/path/tee-cross2.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/path/tee-cross2.iob.bak rename to objects/stronghold/path/tee-cross2.iob.bak diff --git a/objects/jigsaw/stronghold/path/tiny-cross.iob b/objects/stronghold/path/tiny-cross.iob similarity index 100% rename from objects/jigsaw/stronghold/path/tiny-cross.iob rename to objects/stronghold/path/tiny-cross.iob diff --git a/objects/jigsaw/stronghold/path/wood-door.iob b/objects/stronghold/path/wood-door.iob similarity index 100% rename from objects/jigsaw/stronghold/path/wood-door.iob rename to objects/stronghold/path/wood-door.iob diff --git a/objects/jigsaw/stronghold/path/wood-door2.iob b/objects/stronghold/path/wood-door2.iob similarity index 100% rename from objects/jigsaw/stronghold/path/wood-door2.iob rename to objects/stronghold/path/wood-door2.iob diff --git a/objects/jigsaw/stronghold/portal/main.iob b/objects/stronghold/portal/main.iob similarity index 100% rename from objects/jigsaw/stronghold/portal/main.iob rename to objects/stronghold/portal/main.iob diff --git a/objects/jigsaw/stronghold/portal/top.iob b/objects/stronghold/portal/top.iob similarity index 100% rename from objects/jigsaw/stronghold/portal/top.iob rename to objects/stronghold/portal/top.iob diff --git a/objects/jigsaw/stronghold/portal/top_new.iob b/objects/stronghold/portal/top_new.iob similarity index 100% rename from objects/jigsaw/stronghold/portal/top_new.iob rename to objects/stronghold/portal/top_new.iob diff --git a/objects/jigsaw/stronghold/room/portal-room.iob b/objects/stronghold/room/portal-room.iob similarity index 100% rename from objects/jigsaw/stronghold/room/portal-room.iob rename to objects/stronghold/room/portal-room.iob diff --git a/objects/jigsaw/stronghold/room/sleeping-quarters.iob b/objects/stronghold/room/sleeping-quarters.iob similarity index 100% rename from objects/jigsaw/stronghold/room/sleeping-quarters.iob rename to objects/stronghold/room/sleeping-quarters.iob diff --git a/objects/jigsaw/stronghold/room/small-cell.iob b/objects/stronghold/room/small-cell.iob similarity index 100% rename from objects/jigsaw/stronghold/room/small-cell.iob rename to objects/stronghold/room/small-cell.iob diff --git a/objects/jigsaw/stronghold/room/stairs-down.iob b/objects/stronghold/room/stairs-down.iob similarity index 100% rename from objects/jigsaw/stronghold/room/stairs-down.iob rename to objects/stronghold/room/stairs-down.iob diff --git a/objects/jigsaw/stronghold/room/stairs-up-down.iob b/objects/stronghold/room/stairs-up-down.iob similarity index 100% rename from objects/jigsaw/stronghold/room/stairs-up-down.iob rename to objects/stronghold/room/stairs-up-down.iob diff --git a/objects/jigsaw/stronghold/room/stairs-up.iob b/objects/stronghold/room/stairs-up.iob similarity index 100% rename from objects/jigsaw/stronghold/room/stairs-up.iob rename to objects/stronghold/room/stairs-up.iob diff --git a/objects/jigsaw/stronghold/room/study.iob b/objects/stronghold/room/study.iob similarity index 100% rename from objects/jigsaw/stronghold/room/study.iob rename to objects/stronghold/room/study.iob diff --git a/objects/jigsaw/stronghold/room/witch-room-end.iob b/objects/stronghold/room/witch-room-end.iob similarity index 100% rename from objects/jigsaw/stronghold/room/witch-room-end.iob rename to objects/stronghold/room/witch-room-end.iob diff --git a/objects/jigsaw/stronghold/room/witch-room.iob b/objects/stronghold/room/witch-room.iob similarity index 100% rename from objects/jigsaw/stronghold/room/witch-room.iob rename to objects/stronghold/room/witch-room.iob diff --git a/objects/jigsaw/stronghold/rooms/alter1.iob b/objects/stronghold/rooms/alter1.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/alter1.iob rename to objects/stronghold/rooms/alter1.iob diff --git a/objects/jigsaw/stronghold/rooms/alter1.iob.bak b/objects/stronghold/rooms/alter1.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/alter1.iob.bak rename to objects/stronghold/rooms/alter1.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/boomtube-test.iob b/objects/stronghold/rooms/boomtube-test.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/boomtube-test.iob rename to objects/stronghold/rooms/boomtube-test.iob diff --git a/objects/jigsaw/stronghold/rooms/chestroom1-trap.iob b/objects/stronghold/rooms/chestroom1-trap.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/chestroom1-trap.iob rename to objects/stronghold/rooms/chestroom1-trap.iob diff --git a/objects/jigsaw/stronghold/rooms/chestroom1-trap.iob.bak b/objects/stronghold/rooms/chestroom1-trap.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/chestroom1-trap.iob.bak rename to objects/stronghold/rooms/chestroom1-trap.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/chestroom1.iob b/objects/stronghold/rooms/chestroom1.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/chestroom1.iob rename to objects/stronghold/rooms/chestroom1.iob diff --git a/objects/jigsaw/stronghold/rooms/chestroom1.iob.bak b/objects/stronghold/rooms/chestroom1.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/chestroom1.iob.bak rename to objects/stronghold/rooms/chestroom1.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/chestroom2-trap.iob b/objects/stronghold/rooms/chestroom2-trap.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/chestroom2-trap.iob rename to objects/stronghold/rooms/chestroom2-trap.iob diff --git a/objects/jigsaw/stronghold/rooms/chestroom2-trap.iob.bak b/objects/stronghold/rooms/chestroom2-trap.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/chestroom2-trap.iob.bak rename to objects/stronghold/rooms/chestroom2-trap.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/chestroom2.iob b/objects/stronghold/rooms/chestroom2.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/chestroom2.iob rename to objects/stronghold/rooms/chestroom2.iob diff --git a/objects/jigsaw/stronghold/rooms/chestroom2.iob.bak b/objects/stronghold/rooms/chestroom2.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/chestroom2.iob.bak rename to objects/stronghold/rooms/chestroom2.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/jail-complex.iob b/objects/stronghold/rooms/jail-complex.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/jail-complex.iob rename to objects/stronghold/rooms/jail-complex.iob diff --git a/objects/jigsaw/stronghold/rooms/library-large.iob b/objects/stronghold/rooms/library-large.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/library-large.iob rename to objects/stronghold/rooms/library-large.iob diff --git a/objects/jigsaw/stronghold/rooms/library.iob b/objects/stronghold/rooms/library.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/library.iob rename to objects/stronghold/rooms/library.iob diff --git a/objects/jigsaw/stronghold/rooms/library.iob.bak b/objects/stronghold/rooms/library.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/library.iob.bak rename to objects/stronghold/rooms/library.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/maze1.iob b/objects/stronghold/rooms/maze1.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/maze1.iob rename to objects/stronghold/rooms/maze1.iob diff --git a/objects/jigsaw/stronghold/rooms/maze1.iob.bak b/objects/stronghold/rooms/maze1.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/maze1.iob.bak rename to objects/stronghold/rooms/maze1.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/maze2.iob b/objects/stronghold/rooms/maze2.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/maze2.iob rename to objects/stronghold/rooms/maze2.iob diff --git a/objects/jigsaw/stronghold/rooms/maze2.iob.bak b/objects/stronghold/rooms/maze2.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/maze2.iob.bak rename to objects/stronghold/rooms/maze2.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/maze3.iob b/objects/stronghold/rooms/maze3.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/maze3.iob rename to objects/stronghold/rooms/maze3.iob diff --git a/objects/jigsaw/stronghold/rooms/maze3.iob.bak b/objects/stronghold/rooms/maze3.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/maze3.iob.bak rename to objects/stronghold/rooms/maze3.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/oreroom.iob b/objects/stronghold/rooms/oreroom.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/oreroom.iob rename to objects/stronghold/rooms/oreroom.iob diff --git a/objects/jigsaw/stronghold/rooms/oreroom.iob.bak b/objects/stronghold/rooms/oreroom.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/oreroom.iob.bak rename to objects/stronghold/rooms/oreroom.iob.bak diff --git a/objects/jigsaw/stronghold/stairs/casing-floor-hollow.iob b/objects/stronghold/stairs/casing-floor-hollow.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/casing-floor-hollow.iob rename to objects/stronghold/stairs/casing-floor-hollow.iob diff --git a/objects/jigsaw/stronghold/stairs/casing-floor-solid.iob b/objects/stronghold/stairs/casing-floor-solid.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/casing-floor-solid.iob rename to objects/stronghold/stairs/casing-floor-solid.iob diff --git a/objects/jigsaw/stronghold/stairs/casing-tight.iob b/objects/stronghold/stairs/casing-tight.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/casing-tight.iob rename to objects/stronghold/stairs/casing-tight.iob diff --git a/objects/jigsaw/stronghold/stairs/casing-top.iob b/objects/stronghold/stairs/casing-top.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/casing-top.iob rename to objects/stronghold/stairs/casing-top.iob diff --git a/objects/jigsaw/stronghold/stairs/casing.iob b/objects/stronghold/stairs/casing.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/casing.iob rename to objects/stronghold/stairs/casing.iob diff --git a/objects/jigsaw/stronghold/stairs/med-vertical-complete1.iob b/objects/stronghold/stairs/med-vertical-complete1.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/med-vertical-complete1.iob rename to objects/stronghold/stairs/med-vertical-complete1.iob diff --git a/objects/jigsaw/stronghold/stairs/med-vertical-complete2.iob b/objects/stronghold/stairs/med-vertical-complete2.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/med-vertical-complete2.iob rename to objects/stronghold/stairs/med-vertical-complete2.iob diff --git a/objects/jigsaw/stronghold/stairs/med-vertical-extension.iob b/objects/stronghold/stairs/med-vertical-extension.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/med-vertical-extension.iob rename to objects/stronghold/stairs/med-vertical-extension.iob diff --git a/objects/jigsaw/stronghold/stairs/med-vertical-naked.iob b/objects/stronghold/stairs/med-vertical-naked.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/med-vertical-naked.iob rename to objects/stronghold/stairs/med-vertical-naked.iob diff --git a/objects/jigsaw/stronghold/stairs/sml-vertical-naked.iob b/objects/stronghold/stairs/sml-vertical-naked.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/sml-vertical-naked.iob rename to objects/stronghold/stairs/sml-vertical-naked.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/anvil-furnace.iob b/objects/stronghold/wall-fixture/5x3/anvil-furnace.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/anvil-furnace.iob rename to objects/stronghold/wall-fixture/5x3/anvil-furnace.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/brew-set.iob b/objects/stronghold/wall-fixture/5x3/brew-set.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/brew-set.iob rename to objects/stronghold/wall-fixture/5x3/brew-set.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/brewing-shelf.iob b/objects/stronghold/wall-fixture/5x3/brewing-shelf.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/brewing-shelf.iob rename to objects/stronghold/wall-fixture/5x3/brewing-shelf.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/chains.iob b/objects/stronghold/wall-fixture/5x3/chains.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/chains.iob rename to objects/stronghold/wall-fixture/5x3/chains.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/chest.iob b/objects/stronghold/wall-fixture/5x3/chest.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/chest.iob rename to objects/stronghold/wall-fixture/5x3/chest.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/crafting-station.iob b/objects/stronghold/wall-fixture/5x3/crafting-station.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/crafting-station.iob rename to objects/stronghold/wall-fixture/5x3/crafting-station.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/double-chest.iob b/objects/stronghold/wall-fixture/5x3/double-chest.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/double-chest.iob rename to objects/stronghold/wall-fixture/5x3/double-chest.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/lantern.iob b/objects/stronghold/wall-fixture/5x3/lantern.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/lantern.iob rename to objects/stronghold/wall-fixture/5x3/lantern.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/mixed1.iob b/objects/stronghold/wall-fixture/5x3/mixed1.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/mixed1.iob rename to objects/stronghold/wall-fixture/5x3/mixed1.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/mixed1.iob.bak b/objects/stronghold/wall-fixture/5x3/mixed1.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/mixed1.iob.bak rename to objects/stronghold/wall-fixture/5x3/mixed1.iob.bak diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/shelf.iob b/objects/stronghold/wall-fixture/5x3/shelf.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/shelf.iob rename to objects/stronghold/wall-fixture/5x3/shelf.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/study.iob b/objects/stronghold/wall-fixture/5x3/study.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/study.iob rename to objects/stronghold/wall-fixture/5x3/study.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3x3/chains.iob b/objects/stronghold/wall-fixture/5x3x3/chains.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3x3/chains.iob rename to objects/stronghold/wall-fixture/5x3x3/chains.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3x3/cobweb.iob b/objects/stronghold/wall-fixture/5x3x3/cobweb.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3x3/cobweb.iob rename to objects/stronghold/wall-fixture/5x3x3/cobweb.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/blank.iob b/objects/stronghold/wall-fixture/blank.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/blank.iob rename to objects/stronghold/wall-fixture/blank.iob diff --git a/objects/jigsaw/stronghold/wall/1.iob b/objects/stronghold/wall/1.iob similarity index 100% rename from objects/jigsaw/stronghold/wall/1.iob rename to objects/stronghold/wall/1.iob diff --git a/objects/jigsaw/stronghold/wall/2.iob b/objects/stronghold/wall/2.iob similarity index 100% rename from objects/jigsaw/stronghold/wall/2.iob rename to objects/stronghold/wall/2.iob diff --git a/objects/jigsaw/stronghold/wall/3.iob b/objects/stronghold/wall/3.iob similarity index 100% rename from objects/jigsaw/stronghold/wall/3.iob rename to objects/stronghold/wall/3.iob diff --git a/objects/jigsaw/structure/Example Temple/corner-1.iob b/objects/structure/Example Temple/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/Example Temple/corner-1.iob rename to objects/structure/Example Temple/corner-1.iob diff --git a/objects/jigsaw/structure/Example Temple/cross-1.iob b/objects/structure/Example Temple/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/Example Temple/cross-1.iob rename to objects/structure/Example Temple/cross-1.iob diff --git a/objects/jigsaw/structure/Example Temple/hall-1.iob b/objects/structure/Example Temple/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/Example Temple/hall-1.iob rename to objects/structure/Example Temple/hall-1.iob diff --git a/objects/jigsaw/structure/Example Temple/room-1.iob b/objects/structure/Example Temple/room-1.iob similarity index 100% rename from objects/jigsaw/structure/Example Temple/room-1.iob rename to objects/structure/Example Temple/room-1.iob diff --git a/objects/jigsaw/structure/Example Temple/t-connect-1.iob b/objects/structure/Example Temple/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/Example Temple/t-connect-1.iob rename to objects/structure/Example Temple/t-connect-1.iob diff --git a/objects/jigsaw/structure/Example Temple/walled-room-1.iob b/objects/structure/Example Temple/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/Example Temple/walled-room-1.iob rename to objects/structure/Example Temple/walled-room-1.iob diff --git a/objects/jigsaw/structure/RedMineshaft/corner-1.iob b/objects/structure/RedMineshaft/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/corner-1.iob rename to objects/structure/RedMineshaft/corner-1.iob diff --git a/objects/jigsaw/structure/RedMineshaft/corner-2.iob b/objects/structure/RedMineshaft/corner-2.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/corner-2.iob rename to objects/structure/RedMineshaft/corner-2.iob diff --git a/objects/jigsaw/structure/RedMineshaft/corner-3.iob b/objects/structure/RedMineshaft/corner-3.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/corner-3.iob rename to objects/structure/RedMineshaft/corner-3.iob diff --git a/objects/jigsaw/structure/RedMineshaft/corner-4.iob b/objects/structure/RedMineshaft/corner-4.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/corner-4.iob rename to objects/structure/RedMineshaft/corner-4.iob diff --git a/objects/jigsaw/structure/RedMineshaft/corner-5.iob b/objects/structure/RedMineshaft/corner-5.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/corner-5.iob rename to objects/structure/RedMineshaft/corner-5.iob diff --git a/objects/jigsaw/structure/RedMineshaft/cross-1.iob b/objects/structure/RedMineshaft/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/cross-1.iob rename to objects/structure/RedMineshaft/cross-1.iob diff --git a/objects/jigsaw/structure/RedMineshaft/cross-2.iob b/objects/structure/RedMineshaft/cross-2.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/cross-2.iob rename to objects/structure/RedMineshaft/cross-2.iob diff --git a/objects/jigsaw/structure/RedMineshaft/cross-3.iob b/objects/structure/RedMineshaft/cross-3.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/cross-3.iob rename to objects/structure/RedMineshaft/cross-3.iob diff --git a/objects/jigsaw/structure/RedMineshaft/cross-4.iob b/objects/structure/RedMineshaft/cross-4.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/cross-4.iob rename to objects/structure/RedMineshaft/cross-4.iob diff --git a/objects/jigsaw/structure/RedMineshaft/cross-5.iob b/objects/structure/RedMineshaft/cross-5.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/cross-5.iob rename to objects/structure/RedMineshaft/cross-5.iob diff --git a/objects/jigsaw/structure/RedMineshaft/hall-1.iob b/objects/structure/RedMineshaft/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/hall-1.iob rename to objects/structure/RedMineshaft/hall-1.iob diff --git a/objects/jigsaw/structure/RedMineshaft/hall-2.iob b/objects/structure/RedMineshaft/hall-2.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/hall-2.iob rename to objects/structure/RedMineshaft/hall-2.iob diff --git a/objects/jigsaw/structure/RedMineshaft/hall-3.iob b/objects/structure/RedMineshaft/hall-3.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/hall-3.iob rename to objects/structure/RedMineshaft/hall-3.iob diff --git a/objects/jigsaw/structure/RedMineshaft/hall-4.iob b/objects/structure/RedMineshaft/hall-4.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/hall-4.iob rename to objects/structure/RedMineshaft/hall-4.iob diff --git a/objects/jigsaw/structure/RedMineshaft/hall-5.iob b/objects/structure/RedMineshaft/hall-5.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/hall-5.iob rename to objects/structure/RedMineshaft/hall-5.iob diff --git a/objects/jigsaw/structure/RedMineshaft/hall-6.iob b/objects/structure/RedMineshaft/hall-6.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/hall-6.iob rename to objects/structure/RedMineshaft/hall-6.iob diff --git a/objects/jigsaw/structure/RedMineshaft/room-1.iob b/objects/structure/RedMineshaft/room-1.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/room-1.iob rename to objects/structure/RedMineshaft/room-1.iob diff --git a/objects/jigsaw/structure/RedMineshaft/room-2.iob b/objects/structure/RedMineshaft/room-2.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/room-2.iob rename to objects/structure/RedMineshaft/room-2.iob diff --git a/objects/jigsaw/structure/RedMineshaft/room-3.iob b/objects/structure/RedMineshaft/room-3.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/room-3.iob rename to objects/structure/RedMineshaft/room-3.iob diff --git a/objects/jigsaw/structure/RedMineshaft/room-4.iob b/objects/structure/RedMineshaft/room-4.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/room-4.iob rename to objects/structure/RedMineshaft/room-4.iob diff --git a/objects/jigsaw/structure/RedMineshaft/room-5.iob b/objects/structure/RedMineshaft/room-5.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/room-5.iob rename to objects/structure/RedMineshaft/room-5.iob diff --git a/objects/jigsaw/structure/RedMineshaft/t-connect-1.iob b/objects/structure/RedMineshaft/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/t-connect-1.iob rename to objects/structure/RedMineshaft/t-connect-1.iob diff --git a/objects/jigsaw/structure/RedMineshaft/t-connect-2.iob b/objects/structure/RedMineshaft/t-connect-2.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/t-connect-2.iob rename to objects/structure/RedMineshaft/t-connect-2.iob diff --git a/objects/jigsaw/structure/RedMineshaft/t-connect-3.iob b/objects/structure/RedMineshaft/t-connect-3.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/t-connect-3.iob rename to objects/structure/RedMineshaft/t-connect-3.iob diff --git a/objects/jigsaw/structure/RedMineshaft/t-connect-4.iob b/objects/structure/RedMineshaft/t-connect-4.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/t-connect-4.iob rename to objects/structure/RedMineshaft/t-connect-4.iob diff --git a/objects/jigsaw/structure/RedMineshaft/t-connect-5.iob b/objects/structure/RedMineshaft/t-connect-5.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/t-connect-5.iob rename to objects/structure/RedMineshaft/t-connect-5.iob diff --git a/objects/jigsaw/structure/RedMineshaft/t-connect-6.iob b/objects/structure/RedMineshaft/t-connect-6.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/t-connect-6.iob rename to objects/structure/RedMineshaft/t-connect-6.iob diff --git a/objects/jigsaw/structure/RedMineshaft/t-connect-7.iob b/objects/structure/RedMineshaft/t-connect-7.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/t-connect-7.iob rename to objects/structure/RedMineshaft/t-connect-7.iob diff --git a/objects/jigsaw/structure/RedMineshaft/walled-room-1.iob b/objects/structure/RedMineshaft/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/walled-room-1.iob rename to objects/structure/RedMineshaft/walled-room-1.iob diff --git a/objects/jigsaw/structure/RedMineshaft/walled-room-2.iob b/objects/structure/RedMineshaft/walled-room-2.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/walled-room-2.iob rename to objects/structure/RedMineshaft/walled-room-2.iob diff --git a/objects/jigsaw/structure/RedMineshaft/walled-room-3.iob b/objects/structure/RedMineshaft/walled-room-3.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/walled-room-3.iob rename to objects/structure/RedMineshaft/walled-room-3.iob diff --git a/objects/jigsaw/structure/RedMineshaft/walled-room-4.iob b/objects/structure/RedMineshaft/walled-room-4.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/walled-room-4.iob rename to objects/structure/RedMineshaft/walled-room-4.iob diff --git a/objects/jigsaw/structure/cottage-lot/corner-1.iob b/objects/structure/cottage-lot/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/corner-1.iob rename to objects/structure/cottage-lot/corner-1.iob diff --git a/objects/jigsaw/structure/cottage-lot/cross-1.iob b/objects/structure/cottage-lot/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/cross-1.iob rename to objects/structure/cottage-lot/cross-1.iob diff --git a/objects/jigsaw/structure/cottage-lot/hall-1.iob b/objects/structure/cottage-lot/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/hall-1.iob rename to objects/structure/cottage-lot/hall-1.iob diff --git a/objects/jigsaw/structure/cottage-lot/room-1.iob b/objects/structure/cottage-lot/room-1.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/room-1.iob rename to objects/structure/cottage-lot/room-1.iob diff --git a/objects/jigsaw/structure/cottage-lot/room-2.iob b/objects/structure/cottage-lot/room-2.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/room-2.iob rename to objects/structure/cottage-lot/room-2.iob diff --git a/objects/jigsaw/structure/cottage-lot/room-3.iob b/objects/structure/cottage-lot/room-3.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/room-3.iob rename to objects/structure/cottage-lot/room-3.iob diff --git a/objects/jigsaw/structure/cottage-lot/room-4.iob b/objects/structure/cottage-lot/room-4.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/room-4.iob rename to objects/structure/cottage-lot/room-4.iob diff --git a/objects/jigsaw/structure/cottage-lot/t-connect-1.iob b/objects/structure/cottage-lot/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/t-connect-1.iob rename to objects/structure/cottage-lot/t-connect-1.iob diff --git a/objects/jigsaw/structure/cottage-lot/walled-room-1.iob b/objects/structure/cottage-lot/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/walled-room-1.iob rename to objects/structure/cottage-lot/walled-room-1.iob diff --git a/objects/jigsaw/structure/desert-base.iob b/objects/structure/desert-base.iob similarity index 100% rename from objects/jigsaw/structure/desert-base.iob rename to objects/structure/desert-base.iob diff --git a/objects/jigsaw/structure/mush-huts/room-1.iob b/objects/structure/mush-huts/room-1.iob similarity index 100% rename from objects/jigsaw/structure/mush-huts/room-1.iob rename to objects/structure/mush-huts/room-1.iob diff --git a/objects/jigsaw/structure/mush-huts/room-2.iob b/objects/structure/mush-huts/room-2.iob similarity index 100% rename from objects/jigsaw/structure/mush-huts/room-2.iob rename to objects/structure/mush-huts/room-2.iob diff --git a/objects/jigsaw/structure/mush-huts/room-3.iob b/objects/structure/mush-huts/room-3.iob similarity index 100% rename from objects/jigsaw/structure/mush-huts/room-3.iob rename to objects/structure/mush-huts/room-3.iob diff --git a/objects/jigsaw/structure/mush-huts/room-4.iob b/objects/structure/mush-huts/room-4.iob similarity index 100% rename from objects/jigsaw/structure/mush-huts/room-4.iob rename to objects/structure/mush-huts/room-4.iob diff --git a/objects/jigsaw/structure/mush-huts/walled-room-1.iob b/objects/structure/mush-huts/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/mush-huts/walled-room-1.iob rename to objects/structure/mush-huts/walled-room-1.iob diff --git a/objects/jigsaw/structure/mush-huts/walled-room-2.iob b/objects/structure/mush-huts/walled-room-2.iob similarity index 100% rename from objects/jigsaw/structure/mush-huts/walled-room-2.iob rename to objects/structure/mush-huts/walled-room-2.iob diff --git a/objects/jigsaw/structure/mush-huts/walled-room-3.iob b/objects/structure/mush-huts/walled-room-3.iob similarity index 100% rename from objects/jigsaw/structure/mush-huts/walled-room-3.iob rename to objects/structure/mush-huts/walled-room-3.iob diff --git a/objects/jigsaw/structure/mush-huts/walled-room-4.iob b/objects/structure/mush-huts/walled-room-4.iob similarity index 100% rename from objects/jigsaw/structure/mush-huts/walled-room-4.iob rename to objects/structure/mush-huts/walled-room-4.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/corner-1.iob b/objects/structure/ogMurkyCavern/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/corner-1.iob rename to objects/structure/ogMurkyCavern/corner-1.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/corner-2.iob b/objects/structure/ogMurkyCavern/corner-2.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/corner-2.iob rename to objects/structure/ogMurkyCavern/corner-2.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/corner-3.iob b/objects/structure/ogMurkyCavern/corner-3.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/corner-3.iob rename to objects/structure/ogMurkyCavern/corner-3.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/corner-4.iob b/objects/structure/ogMurkyCavern/corner-4.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/corner-4.iob rename to objects/structure/ogMurkyCavern/corner-4.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/cross-1.iob b/objects/structure/ogMurkyCavern/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/cross-1.iob rename to objects/structure/ogMurkyCavern/cross-1.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/cross-2.iob b/objects/structure/ogMurkyCavern/cross-2.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/cross-2.iob rename to objects/structure/ogMurkyCavern/cross-2.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/cross-3.iob b/objects/structure/ogMurkyCavern/cross-3.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/cross-3.iob rename to objects/structure/ogMurkyCavern/cross-3.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/cross-4.iob b/objects/structure/ogMurkyCavern/cross-4.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/cross-4.iob rename to objects/structure/ogMurkyCavern/cross-4.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/cross-5.iob b/objects/structure/ogMurkyCavern/cross-5.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/cross-5.iob rename to objects/structure/ogMurkyCavern/cross-5.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/cross-6.iob b/objects/structure/ogMurkyCavern/cross-6.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/cross-6.iob rename to objects/structure/ogMurkyCavern/cross-6.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/cross-7.iob b/objects/structure/ogMurkyCavern/cross-7.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/cross-7.iob rename to objects/structure/ogMurkyCavern/cross-7.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/cross-8.iob b/objects/structure/ogMurkyCavern/cross-8.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/cross-8.iob rename to objects/structure/ogMurkyCavern/cross-8.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/hall-1.iob b/objects/structure/ogMurkyCavern/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/hall-1.iob rename to objects/structure/ogMurkyCavern/hall-1.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/hall-2.iob b/objects/structure/ogMurkyCavern/hall-2.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/hall-2.iob rename to objects/structure/ogMurkyCavern/hall-2.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/hall-3.iob b/objects/structure/ogMurkyCavern/hall-3.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/hall-3.iob rename to objects/structure/ogMurkyCavern/hall-3.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/hall-4.iob b/objects/structure/ogMurkyCavern/hall-4.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/hall-4.iob rename to objects/structure/ogMurkyCavern/hall-4.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/room-1.iob b/objects/structure/ogMurkyCavern/room-1.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/room-1.iob rename to objects/structure/ogMurkyCavern/room-1.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/room-2.iob b/objects/structure/ogMurkyCavern/room-2.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/room-2.iob rename to objects/structure/ogMurkyCavern/room-2.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/room-3.iob b/objects/structure/ogMurkyCavern/room-3.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/room-3.iob rename to objects/structure/ogMurkyCavern/room-3.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/room-4.iob b/objects/structure/ogMurkyCavern/room-4.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/room-4.iob rename to objects/structure/ogMurkyCavern/room-4.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/t-connect-1.iob b/objects/structure/ogMurkyCavern/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/t-connect-1.iob rename to objects/structure/ogMurkyCavern/t-connect-1.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/t-connect-2.iob b/objects/structure/ogMurkyCavern/t-connect-2.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/t-connect-2.iob rename to objects/structure/ogMurkyCavern/t-connect-2.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/t-connect-3.iob b/objects/structure/ogMurkyCavern/t-connect-3.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/t-connect-3.iob rename to objects/structure/ogMurkyCavern/t-connect-3.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/t-connect-4.iob b/objects/structure/ogMurkyCavern/t-connect-4.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/t-connect-4.iob rename to objects/structure/ogMurkyCavern/t-connect-4.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/walled-room-1.iob b/objects/structure/ogMurkyCavern/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/walled-room-1.iob rename to objects/structure/ogMurkyCavern/walled-room-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/corner-ceiling-1.iob b/objects/structure/prismarine_temple/corner-ceiling-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/corner-ceiling-1.iob rename to objects/structure/prismarine_temple/corner-ceiling-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/corner-encased-1.iob b/objects/structure/prismarine_temple/corner-encased-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/corner-encased-1.iob rename to objects/structure/prismarine_temple/corner-encased-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/corner-encased-2.iob b/objects/structure/prismarine_temple/corner-encased-2.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/corner-encased-2.iob rename to objects/structure/prismarine_temple/corner-encased-2.iob diff --git a/objects/jigsaw/structure/prismarine_temple/corner-encased-3.iob b/objects/structure/prismarine_temple/corner-encased-3.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/corner-encased-3.iob rename to objects/structure/prismarine_temple/corner-encased-3.iob diff --git a/objects/jigsaw/structure/prismarine_temple/corner-floor-1.iob b/objects/structure/prismarine_temple/corner-floor-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/corner-floor-1.iob rename to objects/structure/prismarine_temple/corner-floor-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/corner-opening-1.iob b/objects/structure/prismarine_temple/corner-opening-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/corner-opening-1.iob rename to objects/structure/prismarine_temple/corner-opening-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/corner-opening-2.iob b/objects/structure/prismarine_temple/corner-opening-2.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/corner-opening-2.iob rename to objects/structure/prismarine_temple/corner-opening-2.iob diff --git a/objects/jigsaw/structure/prismarine_temple/cross-ceiling-1.iob b/objects/structure/prismarine_temple/cross-ceiling-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/cross-ceiling-1.iob rename to objects/structure/prismarine_temple/cross-ceiling-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/cross-encased-1.iob b/objects/structure/prismarine_temple/cross-encased-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/cross-encased-1.iob rename to objects/structure/prismarine_temple/cross-encased-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/cross-floor-1.iob b/objects/structure/prismarine_temple/cross-floor-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/cross-floor-1.iob rename to objects/structure/prismarine_temple/cross-floor-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/cross-opening-1.iob b/objects/structure/prismarine_temple/cross-opening-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/cross-opening-1.iob rename to objects/structure/prismarine_temple/cross-opening-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/hall-ceiling-1.iob b/objects/structure/prismarine_temple/hall-ceiling-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/hall-ceiling-1.iob rename to objects/structure/prismarine_temple/hall-ceiling-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/hall-encased-1.iob b/objects/structure/prismarine_temple/hall-encased-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/hall-encased-1.iob rename to objects/structure/prismarine_temple/hall-encased-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/hall-floor-1.iob b/objects/structure/prismarine_temple/hall-floor-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/hall-floor-1.iob rename to objects/structure/prismarine_temple/hall-floor-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/hall-floor-2.iob b/objects/structure/prismarine_temple/hall-floor-2.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/hall-floor-2.iob rename to objects/structure/prismarine_temple/hall-floor-2.iob diff --git a/objects/jigsaw/structure/prismarine_temple/hall-opening-1.iob b/objects/structure/prismarine_temple/hall-opening-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/hall-opening-1.iob rename to objects/structure/prismarine_temple/hall-opening-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/room-ceiling-1.iob b/objects/structure/prismarine_temple/room-ceiling-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/room-ceiling-1.iob rename to objects/structure/prismarine_temple/room-ceiling-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/room-encased-1.iob b/objects/structure/prismarine_temple/room-encased-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/room-encased-1.iob rename to objects/structure/prismarine_temple/room-encased-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/room-floor-1.iob b/objects/structure/prismarine_temple/room-floor-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/room-floor-1.iob rename to objects/structure/prismarine_temple/room-floor-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/room-opening-1.iob b/objects/structure/prismarine_temple/room-opening-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/room-opening-1.iob rename to objects/structure/prismarine_temple/room-opening-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/room-opening-2.iob b/objects/structure/prismarine_temple/room-opening-2.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/room-opening-2.iob rename to objects/structure/prismarine_temple/room-opening-2.iob diff --git a/objects/jigsaw/structure/prismarine_temple/t-connect-ceiling-1.iob b/objects/structure/prismarine_temple/t-connect-ceiling-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/t-connect-ceiling-1.iob rename to objects/structure/prismarine_temple/t-connect-ceiling-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/t-connect-encased-1.iob b/objects/structure/prismarine_temple/t-connect-encased-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/t-connect-encased-1.iob rename to objects/structure/prismarine_temple/t-connect-encased-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/t-connect-encased-2.iob b/objects/structure/prismarine_temple/t-connect-encased-2.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/t-connect-encased-2.iob rename to objects/structure/prismarine_temple/t-connect-encased-2.iob diff --git a/objects/jigsaw/structure/prismarine_temple/t-connect-encased-3.iob b/objects/structure/prismarine_temple/t-connect-encased-3.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/t-connect-encased-3.iob rename to objects/structure/prismarine_temple/t-connect-encased-3.iob diff --git a/objects/jigsaw/structure/prismarine_temple/t-connect-floor-1.iob b/objects/structure/prismarine_temple/t-connect-floor-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/t-connect-floor-1.iob rename to objects/structure/prismarine_temple/t-connect-floor-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/t-connect-floor-2.iob b/objects/structure/prismarine_temple/t-connect-floor-2.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/t-connect-floor-2.iob rename to objects/structure/prismarine_temple/t-connect-floor-2.iob diff --git a/objects/jigsaw/structure/prismarine_temple/t-connect-opening-1.iob b/objects/structure/prismarine_temple/t-connect-opening-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/t-connect-opening-1.iob rename to objects/structure/prismarine_temple/t-connect-opening-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/walled-room-ceiling-1.iob b/objects/structure/prismarine_temple/walled-room-ceiling-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/walled-room-ceiling-1.iob rename to objects/structure/prismarine_temple/walled-room-ceiling-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/walled-room-encased-1.iob b/objects/structure/prismarine_temple/walled-room-encased-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/walled-room-encased-1.iob rename to objects/structure/prismarine_temple/walled-room-encased-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/walled-room-floor-1.iob b/objects/structure/prismarine_temple/walled-room-floor-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/walled-room-floor-1.iob rename to objects/structure/prismarine_temple/walled-room-floor-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/walled-room-opening-1.iob b/objects/structure/prismarine_temple/walled-room-opening-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/walled-room-opening-1.iob rename to objects/structure/prismarine_temple/walled-room-opening-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/walled-room-opening-2.iob b/objects/structure/prismarine_temple/walled-room-opening-2.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/walled-room-opening-2.iob rename to objects/structure/prismarine_temple/walled-room-opening-2.iob diff --git a/objects/jigsaw/structure/prismarine_temple/walled-room-opening-3.iob b/objects/structure/prismarine_temple/walled-room-opening-3.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/walled-room-opening-3.iob rename to objects/structure/prismarine_temple/walled-room-opening-3.iob diff --git a/objects/jigsaw/structure/ruins/corner-1.iob b/objects/structure/ruins/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/ruins/corner-1.iob rename to objects/structure/ruins/corner-1.iob diff --git a/objects/jigsaw/structure/ruins/cross-1.iob b/objects/structure/ruins/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/ruins/cross-1.iob rename to objects/structure/ruins/cross-1.iob diff --git a/objects/jigsaw/structure/ruins/cross-2.iob b/objects/structure/ruins/cross-2.iob similarity index 100% rename from objects/jigsaw/structure/ruins/cross-2.iob rename to objects/structure/ruins/cross-2.iob diff --git a/objects/jigsaw/structure/ruins/cross-3.iob b/objects/structure/ruins/cross-3.iob similarity index 100% rename from objects/jigsaw/structure/ruins/cross-3.iob rename to objects/structure/ruins/cross-3.iob diff --git a/objects/jigsaw/structure/ruins/hall-1.iob b/objects/structure/ruins/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/ruins/hall-1.iob rename to objects/structure/ruins/hall-1.iob diff --git a/objects/jigsaw/structure/ruins/hall-2.iob b/objects/structure/ruins/hall-2.iob similarity index 100% rename from objects/jigsaw/structure/ruins/hall-2.iob rename to objects/structure/ruins/hall-2.iob diff --git a/objects/jigsaw/structure/ruins/room-1.iob b/objects/structure/ruins/room-1.iob similarity index 100% rename from objects/jigsaw/structure/ruins/room-1.iob rename to objects/structure/ruins/room-1.iob diff --git a/objects/jigsaw/structure/ruins/t-connect-1.iob b/objects/structure/ruins/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/ruins/t-connect-1.iob rename to objects/structure/ruins/t-connect-1.iob diff --git a/objects/jigsaw/structure/ruins/t-connect-2.iob b/objects/structure/ruins/t-connect-2.iob similarity index 100% rename from objects/jigsaw/structure/ruins/t-connect-2.iob rename to objects/structure/ruins/t-connect-2.iob diff --git a/objects/jigsaw/structure/ruins/walled-room-1.iob b/objects/structure/ruins/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/ruins/walled-room-1.iob rename to objects/structure/ruins/walled-room-1.iob diff --git a/objects/jigsaw/structure/soul-temple/corner-1.iob b/objects/structure/soul-temple/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/corner-1.iob rename to objects/structure/soul-temple/corner-1.iob diff --git a/objects/jigsaw/structure/soul-temple/cross-1.iob b/objects/structure/soul-temple/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/cross-1.iob rename to objects/structure/soul-temple/cross-1.iob diff --git a/objects/jigsaw/structure/soul-temple/cross-2.iob b/objects/structure/soul-temple/cross-2.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/cross-2.iob rename to objects/structure/soul-temple/cross-2.iob diff --git a/objects/jigsaw/structure/soul-temple/hall-1.iob b/objects/structure/soul-temple/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/hall-1.iob rename to objects/structure/soul-temple/hall-1.iob diff --git a/objects/jigsaw/structure/soul-temple/room-1.iob b/objects/structure/soul-temple/room-1.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/room-1.iob rename to objects/structure/soul-temple/room-1.iob diff --git a/objects/jigsaw/structure/soul-temple/room-2.iob b/objects/structure/soul-temple/room-2.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/room-2.iob rename to objects/structure/soul-temple/room-2.iob diff --git a/objects/jigsaw/structure/soul-temple/room-3.iob b/objects/structure/soul-temple/room-3.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/room-3.iob rename to objects/structure/soul-temple/room-3.iob diff --git a/objects/jigsaw/structure/soul-temple/room-4.iob b/objects/structure/soul-temple/room-4.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/room-4.iob rename to objects/structure/soul-temple/room-4.iob diff --git a/objects/jigsaw/structure/soul-temple/t-connect-1.iob b/objects/structure/soul-temple/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/t-connect-1.iob rename to objects/structure/soul-temple/t-connect-1.iob diff --git a/objects/jigsaw/structure/soul-temple/walled-room-1.iob b/objects/structure/soul-temple/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/walled-room-1.iob rename to objects/structure/soul-temple/walled-room-1.iob diff --git a/objects/jigsaw/structure/stone-village/corner-1.iob b/objects/structure/stone-village/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/corner-1.iob rename to objects/structure/stone-village/corner-1.iob diff --git a/objects/jigsaw/structure/stone-village/corner-2.iob b/objects/structure/stone-village/corner-2.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/corner-2.iob rename to objects/structure/stone-village/corner-2.iob diff --git a/objects/jigsaw/structure/stone-village/corner-3.iob b/objects/structure/stone-village/corner-3.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/corner-3.iob rename to objects/structure/stone-village/corner-3.iob diff --git a/objects/jigsaw/structure/stone-village/corner-4.iob b/objects/structure/stone-village/corner-4.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/corner-4.iob rename to objects/structure/stone-village/corner-4.iob diff --git a/objects/jigsaw/structure/stone-village/cross-1.iob b/objects/structure/stone-village/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/cross-1.iob rename to objects/structure/stone-village/cross-1.iob diff --git a/objects/jigsaw/structure/stone-village/cross-2.iob b/objects/structure/stone-village/cross-2.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/cross-2.iob rename to objects/structure/stone-village/cross-2.iob diff --git a/objects/jigsaw/structure/stone-village/cross-3.iob b/objects/structure/stone-village/cross-3.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/cross-3.iob rename to objects/structure/stone-village/cross-3.iob diff --git a/objects/jigsaw/structure/stone-village/cross-4.iob b/objects/structure/stone-village/cross-4.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/cross-4.iob rename to objects/structure/stone-village/cross-4.iob diff --git a/objects/jigsaw/structure/stone-village/cross-5.iob b/objects/structure/stone-village/cross-5.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/cross-5.iob rename to objects/structure/stone-village/cross-5.iob diff --git a/objects/jigsaw/structure/stone-village/hall-1.iob b/objects/structure/stone-village/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/hall-1.iob rename to objects/structure/stone-village/hall-1.iob diff --git a/objects/jigsaw/structure/stone-village/hall-2.iob b/objects/structure/stone-village/hall-2.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/hall-2.iob rename to objects/structure/stone-village/hall-2.iob diff --git a/objects/jigsaw/structure/stone-village/hall-3.iob b/objects/structure/stone-village/hall-3.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/hall-3.iob rename to objects/structure/stone-village/hall-3.iob diff --git a/objects/jigsaw/structure/stone-village/hall-4.iob b/objects/structure/stone-village/hall-4.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/hall-4.iob rename to objects/structure/stone-village/hall-4.iob diff --git a/objects/jigsaw/structure/stone-village/room-1.iob b/objects/structure/stone-village/room-1.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/room-1.iob rename to objects/structure/stone-village/room-1.iob diff --git a/objects/jigsaw/structure/stone-village/room-2.iob b/objects/structure/stone-village/room-2.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/room-2.iob rename to objects/structure/stone-village/room-2.iob diff --git a/objects/jigsaw/structure/stone-village/room-3.iob b/objects/structure/stone-village/room-3.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/room-3.iob rename to objects/structure/stone-village/room-3.iob diff --git a/objects/jigsaw/structure/stone-village/room-4.iob b/objects/structure/stone-village/room-4.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/room-4.iob rename to objects/structure/stone-village/room-4.iob diff --git a/objects/jigsaw/structure/stone-village/room-5.iob b/objects/structure/stone-village/room-5.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/room-5.iob rename to objects/structure/stone-village/room-5.iob diff --git a/objects/jigsaw/structure/stone-village/room-6.iob b/objects/structure/stone-village/room-6.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/room-6.iob rename to objects/structure/stone-village/room-6.iob diff --git a/objects/jigsaw/structure/stone-village/room-7.iob b/objects/structure/stone-village/room-7.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/room-7.iob rename to objects/structure/stone-village/room-7.iob diff --git a/objects/jigsaw/structure/stone-village/room-8.iob b/objects/structure/stone-village/room-8.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/room-8.iob rename to objects/structure/stone-village/room-8.iob diff --git a/objects/jigsaw/structure/stone-village/t-connect-1.iob b/objects/structure/stone-village/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/t-connect-1.iob rename to objects/structure/stone-village/t-connect-1.iob diff --git a/objects/jigsaw/structure/stone-village/t-connect-2.iob b/objects/structure/stone-village/t-connect-2.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/t-connect-2.iob rename to objects/structure/stone-village/t-connect-2.iob diff --git a/objects/jigsaw/structure/stone-village/t-connect-3.iob b/objects/structure/stone-village/t-connect-3.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/t-connect-3.iob rename to objects/structure/stone-village/t-connect-3.iob diff --git a/objects/jigsaw/structure/stone-village/t-connect-4.iob b/objects/structure/stone-village/t-connect-4.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/t-connect-4.iob rename to objects/structure/stone-village/t-connect-4.iob diff --git a/objects/jigsaw/structure/stone-village/t-connect-5.iob b/objects/structure/stone-village/t-connect-5.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/t-connect-5.iob rename to objects/structure/stone-village/t-connect-5.iob diff --git a/objects/jigsaw/structure/stone-village/walled-room-1.iob b/objects/structure/stone-village/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/walled-room-1.iob rename to objects/structure/stone-village/walled-room-1.iob diff --git a/objects/jigsaw/structure/stone-village/walled-room-2.iob b/objects/structure/stone-village/walled-room-2.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/walled-room-2.iob rename to objects/structure/stone-village/walled-room-2.iob diff --git a/objects/jigsaw/structure/village-stone/corner-1.iob b/objects/structure/village-stone/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/corner-1.iob rename to objects/structure/village-stone/corner-1.iob diff --git a/objects/jigsaw/structure/village-stone/corner-2.iob b/objects/structure/village-stone/corner-2.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/corner-2.iob rename to objects/structure/village-stone/corner-2.iob diff --git a/objects/jigsaw/structure/village-stone/corner-3.iob b/objects/structure/village-stone/corner-3.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/corner-3.iob rename to objects/structure/village-stone/corner-3.iob diff --git a/objects/jigsaw/structure/village-stone/corner-4.iob b/objects/structure/village-stone/corner-4.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/corner-4.iob rename to objects/structure/village-stone/corner-4.iob diff --git a/objects/jigsaw/structure/village-stone/cross-1.iob b/objects/structure/village-stone/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/cross-1.iob rename to objects/structure/village-stone/cross-1.iob diff --git a/objects/jigsaw/structure/village-stone/cross-2.iob b/objects/structure/village-stone/cross-2.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/cross-2.iob rename to objects/structure/village-stone/cross-2.iob diff --git a/objects/jigsaw/structure/village-stone/cross-3.iob b/objects/structure/village-stone/cross-3.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/cross-3.iob rename to objects/structure/village-stone/cross-3.iob diff --git a/objects/jigsaw/structure/village-stone/cross-4.iob b/objects/structure/village-stone/cross-4.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/cross-4.iob rename to objects/structure/village-stone/cross-4.iob diff --git a/objects/jigsaw/structure/village-stone/cross-5.iob b/objects/structure/village-stone/cross-5.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/cross-5.iob rename to objects/structure/village-stone/cross-5.iob diff --git a/objects/jigsaw/structure/village-stone/hall-1.iob b/objects/structure/village-stone/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/hall-1.iob rename to objects/structure/village-stone/hall-1.iob diff --git a/objects/jigsaw/structure/village-stone/hall-2.iob b/objects/structure/village-stone/hall-2.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/hall-2.iob rename to objects/structure/village-stone/hall-2.iob diff --git a/objects/jigsaw/structure/village-stone/hall-3.iob b/objects/structure/village-stone/hall-3.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/hall-3.iob rename to objects/structure/village-stone/hall-3.iob diff --git a/objects/jigsaw/structure/village-stone/hall-4.iob b/objects/structure/village-stone/hall-4.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/hall-4.iob rename to objects/structure/village-stone/hall-4.iob diff --git a/objects/jigsaw/structure/village-stone/room-..iob b/objects/structure/village-stone/room-..iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-..iob rename to objects/structure/village-stone/room-..iob diff --git a/objects/jigsaw/structure/village-stone/room-1.iob b/objects/structure/village-stone/room-1.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-1.iob rename to objects/structure/village-stone/room-1.iob diff --git a/objects/jigsaw/structure/village-stone/room-2.iob b/objects/structure/village-stone/room-2.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-2.iob rename to objects/structure/village-stone/room-2.iob diff --git a/objects/jigsaw/structure/village-stone/room-3.iob b/objects/structure/village-stone/room-3.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-3.iob rename to objects/structure/village-stone/room-3.iob diff --git a/objects/jigsaw/structure/village-stone/room-4.iob b/objects/structure/village-stone/room-4.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-4.iob rename to objects/structure/village-stone/room-4.iob diff --git a/objects/jigsaw/structure/village-stone/room-5.iob b/objects/structure/village-stone/room-5.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-5.iob rename to objects/structure/village-stone/room-5.iob diff --git a/objects/jigsaw/structure/village-stone/room-6.iob b/objects/structure/village-stone/room-6.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-6.iob rename to objects/structure/village-stone/room-6.iob diff --git a/objects/jigsaw/structure/village-stone/room-7.iob b/objects/structure/village-stone/room-7.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-7.iob rename to objects/structure/village-stone/room-7.iob diff --git a/objects/jigsaw/structure/village-stone/room-8.iob b/objects/structure/village-stone/room-8.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-8.iob rename to objects/structure/village-stone/room-8.iob diff --git a/objects/jigsaw/structure/village-stone/t-connect-1.iob b/objects/structure/village-stone/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/t-connect-1.iob rename to objects/structure/village-stone/t-connect-1.iob diff --git a/objects/jigsaw/structure/village-stone/t-connect-2.iob b/objects/structure/village-stone/t-connect-2.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/t-connect-2.iob rename to objects/structure/village-stone/t-connect-2.iob diff --git a/objects/jigsaw/structure/village-stone/t-connect-3.iob b/objects/structure/village-stone/t-connect-3.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/t-connect-3.iob rename to objects/structure/village-stone/t-connect-3.iob diff --git a/objects/jigsaw/structure/village-stone/t-connect-4.iob b/objects/structure/village-stone/t-connect-4.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/t-connect-4.iob rename to objects/structure/village-stone/t-connect-4.iob diff --git a/objects/jigsaw/structure/village-stone/t-connect-5.iob b/objects/structure/village-stone/t-connect-5.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/t-connect-5.iob rename to objects/structure/village-stone/t-connect-5.iob diff --git a/objects/jigsaw/structure/village-stone/walled-room-1.iob b/objects/structure/village-stone/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/walled-room-1.iob rename to objects/structure/village-stone/walled-room-1.iob diff --git a/objects/jigsaw/structure/village-temperate/f-ew.iob b/objects/structure/village-temperate/f-ew.iob similarity index 100% rename from objects/jigsaw/structure/village-temperate/f-ew.iob rename to objects/structure/village-temperate/f-ew.iob diff --git a/objects/jigsaw/structure/village-temperate/f-ne.iob b/objects/structure/village-temperate/f-ne.iob similarity index 100% rename from objects/jigsaw/structure/village-temperate/f-ne.iob rename to objects/structure/village-temperate/f-ne.iob diff --git a/objects/jigsaw/structure/village-temperate/f-nes.iob b/objects/structure/village-temperate/f-nes.iob similarity index 100% rename from objects/jigsaw/structure/village-temperate/f-nes.iob rename to objects/structure/village-temperate/f-nes.iob diff --git a/objects/jigsaw/structure/village-temperate/f-x.iob b/objects/structure/village-temperate/f-x.iob similarity index 100% rename from objects/jigsaw/structure/village-temperate/f-x.iob rename to objects/structure/village-temperate/f-x.iob diff --git a/objects/jigsaw/structure/village/corner-1.iob b/objects/structure/village/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/village/corner-1.iob rename to objects/structure/village/corner-1.iob diff --git a/objects/jigsaw/structure/village/corner-se-1.iob b/objects/structure/village/corner-se-1.iob similarity index 100% rename from objects/jigsaw/structure/village/corner-se-1.iob rename to objects/structure/village/corner-se-1.iob diff --git a/objects/jigsaw/structure/village/corner-se-2.iob b/objects/structure/village/corner-se-2.iob similarity index 100% rename from objects/jigsaw/structure/village/corner-se-2.iob rename to objects/structure/village/corner-se-2.iob diff --git a/objects/jigsaw/structure/village/corner-se-3.iob b/objects/structure/village/corner-se-3.iob similarity index 100% rename from objects/jigsaw/structure/village/corner-se-3.iob rename to objects/structure/village/corner-se-3.iob diff --git a/objects/jigsaw/structure/village/corner-se-4.iob b/objects/structure/village/corner-se-4.iob similarity index 100% rename from objects/jigsaw/structure/village/corner-se-4.iob rename to objects/structure/village/corner-se-4.iob diff --git a/objects/jigsaw/structure/village/cross-1.iob b/objects/structure/village/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-1.iob rename to objects/structure/village/cross-1.iob diff --git a/objects/jigsaw/structure/village/cross-10.iob b/objects/structure/village/cross-10.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-10.iob rename to objects/structure/village/cross-10.iob diff --git a/objects/jigsaw/structure/village/cross-11.iob b/objects/structure/village/cross-11.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-11.iob rename to objects/structure/village/cross-11.iob diff --git a/objects/jigsaw/structure/village/cross-12.iob b/objects/structure/village/cross-12.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-12.iob rename to objects/structure/village/cross-12.iob diff --git a/objects/jigsaw/structure/village/cross-2.iob b/objects/structure/village/cross-2.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-2.iob rename to objects/structure/village/cross-2.iob diff --git a/objects/jigsaw/structure/village/cross-3.iob b/objects/structure/village/cross-3.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-3.iob rename to objects/structure/village/cross-3.iob diff --git a/objects/jigsaw/structure/village/cross-4.iob b/objects/structure/village/cross-4.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-4.iob rename to objects/structure/village/cross-4.iob diff --git a/objects/jigsaw/structure/village/cross-5.iob b/objects/structure/village/cross-5.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-5.iob rename to objects/structure/village/cross-5.iob diff --git a/objects/jigsaw/structure/village/cross-6.iob b/objects/structure/village/cross-6.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-6.iob rename to objects/structure/village/cross-6.iob diff --git a/objects/jigsaw/structure/village/cross-7.iob b/objects/structure/village/cross-7.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-7.iob rename to objects/structure/village/cross-7.iob diff --git a/objects/jigsaw/structure/village/cross-8.iob b/objects/structure/village/cross-8.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-8.iob rename to objects/structure/village/cross-8.iob diff --git a/objects/jigsaw/structure/village/cross-9.iob b/objects/structure/village/cross-9.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-9.iob rename to objects/structure/village/cross-9.iob diff --git a/objects/jigsaw/structure/village/cross-a-1.iob b/objects/structure/village/cross-a-1.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-a-1.iob rename to objects/structure/village/cross-a-1.iob diff --git a/objects/jigsaw/structure/village/cross-a-2.iob b/objects/structure/village/cross-a-2.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-a-2.iob rename to objects/structure/village/cross-a-2.iob diff --git a/objects/jigsaw/structure/village/cross-a-3.iob b/objects/structure/village/cross-a-3.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-a-3.iob rename to objects/structure/village/cross-a-3.iob diff --git a/objects/jigsaw/structure/village/cross-a-4.iob b/objects/structure/village/cross-a-4.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-a-4.iob rename to objects/structure/village/cross-a-4.iob diff --git a/objects/jigsaw/structure/village/cross-a-5.iob b/objects/structure/village/cross-a-5.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-a-5.iob rename to objects/structure/village/cross-a-5.iob diff --git a/objects/jigsaw/structure/village/hall-1.iob b/objects/structure/village/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/village/hall-1.iob rename to objects/structure/village/hall-1.iob diff --git a/objects/jigsaw/structure/village/hall-we-1.iob b/objects/structure/village/hall-we-1.iob similarity index 100% rename from objects/jigsaw/structure/village/hall-we-1.iob rename to objects/structure/village/hall-we-1.iob diff --git a/objects/jigsaw/structure/village/hall-we-2.iob b/objects/structure/village/hall-we-2.iob similarity index 100% rename from objects/jigsaw/structure/village/hall-we-2.iob rename to objects/structure/village/hall-we-2.iob diff --git a/objects/jigsaw/structure/village/hall-we-3.iob b/objects/structure/village/hall-we-3.iob similarity index 100% rename from objects/jigsaw/structure/village/hall-we-3.iob rename to objects/structure/village/hall-we-3.iob diff --git a/objects/jigsaw/structure/village/hall-we-4.iob b/objects/structure/village/hall-we-4.iob similarity index 100% rename from objects/jigsaw/structure/village/hall-we-4.iob rename to objects/structure/village/hall-we-4.iob diff --git a/objects/jigsaw/structure/village/room-1.iob b/objects/structure/village/room-1.iob similarity index 100% rename from objects/jigsaw/structure/village/room-1.iob rename to objects/structure/village/room-1.iob diff --git a/objects/jigsaw/structure/village/room-crop-sew-1.iob b/objects/structure/village/room-crop-sew-1.iob similarity index 100% rename from objects/jigsaw/structure/village/room-crop-sew-1.iob rename to objects/structure/village/room-crop-sew-1.iob diff --git a/objects/jigsaw/structure/village/room-crop-sew-2.iob b/objects/structure/village/room-crop-sew-2.iob similarity index 100% rename from objects/jigsaw/structure/village/room-crop-sew-2.iob rename to objects/structure/village/room-crop-sew-2.iob diff --git a/objects/jigsaw/structure/village/room-crop-sew-3.iob b/objects/structure/village/room-crop-sew-3.iob similarity index 100% rename from objects/jigsaw/structure/village/room-crop-sew-3.iob rename to objects/structure/village/room-crop-sew-3.iob diff --git a/objects/jigsaw/structure/village/room-crop-wheat-sew-1.iob b/objects/structure/village/room-crop-wheat-sew-1.iob similarity index 100% rename from objects/jigsaw/structure/village/room-crop-wheat-sew-1.iob rename to objects/structure/village/room-crop-wheat-sew-1.iob diff --git a/objects/jigsaw/structure/village/room-crop-wheat-sew-2.iob b/objects/structure/village/room-crop-wheat-sew-2.iob similarity index 100% rename from objects/jigsaw/structure/village/room-crop-wheat-sew-2.iob rename to objects/structure/village/room-crop-wheat-sew-2.iob diff --git a/objects/jigsaw/structure/village/room-crop-wheat-sew-3.iob b/objects/structure/village/room-crop-wheat-sew-3.iob similarity index 100% rename from objects/jigsaw/structure/village/room-crop-wheat-sew-3.iob rename to objects/structure/village/room-crop-wheat-sew-3.iob diff --git a/objects/jigsaw/structure/village/room-dirt-sew-1.iob b/objects/structure/village/room-dirt-sew-1.iob similarity index 100% rename from objects/jigsaw/structure/village/room-dirt-sew-1.iob rename to objects/structure/village/room-dirt-sew-1.iob diff --git a/objects/jigsaw/structure/village/t-connect-1.iob b/objects/structure/village/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/village/t-connect-1.iob rename to objects/structure/village/t-connect-1.iob diff --git a/objects/jigsaw/structure/village/tcross-e-1.iob b/objects/structure/village/tcross-e-1.iob similarity index 100% rename from objects/jigsaw/structure/village/tcross-e-1.iob rename to objects/structure/village/tcross-e-1.iob diff --git a/objects/jigsaw/structure/village/tcross-e-2.iob b/objects/structure/village/tcross-e-2.iob similarity index 100% rename from objects/jigsaw/structure/village/tcross-e-2.iob rename to objects/structure/village/tcross-e-2.iob diff --git a/objects/jigsaw/structure/village/tcross-e-3.iob b/objects/structure/village/tcross-e-3.iob similarity index 100% rename from objects/jigsaw/structure/village/tcross-e-3.iob rename to objects/structure/village/tcross-e-3.iob diff --git a/objects/jigsaw/structure/village/tcross-e-4.iob b/objects/structure/village/tcross-e-4.iob similarity index 100% rename from objects/jigsaw/structure/village/tcross-e-4.iob rename to objects/structure/village/tcross-e-4.iob diff --git a/objects/jigsaw/structure/village/walled-room-1.iob b/objects/structure/village/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/village/walled-room-1.iob rename to objects/structure/village/walled-room-1.iob diff --git a/objects/clutter/stump-dark/stump3.iob b/objects/stump-dark/stump3.iob similarity index 100% rename from objects/clutter/stump-dark/stump3.iob rename to objects/stump-dark/stump3.iob diff --git a/objects/clutter/stump/grave-1.iob b/objects/stump/grave-1.iob similarity index 100% rename from objects/clutter/stump/grave-1.iob rename to objects/stump/grave-1.iob diff --git a/objects/clutter/stump/stump1.iob b/objects/stump/stump1.iob similarity index 100% rename from objects/clutter/stump/stump1.iob rename to objects/stump/stump1.iob diff --git a/objects/clutter/stump/stump2.iob b/objects/stump/stump2.iob similarity index 100% rename from objects/clutter/stump/stump2.iob rename to objects/stump/stump2.iob diff --git a/objects/clutter/stump/stump3.iob b/objects/stump/stump3.iob similarity index 100% rename from objects/clutter/stump/stump3.iob rename to objects/stump/stump3.iob diff --git a/objects/clutter/stump/stump4.iob b/objects/stump/stump4.iob similarity index 100% rename from objects/clutter/stump/stump4.iob rename to objects/stump/stump4.iob diff --git a/objects/clutter/stump/stump5.iob b/objects/stump/stump5.iob similarity index 100% rename from objects/clutter/stump/stump5.iob rename to objects/stump/stump5.iob diff --git a/objects/clutter/stump/stump6.iob b/objects/stump/stump6.iob similarity index 100% rename from objects/clutter/stump/stump6.iob rename to objects/stump/stump6.iob diff --git a/objects/trees/oak/swoak1.iob b/objects/swampy-oak/swampy1.iob similarity index 100% rename from objects/trees/oak/swoak1.iob rename to objects/swampy-oak/swampy1.iob diff --git a/objects/trees/oak/swoak2.iob b/objects/swampy-oak/swampy2.iob similarity index 100% rename from objects/trees/oak/swoak2.iob rename to objects/swampy-oak/swampy2.iob diff --git a/objects/trees/oak/swoak3.iob b/objects/swampy-oak/swampy3.iob similarity index 100% rename from objects/trees/oak/swoak3.iob rename to objects/swampy-oak/swampy3.iob diff --git a/objects/trees/oak/swoak4.iob b/objects/swampy-oak/swampy4.iob similarity index 100% rename from objects/trees/oak/swoak4.iob rename to objects/swampy-oak/swampy4.iob diff --git a/objects/trees/oak/swoak5.iob b/objects/swampy-oak/swampy5.iob similarity index 100% rename from objects/trees/oak/swoak5.iob rename to objects/swampy-oak/swampy5.iob diff --git a/objects/structures/tentacle-cold/TentacleCold1.iob b/objects/tentacle-cold/TentacleCold1.iob similarity index 100% rename from objects/structures/tentacle-cold/TentacleCold1.iob rename to objects/tentacle-cold/TentacleCold1.iob diff --git a/objects/structures/tentacle-cold/TentacleCold2.iob b/objects/tentacle-cold/TentacleCold2.iob similarity index 100% rename from objects/structures/tentacle-cold/TentacleCold2.iob rename to objects/tentacle-cold/TentacleCold2.iob diff --git a/objects/structures/tentacle-cold/TentacleCold3.iob b/objects/tentacle-cold/TentacleCold3.iob similarity index 100% rename from objects/structures/tentacle-cold/TentacleCold3.iob rename to objects/tentacle-cold/TentacleCold3.iob diff --git a/objects/structures/tentacle-cold/TentacleCold4.iob b/objects/tentacle-cold/TentacleCold4.iob similarity index 100% rename from objects/structures/tentacle-cold/TentacleCold4.iob rename to objects/tentacle-cold/TentacleCold4.iob diff --git a/objects/structures/tentacle-cold/TentacleCold5.iob b/objects/tentacle-cold/TentacleCold5.iob similarity index 100% rename from objects/structures/tentacle-cold/TentacleCold5.iob rename to objects/tentacle-cold/TentacleCold5.iob diff --git a/objects/structures/tentacle-cold/TentacleCold6.iob b/objects/tentacle-cold/TentacleCold6.iob similarity index 100% rename from objects/structures/tentacle-cold/TentacleCold6.iob rename to objects/tentacle-cold/TentacleCold6.iob diff --git a/objects/structures/tentacle-cold/TentacleCold7.iob b/objects/tentacle-cold/TentacleCold7.iob similarity index 100% rename from objects/structures/tentacle-cold/TentacleCold7.iob rename to objects/tentacle-cold/TentacleCold7.iob diff --git a/objects/structures/tentacle-cold/TentacleCold8.iob b/objects/tentacle-cold/TentacleCold8.iob similarity index 100% rename from objects/structures/tentacle-cold/TentacleCold8.iob rename to objects/tentacle-cold/TentacleCold8.iob diff --git a/objects/structures/tentacle-darkwood/TentacleDarkWood3.iob b/objects/tentacle-darkwood/TentacleDarkWood3.iob similarity index 100% rename from objects/structures/tentacle-darkwood/TentacleDarkWood3.iob rename to objects/tentacle-darkwood/TentacleDarkWood3.iob diff --git a/objects/structures/tentacle-darkwood/TentacleDarkWood6.iob b/objects/tentacle-darkwood/TentacleDarkWood6.iob similarity index 100% rename from objects/structures/tentacle-darkwood/TentacleDarkWood6.iob rename to objects/tentacle-darkwood/TentacleDarkWood6.iob diff --git a/objects/structures/tentacle-darkwood/TentacleDarkWood8.iob b/objects/tentacle-darkwood/TentacleDarkWood8.iob similarity index 100% rename from objects/structures/tentacle-darkwood/TentacleDarkWood8.iob rename to objects/tentacle-darkwood/TentacleDarkWood8.iob diff --git a/objects/structures/tentacle-fire/TentacleFire1.iob b/objects/tentacle-fire/TentacleFire1.iob similarity index 100% rename from objects/structures/tentacle-fire/TentacleFire1.iob rename to objects/tentacle-fire/TentacleFire1.iob diff --git a/objects/structures/tentacle-fire/TentacleFire2.iob b/objects/tentacle-fire/TentacleFire2.iob similarity index 100% rename from objects/structures/tentacle-fire/TentacleFire2.iob rename to objects/tentacle-fire/TentacleFire2.iob diff --git a/objects/structures/tentacle-fire/TentacleFire3.iob b/objects/tentacle-fire/TentacleFire3.iob similarity index 100% rename from objects/structures/tentacle-fire/TentacleFire3.iob rename to objects/tentacle-fire/TentacleFire3.iob diff --git a/objects/structures/tentacle-fire/TentacleFire4.iob b/objects/tentacle-fire/TentacleFire4.iob similarity index 100% rename from objects/structures/tentacle-fire/TentacleFire4.iob rename to objects/tentacle-fire/TentacleFire4.iob diff --git a/objects/structures/tentacle-fire/TentacleFire5.iob b/objects/tentacle-fire/TentacleFire5.iob similarity index 100% rename from objects/structures/tentacle-fire/TentacleFire5.iob rename to objects/tentacle-fire/TentacleFire5.iob diff --git a/objects/structures/tentacle-fire/TentacleFire6.iob b/objects/tentacle-fire/TentacleFire6.iob similarity index 100% rename from objects/structures/tentacle-fire/TentacleFire6.iob rename to objects/tentacle-fire/TentacleFire6.iob diff --git a/objects/structures/tentacle-fire/TentacleFire7.iob b/objects/tentacle-fire/TentacleFire7.iob similarity index 100% rename from objects/structures/tentacle-fire/TentacleFire7.iob rename to objects/tentacle-fire/TentacleFire7.iob diff --git a/objects/structures/tentacle-fire/TentacleFire8.iob b/objects/tentacle-fire/TentacleFire8.iob similarity index 100% rename from objects/structures/tentacle-fire/TentacleFire8.iob rename to objects/tentacle-fire/TentacleFire8.iob diff --git a/objects/structures/tentacle-oak/TentacleOak1.iob b/objects/tentacle-oak/TentacleOak1.iob similarity index 100% rename from objects/structures/tentacle-oak/TentacleOak1.iob rename to objects/tentacle-oak/TentacleOak1.iob diff --git a/objects/structures/tentacle-oak/TentacleOak2.iob b/objects/tentacle-oak/TentacleOak2.iob similarity index 100% rename from objects/structures/tentacle-oak/TentacleOak2.iob rename to objects/tentacle-oak/TentacleOak2.iob diff --git a/objects/structures/tentacle-oak/TentacleOak3.iob b/objects/tentacle-oak/TentacleOak3.iob similarity index 100% rename from objects/structures/tentacle-oak/TentacleOak3.iob rename to objects/tentacle-oak/TentacleOak3.iob diff --git a/objects/structures/tentacle-oak/TentacleOak4.iob b/objects/tentacle-oak/TentacleOak4.iob similarity index 100% rename from objects/structures/tentacle-oak/TentacleOak4.iob rename to objects/tentacle-oak/TentacleOak4.iob diff --git a/objects/structures/tentacle-oak/TentacleOak5.iob b/objects/tentacle-oak/TentacleOak5.iob similarity index 100% rename from objects/structures/tentacle-oak/TentacleOak5.iob rename to objects/tentacle-oak/TentacleOak5.iob diff --git a/objects/structures/tentacle-oak/TentacleOak6.iob b/objects/tentacle-oak/TentacleOak6.iob similarity index 100% rename from objects/structures/tentacle-oak/TentacleOak6.iob rename to objects/tentacle-oak/TentacleOak6.iob diff --git a/objects/structures/tentacle-oak/TentacleOak7.iob b/objects/tentacle-oak/TentacleOak7.iob similarity index 100% rename from objects/structures/tentacle-oak/TentacleOak7.iob rename to objects/tentacle-oak/TentacleOak7.iob diff --git a/objects/structures/tentacle-oak/TentacleOak8.iob b/objects/tentacle-oak/TentacleOak8.iob similarity index 100% rename from objects/structures/tentacle-oak/TentacleOak8.iob rename to objects/tentacle-oak/TentacleOak8.iob diff --git a/objects/structures/tentacle-slime/TentacleSlimy1.iob b/objects/tentacle-slime/TentacleSlimy1.iob similarity index 100% rename from objects/structures/tentacle-slime/TentacleSlimy1.iob rename to objects/tentacle-slime/TentacleSlimy1.iob diff --git a/objects/structures/tentacle-slime/TentacleSlimy2.iob b/objects/tentacle-slime/TentacleSlimy2.iob similarity index 100% rename from objects/structures/tentacle-slime/TentacleSlimy2.iob rename to objects/tentacle-slime/TentacleSlimy2.iob diff --git a/objects/structures/tentacle-slime/TentacleSlimy3.iob b/objects/tentacle-slime/TentacleSlimy3.iob similarity index 100% rename from objects/structures/tentacle-slime/TentacleSlimy3.iob rename to objects/tentacle-slime/TentacleSlimy3.iob diff --git a/objects/structures/tentacle-slime/TentacleSlimy4.iob b/objects/tentacle-slime/TentacleSlimy4.iob similarity index 100% rename from objects/structures/tentacle-slime/TentacleSlimy4.iob rename to objects/tentacle-slime/TentacleSlimy4.iob diff --git a/objects/structures/tentacle-slime/TentacleSlimy5.iob b/objects/tentacle-slime/TentacleSlimy5.iob similarity index 100% rename from objects/structures/tentacle-slime/TentacleSlimy5.iob rename to objects/tentacle-slime/TentacleSlimy5.iob diff --git a/objects/structures/tentacle-slime/TentacleSlimy7.iob b/objects/tentacle-slime/TentacleSlimy7.iob similarity index 100% rename from objects/structures/tentacle-slime/TentacleSlimy7.iob rename to objects/tentacle-slime/TentacleSlimy7.iob diff --git a/objects/structures/tentacle-slime/TentacleSlimy8.iob b/objects/tentacle-slime/TentacleSlimy8.iob similarity index 100% rename from objects/structures/tentacle-slime/TentacleSlimy8.iob rename to objects/tentacle-slime/TentacleSlimy8.iob diff --git a/objects/trees/mixed/tourmaline-large/purp1.iob b/objects/tourmaline-large/purp1.iob similarity index 100% rename from objects/trees/mixed/tourmaline-large/purp1.iob rename to objects/tourmaline-large/purp1.iob diff --git a/objects/trees/mixed/tourmaline-large/purp10.iob b/objects/tourmaline-large/purp10.iob similarity index 100% rename from objects/trees/mixed/tourmaline-large/purp10.iob rename to objects/tourmaline-large/purp10.iob diff --git a/objects/trees/mixed/tourmaline-large/purp2.iob b/objects/tourmaline-large/purp2.iob similarity index 100% rename from objects/trees/mixed/tourmaline-large/purp2.iob rename to objects/tourmaline-large/purp2.iob diff --git a/objects/trees/mixed/tourmaline-large/purp3.iob b/objects/tourmaline-large/purp3.iob similarity index 100% rename from objects/trees/mixed/tourmaline-large/purp3.iob rename to objects/tourmaline-large/purp3.iob diff --git a/objects/trees/mixed/tourmaline-large/purp4.iob b/objects/tourmaline-large/purp4.iob similarity index 100% rename from objects/trees/mixed/tourmaline-large/purp4.iob rename to objects/tourmaline-large/purp4.iob diff --git a/objects/trees/mixed/tourmaline-large/purp5.iob b/objects/tourmaline-large/purp5.iob similarity index 100% rename from objects/trees/mixed/tourmaline-large/purp5.iob rename to objects/tourmaline-large/purp5.iob diff --git a/objects/trees/mixed/tourmaline-large/purp6.iob b/objects/tourmaline-large/purp6.iob similarity index 100% rename from objects/trees/mixed/tourmaline-large/purp6.iob rename to objects/tourmaline-large/purp6.iob diff --git a/objects/trees/mixed/tourmaline-large/purp7.iob b/objects/tourmaline-large/purp7.iob similarity index 100% rename from objects/trees/mixed/tourmaline-large/purp7.iob rename to objects/tourmaline-large/purp7.iob diff --git a/objects/trees/mixed/tourmaline-large/purp8.iob b/objects/tourmaline-large/purp8.iob similarity index 100% rename from objects/trees/mixed/tourmaline-large/purp8.iob rename to objects/tourmaline-large/purp8.iob diff --git a/objects/trees/mixed/tourmaline-large/purp9.iob b/objects/tourmaline-large/purp9.iob similarity index 100% rename from objects/trees/mixed/tourmaline-large/purp9.iob rename to objects/tourmaline-large/purp9.iob diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp1.iob b/objects/tourmaline-medium/Lpurp1.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Lpurp1.iob rename to objects/tourmaline-medium/Lpurp1.iob diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp10.iob b/objects/tourmaline-medium/Lpurp10.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Lpurp10.iob rename to objects/tourmaline-medium/Lpurp10.iob diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp2.iob b/objects/tourmaline-medium/Lpurp2.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Lpurp2.iob rename to objects/tourmaline-medium/Lpurp2.iob diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp3.iob b/objects/tourmaline-medium/Lpurp3.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Lpurp3.iob rename to objects/tourmaline-medium/Lpurp3.iob diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp4.iob b/objects/tourmaline-medium/Lpurp4.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Lpurp4.iob rename to objects/tourmaline-medium/Lpurp4.iob diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp5.iob b/objects/tourmaline-medium/Lpurp5.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Lpurp5.iob rename to objects/tourmaline-medium/Lpurp5.iob diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp6.iob b/objects/tourmaline-medium/Lpurp6.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Lpurp6.iob rename to objects/tourmaline-medium/Lpurp6.iob diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp7.iob b/objects/tourmaline-medium/Lpurp7.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Lpurp7.iob rename to objects/tourmaline-medium/Lpurp7.iob diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp8.iob b/objects/tourmaline-medium/Lpurp8.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Lpurp8.iob rename to objects/tourmaline-medium/Lpurp8.iob diff --git a/objects/trees/mixed/tourmaline-medium/Lpurp9.iob b/objects/tourmaline-medium/Lpurp9.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Lpurp9.iob rename to objects/tourmaline-medium/Lpurp9.iob diff --git a/objects/trees/mixed/tourmaline-medium/Spurp1.iob b/objects/tourmaline-medium/Spurp1.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Spurp1.iob rename to objects/tourmaline-medium/Spurp1.iob diff --git a/objects/trees/mixed/tourmaline-medium/Spurp10.iob b/objects/tourmaline-medium/Spurp10.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Spurp10.iob rename to objects/tourmaline-medium/Spurp10.iob diff --git a/objects/trees/mixed/tourmaline-medium/Spurp2.iob b/objects/tourmaline-medium/Spurp2.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Spurp2.iob rename to objects/tourmaline-medium/Spurp2.iob diff --git a/objects/trees/mixed/tourmaline-medium/Spurp3.iob b/objects/tourmaline-medium/Spurp3.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Spurp3.iob rename to objects/tourmaline-medium/Spurp3.iob diff --git a/objects/trees/mixed/tourmaline-medium/Spurp4.iob b/objects/tourmaline-medium/Spurp4.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Spurp4.iob rename to objects/tourmaline-medium/Spurp4.iob diff --git a/objects/trees/mixed/tourmaline-medium/Spurp5.iob b/objects/tourmaline-medium/Spurp5.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Spurp5.iob rename to objects/tourmaline-medium/Spurp5.iob diff --git a/objects/trees/mixed/tourmaline-medium/Spurp6.iob b/objects/tourmaline-medium/Spurp6.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Spurp6.iob rename to objects/tourmaline-medium/Spurp6.iob diff --git a/objects/trees/mixed/tourmaline-medium/Spurp7.iob b/objects/tourmaline-medium/Spurp7.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Spurp7.iob rename to objects/tourmaline-medium/Spurp7.iob diff --git a/objects/trees/mixed/tourmaline-medium/Spurp8.iob b/objects/tourmaline-medium/Spurp8.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Spurp8.iob rename to objects/tourmaline-medium/Spurp8.iob diff --git a/objects/trees/mixed/tourmaline-medium/Spurp9.iob b/objects/tourmaline-medium/Spurp9.iob similarity index 100% rename from objects/trees/mixed/tourmaline-medium/Spurp9.iob rename to objects/tourmaline-medium/Spurp9.iob diff --git a/objects/trees/mixed/tourmaline-prob/prob1.iob b/objects/tourmaline-prob/prob1.iob similarity index 100% rename from objects/trees/mixed/tourmaline-prob/prob1.iob rename to objects/tourmaline-prob/prob1.iob diff --git a/objects/trees/mixed/tourmaline-prob/prob2.iob b/objects/tourmaline-prob/prob2.iob similarity index 100% rename from objects/trees/mixed/tourmaline-prob/prob2.iob rename to objects/tourmaline-prob/prob2.iob diff --git a/objects/trees/acacia/vexed1.iob b/objects/tree/acacia/1.iob similarity index 100% rename from objects/trees/acacia/vexed1.iob rename to objects/tree/acacia/1.iob diff --git a/objects/trees/acacia/vexed2.iob b/objects/tree/acacia/2.iob similarity index 100% rename from objects/trees/acacia/vexed2.iob rename to objects/tree/acacia/2.iob diff --git a/objects/trees/acacia/vexed3.iob b/objects/tree/acacia/3.iob similarity index 100% rename from objects/trees/acacia/vexed3.iob rename to objects/tree/acacia/3.iob diff --git a/objects/trees/jungle/mgeneric1.iob b/objects/tree/jungle/1.iob similarity index 100% rename from objects/trees/jungle/mgeneric1.iob rename to objects/tree/jungle/1.iob diff --git a/objects/trees/jungle/mgeneric2.iob b/objects/tree/jungle/2.iob similarity index 100% rename from objects/trees/jungle/mgeneric2.iob rename to objects/tree/jungle/2.iob diff --git a/objects/trees/jungle/vgeneric16.iob b/objects/tree/jungle/3.iob similarity index 100% rename from objects/trees/jungle/vgeneric16.iob rename to objects/tree/jungle/3.iob diff --git a/objects/trees/jungle/vgeneric17.iob b/objects/tree/jungle/4.iob similarity index 100% rename from objects/trees/jungle/vgeneric17.iob rename to objects/tree/jungle/4.iob diff --git a/objects/trees/jungle/vgeneric18.iob b/objects/tree/jungle/5.iob similarity index 100% rename from objects/trees/jungle/vgeneric18.iob rename to objects/tree/jungle/5.iob diff --git a/objects/trees/jungle/vgeneric19.iob b/objects/tree/jungle/6.iob similarity index 100% rename from objects/trees/jungle/vgeneric19.iob rename to objects/tree/jungle/6.iob diff --git a/objects/trees/jungle/vgeneric20.iob b/objects/tree/jungle/7.iob similarity index 100% rename from objects/trees/jungle/vgeneric20.iob rename to objects/tree/jungle/7.iob diff --git a/objects/trees/jungle/vgeneric21.iob b/objects/tree/jungle/8.iob similarity index 100% rename from objects/trees/jungle/vgeneric21.iob rename to objects/tree/jungle/8.iob diff --git a/objects/trees/jungle/vgeneric22.iob b/objects/tree/jungle/9.iob similarity index 100% rename from objects/trees/jungle/vgeneric22.iob rename to objects/tree/jungle/9.iob diff --git a/objects/trees/oak/truegeneric7.iob b/objects/tree/oak/1.iob similarity index 100% rename from objects/trees/oak/truegeneric7.iob rename to objects/tree/oak/1.iob diff --git a/objects/trees/oak/truegeneric8.iob b/objects/tree/oak/2.iob similarity index 100% rename from objects/trees/oak/truegeneric8.iob rename to objects/tree/oak/2.iob diff --git a/objects/trees/oak/truegeneric9.iob b/objects/tree/oak/3.iob similarity index 100% rename from objects/trees/oak/truegeneric9.iob rename to objects/tree/oak/3.iob diff --git a/objects/trees/oak/truegeneric10.iob b/objects/tree/oak/4.iob similarity index 100% rename from objects/trees/oak/truegeneric10.iob rename to objects/tree/oak/4.iob diff --git a/objects/trees/oak/truegeneric11.iob b/objects/tree/oak/5.iob similarity index 100% rename from objects/trees/oak/truegeneric11.iob rename to objects/tree/oak/5.iob diff --git a/objects/trees/oak/truegeneric13.iob b/objects/tree/oak/6.iob similarity index 100% rename from objects/trees/oak/truegeneric13.iob rename to objects/tree/oak/6.iob diff --git a/objects/trees/spruce/generic1.iob b/objects/tree/spruce/1.iob similarity index 100% rename from objects/trees/spruce/generic1.iob rename to objects/tree/spruce/1.iob diff --git a/objects/trees/spruce/generic2.iob b/objects/tree/spruce/2.iob similarity index 100% rename from objects/trees/spruce/generic2.iob rename to objects/tree/spruce/2.iob diff --git a/objects/trees/spruce/generic3.iob b/objects/tree/spruce/3.iob similarity index 100% rename from objects/trees/spruce/generic3.iob rename to objects/tree/spruce/3.iob diff --git a/objects/trees/jungle/deligeneric1.iob b/objects/tropical-delux/tropi-1.iob similarity index 100% rename from objects/trees/jungle/deligeneric1.iob rename to objects/tropical-delux/tropi-1.iob diff --git a/objects/trees/jungle/deligeneric2.iob b/objects/tropical-delux/tropi-2.iob similarity index 100% rename from objects/trees/jungle/deligeneric2.iob rename to objects/tropical-delux/tropi-2.iob diff --git a/objects/trees/jungle/deligeneric3.iob b/objects/tropical-delux/tropi-3.iob similarity index 100% rename from objects/trees/jungle/deligeneric3.iob rename to objects/tropical-delux/tropi-3.iob diff --git a/objects/trees/jungle/deligeneric4.iob b/objects/tropical-delux/tropi-4.iob similarity index 100% rename from objects/trees/jungle/deligeneric4.iob rename to objects/tropical-delux/tropi-4.iob diff --git a/objects/trees/jungle/deligeneric5.iob b/objects/tropical-delux/tropi-5.iob similarity index 100% rename from objects/trees/jungle/deligeneric5.iob rename to objects/tropical-delux/tropi-5.iob diff --git a/objects/trees/jungle/deligeneric6.iob b/objects/tropical-delux/tropi-6.iob similarity index 100% rename from objects/trees/jungle/deligeneric6.iob rename to objects/tropical-delux/tropi-6.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-1.iob b/objects/true-redwood/true-redwood-1.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-1.iob rename to objects/true-redwood/true-redwood-1.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-10-b.iob b/objects/true-redwood/true-redwood-10-b.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-10-b.iob rename to objects/true-redwood/true-redwood-10-b.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-10.iob b/objects/true-redwood/true-redwood-10.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-10.iob rename to objects/true-redwood/true-redwood-10.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-2.iob b/objects/true-redwood/true-redwood-2.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-2.iob rename to objects/true-redwood/true-redwood-2.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-3.iob b/objects/true-redwood/true-redwood-3.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-3.iob rename to objects/true-redwood/true-redwood-3.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-4.iob b/objects/true-redwood/true-redwood-4.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-4.iob rename to objects/true-redwood/true-redwood-4.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-5.iob b/objects/true-redwood/true-redwood-5.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-5.iob rename to objects/true-redwood/true-redwood-5.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-6.iob b/objects/true-redwood/true-redwood-6.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-6.iob rename to objects/true-redwood/true-redwood-6.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-7-b.iob b/objects/true-redwood/true-redwood-7-b.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-7-b.iob rename to objects/true-redwood/true-redwood-7-b.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-7.iob b/objects/true-redwood/true-redwood-7.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-7.iob rename to objects/true-redwood/true-redwood-7.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-8-b.iob b/objects/true-redwood/true-redwood-8-b.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-8-b.iob rename to objects/true-redwood/true-redwood-8-b.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-8.iob b/objects/true-redwood/true-redwood-8.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-8.iob rename to objects/true-redwood/true-redwood-8.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-9-b.iob b/objects/true-redwood/true-redwood-9-b.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-9-b.iob rename to objects/true-redwood/true-redwood-9-b.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-9.iob b/objects/true-redwood/true-redwood-9.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-9.iob rename to objects/true-redwood/true-redwood-9.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-small-1.iob b/objects/true-redwood/true-redwood-small-1.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-small-1.iob rename to objects/true-redwood/true-redwood-small-1.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-small-2.iob b/objects/true-redwood/true-redwood-small-2.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-small-2.iob rename to objects/true-redwood/true-redwood-small-2.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-small-3.iob b/objects/true-redwood/true-redwood-small-3.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-small-3.iob rename to objects/true-redwood/true-redwood-small-3.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-small-4.iob b/objects/true-redwood/true-redwood-small-4.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-small-4.iob rename to objects/true-redwood/true-redwood-small-4.iob diff --git a/objects/trees/mixed/true-redwood/true-redwood-small-5.iob b/objects/true-redwood/true-redwood-small-5.iob similarity index 100% rename from objects/trees/mixed/true-redwood/true-redwood-small-5.iob rename to objects/true-redwood/true-redwood-small-5.iob diff --git a/objects/clutter/cobble-spike.iob b/objects/underwater/cobble-spike.iob similarity index 100% rename from objects/clutter/cobble-spike.iob rename to objects/underwater/cobble-spike.iob diff --git a/objects/jigsaw/underwater_ruin/big_brick_1.iob b/objects/underwater/underwater_ruin/big_brick_1.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_brick_1.iob rename to objects/underwater/underwater_ruin/big_brick_1.iob diff --git a/objects/jigsaw/underwater_ruin/big_brick_2.iob b/objects/underwater/underwater_ruin/big_brick_2.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_brick_2.iob rename to objects/underwater/underwater_ruin/big_brick_2.iob diff --git a/objects/jigsaw/underwater_ruin/big_brick_3.iob b/objects/underwater/underwater_ruin/big_brick_3.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_brick_3.iob rename to objects/underwater/underwater_ruin/big_brick_3.iob diff --git a/objects/jigsaw/underwater_ruin/big_brick_8.iob b/objects/underwater/underwater_ruin/big_brick_8.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_brick_8.iob rename to objects/underwater/underwater_ruin/big_brick_8.iob diff --git a/objects/jigsaw/underwater_ruin/big_cracked_1.iob b/objects/underwater/underwater_ruin/big_cracked_1.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_cracked_1.iob rename to objects/underwater/underwater_ruin/big_cracked_1.iob diff --git a/objects/jigsaw/underwater_ruin/big_cracked_2.iob b/objects/underwater/underwater_ruin/big_cracked_2.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_cracked_2.iob rename to objects/underwater/underwater_ruin/big_cracked_2.iob diff --git a/objects/jigsaw/underwater_ruin/big_cracked_3.iob b/objects/underwater/underwater_ruin/big_cracked_3.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_cracked_3.iob rename to objects/underwater/underwater_ruin/big_cracked_3.iob diff --git a/objects/jigsaw/underwater_ruin/big_cracked_8.iob b/objects/underwater/underwater_ruin/big_cracked_8.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_cracked_8.iob rename to objects/underwater/underwater_ruin/big_cracked_8.iob diff --git a/objects/jigsaw/underwater_ruin/big_mossy_1.iob b/objects/underwater/underwater_ruin/big_mossy_1.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_mossy_1.iob rename to objects/underwater/underwater_ruin/big_mossy_1.iob diff --git a/objects/jigsaw/underwater_ruin/big_mossy_2.iob b/objects/underwater/underwater_ruin/big_mossy_2.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_mossy_2.iob rename to objects/underwater/underwater_ruin/big_mossy_2.iob diff --git a/objects/jigsaw/underwater_ruin/big_mossy_3.iob b/objects/underwater/underwater_ruin/big_mossy_3.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_mossy_3.iob rename to objects/underwater/underwater_ruin/big_mossy_3.iob diff --git a/objects/jigsaw/underwater_ruin/big_mossy_8.iob b/objects/underwater/underwater_ruin/big_mossy_8.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_mossy_8.iob rename to objects/underwater/underwater_ruin/big_mossy_8.iob diff --git a/objects/jigsaw/underwater_ruin/big_warm_4.iob b/objects/underwater/underwater_ruin/big_warm_4.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_warm_4.iob rename to objects/underwater/underwater_ruin/big_warm_4.iob diff --git a/objects/jigsaw/underwater_ruin/big_warm_5.iob b/objects/underwater/underwater_ruin/big_warm_5.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_warm_5.iob rename to objects/underwater/underwater_ruin/big_warm_5.iob diff --git a/objects/jigsaw/underwater_ruin/big_warm_6.iob b/objects/underwater/underwater_ruin/big_warm_6.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_warm_6.iob rename to objects/underwater/underwater_ruin/big_warm_6.iob diff --git a/objects/jigsaw/underwater_ruin/big_warm_7.iob b/objects/underwater/underwater_ruin/big_warm_7.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_warm_7.iob rename to objects/underwater/underwater_ruin/big_warm_7.iob diff --git a/objects/jigsaw/underwater_ruin/brick_1.iob b/objects/underwater/underwater_ruin/brick_1.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/brick_1.iob rename to objects/underwater/underwater_ruin/brick_1.iob diff --git a/objects/jigsaw/underwater_ruin/brick_2.iob b/objects/underwater/underwater_ruin/brick_2.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/brick_2.iob rename to objects/underwater/underwater_ruin/brick_2.iob diff --git a/objects/jigsaw/underwater_ruin/brick_3.iob b/objects/underwater/underwater_ruin/brick_3.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/brick_3.iob rename to objects/underwater/underwater_ruin/brick_3.iob diff --git a/objects/jigsaw/underwater_ruin/brick_4.iob b/objects/underwater/underwater_ruin/brick_4.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/brick_4.iob rename to objects/underwater/underwater_ruin/brick_4.iob diff --git a/objects/jigsaw/underwater_ruin/brick_5.iob b/objects/underwater/underwater_ruin/brick_5.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/brick_5.iob rename to objects/underwater/underwater_ruin/brick_5.iob diff --git a/objects/jigsaw/underwater_ruin/brick_6.iob b/objects/underwater/underwater_ruin/brick_6.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/brick_6.iob rename to objects/underwater/underwater_ruin/brick_6.iob diff --git a/objects/jigsaw/underwater_ruin/brick_7.iob b/objects/underwater/underwater_ruin/brick_7.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/brick_7.iob rename to objects/underwater/underwater_ruin/brick_7.iob diff --git a/objects/jigsaw/underwater_ruin/brick_8.iob b/objects/underwater/underwater_ruin/brick_8.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/brick_8.iob rename to objects/underwater/underwater_ruin/brick_8.iob diff --git a/objects/jigsaw/underwater_ruin/cracked_1.iob b/objects/underwater/underwater_ruin/cracked_1.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/cracked_1.iob rename to objects/underwater/underwater_ruin/cracked_1.iob diff --git a/objects/jigsaw/underwater_ruin/cracked_2.iob b/objects/underwater/underwater_ruin/cracked_2.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/cracked_2.iob rename to objects/underwater/underwater_ruin/cracked_2.iob diff --git a/objects/jigsaw/underwater_ruin/cracked_3.iob b/objects/underwater/underwater_ruin/cracked_3.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/cracked_3.iob rename to objects/underwater/underwater_ruin/cracked_3.iob diff --git a/objects/jigsaw/underwater_ruin/cracked_4.iob b/objects/underwater/underwater_ruin/cracked_4.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/cracked_4.iob rename to objects/underwater/underwater_ruin/cracked_4.iob diff --git a/objects/jigsaw/underwater_ruin/cracked_5.iob b/objects/underwater/underwater_ruin/cracked_5.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/cracked_5.iob rename to objects/underwater/underwater_ruin/cracked_5.iob diff --git a/objects/jigsaw/underwater_ruin/cracked_6.iob b/objects/underwater/underwater_ruin/cracked_6.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/cracked_6.iob rename to objects/underwater/underwater_ruin/cracked_6.iob diff --git a/objects/jigsaw/underwater_ruin/cracked_7.iob b/objects/underwater/underwater_ruin/cracked_7.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/cracked_7.iob rename to objects/underwater/underwater_ruin/cracked_7.iob diff --git a/objects/jigsaw/underwater_ruin/cracked_8.iob b/objects/underwater/underwater_ruin/cracked_8.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/cracked_8.iob rename to objects/underwater/underwater_ruin/cracked_8.iob diff --git a/objects/jigsaw/underwater_ruin/mossy_1.iob b/objects/underwater/underwater_ruin/mossy_1.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/mossy_1.iob rename to objects/underwater/underwater_ruin/mossy_1.iob diff --git a/objects/jigsaw/underwater_ruin/mossy_2.iob b/objects/underwater/underwater_ruin/mossy_2.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/mossy_2.iob rename to objects/underwater/underwater_ruin/mossy_2.iob diff --git a/objects/jigsaw/underwater_ruin/mossy_3.iob b/objects/underwater/underwater_ruin/mossy_3.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/mossy_3.iob rename to objects/underwater/underwater_ruin/mossy_3.iob diff --git a/objects/jigsaw/underwater_ruin/mossy_4.iob b/objects/underwater/underwater_ruin/mossy_4.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/mossy_4.iob rename to objects/underwater/underwater_ruin/mossy_4.iob diff --git a/objects/jigsaw/underwater_ruin/mossy_5.iob b/objects/underwater/underwater_ruin/mossy_5.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/mossy_5.iob rename to objects/underwater/underwater_ruin/mossy_5.iob diff --git a/objects/jigsaw/underwater_ruin/mossy_6.iob b/objects/underwater/underwater_ruin/mossy_6.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/mossy_6.iob rename to objects/underwater/underwater_ruin/mossy_6.iob diff --git a/objects/jigsaw/underwater_ruin/mossy_7.iob b/objects/underwater/underwater_ruin/mossy_7.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/mossy_7.iob rename to objects/underwater/underwater_ruin/mossy_7.iob diff --git a/objects/jigsaw/underwater_ruin/mossy_8.iob b/objects/underwater/underwater_ruin/mossy_8.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/mossy_8.iob rename to objects/underwater/underwater_ruin/mossy_8.iob diff --git a/objects/jigsaw/underwater_ruin/warm_1.iob b/objects/underwater/underwater_ruin/warm_1.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/warm_1.iob rename to objects/underwater/underwater_ruin/warm_1.iob diff --git a/objects/jigsaw/underwater_ruin/warm_2.iob b/objects/underwater/underwater_ruin/warm_2.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/warm_2.iob rename to objects/underwater/underwater_ruin/warm_2.iob diff --git a/objects/jigsaw/underwater_ruin/warm_3.iob b/objects/underwater/underwater_ruin/warm_3.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/warm_3.iob rename to objects/underwater/underwater_ruin/warm_3.iob diff --git a/objects/jigsaw/underwater_ruin/warm_4.iob b/objects/underwater/underwater_ruin/warm_4.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/warm_4.iob rename to objects/underwater/underwater_ruin/warm_4.iob diff --git a/objects/jigsaw/underwater_ruin/warm_5.iob b/objects/underwater/underwater_ruin/warm_5.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/warm_5.iob rename to objects/underwater/underwater_ruin/warm_5.iob diff --git a/objects/jigsaw/underwater_ruin/warm_6.iob b/objects/underwater/underwater_ruin/warm_6.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/warm_6.iob rename to objects/underwater/underwater_ruin/warm_6.iob diff --git a/objects/jigsaw/underwater_ruin/warm_7.iob b/objects/underwater/underwater_ruin/warm_7.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/warm_7.iob rename to objects/underwater/underwater_ruin/warm_7.iob diff --git a/objects/jigsaw/underwater_ruin/warm_8.iob b/objects/underwater/underwater_ruin/warm_8.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/warm_8.iob rename to objects/underwater/underwater_ruin/warm_8.iob diff --git a/objects/trees/spruce/xmasbaby1.iob b/objects/unfrosted-spruce/bab-1.iob similarity index 100% rename from objects/trees/spruce/xmasbaby1.iob rename to objects/unfrosted-spruce/bab-1.iob diff --git a/objects/trees/spruce/xmasbaby2.iob b/objects/unfrosted-spruce/bab-2.iob similarity index 100% rename from objects/trees/spruce/xmasbaby2.iob rename to objects/unfrosted-spruce/bab-2.iob diff --git a/objects/trees/spruce/xmasbaby3.iob b/objects/unfrosted-spruce/bab-3.iob similarity index 100% rename from objects/trees/spruce/xmasbaby3.iob rename to objects/unfrosted-spruce/bab-3.iob diff --git a/objects/trees/spruce/xmasbaby4.iob b/objects/unfrosted-spruce/bab-4.iob similarity index 100% rename from objects/trees/spruce/xmasbaby4.iob rename to objects/unfrosted-spruce/bab-4.iob diff --git a/objects/trees/spruce/xmasbaby5.iob b/objects/unfrosted-spruce/bab-5.iob similarity index 100% rename from objects/trees/spruce/xmasbaby5.iob rename to objects/unfrosted-spruce/bab-5.iob diff --git a/objects/trees/spruce/unfrostedmed1.iob b/objects/unfrosted-spruce/big-1.iob similarity index 100% rename from objects/trees/spruce/unfrostedmed1.iob rename to objects/unfrosted-spruce/big-1.iob diff --git a/objects/trees/spruce/unfrostedmed2.iob b/objects/unfrosted-spruce/big-2.iob similarity index 100% rename from objects/trees/spruce/unfrostedmed2.iob rename to objects/unfrosted-spruce/big-2.iob diff --git a/objects/trees/spruce/unfrostedmed3.iob b/objects/unfrosted-spruce/big-3.iob similarity index 100% rename from objects/trees/spruce/unfrostedmed3.iob rename to objects/unfrosted-spruce/big-3.iob diff --git a/objects/trees/spruce/unfrostedlarge1.iob b/objects/unfrosted-spruce/large-1.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge1.iob rename to objects/unfrosted-spruce/large-1.iob diff --git a/objects/trees/spruce/unfrostedlarge2.iob b/objects/unfrosted-spruce/large-10.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge2.iob rename to objects/unfrosted-spruce/large-10.iob diff --git a/objects/trees/spruce/unfrostedlarge3.iob b/objects/unfrosted-spruce/large-11.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge3.iob rename to objects/unfrosted-spruce/large-11.iob diff --git a/objects/trees/spruce/unfrostedlarge4.iob b/objects/unfrosted-spruce/large-12.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge4.iob rename to objects/unfrosted-spruce/large-12.iob diff --git a/objects/trees/spruce/unfrostedlarge5.iob b/objects/unfrosted-spruce/large-13.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge5.iob rename to objects/unfrosted-spruce/large-13.iob diff --git a/objects/trees/spruce/unfrostedlarge6.iob b/objects/unfrosted-spruce/large-14.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge6.iob rename to objects/unfrosted-spruce/large-14.iob diff --git a/objects/trees/spruce/unfrostedlarge7.iob b/objects/unfrosted-spruce/large-15.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge7.iob rename to objects/unfrosted-spruce/large-15.iob diff --git a/objects/trees/spruce/unfrostedlarge8.iob b/objects/unfrosted-spruce/large-16.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge8.iob rename to objects/unfrosted-spruce/large-16.iob diff --git a/objects/trees/spruce/unfrostedlarge9.iob b/objects/unfrosted-spruce/large-17.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge9.iob rename to objects/unfrosted-spruce/large-17.iob diff --git a/objects/trees/spruce/unfrostedlarge10.iob b/objects/unfrosted-spruce/large-18.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge10.iob rename to objects/unfrosted-spruce/large-18.iob diff --git a/objects/trees/spruce/unfrostedlarge11.iob b/objects/unfrosted-spruce/large-19.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge11.iob rename to objects/unfrosted-spruce/large-19.iob diff --git a/objects/trees/spruce/unfrostedlarge12.iob b/objects/unfrosted-spruce/large-2.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge12.iob rename to objects/unfrosted-spruce/large-2.iob diff --git a/objects/trees/spruce/unfrostedlarge13.iob b/objects/unfrosted-spruce/large-20.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge13.iob rename to objects/unfrosted-spruce/large-20.iob diff --git a/objects/trees/spruce/unfrostedlarge14.iob b/objects/unfrosted-spruce/large-21.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge14.iob rename to objects/unfrosted-spruce/large-21.iob diff --git a/objects/trees/spruce/unfrostedlarge15.iob b/objects/unfrosted-spruce/large-22.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge15.iob rename to objects/unfrosted-spruce/large-22.iob diff --git a/objects/trees/spruce/unfrostedlarge16.iob b/objects/unfrosted-spruce/large-23.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge16.iob rename to objects/unfrosted-spruce/large-23.iob diff --git a/objects/trees/spruce/unfrostedlarge17.iob b/objects/unfrosted-spruce/large-24.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge17.iob rename to objects/unfrosted-spruce/large-24.iob diff --git a/objects/trees/spruce/unfrostedlarge18.iob b/objects/unfrosted-spruce/large-3.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge18.iob rename to objects/unfrosted-spruce/large-3.iob diff --git a/objects/trees/spruce/unfrostedlarge19.iob b/objects/unfrosted-spruce/large-4.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge19.iob rename to objects/unfrosted-spruce/large-4.iob diff --git a/objects/trees/spruce/unfrostedlarge20.iob b/objects/unfrosted-spruce/large-5.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge20.iob rename to objects/unfrosted-spruce/large-5.iob diff --git a/objects/trees/spruce/unfrostedlarge21.iob b/objects/unfrosted-spruce/large-6.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge21.iob rename to objects/unfrosted-spruce/large-6.iob diff --git a/objects/trees/spruce/unfrostedlarge22.iob b/objects/unfrosted-spruce/large-7.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge22.iob rename to objects/unfrosted-spruce/large-7.iob diff --git a/objects/trees/spruce/unfrostedlarge23.iob b/objects/unfrosted-spruce/large-8.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge23.iob rename to objects/unfrosted-spruce/large-8.iob diff --git a/objects/trees/spruce/unfrostedlarge24.iob b/objects/unfrosted-spruce/large-9.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge24.iob rename to objects/unfrosted-spruce/large-9.iob diff --git a/objects/trees/spruce/unfrostedmed4.iob b/objects/unfrosted-spruce/med-1.iob similarity index 100% rename from objects/trees/spruce/unfrostedmed4.iob rename to objects/unfrosted-spruce/med-1.iob diff --git a/objects/trees/spruce/unfrostedmed5.iob b/objects/unfrosted-spruce/med-2.iob similarity index 100% rename from objects/trees/spruce/unfrostedmed5.iob rename to objects/unfrosted-spruce/med-2.iob diff --git a/objects/trees/spruce/unfrostedmed6.iob b/objects/unfrosted-spruce/med-3.iob similarity index 100% rename from objects/trees/spruce/unfrostedmed6.iob rename to objects/unfrosted-spruce/med-3.iob diff --git a/objects/trees/spruce/unfrostedmed7.iob b/objects/unfrosted-spruce/med-4.iob similarity index 100% rename from objects/trees/spruce/unfrostedmed7.iob rename to objects/unfrosted-spruce/med-4.iob diff --git a/objects/trees/spruce/unfrostedmed8.iob b/objects/unfrosted-spruce/med-5.iob similarity index 100% rename from objects/trees/spruce/unfrostedmed8.iob rename to objects/unfrosted-spruce/med-5.iob diff --git a/objects/trees/spruce/unfrostedsmol1.iob b/objects/unfrosted-spruce/smol-1.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol1.iob rename to objects/unfrosted-spruce/smol-1.iob diff --git a/objects/trees/spruce/unfrostedsmol2.iob b/objects/unfrosted-spruce/smol-2.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol2.iob rename to objects/unfrosted-spruce/smol-2.iob diff --git a/objects/trees/spruce/unfrostedsmol3.iob b/objects/unfrosted-spruce/smol-3.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol3.iob rename to objects/unfrosted-spruce/smol-3.iob diff --git a/objects/trees/spruce/unfrostedsmol4.iob b/objects/unfrosted-spruce/smol-4.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol4.iob rename to objects/unfrosted-spruce/smol-4.iob diff --git a/objects/trees/spruce/unfrostedsmol5.iob b/objects/unfrosted-spruce/smol-5.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol5.iob rename to objects/unfrosted-spruce/smol-5.iob diff --git a/objects/trees/spruce/unfrostedsmol6.iob b/objects/unfrosted-spruce/smol-6.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol6.iob rename to objects/unfrosted-spruce/smol-6.iob diff --git a/objects/trees/spruce/unfrostedsmol7.iob b/objects/unfrosted-spruce/smol-7.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol7.iob rename to objects/unfrosted-spruce/smol-7.iob diff --git a/objects/trees/spruce/unfrostedsmol8.iob b/objects/unfrosted-spruce/smol-8.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol8.iob rename to objects/unfrosted-spruce/smol-8.iob diff --git a/objects/trees/spruce/unfrostedsmol9.iob b/objects/unfrosted-spruce/smol-9.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol9.iob rename to objects/unfrosted-spruce/smol-9.iob diff --git a/objects/jigsaw/village-bits/bland-e-1.iob b/objects/village-bits/bland-e-1.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-e-1.iob rename to objects/village-bits/bland-e-1.iob diff --git a/objects/jigsaw/village-bits/bland-e-2.iob b/objects/village-bits/bland-e-2.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-e-2.iob rename to objects/village-bits/bland-e-2.iob diff --git a/objects/jigsaw/village-bits/bland-e-3.iob b/objects/village-bits/bland-e-3.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-e-3.iob rename to objects/village-bits/bland-e-3.iob diff --git a/objects/jigsaw/village-bits/bland-e-4.iob b/objects/village-bits/bland-e-4.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-e-4.iob rename to objects/village-bits/bland-e-4.iob diff --git a/objects/jigsaw/village-bits/bland-e-5.iob b/objects/village-bits/bland-e-5.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-e-5.iob rename to objects/village-bits/bland-e-5.iob diff --git a/objects/jigsaw/village-bits/bland-ne-1.iob b/objects/village-bits/bland-ne-1.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ne-1.iob rename to objects/village-bits/bland-ne-1.iob diff --git a/objects/jigsaw/village-bits/bland-ne-2.iob b/objects/village-bits/bland-ne-2.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ne-2.iob rename to objects/village-bits/bland-ne-2.iob diff --git a/objects/jigsaw/village-bits/bland-ne-3.iob b/objects/village-bits/bland-ne-3.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ne-3.iob rename to objects/village-bits/bland-ne-3.iob diff --git a/objects/jigsaw/village-bits/bland-ne-4.iob b/objects/village-bits/bland-ne-4.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ne-4.iob rename to objects/village-bits/bland-ne-4.iob diff --git a/objects/jigsaw/village-bits/bland-ne-5.iob b/objects/village-bits/bland-ne-5.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ne-5.iob rename to objects/village-bits/bland-ne-5.iob diff --git a/objects/jigsaw/village-bits/bland-nes-1.iob b/objects/village-bits/bland-nes-1.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-nes-1.iob rename to objects/village-bits/bland-nes-1.iob diff --git a/objects/jigsaw/village-bits/bland-nes-2.iob b/objects/village-bits/bland-nes-2.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-nes-2.iob rename to objects/village-bits/bland-nes-2.iob diff --git a/objects/jigsaw/village-bits/bland-nes-3.iob b/objects/village-bits/bland-nes-3.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-nes-3.iob rename to objects/village-bits/bland-nes-3.iob diff --git a/objects/jigsaw/village-bits/bland-nes-4.iob b/objects/village-bits/bland-nes-4.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-nes-4.iob rename to objects/village-bits/bland-nes-4.iob diff --git a/objects/jigsaw/village-bits/bland-nes-5.iob b/objects/village-bits/bland-nes-5.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-nes-5.iob rename to objects/village-bits/bland-nes-5.iob diff --git a/objects/jigsaw/village-bits/bland-ns-1.iob b/objects/village-bits/bland-ns-1.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ns-1.iob rename to objects/village-bits/bland-ns-1.iob diff --git a/objects/jigsaw/village-bits/bland-ns-2.iob b/objects/village-bits/bland-ns-2.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ns-2.iob rename to objects/village-bits/bland-ns-2.iob diff --git a/objects/jigsaw/village-bits/bland-ns-3.iob b/objects/village-bits/bland-ns-3.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ns-3.iob rename to objects/village-bits/bland-ns-3.iob diff --git a/objects/jigsaw/village-bits/bland-ns-4.iob b/objects/village-bits/bland-ns-4.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ns-4.iob rename to objects/village-bits/bland-ns-4.iob diff --git a/objects/jigsaw/village-bits/bland-ns-5.iob b/objects/village-bits/bland-ns-5.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ns-5.iob rename to objects/village-bits/bland-ns-5.iob diff --git a/objects/jigsaw/village-bits/bland-x-1.iob b/objects/village-bits/bland-x-1.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-x-1.iob rename to objects/village-bits/bland-x-1.iob diff --git a/objects/jigsaw/village-bits/bland-x-2.iob b/objects/village-bits/bland-x-2.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-x-2.iob rename to objects/village-bits/bland-x-2.iob diff --git a/objects/jigsaw/village-bits/bland-x-3.iob b/objects/village-bits/bland-x-3.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-x-3.iob rename to objects/village-bits/bland-x-3.iob diff --git a/objects/jigsaw/village-bits/bland-x-4.iob b/objects/village-bits/bland-x-4.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-x-4.iob rename to objects/village-bits/bland-x-4.iob diff --git a/objects/jigsaw/village-bits/bland-x-5.iob b/objects/village-bits/bland-x-5.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-x-5.iob rename to objects/village-bits/bland-x-5.iob diff --git a/objects/jigsaw/village-bits/hay-e-1.iob b/objects/village-bits/hay-e-1.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-e-1.iob rename to objects/village-bits/hay-e-1.iob diff --git a/objects/jigsaw/village-bits/hay-e-2.iob b/objects/village-bits/hay-e-2.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-e-2.iob rename to objects/village-bits/hay-e-2.iob diff --git a/objects/jigsaw/village-bits/hay-e-3.iob b/objects/village-bits/hay-e-3.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-e-3.iob rename to objects/village-bits/hay-e-3.iob diff --git a/objects/jigsaw/village-bits/hay-e-4.iob b/objects/village-bits/hay-e-4.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-e-4.iob rename to objects/village-bits/hay-e-4.iob diff --git a/objects/jigsaw/village-bits/hay-e-5.iob b/objects/village-bits/hay-e-5.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-e-5.iob rename to objects/village-bits/hay-e-5.iob diff --git a/objects/jigsaw/village-bits/hay-ne-1.iob b/objects/village-bits/hay-ne-1.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ne-1.iob rename to objects/village-bits/hay-ne-1.iob diff --git a/objects/jigsaw/village-bits/hay-ne-2.iob b/objects/village-bits/hay-ne-2.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ne-2.iob rename to objects/village-bits/hay-ne-2.iob diff --git a/objects/jigsaw/village-bits/hay-ne-3.iob b/objects/village-bits/hay-ne-3.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ne-3.iob rename to objects/village-bits/hay-ne-3.iob diff --git a/objects/jigsaw/village-bits/hay-ne-4.iob b/objects/village-bits/hay-ne-4.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ne-4.iob rename to objects/village-bits/hay-ne-4.iob diff --git a/objects/jigsaw/village-bits/hay-ne-5.iob b/objects/village-bits/hay-ne-5.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ne-5.iob rename to objects/village-bits/hay-ne-5.iob diff --git a/objects/jigsaw/village-bits/hay-nes-1.iob b/objects/village-bits/hay-nes-1.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-nes-1.iob rename to objects/village-bits/hay-nes-1.iob diff --git a/objects/jigsaw/village-bits/hay-nes-2.iob b/objects/village-bits/hay-nes-2.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-nes-2.iob rename to objects/village-bits/hay-nes-2.iob diff --git a/objects/jigsaw/village-bits/hay-nes-3.iob b/objects/village-bits/hay-nes-3.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-nes-3.iob rename to objects/village-bits/hay-nes-3.iob diff --git a/objects/jigsaw/village-bits/hay-nes-4.iob b/objects/village-bits/hay-nes-4.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-nes-4.iob rename to objects/village-bits/hay-nes-4.iob diff --git a/objects/jigsaw/village-bits/hay-nes-5.iob b/objects/village-bits/hay-nes-5.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-nes-5.iob rename to objects/village-bits/hay-nes-5.iob diff --git a/objects/jigsaw/village-bits/hay-ns-1.iob b/objects/village-bits/hay-ns-1.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ns-1.iob rename to objects/village-bits/hay-ns-1.iob diff --git a/objects/jigsaw/village-bits/hay-ns-2.iob b/objects/village-bits/hay-ns-2.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ns-2.iob rename to objects/village-bits/hay-ns-2.iob diff --git a/objects/jigsaw/village-bits/hay-ns-3.iob b/objects/village-bits/hay-ns-3.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ns-3.iob rename to objects/village-bits/hay-ns-3.iob diff --git a/objects/jigsaw/village-bits/hay-ns-4.iob b/objects/village-bits/hay-ns-4.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ns-4.iob rename to objects/village-bits/hay-ns-4.iob diff --git a/objects/jigsaw/village-bits/hay-ns-5.iob b/objects/village-bits/hay-ns-5.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ns-5.iob rename to objects/village-bits/hay-ns-5.iob diff --git a/objects/jigsaw/village-bits/hay-x-1.iob b/objects/village-bits/hay-x-1.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-x-1.iob rename to objects/village-bits/hay-x-1.iob diff --git a/objects/jigsaw/village-bits/hay-x-2.iob b/objects/village-bits/hay-x-2.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-x-2.iob rename to objects/village-bits/hay-x-2.iob diff --git a/objects/jigsaw/village-bits/hay-x-3.iob b/objects/village-bits/hay-x-3.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-x-3.iob rename to objects/village-bits/hay-x-3.iob diff --git a/objects/jigsaw/village-bits/hay-x-4.iob b/objects/village-bits/hay-x-4.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-x-4.iob rename to objects/village-bits/hay-x-4.iob diff --git a/objects/jigsaw/village-bits/hay-x-5.iob b/objects/village-bits/hay-x-5.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-x-5.iob rename to objects/village-bits/hay-x-5.iob diff --git a/objects/jigsaw/village-bits/lantern-ne-1.iob b/objects/village-bits/lantern-ne-1.iob similarity index 100% rename from objects/jigsaw/village-bits/lantern-ne-1.iob rename to objects/village-bits/lantern-ne-1.iob diff --git a/objects/jigsaw/village-bits/lantern-ne-2.iob b/objects/village-bits/lantern-ne-2.iob similarity index 100% rename from objects/jigsaw/village-bits/lantern-ne-2.iob rename to objects/village-bits/lantern-ne-2.iob diff --git a/objects/jigsaw/village-bits/lantern-ne-3.iob b/objects/village-bits/lantern-ne-3.iob similarity index 100% rename from objects/jigsaw/village-bits/lantern-ne-3.iob rename to objects/village-bits/lantern-ne-3.iob diff --git a/objects/jigsaw/village-bits/lantern-ne-4.iob b/objects/village-bits/lantern-ne-4.iob similarity index 100% rename from objects/jigsaw/village-bits/lantern-ne-4.iob rename to objects/village-bits/lantern-ne-4.iob diff --git a/objects/jigsaw/village-bits/lantern-ne-5.iob b/objects/village-bits/lantern-ne-5.iob similarity index 100% rename from objects/jigsaw/village-bits/lantern-ne-5.iob rename to objects/village-bits/lantern-ne-5.iob diff --git a/objects/jigsaw/village-bits/lanterns-e-1.iob b/objects/village-bits/lanterns-e-1.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-e-1.iob rename to objects/village-bits/lanterns-e-1.iob diff --git a/objects/jigsaw/village-bits/lanterns-e-2.iob b/objects/village-bits/lanterns-e-2.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-e-2.iob rename to objects/village-bits/lanterns-e-2.iob diff --git a/objects/jigsaw/village-bits/lanterns-e-3.iob b/objects/village-bits/lanterns-e-3.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-e-3.iob rename to objects/village-bits/lanterns-e-3.iob diff --git a/objects/jigsaw/village-bits/lanterns-e-4.iob b/objects/village-bits/lanterns-e-4.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-e-4.iob rename to objects/village-bits/lanterns-e-4.iob diff --git a/objects/jigsaw/village-bits/lanterns-e-5.iob b/objects/village-bits/lanterns-e-5.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-e-5.iob rename to objects/village-bits/lanterns-e-5.iob diff --git a/objects/jigsaw/village-bits/lanterns-nes-1.iob b/objects/village-bits/lanterns-nes-1.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-nes-1.iob rename to objects/village-bits/lanterns-nes-1.iob diff --git a/objects/jigsaw/village-bits/lanterns-nes-2.iob b/objects/village-bits/lanterns-nes-2.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-nes-2.iob rename to objects/village-bits/lanterns-nes-2.iob diff --git a/objects/jigsaw/village-bits/lanterns-nes-3.iob b/objects/village-bits/lanterns-nes-3.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-nes-3.iob rename to objects/village-bits/lanterns-nes-3.iob diff --git a/objects/jigsaw/village-bits/lanterns-nes-4.iob b/objects/village-bits/lanterns-nes-4.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-nes-4.iob rename to objects/village-bits/lanterns-nes-4.iob diff --git a/objects/jigsaw/village-bits/lanterns-nes-5.iob b/objects/village-bits/lanterns-nes-5.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-nes-5.iob rename to objects/village-bits/lanterns-nes-5.iob diff --git a/objects/jigsaw/village-bits/lanterns-ns-1.iob b/objects/village-bits/lanterns-ns-1.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-ns-1.iob rename to objects/village-bits/lanterns-ns-1.iob diff --git a/objects/jigsaw/village-bits/lanterns-ns-2.iob b/objects/village-bits/lanterns-ns-2.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-ns-2.iob rename to objects/village-bits/lanterns-ns-2.iob diff --git a/objects/jigsaw/village-bits/lanterns-ns-3.iob b/objects/village-bits/lanterns-ns-3.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-ns-3.iob rename to objects/village-bits/lanterns-ns-3.iob diff --git a/objects/jigsaw/village-bits/lanterns-ns-4.iob b/objects/village-bits/lanterns-ns-4.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-ns-4.iob rename to objects/village-bits/lanterns-ns-4.iob diff --git a/objects/jigsaw/village-bits/lanterns-ns-5.iob b/objects/village-bits/lanterns-ns-5.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-ns-5.iob rename to objects/village-bits/lanterns-ns-5.iob diff --git a/objects/jigsaw/village-bits/lanterns-x-1.iob b/objects/village-bits/lanterns-x-1.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-x-1.iob rename to objects/village-bits/lanterns-x-1.iob diff --git a/objects/jigsaw/village-bits/lanterns-x-2.iob b/objects/village-bits/lanterns-x-2.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-x-2.iob rename to objects/village-bits/lanterns-x-2.iob diff --git a/objects/jigsaw/village-bits/lanterns-x-3.iob b/objects/village-bits/lanterns-x-3.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-x-3.iob rename to objects/village-bits/lanterns-x-3.iob diff --git a/objects/jigsaw/village-bits/lanterns-x-4.iob b/objects/village-bits/lanterns-x-4.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-x-4.iob rename to objects/village-bits/lanterns-x-4.iob diff --git a/objects/jigsaw/village-bits/lanterns-x-5.iob b/objects/village-bits/lanterns-x-5.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-x-5.iob rename to objects/village-bits/lanterns-x-5.iob diff --git a/objects/jigsaw/village-bits/logger-e-1.iob b/objects/village-bits/logger-e-1.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-e-1.iob rename to objects/village-bits/logger-e-1.iob diff --git a/objects/jigsaw/village-bits/logger-e-2.iob b/objects/village-bits/logger-e-2.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-e-2.iob rename to objects/village-bits/logger-e-2.iob diff --git a/objects/jigsaw/village-bits/logger-e-3.iob b/objects/village-bits/logger-e-3.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-e-3.iob rename to objects/village-bits/logger-e-3.iob diff --git a/objects/jigsaw/village-bits/logger-e-4.iob b/objects/village-bits/logger-e-4.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-e-4.iob rename to objects/village-bits/logger-e-4.iob diff --git a/objects/jigsaw/village-bits/logger-e-5.iob b/objects/village-bits/logger-e-5.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-e-5.iob rename to objects/village-bits/logger-e-5.iob diff --git a/objects/jigsaw/village-bits/logger-ne-1.iob b/objects/village-bits/logger-ne-1.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ne-1.iob rename to objects/village-bits/logger-ne-1.iob diff --git a/objects/jigsaw/village-bits/logger-ne-2.iob b/objects/village-bits/logger-ne-2.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ne-2.iob rename to objects/village-bits/logger-ne-2.iob diff --git a/objects/jigsaw/village-bits/logger-ne-3.iob b/objects/village-bits/logger-ne-3.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ne-3.iob rename to objects/village-bits/logger-ne-3.iob diff --git a/objects/jigsaw/village-bits/logger-ne-4.iob b/objects/village-bits/logger-ne-4.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ne-4.iob rename to objects/village-bits/logger-ne-4.iob diff --git a/objects/jigsaw/village-bits/logger-ne-5.iob b/objects/village-bits/logger-ne-5.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ne-5.iob rename to objects/village-bits/logger-ne-5.iob diff --git a/objects/jigsaw/village-bits/logger-nes-1.iob b/objects/village-bits/logger-nes-1.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-nes-1.iob rename to objects/village-bits/logger-nes-1.iob diff --git a/objects/jigsaw/village-bits/logger-nes-2.iob b/objects/village-bits/logger-nes-2.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-nes-2.iob rename to objects/village-bits/logger-nes-2.iob diff --git a/objects/jigsaw/village-bits/logger-nes-3.iob b/objects/village-bits/logger-nes-3.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-nes-3.iob rename to objects/village-bits/logger-nes-3.iob diff --git a/objects/jigsaw/village-bits/logger-nes-4.iob b/objects/village-bits/logger-nes-4.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-nes-4.iob rename to objects/village-bits/logger-nes-4.iob diff --git a/objects/jigsaw/village-bits/logger-nes-5.iob b/objects/village-bits/logger-nes-5.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-nes-5.iob rename to objects/village-bits/logger-nes-5.iob diff --git a/objects/jigsaw/village-bits/logger-ns-1.iob b/objects/village-bits/logger-ns-1.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ns-1.iob rename to objects/village-bits/logger-ns-1.iob diff --git a/objects/jigsaw/village-bits/logger-ns-2.iob b/objects/village-bits/logger-ns-2.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ns-2.iob rename to objects/village-bits/logger-ns-2.iob diff --git a/objects/jigsaw/village-bits/logger-ns-3.iob b/objects/village-bits/logger-ns-3.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ns-3.iob rename to objects/village-bits/logger-ns-3.iob diff --git a/objects/jigsaw/village-bits/logger-ns-4.iob b/objects/village-bits/logger-ns-4.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ns-4.iob rename to objects/village-bits/logger-ns-4.iob diff --git a/objects/jigsaw/village-bits/logger-ns-5.iob b/objects/village-bits/logger-ns-5.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ns-5.iob rename to objects/village-bits/logger-ns-5.iob diff --git a/objects/jigsaw/village-bits/logger-x-1.iob b/objects/village-bits/logger-x-1.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-x-1.iob rename to objects/village-bits/logger-x-1.iob diff --git a/objects/jigsaw/village-bits/logger-x-2.iob b/objects/village-bits/logger-x-2.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-x-2.iob rename to objects/village-bits/logger-x-2.iob diff --git a/objects/jigsaw/village-bits/logger-x-3.iob b/objects/village-bits/logger-x-3.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-x-3.iob rename to objects/village-bits/logger-x-3.iob diff --git a/objects/jigsaw/village-bits/logger-x-4.iob b/objects/village-bits/logger-x-4.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-x-4.iob rename to objects/village-bits/logger-x-4.iob diff --git a/objects/jigsaw/village-bits/logger-x-5.iob b/objects/village-bits/logger-x-5.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-x-5.iob rename to objects/village-bits/logger-x-5.iob diff --git a/objects/jigsaw/village-bits/stonehome-esw-1.iob b/objects/village-bits/stonehome-esw-1.iob similarity index 100% rename from objects/jigsaw/village-bits/stonehome-esw-1.iob rename to objects/village-bits/stonehome-esw-1.iob diff --git a/objects/jigsaw/village-bits/stonehome-esw-2.iob b/objects/village-bits/stonehome-esw-2.iob similarity index 100% rename from objects/jigsaw/village-bits/stonehome-esw-2.iob rename to objects/village-bits/stonehome-esw-2.iob diff --git a/objects/jigsaw/village-bits/stonehome-esw-3.iob b/objects/village-bits/stonehome-esw-3.iob similarity index 100% rename from objects/jigsaw/village-bits/stonehome-esw-3.iob rename to objects/village-bits/stonehome-esw-3.iob diff --git a/objects/jigsaw/village-bits/stonehome-esw-4.iob b/objects/village-bits/stonehome-esw-4.iob similarity index 100% rename from objects/jigsaw/village-bits/stonehome-esw-4.iob rename to objects/village-bits/stonehome-esw-4.iob diff --git a/objects/jigsaw/village/common/animals/cat_black.iob b/objects/village/common/animals/cat_black.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_black.iob rename to objects/village/common/animals/cat_black.iob diff --git a/objects/jigsaw/village/common/animals/cat_british.iob b/objects/village/common/animals/cat_british.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_british.iob rename to objects/village/common/animals/cat_british.iob diff --git a/objects/jigsaw/village/common/animals/cat_calico.iob b/objects/village/common/animals/cat_calico.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_calico.iob rename to objects/village/common/animals/cat_calico.iob diff --git a/objects/jigsaw/village/common/animals/cat_jellie.iob b/objects/village/common/animals/cat_jellie.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_jellie.iob rename to objects/village/common/animals/cat_jellie.iob diff --git a/objects/jigsaw/village/common/animals/cat_persian.iob b/objects/village/common/animals/cat_persian.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_persian.iob rename to objects/village/common/animals/cat_persian.iob diff --git a/objects/jigsaw/village/common/animals/cat_ragdoll.iob b/objects/village/common/animals/cat_ragdoll.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_ragdoll.iob rename to objects/village/common/animals/cat_ragdoll.iob diff --git a/objects/jigsaw/village/common/animals/cat_red.iob b/objects/village/common/animals/cat_red.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_red.iob rename to objects/village/common/animals/cat_red.iob diff --git a/objects/jigsaw/village/common/animals/cat_siamese.iob b/objects/village/common/animals/cat_siamese.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_siamese.iob rename to objects/village/common/animals/cat_siamese.iob diff --git a/objects/jigsaw/village/common/animals/cat_tabby.iob b/objects/village/common/animals/cat_tabby.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_tabby.iob rename to objects/village/common/animals/cat_tabby.iob diff --git a/objects/jigsaw/village/common/animals/cat_white.iob b/objects/village/common/animals/cat_white.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_white.iob rename to objects/village/common/animals/cat_white.iob diff --git a/objects/jigsaw/village/common/animals/cows_1.iob b/objects/village/common/animals/cows_1.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cows_1.iob rename to objects/village/common/animals/cows_1.iob diff --git a/objects/jigsaw/village/common/animals/horses_1.iob b/objects/village/common/animals/horses_1.iob similarity index 100% rename from objects/jigsaw/village/common/animals/horses_1.iob rename to objects/village/common/animals/horses_1.iob diff --git a/objects/jigsaw/village/common/animals/horses_2.iob b/objects/village/common/animals/horses_2.iob similarity index 100% rename from objects/jigsaw/village/common/animals/horses_2.iob rename to objects/village/common/animals/horses_2.iob diff --git a/objects/jigsaw/village/common/animals/horses_3.iob b/objects/village/common/animals/horses_3.iob similarity index 100% rename from objects/jigsaw/village/common/animals/horses_3.iob rename to objects/village/common/animals/horses_3.iob diff --git a/objects/jigsaw/village/common/animals/horses_4.iob b/objects/village/common/animals/horses_4.iob similarity index 100% rename from objects/jigsaw/village/common/animals/horses_4.iob rename to objects/village/common/animals/horses_4.iob diff --git a/objects/jigsaw/village/common/animals/horses_5.iob b/objects/village/common/animals/horses_5.iob similarity index 100% rename from objects/jigsaw/village/common/animals/horses_5.iob rename to objects/village/common/animals/horses_5.iob diff --git a/objects/jigsaw/village/common/animals/pigs_1.iob b/objects/village/common/animals/pigs_1.iob similarity index 100% rename from objects/jigsaw/village/common/animals/pigs_1.iob rename to objects/village/common/animals/pigs_1.iob diff --git a/objects/jigsaw/village/common/animals/sheep_1.iob b/objects/village/common/animals/sheep_1.iob similarity index 100% rename from objects/jigsaw/village/common/animals/sheep_1.iob rename to objects/village/common/animals/sheep_1.iob diff --git a/objects/jigsaw/village/common/animals/sheep_2.iob b/objects/village/common/animals/sheep_2.iob similarity index 100% rename from objects/jigsaw/village/common/animals/sheep_2.iob rename to objects/village/common/animals/sheep_2.iob diff --git a/objects/jigsaw/village/common/iron_golem.iob b/objects/village/common/iron_golem.iob similarity index 100% rename from objects/jigsaw/village/common/iron_golem.iob rename to objects/village/common/iron_golem.iob diff --git a/objects/jigsaw/village/common/well_bottom.iob b/objects/village/common/well_bottom.iob similarity index 100% rename from objects/jigsaw/village/common/well_bottom.iob rename to objects/village/common/well_bottom.iob diff --git a/objects/jigsaw/village/decays/grass_11x13.iob b/objects/village/decays/grass_11x13.iob similarity index 100% rename from objects/jigsaw/village/decays/grass_11x13.iob rename to objects/village/decays/grass_11x13.iob diff --git a/objects/jigsaw/village/decays/grass_16x16.iob b/objects/village/decays/grass_16x16.iob similarity index 100% rename from objects/jigsaw/village/decays/grass_16x16.iob rename to objects/village/decays/grass_16x16.iob diff --git a/objects/jigsaw/village/decays/grass_9x9.iob b/objects/village/decays/grass_9x9.iob similarity index 100% rename from objects/jigsaw/village/decays/grass_9x9.iob rename to objects/village/decays/grass_9x9.iob diff --git a/objects/jigsaw/village/desert/desert_lamp_1.iob b/objects/village/desert/desert_lamp_1.iob similarity index 100% rename from objects/jigsaw/village/desert/desert_lamp_1.iob rename to objects/village/desert/desert_lamp_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_animal_pen_1.iob b/objects/village/desert/houses/desert_animal_pen_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_animal_pen_1.iob rename to objects/village/desert/houses/desert_animal_pen_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_animal_pen_2.iob b/objects/village/desert/houses/desert_animal_pen_2.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_animal_pen_2.iob rename to objects/village/desert/houses/desert_animal_pen_2.iob diff --git a/objects/jigsaw/village/desert/houses/desert_armorer_1.iob b/objects/village/desert/houses/desert_armorer_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_armorer_1.iob rename to objects/village/desert/houses/desert_armorer_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_butcher_shop_1.iob b/objects/village/desert/houses/desert_butcher_shop_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_butcher_shop_1.iob rename to objects/village/desert/houses/desert_butcher_shop_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_cartographer_house_1.iob b/objects/village/desert/houses/desert_cartographer_house_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_cartographer_house_1.iob rename to objects/village/desert/houses/desert_cartographer_house_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_farm_1.iob b/objects/village/desert/houses/desert_farm_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_farm_1.iob rename to objects/village/desert/houses/desert_farm_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_farm_2.iob b/objects/village/desert/houses/desert_farm_2.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_farm_2.iob rename to objects/village/desert/houses/desert_farm_2.iob diff --git a/objects/jigsaw/village/desert/houses/desert_fisher_1.iob b/objects/village/desert/houses/desert_fisher_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_fisher_1.iob rename to objects/village/desert/houses/desert_fisher_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_fletcher_house_1.iob b/objects/village/desert/houses/desert_fletcher_house_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_fletcher_house_1.iob rename to objects/village/desert/houses/desert_fletcher_house_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_large_farm_1.iob b/objects/village/desert/houses/desert_large_farm_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_large_farm_1.iob rename to objects/village/desert/houses/desert_large_farm_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_library_1.iob b/objects/village/desert/houses/desert_library_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_library_1.iob rename to objects/village/desert/houses/desert_library_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_mason_1.iob b/objects/village/desert/houses/desert_mason_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_mason_1.iob rename to objects/village/desert/houses/desert_mason_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_medium_house_1.iob b/objects/village/desert/houses/desert_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_medium_house_1.iob rename to objects/village/desert/houses/desert_medium_house_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_medium_house_2.iob b/objects/village/desert/houses/desert_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_medium_house_2.iob rename to objects/village/desert/houses/desert_medium_house_2.iob diff --git a/objects/jigsaw/village/desert/houses/desert_shepherd_house_1.iob b/objects/village/desert/houses/desert_shepherd_house_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_shepherd_house_1.iob rename to objects/village/desert/houses/desert_shepherd_house_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_small_house_1.iob b/objects/village/desert/houses/desert_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_small_house_1.iob rename to objects/village/desert/houses/desert_small_house_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_small_house_2.iob b/objects/village/desert/houses/desert_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_small_house_2.iob rename to objects/village/desert/houses/desert_small_house_2.iob diff --git a/objects/jigsaw/village/desert/houses/desert_small_house_3.iob b/objects/village/desert/houses/desert_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_small_house_3.iob rename to objects/village/desert/houses/desert_small_house_3.iob diff --git a/objects/jigsaw/village/desert/houses/desert_small_house_4.iob b/objects/village/desert/houses/desert_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_small_house_4.iob rename to objects/village/desert/houses/desert_small_house_4.iob diff --git a/objects/jigsaw/village/desert/houses/desert_small_house_5.iob b/objects/village/desert/houses/desert_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_small_house_5.iob rename to objects/village/desert/houses/desert_small_house_5.iob diff --git a/objects/jigsaw/village/desert/houses/desert_small_house_6.iob b/objects/village/desert/houses/desert_small_house_6.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_small_house_6.iob rename to objects/village/desert/houses/desert_small_house_6.iob diff --git a/objects/jigsaw/village/desert/houses/desert_small_house_7.iob b/objects/village/desert/houses/desert_small_house_7.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_small_house_7.iob rename to objects/village/desert/houses/desert_small_house_7.iob diff --git a/objects/jigsaw/village/desert/houses/desert_small_house_8.iob b/objects/village/desert/houses/desert_small_house_8.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_small_house_8.iob rename to objects/village/desert/houses/desert_small_house_8.iob diff --git a/objects/jigsaw/village/desert/houses/desert_tannery_1.iob b/objects/village/desert/houses/desert_tannery_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_tannery_1.iob rename to objects/village/desert/houses/desert_tannery_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_temple_1.iob b/objects/village/desert/houses/desert_temple_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_temple_1.iob rename to objects/village/desert/houses/desert_temple_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_temple_2.iob b/objects/village/desert/houses/desert_temple_2.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_temple_2.iob rename to objects/village/desert/houses/desert_temple_2.iob diff --git a/objects/jigsaw/village/desert/houses/desert_tool_smith_1.iob b/objects/village/desert/houses/desert_tool_smith_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_tool_smith_1.iob rename to objects/village/desert/houses/desert_tool_smith_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_weaponsmith_1.iob b/objects/village/desert/houses/desert_weaponsmith_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_weaponsmith_1.iob rename to objects/village/desert/houses/desert_weaponsmith_1.iob diff --git a/objects/jigsaw/village/desert/streets/corner_01.iob b/objects/village/desert/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/corner_01.iob rename to objects/village/desert/streets/corner_01.iob diff --git a/objects/jigsaw/village/desert/streets/corner_02.iob b/objects/village/desert/streets/corner_02.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/corner_02.iob rename to objects/village/desert/streets/corner_02.iob diff --git a/objects/jigsaw/village/desert/streets/crossroad_01.iob b/objects/village/desert/streets/crossroad_01.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/crossroad_01.iob rename to objects/village/desert/streets/crossroad_01.iob diff --git a/objects/jigsaw/village/desert/streets/crossroad_02.iob b/objects/village/desert/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/crossroad_02.iob rename to objects/village/desert/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/desert/streets/crossroad_03.iob b/objects/village/desert/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/crossroad_03.iob rename to objects/village/desert/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/desert/streets/square_01.iob b/objects/village/desert/streets/square_01.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/square_01.iob rename to objects/village/desert/streets/square_01.iob diff --git a/objects/jigsaw/village/desert/streets/square_02.iob b/objects/village/desert/streets/square_02.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/square_02.iob rename to objects/village/desert/streets/square_02.iob diff --git a/objects/jigsaw/village/desert/streets/straight_01.iob b/objects/village/desert/streets/straight_01.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/straight_01.iob rename to objects/village/desert/streets/straight_01.iob diff --git a/objects/jigsaw/village/desert/streets/straight_02.iob b/objects/village/desert/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/straight_02.iob rename to objects/village/desert/streets/straight_02.iob diff --git a/objects/jigsaw/village/desert/streets/straight_03.iob b/objects/village/desert/streets/straight_03.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/straight_03.iob rename to objects/village/desert/streets/straight_03.iob diff --git a/objects/jigsaw/village/desert/streets/turn_01.iob b/objects/village/desert/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/turn_01.iob rename to objects/village/desert/streets/turn_01.iob diff --git a/objects/jigsaw/village/desert/terminators/terminator_01.iob b/objects/village/desert/terminators/terminator_01.iob similarity index 100% rename from objects/jigsaw/village/desert/terminators/terminator_01.iob rename to objects/village/desert/terminators/terminator_01.iob diff --git a/objects/jigsaw/village/desert/terminators/terminator_02.iob b/objects/village/desert/terminators/terminator_02.iob similarity index 100% rename from objects/jigsaw/village/desert/terminators/terminator_02.iob rename to objects/village/desert/terminators/terminator_02.iob diff --git a/objects/jigsaw/village/desert/town_centers/desert_meeting_point_1.iob b/objects/village/desert/town_centers/desert_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/desert/town_centers/desert_meeting_point_1.iob rename to objects/village/desert/town_centers/desert_meeting_point_1.iob diff --git a/objects/jigsaw/village/desert/town_centers/desert_meeting_point_2.iob b/objects/village/desert/town_centers/desert_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/desert/town_centers/desert_meeting_point_2.iob rename to objects/village/desert/town_centers/desert_meeting_point_2.iob diff --git a/objects/jigsaw/village/desert/town_centers/desert_meeting_point_3.iob b/objects/village/desert/town_centers/desert_meeting_point_3.iob similarity index 100% rename from objects/jigsaw/village/desert/town_centers/desert_meeting_point_3.iob rename to objects/village/desert/town_centers/desert_meeting_point_3.iob diff --git a/objects/jigsaw/village/desert/villagers/baby.iob b/objects/village/desert/villagers/baby.iob similarity index 100% rename from objects/jigsaw/village/desert/villagers/baby.iob rename to objects/village/desert/villagers/baby.iob diff --git a/objects/jigsaw/village/desert/villagers/nitwit.iob b/objects/village/desert/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/desert/villagers/nitwit.iob rename to objects/village/desert/villagers/nitwit.iob diff --git a/objects/jigsaw/village/desert/villagers/unemployed.iob b/objects/village/desert/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/desert/villagers/unemployed.iob rename to objects/village/desert/villagers/unemployed.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_medium_house_1.iob b/objects/village/desert/zombie/houses/desert_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_medium_house_1.iob rename to objects/village/desert/zombie/houses/desert_medium_house_1.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_medium_house_2.iob b/objects/village/desert/zombie/houses/desert_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_medium_house_2.iob rename to objects/village/desert/zombie/houses/desert_medium_house_2.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_small_house_1.iob b/objects/village/desert/zombie/houses/desert_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_small_house_1.iob rename to objects/village/desert/zombie/houses/desert_small_house_1.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_small_house_2.iob b/objects/village/desert/zombie/houses/desert_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_small_house_2.iob rename to objects/village/desert/zombie/houses/desert_small_house_2.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_small_house_3.iob b/objects/village/desert/zombie/houses/desert_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_small_house_3.iob rename to objects/village/desert/zombie/houses/desert_small_house_3.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_small_house_4.iob b/objects/village/desert/zombie/houses/desert_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_small_house_4.iob rename to objects/village/desert/zombie/houses/desert_small_house_4.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_small_house_5.iob b/objects/village/desert/zombie/houses/desert_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_small_house_5.iob rename to objects/village/desert/zombie/houses/desert_small_house_5.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_small_house_6.iob b/objects/village/desert/zombie/houses/desert_small_house_6.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_small_house_6.iob rename to objects/village/desert/zombie/houses/desert_small_house_6.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_small_house_7.iob b/objects/village/desert/zombie/houses/desert_small_house_7.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_small_house_7.iob rename to objects/village/desert/zombie/houses/desert_small_house_7.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_small_house_8.iob b/objects/village/desert/zombie/houses/desert_small_house_8.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_small_house_8.iob rename to objects/village/desert/zombie/houses/desert_small_house_8.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/corner_01.iob b/objects/village/desert/zombie/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/corner_01.iob rename to objects/village/desert/zombie/streets/corner_01.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/corner_02.iob b/objects/village/desert/zombie/streets/corner_02.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/corner_02.iob rename to objects/village/desert/zombie/streets/corner_02.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/crossroad_01.iob b/objects/village/desert/zombie/streets/crossroad_01.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/crossroad_01.iob rename to objects/village/desert/zombie/streets/crossroad_01.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/crossroad_02.iob b/objects/village/desert/zombie/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/crossroad_02.iob rename to objects/village/desert/zombie/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/crossroad_03.iob b/objects/village/desert/zombie/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/crossroad_03.iob rename to objects/village/desert/zombie/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/square_01.iob b/objects/village/desert/zombie/streets/square_01.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/square_01.iob rename to objects/village/desert/zombie/streets/square_01.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/square_02.iob b/objects/village/desert/zombie/streets/square_02.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/square_02.iob rename to objects/village/desert/zombie/streets/square_02.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/straight_01.iob b/objects/village/desert/zombie/streets/straight_01.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/straight_01.iob rename to objects/village/desert/zombie/streets/straight_01.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/straight_02.iob b/objects/village/desert/zombie/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/straight_02.iob rename to objects/village/desert/zombie/streets/straight_02.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/straight_03.iob b/objects/village/desert/zombie/streets/straight_03.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/straight_03.iob rename to objects/village/desert/zombie/streets/straight_03.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/turn_01.iob b/objects/village/desert/zombie/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/turn_01.iob rename to objects/village/desert/zombie/streets/turn_01.iob diff --git a/objects/jigsaw/village/desert/zombie/terminators/terminator_02.iob b/objects/village/desert/zombie/terminators/terminator_02.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/terminators/terminator_02.iob rename to objects/village/desert/zombie/terminators/terminator_02.iob diff --git a/objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_1.iob b/objects/village/desert/zombie/town_centers/desert_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_1.iob rename to objects/village/desert/zombie/town_centers/desert_meeting_point_1.iob diff --git a/objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_2.iob b/objects/village/desert/zombie/town_centers/desert_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_2.iob rename to objects/village/desert/zombie/town_centers/desert_meeting_point_2.iob diff --git a/objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_3.iob b/objects/village/desert/zombie/town_centers/desert_meeting_point_3.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_3.iob rename to objects/village/desert/zombie/town_centers/desert_meeting_point_3.iob diff --git a/objects/jigsaw/village/desert/zombie/villagers/nitwit.iob b/objects/village/desert/zombie/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/villagers/nitwit.iob rename to objects/village/desert/zombie/villagers/nitwit.iob diff --git a/objects/jigsaw/village/desert/zombie/villagers/unemployed.iob b/objects/village/desert/zombie/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/villagers/unemployed.iob rename to objects/village/desert/zombie/villagers/unemployed.iob diff --git a/objects/jigsaw/village/plains/houses/plains_accessory_1.iob b/objects/village/plains/houses/plains_accessory_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_accessory_1.iob rename to objects/village/plains/houses/plains_accessory_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_animal_pen_1.iob b/objects/village/plains/houses/plains_animal_pen_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_animal_pen_1.iob rename to objects/village/plains/houses/plains_animal_pen_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_animal_pen_2.iob b/objects/village/plains/houses/plains_animal_pen_2.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_animal_pen_2.iob rename to objects/village/plains/houses/plains_animal_pen_2.iob diff --git a/objects/jigsaw/village/plains/houses/plains_animal_pen_3.iob b/objects/village/plains/houses/plains_animal_pen_3.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_animal_pen_3.iob rename to objects/village/plains/houses/plains_animal_pen_3.iob diff --git a/objects/jigsaw/village/plains/houses/plains_armorer_house_1.iob b/objects/village/plains/houses/plains_armorer_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_armorer_house_1.iob rename to objects/village/plains/houses/plains_armorer_house_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_big_house_1.iob b/objects/village/plains/houses/plains_big_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_big_house_1.iob rename to objects/village/plains/houses/plains_big_house_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_butcher_shop_1.iob b/objects/village/plains/houses/plains_butcher_shop_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_butcher_shop_1.iob rename to objects/village/plains/houses/plains_butcher_shop_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_butcher_shop_2.iob b/objects/village/plains/houses/plains_butcher_shop_2.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_butcher_shop_2.iob rename to objects/village/plains/houses/plains_butcher_shop_2.iob diff --git a/objects/jigsaw/village/plains/houses/plains_cartographer_1.iob b/objects/village/plains/houses/plains_cartographer_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_cartographer_1.iob rename to objects/village/plains/houses/plains_cartographer_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_fisher_cottage_1.iob b/objects/village/plains/houses/plains_fisher_cottage_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_fisher_cottage_1.iob rename to objects/village/plains/houses/plains_fisher_cottage_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_fletcher_house_1.iob b/objects/village/plains/houses/plains_fletcher_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_fletcher_house_1.iob rename to objects/village/plains/houses/plains_fletcher_house_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_large_farm_1.iob b/objects/village/plains/houses/plains_large_farm_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_large_farm_1.iob rename to objects/village/plains/houses/plains_large_farm_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_library_1.iob b/objects/village/plains/houses/plains_library_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_library_1.iob rename to objects/village/plains/houses/plains_library_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_library_2.iob b/objects/village/plains/houses/plains_library_2.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_library_2.iob rename to objects/village/plains/houses/plains_library_2.iob diff --git a/objects/jigsaw/village/plains/houses/plains_masons_house_1.iob b/objects/village/plains/houses/plains_masons_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_masons_house_1.iob rename to objects/village/plains/houses/plains_masons_house_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_medium_house_1.iob b/objects/village/plains/houses/plains_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_medium_house_1.iob rename to objects/village/plains/houses/plains_medium_house_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_medium_house_2.iob b/objects/village/plains/houses/plains_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_medium_house_2.iob rename to objects/village/plains/houses/plains_medium_house_2.iob diff --git a/objects/jigsaw/village/plains/houses/plains_meeting_point_4.iob b/objects/village/plains/houses/plains_meeting_point_4.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_meeting_point_4.iob rename to objects/village/plains/houses/plains_meeting_point_4.iob diff --git a/objects/jigsaw/village/plains/houses/plains_meeting_point_5.iob b/objects/village/plains/houses/plains_meeting_point_5.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_meeting_point_5.iob rename to objects/village/plains/houses/plains_meeting_point_5.iob diff --git a/objects/jigsaw/village/plains/houses/plains_shepherds_house_1.iob b/objects/village/plains/houses/plains_shepherds_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_shepherds_house_1.iob rename to objects/village/plains/houses/plains_shepherds_house_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_farm_1.iob b/objects/village/plains/houses/plains_small_farm_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_farm_1.iob rename to objects/village/plains/houses/plains_small_farm_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_house_1.iob b/objects/village/plains/houses/plains_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_house_1.iob rename to objects/village/plains/houses/plains_small_house_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_house_2.iob b/objects/village/plains/houses/plains_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_house_2.iob rename to objects/village/plains/houses/plains_small_house_2.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_house_3.iob b/objects/village/plains/houses/plains_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_house_3.iob rename to objects/village/plains/houses/plains_small_house_3.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_house_4.iob b/objects/village/plains/houses/plains_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_house_4.iob rename to objects/village/plains/houses/plains_small_house_4.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_house_5.iob b/objects/village/plains/houses/plains_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_house_5.iob rename to objects/village/plains/houses/plains_small_house_5.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_house_6.iob b/objects/village/plains/houses/plains_small_house_6.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_house_6.iob rename to objects/village/plains/houses/plains_small_house_6.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_house_7.iob b/objects/village/plains/houses/plains_small_house_7.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_house_7.iob rename to objects/village/plains/houses/plains_small_house_7.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_house_8.iob b/objects/village/plains/houses/plains_small_house_8.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_house_8.iob rename to objects/village/plains/houses/plains_small_house_8.iob diff --git a/objects/jigsaw/village/plains/houses/plains_stable_1.iob b/objects/village/plains/houses/plains_stable_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_stable_1.iob rename to objects/village/plains/houses/plains_stable_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_stable_2.iob b/objects/village/plains/houses/plains_stable_2.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_stable_2.iob rename to objects/village/plains/houses/plains_stable_2.iob diff --git a/objects/jigsaw/village/plains/houses/plains_tannery_1.iob b/objects/village/plains/houses/plains_tannery_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_tannery_1.iob rename to objects/village/plains/houses/plains_tannery_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_temple_3.iob b/objects/village/plains/houses/plains_temple_3.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_temple_3.iob rename to objects/village/plains/houses/plains_temple_3.iob diff --git a/objects/jigsaw/village/plains/houses/plains_temple_4.iob b/objects/village/plains/houses/plains_temple_4.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_temple_4.iob rename to objects/village/plains/houses/plains_temple_4.iob diff --git a/objects/jigsaw/village/plains/houses/plains_tool_smith_1.iob b/objects/village/plains/houses/plains_tool_smith_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_tool_smith_1.iob rename to objects/village/plains/houses/plains_tool_smith_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_weaponsmith_1.iob b/objects/village/plains/houses/plains_weaponsmith_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_weaponsmith_1.iob rename to objects/village/plains/houses/plains_weaponsmith_1.iob diff --git a/objects/jigsaw/village/plains/plains_lamp_1.iob b/objects/village/plains/plains_lamp_1.iob similarity index 100% rename from objects/jigsaw/village/plains/plains_lamp_1.iob rename to objects/village/plains/plains_lamp_1.iob diff --git a/objects/jigsaw/village/plains/streets/corner_01.iob b/objects/village/plains/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/corner_01.iob rename to objects/village/plains/streets/corner_01.iob diff --git a/objects/jigsaw/village/plains/streets/corner_02.iob b/objects/village/plains/streets/corner_02.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/corner_02.iob rename to objects/village/plains/streets/corner_02.iob diff --git a/objects/jigsaw/village/plains/streets/corner_03.iob b/objects/village/plains/streets/corner_03.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/corner_03.iob rename to objects/village/plains/streets/corner_03.iob diff --git a/objects/jigsaw/village/plains/streets/crossroad_01.iob b/objects/village/plains/streets/crossroad_01.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/crossroad_01.iob rename to objects/village/plains/streets/crossroad_01.iob diff --git a/objects/jigsaw/village/plains/streets/crossroad_02.iob b/objects/village/plains/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/crossroad_02.iob rename to objects/village/plains/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/plains/streets/crossroad_03.iob b/objects/village/plains/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/crossroad_03.iob rename to objects/village/plains/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/plains/streets/crossroad_04.iob b/objects/village/plains/streets/crossroad_04.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/crossroad_04.iob rename to objects/village/plains/streets/crossroad_04.iob diff --git a/objects/jigsaw/village/plains/streets/crossroad_05.iob b/objects/village/plains/streets/crossroad_05.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/crossroad_05.iob rename to objects/village/plains/streets/crossroad_05.iob diff --git a/objects/jigsaw/village/plains/streets/crossroad_06.iob b/objects/village/plains/streets/crossroad_06.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/crossroad_06.iob rename to objects/village/plains/streets/crossroad_06.iob diff --git a/objects/jigsaw/village/plains/streets/straight_01.iob b/objects/village/plains/streets/straight_01.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/straight_01.iob rename to objects/village/plains/streets/straight_01.iob diff --git a/objects/jigsaw/village/plains/streets/straight_02.iob b/objects/village/plains/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/straight_02.iob rename to objects/village/plains/streets/straight_02.iob diff --git a/objects/jigsaw/village/plains/streets/straight_03.iob b/objects/village/plains/streets/straight_03.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/straight_03.iob rename to objects/village/plains/streets/straight_03.iob diff --git a/objects/jigsaw/village/plains/streets/straight_04.iob b/objects/village/plains/streets/straight_04.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/straight_04.iob rename to objects/village/plains/streets/straight_04.iob diff --git a/objects/jigsaw/village/plains/streets/straight_05.iob b/objects/village/plains/streets/straight_05.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/straight_05.iob rename to objects/village/plains/streets/straight_05.iob diff --git a/objects/jigsaw/village/plains/streets/straight_06.iob b/objects/village/plains/streets/straight_06.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/straight_06.iob rename to objects/village/plains/streets/straight_06.iob diff --git a/objects/jigsaw/village/plains/streets/turn_01.iob b/objects/village/plains/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/turn_01.iob rename to objects/village/plains/streets/turn_01.iob diff --git a/objects/jigsaw/village/plains/terminators/terminator_01.iob b/objects/village/plains/terminators/terminator_01.iob similarity index 100% rename from objects/jigsaw/village/plains/terminators/terminator_01.iob rename to objects/village/plains/terminators/terminator_01.iob diff --git a/objects/jigsaw/village/plains/terminators/terminator_02.iob b/objects/village/plains/terminators/terminator_02.iob similarity index 100% rename from objects/jigsaw/village/plains/terminators/terminator_02.iob rename to objects/village/plains/terminators/terminator_02.iob diff --git a/objects/jigsaw/village/plains/terminators/terminator_03.iob b/objects/village/plains/terminators/terminator_03.iob similarity index 100% rename from objects/jigsaw/village/plains/terminators/terminator_03.iob rename to objects/village/plains/terminators/terminator_03.iob diff --git a/objects/jigsaw/village/plains/terminators/terminator_04.iob b/objects/village/plains/terminators/terminator_04.iob similarity index 100% rename from objects/jigsaw/village/plains/terminators/terminator_04.iob rename to objects/village/plains/terminators/terminator_04.iob diff --git a/objects/jigsaw/village/plains/town_centers/plains_fountain_01.iob b/objects/village/plains/town_centers/plains_fountain_01.iob similarity index 100% rename from objects/jigsaw/village/plains/town_centers/plains_fountain_01.iob rename to objects/village/plains/town_centers/plains_fountain_01.iob diff --git a/objects/jigsaw/village/plains/town_centers/plains_meeting_point_1.iob b/objects/village/plains/town_centers/plains_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/plains/town_centers/plains_meeting_point_1.iob rename to objects/village/plains/town_centers/plains_meeting_point_1.iob diff --git a/objects/jigsaw/village/plains/town_centers/plains_meeting_point_2.iob b/objects/village/plains/town_centers/plains_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/plains/town_centers/plains_meeting_point_2.iob rename to objects/village/plains/town_centers/plains_meeting_point_2.iob diff --git a/objects/jigsaw/village/plains/town_centers/plains_meeting_point_3.iob b/objects/village/plains/town_centers/plains_meeting_point_3.iob similarity index 100% rename from objects/jigsaw/village/plains/town_centers/plains_meeting_point_3.iob rename to objects/village/plains/town_centers/plains_meeting_point_3.iob diff --git a/objects/jigsaw/village/plains/villagers/baby.iob b/objects/village/plains/villagers/baby.iob similarity index 100% rename from objects/jigsaw/village/plains/villagers/baby.iob rename to objects/village/plains/villagers/baby.iob diff --git a/objects/jigsaw/village/plains/villagers/nitwit.iob b/objects/village/plains/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/plains/villagers/nitwit.iob rename to objects/village/plains/villagers/nitwit.iob diff --git a/objects/jigsaw/village/plains/villagers/unemployed.iob b/objects/village/plains/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/plains/villagers/unemployed.iob rename to objects/village/plains/villagers/unemployed.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_animal_pen_3.iob b/objects/village/plains/zombie/houses/plains_animal_pen_3.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_animal_pen_3.iob rename to objects/village/plains/zombie/houses/plains_animal_pen_3.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_big_house_1.iob b/objects/village/plains/zombie/houses/plains_big_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_big_house_1.iob rename to objects/village/plains/zombie/houses/plains_big_house_1.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_butcher_shop_2.iob b/objects/village/plains/zombie/houses/plains_butcher_shop_2.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_butcher_shop_2.iob rename to objects/village/plains/zombie/houses/plains_butcher_shop_2.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_fletcher_house_1.iob b/objects/village/plains/zombie/houses/plains_fletcher_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_fletcher_house_1.iob rename to objects/village/plains/zombie/houses/plains_fletcher_house_1.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_medium_house_1.iob b/objects/village/plains/zombie/houses/plains_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_medium_house_1.iob rename to objects/village/plains/zombie/houses/plains_medium_house_1.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_medium_house_2.iob b/objects/village/plains/zombie/houses/plains_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_medium_house_2.iob rename to objects/village/plains/zombie/houses/plains_medium_house_2.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_meeting_point_4.iob b/objects/village/plains/zombie/houses/plains_meeting_point_4.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_meeting_point_4.iob rename to objects/village/plains/zombie/houses/plains_meeting_point_4.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_meeting_point_5.iob b/objects/village/plains/zombie/houses/plains_meeting_point_5.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_meeting_point_5.iob rename to objects/village/plains/zombie/houses/plains_meeting_point_5.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_shepherds_house_1.iob b/objects/village/plains/zombie/houses/plains_shepherds_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_shepherds_house_1.iob rename to objects/village/plains/zombie/houses/plains_shepherds_house_1.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_small_house_1.iob b/objects/village/plains/zombie/houses/plains_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_small_house_1.iob rename to objects/village/plains/zombie/houses/plains_small_house_1.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_small_house_2.iob b/objects/village/plains/zombie/houses/plains_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_small_house_2.iob rename to objects/village/plains/zombie/houses/plains_small_house_2.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_small_house_3.iob b/objects/village/plains/zombie/houses/plains_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_small_house_3.iob rename to objects/village/plains/zombie/houses/plains_small_house_3.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_small_house_4.iob b/objects/village/plains/zombie/houses/plains_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_small_house_4.iob rename to objects/village/plains/zombie/houses/plains_small_house_4.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_small_house_5.iob b/objects/village/plains/zombie/houses/plains_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_small_house_5.iob rename to objects/village/plains/zombie/houses/plains_small_house_5.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_small_house_6.iob b/objects/village/plains/zombie/houses/plains_small_house_6.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_small_house_6.iob rename to objects/village/plains/zombie/houses/plains_small_house_6.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_small_house_7.iob b/objects/village/plains/zombie/houses/plains_small_house_7.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_small_house_7.iob rename to objects/village/plains/zombie/houses/plains_small_house_7.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_small_house_8.iob b/objects/village/plains/zombie/houses/plains_small_house_8.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_small_house_8.iob rename to objects/village/plains/zombie/houses/plains_small_house_8.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_stable_1.iob b/objects/village/plains/zombie/houses/plains_stable_1.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_stable_1.iob rename to objects/village/plains/zombie/houses/plains_stable_1.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/corner_01.iob b/objects/village/plains/zombie/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/corner_01.iob rename to objects/village/plains/zombie/streets/corner_01.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/corner_02.iob b/objects/village/plains/zombie/streets/corner_02.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/corner_02.iob rename to objects/village/plains/zombie/streets/corner_02.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/corner_03.iob b/objects/village/plains/zombie/streets/corner_03.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/corner_03.iob rename to objects/village/plains/zombie/streets/corner_03.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/crossroad_01.iob b/objects/village/plains/zombie/streets/crossroad_01.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/crossroad_01.iob rename to objects/village/plains/zombie/streets/crossroad_01.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/crossroad_02.iob b/objects/village/plains/zombie/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/crossroad_02.iob rename to objects/village/plains/zombie/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/crossroad_03.iob b/objects/village/plains/zombie/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/crossroad_03.iob rename to objects/village/plains/zombie/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/crossroad_04.iob b/objects/village/plains/zombie/streets/crossroad_04.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/crossroad_04.iob rename to objects/village/plains/zombie/streets/crossroad_04.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/crossroad_05.iob b/objects/village/plains/zombie/streets/crossroad_05.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/crossroad_05.iob rename to objects/village/plains/zombie/streets/crossroad_05.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/crossroad_06.iob b/objects/village/plains/zombie/streets/crossroad_06.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/crossroad_06.iob rename to objects/village/plains/zombie/streets/crossroad_06.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/straight_01.iob b/objects/village/plains/zombie/streets/straight_01.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/straight_01.iob rename to objects/village/plains/zombie/streets/straight_01.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/straight_02.iob b/objects/village/plains/zombie/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/straight_02.iob rename to objects/village/plains/zombie/streets/straight_02.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/straight_03.iob b/objects/village/plains/zombie/streets/straight_03.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/straight_03.iob rename to objects/village/plains/zombie/streets/straight_03.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/straight_04.iob b/objects/village/plains/zombie/streets/straight_04.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/straight_04.iob rename to objects/village/plains/zombie/streets/straight_04.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/straight_05.iob b/objects/village/plains/zombie/streets/straight_05.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/straight_05.iob rename to objects/village/plains/zombie/streets/straight_05.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/straight_06.iob b/objects/village/plains/zombie/streets/straight_06.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/straight_06.iob rename to objects/village/plains/zombie/streets/straight_06.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/turn_01.iob b/objects/village/plains/zombie/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/turn_01.iob rename to objects/village/plains/zombie/streets/turn_01.iob diff --git a/objects/jigsaw/village/plains/zombie/town_centers/plains_fountain_01.iob b/objects/village/plains/zombie/town_centers/plains_fountain_01.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/town_centers/plains_fountain_01.iob rename to objects/village/plains/zombie/town_centers/plains_fountain_01.iob diff --git a/objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_1.iob b/objects/village/plains/zombie/town_centers/plains_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_1.iob rename to objects/village/plains/zombie/town_centers/plains_meeting_point_1.iob diff --git a/objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_2.iob b/objects/village/plains/zombie/town_centers/plains_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_2.iob rename to objects/village/plains/zombie/town_centers/plains_meeting_point_2.iob diff --git a/objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_3.iob b/objects/village/plains/zombie/town_centers/plains_meeting_point_3.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_3.iob rename to objects/village/plains/zombie/town_centers/plains_meeting_point_3.iob diff --git a/objects/jigsaw/village/plains/zombie/villagers/nitwit.iob b/objects/village/plains/zombie/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/villagers/nitwit.iob rename to objects/village/plains/zombie/villagers/nitwit.iob diff --git a/objects/jigsaw/village/plains/zombie/villagers/unemployed.iob b/objects/village/plains/zombie/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/villagers/unemployed.iob rename to objects/village/plains/zombie/villagers/unemployed.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_animal_pen_1.iob b/objects/village/savanna/houses/savanna_animal_pen_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_animal_pen_1.iob rename to objects/village/savanna/houses/savanna_animal_pen_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_animal_pen_2.iob b/objects/village/savanna/houses/savanna_animal_pen_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_animal_pen_2.iob rename to objects/village/savanna/houses/savanna_animal_pen_2.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_animal_pen_3.iob b/objects/village/savanna/houses/savanna_animal_pen_3.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_animal_pen_3.iob rename to objects/village/savanna/houses/savanna_animal_pen_3.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_armorer_1.iob b/objects/village/savanna/houses/savanna_armorer_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_armorer_1.iob rename to objects/village/savanna/houses/savanna_armorer_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_butchers_shop_1.iob b/objects/village/savanna/houses/savanna_butchers_shop_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_butchers_shop_1.iob rename to objects/village/savanna/houses/savanna_butchers_shop_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_butchers_shop_2.iob b/objects/village/savanna/houses/savanna_butchers_shop_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_butchers_shop_2.iob rename to objects/village/savanna/houses/savanna_butchers_shop_2.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_cartographer_1.iob b/objects/village/savanna/houses/savanna_cartographer_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_cartographer_1.iob rename to objects/village/savanna/houses/savanna_cartographer_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_fisher_cottage_1.iob b/objects/village/savanna/houses/savanna_fisher_cottage_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_fisher_cottage_1.iob rename to objects/village/savanna/houses/savanna_fisher_cottage_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_fletcher_house_1.iob b/objects/village/savanna/houses/savanna_fletcher_house_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_fletcher_house_1.iob rename to objects/village/savanna/houses/savanna_fletcher_house_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_large_farm_1.iob b/objects/village/savanna/houses/savanna_large_farm_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_large_farm_1.iob rename to objects/village/savanna/houses/savanna_large_farm_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_large_farm_2.iob b/objects/village/savanna/houses/savanna_large_farm_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_large_farm_2.iob rename to objects/village/savanna/houses/savanna_large_farm_2.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_library_1.iob b/objects/village/savanna/houses/savanna_library_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_library_1.iob rename to objects/village/savanna/houses/savanna_library_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_mason_1.iob b/objects/village/savanna/houses/savanna_mason_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_mason_1.iob rename to objects/village/savanna/houses/savanna_mason_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_medium_house_1.iob b/objects/village/savanna/houses/savanna_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_medium_house_1.iob rename to objects/village/savanna/houses/savanna_medium_house_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_medium_house_2.iob b/objects/village/savanna/houses/savanna_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_medium_house_2.iob rename to objects/village/savanna/houses/savanna_medium_house_2.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_shepherd_1.iob b/objects/village/savanna/houses/savanna_shepherd_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_shepherd_1.iob rename to objects/village/savanna/houses/savanna_shepherd_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_farm.iob b/objects/village/savanna/houses/savanna_small_farm.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_farm.iob rename to objects/village/savanna/houses/savanna_small_farm.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_house_1.iob b/objects/village/savanna/houses/savanna_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_house_1.iob rename to objects/village/savanna/houses/savanna_small_house_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_house_2.iob b/objects/village/savanna/houses/savanna_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_house_2.iob rename to objects/village/savanna/houses/savanna_small_house_2.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_house_3.iob b/objects/village/savanna/houses/savanna_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_house_3.iob rename to objects/village/savanna/houses/savanna_small_house_3.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_house_4.iob b/objects/village/savanna/houses/savanna_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_house_4.iob rename to objects/village/savanna/houses/savanna_small_house_4.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_house_5.iob b/objects/village/savanna/houses/savanna_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_house_5.iob rename to objects/village/savanna/houses/savanna_small_house_5.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_house_6.iob b/objects/village/savanna/houses/savanna_small_house_6.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_house_6.iob rename to objects/village/savanna/houses/savanna_small_house_6.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_house_7.iob b/objects/village/savanna/houses/savanna_small_house_7.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_house_7.iob rename to objects/village/savanna/houses/savanna_small_house_7.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_house_8.iob b/objects/village/savanna/houses/savanna_small_house_8.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_house_8.iob rename to objects/village/savanna/houses/savanna_small_house_8.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_tannery_1.iob b/objects/village/savanna/houses/savanna_tannery_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_tannery_1.iob rename to objects/village/savanna/houses/savanna_tannery_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_temple_1.iob b/objects/village/savanna/houses/savanna_temple_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_temple_1.iob rename to objects/village/savanna/houses/savanna_temple_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_temple_2.iob b/objects/village/savanna/houses/savanna_temple_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_temple_2.iob rename to objects/village/savanna/houses/savanna_temple_2.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_tool_smith_1.iob b/objects/village/savanna/houses/savanna_tool_smith_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_tool_smith_1.iob rename to objects/village/savanna/houses/savanna_tool_smith_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_weaponsmith_1.iob b/objects/village/savanna/houses/savanna_weaponsmith_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_weaponsmith_1.iob rename to objects/village/savanna/houses/savanna_weaponsmith_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_weaponsmith_2.iob b/objects/village/savanna/houses/savanna_weaponsmith_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_weaponsmith_2.iob rename to objects/village/savanna/houses/savanna_weaponsmith_2.iob diff --git a/objects/jigsaw/village/savanna/savanna_lamp_post_01.iob b/objects/village/savanna/savanna_lamp_post_01.iob similarity index 100% rename from objects/jigsaw/village/savanna/savanna_lamp_post_01.iob rename to objects/village/savanna/savanna_lamp_post_01.iob diff --git a/objects/jigsaw/village/savanna/streets/corner_01.iob b/objects/village/savanna/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/corner_01.iob rename to objects/village/savanna/streets/corner_01.iob diff --git a/objects/jigsaw/village/savanna/streets/corner_03.iob b/objects/village/savanna/streets/corner_03.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/corner_03.iob rename to objects/village/savanna/streets/corner_03.iob diff --git a/objects/jigsaw/village/savanna/streets/crossroad_02.iob b/objects/village/savanna/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/crossroad_02.iob rename to objects/village/savanna/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/savanna/streets/crossroad_03.iob b/objects/village/savanna/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/crossroad_03.iob rename to objects/village/savanna/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/savanna/streets/crossroad_04.iob b/objects/village/savanna/streets/crossroad_04.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/crossroad_04.iob rename to objects/village/savanna/streets/crossroad_04.iob diff --git a/objects/jigsaw/village/savanna/streets/crossroad_05.iob b/objects/village/savanna/streets/crossroad_05.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/crossroad_05.iob rename to objects/village/savanna/streets/crossroad_05.iob diff --git a/objects/jigsaw/village/savanna/streets/crossroad_06.iob b/objects/village/savanna/streets/crossroad_06.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/crossroad_06.iob rename to objects/village/savanna/streets/crossroad_06.iob diff --git a/objects/jigsaw/village/savanna/streets/crossroad_07.iob b/objects/village/savanna/streets/crossroad_07.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/crossroad_07.iob rename to objects/village/savanna/streets/crossroad_07.iob diff --git a/objects/jigsaw/village/savanna/streets/split_01.iob b/objects/village/savanna/streets/split_01.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/split_01.iob rename to objects/village/savanna/streets/split_01.iob diff --git a/objects/jigsaw/village/savanna/streets/split_02.iob b/objects/village/savanna/streets/split_02.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/split_02.iob rename to objects/village/savanna/streets/split_02.iob diff --git a/objects/jigsaw/village/savanna/streets/straight_02.iob b/objects/village/savanna/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/straight_02.iob rename to objects/village/savanna/streets/straight_02.iob diff --git a/objects/jigsaw/village/savanna/streets/straight_04.iob b/objects/village/savanna/streets/straight_04.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/straight_04.iob rename to objects/village/savanna/streets/straight_04.iob diff --git a/objects/jigsaw/village/savanna/streets/straight_05.iob b/objects/village/savanna/streets/straight_05.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/straight_05.iob rename to objects/village/savanna/streets/straight_05.iob diff --git a/objects/jigsaw/village/savanna/streets/straight_06.iob b/objects/village/savanna/streets/straight_06.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/straight_06.iob rename to objects/village/savanna/streets/straight_06.iob diff --git a/objects/jigsaw/village/savanna/streets/straight_08.iob b/objects/village/savanna/streets/straight_08.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/straight_08.iob rename to objects/village/savanna/streets/straight_08.iob diff --git a/objects/jigsaw/village/savanna/streets/straight_09.iob b/objects/village/savanna/streets/straight_09.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/straight_09.iob rename to objects/village/savanna/streets/straight_09.iob diff --git a/objects/jigsaw/village/savanna/streets/straight_10.iob b/objects/village/savanna/streets/straight_10.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/straight_10.iob rename to objects/village/savanna/streets/straight_10.iob diff --git a/objects/jigsaw/village/savanna/streets/straight_11.iob b/objects/village/savanna/streets/straight_11.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/straight_11.iob rename to objects/village/savanna/streets/straight_11.iob diff --git a/objects/jigsaw/village/savanna/streets/turn_01.iob b/objects/village/savanna/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/turn_01.iob rename to objects/village/savanna/streets/turn_01.iob diff --git a/objects/jigsaw/village/savanna/terminators/terminator_05.iob b/objects/village/savanna/terminators/terminator_05.iob similarity index 100% rename from objects/jigsaw/village/savanna/terminators/terminator_05.iob rename to objects/village/savanna/terminators/terminator_05.iob diff --git a/objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_1.iob b/objects/village/savanna/town_centers/savanna_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_1.iob rename to objects/village/savanna/town_centers/savanna_meeting_point_1.iob diff --git a/objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_2.iob b/objects/village/savanna/town_centers/savanna_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_2.iob rename to objects/village/savanna/town_centers/savanna_meeting_point_2.iob diff --git a/objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_3.iob b/objects/village/savanna/town_centers/savanna_meeting_point_3.iob similarity index 100% rename from objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_3.iob rename to objects/village/savanna/town_centers/savanna_meeting_point_3.iob diff --git a/objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_4.iob b/objects/village/savanna/town_centers/savanna_meeting_point_4.iob similarity index 100% rename from objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_4.iob rename to objects/village/savanna/town_centers/savanna_meeting_point_4.iob diff --git a/objects/jigsaw/village/savanna/villagers/baby.iob b/objects/village/savanna/villagers/baby.iob similarity index 100% rename from objects/jigsaw/village/savanna/villagers/baby.iob rename to objects/village/savanna/villagers/baby.iob diff --git a/objects/jigsaw/village/savanna/villagers/nitwit.iob b/objects/village/savanna/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/savanna/villagers/nitwit.iob rename to objects/village/savanna/villagers/nitwit.iob diff --git a/objects/jigsaw/village/savanna/villagers/unemployed.iob b/objects/village/savanna/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/savanna/villagers/unemployed.iob rename to objects/village/savanna/villagers/unemployed.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_animal_pen_2.iob b/objects/village/savanna/zombie/houses/savanna_animal_pen_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_animal_pen_2.iob rename to objects/village/savanna/zombie/houses/savanna_animal_pen_2.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_animal_pen_3.iob b/objects/village/savanna/zombie/houses/savanna_animal_pen_3.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_animal_pen_3.iob rename to objects/village/savanna/zombie/houses/savanna_animal_pen_3.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_large_farm_2.iob b/objects/village/savanna/zombie/houses/savanna_large_farm_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_large_farm_2.iob rename to objects/village/savanna/zombie/houses/savanna_large_farm_2.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_medium_house_1.iob b/objects/village/savanna/zombie/houses/savanna_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_medium_house_1.iob rename to objects/village/savanna/zombie/houses/savanna_medium_house_1.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_medium_house_2.iob b/objects/village/savanna/zombie/houses/savanna_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_medium_house_2.iob rename to objects/village/savanna/zombie/houses/savanna_medium_house_2.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_1.iob b/objects/village/savanna/zombie/houses/savanna_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_1.iob rename to objects/village/savanna/zombie/houses/savanna_small_house_1.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_2.iob b/objects/village/savanna/zombie/houses/savanna_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_2.iob rename to objects/village/savanna/zombie/houses/savanna_small_house_2.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_3.iob b/objects/village/savanna/zombie/houses/savanna_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_3.iob rename to objects/village/savanna/zombie/houses/savanna_small_house_3.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_4.iob b/objects/village/savanna/zombie/houses/savanna_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_4.iob rename to objects/village/savanna/zombie/houses/savanna_small_house_4.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_5.iob b/objects/village/savanna/zombie/houses/savanna_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_5.iob rename to objects/village/savanna/zombie/houses/savanna_small_house_5.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_6.iob b/objects/village/savanna/zombie/houses/savanna_small_house_6.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_6.iob rename to objects/village/savanna/zombie/houses/savanna_small_house_6.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_7.iob b/objects/village/savanna/zombie/houses/savanna_small_house_7.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_7.iob rename to objects/village/savanna/zombie/houses/savanna_small_house_7.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_8.iob b/objects/village/savanna/zombie/houses/savanna_small_house_8.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_8.iob rename to objects/village/savanna/zombie/houses/savanna_small_house_8.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/corner_01.iob b/objects/village/savanna/zombie/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/corner_01.iob rename to objects/village/savanna/zombie/streets/corner_01.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/corner_03.iob b/objects/village/savanna/zombie/streets/corner_03.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/corner_03.iob rename to objects/village/savanna/zombie/streets/corner_03.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/crossroad_02.iob b/objects/village/savanna/zombie/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/crossroad_02.iob rename to objects/village/savanna/zombie/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/crossroad_03.iob b/objects/village/savanna/zombie/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/crossroad_03.iob rename to objects/village/savanna/zombie/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/crossroad_04.iob b/objects/village/savanna/zombie/streets/crossroad_04.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/crossroad_04.iob rename to objects/village/savanna/zombie/streets/crossroad_04.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/crossroad_05.iob b/objects/village/savanna/zombie/streets/crossroad_05.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/crossroad_05.iob rename to objects/village/savanna/zombie/streets/crossroad_05.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/crossroad_06.iob b/objects/village/savanna/zombie/streets/crossroad_06.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/crossroad_06.iob rename to objects/village/savanna/zombie/streets/crossroad_06.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/crossroad_07.iob b/objects/village/savanna/zombie/streets/crossroad_07.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/crossroad_07.iob rename to objects/village/savanna/zombie/streets/crossroad_07.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/split_01.iob b/objects/village/savanna/zombie/streets/split_01.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/split_01.iob rename to objects/village/savanna/zombie/streets/split_01.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/split_02.iob b/objects/village/savanna/zombie/streets/split_02.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/split_02.iob rename to objects/village/savanna/zombie/streets/split_02.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/straight_02.iob b/objects/village/savanna/zombie/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/straight_02.iob rename to objects/village/savanna/zombie/streets/straight_02.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/straight_04.iob b/objects/village/savanna/zombie/streets/straight_04.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/straight_04.iob rename to objects/village/savanna/zombie/streets/straight_04.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/straight_05.iob b/objects/village/savanna/zombie/streets/straight_05.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/straight_05.iob rename to objects/village/savanna/zombie/streets/straight_05.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/straight_06.iob b/objects/village/savanna/zombie/streets/straight_06.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/straight_06.iob rename to objects/village/savanna/zombie/streets/straight_06.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/straight_08.iob b/objects/village/savanna/zombie/streets/straight_08.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/straight_08.iob rename to objects/village/savanna/zombie/streets/straight_08.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/straight_09.iob b/objects/village/savanna/zombie/streets/straight_09.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/straight_09.iob rename to objects/village/savanna/zombie/streets/straight_09.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/straight_10.iob b/objects/village/savanna/zombie/streets/straight_10.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/straight_10.iob rename to objects/village/savanna/zombie/streets/straight_10.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/straight_11.iob b/objects/village/savanna/zombie/streets/straight_11.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/straight_11.iob rename to objects/village/savanna/zombie/streets/straight_11.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/turn_01.iob b/objects/village/savanna/zombie/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/turn_01.iob rename to objects/village/savanna/zombie/streets/turn_01.iob diff --git a/objects/jigsaw/village/savanna/zombie/terminators/terminator_05.iob b/objects/village/savanna/zombie/terminators/terminator_05.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/terminators/terminator_05.iob rename to objects/village/savanna/zombie/terminators/terminator_05.iob diff --git a/objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_1.iob b/objects/village/savanna/zombie/town_centers/savanna_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_1.iob rename to objects/village/savanna/zombie/town_centers/savanna_meeting_point_1.iob diff --git a/objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_2.iob b/objects/village/savanna/zombie/town_centers/savanna_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_2.iob rename to objects/village/savanna/zombie/town_centers/savanna_meeting_point_2.iob diff --git a/objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_3.iob b/objects/village/savanna/zombie/town_centers/savanna_meeting_point_3.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_3.iob rename to objects/village/savanna/zombie/town_centers/savanna_meeting_point_3.iob diff --git a/objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_4.iob b/objects/village/savanna/zombie/town_centers/savanna_meeting_point_4.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_4.iob rename to objects/village/savanna/zombie/town_centers/savanna_meeting_point_4.iob diff --git a/objects/jigsaw/village/savanna/zombie/villagers/nitwit.iob b/objects/village/savanna/zombie/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/villagers/nitwit.iob rename to objects/village/savanna/zombie/villagers/nitwit.iob diff --git a/objects/jigsaw/village/savanna/zombie/villagers/unemployed.iob b/objects/village/savanna/zombie/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/villagers/unemployed.iob rename to objects/village/savanna/zombie/villagers/unemployed.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_animal_pen_1.iob b/objects/village/snowy/houses/snowy_animal_pen_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_animal_pen_1.iob rename to objects/village/snowy/houses/snowy_animal_pen_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_animal_pen_2.iob b/objects/village/snowy/houses/snowy_animal_pen_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_animal_pen_2.iob rename to objects/village/snowy/houses/snowy_animal_pen_2.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_armorer_house_1.iob b/objects/village/snowy/houses/snowy_armorer_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_armorer_house_1.iob rename to objects/village/snowy/houses/snowy_armorer_house_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_armorer_house_2.iob b/objects/village/snowy/houses/snowy_armorer_house_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_armorer_house_2.iob rename to objects/village/snowy/houses/snowy_armorer_house_2.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_butchers_shop_1.iob b/objects/village/snowy/houses/snowy_butchers_shop_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_butchers_shop_1.iob rename to objects/village/snowy/houses/snowy_butchers_shop_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_butchers_shop_2.iob b/objects/village/snowy/houses/snowy_butchers_shop_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_butchers_shop_2.iob rename to objects/village/snowy/houses/snowy_butchers_shop_2.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_cartographer_house_1.iob b/objects/village/snowy/houses/snowy_cartographer_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_cartographer_house_1.iob rename to objects/village/snowy/houses/snowy_cartographer_house_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_farm_1.iob b/objects/village/snowy/houses/snowy_farm_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_farm_1.iob rename to objects/village/snowy/houses/snowy_farm_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_farm_2.iob b/objects/village/snowy/houses/snowy_farm_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_farm_2.iob rename to objects/village/snowy/houses/snowy_farm_2.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_fisher_cottage.iob b/objects/village/snowy/houses/snowy_fisher_cottage.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_fisher_cottage.iob rename to objects/village/snowy/houses/snowy_fisher_cottage.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_fletcher_house_1.iob b/objects/village/snowy/houses/snowy_fletcher_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_fletcher_house_1.iob rename to objects/village/snowy/houses/snowy_fletcher_house_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_library_1.iob b/objects/village/snowy/houses/snowy_library_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_library_1.iob rename to objects/village/snowy/houses/snowy_library_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_masons_house_1.iob b/objects/village/snowy/houses/snowy_masons_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_masons_house_1.iob rename to objects/village/snowy/houses/snowy_masons_house_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_masons_house_2.iob b/objects/village/snowy/houses/snowy_masons_house_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_masons_house_2.iob rename to objects/village/snowy/houses/snowy_masons_house_2.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_medium_house_1.iob b/objects/village/snowy/houses/snowy_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_medium_house_1.iob rename to objects/village/snowy/houses/snowy_medium_house_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_medium_house_2.iob b/objects/village/snowy/houses/snowy_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_medium_house_2.iob rename to objects/village/snowy/houses/snowy_medium_house_2.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_medium_house_3.iob b/objects/village/snowy/houses/snowy_medium_house_3.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_medium_house_3.iob rename to objects/village/snowy/houses/snowy_medium_house_3.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_shepherds_house_1.iob b/objects/village/snowy/houses/snowy_shepherds_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_shepherds_house_1.iob rename to objects/village/snowy/houses/snowy_shepherds_house_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_small_house_1.iob b/objects/village/snowy/houses/snowy_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_small_house_1.iob rename to objects/village/snowy/houses/snowy_small_house_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_small_house_2.iob b/objects/village/snowy/houses/snowy_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_small_house_2.iob rename to objects/village/snowy/houses/snowy_small_house_2.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_small_house_3.iob b/objects/village/snowy/houses/snowy_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_small_house_3.iob rename to objects/village/snowy/houses/snowy_small_house_3.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_small_house_4.iob b/objects/village/snowy/houses/snowy_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_small_house_4.iob rename to objects/village/snowy/houses/snowy_small_house_4.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_small_house_5.iob b/objects/village/snowy/houses/snowy_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_small_house_5.iob rename to objects/village/snowy/houses/snowy_small_house_5.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_small_house_6.iob b/objects/village/snowy/houses/snowy_small_house_6.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_small_house_6.iob rename to objects/village/snowy/houses/snowy_small_house_6.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_small_house_7.iob b/objects/village/snowy/houses/snowy_small_house_7.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_small_house_7.iob rename to objects/village/snowy/houses/snowy_small_house_7.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_small_house_8.iob b/objects/village/snowy/houses/snowy_small_house_8.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_small_house_8.iob rename to objects/village/snowy/houses/snowy_small_house_8.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_tannery_1.iob b/objects/village/snowy/houses/snowy_tannery_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_tannery_1.iob rename to objects/village/snowy/houses/snowy_tannery_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_temple_1.iob b/objects/village/snowy/houses/snowy_temple_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_temple_1.iob rename to objects/village/snowy/houses/snowy_temple_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_tool_smith_1.iob b/objects/village/snowy/houses/snowy_tool_smith_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_tool_smith_1.iob rename to objects/village/snowy/houses/snowy_tool_smith_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_weapon_smith_1.iob b/objects/village/snowy/houses/snowy_weapon_smith_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_weapon_smith_1.iob rename to objects/village/snowy/houses/snowy_weapon_smith_1.iob diff --git a/objects/jigsaw/village/snowy/snowy_lamp_post_01.iob b/objects/village/snowy/snowy_lamp_post_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/snowy_lamp_post_01.iob rename to objects/village/snowy/snowy_lamp_post_01.iob diff --git a/objects/jigsaw/village/snowy/snowy_lamp_post_02.iob b/objects/village/snowy/snowy_lamp_post_02.iob similarity index 100% rename from objects/jigsaw/village/snowy/snowy_lamp_post_02.iob rename to objects/village/snowy/snowy_lamp_post_02.iob diff --git a/objects/jigsaw/village/snowy/snowy_lamp_post_03.iob b/objects/village/snowy/snowy_lamp_post_03.iob similarity index 100% rename from objects/jigsaw/village/snowy/snowy_lamp_post_03.iob rename to objects/village/snowy/snowy_lamp_post_03.iob diff --git a/objects/jigsaw/village/snowy/streets/corner_01.iob b/objects/village/snowy/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/corner_01.iob rename to objects/village/snowy/streets/corner_01.iob diff --git a/objects/jigsaw/village/snowy/streets/corner_02.iob b/objects/village/snowy/streets/corner_02.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/corner_02.iob rename to objects/village/snowy/streets/corner_02.iob diff --git a/objects/jigsaw/village/snowy/streets/corner_03.iob b/objects/village/snowy/streets/corner_03.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/corner_03.iob rename to objects/village/snowy/streets/corner_03.iob diff --git a/objects/jigsaw/village/snowy/streets/crossroad_01.iob b/objects/village/snowy/streets/crossroad_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/crossroad_01.iob rename to objects/village/snowy/streets/crossroad_01.iob diff --git a/objects/jigsaw/village/snowy/streets/crossroad_02.iob b/objects/village/snowy/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/crossroad_02.iob rename to objects/village/snowy/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/snowy/streets/crossroad_03.iob b/objects/village/snowy/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/crossroad_03.iob rename to objects/village/snowy/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/snowy/streets/crossroad_04.iob b/objects/village/snowy/streets/crossroad_04.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/crossroad_04.iob rename to objects/village/snowy/streets/crossroad_04.iob diff --git a/objects/jigsaw/village/snowy/streets/crossroad_05.iob b/objects/village/snowy/streets/crossroad_05.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/crossroad_05.iob rename to objects/village/snowy/streets/crossroad_05.iob diff --git a/objects/jigsaw/village/snowy/streets/crossroad_06.iob b/objects/village/snowy/streets/crossroad_06.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/crossroad_06.iob rename to objects/village/snowy/streets/crossroad_06.iob diff --git a/objects/jigsaw/village/snowy/streets/square_01.iob b/objects/village/snowy/streets/square_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/square_01.iob rename to objects/village/snowy/streets/square_01.iob diff --git a/objects/jigsaw/village/snowy/streets/straight_01.iob b/objects/village/snowy/streets/straight_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/straight_01.iob rename to objects/village/snowy/streets/straight_01.iob diff --git a/objects/jigsaw/village/snowy/streets/straight_02.iob b/objects/village/snowy/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/straight_02.iob rename to objects/village/snowy/streets/straight_02.iob diff --git a/objects/jigsaw/village/snowy/streets/straight_03.iob b/objects/village/snowy/streets/straight_03.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/straight_03.iob rename to objects/village/snowy/streets/straight_03.iob diff --git a/objects/jigsaw/village/snowy/streets/straight_04.iob b/objects/village/snowy/streets/straight_04.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/straight_04.iob rename to objects/village/snowy/streets/straight_04.iob diff --git a/objects/jigsaw/village/snowy/streets/straight_06.iob b/objects/village/snowy/streets/straight_06.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/straight_06.iob rename to objects/village/snowy/streets/straight_06.iob diff --git a/objects/jigsaw/village/snowy/streets/straight_08.iob b/objects/village/snowy/streets/straight_08.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/straight_08.iob rename to objects/village/snowy/streets/straight_08.iob diff --git a/objects/jigsaw/village/snowy/streets/turn_01.iob b/objects/village/snowy/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/turn_01.iob rename to objects/village/snowy/streets/turn_01.iob diff --git a/objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_1.iob b/objects/village/snowy/town_centers/snowy_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_1.iob rename to objects/village/snowy/town_centers/snowy_meeting_point_1.iob diff --git a/objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_2.iob b/objects/village/snowy/town_centers/snowy_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_2.iob rename to objects/village/snowy/town_centers/snowy_meeting_point_2.iob diff --git a/objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_3.iob b/objects/village/snowy/town_centers/snowy_meeting_point_3.iob similarity index 100% rename from objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_3.iob rename to objects/village/snowy/town_centers/snowy_meeting_point_3.iob diff --git a/objects/jigsaw/village/snowy/villagers/baby.iob b/objects/village/snowy/villagers/baby.iob similarity index 100% rename from objects/jigsaw/village/snowy/villagers/baby.iob rename to objects/village/snowy/villagers/baby.iob diff --git a/objects/jigsaw/village/snowy/villagers/nitwit.iob b/objects/village/snowy/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/snowy/villagers/nitwit.iob rename to objects/village/snowy/villagers/nitwit.iob diff --git a/objects/jigsaw/village/snowy/villagers/unemployed.iob b/objects/village/snowy/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/snowy/villagers/unemployed.iob rename to objects/village/snowy/villagers/unemployed.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_1.iob b/objects/village/snowy/zombie/houses/snowy_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_1.iob rename to objects/village/snowy/zombie/houses/snowy_medium_house_1.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_2.iob b/objects/village/snowy/zombie/houses/snowy_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_2.iob rename to objects/village/snowy/zombie/houses/snowy_medium_house_2.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_3.iob b/objects/village/snowy/zombie/houses/snowy_medium_house_3.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_3.iob rename to objects/village/snowy/zombie/houses/snowy_medium_house_3.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_1.iob b/objects/village/snowy/zombie/houses/snowy_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_1.iob rename to objects/village/snowy/zombie/houses/snowy_small_house_1.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_2.iob b/objects/village/snowy/zombie/houses/snowy_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_2.iob rename to objects/village/snowy/zombie/houses/snowy_small_house_2.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_3.iob b/objects/village/snowy/zombie/houses/snowy_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_3.iob rename to objects/village/snowy/zombie/houses/snowy_small_house_3.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_4.iob b/objects/village/snowy/zombie/houses/snowy_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_4.iob rename to objects/village/snowy/zombie/houses/snowy_small_house_4.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_5.iob b/objects/village/snowy/zombie/houses/snowy_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_5.iob rename to objects/village/snowy/zombie/houses/snowy_small_house_5.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_6.iob b/objects/village/snowy/zombie/houses/snowy_small_house_6.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_6.iob rename to objects/village/snowy/zombie/houses/snowy_small_house_6.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_7.iob b/objects/village/snowy/zombie/houses/snowy_small_house_7.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_7.iob rename to objects/village/snowy/zombie/houses/snowy_small_house_7.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_8.iob b/objects/village/snowy/zombie/houses/snowy_small_house_8.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_8.iob rename to objects/village/snowy/zombie/houses/snowy_small_house_8.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/corner_01.iob b/objects/village/snowy/zombie/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/corner_01.iob rename to objects/village/snowy/zombie/streets/corner_01.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/corner_02.iob b/objects/village/snowy/zombie/streets/corner_02.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/corner_02.iob rename to objects/village/snowy/zombie/streets/corner_02.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/corner_03.iob b/objects/village/snowy/zombie/streets/corner_03.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/corner_03.iob rename to objects/village/snowy/zombie/streets/corner_03.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/crossroad_01.iob b/objects/village/snowy/zombie/streets/crossroad_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/crossroad_01.iob rename to objects/village/snowy/zombie/streets/crossroad_01.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/crossroad_02.iob b/objects/village/snowy/zombie/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/crossroad_02.iob rename to objects/village/snowy/zombie/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/crossroad_03.iob b/objects/village/snowy/zombie/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/crossroad_03.iob rename to objects/village/snowy/zombie/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/crossroad_04.iob b/objects/village/snowy/zombie/streets/crossroad_04.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/crossroad_04.iob rename to objects/village/snowy/zombie/streets/crossroad_04.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/crossroad_05.iob b/objects/village/snowy/zombie/streets/crossroad_05.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/crossroad_05.iob rename to objects/village/snowy/zombie/streets/crossroad_05.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/crossroad_06.iob b/objects/village/snowy/zombie/streets/crossroad_06.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/crossroad_06.iob rename to objects/village/snowy/zombie/streets/crossroad_06.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/square_01.iob b/objects/village/snowy/zombie/streets/square_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/square_01.iob rename to objects/village/snowy/zombie/streets/square_01.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/straight_01.iob b/objects/village/snowy/zombie/streets/straight_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/straight_01.iob rename to objects/village/snowy/zombie/streets/straight_01.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/straight_02.iob b/objects/village/snowy/zombie/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/straight_02.iob rename to objects/village/snowy/zombie/streets/straight_02.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/straight_03.iob b/objects/village/snowy/zombie/streets/straight_03.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/straight_03.iob rename to objects/village/snowy/zombie/streets/straight_03.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/straight_04.iob b/objects/village/snowy/zombie/streets/straight_04.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/straight_04.iob rename to objects/village/snowy/zombie/streets/straight_04.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/straight_06.iob b/objects/village/snowy/zombie/streets/straight_06.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/straight_06.iob rename to objects/village/snowy/zombie/streets/straight_06.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/straight_08.iob b/objects/village/snowy/zombie/streets/straight_08.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/straight_08.iob rename to objects/village/snowy/zombie/streets/straight_08.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/turn_01.iob b/objects/village/snowy/zombie/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/turn_01.iob rename to objects/village/snowy/zombie/streets/turn_01.iob diff --git a/objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_1.iob b/objects/village/snowy/zombie/town_centers/snowy_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_1.iob rename to objects/village/snowy/zombie/town_centers/snowy_meeting_point_1.iob diff --git a/objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_2.iob b/objects/village/snowy/zombie/town_centers/snowy_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_2.iob rename to objects/village/snowy/zombie/town_centers/snowy_meeting_point_2.iob diff --git a/objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_3.iob b/objects/village/snowy/zombie/town_centers/snowy_meeting_point_3.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_3.iob rename to objects/village/snowy/zombie/town_centers/snowy_meeting_point_3.iob diff --git a/objects/jigsaw/village/snowy/zombie/villagers/nitwit.iob b/objects/village/snowy/zombie/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/villagers/nitwit.iob rename to objects/village/snowy/zombie/villagers/nitwit.iob diff --git a/objects/jigsaw/village/snowy/zombie/villagers/unemployed.iob b/objects/village/snowy/zombie/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/villagers/unemployed.iob rename to objects/village/snowy/zombie/villagers/unemployed.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_animal_pen_1.iob b/objects/village/taiga/houses/taiga_animal_pen_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_animal_pen_1.iob rename to objects/village/taiga/houses/taiga_animal_pen_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_armorer_2.iob b/objects/village/taiga/houses/taiga_armorer_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_armorer_2.iob rename to objects/village/taiga/houses/taiga_armorer_2.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_armorer_house_1.iob b/objects/village/taiga/houses/taiga_armorer_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_armorer_house_1.iob rename to objects/village/taiga/houses/taiga_armorer_house_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_butcher_shop_1.iob b/objects/village/taiga/houses/taiga_butcher_shop_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_butcher_shop_1.iob rename to objects/village/taiga/houses/taiga_butcher_shop_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_cartographer_house_1.iob b/objects/village/taiga/houses/taiga_cartographer_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_cartographer_house_1.iob rename to objects/village/taiga/houses/taiga_cartographer_house_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_fisher_cottage_1.iob b/objects/village/taiga/houses/taiga_fisher_cottage_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_fisher_cottage_1.iob rename to objects/village/taiga/houses/taiga_fisher_cottage_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_fletcher_house_1.iob b/objects/village/taiga/houses/taiga_fletcher_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_fletcher_house_1.iob rename to objects/village/taiga/houses/taiga_fletcher_house_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_large_farm_1.iob b/objects/village/taiga/houses/taiga_large_farm_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_large_farm_1.iob rename to objects/village/taiga/houses/taiga_large_farm_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_large_farm_2.iob b/objects/village/taiga/houses/taiga_large_farm_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_large_farm_2.iob rename to objects/village/taiga/houses/taiga_large_farm_2.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_library_1.iob b/objects/village/taiga/houses/taiga_library_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_library_1.iob rename to objects/village/taiga/houses/taiga_library_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_masons_house_1.iob b/objects/village/taiga/houses/taiga_masons_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_masons_house_1.iob rename to objects/village/taiga/houses/taiga_masons_house_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_medium_house_1.iob b/objects/village/taiga/houses/taiga_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_medium_house_1.iob rename to objects/village/taiga/houses/taiga_medium_house_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_medium_house_2.iob b/objects/village/taiga/houses/taiga_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_medium_house_2.iob rename to objects/village/taiga/houses/taiga_medium_house_2.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_medium_house_3.iob b/objects/village/taiga/houses/taiga_medium_house_3.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_medium_house_3.iob rename to objects/village/taiga/houses/taiga_medium_house_3.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_medium_house_4.iob b/objects/village/taiga/houses/taiga_medium_house_4.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_medium_house_4.iob rename to objects/village/taiga/houses/taiga_medium_house_4.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_shepherds_house_1.iob b/objects/village/taiga/houses/taiga_shepherds_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_shepherds_house_1.iob rename to objects/village/taiga/houses/taiga_shepherds_house_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_small_farm_1.iob b/objects/village/taiga/houses/taiga_small_farm_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_small_farm_1.iob rename to objects/village/taiga/houses/taiga_small_farm_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_small_house_1.iob b/objects/village/taiga/houses/taiga_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_small_house_1.iob rename to objects/village/taiga/houses/taiga_small_house_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_small_house_2.iob b/objects/village/taiga/houses/taiga_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_small_house_2.iob rename to objects/village/taiga/houses/taiga_small_house_2.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_small_house_3.iob b/objects/village/taiga/houses/taiga_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_small_house_3.iob rename to objects/village/taiga/houses/taiga_small_house_3.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_small_house_4.iob b/objects/village/taiga/houses/taiga_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_small_house_4.iob rename to objects/village/taiga/houses/taiga_small_house_4.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_small_house_5.iob b/objects/village/taiga/houses/taiga_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_small_house_5.iob rename to objects/village/taiga/houses/taiga_small_house_5.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_tannery_1.iob b/objects/village/taiga/houses/taiga_tannery_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_tannery_1.iob rename to objects/village/taiga/houses/taiga_tannery_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_temple_1.iob b/objects/village/taiga/houses/taiga_temple_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_temple_1.iob rename to objects/village/taiga/houses/taiga_temple_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_tool_smith_1.iob b/objects/village/taiga/houses/taiga_tool_smith_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_tool_smith_1.iob rename to objects/village/taiga/houses/taiga_tool_smith_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_weaponsmith_1.iob b/objects/village/taiga/houses/taiga_weaponsmith_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_weaponsmith_1.iob rename to objects/village/taiga/houses/taiga_weaponsmith_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_weaponsmith_2.iob b/objects/village/taiga/houses/taiga_weaponsmith_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_weaponsmith_2.iob rename to objects/village/taiga/houses/taiga_weaponsmith_2.iob diff --git a/objects/jigsaw/village/taiga/streets/corner_01.iob b/objects/village/taiga/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/corner_01.iob rename to objects/village/taiga/streets/corner_01.iob diff --git a/objects/jigsaw/village/taiga/streets/corner_02.iob b/objects/village/taiga/streets/corner_02.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/corner_02.iob rename to objects/village/taiga/streets/corner_02.iob diff --git a/objects/jigsaw/village/taiga/streets/corner_03.iob b/objects/village/taiga/streets/corner_03.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/corner_03.iob rename to objects/village/taiga/streets/corner_03.iob diff --git a/objects/jigsaw/village/taiga/streets/crossroad_01.iob b/objects/village/taiga/streets/crossroad_01.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/crossroad_01.iob rename to objects/village/taiga/streets/crossroad_01.iob diff --git a/objects/jigsaw/village/taiga/streets/crossroad_02.iob b/objects/village/taiga/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/crossroad_02.iob rename to objects/village/taiga/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/taiga/streets/crossroad_03.iob b/objects/village/taiga/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/crossroad_03.iob rename to objects/village/taiga/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/taiga/streets/crossroad_04.iob b/objects/village/taiga/streets/crossroad_04.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/crossroad_04.iob rename to objects/village/taiga/streets/crossroad_04.iob diff --git a/objects/jigsaw/village/taiga/streets/crossroad_05.iob b/objects/village/taiga/streets/crossroad_05.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/crossroad_05.iob rename to objects/village/taiga/streets/crossroad_05.iob diff --git a/objects/jigsaw/village/taiga/streets/crossroad_06.iob b/objects/village/taiga/streets/crossroad_06.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/crossroad_06.iob rename to objects/village/taiga/streets/crossroad_06.iob diff --git a/objects/jigsaw/village/taiga/streets/straight_01.iob b/objects/village/taiga/streets/straight_01.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/straight_01.iob rename to objects/village/taiga/streets/straight_01.iob diff --git a/objects/jigsaw/village/taiga/streets/straight_02.iob b/objects/village/taiga/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/straight_02.iob rename to objects/village/taiga/streets/straight_02.iob diff --git a/objects/jigsaw/village/taiga/streets/straight_03.iob b/objects/village/taiga/streets/straight_03.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/straight_03.iob rename to objects/village/taiga/streets/straight_03.iob diff --git a/objects/jigsaw/village/taiga/streets/straight_04.iob b/objects/village/taiga/streets/straight_04.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/straight_04.iob rename to objects/village/taiga/streets/straight_04.iob diff --git a/objects/jigsaw/village/taiga/streets/straight_05.iob b/objects/village/taiga/streets/straight_05.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/straight_05.iob rename to objects/village/taiga/streets/straight_05.iob diff --git a/objects/jigsaw/village/taiga/streets/straight_06.iob b/objects/village/taiga/streets/straight_06.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/straight_06.iob rename to objects/village/taiga/streets/straight_06.iob diff --git a/objects/jigsaw/village/taiga/streets/turn_01.iob b/objects/village/taiga/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/turn_01.iob rename to objects/village/taiga/streets/turn_01.iob diff --git a/objects/jigsaw/village/taiga/taiga_decoration_1.iob b/objects/village/taiga/taiga_decoration_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/taiga_decoration_1.iob rename to objects/village/taiga/taiga_decoration_1.iob diff --git a/objects/jigsaw/village/taiga/taiga_decoration_2.iob b/objects/village/taiga/taiga_decoration_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/taiga_decoration_2.iob rename to objects/village/taiga/taiga_decoration_2.iob diff --git a/objects/jigsaw/village/taiga/taiga_decoration_3.iob b/objects/village/taiga/taiga_decoration_3.iob similarity index 100% rename from objects/jigsaw/village/taiga/taiga_decoration_3.iob rename to objects/village/taiga/taiga_decoration_3.iob diff --git a/objects/jigsaw/village/taiga/taiga_decoration_4.iob b/objects/village/taiga/taiga_decoration_4.iob similarity index 100% rename from objects/jigsaw/village/taiga/taiga_decoration_4.iob rename to objects/village/taiga/taiga_decoration_4.iob diff --git a/objects/jigsaw/village/taiga/taiga_decoration_5.iob b/objects/village/taiga/taiga_decoration_5.iob similarity index 100% rename from objects/jigsaw/village/taiga/taiga_decoration_5.iob rename to objects/village/taiga/taiga_decoration_5.iob diff --git a/objects/jigsaw/village/taiga/taiga_decoration_6.iob b/objects/village/taiga/taiga_decoration_6.iob similarity index 100% rename from objects/jigsaw/village/taiga/taiga_decoration_6.iob rename to objects/village/taiga/taiga_decoration_6.iob diff --git a/objects/jigsaw/village/taiga/taiga_lamp_post_1.iob b/objects/village/taiga/taiga_lamp_post_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/taiga_lamp_post_1.iob rename to objects/village/taiga/taiga_lamp_post_1.iob diff --git a/objects/jigsaw/village/taiga/town_centers/taiga_meeting_point_1.iob b/objects/village/taiga/town_centers/taiga_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/town_centers/taiga_meeting_point_1.iob rename to objects/village/taiga/town_centers/taiga_meeting_point_1.iob diff --git a/objects/jigsaw/village/taiga/town_centers/taiga_meeting_point_2.iob b/objects/village/taiga/town_centers/taiga_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/town_centers/taiga_meeting_point_2.iob rename to objects/village/taiga/town_centers/taiga_meeting_point_2.iob diff --git a/objects/jigsaw/village/taiga/villagers/baby.iob b/objects/village/taiga/villagers/baby.iob similarity index 100% rename from objects/jigsaw/village/taiga/villagers/baby.iob rename to objects/village/taiga/villagers/baby.iob diff --git a/objects/jigsaw/village/taiga/villagers/nitwit.iob b/objects/village/taiga/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/taiga/villagers/nitwit.iob rename to objects/village/taiga/villagers/nitwit.iob diff --git a/objects/jigsaw/village/taiga/villagers/unemployed.iob b/objects/village/taiga/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/taiga/villagers/unemployed.iob rename to objects/village/taiga/villagers/unemployed.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_cartographer_house_1.iob b/objects/village/taiga/zombie/houses/taiga_cartographer_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_cartographer_house_1.iob rename to objects/village/taiga/zombie/houses/taiga_cartographer_house_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_fisher_cottage_1.iob b/objects/village/taiga/zombie/houses/taiga_fisher_cottage_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_fisher_cottage_1.iob rename to objects/village/taiga/zombie/houses/taiga_fisher_cottage_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_large_farm_2.iob b/objects/village/taiga/zombie/houses/taiga_large_farm_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_large_farm_2.iob rename to objects/village/taiga/zombie/houses/taiga_large_farm_2.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_library_1.iob b/objects/village/taiga/zombie/houses/taiga_library_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_library_1.iob rename to objects/village/taiga/zombie/houses/taiga_library_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_1.iob b/objects/village/taiga/zombie/houses/taiga_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_1.iob rename to objects/village/taiga/zombie/houses/taiga_medium_house_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_2.iob b/objects/village/taiga/zombie/houses/taiga_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_2.iob rename to objects/village/taiga/zombie/houses/taiga_medium_house_2.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_3.iob b/objects/village/taiga/zombie/houses/taiga_medium_house_3.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_3.iob rename to objects/village/taiga/zombie/houses/taiga_medium_house_3.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_4.iob b/objects/village/taiga/zombie/houses/taiga_medium_house_4.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_4.iob rename to objects/village/taiga/zombie/houses/taiga_medium_house_4.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_shepherds_house_1.iob b/objects/village/taiga/zombie/houses/taiga_shepherds_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_shepherds_house_1.iob rename to objects/village/taiga/zombie/houses/taiga_shepherds_house_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_1.iob b/objects/village/taiga/zombie/houses/taiga_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_1.iob rename to objects/village/taiga/zombie/houses/taiga_small_house_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_2.iob b/objects/village/taiga/zombie/houses/taiga_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_2.iob rename to objects/village/taiga/zombie/houses/taiga_small_house_2.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_3.iob b/objects/village/taiga/zombie/houses/taiga_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_3.iob rename to objects/village/taiga/zombie/houses/taiga_small_house_3.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_4.iob b/objects/village/taiga/zombie/houses/taiga_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_4.iob rename to objects/village/taiga/zombie/houses/taiga_small_house_4.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_5.iob b/objects/village/taiga/zombie/houses/taiga_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_5.iob rename to objects/village/taiga/zombie/houses/taiga_small_house_5.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_temple_1.iob b/objects/village/taiga/zombie/houses/taiga_temple_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_temple_1.iob rename to objects/village/taiga/zombie/houses/taiga_temple_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_tool_smith_1.iob b/objects/village/taiga/zombie/houses/taiga_tool_smith_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_tool_smith_1.iob rename to objects/village/taiga/zombie/houses/taiga_tool_smith_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_weaponsmith_2.iob b/objects/village/taiga/zombie/houses/taiga_weaponsmith_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_weaponsmith_2.iob rename to objects/village/taiga/zombie/houses/taiga_weaponsmith_2.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/corner_01.iob b/objects/village/taiga/zombie/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/corner_01.iob rename to objects/village/taiga/zombie/streets/corner_01.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/corner_02.iob b/objects/village/taiga/zombie/streets/corner_02.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/corner_02.iob rename to objects/village/taiga/zombie/streets/corner_02.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/corner_03.iob b/objects/village/taiga/zombie/streets/corner_03.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/corner_03.iob rename to objects/village/taiga/zombie/streets/corner_03.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/crossroad_01.iob b/objects/village/taiga/zombie/streets/crossroad_01.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/crossroad_01.iob rename to objects/village/taiga/zombie/streets/crossroad_01.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/crossroad_02.iob b/objects/village/taiga/zombie/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/crossroad_02.iob rename to objects/village/taiga/zombie/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/crossroad_03.iob b/objects/village/taiga/zombie/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/crossroad_03.iob rename to objects/village/taiga/zombie/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/crossroad_04.iob b/objects/village/taiga/zombie/streets/crossroad_04.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/crossroad_04.iob rename to objects/village/taiga/zombie/streets/crossroad_04.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/crossroad_05.iob b/objects/village/taiga/zombie/streets/crossroad_05.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/crossroad_05.iob rename to objects/village/taiga/zombie/streets/crossroad_05.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/crossroad_06.iob b/objects/village/taiga/zombie/streets/crossroad_06.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/crossroad_06.iob rename to objects/village/taiga/zombie/streets/crossroad_06.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/straight_01.iob b/objects/village/taiga/zombie/streets/straight_01.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/straight_01.iob rename to objects/village/taiga/zombie/streets/straight_01.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/straight_02.iob b/objects/village/taiga/zombie/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/straight_02.iob rename to objects/village/taiga/zombie/streets/straight_02.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/straight_03.iob b/objects/village/taiga/zombie/streets/straight_03.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/straight_03.iob rename to objects/village/taiga/zombie/streets/straight_03.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/straight_04.iob b/objects/village/taiga/zombie/streets/straight_04.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/straight_04.iob rename to objects/village/taiga/zombie/streets/straight_04.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/straight_05.iob b/objects/village/taiga/zombie/streets/straight_05.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/straight_05.iob rename to objects/village/taiga/zombie/streets/straight_05.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/straight_06.iob b/objects/village/taiga/zombie/streets/straight_06.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/straight_06.iob rename to objects/village/taiga/zombie/streets/straight_06.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/turn_01.iob b/objects/village/taiga/zombie/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/turn_01.iob rename to objects/village/taiga/zombie/streets/turn_01.iob diff --git a/objects/jigsaw/village/taiga/zombie/town_centers/taiga_meeting_point_1.iob b/objects/village/taiga/zombie/town_centers/taiga_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/town_centers/taiga_meeting_point_1.iob rename to objects/village/taiga/zombie/town_centers/taiga_meeting_point_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/town_centers/taiga_meeting_point_2.iob b/objects/village/taiga/zombie/town_centers/taiga_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/town_centers/taiga_meeting_point_2.iob rename to objects/village/taiga/zombie/town_centers/taiga_meeting_point_2.iob diff --git a/objects/jigsaw/village/taiga/zombie/villagers/nitwit.iob b/objects/village/taiga/zombie/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/villagers/nitwit.iob rename to objects/village/taiga/zombie/villagers/nitwit.iob diff --git a/objects/jigsaw/village/taiga/zombie/villagers/unemployed.iob b/objects/village/taiga/zombie/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/villagers/unemployed.iob rename to objects/village/taiga/zombie/villagers/unemployed.iob diff --git a/objects/wasteland/dead-1.iob b/objects/wasteland/dead-1.iob new file mode 100644 index 00000000..4898353a Binary files /dev/null and b/objects/wasteland/dead-1.iob differ diff --git a/objects/wasteland/dead-2.iob b/objects/wasteland/dead-2.iob new file mode 100644 index 00000000..3ff72ed7 Binary files /dev/null and b/objects/wasteland/dead-2.iob differ diff --git a/objects/wasteland/dead-3.iob b/objects/wasteland/dead-3.iob new file mode 100644 index 00000000..79c4bc7d Binary files /dev/null and b/objects/wasteland/dead-3.iob differ diff --git a/objects/wasteland/dead-4.iob b/objects/wasteland/dead-4.iob new file mode 100644 index 00000000..9eddd3a0 Binary files /dev/null and b/objects/wasteland/dead-4.iob differ diff --git a/objects/wasteland/dead-5.iob b/objects/wasteland/dead-5.iob new file mode 100644 index 00000000..b4bf92ac Binary files /dev/null and b/objects/wasteland/dead-5.iob differ diff --git a/objects/wasteland/dead-6.iob b/objects/wasteland/dead-6.iob new file mode 100644 index 00000000..36e22119 Binary files /dev/null and b/objects/wasteland/dead-6.iob differ diff --git a/objects/clutter/stone-1.iob b/objects/wasteland/stone-1.iob similarity index 100% rename from objects/clutter/stone-1.iob rename to objects/wasteland/stone-1.iob diff --git a/objects/clutter/stone-2.iob b/objects/wasteland/stone-2.iob similarity index 100% rename from objects/clutter/stone-2.iob rename to objects/wasteland/stone-2.iob diff --git a/objects/clutter/stone-3.iob b/objects/wasteland/stone-3.iob similarity index 100% rename from objects/clutter/stone-3.iob rename to objects/wasteland/stone-3.iob diff --git a/objects/clutter/stone-4.iob b/objects/wasteland/stone-4.iob similarity index 100% rename from objects/clutter/stone-4.iob rename to objects/wasteland/stone-4.iob diff --git a/objects/clutter/stone-5.iob b/objects/wasteland/stone-5.iob similarity index 100% rename from objects/clutter/stone-5.iob rename to objects/wasteland/stone-5.iob diff --git a/objects/clutter/stone-6.iob b/objects/wasteland/stone-6.iob similarity index 100% rename from objects/clutter/stone-6.iob rename to objects/wasteland/stone-6.iob diff --git a/objects/clutter/stone-7.iob b/objects/wasteland/stone-7.iob similarity index 100% rename from objects/clutter/stone-7.iob rename to objects/wasteland/stone-7.iob diff --git a/objects/trees/spruce/sprucetree-1.iob b/objects/wastelands/sprucetree-1.iob similarity index 100% rename from objects/trees/spruce/sprucetree-1.iob rename to objects/wastelands/sprucetree-1.iob diff --git a/objects/trees/spruce/sprucetree-10.iob b/objects/wastelands/sprucetree-10.iob similarity index 100% rename from objects/trees/spruce/sprucetree-10.iob rename to objects/wastelands/sprucetree-10.iob diff --git a/objects/trees/spruce/sprucetree-11.iob b/objects/wastelands/sprucetree-11.iob similarity index 100% rename from objects/trees/spruce/sprucetree-11.iob rename to objects/wastelands/sprucetree-11.iob diff --git a/objects/trees/spruce/sprucetree-12.iob b/objects/wastelands/sprucetree-12.iob similarity index 100% rename from objects/trees/spruce/sprucetree-12.iob rename to objects/wastelands/sprucetree-12.iob diff --git a/objects/trees/spruce/sprucetree-13.iob b/objects/wastelands/sprucetree-13.iob similarity index 100% rename from objects/trees/spruce/sprucetree-13.iob rename to objects/wastelands/sprucetree-13.iob diff --git a/objects/trees/spruce/sprucetree-14.iob b/objects/wastelands/sprucetree-14.iob similarity index 100% rename from objects/trees/spruce/sprucetree-14.iob rename to objects/wastelands/sprucetree-14.iob diff --git a/objects/trees/spruce/sprucetree-15.iob b/objects/wastelands/sprucetree-15.iob similarity index 100% rename from objects/trees/spruce/sprucetree-15.iob rename to objects/wastelands/sprucetree-15.iob diff --git a/objects/trees/spruce/sprucetree-2.iob b/objects/wastelands/sprucetree-2.iob similarity index 100% rename from objects/trees/spruce/sprucetree-2.iob rename to objects/wastelands/sprucetree-2.iob diff --git a/objects/trees/spruce/sprucetree-3.iob b/objects/wastelands/sprucetree-3.iob similarity index 100% rename from objects/trees/spruce/sprucetree-3.iob rename to objects/wastelands/sprucetree-3.iob diff --git a/objects/trees/spruce/sprucetree-4.iob b/objects/wastelands/sprucetree-4.iob similarity index 100% rename from objects/trees/spruce/sprucetree-4.iob rename to objects/wastelands/sprucetree-4.iob diff --git a/objects/trees/spruce/sprucetree-5.iob b/objects/wastelands/sprucetree-5.iob similarity index 100% rename from objects/trees/spruce/sprucetree-5.iob rename to objects/wastelands/sprucetree-5.iob diff --git a/objects/trees/spruce/sprucetree-6.iob b/objects/wastelands/sprucetree-6.iob similarity index 100% rename from objects/trees/spruce/sprucetree-6.iob rename to objects/wastelands/sprucetree-6.iob diff --git a/objects/trees/spruce/sprucetree-7.iob b/objects/wastelands/sprucetree-7.iob similarity index 100% rename from objects/trees/spruce/sprucetree-7.iob rename to objects/wastelands/sprucetree-7.iob diff --git a/objects/trees/spruce/sprucetree-8.iob b/objects/wastelands/sprucetree-8.iob similarity index 100% rename from objects/trees/spruce/sprucetree-8.iob rename to objects/wastelands/sprucetree-8.iob diff --git a/objects/trees/spruce/sprucetree-9.iob b/objects/wastelands/sprucetree-9.iob similarity index 100% rename from objects/trees/spruce/sprucetree-9.iob rename to objects/wastelands/sprucetree-9.iob diff --git a/objects/trees/darkoak/large-10.iob b/objects/waterlogged-darkwood/large-10.iob similarity index 100% rename from objects/trees/darkoak/large-10.iob rename to objects/waterlogged-darkwood/large-10.iob diff --git a/objects/trees/darkoak/large-3.iob b/objects/waterlogged-darkwood/large-3.iob similarity index 100% rename from objects/trees/darkoak/large-3.iob rename to objects/waterlogged-darkwood/large-3.iob diff --git a/objects/trees/darkoak/medgeneric1.iob b/objects/waterlogged-darkwood/med-1.iob similarity index 100% rename from objects/trees/darkoak/medgeneric1.iob rename to objects/waterlogged-darkwood/med-1.iob diff --git a/objects/trees/darkoak/medgeneric2.iob b/objects/waterlogged-darkwood/med-2.iob similarity index 100% rename from objects/trees/darkoak/medgeneric2.iob rename to objects/waterlogged-darkwood/med-2.iob diff --git a/objects/trees/darkoak/medgeneric3.iob b/objects/waterlogged-darkwood/med-3.iob similarity index 100% rename from objects/trees/darkoak/medgeneric3.iob rename to objects/waterlogged-darkwood/med-3.iob diff --git a/objects/trees/darkoak/medgeneric4.iob b/objects/waterlogged-darkwood/med-4.iob similarity index 100% rename from objects/trees/darkoak/medgeneric4.iob rename to objects/waterlogged-darkwood/med-4.iob diff --git a/objects/trees/darkoak/medgeneric5.iob b/objects/waterlogged-darkwood/med-5.iob similarity index 100% rename from objects/trees/darkoak/medgeneric5.iob rename to objects/waterlogged-darkwood/med-5.iob diff --git a/objects/trees/darkoak/medgeneric6.iob b/objects/waterlogged-darkwood/med-6.iob similarity index 100% rename from objects/trees/darkoak/medgeneric6.iob rename to objects/waterlogged-darkwood/med-6.iob diff --git a/objects/trees/darkoak/medgeneric7.iob b/objects/waterlogged-darkwood/med-7.iob similarity index 100% rename from objects/trees/darkoak/medgeneric7.iob rename to objects/waterlogged-darkwood/med-7.iob diff --git a/objects/trees/darkoak/medgeneric8.iob b/objects/waterlogged-darkwood/med-8.iob similarity index 100% rename from objects/trees/darkoak/medgeneric8.iob rename to objects/waterlogged-darkwood/med-8.iob diff --git a/objects/trees/darkoak/medgeneric9.iob b/objects/waterlogged-darkwood/med-9.iob similarity index 100% rename from objects/trees/darkoak/medgeneric9.iob rename to objects/waterlogged-darkwood/med-9.iob diff --git a/objects/trees/darkoak/smolgeneric16.iob b/objects/waterlogged-darkwood/smol-1.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric16.iob rename to objects/waterlogged-darkwood/smol-1.iob diff --git a/objects/trees/darkoak/smolgeneric17.iob b/objects/waterlogged-darkwood/smol-10.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric17.iob rename to objects/waterlogged-darkwood/smol-10.iob diff --git a/objects/trees/darkoak/smolgeneric18.iob b/objects/waterlogged-darkwood/smol-11.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric18.iob rename to objects/waterlogged-darkwood/smol-11.iob diff --git a/objects/trees/darkoak/smolgeneric19.iob b/objects/waterlogged-darkwood/smol-12.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric19.iob rename to objects/waterlogged-darkwood/smol-12.iob diff --git a/objects/trees/darkoak/smolgeneric20.iob b/objects/waterlogged-darkwood/smol-13.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric20.iob rename to objects/waterlogged-darkwood/smol-13.iob diff --git a/objects/trees/darkoak/smolgeneric21.iob b/objects/waterlogged-darkwood/smol-14.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric21.iob rename to objects/waterlogged-darkwood/smol-14.iob diff --git a/objects/trees/darkoak/smolgeneric22.iob b/objects/waterlogged-darkwood/smol-15.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric22.iob rename to objects/waterlogged-darkwood/smol-15.iob diff --git a/objects/trees/darkoak/smolgeneric23.iob b/objects/waterlogged-darkwood/smol-16.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric23.iob rename to objects/waterlogged-darkwood/smol-16.iob diff --git a/objects/trees/darkoak/smolgeneric24.iob b/objects/waterlogged-darkwood/smol-2.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric24.iob rename to objects/waterlogged-darkwood/smol-2.iob diff --git a/objects/trees/darkoak/smolgeneric25.iob b/objects/waterlogged-darkwood/smol-3.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric25.iob rename to objects/waterlogged-darkwood/smol-3.iob diff --git a/objects/trees/darkoak/smolgeneric26.iob b/objects/waterlogged-darkwood/smol-4.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric26.iob rename to objects/waterlogged-darkwood/smol-4.iob diff --git a/objects/trees/darkoak/smolgeneric27.iob b/objects/waterlogged-darkwood/smol-5.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric27.iob rename to objects/waterlogged-darkwood/smol-5.iob diff --git a/objects/trees/darkoak/smolgeneric28.iob b/objects/waterlogged-darkwood/smol-6.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric28.iob rename to objects/waterlogged-darkwood/smol-6.iob diff --git a/objects/trees/darkoak/smolgeneric29.iob b/objects/waterlogged-darkwood/smol-7.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric29.iob rename to objects/waterlogged-darkwood/smol-7.iob diff --git a/objects/trees/darkoak/smolgeneric30.iob b/objects/waterlogged-darkwood/smol-8.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric30.iob rename to objects/waterlogged-darkwood/smol-8.iob diff --git a/objects/trees/darkoak/smolgeneric31.iob b/objects/waterlogged-darkwood/smol-9.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric31.iob rename to objects/waterlogged-darkwood/smol-9.iob diff --git a/objects/trees/darkoak/smdeadwillow1.iob b/objects/willow-dead-supermassive/dead1.iob similarity index 100% rename from objects/trees/darkoak/smdeadwillow1.iob rename to objects/willow-dead-supermassive/dead1.iob diff --git a/objects/trees/darkoak/smdeadwillow2.iob b/objects/willow-dead-supermassive/dead2.iob similarity index 100% rename from objects/trees/darkoak/smdeadwillow2.iob rename to objects/willow-dead-supermassive/dead2.iob diff --git a/objects/trees/darkoak/smwillow1.iob b/objects/willow-supermassive/willow1.iob similarity index 100% rename from objects/trees/darkoak/smwillow1.iob rename to objects/willow-supermassive/willow1.iob diff --git a/objects/trees/darkoak/smwillow2.iob b/objects/willow-supermassive/willow2.iob similarity index 100% rename from objects/trees/darkoak/smwillow2.iob rename to objects/willow-supermassive/willow2.iob diff --git a/objects/trees/darkoak/smwillow3.iob b/objects/willow-supermassive/willow3.iob similarity index 100% rename from objects/trees/darkoak/smwillow3.iob rename to objects/willow-supermassive/willow3.iob diff --git a/objects/trees/darkoak/smwillow4.iob b/objects/willow-supermassive/willow4.iob similarity index 100% rename from objects/trees/darkoak/smwillow4.iob rename to objects/willow-supermassive/willow4.iob diff --git a/objects/trees/darkoak/willowgeneric1.iob b/objects/willowbutbigger/o1.iob similarity index 100% rename from objects/trees/darkoak/willowgeneric1.iob rename to objects/willowbutbigger/o1.iob diff --git a/objects/trees/darkoak/willowgeneric2.iob b/objects/willowbutbigger/o2.iob similarity index 100% rename from objects/trees/darkoak/willowgeneric2.iob rename to objects/willowbutbigger/o2.iob diff --git a/objects/trees/darkoak/willowbutbigger-1.iob b/objects/willwo/willowbutbigger-1.iob similarity index 100% rename from objects/trees/darkoak/willowbutbigger-1.iob rename to objects/willwo/willowbutbigger-1.iob diff --git a/objects/trees/darkoak/willowbutbigger-2.iob b/objects/willwo/willowbutbigger-2.iob similarity index 100% rename from objects/trees/darkoak/willowbutbigger-2.iob rename to objects/willwo/willowbutbigger-2.iob diff --git a/objects/trees/darkoak/generic1.iob b/objects/willwo/willwo-1.iob similarity index 100% rename from objects/trees/darkoak/generic1.iob rename to objects/willwo/willwo-1.iob diff --git a/objects/trees/darkoak/generic2.iob b/objects/willwo/willwo-10.iob similarity index 100% rename from objects/trees/darkoak/generic2.iob rename to objects/willwo/willwo-10.iob diff --git a/objects/trees/darkoak/generic3.iob b/objects/willwo/willwo-11.iob similarity index 100% rename from objects/trees/darkoak/generic3.iob rename to objects/willwo/willwo-11.iob diff --git a/objects/trees/darkoak/generic4.iob b/objects/willwo/willwo-2.iob similarity index 100% rename from objects/trees/darkoak/generic4.iob rename to objects/willwo/willwo-2.iob diff --git a/objects/trees/darkoak/generic5.iob b/objects/willwo/willwo-3.iob similarity index 100% rename from objects/trees/darkoak/generic5.iob rename to objects/willwo/willwo-3.iob diff --git a/objects/trees/darkoak/generic6.iob b/objects/willwo/willwo-4.iob similarity index 100% rename from objects/trees/darkoak/generic6.iob rename to objects/willwo/willwo-4.iob diff --git a/objects/trees/darkoak/generic7.iob b/objects/willwo/willwo-5.iob similarity index 100% rename from objects/trees/darkoak/generic7.iob rename to objects/willwo/willwo-5.iob diff --git a/objects/trees/darkoak/generic10.iob b/objects/willwo/willwo-6.iob similarity index 100% rename from objects/trees/darkoak/generic10.iob rename to objects/willwo/willwo-6.iob diff --git a/objects/trees/darkoak/generic9.iob b/objects/willwo/willwo-7.iob similarity index 100% rename from objects/trees/darkoak/generic9.iob rename to objects/willwo/willwo-7.iob diff --git a/objects/trees/darkoak/generic8.iob b/objects/willwo/willwo-8.iob similarity index 100% rename from objects/trees/darkoak/generic8.iob rename to objects/willwo/willwo-8.iob diff --git a/objects/trees/darkoak/generic11.iob b/objects/willwo/willwo-9.iob similarity index 100% rename from objects/trees/darkoak/generic11.iob rename to objects/willwo/willwo-9.iob diff --git a/objects/trees/mushroom/froShroom-1.iob b/objects/wonderland/froShroom-1.iob similarity index 100% rename from objects/trees/mushroom/froShroom-1.iob rename to objects/wonderland/froShroom-1.iob diff --git a/objects/trees/mushroom/froShroom-2.iob b/objects/wonderland/froShroom-2.iob similarity index 100% rename from objects/trees/mushroom/froShroom-2.iob rename to objects/wonderland/froShroom-2.iob diff --git a/objects/trees/mushroom/froShroom-3.iob b/objects/wonderland/froShroom-3.iob similarity index 100% rename from objects/trees/mushroom/froShroom-3.iob rename to objects/wonderland/froShroom-3.iob diff --git a/objects/trees/mushroom/froShroom-4.iob b/objects/wonderland/froShroom-4.iob similarity index 100% rename from objects/trees/mushroom/froShroom-4.iob rename to objects/wonderland/froShroom-4.iob diff --git a/objects/trees/mushroom/froShroom-5.iob b/objects/wonderland/froShroom-5.iob similarity index 100% rename from objects/trees/mushroom/froShroom-5.iob rename to objects/wonderland/froShroom-5.iob diff --git a/objects/trees/mushroom/froShroom-6.iob b/objects/wonderland/froShroom-6.iob similarity index 100% rename from objects/trees/mushroom/froShroom-6.iob rename to objects/wonderland/froShroom-6.iob diff --git a/objects/trees/mushroom/froShroom-7.iob b/objects/wonderland/froShroom-7.iob similarity index 100% rename from objects/trees/mushroom/froShroom-7.iob rename to objects/wonderland/froShroom-7.iob diff --git a/objects/trees/mushroom/froShroom-8.iob b/objects/wonderland/froShroom-8.iob similarity index 100% rename from objects/trees/mushroom/froShroom-8.iob rename to objects/wonderland/froShroom-8.iob diff --git a/objects/trees/mushroom/froShroom-9.iob b/objects/wonderland/froShroom-9.iob similarity index 100% rename from objects/trees/mushroom/froShroom-9.iob rename to objects/wonderland/froShroom-9.iob diff --git a/objects/trees/spruce/twirl1.iob b/objects/wonderland/twirlSpruce-1.iob similarity index 100% rename from objects/trees/spruce/twirl1.iob rename to objects/wonderland/twirlSpruce-1.iob diff --git a/objects/trees/spruce/twirl2.iob b/objects/wonderland/twirlSpruce-10.iob similarity index 100% rename from objects/trees/spruce/twirl2.iob rename to objects/wonderland/twirlSpruce-10.iob diff --git a/objects/trees/spruce/twirl3.iob b/objects/wonderland/twirlSpruce-2.iob similarity index 100% rename from objects/trees/spruce/twirl3.iob rename to objects/wonderland/twirlSpruce-2.iob diff --git a/objects/trees/spruce/twirl4.iob b/objects/wonderland/twirlSpruce-3.iob similarity index 100% rename from objects/trees/spruce/twirl4.iob rename to objects/wonderland/twirlSpruce-3.iob diff --git a/objects/trees/spruce/twirl5.iob b/objects/wonderland/twirlSpruce-4.iob similarity index 100% rename from objects/trees/spruce/twirl5.iob rename to objects/wonderland/twirlSpruce-4.iob diff --git a/objects/trees/spruce/twirl6.iob b/objects/wonderland/twirlSpruce-5.iob similarity index 100% rename from objects/trees/spruce/twirl6.iob rename to objects/wonderland/twirlSpruce-5.iob diff --git a/objects/trees/spruce/twirl7.iob b/objects/wonderland/twirlSpruce-6.iob similarity index 100% rename from objects/trees/spruce/twirl7.iob rename to objects/wonderland/twirlSpruce-6.iob diff --git a/objects/trees/spruce/twirl8.iob b/objects/wonderland/twirlSpruce-7.iob similarity index 100% rename from objects/trees/spruce/twirl8.iob rename to objects/wonderland/twirlSpruce-7.iob diff --git a/objects/trees/spruce/twirl9.iob b/objects/wonderland/twirlSpruce-8.iob similarity index 100% rename from objects/trees/spruce/twirl9.iob rename to objects/wonderland/twirlSpruce-8.iob diff --git a/objects/trees/spruce/twirl10.iob b/objects/wonderland/twirlSpruce-9.iob similarity index 100% rename from objects/trees/spruce/twirl10.iob rename to objects/wonderland/twirlSpruce-9.iob diff --git a/objects/clutter/ice/wonder-1.iob b/objects/wonderland/wonder-1.iob similarity index 100% rename from objects/clutter/ice/wonder-1.iob rename to objects/wonderland/wonder-1.iob diff --git a/objects/clutter/ice/wonder-10.iob b/objects/wonderland/wonder-10.iob similarity index 100% rename from objects/clutter/ice/wonder-10.iob rename to objects/wonderland/wonder-10.iob diff --git a/objects/clutter/ice/wonder-2.iob b/objects/wonderland/wonder-2.iob similarity index 100% rename from objects/clutter/ice/wonder-2.iob rename to objects/wonderland/wonder-2.iob diff --git a/objects/clutter/ice/wonder-3.iob b/objects/wonderland/wonder-3.iob similarity index 100% rename from objects/clutter/ice/wonder-3.iob rename to objects/wonderland/wonder-3.iob diff --git a/objects/clutter/ice/wonder-4.iob b/objects/wonderland/wonder-4.iob similarity index 100% rename from objects/clutter/ice/wonder-4.iob rename to objects/wonderland/wonder-4.iob diff --git a/objects/clutter/ice/wonder-5.iob b/objects/wonderland/wonder-5.iob similarity index 100% rename from objects/clutter/ice/wonder-5.iob rename to objects/wonderland/wonder-5.iob diff --git a/objects/clutter/ice/wonder-6.iob b/objects/wonderland/wonder-6.iob similarity index 100% rename from objects/clutter/ice/wonder-6.iob rename to objects/wonderland/wonder-6.iob diff --git a/objects/clutter/ice/wonder-7.iob b/objects/wonderland/wonder-7.iob similarity index 100% rename from objects/clutter/ice/wonder-7.iob rename to objects/wonderland/wonder-7.iob diff --git a/objects/clutter/ice/wonder-8.iob b/objects/wonderland/wonder-8.iob similarity index 100% rename from objects/clutter/ice/wonder-8.iob rename to objects/wonderland/wonder-8.iob diff --git a/objects/clutter/ice/wonder-9.iob b/objects/wonderland/wonder-9.iob similarity index 100% rename from objects/clutter/ice/wonder-9.iob rename to objects/wonderland/wonder-9.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/a1.iob b/objects/woodland_mansion/1x1/a1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/a1.iob rename to objects/woodland_mansion/1x1/a1.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/a2.iob b/objects/woodland_mansion/1x1/a2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/a2.iob rename to objects/woodland_mansion/1x1/a2.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/a3.iob b/objects/woodland_mansion/1x1/a3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/a3.iob rename to objects/woodland_mansion/1x1/a3.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/a4.iob b/objects/woodland_mansion/1x1/a4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/a4.iob rename to objects/woodland_mansion/1x1/a4.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/a5.iob b/objects/woodland_mansion/1x1/a5.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/a5.iob rename to objects/woodland_mansion/1x1/a5.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/as1.iob b/objects/woodland_mansion/1x1/as1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/as1.iob rename to objects/woodland_mansion/1x1/as1.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/as2.iob b/objects/woodland_mansion/1x1/as2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/as2.iob rename to objects/woodland_mansion/1x1/as2.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/as3.iob b/objects/woodland_mansion/1x1/as3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/as3.iob rename to objects/woodland_mansion/1x1/as3.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/as4.iob b/objects/woodland_mansion/1x1/as4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/as4.iob rename to objects/woodland_mansion/1x1/as4.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/b1.iob b/objects/woodland_mansion/1x1/b1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/b1.iob rename to objects/woodland_mansion/1x1/b1.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/b2.iob b/objects/woodland_mansion/1x1/b2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/b2.iob rename to objects/woodland_mansion/1x1/b2.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/b3.iob b/objects/woodland_mansion/1x1/b3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/b3.iob rename to objects/woodland_mansion/1x1/b3.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/b4.iob b/objects/woodland_mansion/1x1/b4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/b4.iob rename to objects/woodland_mansion/1x1/b4.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/b5.iob b/objects/woodland_mansion/1x1/b5.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/b5.iob rename to objects/woodland_mansion/1x1/b5.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a1.iob b/objects/woodland_mansion/1x2/a1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a1.iob rename to objects/woodland_mansion/1x2/a1.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a2.iob b/objects/woodland_mansion/1x2/a2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a2.iob rename to objects/woodland_mansion/1x2/a2.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a3.iob b/objects/woodland_mansion/1x2/a3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a3.iob rename to objects/woodland_mansion/1x2/a3.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a4.iob b/objects/woodland_mansion/1x2/a4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a4.iob rename to objects/woodland_mansion/1x2/a4.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a5.iob b/objects/woodland_mansion/1x2/a5.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a5.iob rename to objects/woodland_mansion/1x2/a5.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a6.iob b/objects/woodland_mansion/1x2/a6.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a6.iob rename to objects/woodland_mansion/1x2/a6.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a7.iob b/objects/woodland_mansion/1x2/a7.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a7.iob rename to objects/woodland_mansion/1x2/a7.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a8.iob b/objects/woodland_mansion/1x2/a8.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a8.iob rename to objects/woodland_mansion/1x2/a8.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a9.iob b/objects/woodland_mansion/1x2/a9.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a9.iob rename to objects/woodland_mansion/1x2/a9.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/b1.iob b/objects/woodland_mansion/1x2/b1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/b1.iob rename to objects/woodland_mansion/1x2/b1.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/b2.iob b/objects/woodland_mansion/1x2/b2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/b2.iob rename to objects/woodland_mansion/1x2/b2.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/b3.iob b/objects/woodland_mansion/1x2/b3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/b3.iob rename to objects/woodland_mansion/1x2/b3.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/b4.iob b/objects/woodland_mansion/1x2/b4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/b4.iob rename to objects/woodland_mansion/1x2/b4.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/b5.iob b/objects/woodland_mansion/1x2/b5.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/b5.iob rename to objects/woodland_mansion/1x2/b5.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/c1.iob b/objects/woodland_mansion/1x2/c1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/c1.iob rename to objects/woodland_mansion/1x2/c1.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/c2.iob b/objects/woodland_mansion/1x2/c2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/c2.iob rename to objects/woodland_mansion/1x2/c2.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/c3.iob b/objects/woodland_mansion/1x2/c3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/c3.iob rename to objects/woodland_mansion/1x2/c3.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/c4.iob b/objects/woodland_mansion/1x2/c4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/c4.iob rename to objects/woodland_mansion/1x2/c4.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/d1.iob b/objects/woodland_mansion/1x2/d1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/d1.iob rename to objects/woodland_mansion/1x2/d1.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/d2.iob b/objects/woodland_mansion/1x2/d2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/d2.iob rename to objects/woodland_mansion/1x2/d2.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/d3.iob b/objects/woodland_mansion/1x2/d3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/d3.iob rename to objects/woodland_mansion/1x2/d3.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/d4.iob b/objects/woodland_mansion/1x2/d4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/d4.iob rename to objects/woodland_mansion/1x2/d4.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/d5.iob b/objects/woodland_mansion/1x2/d5.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/d5.iob rename to objects/woodland_mansion/1x2/d5.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/s1.iob b/objects/woodland_mansion/1x2/s1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/s1.iob rename to objects/woodland_mansion/1x2/s1.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/s2.iob b/objects/woodland_mansion/1x2/s2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/s2.iob rename to objects/woodland_mansion/1x2/s2.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/se1.iob b/objects/woodland_mansion/1x2/se1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/se1.iob rename to objects/woodland_mansion/1x2/se1.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/a1.iob b/objects/woodland_mansion/2x2/a1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/a1.iob rename to objects/woodland_mansion/2x2/a1.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/a2.iob b/objects/woodland_mansion/2x2/a2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/a2.iob rename to objects/woodland_mansion/2x2/a2.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/a3.iob b/objects/woodland_mansion/2x2/a3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/a3.iob rename to objects/woodland_mansion/2x2/a3.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/a4.iob b/objects/woodland_mansion/2x2/a4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/a4.iob rename to objects/woodland_mansion/2x2/a4.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/b1.iob b/objects/woodland_mansion/2x2/b1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/b1.iob rename to objects/woodland_mansion/2x2/b1.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/b2.iob b/objects/woodland_mansion/2x2/b2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/b2.iob rename to objects/woodland_mansion/2x2/b2.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/b3.iob b/objects/woodland_mansion/2x2/b3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/b3.iob rename to objects/woodland_mansion/2x2/b3.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/b4.iob b/objects/woodland_mansion/2x2/b4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/b4.iob rename to objects/woodland_mansion/2x2/b4.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/b5.iob b/objects/woodland_mansion/2x2/b5.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/b5.iob rename to objects/woodland_mansion/2x2/b5.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/s1.iob b/objects/woodland_mansion/2x2/s1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/s1.iob rename to objects/woodland_mansion/2x2/s1.iob diff --git a/objects/jigsaw/woodland_mansion/main/a1.iob b/objects/woodland_mansion/main/a1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/main/a1.iob rename to objects/woodland_mansion/main/a1.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/carpet_east.iob b/objects/woodland_mansion/oldstuff/carpet_east.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/carpet_east.iob rename to objects/woodland_mansion/oldstuff/carpet_east.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/carpet_north.iob b/objects/woodland_mansion/oldstuff/carpet_north.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/carpet_north.iob rename to objects/woodland_mansion/oldstuff/carpet_north.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/carpet_south_1.iob b/objects/woodland_mansion/oldstuff/carpet_south_1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/carpet_south_1.iob rename to objects/woodland_mansion/oldstuff/carpet_south_1.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/carpet_south_2.iob b/objects/woodland_mansion/oldstuff/carpet_south_2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/carpet_south_2.iob rename to objects/woodland_mansion/oldstuff/carpet_south_2.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/carpet_west_1.iob b/objects/woodland_mansion/oldstuff/carpet_west_1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/carpet_west_1.iob rename to objects/woodland_mansion/oldstuff/carpet_west_1.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/carpet_west_2.iob b/objects/woodland_mansion/oldstuff/carpet_west_2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/carpet_west_2.iob rename to objects/woodland_mansion/oldstuff/carpet_west_2.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/corridor_floor.iob b/objects/woodland_mansion/oldstuff/corridor_floor.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/corridor_floor.iob rename to objects/woodland_mansion/oldstuff/corridor_floor.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/entrance.iob b/objects/woodland_mansion/oldstuff/entrance.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/entrance.iob rename to objects/woodland_mansion/oldstuff/entrance.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/indoors_door_1.iob b/objects/woodland_mansion/oldstuff/indoors_door_1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/indoors_door_1.iob rename to objects/woodland_mansion/oldstuff/indoors_door_1.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/indoors_door_2.iob b/objects/woodland_mansion/oldstuff/indoors_door_2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/indoors_door_2.iob rename to objects/woodland_mansion/oldstuff/indoors_door_2.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/indoors_wall_1.iob b/objects/woodland_mansion/oldstuff/indoors_wall_1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/indoors_wall_1.iob rename to objects/woodland_mansion/oldstuff/indoors_wall_1.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/indoors_wall_2.iob b/objects/woodland_mansion/oldstuff/indoors_wall_2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/indoors_wall_2.iob rename to objects/woodland_mansion/oldstuff/indoors_wall_2.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/roof.iob b/objects/woodland_mansion/oldstuff/roof.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/roof.iob rename to objects/woodland_mansion/oldstuff/roof.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/roof_corner.iob b/objects/woodland_mansion/oldstuff/roof_corner.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/roof_corner.iob rename to objects/woodland_mansion/oldstuff/roof_corner.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/roof_front.iob b/objects/woodland_mansion/oldstuff/roof_front.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/roof_front.iob rename to objects/woodland_mansion/oldstuff/roof_front.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/roof_inner_corner.iob b/objects/woodland_mansion/oldstuff/roof_inner_corner.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/roof_inner_corner.iob rename to objects/woodland_mansion/oldstuff/roof_inner_corner.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/small_wall.iob b/objects/woodland_mansion/oldstuff/small_wall.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/small_wall.iob rename to objects/woodland_mansion/oldstuff/small_wall.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/small_wall_corner.iob b/objects/woodland_mansion/oldstuff/small_wall_corner.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/small_wall_corner.iob rename to objects/woodland_mansion/oldstuff/small_wall_corner.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/wall_corner.iob b/objects/woodland_mansion/oldstuff/wall_corner.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/wall_corner.iob rename to objects/woodland_mansion/oldstuff/wall_corner.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/wall_flat.iob b/objects/woodland_mansion/oldstuff/wall_flat.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/wall_flat.iob rename to objects/woodland_mansion/oldstuff/wall_flat.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/wall_window.iob b/objects/woodland_mansion/oldstuff/wall_window.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/wall_window.iob rename to objects/woodland_mansion/oldstuff/wall_window.iob diff --git a/objects/jigsaw/woodland_mansion/path/path_1.iob b/objects/woodland_mansion/path/path_1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/path/path_1.iob rename to objects/woodland_mansion/path/path_1.iob diff --git a/objects/jigsaw/woodland_mansion/path/path_2.iob b/objects/woodland_mansion/path/path_2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/path/path_2.iob rename to objects/woodland_mansion/path/path_2.iob diff --git a/objects/jigsaw/woodland_mansion/path_2/path_1.iob b/objects/woodland_mansion/path_2/path_1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/path_2/path_1.iob rename to objects/woodland_mansion/path_2/path_1.iob diff --git a/objects/jigsaw/woodland_mansion/path_2/path_2.iob b/objects/woodland_mansion/path_2/path_2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/path_2/path_2.iob rename to objects/woodland_mansion/path_2/path_2.iob diff --git a/objects/jigsaw/woodland_mansion/roof/roof_1.iob b/objects/woodland_mansion/roof/roof_1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/roof/roof_1.iob rename to objects/woodland_mansion/roof/roof_1.iob diff --git a/objects/jigsaw/woodland_mansion/stairs/stairs_left.iob b/objects/woodland_mansion/stairs/stairs_left.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/stairs/stairs_left.iob rename to objects/woodland_mansion/stairs/stairs_left.iob diff --git a/objects/jigsaw/woodland_mansion/stairs/stairs_right.iob b/objects/woodland_mansion/stairs/stairs_right.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/stairs/stairs_right.iob rename to objects/woodland_mansion/stairs/stairs_right.iob diff --git a/objects/jigsaw/woodland_mansion/stairs/stairs_straight.iob b/objects/woodland_mansion/stairs/stairs_straight.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/stairs/stairs_straight.iob rename to objects/woodland_mansion/stairs/stairs_straight.iob diff --git a/objects/trees/sproak/sp1.iob b/objects/wwland/DoSp-1.iob similarity index 100% rename from objects/trees/sproak/sp1.iob rename to objects/wwland/DoSp-1.iob diff --git a/objects/trees/sproak/sp2.iob b/objects/wwland/DoSp-2.iob similarity index 100% rename from objects/trees/sproak/sp2.iob rename to objects/wwland/DoSp-2.iob diff --git a/objects/trees/sproak/sp3.iob b/objects/wwland/DoSp-3.iob similarity index 100% rename from objects/trees/sproak/sp3.iob rename to objects/wwland/DoSp-3.iob diff --git a/objects/trees/sproak/sp4.iob b/objects/wwland/DoSp-4.iob similarity index 100% rename from objects/trees/sproak/sp4.iob rename to objects/wwland/DoSp-4.iob diff --git a/objects/trees/sproak/sp5.iob b/objects/wwland/DoSp-5.iob similarity index 100% rename from objects/trees/sproak/sp5.iob rename to objects/wwland/DoSp-5.iob diff --git a/objects/trees/sproak/sp6.iob b/objects/wwland/DoSp-6.iob similarity index 100% rename from objects/trees/sproak/sp6.iob rename to objects/wwland/DoSp-6.iob diff --git a/objects/trees/sproak/msapling1.iob b/objects/wwland/DoSp-sapling-10.iob similarity index 100% rename from objects/trees/sproak/msapling1.iob rename to objects/wwland/DoSp-sapling-10.iob diff --git a/objects/trees/sproak/msapling2.iob b/objects/wwland/DoSp-sapling-2.iob similarity index 100% rename from objects/trees/sproak/msapling2.iob rename to objects/wwland/DoSp-sapling-2.iob diff --git a/objects/trees/sproak/msapling3.iob b/objects/wwland/DoSp-sapling-3.iob similarity index 100% rename from objects/trees/sproak/msapling3.iob rename to objects/wwland/DoSp-sapling-3.iob diff --git a/objects/trees/sproak/msapling4.iob b/objects/wwland/DoSp-sapling-4.iob similarity index 100% rename from objects/trees/sproak/msapling4.iob rename to objects/wwland/DoSp-sapling-4.iob diff --git a/objects/trees/sproak/msapling5.iob b/objects/wwland/DoSp-sapling-5.iob similarity index 100% rename from objects/trees/sproak/msapling5.iob rename to objects/wwland/DoSp-sapling-5.iob diff --git a/objects/trees/sproak/msapling6.iob b/objects/wwland/DoSp-sapling-6.iob similarity index 100% rename from objects/trees/sproak/msapling6.iob rename to objects/wwland/DoSp-sapling-6.iob diff --git a/objects/trees/sproak/msapling7.iob b/objects/wwland/DoSp-sapling-7.iob similarity index 100% rename from objects/trees/sproak/msapling7.iob rename to objects/wwland/DoSp-sapling-7.iob diff --git a/objects/trees/sproak/msapling8.iob b/objects/wwland/DoSp-sapling-8.iob similarity index 100% rename from objects/trees/sproak/msapling8.iob rename to objects/wwland/DoSp-sapling-8.iob diff --git a/objects/trees/sproak/msapling9.iob b/objects/wwland/DoSp-sapling-9.iob similarity index 100% rename from objects/trees/sproak/msapling9.iob rename to objects/wwland/DoSp-sapling-9.iob diff --git a/objects/trees/sproak/msapling10.iob b/objects/wwland/DoSp-sapling.iob similarity index 100% rename from objects/trees/sproak/msapling10.iob rename to objects/wwland/DoSp-sapling.iob diff --git a/objects/structures/BarcoPirataGriffer.iob b/objects/zzz/BarcoPirataGriffer.iob similarity index 100% rename from objects/structures/BarcoPirataGriffer.iob rename to objects/zzz/BarcoPirataGriffer.iob diff --git a/objects/structures/FT_1.iob b/objects/zzz/FT_1.iob similarity index 100% rename from objects/structures/FT_1.iob rename to objects/zzz/FT_1.iob diff --git a/objects/zzz/cave1.iob b/objects/zzz/cave1.iob new file mode 100644 index 00000000..4c4763ce Binary files /dev/null and b/objects/zzz/cave1.iob differ diff --git a/objects/zzz/cave2.iob b/objects/zzz/cave2.iob new file mode 100644 index 00000000..f9ee54f3 Binary files /dev/null and b/objects/zzz/cave2.iob differ diff --git a/objects/zzz/grass.iob b/objects/zzz/grass.iob new file mode 100644 index 00000000..7c3a0c0f Binary files /dev/null and b/objects/zzz/grass.iob differ diff --git a/objects/jigsaw/mansion/grid.iob b/objects/zzz/grid.iob similarity index 100% rename from objects/jigsaw/mansion/grid.iob rename to objects/zzz/grid.iob diff --git a/objects/jigsaw/mansion/mansion_roof.iob b/objects/zzz/mansion_roof.iob similarity index 100% rename from objects/jigsaw/mansion/mansion_roof.iob rename to objects/zzz/mansion_roof.iob diff --git a/objects/jigsaw/mansion/mansion_vanilla_1.iob b/objects/zzz/mansion_vanilla_1.iob similarity index 100% rename from objects/jigsaw/mansion/mansion_vanilla_1.iob rename to objects/zzz/mansion_vanilla_1.iob diff --git a/objects/jigsaw/mansion/mansion_vanilla_2.iob b/objects/zzz/mansion_vanilla_2.iob similarity index 100% rename from objects/jigsaw/mansion/mansion_vanilla_2.iob rename to objects/zzz/mansion_vanilla_2.iob diff --git a/objects/jigsaw/mansion/mansion_vanilla_3.iob b/objects/zzz/mansion_vanilla_3.iob similarity index 100% rename from objects/jigsaw/mansion/mansion_vanilla_3.iob rename to objects/zzz/mansion_vanilla_3.iob diff --git a/regions/frozen.json b/regions/frozen.json index 69b6e113..ece8e33f 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -38,38 +38,6 @@ "zoom": 5 } }, - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 25 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 25 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 25 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 25 - }, - { - "entity": "polar-bear", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 20 - } - ], "deposits": [ { "minHeight": 8, @@ -132,12 +100,12 @@ "bottom": true, "density": 1, "place": [ - "objects/structures/amethyst1", - "objects/structures/amethyst2", - "objects/structures/amethyst3", - "objects/structures/amethyst4", - "objects/structures/amethyst5", - "objects/structures/amethyst6" + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" ], "edit": [{ "find": [{"block": "glass"}], @@ -163,8 +131,8 @@ "name": "standard-surface-portals", "chance": 0.001, "place": [ - "clutter/swordnp2", - "clutter/swordnp1", + "global-clutter/BigSwordPortal-unlit-1", + "global-clutter/BigSwordPortal-lit-1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/regions/hot.json b/regions/hot.json index b36656f1..e84c35ba 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -8,13 +8,7 @@ "hot/sav-savanna", "hot/sav-forest", "hot/sav-plateau", - "hot/sav-acacia-denmyre", - "hot/msa-plateau", - "hot/msa-valleys", - "hot/msa-plateau-high", - "hot/msa-valleys", - "hot/msa-mesa", - "hot/msa-cliffs" + "hot/sav-acacia-denmyre" ], "shoreBiomes": ["hot/hot-beach"], "seaBiomes": ["ocean/oce-hot-ocean"], @@ -31,37 +25,6 @@ "zoom": 5 } }, - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 12 - }, - { - "entity": "donkey", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 50 - }, - { - "entity": "mule", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 50 - },{ - "entity": "rabbit", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 20 - }, - { - "entity": "wanderingtrader", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 190 - } - ], "spotBiomes": [{ "biome": "hot/hot-oasis", "scale": 5, @@ -180,12 +143,12 @@ "bottom": true, "density": 1, "place": [ - "objects/structures/amethyst1", - "objects/structures/amethyst2", - "objects/structures/amethyst3", - "objects/structures/amethyst4", - "objects/structures/amethyst5", - "objects/structures/amethyst6" + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" ], "edit": [{ "find": [{"block": "glass"}], @@ -211,8 +174,8 @@ "name": "standard-surface-portals", "chance": 0.001, "place": [ - "clutter/swordnp2", - "clutter/swordnp1", + "global-clutter/BigSwordPortal-unlit-1", + "global-clutter/BigSwordPortal-lit-1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/regions/mesa.json b/regions/mesa.json new file mode 100644 index 00000000..49fbdde6 --- /dev/null +++ b/regions/mesa.json @@ -0,0 +1,130 @@ +{ + "name": "Mesa", + "color": "#E79200", + "landBiomes": [ + "mesa/msa-plateau", + "mesa/msa-valleys", + "mesa/msa-plateau-high", + "mesa/msa-valleys", + "mesa/msa-mesa", + "mesa/msa-cliffs" + ], + "shoreBiomes": ["mesa/msa-beach"], + "seaBiomes": ["ocean/oce-hot-river"], + "jigsawStructures": [{ + "structure": "murky_stronghold", + "rarity": 750 + }], + "caveBiomes": [ + "cave/old-cavern", + "cave/sandy-cave", + "cave/sandy-red-cave" + ], + "riverBiomes": ["ocean/oce-hot-river"], + "spotBiomes": [{ + "biome": "ocean/oce-hot-ocean", + "scale": 25, + "type": "SEA", + "shuffle": 328, + "rarity": 15 + }], + "biomeImplosionRatio": 0.75, + "riverStyle": { + "style": "VASCULAR", + "zoom": 4.77, + "fracture": { + "multiplier": 240, + "style": "IRIS", + "zoom": 5 + } + }, + "objects": [{ + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 5 + }, + "chance": 0.05, + "bottom": true, + "density": 1, + "place": [ + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" + ], + "edit": [{ + "find": [{"block": "glass"}], + "replace": {"palette": [{"block": "void_air"}]} + }], + "enabled": true, + "xAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "yAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "translate": { + "yRandom": 10, + "y": 2 + } + }], + "deposits": [ + { + "minHeight": 25, + "maxPerChunk": 9, + "maxHeight": 50, + "minPerChunk": 3, + "minSize": 3, + "maxSize": 4, + "palette": [{"block": "gold_ore"}], + "varience": 5 + }, + { + "minHeight": 15, + "maxPerChunk": 4, + "maxHeight": 35, + "minPerChunk": 2, + "minSize": 3, + "maxSize": 5, + "palette": [{"block": "lapis_ore"}], + "varience": 5 + }, + { + "minHeight": 8, + "maxPerChunk": 12, + "maxHeight": 57, + "minPerChunk": 7, + "minSize": 12, + "maxSize": 22, + "palette": [{"block": "blackstone"}], + "varience": 4 + } + ], + "loot": { + "mode": "ADD", + "multiplier": 1, + "tables": [ + "global-clutter", + "global-tools", + "hot-treasure", + "hot-food" + ] + }, + "riverRarity": 1, + "landBiomeZoom": 1.5, + "shoreHeightMin": 4, + "shoreHeightMax": 6, + "shoreHeightZoom": 1.14, + "riverThickness": 0.006, + "rarity": 4 +} diff --git a/regions/mushroom.json b/regions/mushroom.json index 68cdd249..323d9147 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -72,12 +72,12 @@ "bottom": true, "density": 1, "place": [ - "objects/structures/amethyst1", - "objects/structures/amethyst2", - "objects/structures/amethyst3", - "objects/structures/amethyst4", - "objects/structures/amethyst5", - "objects/structures/amethyst6" + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" ], "edit": [{ "find": [{"block": "glass"}], @@ -123,19 +123,6 @@ "interval": 60000, "soundDistance": 3 } - ], - "entityInitialSpawns": [ - { - "entity": "mooshroom", - "maxSpawns": 4, - "minSpawns": 1, - "rarity": 12 - }, - { - "entity": "cow", - "maxSpawns": 2, - "rarity": 20 - } ], "shoreHeightMin": 3.2, "shoreHeightMax": 6.2, diff --git a/regions/ocean.json b/regions/ocean.json index a2b1672d..d5874c5c 100644 --- a/regions/ocean.json +++ b/regions/ocean.json @@ -25,18 +25,6 @@ "ocean-clutter", "tropical-treasure" ]}, - "entityInitialSpawns": [ - { - "entity": "glowsquid", - "maxSpawns": 2, - "rarity": 40 - }, - { - "entity": "drowned", - "maxSpawns": 2, - "rarity": 45 - } - ], "rarity": 3, "effects": [ { diff --git a/regions/swamp.json b/regions/swamp.json index df737093..1d26392c 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -30,38 +30,6 @@ "zoom": 5 } }, - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 16 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 16 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 8 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 12 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 28 - } - ], "biomeImplosionRatio": 0.26, "deposits": [ { @@ -98,12 +66,12 @@ "bottom": true, "density": 1, "place": [ - "objects/structures/amethyst1", - "objects/structures/amethyst2", - "objects/structures/amethyst3", - "objects/structures/amethyst4", - "objects/structures/amethyst5", - "objects/structures/amethyst6" + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" ], "edit": [{ "find": [{"block": "glass"}], diff --git a/regions/temperate.json b/regions/temperate.json index eb5f917e..ebd6d4e0 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -31,68 +31,6 @@ "structure": "murky_stronghold", "rarity": 750 }], - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 0, - "rarity": 18 - }, - { - "entity": "goat", - "maxSpawns": 2, - "minSpawns": 0, - "rarity": 38 - }, - { - "entity": "horse", - "maxSpawns": 3, - "minSpawns": 0, - "rarity": 60 - }, - { - "entity": "llama", - "maxSpawns": 3, - "minSpawns": 0, - "rarity": 65 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 0, - "rarity": 40 - }, - { - "entity": "bee", - "maxSpawns": 1, - "minSpawns": 0, - "rarity": 30 - } - ], "shoreRatio": 0.1, "shoreBiomeZoom": 0.15, "biomeImplosionRatio": 0.7, @@ -123,12 +61,12 @@ "bottom": true, "density": 1, "place": [ - "objects/structures/amethyst1", - "objects/structures/amethyst2", - "objects/structures/amethyst3", - "objects/structures/amethyst4", - "objects/structures/amethyst5", - "objects/structures/amethyst6" + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" ], "edit": [{ "find": [{"block": "glass"}], @@ -154,8 +92,8 @@ "name": "standard-surface-portals", "chance": 0.001, "place": [ - "clutter/swordnp2", - "clutter/swordnp1", + "global-clutter/BigSwordPortal-unlit-1", + "global-clutter/BigSwordPortal-lit-1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/regions/tropical.json b/regions/tropical.json index d1d011a7..d05a2310 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -5,24 +5,26 @@ "tropical/tro-rainforest", "tropical/tro-plains", "tropical/tro-bamboo-forest", + "tropical/tro-plains", "tropical/tro-rainforest-wicked", + "tropical/tro-wilds", "tropical/tro-volcanic-plains", - "tropical/tro-mountain", "tropical/tro-mountain-extreme", - "tropical/tro-mountain-plains", + "tropical/tro-mountain", + "tropical/tro-plains", + "tropical/tro-mountain", + "tropical/tro-plains", + "tropical/tro-mountain-extreme", "tropical/tro-wilds", "tropical/tro-plains-hills" ], "shoreBiomes": [ "tropical/tro-island-beach", "tropical/tro-beach", - "tropical/tro-submerged-volcanic", "tropical/tro-beach-bamboo" ], "seaBiomes": [ - "tropical/tro-submerged-volcanic", "ocean/oce-tro-ocean", - "tropical/tro-rainforest-island", "ocean/oce-tro-river-soft" ], "caveBiomes": [ @@ -40,74 +42,6 @@ "zoom": 5 } }, - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 18 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 18 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 18 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 18 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 39 - }, - { - "entity": "ocelot", - "maxSpawns": 2, - "minSpawns": 0, - "rarity": 10 - }, - { - "entity": "parrot", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 15 - }, - { - "entity": "turtle", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 80 - }, - { - "entity": "panda", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 40 - }, - { - "entity": "pandaUwU", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 150 - }, - { - "entity": "aeternum", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 200 - } - ], "jigsawStructures": [{ "structure": "murky_stronghold", "rarity": 750 @@ -150,12 +84,12 @@ "bottom": true, "density": 1, "place": [ - "objects/structures/amethyst1", - "objects/structures/amethyst2", - "objects/structures/amethyst3", - "objects/structures/amethyst4", - "objects/structures/amethyst5", - "objects/structures/amethyst6" + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" ], "edit": [{ "find": [{"block": "glass"}], @@ -181,8 +115,8 @@ "name": "standard-surface-portals", "chance": 0.001, "place": [ - "clutter/swordnp2", - "clutter/swordnp1", + "global-clutter/BigSwordPortal-unlit-1", + "global-clutter/BigSwordPortal-lit-1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/regions/tundra.json b/regions/tundra.json index 0395e797..b6936214 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -29,44 +29,6 @@ "caveBiomes": [ "cave/tundra-cavern", "cave/spiked-cavern" - ], - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 29 - }, - { - "entity": "polar-bear", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 20 - } ], "riverBiomes": ["ocean/oce-tun-river"], "biomeImplosionRatio": 0.25, @@ -117,12 +79,12 @@ "bottom": true, "density": 1, "place": [ - "objects/structures/amethyst1", - "objects/structures/amethyst2", - "objects/structures/amethyst3", - "objects/structures/amethyst4", - "objects/structures/amethyst5", - "objects/structures/amethyst6" + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" ], "edit": [{ "find": [{"block": "glass"}],