From 1962f73ac2452f11422f38bf53ff12217d966883 Mon Sep 17 00:00:00 2001 From: Nikita Kruglickiy Date: Mon, 19 Feb 2024 21:39:10 +0300 Subject: [PATCH] Some shit --- .../_Prefabs/Fan_01.prefab | Bin 10792 -> 8204 bytes Assets/SmartMergeRegistrator.cs.meta | 11 +++++++++++ .../RiderScriptEditorPersistedState.asset | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 Assets/SmartMergeRegistrator.cs.meta diff --git a/Assets/Environment/3D Free Modular Kit/_Prefabs/Fan_01.prefab b/Assets/Environment/3D Free Modular Kit/_Prefabs/Fan_01.prefab index a68eda2d195bcfd919da611df0c5959ba5bd2eb1..669994f437dbc7bf05e5c595fbbbfbac92b2af8d 100644 GIT binary patch literal 8204 zcmeHMO>f&c5WVMDsE6hh8zQMs-(06j4a7|lC+W6}ML2Be0Zd|#kmzv@2zl5eICxwl!hR4&T3~&9M(>!k z{(B8>9yuqpxP1c-EN@+;?Yg4Nc_pD|#IJ?GGP>EKGzqRfO`{{V-+zU^VKv)SO&K^zP~5d|F2B&1)xy-?fZo&48U0~Yn}pccqvZOAoSuzLcNScF-~cQ{fLE05K)k; z?ly3Sr1b>`Uo;$`eR0VO@a$9Z#>;{(at4MQVwupgny+XoKC~2m$r1*9(DoX^VnC~u#mk<)CQI-UV5jSQ8r4}jJTw&vx7qm)N(;^c}x8r17 zg1_s9!KB)-Z!kTV6PiY98PHhLoYKXa8c74;rWV$SbWUnDMfagwxoUEvpH#7S2 zn3qjD;ST-XA#5hd_O$Q(G+wec{*&S8_p9gORg3zO z6HKs&6Q2?W=~EkEmBx#l-klfY5A;1;ZWA;NiP_eLVh__e6QZH4S*zHyxqqjy}UEez~9pRbp|BG3MTgqUBcpW@ebZ$noTxZCv{ng^`r(4Hj!k{xv9vgT-cKu zID6z2m8xIG)w_n;y83NtUMrVFdK7xP@G1PC%*L{Jp_fqK*0#YVkPLDLh;=GSvB#?L`>@x(?KGiBd2T}sjp6Tyna0ztN9}=kZnQl= zy6?&j1nKm zcBeR|A`O7$S8>dI#Q9Ym`&AtKUd1uUi9+JX(NFXdvKN1T*o;Q+@kwMf8Xdiy#J&_m z!Rr1ez<>DWXFeB_Vc2}u3x;n017SZ^8OAttA;&Q(OV?7Vi*1=beRT@cX3l$3n1B6g F?{A?F#Tftq literal 10792 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