From aaf3483618d407f15776a8ae6c9027c87879fb89 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Sat, 27 Jun 2020 15:33:30 -0400 Subject: [PATCH] Move Godot Battle Bot model and materials to a subfolder Also minify textures by making them really low resolution --- 3d/ik/fabrik_ik.tscn | 22 +++++------ 3d/ik/fps/fps_example.tscn | 24 ++++++------ 3d/ik/fps/gun_textures.png | Bin 323 -> 5570 bytes 3d/ik/fps/gun_textures.png.import | 4 +- 3d/ik/godot_battle_bot_colors.png | Bin 7275 -> 0 bytes 3d/ik/godot_battle_bot_colors.png.import | 36 ------------------ 3d/ik/godot_battle_bot_emission.png | Bin 2095 -> 0 bytes 3d/ik/godot_battle_bot_emission.png.import | 36 ------------------ 3d/ik/look_at_ik.tscn | 21 +++++----- 3d/ik/model/README.md | 5 +++ 3d/ik/{ => model}/battle_bot_color.tres | 3 +- 3d/ik/{ => model}/battle_bot_emission.tres | 0 3d/ik/{ => model}/godot_battle_bot.dae | 0 3d/ik/{ => model}/godot_battle_bot.dae.import | 6 +-- 3d/ik/model/godot_battle_bot_colors.png | Bin 0 -> 548 bytes .../model/godot_battle_bot_colors.png.import | 36 ++++++++++++++++++ 3d/ik/model/godot_battle_bot_emission.png | Bin 0 -> 529 bytes .../godot_battle_bot_emission.png.import | 36 ++++++++++++++++++ 3d/ik/skeleton_ik.tscn | 6 +-- 19 files changed, 121 insertions(+), 114 deletions(-) delete mode 100644 3d/ik/godot_battle_bot_colors.png delete mode 100644 3d/ik/godot_battle_bot_colors.png.import delete mode 100644 3d/ik/godot_battle_bot_emission.png delete mode 100644 3d/ik/godot_battle_bot_emission.png.import create mode 100644 3d/ik/model/README.md rename 3d/ik/{ => model}/battle_bot_color.tres (94%) rename 3d/ik/{ => model}/battle_bot_emission.tres (100%) rename 3d/ik/{ => model}/godot_battle_bot.dae (100%) rename 3d/ik/{ => model}/godot_battle_bot.dae.import (99%) create mode 100644 3d/ik/model/godot_battle_bot_colors.png create mode 100644 3d/ik/model/godot_battle_bot_colors.png.import create mode 100644 3d/ik/model/godot_battle_bot_emission.png create mode 100644 3d/ik/model/godot_battle_bot_emission.png.import diff --git a/3d/ik/fabrik_ik.tscn b/3d/ik/fabrik_ik.tscn index f825dec8..f484a708 100644 --- a/3d/ik/fabrik_ik.tscn +++ b/3d/ik/fabrik_ik.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=15 format=2] [ext_resource path="res://addons/sade/editor_gizmo_texture.png" type="Texture" id=1] -[ext_resource path="res://godot_battle_bot.dae" type="PackedScene" id=2] -[ext_resource path="res://battle_bot_color.tres" type="Material" id=3] -[ext_resource path="res://battle_bot_emission.tres" type="Material" id=4] +[ext_resource path="res://model/godot_battle_bot.dae" type="PackedScene" id=2] +[ext_resource path="res://model/battle_bot_color.tres" type="Material" id=3] +[ext_resource path="res://model/battle_bot_emission.tres" type="Material" id=4] [ext_resource path="res://target_from_mousepos.gd" type="Script" id=5] [ext_resource path="res://addons/sade/ik_look_at.gd" type="Script" id=6] [ext_resource path="res://addons/sade/ik_look_at.png" type="Texture" id=7] @@ -36,9 +36,9 @@ material/0 = SubResource( 2 ) [node name="DirectionalLight" type="DirectionalLight" parent="."] transform = Transform( 0.56827, 0.673454, -0.472789, 0, 0.574581, 0.818448, 0.822842, -0.465099, 0.326517, -9.77531, 11.5204, 11.766 ) -[node name="BattleBot" parent="." instance=ExtResource( 2 )] +[node name="GodotBattleBot" parent="." instance=ExtResource( 2 )] -[node name="godot_battle_bot" parent="BattleBot/Armature/Skeleton" index="0"] +[node name="godot_battle_bot" parent="GodotBattleBot/Armature/Skeleton" index="0"] material/0 = ExtResource( 3 ) material/1 = ExtResource( 4 ) @@ -57,7 +57,7 @@ script = ExtResource( 6 ) __meta__ = { "_editor_icon": ExtResource( 7 ) } -skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") bone_name = "Head" additional_rotation = Vector3( 90, 0, 0 ) @@ -66,7 +66,7 @@ script = ExtResource( 8 ) __meta__ = { "_editor_icon": ExtResource( 9 ) } -skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") bones_in_chain = PoolStringArray( "Left_UpperArm", "Left_LowerArm" ) bones_in_chain_lengths = PoolRealArray( 1.97, 3 ) chain_iterations = 10 @@ -82,7 +82,7 @@ script = ExtResource( 6 ) __meta__ = { "_editor_icon": ExtResource( 7 ) } -skeleton_path = NodePath("../../../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../../../GodotBattleBot/Armature/Skeleton") bone_name = "Left_Hand" additional_rotation = Vector3( 0, 0, 90 ) position_using_additional_bone = true @@ -103,7 +103,7 @@ script = ExtResource( 8 ) __meta__ = { "_editor_icon": ExtResource( 9 ) } -skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") bones_in_chain = PoolStringArray( "Right_UpperArm", "Right_LowerArm", "Right_Hand" ) bones_in_chain_lengths = PoolRealArray( 1.97, 3, 1.2 ) limit_chain_iterations = false @@ -118,7 +118,7 @@ script = ExtResource( 6 ) __meta__ = { "_editor_icon": ExtResource( 7 ) } -skeleton_path = NodePath("../../../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../../../GodotBattleBot/Armature/Skeleton") bone_name = "Right_Hand" additional_rotation = Vector3( 0, 0, 90 ) @@ -228,4 +228,4 @@ __meta__ = { } scene_to_change_to = "res://look_at_ik.tscn" -[editable path="BattleBot"] +[editable path="GodotBattleBot"] diff --git a/3d/ik/fps/fps_example.tscn b/3d/ik/fps/fps_example.tscn index 9b02ce0b..c510d499 100644 --- a/3d/ik/fps/fps_example.tscn +++ b/3d/ik/fps/fps_example.tscn @@ -10,9 +10,9 @@ [ext_resource path="res://fps/weapon_pistol.dae" type="PackedScene" id=8] [ext_resource path="res://fps/gun_color.tres" type="Material" id=9] [ext_resource path="res://fps/gun_emission.tres" type="Material" id=10] -[ext_resource path="res://godot_battle_bot.dae" type="PackedScene" id=11] -[ext_resource path="res://battle_bot_color.tres" type="Material" id=12] -[ext_resource path="res://battle_bot_emission.tres" type="Material" id=13] +[ext_resource path="res://model/godot_battle_bot.dae" type="PackedScene" id=11] +[ext_resource path="res://model/battle_bot_color.tres" type="Material" id=12] +[ext_resource path="res://model/battle_bot_emission.tres" type="Material" id=13] [sub_resource type="PlaneMesh" id=1] size = Vector2( 40, 40 ) @@ -472,7 +472,7 @@ script = ExtResource( 4 ) __meta__ = { "_editor_icon": ExtResource( 5 ) } -skeleton_path = NodePath("../../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../../GodotBattleBot/Armature/Skeleton") bone_name = "Chest" look_at_axis = 2 additional_rotation = Vector3( -10, 0, 0 ) @@ -489,7 +489,7 @@ script = ExtResource( 6 ) __meta__ = { "_editor_icon": ExtResource( 7 ) } -skeleton_path = NodePath("../../../../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../../../../GodotBattleBot/Armature/Skeleton") bones_in_chain = PoolStringArray( "Left_UpperArm", "Left_LowerArm", "Left_Hand" ) bones_in_chain_lengths = PoolRealArray( 1.97, 3, 0.1 ) limit_chain_iterations = false @@ -504,7 +504,7 @@ script = ExtResource( 4 ) __meta__ = { "_editor_icon": ExtResource( 5 ) } -skeleton_path = NodePath("../../../../../../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../../../../../../GodotBattleBot/Armature/Skeleton") bone_name = "Left_Hand" use_negative_our_rot = true additional_rotation = Vector3( 0, 0, 90 ) @@ -526,7 +526,7 @@ script = ExtResource( 6 ) __meta__ = { "_editor_icon": ExtResource( 7 ) } -skeleton_path = NodePath("../../../../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../../../../GodotBattleBot/Armature/Skeleton") bones_in_chain = PoolStringArray( "Right_UpperArm", "Right_LowerArm", "Right_Hand" ) bones_in_chain_lengths = PoolRealArray( 1.97, 3, 0.1 ) limit_chain_iterations = false @@ -541,7 +541,7 @@ script = ExtResource( 4 ) __meta__ = { "_editor_icon": ExtResource( 5 ) } -skeleton_path = NodePath("../../../../../../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../../../../../../GodotBattleBot/Armature/Skeleton") bone_name = "Right_Hand" use_negative_our_rot = true additional_rotation = Vector3( 0, 0, 90 ) @@ -566,7 +566,7 @@ script = ExtResource( 4 ) __meta__ = { "_editor_icon": ExtResource( 5 ) } -skeleton_path = NodePath("../../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../../GodotBattleBot/Armature/Skeleton") bone_name = "Head" [node name="AnimationPlayer" type="AnimationPlayer" parent="KinematicBody/CameraHolder"] @@ -589,12 +589,12 @@ material/1 = ExtResource( 10 ) [node name="PistolEnd" type="Spatial" parent="KinematicBody/CameraHolder/Weapon/Pistol"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0161836, 0.315914, 1.41329 ) -[node name="BattleBot" parent="KinematicBody" instance=ExtResource( 11 )] +[node name="GodotBattleBot" parent="KinematicBody" instance=ExtResource( 11 )] -[node name="godot_battle_bot" parent="KinematicBody/BattleBot/Armature/Skeleton" index="0"] +[node name="godot_battle_bot" parent="KinematicBody/GodotBattleBot/Armature/Skeleton" index="0"] material/0 = ExtResource( 12 ) material/1 = ExtResource( 13 ) [editable path="KinematicBody/CameraHolder/Weapon/Pistol"] -[editable path="KinematicBody/BattleBot"] +[editable path="KinematicBody/GodotBattleBot"] diff --git a/3d/ik/fps/gun_textures.png b/3d/ik/fps/gun_textures.png index 11a735d9e92bf9f2c2652532ac30a3e195922ffc..0d591d699a382d5a92f6f91ea4754ea7c297c00d 100644 GIT binary patch literal 5570 zcmeHLc~}$I79XStB8sRWxV(tBLGNfFJ@YO0`TTlSN1-W)c!Mt$+ezK}D=6 zR#V52VApPJeLbWR5@=y^JM4?sdE~2$`CLrQ_KKuN>*Z<7-C7FBXcYf#G-#zEv zOfo`(=Zvr(Zw&yz2$8>UDE>W)czyRU&>4Gc%6$0Ln$3tP-}WZ^ z)sE`4p5c~P3hFEyw@AL{CO*ob4_%h+TwL_siY48)FC7z0w>=*E&)Tk@=Pq$C<(H4w zn`civn0R~Y|~sGPLW<)w7d&Ia)D zkvO(-RRFmrGlM_#@SOv5EE4mb0``>2h&2?Y@{OyV2D&?)B;0+bL@{K;!b3dTB7jk-c=h1%I^y4C7 znfDUrLWfgZI&Rx91={OwJ8Z7WKK!tG@6(h$*2&PxZ?{ApzGXEp`DH|86_@ebkQXG_-&MDNmDn;)B^p+1BbM_nQg0eI#gvF;n8j%J>7ETtkh8{QSfk=jvpKAN5Px8oC-I$rOCc_^F$kS zFGZi*x9fli+f{qn+-I$5W8o(4)SL~|ofoWGxn@sDTYKR2692}H0S6;yU1|z}a}TgC zUE8<(IJ;4jQ%Ekmw*BYJE|vFp*1IoB_$4l?c*NgUq}rv~Oj35_TrGUD=am`j$o@tW z>s80@p+$CasTyqNupFoK4F=FX2XJ7DWec`=M4*fle+ zB&~nxz!~!-@>-XnBkP{l5aIVLO{6OY?@ev~E1}S=Y18F}L}5j!1uMD9gJZGwS-UD~G)L zTW&gC-Id%r}PKLC!?Dlrs0+|`-MDU@iw8?1bQ%qcJ>AEoXykluVS6h+eGvL{+ap)DV zDSiN8wp!`q6C(2QdA&>Eaq^Qk2>p+HPCW5>SQ*JaEq0VXJ!HFEy2J8|Gsf=p-e*O1j={euz?8@Bqyt?olsV?Q_imIdC7xOyAH{H>>w`=ht4EC8aEVs@o03Da^&Py7H;0jRu=X#1)ofqw^$$Q zwp-!xYul%a=To#U9ajP8dcmo4Am_ImD<2$72~>y<0*$H|HO4mzNhV%CeodGuB+vxWMGHw0;t``x%w7bkZzqP@t8{_@TbD`zi2|kfhM*G<*uhU@*8F81AT6PNDI5JPMUgq0`AY zf{ewfb&!#)#+(U?J`P_5gSB`;D^WE_a6%GPuM?6;_k1sl}@JfD1-g+yJGQxw;JnL5!aJqgftYIJC&kRz2$-F{9@n4d#48$ zj-Q^CPy|EuS{U(*MbtXy!9g`KdTek^J%$h_Q{FLB83j+u6nU`E9FaI=z=x1gu2gAE z9t3(YQVI{?Gb7 zE2VtXC5H`35Sj!cGdMH`naN|Y$PiD;CbK0{iG+u+Idl$n5S2)c=^!r8v*G(_5lDw>!%;LwNFp)-30G4ufP(%i=LexMM0A4*j7W(_>2DQpNKP>g1(f%J z|AQ$^fg05R8_yf)0E?GaXF#>lbG36N%Me)iex7%M2be`pVKD z_eHgFgW`uF%lk%sJ4uYvBozpnx|a{Zgo;8E2E`&$(-Po1_T7RNkXnx5+hl)_ytXUf zQLYF}BB9bbc#-m87MaOnAY=*5g~>dGM@M8ZM1^_C+w2%B(-|Nw;w8tM2w!Ksg-q)V zPB&GV%iCy!0>P6cQ<;1!mDIPqpnyW`gs-P3AodEem_Jwm0kN0xMMQ;#={1@dC8B*> znAe5!UvPu``-}3=+y}$@ynRqj9NwG?-CTqEz2V;h>|+R0!iX9}-W@J_NZ*fgeU$5i6!;+U$Ljhh*9R%^LEw+o z^?#Gg`pu&;qQ-yd8Sn?+-L*%l_(SvLkf3nlfgTnyN+n4eGNP%G*|3w%83?Dj=0fMCldQvb_|^`W|~cE z0853NK#{LkxK$H8YHWBYogKRzsyS{oLL3N3b#>L$7mNk~=kvD8y^}qM;8;N97wmh` HJ1Y4P9$P(r literal 323 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 z00SY=zw3@jXg;~Kz>Wa<{TB$3je`dO00000000000000000000000000000000000 Z00+dQ2~h^)073u&002ovPDHLkV1i0Q@eKd~ diff --git a/3d/ik/godot_battle_bot_emission.png.import b/3d/ik/godot_battle_bot_emission.png.import deleted file mode 100644 index 8b300305..00000000 --- a/3d/ik/godot_battle_bot_emission.png.import +++ /dev/null @@ -1,36 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path.s3tc="res://.import/godot_battle_bot_emission.png-c363ccbe8ada8fe822cd5528b54fc924.s3tc.stex" -path.etc2="res://.import/godot_battle_bot_emission.png-c363ccbe8ada8fe822cd5528b54fc924.etc2.stex" -metadata={ -"imported_formats": [ "s3tc", "etc2" ], -"vram_texture": true -} - -[deps] - -source_file="res://godot_battle_bot_emission.png" -dest_files=[ "res://.import/godot_battle_bot_emission.png-c363ccbe8ada8fe822cd5528b54fc924.s3tc.stex", "res://.import/godot_battle_bot_emission.png-c363ccbe8ada8fe822cd5528b54fc924.etc2.stex" ] - -[params] - -compress/mode=2 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=true -flags/filter=true -flags/mipmaps=true -flags/anisotropic=false -flags/srgb=1 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/3d/ik/look_at_ik.tscn b/3d/ik/look_at_ik.tscn index 62df55e6..174da070 100644 --- a/3d/ik/look_at_ik.tscn +++ b/3d/ik/look_at_ik.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=11 format=2] [ext_resource path="res://addons/sade/editor_gizmo_texture.png" type="Texture" id=1] -[ext_resource path="res://godot_battle_bot.dae" type="PackedScene" id=2] -[ext_resource path="res://battle_bot_color.tres" type="Material" id=3] -[ext_resource path="res://battle_bot_emission.tres" type="Material" id=4] +[ext_resource path="res://model/godot_battle_bot.dae" type="PackedScene" id=2] +[ext_resource path="res://model/battle_bot_color.tres" type="Material" id=3] +[ext_resource path="res://model/battle_bot_emission.tres" type="Material" id=4] [ext_resource path="res://target_from_mousepos.gd" type="Script" id=5] [ext_resource path="res://addons/sade/ik_look_at.gd" type="Script" id=6] [ext_resource path="res://addons/sade/ik_look_at.png" type="Texture" id=7] @@ -27,9 +27,9 @@ material/0 = SubResource( 2 ) [node name="DirectionalLight" type="DirectionalLight" parent="."] transform = Transform( 0.56827, 0.673454, -0.472789, 0, 0.574581, 0.818448, 0.822842, -0.465099, 0.326517, -9.77531, 11.5204, 11.766 ) -[node name="BattleBot" parent="." instance=ExtResource( 2 )] +[node name="GodotBattleBot" parent="." instance=ExtResource( 2 )] -[node name="godot_battle_bot" parent="BattleBot/Armature/Skeleton" index="0"] +[node name="godot_battle_bot" parent="GodotBattleBot/Armature/Skeleton" index="0"] material/0 = ExtResource( 3 ) material/1 = ExtResource( 4 ) @@ -47,7 +47,7 @@ script = ExtResource( 6 ) __meta__ = { "_editor_icon": ExtResource( 7 ) } -skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") bone_name = "Head" additional_rotation = Vector3( 90, 0, 0 ) @@ -56,7 +56,7 @@ script = ExtResource( 6 ) __meta__ = { "_editor_icon": ExtResource( 7 ) } -skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") bone_name = "Left_UpperArm" [node name="IK_LookAt_RightArm" type="Spatial" parent="Camera/Targets"] @@ -64,7 +64,7 @@ script = ExtResource( 6 ) __meta__ = { "_editor_icon": ExtResource( 7 ) } -skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton") +skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton") bone_name = "Right_UpperArm" additional_rotation = Vector3( 0, 0, 180 ) @@ -98,6 +98,9 @@ text = "LookAt IK Move mouse to move IK targets" align = 1 valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="ButtonNext" type="Button" parent="Control"] anchor_left = 1.0 @@ -115,4 +118,4 @@ __meta__ = { } scene_to_change_to = "res://fabrik_ik.tscn" -[editable path="BattleBot"] +[editable path="GodotBattleBot"] diff --git a/3d/ik/model/README.md b/3d/ik/model/README.md new file mode 100644 index 00000000..dbebb4e0 --- /dev/null +++ b/3d/ik/model/README.md @@ -0,0 +1,5 @@ +# Godot Battle Bot + +This folder contains the model and textures/materials for the Godot Battle Bot. + +Yes, the battle bot really is 14.5 meters tall. It is a powerful robot. diff --git a/3d/ik/battle_bot_color.tres b/3d/ik/model/battle_bot_color.tres similarity index 94% rename from 3d/ik/battle_bot_color.tres rename to 3d/ik/model/battle_bot_color.tres index b9915b9f..df93a6a0 100644 --- a/3d/ik/battle_bot_color.tres +++ b/3d/ik/model/battle_bot_color.tres @@ -1,6 +1,6 @@ [gd_resource type="SpatialMaterial" load_steps=2 format=2] -[ext_resource path="res://godot_battle_bot_colors.png" type="Texture" id=1] +[ext_resource path="res://model/godot_battle_bot_colors.png" type="Texture" id=1] [resource] @@ -55,4 +55,3 @@ uv2_triplanar_sharpness = 1.0 proximity_fade_enable = false distance_fade_enable = false _sections_unfolded = [ "Albedo" ] - diff --git a/3d/ik/battle_bot_emission.tres b/3d/ik/model/battle_bot_emission.tres similarity index 100% rename from 3d/ik/battle_bot_emission.tres rename to 3d/ik/model/battle_bot_emission.tres diff --git a/3d/ik/godot_battle_bot.dae b/3d/ik/model/godot_battle_bot.dae similarity index 100% rename from 3d/ik/godot_battle_bot.dae rename to 3d/ik/model/godot_battle_bot.dae diff --git a/3d/ik/godot_battle_bot.dae.import b/3d/ik/model/godot_battle_bot.dae.import similarity index 99% rename from 3d/ik/godot_battle_bot.dae.import rename to 3d/ik/model/godot_battle_bot.dae.import index 58510161..9459461a 100644 --- a/3d/ik/godot_battle_bot.dae.import +++ b/3d/ik/model/godot_battle_bot.dae.import @@ -2,12 +2,12 @@ importer="scene" type="PackedScene" -path="res://.import/godot_battle_bot.dae-eca9fb346b160636fd03ddf258af136e.scn" +path="res://.import/godot_battle_bot.dae-b816538849caf76e74976d7a086ba5f7.scn" [deps] -source_file="res://godot_battle_bot.dae" -dest_files=[ "res://.import/godot_battle_bot.dae-eca9fb346b160636fd03ddf258af136e.scn" ] +source_file="res://model/godot_battle_bot.dae" +dest_files=[ "res://.import/godot_battle_bot.dae-b816538849caf76e74976d7a086ba5f7.scn" ] [params] diff --git a/3d/ik/model/godot_battle_bot_colors.png b/3d/ik/model/godot_battle_bot_colors.png new file mode 100644 index 0000000000000000000000000000000000000000..ff4584ce7b84c2039d0e7703bfc1b645e437632b GIT binary patch literal 548 zcmV+<0^9wGP)EX>4Tx04R}tkv&MmKpe$iQ?()$hjtKkh)|s@h!%0wDionYs1;guFuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi*nNH0Shl#~P8!K(hil#;!BaWz=PWeK{ zWtH<5XRTCW&3p0}26OuI64z-CA%O)fLV^ed6>Ojc8&O(yQY@rsKknflX!s>^DdgG! zBgZ_-&>%Pb;D7MDTPr^~;U)#+K1R2b7^+_-Tg0}RYoG=sBcrZvLZObkQ->M3G5w)F~} mBguXV&Ym%2#z47gFaiL`vk6lGQ)g8G0000EX>4Tx04R}tkv&MmKpe$iQ?()$hjtKkh)|s@h!%0wDionYs1;guFuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi*nNH0Shl#~P8!K(hil#;!BaWz=PWeK{ zWtH<5XRTCW&3p0}26OuI64z-CA%O)fLV^ed6>Ojc8&O(yQY@rsKknflX!s>^DdgG! zBgZ_-&>%Pb;D7MDTPr^~;U)#+K