TheOnlyJoeEnderman
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,920 Commits 47 Branches 73 Tags 105 MiB
Commit Graph

1387 Commits

Author SHA1 Message Date
jordan4ibanez 0895666407 Fix random crash with mixed mob ally data types 2021-04-22 23:36:58 -04:00
jordan4ibanez 408296140a Fix and overhaul wolves 2021-04-22 23:30:32 -04:00
jordan4ibanez aac1e19336 Implement rotation locking when standing, fix rotation unlock/lock for fly/swim mobs 2021-04-22 23:18:33 -04:00
jordan4ibanez fa059b5df2 Fix ghast's eyeheight 2021-04-22 22:59:03 -04:00
jordan4ibanez 2e3e92e393 Fix ghast's insane difficulty 2021-04-22 22:58:32 -04:00
jordan4ibanez 11bcf3aa34 Add attributes to epCode 2021-04-22 22:51:13 -04:00
jordan4ibanez 2099be43ea Update to epCode's fixed version of ghast model 2021-04-22 22:50:14 -04:00
jordan4ibanez 5037ec3736 Fix ghasts horrible collisionbox 2021-04-22 22:40:16 -04:00
jordan4ibanez 0a8fff6524 Add in mob criticals when falling 2021-04-22 22:08:54 -04:00
jordan4ibanez afdcada1fd Fix endermite 2021-04-22 21:46:13 -04:00
jordan4ibanez 5d876725c5 Fix bats 2021-04-22 21:45:00 -04:00
jordan4ibanez ef0d52a2df Update backup_code_api.lua 2021-04-22 21:41:54 -04:00
jordan4ibanez 8142f7e512 Add in mob death 2021-04-22 21:36:42 -04:00
jordan4ibanez ebf27866ca Fix typo and error in animation.lua 2021-04-22 21:12:08 -04:00
jordan4ibanez 3fe8d2d3c5 Add file death_logic.lua 2021-04-22 20:30:50 -04:00
jordan4ibanez b73ab976a1 Implement framework for mob death 2021-04-22 20:25:58 -04:00
jordan4ibanez 8530e6ee36 Make mob punching time based 2021-04-22 20:20:56 -04:00
jordan4ibanez e1812b2cdb Reset pause timer to 0 2021-04-22 20:12:02 -04:00
jordan4ibanez 991bba0a1d Add comments into ai.lua 2021-04-22 20:10:01 -04:00
jordan4ibanez f9a7144b65 Implement ability to hurt mobs 2021-04-22 20:07:30 -04:00
jordan4ibanez 45790c0be0 Re-enable mob punching (broken) 2021-04-22 19:12:02 -04:00
jordan4ibanez 31a791c33b Undo debug.txt spam from mob spawning 2021-04-22 18:20:58 -04:00
jordan4ibanez d0d128c1d8 Break infinite loop if unable to find any mob to spawn 2021-04-22 18:18:57 -04:00
jordan4ibanez ee905642c2 Add temporary warning debug to spawning algorithm output 2021-04-22 17:56:38 -04:00
jordan4ibanez 2cef9e7cca Optimize mob spawning even further with additional lua locals 2021-04-22 00:39:32 -04:00
jordan4ibanez edb1939649 Fix mob_counter in mob spawning limiter 2021-04-22 00:27:35 -04:00
jordan4ibanez 7c1adeab45 Hyper-optimize mob spawning 2021-04-22 00:20:57 -04:00
jordan4ibanez ecebe0253c Merge branch 'mineclone5' into mineclone5 2021-04-22 03:29:18 +00:00
jordan4ibanez fbe3ccc5c0 Delete current state of things comment 2021-04-21 23:28:38 -04:00
jordan4ibanez e398aca747 Merge pull request 'Fix sheep and pig rotation' (#1592) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: MineClone2/MineClone2#1592
 2021-04-22 03:26:27 +00:00
jordan4ibanez 5e15af260b Fix pig rotation 2021-04-21 23:25:19 -04:00
jordan4ibanez 6aa6364492 Fix sheep rotation 2021-04-21 23:25:10 -04:00
kay27 7c2ea8d7f0 [mineclone5] Merge backup_code_api.lua from latest mineclone5 and playerplus from master 2021-04-22 01:16:22 +04:00
jordan4ibanez 29305f548d Overhaul arrow register, implement basic blaze, break parts of arrow register for now, remove fallback for detecting players 2021-04-21 15:08:35 -04:00
jordan4ibanez 08c90c34e8 Make parrots and squids work with tilt fly/swim 2021-04-21 13:05:46 -04:00
jordan4ibanez 91099c3be9 Fix auto-true statement for tilt fly/swim 2021-04-21 13:01:14 -04:00
jordan4ibanez 71c34823bc Make tilt flying/swimming dynamic 2021-04-21 12:56:36 -04:00
jordan4ibanez 20886f54bb Make shooty mobs jump 2021-04-21 12:48:23 -04:00
jordan4ibanez ebd995fbd2 Simplify skeleton arrow damage calculation 2021-04-21 12:45:02 -04:00
jordan4ibanez c9f71d66f5 Implement skeletons/strays 2021-04-21 12:42:34 -04:00
jordan4ibanez 99e808296b Add missing skeleton/stray run animation 2021-04-21 12:17:51 -04:00
jordan4ibanez 74094938bb Fix crash with non-punch attack mobs in collision 2021-04-21 12:10:29 -04:00
jordan4ibanez 6bd279255c Fully implement zombie pigmen 2021-04-21 11:50:22 -04:00
jordan4ibanez 964ce9ccf7 Temporarily disable spawn eggs from setting owner 2021-04-21 11:42:01 -04:00
jordan4ibanez 5062d56a5d Implement neutral mob mechanics and partial implement of zombie pigmen 2021-04-21 11:00:02 -04:00
jordan4ibanez b0b1ec9436 Implement zombie pigmen and make them turn hostile when punched 2021-04-21 10:53:20 -04:00
jordan4ibanez f1dc286442 Dump mob_punch from backup_code_api.lua back into interaction.lua 2021-04-21 10:23:51 -04:00
jordan4ibanez cc2a0ae52c Complete charged creeper 2021-04-21 10:21:11 -04:00
jordan4ibanez 486959515c Make creepers even more dangerous 2021-04-21 10:20:31 -04:00
Lizzy Fleckenstein 1e7ba2b605 Merge branch 'master' into damage 2021-04-21 11:32:50 +02:00
Lizzy Fleckenstein fe5f61c747 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-21 11:31:53 +02:00
Lizzy Fleckenstein f3c4dd699d Merge branch 'master' into mineclone5 2021-04-21 11:31:39 +02:00
jordan4ibanez 576621169b Make creepers and zombies even harder 2021-04-20 23:26:18 -04:00
jordan4ibanez 2c87bd19f3 Overhaul zombie villager 2021-04-20 23:14:53 -04:00
jordan4ibanez 1ed3377559 Add punch mobs knockback to players when hit 2021-04-20 23:11:18 -04:00
jordan4ibanez 8c9356a18c Implement eye_height and viewing range for hostile mobs, along with making punchy mobs jump over nodes 2021-04-20 22:58:39 -04:00
jordan4ibanez a05ebd7cc2 Add informative text art 2021-04-20 22:44:34 -04:00
jordan4ibanez 60ac3058ce Make zombies more difficult 2021-04-20 22:42:51 -04:00
jordan4ibanez 751c4c2d99 Integrate mob punching into collision detection 2021-04-20 22:41:13 -04:00
jordan4ibanez 6b52b94516 Start setting up hostile punch attack type 2021-04-20 22:30:34 -04:00
jordan4ibanez d371d6fdc9 Adjust creeper explosion settings 2021-04-20 22:04:54 -04:00
jordan4ibanez fabd4d64e6 Slow down creeper type mobs explosion buildup 2021-04-20 21:35:19 -04:00
jordan4ibanez bf367fffd0 Add in sound_handling and make explosion type mobs make their attack sound before explosion animation 2021-04-20 21:34:18 -04:00
jordan4ibanez 0b763f54b5 Finish creeper movement ai and move jump_check into environment 2021-04-20 21:00:36 -04:00
jordan4ibanez cd6f07537f Make creepers even more deadly 2021-04-20 20:43:45 -04:00
jordan4ibanez 9678b556e1 Fix crashes when trying to collision detect a removed mob 2021-04-20 20:33:30 -04:00
jordan4ibanez cdb840609d Add in creeper basic prototype 2021-04-20 20:19:55 -04:00
jordan4ibanez 008d670ed9 Remove wandering from ai 2021-04-20 17:10:51 -04:00
jordan4ibanez 491ef6c8f8 Add in auto mob removal if something goes horribly wrong 2021-04-20 16:48:20 -04:00
jordan4ibanez 348df0fcec Rename detect_players_in_area to detect_closest_player_within_radius 2021-04-20 16:46:10 -04:00
jordan4ibanez ac08c6991c Add in detect_players_in_area 2021-04-20 16:39:05 -04:00
jordan4ibanez 3d776138e9 Start implementing creeper ai 2021-04-20 14:55:22 -04:00
kay27 106ecb0958 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-20 22:08:36 +04:00
epCode c7d91baadf rid some mobs of bouncing animation 2021-04-19 14:29:12 -07:00
Lizzy Fleckenstein ca74f23094 Merge branch 'master' into damage 2021-04-19 18:58:00 +02:00
Lizzy Fleckenstein d8d4cb5def Revert color changes to GUI. 
The Minecraft colorset (net.minecraft.util.text.TextFormatting) is only used for chat and tooltips.
This partically reverts 84819bf9f5.
 2021-04-19 14:44:20 +02:00
Lizzy Fleckenstein 69485f8505 Integrate falling nodes damage 2021-04-19 09:49:29 +02:00
jordan4ibanez 85e531bf10 Remove unneeded mobs:protect from code 2021-04-18 21:24:31 -04:00
jordan4ibanez 4d589dfb2a Remove literally unneeded mobs:capture_mob 2021-04-18 21:22:39 -04:00
jordan4ibanez 39985aa558 Up fallback max xp to 3 2021-04-18 21:22:21 -04:00
jordan4ibanez 1920ddf915 Change all enemy attack info to more workable and understandable attacks 2021-04-18 21:02:03 -04:00
kay27 96694692d8 [mineclone5] Put ITEMS/mcl_core/nodes_trees.lua from master 2021-04-19 00:15:20 +04:00
Lizzy Fleckenstein f0d7715080 Merge branch 'master' into damage 2021-04-18 14:51:45 +02:00
kay27 bb902caa57 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-18 04:29:59 +04:00
jordan4ibanez 719bb2a3c9 Add in prototype jump-only mobs api 2021-04-17 18:21:33 -04:00
jordan4ibanez db87b8e0a3 fix chicken rotation 2021-04-17 17:09:57 -04:00
jordan4ibanez e2987245fd Balance out collision forces for mobs 2021-04-17 17:00:34 -04:00
jordan4ibanez 3cf263d292 Add in dynamic pitch in flying/swimming mobs 2021-04-17 16:23:38 -04:00
Lizzy Fleckenstein a7e102426a Add time_of_day to get_light crash fix 2021-04-17 21:01:09 +02:00
Lizzy Fleckenstein bcd058feb1 Fix get_light crash 2021-04-17 21:00:32 +02:00
jordan4ibanez 5ade34115c Remove random state initialization in set_up.lua 2021-04-17 13:17:29 -04:00
jordan4ibanez d9729fc865 Fix parrot's rotation 2021-04-17 13:13:45 -04:00
jordan4ibanez 58d9670e77 Remove collisionbox addition for y position for fly mobs 2021-04-17 13:11:39 -04:00
jordan4ibanez a20f272e08 re-adjust logic gate for mobs floating in water and lava 2021-04-17 13:05:53 -04:00
jordan4ibanez 0794bc5437 Make flying mobs float in water and lava 2021-04-17 13:04:55 -04:00
kay27 ff07ee5d93 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-17 21:02:07 +04:00
jordan4ibanez 8783912938 Add in mobs api swimming animation 2021-04-17 12:48:57 -04:00
jordan4ibanez f2e909ab8d Add in fly logic gate 2021-04-17 12:41:14 -04:00
jordan4ibanez 07841c8963 Swap name of quick_rotate_45 to quick_rotate 2021-04-17 12:38:48 -04:00
jordan4ibanez 240d6ea211 Add note about quick_rotate_45 actually rotating 11.25 degrees 2021-04-17 12:37:04 -04:00
jordan4ibanez e8148f81ab Make underwater mobs try to continuously swim around with quick_rotate_45 2021-04-17 12:36:19 -04:00
jordan4ibanez 061602d9d4 Overhaul separation of swimming and flying for ease of use with writing mobs api 2021-04-17 12:28:07 -04:00
jordan4ibanez 5365dec19a Adjust "flying" vector checks for mobs 2021-04-17 12:01:27 -04:00
Lizzy Fleckenstein c7c47c1ca7 Increase mob_view_range_factor performance 2021-04-17 13:49:40 +02:00
Lizzy Fleckenstein ca75a893db Merge branch 'master' into damage 2021-04-17 12:58:19 +02:00
jordan4ibanez dda7839d8c Add in prototype swimming 2021-04-16 21:43:02 -04:00
jordan4ibanez f1141aed9f Make mobs flop when outside of flying node 2021-04-16 21:08:54 -04:00
jordan4ibanez 84ca7681fc Make squids fly in water flowing and water source 2021-04-16 20:47:16 -04:00
jordan4ibanez 52c3db041e Add in fly state prep for mobs 2021-04-16 20:32:05 -04:00
jordan4ibanez 6db4511dd5 Add notes 2021-04-16 20:06:55 -04:00
jordan4ibanez 15ea9c1c71 Implement self walking velocity for walking state 2021-04-16 19:59:20 -04:00
jordan4ibanez 9d6d042ee3 Fix formatting in ai.lua 2021-04-16 19:37:01 -04:00
jordan4ibanez ce7f4918b0 Re-organize comments 2021-04-16 19:35:19 -04:00
jordan4ibanez 05d06a4c8f Add comment to state_execution 2021-04-16 18:36:23 -04:00
jordan4ibanez c761db86c7 re-arrange mob logic for random wandering 2021-04-16 18:29:42 -04:00
jordan4ibanez ed456ecb47 Make mobs not fear cliffs if fear_height is 0 2021-04-16 18:17:51 -04:00
jordan4ibanez 8ca5f221ec clean up ai.lua 2021-04-16 18:13:54 -04:00
jordan4ibanez cadd53c103 Adjust mob jumping default to account for higher gravity 2021-04-16 16:39:03 -04:00
jordan4ibanez 57b293de2b Make mobs gravity equal to player's 2021-04-16 16:37:15 -04:00
jordan4ibanez fb9a55e562 Make jump_check more modular and allow mobs to turn if at a wall 2021-04-16 15:55:11 -04:00
jordan4ibanez a6a54b3414 Make mobs not jump if against a wall 2021-04-16 15:49:03 -04:00
jordan4ibanez 6c5393427f Smooth out mob cliff check and check if falling before cliff check 2021-04-16 15:39:39 -04:00
jordan4ibanez 2486ffef11 Make wandering mobs avoid cliffs 2021-04-16 15:30:44 -04:00
jordan4ibanez adc683c6a7 Clear mob animation on activate 2021-04-16 14:19:22 -04:00
jordan4ibanez d0695e7929 Fix mob animation "memory leak" 2021-04-16 13:58:08 -04:00
Lizzy Fleckenstein bd3c08d367 Improve mcl_burning player performance 2021-04-16 19:50:56 +02:00
Lizzy Fleckenstein 01c79c5a18 Fix mcl_burning.tick not being called at all for mobs 2021-04-16 18:37:07 +02:00
Lizzy Fleckenstein 095f78b785 Massive mcl_burning performance improvement 2021-04-16 18:34:29 +02:00
jordan4ibanez 024cf46307 Adjust spacing in animation.lua 2021-04-16 11:52:29 -04:00
jordan4ibanez f38492bcb0 Re-implement animation check gate for mobs 2021-04-16 11:50:29 -04:00
jordan4ibanez a934a59f3b Implement mob random walk directions 2021-04-16 11:50:13 -04:00
jordan4ibanez 94ca7e8b89 Add in state switch and state execution for mobs 2021-04-16 11:31:18 -04:00
jordan4ibanez 626c30de6d Create todo.txt 2021-04-16 11:30:55 -04:00
Lizzy Fleckenstein 5d5ed91519 Merge branch 'master' into damage 2021-04-16 12:20:53 +02:00
Lizzy Fleckenstein fbee510b42 Merge branch 'master' into mineclone5 2021-04-16 12:17:55 +02:00
jordan4ibanez c2bac87a6d Update set_up.lua 2021-04-15 21:46:33 -04:00
jordan4ibanez 044e9d22ad Re-enable mob-despawner 2021-04-15 21:13:19 -04:00
epCode cd04f6d7ce Fix glitch with Stray 2021-04-15 14:53:22 -07:00
epCode 9feaec95d9 Fix Stupid mistake with zombievillagers 2021-04-15 14:29:24 -07:00
epCode 0ca6c06198 add the other villager zombie textures 2021-04-15 14:11:35 -07:00
jordan4ibanez 375d683d08 Fix forgotten localization in collision.lua 2021-04-15 16:18:42 -04:00
jordan4ibanez 246bdf9707 Implement basic mob walking animation test 2021-04-15 15:55:10 -04:00
jordan4ibanez d07d0ae31c Make mobs jump properly 2021-04-15 15:34:07 -04:00
jordan4ibanez 6cb6d714c9 Reorganize all mob sections into multiple files 2021-04-15 15:04:55 -04:00
epCode f0fab4e708 Allow zombie villager to have visual armor 2021-04-15 12:04:25 -07:00
jordan4ibanez 5155d12d05 Reformat mobs_mcl to api folder for ease of use 2021-04-15 14:09:54 -04:00
jordan4ibanez bbcfb3fdb1 Randomize walking or standing on spawn in 2021-04-15 11:33:09 -04:00
jordan4ibanez 9e4bf6e130 Move old set_yaw and add node on set_velocity 2021-04-15 11:29:18 -04:00
jordan4ibanez e53a193c4f Fix get_velocity (mobs internal) 2021-04-15 11:25:55 -04:00
jordan4ibanez 14207dd96a Smooth out mob movement set_velocity more 2021-04-15 11:23:52 -04:00
jordan4ibanez a0ed1a0b20 Add automatic rotation lock 2021-04-15 10:05:24 -04:00
jordan4ibanez ba46e7fa42 Remove old debug of colliding with objects 2021-04-15 09:28:58 -04:00
jordan4ibanez 61124905f3 Add in mob auto rotation (implementation 1) 2021-04-15 09:28:22 -04:00
kay27 93429549b8 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-15 15:50:38 +04:00
epCode 5fe30d7287 Make Zmbs, Husks, Sklys, Strys, and WthrSklys support armor textures. 2021-04-14 16:51:17 -07:00
jordan4ibanez 8b200c7352 Add in basic movement rotation testing 2021-04-14 19:38:14 -04:00
jordan4ibanez 67259891a8 Remove unneeded comments 2021-04-14 18:01:29 -04:00
jordan4ibanez d4db27f0e1 Update backup_code_api.lua 2021-04-14 17:25:39 -04:00
jordan4ibanez 755533beeb Disable literally everything in mobs api 2021-04-14 11:50:22 -04:00
Lizzy Fleckenstein 875bb3db84 Use fire-like damage types properly 2021-04-14 17:20:51 +02:00
Lizzy Fleckenstein d0ddd38d4e Merge branch 'master' into damage 2021-04-14 16:14:00 +02:00
Lizzy Fleckenstein ce0148d9a8 Rewrite armor; new damage system 2021-04-14 15:46:52 +02:00
jordan4ibanez 3f6312a631 Make mobs magnetic collision more jello-y 2021-04-13 20:24:46 -04:00
jordan4ibanez aa4d34c10e Improve mob to mob collision 2021-04-13 20:00:38 -04:00
jordan4ibanez 1210bc463a prevent mob collision detection shootout 2021-04-13 19:44:24 -04:00
jordan4ibanez ed60266713 Gut even more elements of the api 2021-04-13 19:17:48 -04:00
jordan4ibanez 220d30df5f Completely gut do_states 2021-04-13 19:13:29 -04:00
kay27 7fa0767b13 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-14 01:18:34 +04:00
jordan4ibanez 9758bbf2e7 Finish gutting mob api 2021-04-13 08:21:04 -04:00
jordan4ibanez f29ad4b8b7 Reorganize more settings to the top of file 2021-04-13 08:20:11 -04:00
jordan4ibanez 54f5bee8a3 reorganize load settings 2021-04-13 08:08:29 -04:00
jordan4ibanez 02515f0778 Move a large chunk of code to backup_code_api.lua 2021-04-13 08:07:32 -04:00
jordan4ibanez 3fc0184182 Disable entire mob ai to work on vanilla walking 2021-04-13 07:39:57 -04:00
Code-Sploit 84764389dc Fix #1538 2021-04-13 11:34:53 +00:00
jordan4ibanez f851f5c7ca Merge branch 'master' into mineclone5 2021-04-12 17:31:51 -04:00
Lizzy Fleckenstein d3d9351bac Merge branch 'master' into mineclone5 2021-04-12 15:45:16 +02:00
Lizzy Fleckenstein 0d5933b95e Remove debug printin mcl_mobs 2021-04-12 15:45:00 +02:00
Lizzy Fleckenstein 8b5be69332 Merge branch 'master' into mineclone5 2021-04-12 15:06:49 +02:00
jordan4ibanez 6fff719322 Localize minetest library 2021-04-12 08:47:07 -04:00
jordan4ibanez adaf74fc5c Remove spacing and delete old collision comments 2021-04-12 08:13:11 -04:00
jordan4ibanez a564009e4a Change HORNY_TIMER to BREED_TIMER 2021-04-12 08:11:55 -04:00
jordan4ibanez 00759da39d Unlimit mob ai 2021-04-11 18:29:32 -04:00
jordan4ibanez 9aafc28a20 Fix mobs nil check during mob_step 2021-04-11 14:47:56 -04:00
jordan4ibanez 67c40885ef Fix mobs collision system only running during movement - major overhaul with ai disabled 2021-04-11 14:21:19 -04:00
jordan4ibanez 2456e3cd1e Adjust math localizations in api.lua 2021-04-11 12:52:31 -04:00
jordan4ibanez 725dc731dd Adjust mob collision detection - this breaks a lot of things and will be fixed later 2021-04-11 11:58:33 -04:00
Lizzy Fleckenstein c0a31f0e9c Fix #1535 2021-04-11 17:30:32 +02:00
kay27 4a3078f04b [mobs] Merge repeat/break/until instead of goto from master 2021-04-11 02:16:09 +04:00
kay27 40c733c913 [mobs_mc] Remove `goto` from enderman.lua 2021-04-11 02:11:14 +04:00
kay27 a76fe2b487 [mcl_mobs] Replace `goto` to `repeat-break-until true` in spawning.lua 2021-04-11 02:11:06 +04:00
kay27 b14ca5a843 Revert "[mcl_mobs, mobs_mc] TEMP! Remove `goto` to run on RasbPI4, Oil_boi free to revert" 
This reverts commit ea41c82834.
 2021-04-11 02:10:27 +04:00
Lizzy Fleckenstein 9ba1917209 Add end crystal beams 2021-04-10 20:58:34 +02:00
kay27 ea41c82834 [mcl_mobs, mobs_mc] TEMP! Remove `goto` to run on RasbPI4, Oil_boi free to revert 2021-04-10 20:47:55 +02:00
kay27 647b5c1e8a [mcl_mobs, mobs_mc] TEMP! Remove `goto` to run on RasbPI4, Oil_boi free to revert 2021-04-10 21:15:04 +04:00
jordan4ibanez 6279f5eb41 test 2021-04-08 23:58:12 +04:00
jordan4ibanez 9789cf5dcd Adjust spawning to be closer and more frequent 2021-04-08 23:58:12 +04:00
jordan4ibanez 26847bbb54 Finish mob limiter 2021-04-08 23:58:12 +04:00
jordan4ibanez 4fca50dead Fix spawn timer reset debug 2021-04-08 23:58:12 +04:00
jordan4ibanez 310dcf9660 Fix forgotten biome check 2021-04-08 23:58:11 +04:00
jordan4ibanez ba9866db49 merge 2021-04-08 23:58:11 +04:00