From 76d77fb60f2a382d511ca92efb6de25eadf40d83 Mon Sep 17 00:00:00 2001 From: Max Hyper Date: Wed, 7 Jun 2023 20:47:48 -0300 Subject: [PATCH] fixed mega fir jocodes and biome overrides --- gradle.properties | 2 +- src/generated/resources/.cache/cache | 3 + .../blockstates/rooty_glowing_moss_block.json | 14 ++ .../dtbop/loot_tables/trees/leaves/silk.json | 41 ++++ src/main/resources/META-INF/mods.toml | 45 +--- .../resources/assets/dtbop/lang/en_us.json | 15 +- .../trees/dtbop/jo_codes/mega_fir.txt | 217 +++++++++++------- .../trees/dtbop/jo_codes/mega_umbran.txt | 217 +++++++++++------- .../trees/dtbop/species/mega_fir.json | 3 +- .../trees/dtbop/species/mega_umbran.json | 3 +- .../trees/dtbop/species/redwood.json | 3 +- .../trees/dtbop/species/small_redwood.json | 2 +- .../trees/dtbop/world_gen/default.json | 15 +- 13 files changed, 367 insertions(+), 213 deletions(-) create mode 100644 src/generated/resources/assets/dtbop/blockstates/rooty_glowing_moss_block.json create mode 100644 src/generated/resources/data/dtbop/loot_tables/trees/leaves/silk.json diff --git a/gradle.properties b/gradle.properties index a827416f..08414606 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ modName=DynamicTreesBOP modId=dtbop -modVersion=3.0.0-Beta5 +modVersion=3.0.0 group=therealeststu.dtbop mcVersion=1.18.2 diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index f0e15d13..1492d81c 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -51,6 +51,7 @@ a31c500c009d48c26d1967cc11c7f81f00c63bea assets/dtbop/blockstates/redwood_root.j 23bb639a4c71ef39f99ad6f5171133afcf0a319b assets/dtbop/blockstates/redwood_sapling.json 448eb3b3b3b60e09585ceae5d2050f6ee186fbdd assets/dtbop/blockstates/rooty_black_sand.json 2df89e5c35225327b9321954e87b6faba05622ac assets/dtbop/blockstates/rooty_dried_salt.json +ec0d64a546e78cdc50387a78146b4455bdddfbec assets/dtbop/blockstates/rooty_glowing_moss_block.json fbbf881211d991917e5b09304d55971989e53289 assets/dtbop/blockstates/rooty_mud.json 9c7ed3e45838a36c912326c26f65cce256238895 assets/dtbop/blockstates/rooty_orange_sand.json 8cc12e50f08ceb1d5bf60f7ac41f0b903e1ef16b assets/dtbop/blockstates/rooty_origin_grass_block.json @@ -185,6 +186,7 @@ c2f08a71b78b1d01e524bc353c2cab77b7750c14 data/dtbop/loot_tables/blocks/poplar_le 0c0bbbeed85328e7b62574f1d9d2b1e0e1271f2f data/dtbop/loot_tables/blocks/rainbow_birch_leaves.json 084319dc88c87136ca6ab5b7d593e812a36be467 data/dtbop/loot_tables/blocks/redwood_leaves.json 98e0f08cd5527c067f19c2cdf65690045a22019f data/dtbop/loot_tables/blocks/silk_undergrowth_web.json +98e0f08cd5527c067f19c2cdf65690045a22019f data/dtbop/loot_tables/blocks/silk_web.json b5b5943747059789bdd3271118d3b2dbad8968d5 data/dtbop/loot_tables/blocks/sparse_acacia_leaves.json e99c4293e30ae0fa3c79c29b761f7e6f53a36c22 data/dtbop/loot_tables/blocks/sparse_oak_leaves.json f9c69617b25b7fff39eb6e93f3e0d5408158fe71 data/dtbop/loot_tables/blocks/spruce_poplar_leaves.json @@ -242,6 +244,7 @@ be3261b7d5f46f13f1dff9bb9290d9d7ea3f11f3 data/dtbop/loot_tables/trees/branches/s 4c52d020b8802156ae80c1cf9f6cb977a3bf11fc data/dtbop/loot_tables/trees/leaves/poplar.json 4c52d020b8802156ae80c1cf9f6cb977a3bf11fc data/dtbop/loot_tables/trees/leaves/rainbow_birch.json 4c52d020b8802156ae80c1cf9f6cb977a3bf11fc data/dtbop/loot_tables/trees/leaves/redwood.json +4c52d020b8802156ae80c1cf9f6cb977a3bf11fc data/dtbop/loot_tables/trees/leaves/silk.json 4c52d020b8802156ae80c1cf9f6cb977a3bf11fc data/dtbop/loot_tables/trees/leaves/silk_undergrowth.json 4c52d020b8802156ae80c1cf9f6cb977a3bf11fc data/dtbop/loot_tables/trees/leaves/sparse_acacia.json 4c52d020b8802156ae80c1cf9f6cb977a3bf11fc data/dtbop/loot_tables/trees/leaves/sparse_oak.json diff --git a/src/generated/resources/assets/dtbop/blockstates/rooty_glowing_moss_block.json b/src/generated/resources/assets/dtbop/blockstates/rooty_glowing_moss_block.json new file mode 100644 index 00000000..e0137246 --- /dev/null +++ b/src/generated/resources/assets/dtbop/blockstates/rooty_glowing_moss_block.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "biomesoplenty:block/glowing_moss_block" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dtbop/loot_tables/trees/leaves/silk.json b/src/generated/resources/data/dtbop/loot_tables/trees/leaves/silk.json new file mode 100644 index 00000000..88e6045d --- /dev/null +++ b/src/generated/resources/data/dtbop/loot_tables/trees/leaves/silk.json @@ -0,0 +1,41 @@ +{ + "type": "dynamictrees:leaves", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.1, + 0.1333333, + 0.1666666, + 0.2 + ] + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 2.0 + }, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:string" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index d114de44..54679dd8 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,65 +1,26 @@ -# This is an example mods.toml file. It contains the data relating to the loading mods. -# There are several mandatory fields (#mandatory), and many more that are optional (#optional). -# The overall format is standard TOML format, v0.5.0. -# Note that there are a couple of TOML lists in this file. -# Find more information on toml format here: https://github.com/toml-lang/toml -# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml modLoader="javafml" #mandatory -# A version range to match for said mod loader - for regular FML @Mod it will be the forge version loaderVersion="[36,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. - -# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. -# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. license="MIT" -# A URL to refer people to when problems occur with this mod -#issueTrackerURL="https://github.com/supermassimo/DynamicTrees-ExC/issues" #optional - -# A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory - -# The modid of the mod modId="dtbop" #mandatory - -# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it -# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata -# see the associated build.gradle script for how to populate this completely automatically during a build version="${file.jarVersion}" #mandatory - -# A display name for the mod displayName="Dynamic Trees for Biomes o' Plenty" #mandatory - -# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/ updateJSONURL="https://github.com/the-realest-stu/DynamicTrees-BOP/blob/master/version_info.json?raw=true" #optional - -# A URL for the "homepage" for this mod, displayed in the mod UI displayURL="https://www.curseforge.com/minecraft/mc-mods/dtbop" #optional - -# A file name (in the root of the mod JAR) containing a logo for display logoFile="" #optional - -# A text field displayed in the mod UI credits="ferreusveritas" #optional - -# A text field displayed in the mod UI authors="mangoose, Max Hyper" #optional -# The description text for the mod (multi line!) (#mandatory) description=''' Compatibility Mod between Dynamic trees and Biomes o' plenty ''' -# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. [[dependencies.dtbop]] #optional - # the modid of the dependency modId="forge" #mandatory - # Does this dependency have to exist - if not, ordering below must be specified mandatory=true #mandatory - # The version range of the dependency versionRange="[36,)" #mandatory - # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory ordering="NONE" - # Side this dependency is applied on - BOTH, CLIENT or SERVER side="BOTH" [[dependencies.dtbop]] @@ -72,20 +33,20 @@ Compatibility Mod between Dynamic trees and Biomes o' plenty [[dependencies.dtbop]] modId="dynamictrees" mandatory=true - versionRange="[0.11.0,)" + versionRange="[1.0.0,)" ordering="AFTER" side="BOTH" [[dependencies.dtbop]] modId="dynamictreesplus" mandatory=false - versionRange="[0.1.0,)" + versionRange="[1.0.0,)" ordering="AFTER" side="BOTH" [[dependencies.dtbop]] modId="biomesoplenty" mandatory=true - versionRange="[16.0.0.109,17.0.0.0)" + versionRange="[1.18.2-16.0.0.109,1.19.0-17.0.0.0)" ordering="AFTER" side="BOTH" diff --git a/src/main/resources/assets/dtbop/lang/en_us.json b/src/main/resources/assets/dtbop/lang/en_us.json index 29223a90..29fc9e41 100644 --- a/src/main/resources/assets/dtbop/lang/en_us.json +++ b/src/main/resources/assets/dtbop/lang/en_us.json @@ -29,11 +29,11 @@ "species.dtbop.orange_autumn":"Autumnal Oak", "species.dtbop.yellow_autumn":"Autumnal Birch", "species.dtbop.maple":"Red Maple", - "species.dtbop.dead":"Bare", - "species.dtbop.dying":"Dying", - "species.dtbop.tall_dead":"Tall Bare", - "species.dtbop.tall_dying":"Tall Dying", - "species.dtbop.infested":"Infested", + "species.dtbop.dead":"Bare Tree", + "species.dtbop.dying":"Dying Tree", + "species.dtbop.tall_dead":"Tall Bare Tree", + "species.dtbop.tall_dying":"Tall Dying Tree", + "species.dtbop.infested":"Infested Oak", "species.dtbop.silk":"Silked", "species.dtbop.flowering_oak":"Flowering Oak", "species.dtbop.flowering_apple_oak":"Flowering Apple", @@ -62,6 +62,11 @@ "species.dtbop.sparse_oak":"Sparse Oak", "species.dtbop.sparse_acacia":"Sparse Acacia", "species.dtbop.short_jungle":"Short Jungle", + "species.dtbop.flowering_oak_undergrowth":"Flowering Oak Undergrowth", + "species.dtbop.infested_oak_undergrowth":"Infested Oak Undergrowth", + "species.dtbop.silk_undergrowth":"Silked Undergrowth", + "species.dtbop.acacia_undergrowth":"Acacia Undergrowth", + "species.dtbop.spruce_undergrowth":"Spruce Undergrowth", "block.dtbop.palm_branch":"Palm", "block.dtbop.dead_branch":"Dead Tree", diff --git a/src/main/resources/trees/dtbop/jo_codes/mega_fir.txt b/src/main/resources/trees/dtbop/jo_codes/mega_fir.txt index bf00f795..62d8ab4e 100644 --- a/src/main/resources/trees/dtbop/jo_codes/mega_fir.txt +++ b/src/main/resources/trees/dtbop/jo_codes/mega_fir.txt @@ -1,77 +1,140 @@ -2:JJJOJxOJxOJxOJJPvy+fvy+fvy+fvynvy9+fv -2:JJJJOJxOJxOJxJJ7vy+fny+fny+f09+Xz86 -2:JJJOJxOJxOJJxOJJ8+Xz8+Xz9+X09+Xz+nvz8+f09 -2:JJJOJxOJxOJxJJJ+fvyvenvynr+V+fny+nvy+f09 -2:JJJOJxOJJJJxOJ7+d8+Xvy+nvy+f09 -2:JJJOJxOJJxOJxJJ+i9XXXvz9+fn -2:JJJJOJxJOJxOJJ+XvXXff -2:JJJJJJJOJxOJxJ776+Xz9 -3:JJJOJxOJxOP17+vzfX0j+t+b6X0nzvWvS+ki+t+b0fvS16n -3:JJJOJxOJxOJxOJxJPn0Xt+S+b+k9vyU+bv0i9r+b09+mS8fuS9fyWnv0mXb9q+S09+mbni9vyV+bntb -3:JJJOJxOJxOJxOJxJP0nvyXz+nvy+b+k9vyV+bn09uXfyWnvzd+kXtXyUnzd9uXfzt8mXfzc+ky79r -3:JJJOJxOJxOJxOJJPy7+Xzf09v0yXzfnuXz9+Svzc+ky79q+S09+nty7+bnkfyV+f0i9q -3:JJJOJxOJxOJxOJxOJ7+Xz8+f0nq+Xz+nt+WXvzz9vk+WU9+bnky7+S+b8i+bvtXyVvzc8j -3:JJJJOJJJxOJxOJ+X09+S+f09vyXzf0nvb6 -3:JJJOJxOJxOJxOJxOPz89+Xz8ny+b+k9vyWnvzf09q+Snzd+kft+b09+kft+Snzd8nSn -3:JJJOJxOJxOJxOJJxPz8+Xzf09+S+b+nvyU+f0ntXyV+bvtf0j9SvyV+bvtXyV+b09+kfty7 -3:JJJOJJxOJxOJxOJJ+fnz+i9+S+efnt+WV8nzz89q+Sv0mXft+Vq8i+SvtX -4:JJJJJOJxOJxOJxOJ+Xvy+f09+Xzz98nyXzf0nt+Xzf0nt+Sy+nvzef09+kz89ufvy+mb8y89zfuXv -4:JJJOJxOJxOJxOJPyy97+S+b+k9vzf0XuXvyWnvzd+ky+fnty+fvyWX09+bv0mXz89ufvyWnvzef09+ky+fnty7+SXzd+ky89uWXvd -4:JJJOJxOJxOJxOJxJPy+f09+S+b+k9vy+f09vyy9+efvk+Sy+nvzef09+ky+fnty9+Sy+nvzefn0mXfty+fvyWX09+b0nt+kj9uXr+Snzc+ky+fntuXf -4:JJJOJxOJxOJxOJxOPfnznv0y+fnq+S+b+k9vyWX09+bz+nv0mXntz9+Sy+nvzenv0mXnty+fvyWXnzb+kXvyyXk7bn -4:JJJOJxOJxOJxOJxJPy+f09+V+d8nyy8+b9vyXzf0nt+Sy+nvzef09+ky+fnty+fvyWX09+mb8nufq+Synt+bnkS+bvtyXf -4:JJJOJxOJxOJxOJx+Xz+nvy+fk+b+mXnq+S+j9z9+Xzefn0mfnty9+Sy+nvzenv09uXz9+WSnkXzzc8j9ufvyWXnzb8i -4:JJJOJxOJxOJxOJx+Xz9+Xnzf0y89y9+S+b+k9vy+bz8+ky+fnty+fvyWX09+bz8+kz89uXz9+SV9vcn -4:JJJJJOJxOJxOJxOJ+fny+nvy+efnvy+b+k9vzf0y89XyWX09+b09+ky+fnty+fvyWX09+bz+nv0mXz89uXz9 -5:JJJOJxOJxOJxOP18fz+t8Xzz8nyXt+bfyX1ufq8mfy8nzer8fyWWXvn1uXvkz+Xk+SyWXn18+ubd9y9zfuXvmbfmXmb8y8+bzj9+Syyvk9+tzt6vkzfmS8z8 -5:JJJOJxOJxOJxOJxOPnz+nt+S+d8+Sy+nv0zfnub9y9+S09+mb8y8z89zb9q+SWXvzeefvn09uS+ft+Syy98+bzf09+ky+fk9uS+ft+Syynvnzebnn0mXz8ntyV7b+SyWnvnzbn0mXzc89uftf -5:JJJOJxOJxOJxOJxOJJ+Xfy+nvy+b+nt+bf0yXk9yXufvyWS+k9vz+kz8y89uft+SyX09+bzz89v0mXzfk9uXt+S0XuXvzbf0k9ufuXvyWWU98+b+k9uSvzft+bzd8+kfv -5:JJJOJxOJxOJxOJxJPy+fny+efnvyS+b+kntvyWX09vzefv0ky+fntz9+SyX09vzef09+ky+fk9ty+fvyWS+nt+benv0kz89ub9y9+Sy8+bzc+knt+ky89tfySV+b8mXmfi -5:JJJOJxOJxOJxOJxJ7+S+mb89t+mS8z89yvfzef0nv0yXk9y9z9+SyX09vzeefnv0mXz8ntuXz9+SyX09+br+ky8ntt+SUnkiXynt -5:JJJOJxOJxOJxOJxOPny8+Xmfk+WS9+b8k+SyXvzef09+kyXz89uXd+SyX09+bzf09+ky+fnty+fvyyWXvty7+bzf0nt8kz8+WS0nv0kXty9vbef0nt+Snzc+ky8i9uXtX -5:JJJOJxOJxOJxOJxPvy7+Xzc+ntfySXzeb9v0mXz89+Snzed8n0mXmfnty+b9+bb+mSy88mXz89yV9z9y9+Syyvnvzeed8nt+kyU+fnty9z9XyWSvvzbf0k9tS -5:JJJOJxOJxOJxOJxOJ6ni+f09XyWXnzef09+kntz9+X0ftuXz9+Syy89+bzf0nv0mS8z89uXz9+SyXvzeefvk+ki9uXb+bb8j+Svz9q -5:JJJOJxOJxOJxOJxOJ+fny7+Sn09vy+bv0j9vy+bzf09+ky7nvyS09+bv0mXk9ufuXvyyyXt8nebz+nv0j9t+bzd9+kmS89tvyV+bb+k9tv -6:JJJOJxOJxOJxOJxOJPy+fvy+f09+WXvef09+X0nufvyWX09+bz+nv09uXz9+Sy+nvzenv0mXz89ufvyWS+nvzeefnt+ky+b8nty9z9+Syy89+bef09+ky+b8ntyvefvyUXzeb+nv0mXz8ntyXz9v -6:JJJOJxOJxOJxOJxOJPXy+f09+S+b+k9+Xzf0nt+Vy9+bz+nvky8+eefvk9yXufvyWWXvk+bzf0nv0ky+fntyXz9vyyyy989uXvzzzz989ufvky+fk+SyX09+bzz89+ky8z89uXz9v -6:JJJOJxOJxOJxOJxOJPvy+nvyX0z89z9+S+b+nt+Sy9+f0mXz89t+Sy+nvzef09+nty+fvyWS+k9vzeb+nt8mfmXnyWS+nt+bzf09+ky+fk9ufuXvyWS+k9+bef09+kzfmXnty9z9 -6:JJJOJxOJxOJxOJxJPfyXz+k9vzb+mXnt+WWXnvzzft8mfnyVX0mS+fnub9vyWS+nvzeb+nv0mXmfnty+ft+SyX09+bzf09+ky+fk9uXz9vyWSy+nv09+bzef09+nv0mXz8mXz89uXz9uXz9 -6:JJJOJxOJxOJxOJxJ+Xzf09+Xz+k9+Svzefv0mXfvyWXvzefn0mXnty+fvyWXvzeefnv0ky+fnty9z9+Vy9vzzzz989ufvkyXz8nyWS+nvzeb+k9v0inty9z9+bzznt8j+mSU8mS+fk9yWS99uXufv -6:JJJOJxOJxOJxOJxOJPy7+fvyXzf0nt+S+f0nt+Sy8+bz+nv0mXz89+Sy+nvzf0mXz89uXz9+SyX0nvzej9f0mfmXnty9z9+SyX09vzeb+nv0mfmXntz9y9+SyX09+bef09+ky+b8nty+ft -6:JJJOJxOJxOJxOJxOPy+fny+nvyy8+efnt+U+efnt+Xzefv0mXz89uXfyyy89vzzft8k+SyX0nvzeefnv0mb8y89uXz9vyWS+k9+bzf0nv0ky+fnty+ft+SyX09+bzf09+ky+fk9uXz9v -6:JJJOJxOJxOJxOJxOJPXyvz8+Xzf0nt+Sy8+mfk9t+Sy+nvzefn0mXz89ufvyXzeefnv0mS8ntyXz9vyyyy989q+eeefvntfky+fk+SyX09+bzz98+ky+fk9uXzft+WWSy+nvntyXufvzzzr89rvky+fky+fn -6:JJJOJxOJxOJxOJxOJPy7+fvyXzf0nt+S+f0nt+Sy8+bz+nv0mXz89+Sy+nvzf0mXz89uXz9+SyX0nvzej9f0mfmXnty9z9+SyX09vzeb+nv0mfmXntz9y9+SyX09+bef09+ky+b8nty+ft -6:JJJOJxOJxOJxOJxOJxOJxPXz+vnzfyX1vk+S+ufvmfnzef18+Sy8+ty98mXnzzvk+WWXvk9ufy9+SyX18+ubfuXt8zb8y8z8+bzf1vnyyyy98nty98mfmXnzeeefvk9+Syyy898+tz+S9ufy98mXmb8y8+eeeefnvkftz+XvmSyX188mfy8nzbzef189r+SWWWXvk9+tyV9zd9y9z98kmS8z8+bbzf1vk+SSyX1vk+ttzfyXt8kmb+S8n -6:JJJOJxOJxOJxOJxJ+fnz+vkz6+ef1861Xnznyyt89vzec9+Syy98k+tz9V8mfnzbzf18+Syynvn1uSvufvkzfUXzzzzznt89t8j6yWSy988mXmfnzbzef18+vnySWS+vk+tzd9uS9z98mbk8mS8z8 -6:JJJOJxOJxOJxOJxJ+efvXz+XnzfWX18+befv1y9zfq8y8nzzdvk+Sy99uXtz+Xvzeeb89+tz+S9t8yWXnmfmXnyWSy99v1rz98mbvy8mXnzebzf1vk+vknyWWWS98k9ty99tub9y9 -6:JJJOJxOJxOJxOJxPz+t8+bfyX18j+X1z9t8j+bv1yXufvmXknzeefk9t+S18U+tVXkz+Xkfzebz9+t8+SyWX18+vn1uXufq8mcz86i+bzeb+t8+vnyWWWWXnvntX1ufuXub9Xkz+Snkz+Xk+bzeb+t8n18nyWSuXvkWXn1ufy9uS9z98kz+Xkz+Xn -6:JJJOJxOJxOJxOJxJ7+X09+Svz+ntvyWX09+bz9+ky+fnty+fvyWS+nv0zefnky+fnubvuXufvyyyy989+eeefvnty+fvky+fk+Syy89+mbz88yXmfnubz99y9z9+Syyy989+bzef09+kz89+kyU8mXz89uXz9uXz9 -6:JJJOJxOJxOJxOJx6Xy+b+k9+SXzb+kXtvyWX09+bz+nv0mXnty7+Sq+bzz89+kzfmXntz9y9+bzz89v0yWXnmb8y89ty+fvyWS+nt+bzf09+ky+fk9ufuXvyWWWXnt8+bzef09+nv0mXz8mXz89uXz9uXz9 -6:JJJOJxOJxOJxOJxOJPy+nvy+k9+WXnzz89vyWX09+ec98mXz8+Sy+nvzef09+ky+fntz9+WSy+nvky8+bzf0nvtyXz9vyVXzeb+k9+kyXj9uXz9vyyWX09+ky89uXz97zef09+kz89+SyWX09+ntXzeeefvnv0mXzc8mXz89ufuXufv -6:JJJOJxOJxOJxOJx+Xny+c9vyV+bf09+Sy8+eb98mXfySy+nvzefv0mfntz9+Syy98nzeb+k9+kk9uS+ft+SyX09+bzf09+ky+fk9uXz9vyWSy+nv09uXvzeeefvnv0mXzc8mXz89ufty+fv -6:JJJOJxOJxOJxOJPy+fvyS+f0k9+S09+f0mXfty+fvyWS+k9+bzfn0jnty+b9vySy+nvzdf0mS+b8ntz9y9+Syy89+bzz98+kyXz8nty7z9+bzef09+nv0yWWXvnmfintz9yXufv -6:JJJOJxOJxOJxOJxJ+Xfyy8+b9+Xz+kftfyWXvzefn0mXftXyWWXvnzeefnv0mXz8ntuXz9+SyX09+bzf09v0mXz8nty9vyWS8+bzf0nv0mXmfnty+fvyWSy+nv09q+bzzz898+ky8zfmXntzd9y9z9 -6:JJJOJxOJxOJxOJPy+fvyS+f0k9+S09+f0mXfty+fvyWS+k9+bzfn0jnty+b9vySy+nvzdf0mS+b8ntz9y9+Syy89+bzz98+kyXz8nty7z9+bzef09+nv0yWWXvnmfintz9yXufv -6:JJJOJxOJxOJxOJxJ+XvyXznt+Sy8+bz8+ky89uXz9+Sy9+bz+nv0mXz89vyWS+nt+bzz98+ky8z89ty9+SyX0nvzeefnv0ky+fnty+ft+Sy+nt+bzz98+ky+fk9ub9y9+SyWX09+nvzebz+nv09+ky+fky+fnty+fty+fv -6:JJJOJxOJxOJxOJxJ+fny7z8+SX0z89b+bz+nv0mXz89uXz9+SyX0nvzeb+k9+kmXnty+ft+Syy89+b0fr+kyXz8nty+ft+bef09+kyXzfnuSy99zfuXvyWSy+nv0i9+bzef099r+kzefnmXmfnty9z9y9 -6:JJJOJxOJxOJxOJxJPy8nynznvyXzzz989uXvyyvnzef099uXz9+Sy+nvzeefnt+ky+b8nty9z9+b0fufv0yS8z8y89yWXvtz9+SyX09+bzf09+ky+fk9uXz9vyWSy+nv0i9+bzzz898+kz8y8z89uXzd9uXz9 -7:JJJOJxOJxOJxOJxOJx9+Xz9+fmXnyXzf0nvyXzefvtvzef09+mS8z89yXr+SyXvzemfnt9uXufvyWS+nt+bef09+ky+b8ntzfuXvyyyy898mXnzzzz898mfnty+ft+S0WXnqy9+bzef09+nv0mXz8mXz89uXz9uXz9 -7:JJJOJxOJxOJxOJxOJPz8+f09+S+b+k9vyWnvz+kXtz9+WS+k9veb+k9vyWS+nvzej9f0mXz8nty+ft+Syy89+bzf0nv0mS8z89uXz9vyWWXvnzbz+nv0mXzfk9uS9z9+SyWX09+nvzebz+nv09r+ky+fky+fnty9z9y9 -7:JJJOJxOJxOJxOJxJ+X09+WX097z8+Snzefn0mXz89vy+bz+nv0mfntz9+SyX09+bt+ky+b8nty9z9+S0XuXvzeefnv0mXz8ntuXz9+Syy98nzeb+nv0mfmXntyXz9vyWSy+nv09+bz+nv0mXz8mXz89rufv -7:JJJOJxOJxOJxOJxJPy8nynefvyXzf0mfnt+eb89y9vyWWXvnzeefnv0mXzfk9ufuXvyWWXvnzed8+ky+fk9uS+ft+bzz89+mSy88zfmXnuSy99z9y9+Syyy898+bzef09+kfv0mXmfmXntyV+fty+fv -7:JJJOJxOJxOJxOJxOJ+Xfzfvz+k9vyS+cftz9+Sy+nvzefv0mXz89vyyWX099uXvzzzz98nt8mS8z8+SyX0nvzeb+nv0mfmXnty+ft+SWX09+bef09+kyXzfk9uXufvyWSy+nv09+bzef09+nv0mXz8mXz89uXz9uXz9 -7:JJJOJxOJxOJxOJxPz9+S+f0nvy+bf09t+bv0mXz89vyWS+nvzeefvn0mXz8nty9z9+SyX0nvzbz+nv0ky+fntyvefvyWU9+bzf0nv0mS8z89uXz9vyWWWXnvnzebz+nv09+ky+fky+fntyV+fty+fv -7:JJJOJxOJxOJxOJxOJPvXy+f0nvyS+bf0k9uXvyWX09+eb98nyWWXnvzek9+kyXk9uXz9vyWS+nvzeefvn0mXz8nty+ft+Syy98+bzf09+ky+fk9uWXvd+Syyy898i+bzzz89vn0mfmXmfntyV+fty+fv -7:JJJOJxOJxOJxOJxOJx9+Xz9+fmXnyXzf0nvyXzefvtvzef09+mS8z89yXr+SyXvzemfnt9uXufvyWS+nt+bef09+ky+b8ntzfuXvyyyy898mXnzzzz898mfnty+ft+S0WXnqy9+bzef09+nv0mXz8mXz89uXz9uXz9 -7:JJJOJxOJxOJxOJxJ6+Xz+k9vzefn0y89y9+bz8+mS8nuS9vyWS+nvzeb8+ky+fk9uXzft+SyX09+bzf09+kync9uXz9vyWS+nvzeefnt+ky8z89uXufvyWSy+nv09+bzef09+ntf0mXz8mXz89uXufuXv -7:JJJOJxOJxOJxOJxOJ6+fnfyXzf09t+WS+k97zf09+bef09+kz8y89uXzfvyWS+k9v0mb8y89ub9y9+Syy98+bzf0nv0mXmfntz9y9+Sy+ntXzebz+nv0k9+kUXtz9y9z9 -7:JJJOJxOJxOJxOJxPz+Xk+c+WS89r+bz8+WS98+Syvn1tvmfk+b1fmfn1yXufuXvmSnkz8y8+SyWX188i+ubvuS9ufyXvmbfkzfy8+bzef18+vkfyWWU9uXvn1uftt8mXmfmXnzbebz8+tvkz8+S1SS8Sy8+ttzefvyS9ufy98kyWXnkz+Xn -8:JJJOJxOJxOJxOJxJPny+fvy+bvky8+bz8+mS8nuS9+SyX09+bzf09+kync9uXz9+bzf0nt+mSnky+fnuS9uXvyWSy+nv09+b0efnrv0mXz8mXz89uXz9uXz9+SyWX09+kXtXzeeefvk9+kmXmfntz9y9v -8:JJJOJxOJxOJxOJxOJPy7+Xz+nt+S+f0nt+Sy+nvzefn0mXz89uXz9+Sy9+bz+nv0mXnty7+Syy89vzej9f0mS8z89ufuXvzbz+nv0yWXnmb8nuSy99zfuXvyWSy+nvnzebz+nv09+ky+fky+fntz9yXufvyWSy+nvvzebz+nvv0kmXz89uXz9uXz9 -8:JJJOJxOJxOJxOJxOJPy78Xy+b+nt+WS8+eefvnvyWX09+bz+nv0mXnty+fvyWWXvnzeb+k9+ky8z89uXz9vzeb+k9+kmXz89ufuXvyWiy89WXvzeeefnvn0mXky+fnty+bvty+fvyWSy+nvvzebz+nvv0kmfntz9uXf -8:JJJOJxOJxOJxOJxJJ+b9+S+mfnufvyS+f0mXfvyXzefn0mXz89vyWWXvnzefv0mXk9uXz9vzef09v0mS+fk9uXufvyWSy+nv0nvzbzf09+kbnty+b9uXz9+Syyy989+bzef09+nv0mSnz8mXz89ufty7 -8:JJJOJxOJxOJxOJxOJ8n0y+fnt+V+fnyU+f0j9r+Sy+nvzzz89vky+fnySy+nvzeefvn0mfk9uV7z9+bzf09+mSXmfmXnuSy99z9y9+SyWX09+nvzeeefvnv0mXzc8mXz89uXz9uXz9+SyWX099q+bbz+nv0kzfmXntuXufv -8:JJJOJxOJxOJxOJxOPXyXz+nvy+efnt+Sy8+bz+nv0j9t+Sy+nvzb+ky89ufvyWWXnt+bzz89v0mS+b8ntuXz9+Sy+nt+bef098mXmfnyyyyy9898mXk+eebz+nvvkz8nty+fty+fvyVyXvzebz+nvn0mSy8+fky+fntz9y9z9 -8:JJJOJxOJxOJxOJxOPny+b+nt+b+mXnt+S+bf0mXftz9+Sy+nvzzft8mfnyWS+nt+bef09+ky+b8ntfyWS+nv0mXzfk9zefvuXufvyUS+bzef09+nv0mXz8mXz89uSy9+fty+fvyWWWXnvnzbef09+ky8mXz89uSvty+fv -8:JJJOJxOJxOJxOJxOJx9+XvzvmXny+efvnyS+bf0mXftvyWXvzefn0j9uXz9+Syy89+bzf0nv0mS8z89uXz9vyWS+k9vzeefnt+kzfmXntuXz9+SyWX09+kXvzeeefvk9+kmXzfk9uVy97t+bzef098+mSWXnmfky+fnuSyXvtuXz9 -8:JJJOJxOJxOJxOJxJ+nvy+f09+bz8+mXk9XyWX09+bz9+kz89ufvyWS+nvzeb+nv0mXz8nty7vyWV8nzeb+nv0mfmXntz9y9+SyWX09+nvzebz+nv09+ky+fky+fnty+fty+fvyWSy+nvvzeeefnvn0mXz8mXz89uXzd9uXv \ No newline at end of file +8:JJJJOJxOJxOJxOJxJPk+uXvmfnzb+uS9z98y8nzzf1vnSy+vnzzr8j9yWXvufuXvzzzz98ntz+XvyWWXvnky8z8+bzzz898+uSWXvub9ufy98ySy88z8yXmfnzkefnyyyyy98ntXkmfy89ufqv +8:JJJJOJxOJxOJxOJx9+bnyX18+bfy+t8nzd+S+vkfzefnyyyXnty98mXk+ubz9+S9ufy98yWXnjz8+bzef18+vkfyWWWXnt8i+tz9yXt8kz+Xk+bzef18+tfnySyX18n1uSvufuXvkkz+Xn +8:JJJJOJxOJxOJxOJxJ+f18y8+fy+t8+bz+vnyS+tz+Xvkfzef18+SXkz8+SWXv1ub+S9vkzfyXk+ebz+vnkz8+UyXk9uefvWXvzerz98efnySyX18+tyXtz+XvkyXmfmXnzeeefvnvyyWS+vk9uXt8mb+Xky8 +8:JJJJOJxOJxOJxOJxOJxJ77+b+WXnvzf1y98y8+bz9+Untz6+bz8+uS9z98yXmfnyWWXvn1zb9y9z98zefnmXmfnzeb+vnyWS+t8+tz9y98mfy8nzzzzz89vntufvyyWWXvk9uS9vkz8yXmfnzeeefvnvySyy98n1udz96uXvkzc8mfy8 +8:JJJJOJxOJxOJxOJxOOJ98+b+Xnzz8+WXnt6yy89+Sy+vn1efvmb8y8+Sy+vn1zfuXvkz+Xnzzzz89vkz8+WSy+vnky89uS9z9+bzf18nyWWXvn1ufuXvky8z8+bzzz98nvyWSy+vn18+tzufvVXky8mfy8 +8:JJJJOJxOJxOJxOJxJPz+vk+S8nzf1yXt8i+eefnvyyy898mfnzeefnt+Sq+ty9z98mXmfnUmXnyWSy+vn1t8+rub9vmbzz988y8z8y8+bzef18+tz98+SyWX18+vn1uXtz+Xvkz8mfy8 +8:JJJJOJxOJxOJxOJxJ9fz+Xk+fyU+ty98+eefnt+Svky8+eeefnt8mfXWqXinzeb+vnyWvmXn1ufy9vkz8y8+bzef188+SyWX18+tXn1ubfuXt8mfy8mfy8+bzefv1ufvkf1tyXufvkmfmXn +8:JJJJOJxOJxOJxOJxOJ+fXzfynt+WXnufvyWXv1ufXmfmXnzzz98nyyy98ntz+XvyWS+vn1z9y9z98zfkz+Xnzbz+vnyyWX188mfntzfuXvzebz+vn18+SSy+vn1ufyWXvtz+Xvkz+Sy88mfy8+bzzz98nvyWWWXvk9+tz+Xtz+XvkmefnWXn +8:JJJJOJxOJxOJxOJxJ+fi+b+X1vnzb+uS9vmXnzzz89+WWXnvky8+bzz98nyyuXvk9ub9y9+befvyyyy989ufvkzfy8nzebz+vntfyWSy+vn18+ty9z9y98mbz8+Xkz+XnzczfmXnuSyXvubz99V +8:JJJJOJxOJxOJxOJxOPXz+XvznyXv1z+XvmfXzzft+WWXnvkz+Xnzef18+Sy+vn1ufy98mfy8+bzf1vnyWS+t8+tufy98mfy8nzeb+vnyWS+t8+tz9y98mfy8nzbzz98nyUyXk+tub+S9vkkz+Xn +8:JJJJOJxOJxOJxOJxPzfnz+t8n1yXufvi+Sy+vn1z9Xmb8y8+bz+vn1yXufvkz+Xnzz9+SWX188jz8+bef18+Syy89+tzfy9vkzz86y8+bzef18+tfnyWSy+vn1uXvn1tz9y98mfy8mfy8 +8:JJJJOJxOJxOJxOJx+Xvzfy+vk+b+S+t8nzc+X18j+bz9+Sy+vn1ufvky8+ebz+vnkz8+S1XmXntV+bzz89+Syy89v1ufuXvkmfy8+czefnkz8+WWSy+vnty98iXttz+Xv +8:JJJJOJxOJxOJxOJxOJxPvnz+X18+b+S+t8+b+uXvmXnyWX18+ub9vkz+Xnyyy98nub9y9+bzz98+SWX18+tyXufvkz8y8+bzz98+Syy89+tzfy9vkz8y8+bzef18+vn1uSy99zfuXvmSyy98nmfkz+Xn +8:JJJJOJxOJxOJxOJxJ+b8XyX1z98+bvyWXv18mfnyWXv1ufy98zfnzzz98nyyy98ntz+Xvzzef189ufy9+Syy89vkzfyXk+eeefvntz+Xvyyyy98nvkz8y8+bzef18+vnyWSy+vn18mXn1ufy9ufy98mfkz+Xn +8:JJJJOJxOJxOJxOJxOPnq+f18nzb9ufvzc+Sy9+tvkz8+eeb98mXnyWXvtz+Xvzzzz89vkz8+SyX1vk9+Syyy89vn1zb9uefvS8mXmb8nzebz+vn18+SyWX18+vn1ufy9ufy98mfy8mfy8 +8:JJJJOJxOJxOJxOJxOJPy+vnz+q8+efnyy89vzzft+WWXnt8mfy8+Sy+vn1zfuXvmb8y8+ebz+vn1uXvkz86yWX18+vky8+Syy98+tyXufvmbz+vnmXmfnzb1fmfnyWSy+vntX1ubvuXufvkUy8+SyWX18+vky8+tzefvuS9z98zbfkzfmXn +8:JJJJOJxOJxOJxOJxPz+vnz+S+vk+bfyV+vnzvyV8+bz9+Sy8+tvkz+Xnzeb+t8+VyXt8mfyXk+bzz98+Syy98+tzfyXt8mc6nzeeefvnvyWSy+vnn1ufyWXvtz+Xvkzc+Xkz+Xn +8:JJJJOJxOJxOJxOJxPb+X1vmfnz+WS98+b+uXt8y8fzef18+Sy+vn1ufy98k+bef18+WSy89q8kz+Xnzzzz989ufvyyyy989uXvkz+Xk+bzef18+vkfyWWWXvnv1ufy9ufy98mSnjn +8:JJJJOJxOJxOJxOJxPnz+XvzefvyS+ty98nzef18+SX1ufy98k+WWS898eb8nzeb+vnyWWXnv1ufy9vkz+S8nzeeefvntz9+WWSy+vnntuXvkzc+Xkz+Xnzebz+vn18mfnyWSy+vnv1ufy9ufy98mXkz+Xn +8:JJJJOJxOJxOJxOJ+bfyy89+f1V8y8+S+ub9vmb8y8+ebz+vnkz8+WSy98i9ufy9+ebz+vnkz89yWXvtz+Xvzebz9+tfkfyyyyy8989uXt8mXmfmXnzeeefvnvyWSy+vn18i+tz9yXufvkzc8y8z8 +7:JJJJOJxOJxOJxOJxOPfy+vnzfyXk+eefvnyyy989r+bz+vnyWXn1uXvkz+Xnzmb8+WSy+vnntz9y9+b1fmfn1yWXvrviWXnzebz+vn1ufvkfyWWWXvk9+ty9ufy98mXmfmXnzebz+vnvyWSy+vn1q8+tub+Xt8mfy8mfy8 +7:JJJJOJxOJxOJxOJxPnzfynvzvWS+vnzzfk+WWXvntz9+bz+vnyWX18+tz98mfy8+bzf18nyWS+vk+tzvV8kz+Xnzeb+vnySy+vn1uft8mfyXk+bzzz898+SyWX189+tzd+Xtz+Xvkz+Sy88mfy8 +7:JJJJOJxOJxOJxOJxOJPfzf1vnz+S9+eb9vyU8i+bz+vnyS+tvky8+bz+vnyWX189uXvzeefnv1yWXvrvmSy88efnzeefnt+SyX1vn1tz+Xvkzfy8nzebz+vn18mfnyWVy98+ty9ufy98kyXmfn +7:JJJJOJxOJxOJxOJxJ+c6+b+WXvk+vmb8+b+Sn1vkXyWX18+ub9y98b+ubz9+Sy99ufy98zz8nSnzeefvnyWS+vn1uXr8mfy8nzbzz89vyWSy+vn1uXvnkz+Xkz+Xn +7:JJJJOJxOJxOJxOJJ+fy9+b+V8nzc+SX1vkz8+Sy+vn1zft8z8Xzbz+vnySy+vn1ub+S9vkzfyXk+SyX18+ubz99y9z98zefnmXmfnzebz+vn18j+SWS+vn1ufyV9ufy98mSnjn +7:JJJJOJxOJxOJxOJxJ+vnfz+S+vnzefn1y98mXnzbz8+SWvn1ufy98mb8nzeefnt+SyX18+ty9z98mXmfnzebz+vnnyWSy+vnt+tzb9y9z98mfyWXnkz+Xnzebz+vnvyWWWXvk9uXv1tufy98kzfyXk +7:JJJJOJxOJxOJxJ+f18y8+d+SXkXyX1z9vknzeb+vnySy+vn1ufXkz8nzeefvnyWvi+tzfy9vkz+Xk+ebzz98nkmfnyyyWX189q8mS8ntzefvqv +7:JJJJOJxOJxOJxOJPyXn1fmfnyWvn1t8z8y8+WWXvk9z9y9z9+bzft+SyX18+ty98mb+Xk+bzef18+vnyWSy+vn18i+tz+Xtz+Xvkz8y8nzedfnyWSy+vnv1uXtz68mcz86yXk +7:JJJJOJxOJxOJxOJx+fXzef18+S+t8nzb+SX1vknz+S+tz+Xvkz+Xnzzzz989vyVy98mfyXk+bzf18+uSXtz+XvmS8z8XyWWS9vn1zbz99ub+S9vmbc8mb+S8nyWWWXvntX1tzfy9vmbzfnmS8z8y8 +7:JJJJOJxOJxOJxOJxOJxJPvz6+fy+vn1Xmfy8+b+S+t8nyWX18+ub9y98zfmXnzef18+Sy+vn1ufy98mfXzeefnt+uSy99ufy98yWXnmb8y8+Syy89vmbfky8+b1zfvmb8+SyWX18+tXn1tz+Xt8mXmfmXn +7:JJJJOJxOJxOJxOJxOPfX1z98+b+S+t8nzzz89vyyy89vkz+Xnzmfntz+Xvzeefnt+SyX18+ty9z98mXk+b1fmfnyWWXnv1ud6vkyXk+bzef18+vnySyy98+tz9yXufvkz+Snkz+Xn +7:JJJJOJxOJxOJxOJxOJx6+fvy+vnzfy+t8nzfyXvzzz89vyWXvky8+bz+vnyyy98ntz+XvzeefnvyWWXnv1ud68mb8y8+eeefnt8mfnyyyy898mXnty9z9+SyWX18+ty98+tzefvtz+Xvky8zfmXn +7:JJJJOJxOJxOJxJPz+Xvzb+t8k+bzf18+U9vzed8+SyXv1uft8mfmXnyyyS89uXvmbfmXky8+beb+t8+SyWX18+vn1uXub9vkzz8nX +7:JJJJOJxOJxOJxOJx+fXzz98nz+vkXzc+Sy8+tvknzzz98nyyXk9ufvzeb+vnySy+vn1ufy9vkz+Xk+bef18+SyX18+tV8mb+Xk+bz+tz98+SWWXvnkz+Snkz+Xn +7:JJJJOJxOJxOJxOJxOPnyXnzfyXt+bz8+tXkz6+WWXnvknzefnyWX18+tz+Xvkz+XnzeefnvyWS+t8+tz9y98mefnXzeefnvyWWXnt+tz9y98mb+S8nzebz+vnnyWWWXnt8+tzefvuS9z98mfy8mfy8 +7:JJJJOJxOJxOJxOJxJJPzfWX18+b+S+vk+bny+tvkz6+bz+vnyWX18+ty98mfy8+eb188nyyWX188ntS+bzz89+WWWXnt8i9ufuXvzeeefnt8mXn1yWS99uXufviyWXnkz+Xnzzeefnt9tz9+Syyy89vky88mbz88mfy8 +7:JJJJOJxOJxOJxOJxJ+X1vk+evnU+bfyU+tvknyS+ub9y98mfy8+bz+vnyyy98ntz+XvymS8ntz9y9+bef18+uXrz98yWX188mfy8+bzzz89vnyWSy+vn1uXvn1tufy98mfy8mfy8 +7:JJJJOJxOJxOJxOJxPz8+S+r8fzef18+S+vkz8+eb9vWS+t8nzk+WV8ntzvV+befvyWWXvn1ufyXt8mb+Xk+bzef18+tfkfyWSy+vnn1uSy99z9y98kz+S8nzbzz89v1tyXufvmSWXnmbfmS8z8 +7:JJJJOJxOJxOJxOJxPi+fy+vnzef18+S+tfkn1z68zfmXnzef18+Sy+vn1ufy98mfy8+ebz+vn1ufy98mfnWSy+vn18mXnzeefvnyWS+vk+ty9z98mfmXnzebz+vn18j+SyWX188+tz+Sy99ufy98mXmfmXn +7:JJJJOJxOJxOJxOJ+b+Xt+b+uXvi+eefvk+WWXvnt+eefnt+WWXnt8mfy8+eeefnvky8+Syy989ufuXvyWS+t8+ubz99ufy98zefnmXmfnzbzf18nyWSy+vnv1ubvy9ufy98mfmS8z8 +6:JJJJOJxOJxOJxOJxPy+vnz+Xk+fy+tz68+bz8+Sy9+ty98mfnzc+SWXn1ufy98mfy8nzzzz898mfy8+WWS989ud6vzebz9+vn1ufyWXvtz+XvmSy+vnjmfnzbzz89+Syyy89vky8+tzd+Xtz+Xvkz8mfy8 +6:JJJJOJxOJxOJxOJxPXy+vnzefvyX1uXvk+ufvmS8nzbz8+Sy+t8n1ub9XkefnzeefnvyWS+vn1ufq8mb+Xk+ebzz899ufuXvyyyWX188mXntV8mbnkz+Xnzebz+vnvyWSy+vn1q8+tub+Xt8mbz8+Xky8 +6:JJJJOJxOJxOJxOJxOJ8+X1fnzc+S8j+S18+t8z8y8+bvyWX18+tz98mfnzzmfntvmSXkz+Xnzzzz898nyyyy898mXntz+Xt+bzef18+vnyWWWXvk9q+tz9y9z98jmfnzeb18+tz98j+S1WXvmS8n1uXtz+XvkmfmXn +6:JJJJOJxOJxOJxOJx97k+fyV+tXknyX1z9vmb8+befvyWS+t8+tz9vkz+XnySy8+tV8zefnmS8z8+bzzfnvyWWWXvk9+tz+Xtz+Xvky8zfmXnzeeefnvkfyWWWXnt8n1ubvuS9z98kz+Xn +6:JJJJOJxOJxOJxOJxPnt+bfyV+t8+eefnt6yX18+dzfvyyyy98nt8mfi+bzfnySy8+tufy98mfyXk+eeeefvnvkz8nyyyWX1898kntz+Xtz+Xvzdb+SyyXk9+tz+Xtz+XvkzefnmS8z8 +6:JJJJOJxOJxOJxOJxOJ+fvz+Xvz+S+t8nzz89XzefnyWX18+tz+Xvkz+Xnzef188yXmfnzeufvj+SyX1vn1tz+XvkznU+eeefnvnySy+vntz+S9vzbzf1vnyWuS9viy8+tz9ufy98mefk6mXn +6:JJJJOJxOJxOJxOJxOJJ7+fy8+fy+t8nzzz98nyyy989ufvzef18+uS9vmS8z8+ub+Sy99ufXmbnyXkz+Xnzzzfvkz8+SWX189ufuXvzebz+vn18j+SyWX18+tXky8+tz9y9z98kz8y8+b1efvmb8nyyWWXvk8kXtyWXvtf +6:JJJJOJxOJxOJxOJxJ8+X1vmfnzz+vnWX18+eefvnuXufvzef18+Sy+vn1ufy98mfy8+bzf1vnyWWXnv1uXufvkc+Syy98nubfuS9z9+bzef18+vkz8+WSyy98nkmfy89ufyWXvtz+Xv +6:JJJJOJxOJxOJxOJx6+fyy89+fyX1vk+bz+vn1ufXmXmfnzzfk9y9z9+SyX1vnmbz88y8z8+bzz98nySy+vn1uS9z98kz+Xnzebz+vn1r8+Syyy989+ty9z9y98mfyU8mfy8 +6:JJJJOJxOJxOJxOJxJ+Xvy+t8nbz+vnzc+Sy8+vkz+XnyWX18+ub9y98zfmXnySy+vn1z9yXufvkzfmXnyWWXnv1zefvuXufvmbz88yXmfnzzmb89+Sinky8z8y8 +6:JJJJOJxOJxOJx+fvzftvzzfnynvzeb8+qXkz+Xk+bzfvySy9+tz9y98kz+Xnzeec98+SyWXnv1uXub9vkznWS8n +6:JJJJOJxOJxOJxOPb+fyy89vzefvyS+t8k+bzz89+SX1tz+Xvkzfnzzef189ufvyymXntXkz8nzeeb8nv1yWS89z9ufvmXmfmS8z8+ubefvySy99ub+S9vmbnyWXnky8z8 +6:JJJJOJxOJxOJxOJxOJxJ9+fy8+X18+f1y98y8+b+uXvmXnzzz98nyyy98ntz9+eefnt+WWXnt8mfy8+eeefvk9ufvWSy+vn1uXvkz+Xnzbz+vn1ub+S9vkyXmfnzbzf18nyWSy+vn18+tzd+Xtz+Xvky8zfmXn +6:JJJJOJxOJxOJxOJxJOJ67nz+q8+ed8+U9q+Sy+vn1uXvmb8nzef18+uSXufuXvmS8c+S1Xn1zefvuXufvky8z8+SyWX18+vn1zeefvk9y9zfuXvky8zfmXnzeub9vmb8+tuS9z98ySy88mfyXk +6:JJJJOJxOJxOJxOJxJ+vnz+X1vk+b+S+t8nzzz89vkz8+bz8+Sy+vn1ufy98mfy8+ebz9+tvkfWSy+vn1t8mXnzzef188mfnyWS+t8ntzfuXvzbzz89v1ySy99z9ufy98yWS88zefnmXmfn +6:JJJJOJxOJxOJxOJxJ+fny9+f1vi+f1y98y8fzznt6y+t8+bef18+Sy9v1uft8mb6y8+bzzvnvyWWS98n1ufyV9t8mb8y8z8+Syyy98nv1ubz9+Xtz+Xvky8zfmXn +6:JJJJOJxOJxOJxOJxOJJx78+fnz+S+vk+eefnt8mfnzz+vk6yy98nzr+WS9vkz+XnyWuXvi+rzft8zb8y8z8+bzz98+qyXt8mfyXk+bzzz98nvyWSy+vn18i+tz+Xtz+Xvkz8y8z8 +6:JJJJOJxOJxOJxOJxOPXz6+efnyy89vzz89y9+Vy98z8y8+Sy8+rz98mfy8+bzz98+uSvty98yWXnmfmXnzeb+vn1yWXvufuXvmSy88z8y8+SyWX18+vn1ueb9vVy98zbz88y8zfmXn +6:JJJJOJxOJxOJxOJxJ+Xnzfynvzb+WS98nzt+Sy98mfnzzz89vyuXvkz+Xnzbz+vnyWWXvk+tufy98mb8y8+ubz99yXufvmbz8+Sy+vnkz+Xnzzeb+vn1uft8mfmXnVyWXvtv +6:JJJJOJxOJxOJxOJxJ+S+vnz+WXnvzfyXkz+XnyWXv1z9y98zfi+WSy88i9zefvuS9vzeb+t8nySy+vn1uS9z98kz+Xnzebz9+vnyWSy+vn1vn1ufuXufvkz8yXmfnzbzz98+SWWXnt+ty9ufy98mbny8mXn +5:JJJJOJxOJxOJxOJx77fznWXvz+SX1vk+eb+t8nWS+t8nzzzz89vkz8+Syy899uXufvzcfyWS+vn1ufy9vky8n1uSy+vntXmSnky8 +5:JJJJOJxOJxOJxOJxJ+b+X18+efnuXvzb+Sy9+tvky8+bz8+Sy+vn1ufy98mfy8+eec98mfnyyyy898i9ufy9vyWWXnv1z9y9z98zd8yXmfnzebvvyWSvvtz6+SVvtVX +5:JJJJJOJxOJxOJxOJPz8+d6y+vnzfyX1vk+bf1yXufvmXk+ec9vyyy89vkz+Xnzb18+SyX1vn1ub9y98mb8y8+bb8kz8 +5:JJJJJOJxOJxOJxJ+Xvz+VXknyyy898z8+bzf18+Sy8+tz+Xvkmfnzbz8+SyX1vn1tz98kz+XnuSvrufv +5:JJJJJOJxOJxOJxOJxPz8+fy8+b+S+vk+b+X1vnzefnyWvnkXzzft+WWXnt8mfy8+uSy99zfuXvmbz+vnyS8mfy8+br+SWXv1ty98mb8n +5:JJJJOJxOJxOJxOJxOJ8+fy+vnzfyX1vk+fyX1vky8+bz+vnyWXv1uXvkfzef18+X1ufy98mfy8+bzz89+Syy98+tz+S9vky8z8+SWXn1z9ufvmbz+vnkz+Xnzbt9tf +5:JJJJJOJxOJxOJxJPy8+ftvzvyyy89vknzb18+SyX18n1t8ky8+edfkfySXtz+S9vtub+Xv +5:JJJJOJxOJxOJxOJxOPXfzz8+S9+fyS+ty98mfnzefnyyy89vkz+Xnzeb9+uS9ufy98mXmfnzeefnt+WWWXvnvky8z8+qUy88mXmfi+SU8mSnkX +5:JJJJOJxOJxOJxOJxJ87+Xt+bvyU+tXkXzef18+tz98mfnzzzz98nt+WSy+vntvkWXnzbz+vnySX1uefvV8ky89tr +5:JJJJJOJxOJxOJxOJx8+b6vzf1y98+eb9+Sy+vnkXzzz98nyyXk9ufy9+etvmfnSyX18nyWS+vk+tzfy9vmbz88mfy8+eeec98j9r+WSV9uS9vkj +5:JJJJOJxOJxOJxOJxJ+Xvzz89Xzef18+WXvkz8+eb9+WWXnt8mfy8+bz+vnyWX18+tz+Xvkz+XnyWS+vk9ub+Xt+SWXv1zefvuS9z98zefnkz8+StX1tXmbzfnkf +5:JJJJOJxOJxOJxOJxJ+S9+fy+vnzd+U9vzzft8y8z8+bzf18n1yV9z9y98yXkz+Xnzef18nySy+vn1ufyXt8mS8z8+bdvSWU97dt +5:JJJJOJxOJxOJxOJxJ7+Sv18nyWXn1fkfyS+ub9vmfnyWU9+ub9y9vmbfmXnyWS+vk+ub9y9z98zb8mfy8+bzd9+SVy9+tz68mbnkXbzd9r +5:JJJJJOJxOJxOJxOPfy9+eb98XzefvyU+tXknzzefntXyyyXnvkz6nzdfySy9+tyXufvkzfyXk+ubz99tXjcn +5:JJJJOJxOJxOJxOJ8+b+q8nyS+ub9y98zfnzefvyWX18+tz+Xvky8+bzf1vn1XmSy98c+uSy99ufy98zc+SXkz+XnySv1qy9vkkX +5:JJJJOJxOJxOJxOJxOPfyXvzz9+S8+bfyWXv1r8mXnyV+ub9y98efnyWS+vn1ub+Xt8zefnmXmfnzcfyWU9+tz+Xt8mS8nySt+tqXkSntqX +5:JJJJJJOJxOJxOJxPS+f1vnzj9vzf1yXufvmS8z8+SWX18+ufuS9fmbz88S+bef18+tufvkmfn +5:JJJJOJxOJxOJxOJxJPz8+vi+ed8nyXvyWXv1zfuXvmb8nzef18+Sy+vn1ufy98mfy8+bzf18n1ufy9vkyXmfnyWWXnv1ub+Xt8inyWWV899q +5:JJJJOJxOJxOJxOJxPz6+ufvk+efnuXvzefnyWX18+tz98mfnyWX18+ub9y98efnzeb+vnyWS+vn1ufy9vkz+Xk+czfmXnyntWXvzb1z98nyWUnty9+trz98mXmb8X +5:JJJJJOJxOJxOJxOJPnz9+bfyX18mXnzevnyWXn1t8nzef1vnyWS+vn1tz+XvkznXzeb8+uSy99uXvmSnmfmXnUSn +4:JJJJJJOJxOJxOJxOPz67+t8y8+bvyynvn1z+Xt8mfXyWU9+rvmbz98j6WXt +4:JJJJJJOJxOJxOJJ+b+S+t8+d+WXvk+bfyyy98ntz9+bz+vnyV+tz+Xvky88zc8j +4:JJJJJJJOJxOJxOJx6+fk+d+WXvk+Sy8+ufuXvmb8y8+eb9+Sy88i+bz99r +4:JJJJJJOJxOJxOJxOJ68+efnyy89+bz8+Sv1uXvkfzefnyuXvkz86yXk8Sy8 +4:JJJJJJOJxOJxOJx+fvzvy8nz+S+vk+bv1y9vmXj+b+Sy+vn1uXvkz8+Sy88i +4:JJJJJJJOJxOJxOJx66vzfyX1vk+uXufvmfy8+bfyuXvky87zfk +4:JJJJJJJOJxOJxOJJ6+eb98y8+efvyy98nzefvyWXv1ufvkfzzntz9+VyXt8mfi +4:JJJJJJJOJxOJxOJxP18+fvyX1z98z8+uXvmXnzef18+Sy8+tz+Xvkz8+Sy8+ub9y98mXn +4:JJJJJJJOJxOJxOJPz8+X18fzvyWX188mXnzc+Sy+vntz+Xveefvk +4:JJJJJJOJxOJxOJxOJJ6+f18+b+X1vk+WXnufvzzz98nuS9z9+bz+vn1yXufviy8+Si8in +4:JJJJJJOJxOJxOJPz9+fyX18k+b+S18+t8+bz+vnyWvk9+bz+vn1t8j +4:JJJJJJOJxOJxOJxJPz+Xnz+S+t8nz+WXvk+bz9+Sy8+t8k+bz9+Sy+vn1ufy98mfy89tX +4:JJJJJJOJxOJxOJxJ7+d+XnzzfnVvzefnyS+tz+Xvnzr+SXky88iX +4:JJJJJJJOJxOJxOJxPz6+fnzefn1Xk+eefvnWXvzd+Sy+vn1uXvkz8+Sy9+tV8kX +4:JJJJJJJOJxOJxOJJ6vz+X18+WXntz+Xv1zfyXt8zfmXnzef18+Sk8mfi +4:JJJJJJOJxOJxOJx6+d8+fy9vzzz98nWS+vnzef18+Sy+vn1ufy98mXn1yXtXmSnkX +4:JJJJJJJOJxOJxOJPy8nznt9z9vzef18+uS9vmXk+bz+t8+WWXk9q8mfn +4:JJJJJJJOJxOJxOJx97+fyX1vnzb+S+tXk+bfyWXn1ufy98k+bvyS+tr8iX +4:JJJJJJOJxOJxOJxPy9+fy+t8+r8z+XnzfyWX18+ty98k+bz+vnyWq8+ty9fkz+Xnzdf1r8jf +4:JJJJJJJJOJxOJx9+bfyS+t8nyV+tXkz+XnyV9zfuXv +3:JJJJJJJJJOJxJ+b+X1vnzznvyU8mfX +3:JJJJJJJJJJOJxOJPvz+S+vnb +3:JJJJJJJJJJOJxOJ7+uXvnyXn +3:JJJJJJJJJOJxOJ+S+vny+r8z88j +3:JJJJJJJOJxOJxPzfvzk9+Snmfi6X +3:JJJJJJJJJJOJxOPvznXk +3:JJJJJJJJJOJxJPzfy+t8nv +3:JJJJJJJJJOJxOPz+t8+c6nzd6V +3:JJJJJJJJJJOJxOJPvzfy9+Xmfn +3:JJJJJJJJJJOJxOJPXz9+ufvk +3:JJJJJJJJJOJxOJ6+b+t86V +3:JJJJJJJJJJOJxOPXz+Xvzz89v +3:JJJJJJJJJJJOJxOJ9+f18+fX +3:JJJJJJJJJJOJxOPzfnz+Xt+WV8nt +3:JJJJJJJJOJxOJJ+fy9vzfyX1r8nbv +3:JJJJJJJJJJOJxOJPfyXvyX1vn +3:JJJJJJJJJJOJxJPz6+b9 +3:JJJJJJJJJJJOJxJ+fy9+b6n +3:JJJJJJJJJJJOJxOJ8+fy9+fv +3:JJJJJJJJJJOJxJ+b+t8XyX1z98n +2:JJJJJJJJJJJJJ +2:JJJJJJJJJJJJJP +2:JJJJJJJJJJJJJJ +2:JJJJJJJJJJJJOJPX +2:JJJJJJJJJJJJJP +2:JJJJJJJJJJJJOPX +2:JJJJJJJJJJJJJP +2:JJJJJJJJJJJJJ +2:JJJJJJJJJJJJJJ +2:JJJJJJJJJJJJJP +2:JJJJJJJJJJJJJJ +2:JJJJJJJJJJJJJJP +2:JJJJJJJJJJJJJJ +2:JJJJJJJJJJJJJP +2:JJJJJJJJJJJJJP +2:JJJJJJJJJJJJJJ +2:JJJJJJJJJJJJJJP +2:JJJJJJJJJJJJJJP +2:JJJJJJJJJJJJJ +2:JJJJJJJJJJJJJJ diff --git a/src/main/resources/trees/dtbop/jo_codes/mega_umbran.txt b/src/main/resources/trees/dtbop/jo_codes/mega_umbran.txt index bf00f795..62d8ab4e 100644 --- a/src/main/resources/trees/dtbop/jo_codes/mega_umbran.txt +++ b/src/main/resources/trees/dtbop/jo_codes/mega_umbran.txt @@ -1,77 +1,140 @@ -2:JJJOJxOJxOJxOJJPvy+fvy+fvy+fvynvy9+fv -2:JJJJOJxOJxOJxJJ7vy+fny+fny+f09+Xz86 -2:JJJOJxOJxOJJxOJJ8+Xz8+Xz9+X09+Xz+nvz8+f09 -2:JJJOJxOJxOJxJJJ+fvyvenvynr+V+fny+nvy+f09 -2:JJJOJxOJJJJxOJ7+d8+Xvy+nvy+f09 -2:JJJOJxOJJxOJxJJ+i9XXXvz9+fn -2:JJJJOJxJOJxOJJ+XvXXff -2:JJJJJJJOJxOJxJ776+Xz9 -3:JJJOJxOJxOP17+vzfX0j+t+b6X0nzvWvS+ki+t+b0fvS16n -3:JJJOJxOJxOJxOJxJPn0Xt+S+b+k9vyU+bv0i9r+b09+mS8fuS9fyWnv0mXb9q+S09+mbni9vyV+bntb -3:JJJOJxOJxOJxOJxJP0nvyXz+nvy+b+k9vyV+bn09uXfyWnvzd+kXtXyUnzd9uXfzt8mXfzc+ky79r -3:JJJOJxOJxOJxOJJPy7+Xzf09v0yXzfnuXz9+Svzc+ky79q+S09+nty7+bnkfyV+f0i9q -3:JJJOJxOJxOJxOJxOJ7+Xz8+f0nq+Xz+nt+WXvzz9vk+WU9+bnky7+S+b8i+bvtXyVvzc8j -3:JJJJOJJJxOJxOJ+X09+S+f09vyXzf0nvb6 -3:JJJOJxOJxOJxOJxOPz89+Xz8ny+b+k9vyWnvzf09q+Snzd+kft+b09+kft+Snzd8nSn -3:JJJOJxOJxOJxOJJxPz8+Xzf09+S+b+nvyU+f0ntXyV+bvtf0j9SvyV+bvtXyV+b09+kfty7 -3:JJJOJJxOJxOJxOJJ+fnz+i9+S+efnt+WV8nzz89q+Sv0mXft+Vq8i+SvtX -4:JJJJJOJxOJxOJxOJ+Xvy+f09+Xzz98nyXzf0nt+Xzf0nt+Sy+nvzef09+kz89ufvy+mb8y89zfuXv -4:JJJOJxOJxOJxOJPyy97+S+b+k9vzf0XuXvyWnvzd+ky+fnty+fvyWX09+bv0mXz89ufvyWnvzef09+ky+fnty7+SXzd+ky89uWXvd -4:JJJOJxOJxOJxOJxJPy+f09+S+b+k9vy+f09vyy9+efvk+Sy+nvzef09+ky+fnty9+Sy+nvzefn0mXfty+fvyWX09+b0nt+kj9uXr+Snzc+ky+fntuXf -4:JJJOJxOJxOJxOJxOPfnznv0y+fnq+S+b+k9vyWX09+bz+nv0mXntz9+Sy+nvzenv0mXnty+fvyWXnzb+kXvyyXk7bn -4:JJJOJxOJxOJxOJxJPy+f09+V+d8nyy8+b9vyXzf0nt+Sy+nvzef09+ky+fnty+fvyWX09+mb8nufq+Synt+bnkS+bvtyXf -4:JJJOJxOJxOJxOJx+Xz+nvy+fk+b+mXnq+S+j9z9+Xzefn0mfnty9+Sy+nvzenv09uXz9+WSnkXzzc8j9ufvyWXnzb8i -4:JJJOJxOJxOJxOJx+Xz9+Xnzf0y89y9+S+b+k9vy+bz8+ky+fnty+fvyWX09+bz8+kz89uXz9+SV9vcn -4:JJJJJOJxOJxOJxOJ+fny+nvy+efnvy+b+k9vzf0y89XyWX09+b09+ky+fnty+fvyWX09+bz+nv0mXz89uXz9 -5:JJJOJxOJxOJxOP18fz+t8Xzz8nyXt+bfyX1ufq8mfy8nzer8fyWWXvn1uXvkz+Xk+SyWXn18+ubd9y9zfuXvmbfmXmb8y8+bzj9+Syyvk9+tzt6vkzfmS8z8 -5:JJJOJxOJxOJxOJxOPnz+nt+S+d8+Sy+nv0zfnub9y9+S09+mb8y8z89zb9q+SWXvzeefvn09uS+ft+Syy98+bzf09+ky+fk9uS+ft+Syynvnzebnn0mXz8ntyV7b+SyWnvnzbn0mXzc89uftf -5:JJJOJxOJxOJxOJxOJJ+Xfy+nvy+b+nt+bf0yXk9yXufvyWS+k9vz+kz8y89uft+SyX09+bzz89v0mXzfk9uXt+S0XuXvzbf0k9ufuXvyWWU98+b+k9uSvzft+bzd8+kfv -5:JJJOJxOJxOJxOJxJPy+fny+efnvyS+b+kntvyWX09vzefv0ky+fntz9+SyX09vzef09+ky+fk9ty+fvyWS+nt+benv0kz89ub9y9+Sy8+bzc+knt+ky89tfySV+b8mXmfi -5:JJJOJxOJxOJxOJxJ7+S+mb89t+mS8z89yvfzef0nv0yXk9y9z9+SyX09vzeefnv0mXz8ntuXz9+SyX09+br+ky8ntt+SUnkiXynt -5:JJJOJxOJxOJxOJxOPny8+Xmfk+WS9+b8k+SyXvzef09+kyXz89uXd+SyX09+bzf09+ky+fnty+fvyyWXvty7+bzf0nt8kz8+WS0nv0kXty9vbef0nt+Snzc+ky8i9uXtX -5:JJJOJxOJxOJxOJxPvy7+Xzc+ntfySXzeb9v0mXz89+Snzed8n0mXmfnty+b9+bb+mSy88mXz89yV9z9y9+Syyvnvzeed8nt+kyU+fnty9z9XyWSvvzbf0k9tS -5:JJJOJxOJxOJxOJxOJ6ni+f09XyWXnzef09+kntz9+X0ftuXz9+Syy89+bzf0nv0mS8z89uXz9+SyXvzeefvk+ki9uXb+bb8j+Svz9q -5:JJJOJxOJxOJxOJxOJ+fny7+Sn09vy+bv0j9vy+bzf09+ky7nvyS09+bv0mXk9ufuXvyyyXt8nebz+nv0j9t+bzd9+kmS89tvyV+bb+k9tv -6:JJJOJxOJxOJxOJxOJPy+fvy+f09+WXvef09+X0nufvyWX09+bz+nv09uXz9+Sy+nvzenv0mXz89ufvyWS+nvzeefnt+ky+b8nty9z9+Syy89+bef09+ky+b8ntyvefvyUXzeb+nv0mXz8ntyXz9v -6:JJJOJxOJxOJxOJxOJPXy+f09+S+b+k9+Xzf0nt+Vy9+bz+nvky8+eefvk9yXufvyWWXvk+bzf0nv0ky+fntyXz9vyyyy989uXvzzzz989ufvky+fk+SyX09+bzz89+ky8z89uXz9v -6:JJJOJxOJxOJxOJxOJPvy+nvyX0z89z9+S+b+nt+Sy9+f0mXz89t+Sy+nvzef09+nty+fvyWS+k9vzeb+nt8mfmXnyWS+nt+bzf09+ky+fk9ufuXvyWS+k9+bef09+kzfmXnty9z9 -6:JJJOJxOJxOJxOJxJPfyXz+k9vzb+mXnt+WWXnvzzft8mfnyVX0mS+fnub9vyWS+nvzeb+nv0mXmfnty+ft+SyX09+bzf09+ky+fk9uXz9vyWSy+nv09+bzef09+nv0mXz8mXz89uXz9uXz9 -6:JJJOJxOJxOJxOJxJ+Xzf09+Xz+k9+Svzefv0mXfvyWXvzefn0mXnty+fvyWXvzeefnv0ky+fnty9z9+Vy9vzzzz989ufvkyXz8nyWS+nvzeb+k9v0inty9z9+bzznt8j+mSU8mS+fk9yWS99uXufv -6:JJJOJxOJxOJxOJxOJPy7+fvyXzf0nt+S+f0nt+Sy8+bz+nv0mXz89+Sy+nvzf0mXz89uXz9+SyX0nvzej9f0mfmXnty9z9+SyX09vzeb+nv0mfmXntz9y9+SyX09+bef09+ky+b8nty+ft -6:JJJOJxOJxOJxOJxOPy+fny+nvyy8+efnt+U+efnt+Xzefv0mXz89uXfyyy89vzzft8k+SyX0nvzeefnv0mb8y89uXz9vyWS+k9+bzf0nv0ky+fnty+ft+SyX09+bzf09+ky+fk9uXz9v -6:JJJOJxOJxOJxOJxOJPXyvz8+Xzf0nt+Sy8+mfk9t+Sy+nvzefn0mXz89ufvyXzeefnv0mS8ntyXz9vyyyy989q+eeefvntfky+fk+SyX09+bzz98+ky+fk9uXzft+WWSy+nvntyXufvzzzr89rvky+fky+fn -6:JJJOJxOJxOJxOJxOJPy7+fvyXzf0nt+S+f0nt+Sy8+bz+nv0mXz89+Sy+nvzf0mXz89uXz9+SyX0nvzej9f0mfmXnty9z9+SyX09vzeb+nv0mfmXntz9y9+SyX09+bef09+ky+b8nty+ft -6:JJJOJxOJxOJxOJxOJxOJxPXz+vnzfyX1vk+S+ufvmfnzef18+Sy8+ty98mXnzzvk+WWXvk9ufy9+SyX18+ubfuXt8zb8y8z8+bzf1vnyyyy98nty98mfmXnzeeefvk9+Syyy898+tz+S9ufy98mXmb8y8+eeeefnvkftz+XvmSyX188mfy8nzbzef189r+SWWWXvk9+tyV9zd9y9z98kmS8z8+bbzf1vk+SSyX1vk+ttzfyXt8kmb+S8n -6:JJJOJxOJxOJxOJxJ+fnz+vkz6+ef1861Xnznyyt89vzec9+Syy98k+tz9V8mfnzbzf18+Syynvn1uSvufvkzfUXzzzzznt89t8j6yWSy988mXmfnzbzef18+vnySWS+vk+tzd9uS9z98mbk8mS8z8 -6:JJJOJxOJxOJxOJxJ+efvXz+XnzfWX18+befv1y9zfq8y8nzzdvk+Sy99uXtz+Xvzeeb89+tz+S9t8yWXnmfmXnyWSy99v1rz98mbvy8mXnzebzf1vk+vknyWWWS98k9ty99tub9y9 -6:JJJOJxOJxOJxOJxPz+t8+bfyX18j+X1z9t8j+bv1yXufvmXknzeefk9t+S18U+tVXkz+Xkfzebz9+t8+SyWX18+vn1uXufq8mcz86i+bzeb+t8+vnyWWWWXnvntX1ufuXub9Xkz+Snkz+Xk+bzeb+t8n18nyWSuXvkWXn1ufy9uS9z98kz+Xkz+Xn -6:JJJOJxOJxOJxOJxJ7+X09+Svz+ntvyWX09+bz9+ky+fnty+fvyWS+nv0zefnky+fnubvuXufvyyyy989+eeefvnty+fvky+fk+Syy89+mbz88yXmfnubz99y9z9+Syyy989+bzef09+kz89+kyU8mXz89uXz9uXz9 -6:JJJOJxOJxOJxOJx6Xy+b+k9+SXzb+kXtvyWX09+bz+nv0mXnty7+Sq+bzz89+kzfmXntz9y9+bzz89v0yWXnmb8y89ty+fvyWS+nt+bzf09+ky+fk9ufuXvyWWWXnt8+bzef09+nv0mXz8mXz89uXz9uXz9 -6:JJJOJxOJxOJxOJxOJPy+nvy+k9+WXnzz89vyWX09+ec98mXz8+Sy+nvzef09+ky+fntz9+WSy+nvky8+bzf0nvtyXz9vyVXzeb+k9+kyXj9uXz9vyyWX09+ky89uXz97zef09+kz89+SyWX09+ntXzeeefvnv0mXzc8mXz89ufuXufv -6:JJJOJxOJxOJxOJx+Xny+c9vyV+bf09+Sy8+eb98mXfySy+nvzefv0mfntz9+Syy98nzeb+k9+kk9uS+ft+SyX09+bzf09+ky+fk9uXz9vyWSy+nv09uXvzeeefvnv0mXzc8mXz89ufty+fv -6:JJJOJxOJxOJxOJPy+fvyS+f0k9+S09+f0mXfty+fvyWS+k9+bzfn0jnty+b9vySy+nvzdf0mS+b8ntz9y9+Syy89+bzz98+kyXz8nty7z9+bzef09+nv0yWWXvnmfintz9yXufv -6:JJJOJxOJxOJxOJxJ+Xfyy8+b9+Xz+kftfyWXvzefn0mXftXyWWXvnzeefnv0mXz8ntuXz9+SyX09+bzf09v0mXz8nty9vyWS8+bzf0nv0mXmfnty+fvyWSy+nv09q+bzzz898+ky8zfmXntzd9y9z9 -6:JJJOJxOJxOJxOJPy+fvyS+f0k9+S09+f0mXfty+fvyWS+k9+bzfn0jnty+b9vySy+nvzdf0mS+b8ntz9y9+Syy89+bzz98+kyXz8nty7z9+bzef09+nv0yWWXvnmfintz9yXufv -6:JJJOJxOJxOJxOJxJ+XvyXznt+Sy8+bz8+ky89uXz9+Sy9+bz+nv0mXz89vyWS+nt+bzz98+ky8z89ty9+SyX0nvzeefnv0ky+fnty+ft+Sy+nt+bzz98+ky+fk9ub9y9+SyWX09+nvzebz+nv09+ky+fky+fnty+fty+fv -6:JJJOJxOJxOJxOJxJ+fny7z8+SX0z89b+bz+nv0mXz89uXz9+SyX0nvzeb+k9+kmXnty+ft+Syy89+b0fr+kyXz8nty+ft+bef09+kyXzfnuSy99zfuXvyWSy+nv0i9+bzef099r+kzefnmXmfnty9z9y9 -6:JJJOJxOJxOJxOJxJPy8nynznvyXzzz989uXvyyvnzef099uXz9+Sy+nvzeefnt+ky+b8nty9z9+b0fufv0yS8z8y89yWXvtz9+SyX09+bzf09+ky+fk9uXz9vyWSy+nv0i9+bzzz898+kz8y8z89uXzd9uXz9 -7:JJJOJxOJxOJxOJxOJx9+Xz9+fmXnyXzf0nvyXzefvtvzef09+mS8z89yXr+SyXvzemfnt9uXufvyWS+nt+bef09+ky+b8ntzfuXvyyyy898mXnzzzz898mfnty+ft+S0WXnqy9+bzef09+nv0mXz8mXz89uXz9uXz9 -7:JJJOJxOJxOJxOJxOJPz8+f09+S+b+k9vyWnvz+kXtz9+WS+k9veb+k9vyWS+nvzej9f0mXz8nty+ft+Syy89+bzf0nv0mS8z89uXz9vyWWXvnzbz+nv0mXzfk9uS9z9+SyWX09+nvzebz+nv09r+ky+fky+fnty9z9y9 -7:JJJOJxOJxOJxOJxJ+X09+WX097z8+Snzefn0mXz89vy+bz+nv0mfntz9+SyX09+bt+ky+b8nty9z9+S0XuXvzeefnv0mXz8ntuXz9+Syy98nzeb+nv0mfmXntyXz9vyWSy+nv09+bz+nv0mXz8mXz89rufv -7:JJJOJxOJxOJxOJxJPy8nynefvyXzf0mfnt+eb89y9vyWWXvnzeefnv0mXzfk9ufuXvyWWXvnzed8+ky+fk9uS+ft+bzz89+mSy88zfmXnuSy99z9y9+Syyy898+bzef09+kfv0mXmfmXntyV+fty+fv -7:JJJOJxOJxOJxOJxOJ+Xfzfvz+k9vyS+cftz9+Sy+nvzefv0mXz89vyyWX099uXvzzzz98nt8mS8z8+SyX0nvzeb+nv0mfmXnty+ft+SWX09+bef09+kyXzfk9uXufvyWSy+nv09+bzef09+nv0mXz8mXz89uXz9uXz9 -7:JJJOJxOJxOJxOJxPz9+S+f0nvy+bf09t+bv0mXz89vyWS+nvzeefvn0mXz8nty9z9+SyX0nvzbz+nv0ky+fntyvefvyWU9+bzf0nv0mS8z89uXz9vyWWWXnvnzebz+nv09+ky+fky+fntyV+fty+fv -7:JJJOJxOJxOJxOJxOJPvXy+f0nvyS+bf0k9uXvyWX09+eb98nyWWXnvzek9+kyXk9uXz9vyWS+nvzeefvn0mXz8nty+ft+Syy98+bzf09+ky+fk9uWXvd+Syyy898i+bzzz89vn0mfmXmfntyV+fty+fv -7:JJJOJxOJxOJxOJxOJx9+Xz9+fmXnyXzf0nvyXzefvtvzef09+mS8z89yXr+SyXvzemfnt9uXufvyWS+nt+bef09+ky+b8ntzfuXvyyyy898mXnzzzz898mfnty+ft+S0WXnqy9+bzef09+nv0mXz8mXz89uXz9uXz9 -7:JJJOJxOJxOJxOJxJ6+Xz+k9vzefn0y89y9+bz8+mS8nuS9vyWS+nvzeb8+ky+fk9uXzft+SyX09+bzf09+kync9uXz9vyWS+nvzeefnt+ky8z89uXufvyWSy+nv09+bzef09+ntf0mXz8mXz89uXufuXv -7:JJJOJxOJxOJxOJxOJ6+fnfyXzf09t+WS+k97zf09+bef09+kz8y89uXzfvyWS+k9v0mb8y89ub9y9+Syy98+bzf0nv0mXmfntz9y9+Sy+ntXzebz+nv0k9+kUXtz9y9z9 -7:JJJOJxOJxOJxOJxPz+Xk+c+WS89r+bz8+WS98+Syvn1tvmfk+b1fmfn1yXufuXvmSnkz8y8+SyWX188i+ubvuS9ufyXvmbfkzfy8+bzef18+vkfyWWU9uXvn1uftt8mXmfmXnzbebz8+tvkz8+S1SS8Sy8+ttzefvyS9ufy98kyWXnkz+Xn -8:JJJOJxOJxOJxOJxJPny+fvy+bvky8+bz8+mS8nuS9+SyX09+bzf09+kync9uXz9+bzf0nt+mSnky+fnuS9uXvyWSy+nv09+b0efnrv0mXz8mXz89uXz9uXz9+SyWX09+kXtXzeeefvk9+kmXmfntz9y9v -8:JJJOJxOJxOJxOJxOJPy7+Xz+nt+S+f0nt+Sy+nvzefn0mXz89uXz9+Sy9+bz+nv0mXnty7+Syy89vzej9f0mS8z89ufuXvzbz+nv0yWXnmb8nuSy99zfuXvyWSy+nvnzebz+nv09+ky+fky+fntz9yXufvyWSy+nvvzebz+nvv0kmXz89uXz9uXz9 -8:JJJOJxOJxOJxOJxOJPy78Xy+b+nt+WS8+eefvnvyWX09+bz+nv0mXnty+fvyWWXvnzeb+k9+ky8z89uXz9vzeb+k9+kmXz89ufuXvyWiy89WXvzeeefnvn0mXky+fnty+bvty+fvyWSy+nvvzebz+nvv0kmfntz9uXf -8:JJJOJxOJxOJxOJxJJ+b9+S+mfnufvyS+f0mXfvyXzefn0mXz89vyWWXvnzefv0mXk9uXz9vzef09v0mS+fk9uXufvyWSy+nv0nvzbzf09+kbnty+b9uXz9+Syyy989+bzef09+nv0mSnz8mXz89ufty7 -8:JJJOJxOJxOJxOJxOJ8n0y+fnt+V+fnyU+f0j9r+Sy+nvzzz89vky+fnySy+nvzeefvn0mfk9uV7z9+bzf09+mSXmfmXnuSy99z9y9+SyWX09+nvzeeefvnv0mXzc8mXz89uXz9uXz9+SyWX099q+bbz+nv0kzfmXntuXufv -8:JJJOJxOJxOJxOJxOPXyXz+nvy+efnt+Sy8+bz+nv0j9t+Sy+nvzb+ky89ufvyWWXnt+bzz89v0mS+b8ntuXz9+Sy+nt+bef098mXmfnyyyyy9898mXk+eebz+nvvkz8nty+fty+fvyVyXvzebz+nvn0mSy8+fky+fntz9y9z9 -8:JJJOJxOJxOJxOJxOPny+b+nt+b+mXnt+S+bf0mXftz9+Sy+nvzzft8mfnyWS+nt+bef09+ky+b8ntfyWS+nv0mXzfk9zefvuXufvyUS+bzef09+nv0mXz8mXz89uSy9+fty+fvyWWWXnvnzbef09+ky8mXz89uSvty+fv -8:JJJOJxOJxOJxOJxOJx9+XvzvmXny+efvnyS+bf0mXftvyWXvzefn0j9uXz9+Syy89+bzf0nv0mS8z89uXz9vyWS+k9vzeefnt+kzfmXntuXz9+SyWX09+kXvzeeefvk9+kmXzfk9uVy97t+bzef098+mSWXnmfky+fnuSyXvtuXz9 -8:JJJOJxOJxOJxOJxJ+nvy+f09+bz8+mXk9XyWX09+bz9+kz89ufvyWS+nvzeb+nv0mXz8nty7vyWV8nzeb+nv0mfmXntz9y9+SyWX09+nvzebz+nv09+ky+fky+fnty+fty+fvyWSy+nvvzeeefnvn0mXz8mXz89uXzd9uXv \ No newline at end of file +8:JJJJOJxOJxOJxOJxJPk+uXvmfnzb+uS9z98y8nzzf1vnSy+vnzzr8j9yWXvufuXvzzzz98ntz+XvyWWXvnky8z8+bzzz898+uSWXvub9ufy98ySy88z8yXmfnzkefnyyyyy98ntXkmfy89ufqv +8:JJJJOJxOJxOJxOJx9+bnyX18+bfy+t8nzd+S+vkfzefnyyyXnty98mXk+ubz9+S9ufy98yWXnjz8+bzef18+vkfyWWWXnt8i+tz9yXt8kz+Xk+bzef18+tfnySyX18n1uSvufuXvkkz+Xn +8:JJJJOJxOJxOJxOJxJ+f18y8+fy+t8+bz+vnyS+tz+Xvkfzef18+SXkz8+SWXv1ub+S9vkzfyXk+ebz+vnkz8+UyXk9uefvWXvzerz98efnySyX18+tyXtz+XvkyXmfmXnzeeefvnvyyWS+vk9uXt8mb+Xky8 +8:JJJJOJxOJxOJxOJxOJxJ77+b+WXnvzf1y98y8+bz9+Untz6+bz8+uS9z98yXmfnyWWXvn1zb9y9z98zefnmXmfnzeb+vnyWS+t8+tz9y98mfy8nzzzzz89vntufvyyWWXvk9uS9vkz8yXmfnzeeefvnvySyy98n1udz96uXvkzc8mfy8 +8:JJJJOJxOJxOJxOJxOOJ98+b+Xnzz8+WXnt6yy89+Sy+vn1efvmb8y8+Sy+vn1zfuXvkz+Xnzzzz89vkz8+WSy+vnky89uS9z9+bzf18nyWWXvn1ufuXvky8z8+bzzz98nvyWSy+vn18+tzufvVXky8mfy8 +8:JJJJOJxOJxOJxOJxJPz+vk+S8nzf1yXt8i+eefnvyyy898mfnzeefnt+Sq+ty9z98mXmfnUmXnyWSy+vn1t8+rub9vmbzz988y8z8y8+bzef18+tz98+SyWX18+vn1uXtz+Xvkz8mfy8 +8:JJJJOJxOJxOJxOJxJ9fz+Xk+fyU+ty98+eefnt+Svky8+eeefnt8mfXWqXinzeb+vnyWvmXn1ufy9vkz8y8+bzef188+SyWX18+tXn1ubfuXt8mfy8mfy8+bzefv1ufvkf1tyXufvkmfmXn +8:JJJJOJxOJxOJxOJxOJ+fXzfynt+WXnufvyWXv1ufXmfmXnzzz98nyyy98ntz+XvyWS+vn1z9y9z98zfkz+Xnzbz+vnyyWX188mfntzfuXvzebz+vn18+SSy+vn1ufyWXvtz+Xvkz+Sy88mfy8+bzzz98nvyWWWXvk9+tz+Xtz+XvkmefnWXn +8:JJJJOJxOJxOJxOJxJ+fi+b+X1vnzb+uS9vmXnzzz89+WWXnvky8+bzz98nyyuXvk9ub9y9+befvyyyy989ufvkzfy8nzebz+vntfyWSy+vn18+ty9z9y98mbz8+Xkz+XnzczfmXnuSyXvubz99V +8:JJJJOJxOJxOJxOJxOPXz+XvznyXv1z+XvmfXzzft+WWXnvkz+Xnzef18+Sy+vn1ufy98mfy8+bzf1vnyWS+t8+tufy98mfy8nzeb+vnyWS+t8+tz9y98mfy8nzbzz98nyUyXk+tub+S9vkkz+Xn +8:JJJJOJxOJxOJxOJxPzfnz+t8n1yXufvi+Sy+vn1z9Xmb8y8+bz+vn1yXufvkz+Xnzz9+SWX188jz8+bef18+Syy89+tzfy9vkzz86y8+bzef18+tfnyWSy+vn1uXvn1tz9y98mfy8mfy8 +8:JJJJOJxOJxOJxOJx+Xvzfy+vk+b+S+t8nzc+X18j+bz9+Sy+vn1ufvky8+ebz+vnkz8+S1XmXntV+bzz89+Syy89v1ufuXvkmfy8+czefnkz8+WWSy+vnty98iXttz+Xv +8:JJJJOJxOJxOJxOJxOJxPvnz+X18+b+S+t8+b+uXvmXnyWX18+ub9vkz+Xnyyy98nub9y9+bzz98+SWX18+tyXufvkz8y8+bzz98+Syy89+tzfy9vkz8y8+bzef18+vn1uSy99zfuXvmSyy98nmfkz+Xn +8:JJJJOJxOJxOJxOJxJ+b8XyX1z98+bvyWXv18mfnyWXv1ufy98zfnzzz98nyyy98ntz+Xvzzef189ufy9+Syy89vkzfyXk+eeefvntz+Xvyyyy98nvkz8y8+bzef18+vnyWSy+vn18mXn1ufy9ufy98mfkz+Xn +8:JJJJOJxOJxOJxOJxOPnq+f18nzb9ufvzc+Sy9+tvkz8+eeb98mXnyWXvtz+Xvzzzz89vkz8+SyX1vk9+Syyy89vn1zb9uefvS8mXmb8nzebz+vn18+SyWX18+vn1ufy9ufy98mfy8mfy8 +8:JJJJOJxOJxOJxOJxOJPy+vnz+q8+efnyy89vzzft+WWXnt8mfy8+Sy+vn1zfuXvmb8y8+ebz+vn1uXvkz86yWX18+vky8+Syy98+tyXufvmbz+vnmXmfnzb1fmfnyWSy+vntX1ubvuXufvkUy8+SyWX18+vky8+tzefvuS9z98zbfkzfmXn +8:JJJJOJxOJxOJxOJxPz+vnz+S+vk+bfyV+vnzvyV8+bz9+Sy8+tvkz+Xnzeb+t8+VyXt8mfyXk+bzz98+Syy98+tzfyXt8mc6nzeeefvnvyWSy+vnn1ufyWXvtz+Xvkzc+Xkz+Xn +8:JJJJOJxOJxOJxOJxPb+X1vmfnz+WS98+b+uXt8y8fzef18+Sy+vn1ufy98k+bef18+WSy89q8kz+Xnzzzz989ufvyyyy989uXvkz+Xk+bzef18+vkfyWWWXvnv1ufy9ufy98mSnjn +8:JJJJOJxOJxOJxOJxPnz+XvzefvyS+ty98nzef18+SX1ufy98k+WWS898eb8nzeb+vnyWWXnv1ufy9vkz+S8nzeeefvntz9+WWSy+vnntuXvkzc+Xkz+Xnzebz+vn18mfnyWSy+vnv1ufy9ufy98mXkz+Xn +8:JJJJOJxOJxOJxOJ+bfyy89+f1V8y8+S+ub9vmb8y8+ebz+vnkz8+WSy98i9ufy9+ebz+vnkz89yWXvtz+Xvzebz9+tfkfyyyyy8989uXt8mXmfmXnzeeefvnvyWSy+vn18i+tz9yXufvkzc8y8z8 +7:JJJJOJxOJxOJxOJxOPfy+vnzfyXk+eefvnyyy989r+bz+vnyWXn1uXvkz+Xnzmb8+WSy+vnntz9y9+b1fmfn1yWXvrviWXnzebz+vn1ufvkfyWWWXvk9+ty9ufy98mXmfmXnzebz+vnvyWSy+vn1q8+tub+Xt8mfy8mfy8 +7:JJJJOJxOJxOJxOJxPnzfynvzvWS+vnzzfk+WWXvntz9+bz+vnyWX18+tz98mfy8+bzf18nyWS+vk+tzvV8kz+Xnzeb+vnySy+vn1uft8mfyXk+bzzz898+SyWX189+tzd+Xtz+Xvkz+Sy88mfy8 +7:JJJJOJxOJxOJxOJxOJPfzf1vnz+S9+eb9vyU8i+bz+vnyS+tvky8+bz+vnyWX189uXvzeefnv1yWXvrvmSy88efnzeefnt+SyX1vn1tz+Xvkzfy8nzebz+vn18mfnyWVy98+ty9ufy98kyXmfn +7:JJJJOJxOJxOJxOJxJ+c6+b+WXvk+vmb8+b+Sn1vkXyWX18+ub9y98b+ubz9+Sy99ufy98zz8nSnzeefvnyWS+vn1uXr8mfy8nzbzz89vyWSy+vn1uXvnkz+Xkz+Xn +7:JJJJOJxOJxOJxOJJ+fy9+b+V8nzc+SX1vkz8+Sy+vn1zft8z8Xzbz+vnySy+vn1ub+S9vkzfyXk+SyX18+ubz99y9z98zefnmXmfnzebz+vn18j+SWS+vn1ufyV9ufy98mSnjn +7:JJJJOJxOJxOJxOJxJ+vnfz+S+vnzefn1y98mXnzbz8+SWvn1ufy98mb8nzeefnt+SyX18+ty9z98mXmfnzebz+vnnyWSy+vnt+tzb9y9z98mfyWXnkz+Xnzebz+vnvyWWWXvk9uXv1tufy98kzfyXk +7:JJJJOJxOJxOJxJ+f18y8+d+SXkXyX1z9vknzeb+vnySy+vn1ufXkz8nzeefvnyWvi+tzfy9vkz+Xk+ebzz98nkmfnyyyWX189q8mS8ntzefvqv +7:JJJJOJxOJxOJxOJPyXn1fmfnyWvn1t8z8y8+WWXvk9z9y9z9+bzft+SyX18+ty98mb+Xk+bzef18+vnyWSy+vn18i+tz+Xtz+Xvkz8y8nzedfnyWSy+vnv1uXtz68mcz86yXk +7:JJJJOJxOJxOJxOJx+fXzef18+S+t8nzb+SX1vknz+S+tz+Xvkz+Xnzzzz989vyVy98mfyXk+bzf18+uSXtz+XvmS8z8XyWWS9vn1zbz99ub+S9vmbc8mb+S8nyWWWXvntX1tzfy9vmbzfnmS8z8y8 +7:JJJJOJxOJxOJxOJxOJxJPvz6+fy+vn1Xmfy8+b+S+t8nyWX18+ub9y98zfmXnzef18+Sy+vn1ufy98mfXzeefnt+uSy99ufy98yWXnmb8y8+Syy89vmbfky8+b1zfvmb8+SyWX18+tXn1tz+Xt8mXmfmXn +7:JJJJOJxOJxOJxOJxOPfX1z98+b+S+t8nzzz89vyyy89vkz+Xnzmfntz+Xvzeefnt+SyX18+ty9z98mXk+b1fmfnyWWXnv1ud6vkyXk+bzef18+vnySyy98+tz9yXufvkz+Snkz+Xn +7:JJJJOJxOJxOJxOJxOJx6+fvy+vnzfy+t8nzfyXvzzz89vyWXvky8+bz+vnyyy98ntz+XvzeefnvyWWXnv1ud68mb8y8+eeefnt8mfnyyyy898mXnty9z9+SyWX18+ty98+tzefvtz+Xvky8zfmXn +7:JJJJOJxOJxOJxJPz+Xvzb+t8k+bzf18+U9vzed8+SyXv1uft8mfmXnyyyS89uXvmbfmXky8+beb+t8+SyWX18+vn1uXub9vkzz8nX +7:JJJJOJxOJxOJxOJx+fXzz98nz+vkXzc+Sy8+tvknzzz98nyyXk9ufvzeb+vnySy+vn1ufy9vkz+Xk+bef18+SyX18+tV8mb+Xk+bz+tz98+SWWXvnkz+Snkz+Xn +7:JJJJOJxOJxOJxOJxOPnyXnzfyXt+bz8+tXkz6+WWXnvknzefnyWX18+tz+Xvkz+XnzeefnvyWS+t8+tz9y98mefnXzeefnvyWWXnt+tz9y98mb+S8nzebz+vnnyWWWXnt8+tzefvuS9z98mfy8mfy8 +7:JJJJOJxOJxOJxOJxJJPzfWX18+b+S+vk+bny+tvkz6+bz+vnyWX18+ty98mfy8+eb188nyyWX188ntS+bzz89+WWWXnt8i9ufuXvzeeefnt8mXn1yWS99uXufviyWXnkz+Xnzzeefnt9tz9+Syyy89vky88mbz88mfy8 +7:JJJJOJxOJxOJxOJxJ+X1vk+evnU+bfyU+tvknyS+ub9y98mfy8+bz+vnyyy98ntz+XvymS8ntz9y9+bef18+uXrz98yWX188mfy8+bzzz89vnyWSy+vn1uXvn1tufy98mfy8mfy8 +7:JJJJOJxOJxOJxOJxPz8+S+r8fzef18+S+vkz8+eb9vWS+t8nzk+WV8ntzvV+befvyWWXvn1ufyXt8mb+Xk+bzef18+tfkfyWSy+vnn1uSy99z9y98kz+S8nzbzz89v1tyXufvmSWXnmbfmS8z8 +7:JJJJOJxOJxOJxOJxPi+fy+vnzef18+S+tfkn1z68zfmXnzef18+Sy+vn1ufy98mfy8+ebz+vn1ufy98mfnWSy+vn18mXnzeefvnyWS+vk+ty9z98mfmXnzebz+vn18j+SyWX188+tz+Sy99ufy98mXmfmXn +7:JJJJOJxOJxOJxOJ+b+Xt+b+uXvi+eefvk+WWXvnt+eefnt+WWXnt8mfy8+eeefnvky8+Syy989ufuXvyWS+t8+ubz99ufy98zefnmXmfnzbzf18nyWSy+vnv1ubvy9ufy98mfmS8z8 +6:JJJJOJxOJxOJxOJxPy+vnz+Xk+fy+tz68+bz8+Sy9+ty98mfnzc+SWXn1ufy98mfy8nzzzz898mfy8+WWS989ud6vzebz9+vn1ufyWXvtz+XvmSy+vnjmfnzbzz89+Syyy89vky8+tzd+Xtz+Xvkz8mfy8 +6:JJJJOJxOJxOJxOJxPXy+vnzefvyX1uXvk+ufvmS8nzbz8+Sy+t8n1ub9XkefnzeefnvyWS+vn1ufq8mb+Xk+ebzz899ufuXvyyyWX188mXntV8mbnkz+Xnzebz+vnvyWSy+vn1q8+tub+Xt8mbz8+Xky8 +6:JJJJOJxOJxOJxOJxOJ8+X1fnzc+S8j+S18+t8z8y8+bvyWX18+tz98mfnzzmfntvmSXkz+Xnzzzz898nyyyy898mXntz+Xt+bzef18+vnyWWWXvk9q+tz9y9z98jmfnzeb18+tz98j+S1WXvmS8n1uXtz+XvkmfmXn +6:JJJJOJxOJxOJxOJx97k+fyV+tXknyX1z9vmb8+befvyWS+t8+tz9vkz+XnySy8+tV8zefnmS8z8+bzzfnvyWWWXvk9+tz+Xtz+Xvky8zfmXnzeeefnvkfyWWWXnt8n1ubvuS9z98kz+Xn +6:JJJJOJxOJxOJxOJxPnt+bfyV+t8+eefnt6yX18+dzfvyyyy98nt8mfi+bzfnySy8+tufy98mfyXk+eeeefvnvkz8nyyyWX1898kntz+Xtz+Xvzdb+SyyXk9+tz+Xtz+XvkzefnmS8z8 +6:JJJJOJxOJxOJxOJxOJ+fvz+Xvz+S+t8nzz89XzefnyWX18+tz+Xvkz+Xnzef188yXmfnzeufvj+SyX1vn1tz+XvkznU+eeefnvnySy+vntz+S9vzbzf1vnyWuS9viy8+tz9ufy98mefk6mXn +6:JJJJOJxOJxOJxOJxOJJ7+fy8+fy+t8nzzz98nyyy989ufvzef18+uS9vmS8z8+ub+Sy99ufXmbnyXkz+Xnzzzfvkz8+SWX189ufuXvzebz+vn18j+SyWX18+tXky8+tz9y9z98kz8y8+b1efvmb8nyyWWXvk8kXtyWXvtf +6:JJJJOJxOJxOJxOJxJ8+X1vmfnzz+vnWX18+eefvnuXufvzef18+Sy+vn1ufy98mfy8+bzf1vnyWWXnv1uXufvkc+Syy98nubfuS9z9+bzef18+vkz8+WSyy98nkmfy89ufyWXvtz+Xv +6:JJJJOJxOJxOJxOJx6+fyy89+fyX1vk+bz+vn1ufXmXmfnzzfk9y9z9+SyX1vnmbz88y8z8+bzz98nySy+vn1uS9z98kz+Xnzebz+vn1r8+Syyy989+ty9z9y98mfyU8mfy8 +6:JJJJOJxOJxOJxOJxJ+Xvy+t8nbz+vnzc+Sy8+vkz+XnyWX18+ub9y98zfmXnySy+vn1z9yXufvkzfmXnyWWXnv1zefvuXufvmbz88yXmfnzzmb89+Sinky8z8y8 +6:JJJJOJxOJxOJx+fvzftvzzfnynvzeb8+qXkz+Xk+bzfvySy9+tz9y98kz+Xnzeec98+SyWXnv1uXub9vkznWS8n +6:JJJJOJxOJxOJxOPb+fyy89vzefvyS+t8k+bzz89+SX1tz+Xvkzfnzzef189ufvyymXntXkz8nzeeb8nv1yWS89z9ufvmXmfmS8z8+ubefvySy99ub+S9vmbnyWXnky8z8 +6:JJJJOJxOJxOJxOJxOJxJ9+fy8+X18+f1y98y8+b+uXvmXnzzz98nyyy98ntz9+eefnt+WWXnt8mfy8+eeefvk9ufvWSy+vn1uXvkz+Xnzbz+vn1ub+S9vkyXmfnzbzf18nyWSy+vn18+tzd+Xtz+Xvky8zfmXn +6:JJJJOJxOJxOJxOJxJOJ67nz+q8+ed8+U9q+Sy+vn1uXvmb8nzef18+uSXufuXvmS8c+S1Xn1zefvuXufvky8z8+SyWX18+vn1zeefvk9y9zfuXvky8zfmXnzeub9vmb8+tuS9z98ySy88mfyXk +6:JJJJOJxOJxOJxOJxJ+vnz+X1vk+b+S+t8nzzz89vkz8+bz8+Sy+vn1ufy98mfy8+ebz9+tvkfWSy+vn1t8mXnzzef188mfnyWS+t8ntzfuXvzbzz89v1ySy99z9ufy98yWS88zefnmXmfn +6:JJJJOJxOJxOJxOJxJ+fny9+f1vi+f1y98y8fzznt6y+t8+bef18+Sy9v1uft8mb6y8+bzzvnvyWWS98n1ufyV9t8mb8y8z8+Syyy98nv1ubz9+Xtz+Xvky8zfmXn +6:JJJJOJxOJxOJxOJxOJJx78+fnz+S+vk+eefnt8mfnzz+vk6yy98nzr+WS9vkz+XnyWuXvi+rzft8zb8y8z8+bzz98+qyXt8mfyXk+bzzz98nvyWSy+vn18i+tz+Xtz+Xvkz8y8z8 +6:JJJJOJxOJxOJxOJxOPXz6+efnyy89vzz89y9+Vy98z8y8+Sy8+rz98mfy8+bzz98+uSvty98yWXnmfmXnzeb+vn1yWXvufuXvmSy88z8y8+SyWX18+vn1ueb9vVy98zbz88y8zfmXn +6:JJJJOJxOJxOJxOJxJ+Xnzfynvzb+WS98nzt+Sy98mfnzzz89vyuXvkz+Xnzbz+vnyWWXvk+tufy98mb8y8+ubz99yXufvmbz8+Sy+vnkz+Xnzzeb+vn1uft8mfmXnVyWXvtv +6:JJJJOJxOJxOJxOJxJ+S+vnz+WXnvzfyXkz+XnyWXv1z9y98zfi+WSy88i9zefvuS9vzeb+t8nySy+vn1uS9z98kz+Xnzebz9+vnyWSy+vn1vn1ufuXufvkz8yXmfnzbzz98+SWWXnt+ty9ufy98mbny8mXn +5:JJJJOJxOJxOJxOJx77fznWXvz+SX1vk+eb+t8nWS+t8nzzzz89vkz8+Syy899uXufvzcfyWS+vn1ufy9vky8n1uSy+vntXmSnky8 +5:JJJJOJxOJxOJxOJxJ+b+X18+efnuXvzb+Sy9+tvky8+bz8+Sy+vn1ufy98mfy8+eec98mfnyyyy898i9ufy9vyWWXnv1z9y9z98zd8yXmfnzebvvyWSvvtz6+SVvtVX +5:JJJJJOJxOJxOJxOJPz8+d6y+vnzfyX1vk+bf1yXufvmXk+ec9vyyy89vkz+Xnzb18+SyX1vn1ub9y98mb8y8+bb8kz8 +5:JJJJJOJxOJxOJxJ+Xvz+VXknyyy898z8+bzf18+Sy8+tz+Xvkmfnzbz8+SyX1vn1tz98kz+XnuSvrufv +5:JJJJJOJxOJxOJxOJxPz8+fy8+b+S+vk+b+X1vnzefnyWvnkXzzft+WWXnt8mfy8+uSy99zfuXvmbz+vnyS8mfy8+br+SWXv1ty98mb8n +5:JJJJOJxOJxOJxOJxOJ8+fy+vnzfyX1vk+fyX1vky8+bz+vnyWXv1uXvkfzef18+X1ufy98mfy8+bzz89+Syy98+tz+S9vky8z8+SWXn1z9ufvmbz+vnkz+Xnzbt9tf +5:JJJJJOJxOJxOJxJPy8+ftvzvyyy89vknzb18+SyX18n1t8ky8+edfkfySXtz+S9vtub+Xv +5:JJJJOJxOJxOJxOJxOPXfzz8+S9+fyS+ty98mfnzefnyyy89vkz+Xnzeb9+uS9ufy98mXmfnzeefnt+WWWXvnvky8z8+qUy88mXmfi+SU8mSnkX +5:JJJJOJxOJxOJxOJxJ87+Xt+bvyU+tXkXzef18+tz98mfnzzzz98nt+WSy+vntvkWXnzbz+vnySX1uefvV8ky89tr +5:JJJJJOJxOJxOJxOJx8+b6vzf1y98+eb9+Sy+vnkXzzz98nyyXk9ufy9+etvmfnSyX18nyWS+vk+tzfy9vmbz88mfy8+eeec98j9r+WSV9uS9vkj +5:JJJJOJxOJxOJxOJxJ+Xvzz89Xzef18+WXvkz8+eb9+WWXnt8mfy8+bz+vnyWX18+tz+Xvkz+XnyWS+vk9ub+Xt+SWXv1zefvuS9z98zefnkz8+StX1tXmbzfnkf +5:JJJJOJxOJxOJxOJxJ+S9+fy+vnzd+U9vzzft8y8z8+bzf18n1yV9z9y98yXkz+Xnzef18nySy+vn1ufyXt8mS8z8+bdvSWU97dt +5:JJJJOJxOJxOJxOJxJ7+Sv18nyWXn1fkfyS+ub9vmfnyWU9+ub9y9vmbfmXnyWS+vk+ub9y9z98zb8mfy8+bzd9+SVy9+tz68mbnkXbzd9r +5:JJJJJOJxOJxOJxOPfy9+eb98XzefvyU+tXknzzefntXyyyXnvkz6nzdfySy9+tyXufvkzfyXk+ubz99tXjcn +5:JJJJOJxOJxOJxOJ8+b+q8nyS+ub9y98zfnzefvyWX18+tz+Xvky8+bzf1vn1XmSy98c+uSy99ufy98zc+SXkz+XnySv1qy9vkkX +5:JJJJOJxOJxOJxOJxOPfyXvzz9+S8+bfyWXv1r8mXnyV+ub9y98efnyWS+vn1ub+Xt8zefnmXmfnzcfyWU9+tz+Xt8mS8nySt+tqXkSntqX +5:JJJJJJOJxOJxOJxPS+f1vnzj9vzf1yXufvmS8z8+SWX18+ufuS9fmbz88S+bef18+tufvkmfn +5:JJJJOJxOJxOJxOJxJPz8+vi+ed8nyXvyWXv1zfuXvmb8nzef18+Sy+vn1ufy98mfy8+bzf18n1ufy9vkyXmfnyWWXnv1ub+Xt8inyWWV899q +5:JJJJOJxOJxOJxOJxPz6+ufvk+efnuXvzefnyWX18+tz98mfnyWX18+ub9y98efnzeb+vnyWS+vn1ufy9vkz+Xk+czfmXnyntWXvzb1z98nyWUnty9+trz98mXmb8X +5:JJJJJOJxOJxOJxOJPnz9+bfyX18mXnzevnyWXn1t8nzef1vnyWS+vn1tz+XvkznXzeb8+uSy99uXvmSnmfmXnUSn +4:JJJJJJOJxOJxOJxOPz67+t8y8+bvyynvn1z+Xt8mfXyWU9+rvmbz98j6WXt +4:JJJJJJOJxOJxOJJ+b+S+t8+d+WXvk+bfyyy98ntz9+bz+vnyV+tz+Xvky88zc8j +4:JJJJJJJOJxOJxOJx6+fk+d+WXvk+Sy8+ufuXvmb8y8+eb9+Sy88i+bz99r +4:JJJJJJOJxOJxOJxOJ68+efnyy89+bz8+Sv1uXvkfzefnyuXvkz86yXk8Sy8 +4:JJJJJJOJxOJxOJx+fvzvy8nz+S+vk+bv1y9vmXj+b+Sy+vn1uXvkz8+Sy88i +4:JJJJJJJOJxOJxOJx66vzfyX1vk+uXufvmfy8+bfyuXvky87zfk +4:JJJJJJJOJxOJxOJJ6+eb98y8+efvyy98nzefvyWXv1ufvkfzzntz9+VyXt8mfi +4:JJJJJJJOJxOJxOJxP18+fvyX1z98z8+uXvmXnzef18+Sy8+tz+Xvkz8+Sy8+ub9y98mXn +4:JJJJJJJOJxOJxOJPz8+X18fzvyWX188mXnzc+Sy+vntz+Xveefvk +4:JJJJJJOJxOJxOJxOJJ6+f18+b+X1vk+WXnufvzzz98nuS9z9+bz+vn1yXufviy8+Si8in +4:JJJJJJOJxOJxOJPz9+fyX18k+b+S18+t8+bz+vnyWvk9+bz+vn1t8j +4:JJJJJJOJxOJxOJxJPz+Xnz+S+t8nz+WXvk+bz9+Sy8+t8k+bz9+Sy+vn1ufy98mfy89tX +4:JJJJJJOJxOJxOJxJ7+d+XnzzfnVvzefnyS+tz+Xvnzr+SXky88iX +4:JJJJJJJOJxOJxOJxPz6+fnzefn1Xk+eefvnWXvzd+Sy+vn1uXvkz8+Sy9+tV8kX +4:JJJJJJJOJxOJxOJJ6vz+X18+WXntz+Xv1zfyXt8zfmXnzef18+Sk8mfi +4:JJJJJJOJxOJxOJx6+d8+fy9vzzz98nWS+vnzef18+Sy+vn1ufy98mXn1yXtXmSnkX +4:JJJJJJJOJxOJxOJPy8nznt9z9vzef18+uS9vmXk+bz+t8+WWXk9q8mfn +4:JJJJJJJOJxOJxOJx97+fyX1vnzb+S+tXk+bfyWXn1ufy98k+bvyS+tr8iX +4:JJJJJJOJxOJxOJxPy9+fy+t8+r8z+XnzfyWX18+ty98k+bz+vnyWq8+ty9fkz+Xnzdf1r8jf +4:JJJJJJJJOJxOJx9+bfyS+t8nyV+tXkz+XnyV9zfuXv +3:JJJJJJJJJOJxJ+b+X1vnzznvyU8mfX +3:JJJJJJJJJJOJxOJPvz+S+vnb +3:JJJJJJJJJJOJxOJ7+uXvnyXn +3:JJJJJJJJJOJxOJ+S+vny+r8z88j +3:JJJJJJJOJxOJxPzfvzk9+Snmfi6X +3:JJJJJJJJJJOJxOPvznXk +3:JJJJJJJJJOJxJPzfy+t8nv +3:JJJJJJJJJOJxOPz+t8+c6nzd6V +3:JJJJJJJJJJOJxOJPvzfy9+Xmfn +3:JJJJJJJJJJOJxOJPXz9+ufvk +3:JJJJJJJJJOJxOJ6+b+t86V +3:JJJJJJJJJJOJxOPXz+Xvzz89v +3:JJJJJJJJJJJOJxOJ9+f18+fX +3:JJJJJJJJJJOJxOPzfnz+Xt+WV8nt +3:JJJJJJJJOJxOJJ+fy9vzfyX1r8nbv +3:JJJJJJJJJJOJxOJPfyXvyX1vn +3:JJJJJJJJJJOJxJPz6+b9 +3:JJJJJJJJJJJOJxJ+fy9+b6n +3:JJJJJJJJJJJOJxOJ8+fy9+fv +3:JJJJJJJJJJOJxJ+b+t8XyX1z98n +2:JJJJJJJJJJJJJ +2:JJJJJJJJJJJJJP +2:JJJJJJJJJJJJJJ +2:JJJJJJJJJJJJOJPX +2:JJJJJJJJJJJJJP +2:JJJJJJJJJJJJOPX +2:JJJJJJJJJJJJJP +2:JJJJJJJJJJJJJ +2:JJJJJJJJJJJJJJ +2:JJJJJJJJJJJJJP +2:JJJJJJJJJJJJJJ +2:JJJJJJJJJJJJJJP +2:JJJJJJJJJJJJJJ +2:JJJJJJJJJJJJJP +2:JJJJJJJJJJJJJP +2:JJJJJJJJJJJJJJ +2:JJJJJJJJJJJJJJP +2:JJJJJJJJJJJJJJP +2:JJJJJJJJJJJJJ +2:JJJJJJJJJJJJJJ diff --git a/src/main/resources/trees/dtbop/species/mega_fir.json b/src/main/resources/trees/dtbop/species/mega_fir.json index 8536b9bc..e867be33 100644 --- a/src/main/resources/trees/dtbop/species/mega_fir.json +++ b/src/main/resources/trees/dtbop/species/mega_fir.json @@ -5,7 +5,7 @@ "up_probability": 7, "lowest_branch_height": 7, "growth_rate": 1.0, - "soil_longevity": 14, + "soil_longevity": 18, "max_branch_radius": 24, "growth_logic_kit": "dtbop:fir", "leaves_properties": "dtbop:fir", @@ -15,6 +15,7 @@ "wet": 0.75 }, "perfect_biomes": { "type": "coniferous" }, + "common_override": { "name": "biomesoplenty:coniferous_forest" }, "features" : [ "conifer_topper", { diff --git a/src/main/resources/trees/dtbop/species/mega_umbran.json b/src/main/resources/trees/dtbop/species/mega_umbran.json index 57490238..ee7b2985 100644 --- a/src/main/resources/trees/dtbop/species/mega_umbran.json +++ b/src/main/resources/trees/dtbop/species/mega_umbran.json @@ -5,7 +5,7 @@ "up_probability": 7, "lowest_branch_height": 7, "growth_rate": 1.0, - "soil_longevity": 14, + "soil_longevity": 18, "max_branch_radius": 24, "growth_logic_kit": "dtbop:fir", "leaves_properties": "dtbop:umbran", @@ -19,6 +19,7 @@ "magical": 1.1 }, "perfect_biomes": { "type": "coniferous" }, + "common_override": { "name": "biomesoplenty:ominous_woods" }, "features" : [ "conifer_topper", { diff --git a/src/main/resources/trees/dtbop/species/redwood.json b/src/main/resources/trees/dtbop/species/redwood.json index f46d7e87..c2459f84 100644 --- a/src/main/resources/trees/dtbop/species/redwood.json +++ b/src/main/resources/trees/dtbop/species/redwood.json @@ -16,7 +16,8 @@ }, "always_show_on_waila": false, "world_gen_leaf_map_height": 60, - "perfect_biomes": { "type": "coniferous" }, + "perfect_biomes": { "name": ".*redwood.*" }, + "common_override": { "name": ".*redwood.*" }, "features" : [ "conifer_topper", { diff --git a/src/main/resources/trees/dtbop/species/small_redwood.json b/src/main/resources/trees/dtbop/species/small_redwood.json index 24990581..87f2dfe4 100644 --- a/src/main/resources/trees/dtbop/species/small_redwood.json +++ b/src/main/resources/trees/dtbop/species/small_redwood.json @@ -16,7 +16,7 @@ "always_show_on_waila": true, "seed_name": "redwood_seed", "sapling_name": "redwood_sapling", - "perfect_biomes": { "type": "coniferous" }, + "perfect_biomes": { "name": ".*redwood.*" }, "primitive_sapling": "biomesoplenty:redwood_sapling", "mega_species": "dtbop:redwood", "features" : [ diff --git a/src/main/resources/trees/dtbop/world_gen/default.json b/src/main/resources/trees/dtbop/world_gen/default.json index a925e618..18891bbd 100644 --- a/src/main/resources/trees/dtbop/world_gen/default.json +++ b/src/main/resources/trees/dtbop/world_gen/default.json @@ -12,9 +12,10 @@ "apply": { "species" : { "random" : { - "dtbop:palm" : 3, - "dtbop:flowering_oak_undergrowth" : 1, - "dtbop:jungle_twiglet" : 1 + "dtbop:palm" : 6, + "dtbop:flowering_oak_undergrowth" : 2, + "dtbop:jungle_twiglet" : 2, + "cocoa" : 1 } }, "density": [ 5.0 ], @@ -118,8 +119,8 @@ "oak" : 1 } }, - "density": 0.1, - "chance": 0.05 + "density": 0.2, + "chance": 0.2 } }, { @@ -330,8 +331,8 @@ "apply": { "species" : { "random" : { - "dtbop:flowering_oak" : 5, - "dtbop:flowering_apple_oak" : 1 + "dtbop:flowering_oak" : 1, + "dtbop:flowering_apple_oak" : 5 } }, "density": 0.2,