atomdmac
/
MineClone5
forked from MineClone5/MineClone5
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,824 Commits 32 Branches 24 Tags 71 MiB
Commit Graph

8824 Commits

Author SHA1 Message Date
kay27 2772303fc0 #373 Fix generated dropped cactee 2022-07-17 04:16:44 +03:00
kay27 1cebafee80 Remove tabs 2022-07-17 04:08:21 +03:00
kay27 7f02781339 Localize lava_spark_add() 2022-07-17 04:04:39 +03:00
kay27 69b66c2e3c Merge testing into grow_cactus_in_inactive_areas 2022-07-17 03:50:00 +03:00
kay27 9210e05eba #373 Grow cactus in inactive areas/during skipped nights 2022-07-17 03:27:12 +03:00
kay27 f4e44acb94 #372 Prevent crash in mcl_shields/init:181 2022-07-17 02:00:37 +03:00
kay27 08846bef2f Merge master into testing 2022-07-17 01:53:37 +03:00
kay27 ec00351041 Merge pull request 'fox_fixes' (#368) from SumianVoice/MineClone5_c:fox_fixes into master 
Reviewed-on: MineClone5/MineClone5#368
 2022-07-15 13:57:18 +00:00
Sumyjkl 3ec5a26aa1 removed unnecessary added debugging code 2022-07-14 15:12:43 +10:00
Sumyjkl b2bebd1d8d comments and changed scare distance 2022-07-14 14:57:30 +10:00
Sumyjkl 0a3190887c made fox run from player 2022-07-14 14:46:00 +10:00
Sumyjkl 56b1cc8d75 Update fox to fix some bugs with sliding and jittering 2022-07-14 13:24:02 +10:00
kay27 ea8d96389f Merge master into testing 2022-07-10 17:29:05 +03:00
kay27 f2ae6a9d02 Merge pull request 'Advanced Skins Mod' (#313) from MrRar/MineClone5:skins into master 
Reviewed-on: MineClone5/MineClone5#313
 2022-07-10 14:27:49 +00:00
kay27 1b9af42521 #362 Fix comment typo 2022-07-10 17:17:46 +03:00
kay27 3bc3540ead #362 Cover world edges by mapgen API 2022-07-10 17:15:30 +03:00
kay27 01b2f65309 #361 Fix a crash in mcl_copper/functions.lua:71 2022-07-10 16:08:40 +03:00
kay27 eefaba3f49 Merge master into testing 2022-07-10 15:55:40 +03:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 4ca2fb25a7 Add advanced skins mod 2022-07-09 10:52:28 -05:00
kay27 0ad52fd949 Merge pull request 'Replace PP textures for villager job sites' (#359) from MrRar/MineClone5:pp_textures into master 
Reviewed-on: MineClone5/MineClone5#359
 2022-07-06 21:58:55 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 2905a21674 Replace PP textures for villager job sites 2022-07-06 13:38:12 -05:00
kay27 98855596f9 Merge remote-tracking branch 'origin/master' into testing 2022-07-05 15:02:23 +03:00
kay27 b679fd8a13 Merge pull request 'Stop creeper explosion sequence if target leaves line of sight' (#348) from Gustavo6046/MineClone5:improve/creepers into master 
Reviewed-on: MineClone5/MineClone5#348
 2022-07-04 08:22:11 +00:00
wallabra 2caf2bf1b8
Merge branch 'master' into improve/creepers 2022-07-04 03:41:54 -03:00
wallabra 6b78abd79c
Merge remote-tracking branch 'origin/improve/creepers' into improve/creepers 2022-07-04 03:41:25 -03:00
kay27 7640edabcc Merge pull request 'Remove 2D preview + fix enchanting overlay by AFCMS' (#311) from MrRar/MineClone5:armor2d into master 
Reviewed-on: MineClone5/MineClone5#311
 2022-07-04 01:38:55 +00:00
kay27 690b0782a5 Merge pull request 'Polish the behaviour of hoppers' (#350) from Gustavo6046/MineClone5:improve/hoppers into master 
Reviewed-on: MineClone5/MineClone5#350
 2022-07-03 01:53:42 +00:00
wallabra 2eda3a6971 Merge branch 'master' into improve/creepers 2022-06-23 21:27:13 +00:00
wallabra b8f89e5569
Add missing local definition of var downpos 2022-06-23 18:23:29 -03:00
wallabra f3cc8f0f8a
Fix get_item_group crash in mcl_hoppers 2022-06-23 14:29:36 -03:00
wallabra 5307908290
Merge branch 'master' into improve/creepers 2022-06-21 17:31:46 -03:00
wallabra 588afc72f0
Merge branch 'master' into improve/hoppers 2022-06-21 17:31:40 -03:00
kay27 fa46332870 Merge pull request 'Improve underwater item physics' (#351) from Gustavo6046/MineClone5:item-physics into master 
Reviewed-on: MineClone5/MineClone5#351
 2022-06-21 19:59:19 +00:00
wallabra d57097baef
Fix syntax error with hopper check 2022-06-20 20:37:15 -03:00
wallabra 54e9477f37
Fix hopper downpos priority check 2022-06-20 17:05:18 -03:00
wallabra 3502e504bf
Merge branch 'master' into improve/creepers 2022-06-20 16:45:22 -03:00
wallabra ff0e0dd36a
Merge branch 'master' into improve/hoppers 2022-06-20 16:45:11 -03:00
wallabra 218990c114
Merge branch 'master' into item-physics 2022-06-20 16:45:00 -03:00
kay27 56ab442645 #346 Cleanup the fix 2022-06-19 02:25:29 +03:00
kay27 acda4deb3b #346 Quickfix indexing nil savetable in doc/doc 2022-06-19 02:13:49 +03:00
kay27 8b2cce4399 Merge master into testing 2022-06-19 02:01:45 +03:00
PrairieWind f93efc4843 Merge pull request 'Fix skipping growth stages of mcl_farming plants' (#345) from balazsszalab/MineClone5:master into master 
Reviewed-on: MineClone5/MineClone5#345
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2022-06-18 17:48:49 +00:00
balazsszalab 42fe7d8c73 Add sweet berry bush to bonemealable plants 
Sweet berry bush advances 1 growth stage if bonemeal is applied on it.
 2022-06-18 17:30:23 +00:00
balazsszalab 5b56acd415 Fix skipping growth stages of mcl_farming plants 
Because usually math.ceil(intervals_counter)>=1, stages + math.ceil(intervals_counter)>=2. It causes the plants to skip growth stages and they usually grow two stages at once. Changing ceil to floor seems to solve the problem.
 2022-06-18 16:40:50 +00:00
PrairieWind 2b20f89d7b Merge pull request 'Register sweet berry bush by add_plant function to enable plant growth' (#344) from balazsszalab/MineClone5:master into master 
Reviewed-on: MineClone5/MineClone5#344
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2022-06-18 16:11:05 +00:00
balazsszalab e2e4f7d2df Register sweet berry bush by add_plant function to enable plant growth 
Without calling the add_plant function, sweet berry bushes will not go through growth stages and it is impossible to farm them. Sweet berry bush and beetroot have the same number of growth stages, so I used beetroot's interval and chance values here. If somebody has a better approximation of these values, feel free to change them.
 2022-06-18 15:41:22 +00:00
balazsszalab 464649945c Merge pull request 'master' (#1) from MineClone5/MineClone5:master into master 
Reviewed-on: balazsszalab/MineClone5#1
 2022-06-18 15:29:28 +00:00
PrairieWind d33aba9355 Merge pull request 'fixed-elytra' (#343) from FlamingRCCars/MineClone5-FlamingRCCars:fixed-elytra into master 
Reviewed-on: MineClone5/MineClone5#343
 2022-06-17 21:42:16 +00:00
FlamingRCCars 88935cbcbd Update 'mods/ITEMS/mcl_armor/register.lua' 2022-06-17 21:27:46 +00:00
FlamingRCCars 73d67792ee Merge branch 'master' into fixed-elytra 2022-06-17 21:08:08 +00:00