argo
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity
6,361 Commits 68 Branches 76 Tags 145 MiB
Commit Graph

6361 Commits

Author SHA1 Message Date
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 346efee399 Merge pull request 'Revert fixes to crash world border' (#1510) from jordan4ibanez/MineClone2:master into master 
Reviewed-on: MineClone2/MineClone2#1510
 2021-04-08 19:49:26 +00:00
jordan4ibanez 18f73ba31f Revert fixes to crash world border 2021-04-08 15:48:53 -04:00
jordan4ibanez 213d24cc86 Merge pull request 'Add erlehmann fix to redstone world border crash' (#1509) from jordan4ibanez/MineClone2:master into master 
Reviewed-on: MineClone2/MineClone2#1509
 2021-04-08 19:17:24 +00: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 fa95545252 Merge pull request 'Fix extreme mesecons/redstone crashing at world border' (#1508) from jordan4ibanez/MineClone2:master into master 
Reviewed-on: MineClone2/MineClone2#1508
 2021-04-08 18:29:30 +00:00
jordan4ibanez 0842a36aa6 Fix extreme mesecons/redstone crashing at world border 2021-04-08 14:28:07 -04:00
jordan4ibanez c4334a19a5 Merge pull request 'Adjust spawning distance' (#1507) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: MineClone2/MineClone2#1507
 2021-04-08 18:21:06 +00:00
jordan4ibanez c937b2a973 test 2021-04-08 14:19:42 -04:00
jordan4ibanez 3884750efa Merge pull request 'Adjust spawning to be closer and more frequent' (#1505) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: MineClone2/MineClone2#1505
 2021-04-08 16:48:45 +00:00
jordan4ibanez 8c10fe4057 Adjust spawning to be closer and more frequent 2021-04-08 12:48:02 -04:00
kay27 75247ad53d Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-08 20:22:13 +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 9a617a3150 Merge pull request 'Finish mob limiter' (#1503) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: MineClone2/MineClone2#1503
 2021-04-08 16:08:30 +00:00
jordan4ibanez bd7866d798 Finish mob limiter 2021-04-08 12:07:20 -04:00
jordan4ibanez 40478aa150 Merge pull request 'Fix forgotten biome check' (#1502) from jordan4ibanez/MineClone2:mineclone5 into mineclone5 
Reviewed-on: MineClone2/MineClone2#1502
 2021-04-08 14:01:49 +00: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