Eliy21
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity
6,406 Commits 87 Branches 76 Tags 156 MiB
Commit Graph

5984 Commits

Author SHA1 Message Date
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
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
Lizzy Fleckenstein b914e088cc Update README files 2021-04-12 14:03:51 +02: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
jordan4ibanez 8c10fe4057 Adjust spawning to be closer and more frequent 2021-04-08 12:48:02 -04:00
AFCMS 61722850ae Revert "fix add_bar function returning nil value" 
This reverts commit 11114c6847.
 2021-04-08 20:22:09 +04:00
AFCMS 36d4049632 fix add_bar function returning nil value 2021-04-08 20:22:09 +04:00
iliekprogrammar bfc1f253af Allow kelp stems at half height to be treated like full-sized ones. 
Remove debug information
 2021-04-08 20:22:09 +04:00
iliekprogrammar ce66d99504 Fix bug where incorrect number of items are dropped. 2021-04-08 20:22:09 +04:00
iliekprogrammar 70d1aba73e Prevent param2 overflow when adding stems. Fix #1490 2021-04-08 20:22:08 +04:00
jordan4ibanez bd7866d798 Finish mob limiter 2021-04-08 12:07:20 -04:00
jordan4ibanez 9369c9cab8 Fix spawn timer reset debug 2021-04-08 10:01:15 -04:00
jordan4ibanez 28823298e1 Fix forgotten biome check 2021-04-08 10:00:04 -04:00
jordan4ibanez 9d48549ec5 Complete prototype of biome generated mobs 2021-04-08 09:52:50 -04:00
jordan4ibanez 518252679f Fix a lot of things 2021-04-08 08:42:57 -04:00
jordan4ibanez bb078b0c4c Fix silverfish typo 2021-04-08 08:33:50 -04:00
jordan4ibanez adab48ff0c Readjust mobs internal settings to not cause insane memory usage 2021-04-08 08:29:16 -04:00
jordan4ibanez 47c59edb51 Fix typo 2021-04-08 08:13:46 -04:00
jordan4ibanez 5ca30fa8ee Combine air and ground type spawning into ground 2021-04-08 08:12:43 -04:00
jordan4ibanez aacb8fc7b9 Add in extra_mobs information 2021-04-08 08:09:43 -04:00
jordan4ibanez f900b24b53 Add in all biome information to mobs 2021-04-08 07:39:18 -04:00
iliekprogrammar d50665d2d5 Allow kelp stems at half height to be treated like full-sized ones. 
Remove debug information
 2021-04-08 19:25:19 +08:00
jordan4ibanez 0ad833c046 Add bats, chicken, and blaze spawn info 2021-04-08 06:57:24 -04:00
jordan4ibanez f4a6bdc6b8 Make reference list copy-pastable 2021-04-08 06:48:25 -04:00
jordan4ibanez bf4bf9a0cc Ignore default or void dimensions 2021-04-08 06:10:07 -04:00
jordan4ibanez 8e1e02d1fb Add biome list 2021-04-08 06:04:36 -04:00
jordan4ibanez da045c207d Refactor spawning into it's own file 2021-04-08 02:07:15 -04:00
iliekprogrammar 5ccb12586d Fix bug where incorrect number of items are dropped. 2021-04-08 13:35:49 +08:00
iliekprogrammar 2db0e176b3 Prevent param2 overflow when adding stems. Fix #1490 2021-04-08 12:46:04 +08:00
jordan4ibanez b0c60c69d0 Merge pull request 'Fix mobs colliding with each other/players instead of magnetically' (#1495) from jordan4ibanez/MineClone2-MobTweaks:master into mineclone5 
Reviewed-on: MineClone2/MineClone2#1495
 2021-04-08 03:18:24 +00:00
jordan4ibanez 6ec66ef6f6 Fix mobs colliding with other mobs/players 2021-04-07 23:16:03 -04:00
jordan4ibanez 6bd249547a Fix mobs colliding with objects 2021-04-07 23:07:04 -04:00
kay27 227180035f Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-08 02:58:17 +04:00
kay27 8e30bc8dbd [mcl_portals] Prevent from spawning Nether portals in Undertale when not enough air space in Nether 2021-04-08 02:54:33 +04:00
kay27 c89768f8f7 [extra_mobs] Fix hoglin spawn caused server crash 2021-04-08 01:16:06 +04:00
kay27 5d48975a07 [mineclone5] Make work new mob spawn by Oil_boi with extra_mobs 2021-04-08 00:44:20 +04:00
kay27 3accc82d2d 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-07 20:47:40 +04:00
kay27 034af87cd7 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-07 20:40:07 +04:00
Lizzy Fleckenstein d77affca91 Change max_bossbars default to 4 2021-04-07 17:39:13 +02:00
Lizzy Fleckenstein 6a1a634cba Revert "Merge pull request 'Massively overhaul spawning algorithm for mobs' (#1487) from jordan4ibanez/MineClone2-MobTweaks:master into master" 
This reverts commit 4f2a6b2db0, reversing
changes made to 0970981252.
 2021-04-07 17:20:56 +02:00
Lizzy Fleckenstein 6c35ff1fc5 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-07 17:02:46 +02:00
Lizzy Fleckenstein 567f157541 Add a bossbar limit setting 2021-04-07 17:02:03 +02:00
Lizzy Fleckenstein f282cd0c4d Allow bossbars to be grouped 2021-04-07 16:56:21 +02:00
Lizzy Fleckenstein 3449b3eb7c Improve bossbars API 2021-04-07 16:47:14 +02:00
iliekprogrammar 986ae950ec Merge remote-tracking branch 'upstream/master' 2021-04-07 22:30:44 +08:00
iliekprogrammar 61cef21cd1 Add right-to-left statbars, for hunger and air. 2021-04-07 22:26:42 +08:00
kay27 99563ab93a Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-07 17:19:41 +04:00
TechDudie db9e8d23d9 Update 'mods/ENTITIES/mobs_mc/creeper.lua' 2021-04-07 17:16:38 +04:00
TechDudie f664a87dac Update 'mods/ENTITIES/mobs_mc/creeper.lua' 2021-04-07 17:16:38 +04:00
Lizzy Fleckenstein 6e2a7c8a7e Make gateway enderpearl teleports easier 2021-04-07 13:47:48 +02:00
Lizzy Fleckenstein c451866a36 Fix #1426 2021-04-07 09:56:00 +02:00
Lizzy Fleckenstein 3c1a38904a Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-07 09:25:44 +02:00
Lizzy Fleckenstein b2c09c8ba0 Add gateway portals 2021-04-07 09:17:13 +02:00
jordan4ibanez 4f2a6b2db0 Merge pull request 'Massively overhaul spawning algorithm for mobs' (#1487) from jordan4ibanez/MineClone2-MobTweaks:master into master 
Reviewed-on: MineClone2/MineClone2#1487
 2021-04-07 06:40:21 +00:00
jordan4ibanez ec6eb51726 Massively overhaul spawning algorithm for mobs 2021-04-07 02:39:15 -04:00
jordan4ibanez 6cdf7c98c2 Rework all mobs spawning - preprototype stage 2021-04-07 00:55:57 -04:00
jordan4ibanez 0970981252 Merge pull request 'Adjust enderman projectile behavior, add snowballs to avoidance' (#1485) from jordan4ibanez/MineClone2-MobTweaks:master into master 
Reviewed-on: MineClone2/MineClone2#1485
 2021-04-07 02:22:44 +00:00
jordan4ibanez 6c4c22e3b9 Adjust enderman projectile behavior, add snowballs to avoidance 2021-04-06 22:22:05 -04:00
jordan4ibanez 9b1cc19718 Merge pull request 'Make mobs not collide with objects to stop weird glitches' (#1484) from jordan4ibanez/MineClone2-MobTweaks:master into master 
Reviewed-on: MineClone2/MineClone2#1484
 2021-04-07 02:08:39 +00:00
jordan4ibanez 7cecc71b91 Make mobs not collide with objects to stop weird glitches 2021-04-06 22:08:10 -04:00