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

8806 Commits

Author SHA1 Message Date
kay27 eefaba3f49 Merge master into testing 2022-07-10 15:55:40 +03: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
FlamingRCCars 5ceed2672e fixed-elytras 2022-06-17 16:04:30 -05:00
FlamingRCCars 5d2552eb97 Fixed elytra not working when enchanted 2022-06-17 13:36:19 -05:00
unknown 047d75a78a fixed elytras 2022-06-17 12:38:08 -05:00
unknown fb7390f61d fixed elytras 2022-06-17 12:37:03 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 0334127372 Merge pull request 'Remove wield view from player models' (#338) from MrRar/MineClone5:mesh into master 
Reviewed-on: MineClone5/MineClone5#338
 2022-06-17 17:36:57 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 087a665112 Merge pull request 'Fix l10n template for mcl_achivements' (#340) from MrRar/MineClone5:achievements into master 
Reviewed-on: MineClone5/MineClone5#340
 2022-06-16 18:17:49 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 3c346170a6 Fix l10n template for mcl_achivements 2022-06-14 13:30:59 -05:00
PrairieWind 615eae97ee Merge pull request 'Fix Blast Furnaces and Smokers' (#336) from PrairieAstronomer/MineClone5:blast_furnace_fixes into master 
Reviewed-on: MineClone5/MineClone5#336
 2022-06-12 02:33:29 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 6889c672c0 Remove wield view from player models 2022-06-11 18:00:42 -05:00
kay27 7becc4e01b Merge pull request 'Basic Pillagers' (#332) from MrRar/MineClone5:master into master 
Reviewed-on: MineClone5/MineClone5#332
 2022-06-11 21:37:57 +00:00
PrairieAstronomer 539ada1057 Adjusted README files. 2022-06-10 13:21:07 -06:00
PrairieAstronomer de29e05a6f Fixed Blast Furnaces and Smokers so they use groups to smelt, and put them into individual mods like in Mineclone2 2022-06-10 13:18:02 -06:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 6aef455fbc Merge pull request 'Buckets of Fish' (#335) from PrairieAstronomer/MineClone5:fish_bucket into master 
Reviewed-on: MineClone5/MineClone5#335
 2022-06-09 20:18:27 +00:00
PrairieAstronomer 977a77f871 Fixed some more white space formating in cod.lua 2022-06-09 13:04:36 -06:00
PrairieAstronomer 43e73e2856 Updated Translate Template and fixed the fish bucket definitions to work with the translation 2022-06-09 09:47:24 -06:00
PrairieAstronomer f17f51cce3 Fixed formatting whitespace issues on cod.lua and salmon.lua 2022-06-08 16:37:38 -06:00
PrairieAstronomer ebcadc415d Buckets of Fish 2022-06-08 13:07:01 -06:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 da4b867314 Merge pull request 'New Advancements and Nodes' (#326) from PrairieAstronomer/MineClone5:PrairieWind_commits into master 
Reviewed-on: MineClone5/MineClone5#326
 2022-06-08 18:02:16 +00:00