mim
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity
6,571 Commits 67 Branches 76 Tags 158 MiB
Commit Graph

6140 Commits

Author SHA1 Message Date
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
AFCMS 457f61a532 Fix #1570 2021-04-16 11:40:44 +00:00
AFCMS 1a58b0c510 fix many codestyle issues 2021-04-16 13:35:03 +02:00
Lizzy Fleckenstein fbee510b42 Merge branch 'master' into mineclone5 2021-04-16 12:17:55 +02:00
AFCMS 2d6e0241cd Merge branch 'master' into luacheck 2021-04-16 11:03:46 +02:00
AFCMS 1df916bd7b fix warning 2021-04-16 11:03:31 +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 31dfeae445 Fix female player model for footglitch/elytra 2021-04-15 14:57:55 -07:00
epCode cd04f6d7ce Fix glitch with Stray 2021-04-15 14:53:22 -07:00
AFCMS 60e74fc41d fix excedent lines 2021-04-15 23:44:29 +02:00
AFCMS a602f64ea5 fix many warnings 2021-04-15 23:41:34 +02: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
AFCMS b497778192 delete unused file 2021-04-15 22:22:39 +02: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
Elias Fleckenstein 0c5096db13 Merge pull request 'Fixes for german locales (2021-04-14_locales_german)' (#1564) from n_to/MineClone2:2021-04-14_locales_german into master 
Reviewed-on: MineClone2/MineClone2#1564
 2021-04-15 16:18:51 +00: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
NO11 a8760c0375 Reduce the radius in which a cactus destroys items 2021-04-15 12:23:08 +00:00
kay27 93429549b8 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-15 15:50:38 +04:00
NO11 bbffda3635 Make cactus destroy items 2021-04-15 11:21:15 +00:00
Nils Dagsson Moskopp 2575e20e7e Show preview of new banner pattern when crafting it 2021-04-15 13:25:59 +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 d063db751c Disable mcl_playerplus random check that moves players randomly 2021-04-14 17:26:20 -04:00
jordan4ibanez d4db27f0e1 Update backup_code_api.lua 2021-04-14 17:25:39 -04:00
Benjamin Schötz bffd032a8b Fixes my own typo ;) 2021-04-14 22:06:03 +02:00
Benjamin Schötz e4c8ba795a Fixes typos, grammar errors, and some translation flaws in several german translation files. 2021-04-14 22:03:36 +02:00
epCode 18cdd13c06 Partialy fix #1559 2021-04-14 11:01:50 -07:00
Lizzy Fleckenstein 7f28f4a9d1 Merge branch 'master' into mineclone5 2021-04-14 18:16:24 +02:00
Lizzy Fleckenstein c41bd3932c Add global smoke spawning API 2021-04-14 18:14:21 +02:00
jordan4ibanez 755533beeb Disable literally everything in mobs api 2021-04-14 11:50:22 -04:00
j1233 46b1762872 credit me 
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_fireworks/README.txt#L3
 2021-04-14 14:53:33 +00:00
Lizzy Fleckenstein 963adfb4e2 Move @Code-Sploit to devs section 2021-04-14 16:37:07 +02:00
Lizzy Fleckenstein 6d0abb2973 Merge branch 'master' into beta 2021-04-14 16:36:04 +02:00
jordan4ibanez 3f6312a631 Make mobs magnetic collision more jello-y 2021-04-13 20:24:46 -04:00
epCode 5b93ee5e40 Improve rocket 2021-04-13 17:07:28 -07: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
epCode 8d22102c66 remove abitrary minetest.chat_send_all( 2021-04-13 16:28:38 -07:00
epCode a93562a60c Merge pull request 'Add Firework Rocket for elytra boost' (#1551) from NO11/MineClone2:elytra_rocket into master 
Reviewed-on: MineClone2/MineClone2#1551
 2021-04-13 23:27:23 +00:00
jordan4ibanez ed60266713 Gut even more elements of the api 2021-04-13 19:17:48 -04:00
epCode 399ed85717 Make flying w elytra use pitch and not sneak 2021-04-13 16:14:37 -07:00
jordan4ibanez 220d30df5f Completely gut do_states 2021-04-13 19:13:29 -04:00
jordan4ibanez 67c1bc973a Add lua locals into mcl_dungeons for performance 2021-04-14 01:19:01 +04:00
kay27 7fa0767b13 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-14 01:18:34 +04:00
NO11 1c50f9aed6 fix typo 2021-04-13 20:52:55 +00:00
NO11 f768972469 add rocket texture (pixel perfection) 2021-04-13 20:38:00 +00:00
NO11 9c68528b8b add german translation 2021-04-13 20:36:41 +00:00
NO11 1597e093b5 Dateien hochladen nach „mods/ITEMS/mcl_fireworks/sounds“ 2021-04-13 20:35:40 +00:00
NO11 f15a28109c add rocket for elytra boost 2021-04-13 20:33:34 +00:00
epCode f498d3ae02 make elytra activate mor MC-like 2021-04-13 11:45:31 -07:00
Code-Sploit cd0d2d2296 Fix #1548 2021-04-13 13:57:45 +00:00
kay27 3077498a63 Fix screwdriver/door duplication glitch, MineClone2/MineClone2#1149 2021-04-13 16:49:10 +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
Lizzy Fleckenstein b340a3586d Make mcl_backstone use the new mcl_torches API for soul torches instead of overwriting it 2021-04-13 10:05:22 +02:00
Lizzy Fleckenstein 78d387e2df Rewrite mcl_torches API 2021-04-13 09:59:51 +02:00
Lizzy Fleckenstein 944a6325d0 Rewrite mcl_torches API 2021-04-13 09:59:32 +02:00
Lizzy Fleckenstein 89c4720de1 Fix warning with leafdecay_distance 2021-04-13 08:53:22 +02:00
Lizzy Fleckenstein 9ce4cd1281 Fix fire_enabled warning 2021-04-13 08:50:50 +02:00
Lizzy Fleckenstein fe5a8737b8 Fix light_source warning in mcl_mushroom 2021-04-13 08:49:57 +02:00
Lizzy Fleckenstein 0dc44afe3d Merge branch 'master' into mineclone5 2021-04-13 08:46:06 +02:00
Lizzy Fleckenstein 421ab9f660 Add timeout to static hudbars 2021-04-13 08:42:17 +02:00
Lizzy Fleckenstein 5ddd1d0193 Merge branch 'master' into beta 2021-04-13 08:33:31 +02:00
Lizzy Fleckenstein e1ccdef42a Merge branch 'master' into mineclone5 2021-04-13 08:22:39 +02:00
Lizzy Fleckenstein 037832a177 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-13 08:06:28 +02:00
epCode 424685d3d3 Add elytra (sprint in air to use) 2021-04-12 14:56:33 -07:00
jordan4ibanez f851f5c7ca Merge branch 'master' into mineclone5 2021-04-12 17:31:51 -04:00
Lizzy Fleckenstein 8cede8a5a3 Merge branch 'master' into mineclone5 2021-04-12 17:54:32 +02:00
Lizzy Fleckenstein 5028728fbc Merge branch 'master' into faithful 2021-04-12 17:54:20 +02:00
Lizzy Fleckenstein 6f770bc962 Fix crash in mcl_bossbars.remove_bar 2021-04-12 17:54:09 +02:00
Lizzy Fleckenstein f540bc2bb1 Merge branch 'master' into beta 2021-04-12 17:31:58 +02:00
Lizzy Fleckenstein 5fb7913355 Revert "Revert "Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master"" 
This reverts commit 615b15f133.
 2021-04-12 16:36:08 +02:00
Lizzy Fleckenstein d3a3253563 Revert "Revert "Make hoe dig some blocks faster"" 
This reverts commit db5626fcb4.
 2021-04-12 16:34:40 +02:00
Lizzy Fleckenstein c3868084af Revert "Fix crash with removed hoey diggroup" 
This reverts commit ed7099fefc.
 2021-04-12 16:34:25 +02: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 bb16512842 Revert "Revert "Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master"" 
This reverts commit 615b15f133.
 2021-04-12 15:28:28 +02:00
Lizzy Fleckenstein 06e8e8f463 Merge branch 'master' into mineclone5 2021-04-12 15:28:00 +02:00
Lizzy Fleckenstein 615b15f133 Revert "Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master" 
This reverts commit 7a8079bb64, reversing
changes made to 849823af1f.
 2021-04-12 15:25:31 +02:00
Lizzy Fleckenstein 1ca95f9495 Revert "Fix crash with removed hoey diggroup" 
This reverts commit ed7099fefc.
 2021-04-12 15:19:36 +02:00
Lizzy Fleckenstein 9da82d44c5 Merge branch 'master' into mineclone5 2021-04-12 15:19:04 +02:00
Lizzy Fleckenstein ed7099fefc Fix crash with removed hoey diggroup 2021-04-12 15:18:19 +02:00
Lizzy Fleckenstein 7995ff0527 Revert "Revert "Make hoe dig some blocks faster"" 
This reverts commit db5626fcb4.
 2021-04-12 15:09:48 +02:00
Lizzy Fleckenstein 8b5be69332 Merge branch 'master' into mineclone5 2021-04-12 15:06:49 +02:00
Lizzy Fleckenstein db5626fcb4 Revert "Make hoe dig some blocks faster" 
This reverts commit c1e295de5f.
 2021-04-12 15:05:01 +02:00
Lizzy Fleckenstein 523a0c54d6 Localize c_x and c_y in mcl_playerplus 2021-04-12 14:54:14 +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
Lizzy Fleckenstein b914e088cc Update README files 2021-04-12 14:03:51 +02: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
Lizzy Fleckenstein 24f8f9166b Fix #1528 2021-04-11 17:29:05 +02:00
Lizzy Fleckenstein af044e6a96 Bossbars: Add support for non-mob bosses 2021-04-11 11:15:09 +02:00
Lizzy Fleckenstein 2313012f60 Fix #1528 2021-04-11 10:41:11 +02:00
epCode ce49cd02ac make player collision box MUCH closer to MC 2021-04-10 15:41:50 -07: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
epCode 3ff214ec2d lessen the push strength for players 2021-04-10 15:06:16 -07:00
epCode f6db31eae3 add criticle and sprint hits. 2021-04-10 14:47:26 -07: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
Lizzy Fleckenstein 2116b2b9d0 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-10 20:05:09 +02:00
epCode 08b7340ff5 Fix crash with player near unknown object 2021-04-10 10:20:38 -07: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
kay27 9e15c6f168 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-10 20:01:17 +04:00
NO11 cdd12a0c71 Charcoal made from debarked wood 2021-04-10 11:19:51 +00:00
NO11 652f8d48ed Debark wood with an axe 2021-04-09 22:16:52 +00:00
NO11 988f298375 Add stripped wood crafting 2021-04-09 22:13:50 +00:00
kay27 686fd5f844 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-10 02:12:13 +04:00
NO11 c73cd8b810 Add stripped spruce textures 2021-04-09 22:11:32 +00:00
NO11 ebd4380c98 Add stripped oak textures 2021-04-09 22:10:47 +00:00
NO11 3d732c2412 Add stripped jungle textures 2021-04-09 22:10:10 +00:00
NO11 03e112ef9b Add stripped dark oak textures 2021-04-09 22:09:16 +00:00
NO11 9b81a4d83e Add stripped birch textures 2021-04-09 22:08:39 +00:00
NO11 cbcaef19c6 Add stripped acacia textures 2021-04-09 22:07:44 +00:00
NO11 9e5fb7f533 Add #490 2021-04-09 22:04:42 +00:00
epCode 849823af1f Add player pushing ;) 2021-04-09 14:33:14 -07:00
kay27 3addd4ebb1 Revert "Attemp to fix #1513" in favour of next commit 3375e903ce 
This reverts commit f5f6e232cc.
 2021-04-09 19:06:11 +04:00
kay27 1cb060ea08 [mesecons] Fix attempt to call upvalue in internal.lua 2021-04-09 19:06:11 +04:00
AFCMS d2c65f14a3 Attemp to fix #1513 2021-04-09 19:06:11 +04:00
kay27 d50fd06c82 Revert "Attemp to fix #1513" in favour of next commit 3375e903ce 
This reverts commit f5f6e232cc.
 2021-04-09 19:03:45 +04:00
kay27 3375e903ce [mesecons] Fix attempt to call upvalue in internal.lua 2021-04-09 18:52:33 +04:00
AFCMS f5f6e232cc Attemp to fix #1513 2021-04-09 16:46:41 +02:00
Lizzy Fleckenstein c6ffccfef5 Add priority to bossbars; display bossbars of closest bosses first 2021-04-09 13:35:58 +02:00
Lizzy Fleckenstein cbd2731e06 Improve mcl_bossbars performance 2021-04-09 13:22:45 +02:00
jordan4ibanez e15fd2f4b6 Add lua locals into mcl_dungeons for performance 2021-04-09 01:38:34 -04:00
kay27 bc16c33dde Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-09 02:15:15 +04:00
kay27 a733eb8e0c [mesecons] Localise several things in internal.lua 2021-04-09 02:08:03 +04:00
Nils Dagsson Moskopp 7c8cf6f79f Do not crash server if world border is depowered 2021-04-09 01:33:22 +04:00
kay27 f0c2eb86a2 Revert (3/3) "Fix extreme mesecons/redstone crashing at world border" 
This reverts commit 0842a36aa6.
 2021-04-09 01:32:58 +04:00
kay27 26ce10d25c Revert (2/3) "Add erlehmann fix to redstone world border crash" 
This reverts commit b9d175e6a5.
 2021-04-09 01:32:27 +04:00
kay27 6b31e85385 Revert (1/3) "Revert fixes to crash world border" 
This reverts commit 18f73ba31f.
 2021-04-09 01:31:21 +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
jordan4ibanez 282ba2614a merge 2021-04-08 23:58:11 +04:00
jordan4ibanez 26ef8c2674 Fix silverfish typo 2021-04-08 23:58:11 +04:00
jordan4ibanez f5cc2bab09 Readjust mobs internal settings to not cause insane memory usage 2021-04-08 23:58:11 +04:00
jordan4ibanez 71c50042e6 Fix typo 2021-04-08 23:58:11 +04:00
jordan4ibanez ae0c235c1f Combine air and ground type spawning into ground 2021-04-08 23:58:11 +04:00
jordan4ibanez 668b67158c merge 2021-04-08 23:58:11 +04:00
jordan4ibanez c259fc2a28 Add in all biome information to mobs 2021-04-08 23:58:11 +04:00
jordan4ibanez 249a3c8891 Add bats, chicken, and blaze spawn info 2021-04-08 23:58:11 +04:00
jordan4ibanez 34b66acc9d Make reference list copy-pastable 2021-04-08 23:58:11 +04:00
jordan4ibanez 89f35c06af Ignore default or void dimensions 2021-04-08 23:58:11 +04:00
jordan4ibanez cb093b774c Add biome list 2021-04-08 23:58:10 +04:00
jordan4ibanez abc68f4dc6 Refactor spawning into it's own file 2021-04-08 23:58:10 +04:00
jordan4ibanez 38dcbcb3d4 Fix mobs colliding with other mobs/players 2021-04-08 23:58:10 +04:00
jordan4ibanez d65a5e3be0 Fix mobs colliding with objects 2021-04-08 23:58:10 +04:00
kay27 de41a4c26b merge 2021-04-08 23:58:10 +04:00
kay27 5e0bd2281c Revert "Revert "Merge pull request 'Massively overhaul spawning algorithm for mobs' (#1487) from jordan4ibanez/MineClone2-MobTweaks:master into master"" 
This reverts commit 6a1a634cba.
 2021-04-08 23:58:10 +04:00
jordan4ibanez 18f73ba31f Revert fixes to crash world border 2021-04-08 15:48:53 -04:00
jordan4ibanez b9d175e6a5 Add erlehmann fix to redstone world border crash 2021-04-08 15:16:38 -04:00
kay27 871ad8d8d9 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-08 23:07:31 +04:00
jordan4ibanez 0842a36aa6 Fix extreme mesecons/redstone crashing at world border 2021-04-08 14:28:07 -04:00
jordan4ibanez c937b2a973 test 2021-04-08 14:19:42 -04:00