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

8770 Commits

Author SHA1 Message Date
wallabra 218990c114
Merge branch 'master' into item-physics 2022-06-20 16:45:00 -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
PrairieAstronomer 6cca004dbe Fixed whitespace in Sweet Dreams activation point 2022-06-08 10:54:36 -06:00
PrairieWind 6c84baac22 Merge branch 'master' into PrairieWind_commits 2022-06-07 22:02:49 +00:00
PrairieAstronomer 6ff27c0247 Fixed formatting in advancement definitions and in the award unlock code in the mcl_totem mod 2022-06-07 16:01:12 -06:00
3raven 6dbbe99d68 Merge pull request 'Fixing maps and clocks in itemframes' (#334) from 3raven/MineClone5:master into master 
Reviewed-on: MineClone5/MineClone5#334
Works on my computer (except pb mentioned above with older maps).
 2022-06-07 19:17:56 +00:00
3raven 7808c576a5 Update 2022-06-07 16:41:44 +00:00
3raven f968d76caa Update translation 2022-06-07 16:40:43 +00:00
3raven 7cab3b67e1 Update translation 2022-06-07 16:38:36 +00:00
3raven b79017d86e Update translation 2022-06-07 16:38:02 +00:00
3raven 6e9448c0b5 Update translation template 2022-06-07 16:35:22 +00:00
3raven c5655a40cd Update translation template-TODO update translations 2022-06-07 16:34:31 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 34586bef62 Pillagers: spawn with loaded crossbow 2022-06-07 07:48:42 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 836ef83bd1 Basic Pillagers 2022-06-06 13:06:36 -05:00
PrairieAstronomer cd75d6ffd2 Armor Advancement Definitions (Commented out, but ready for me to use later) 2022-06-03 10:38:51 -06:00
PrairieAstronomer 6c9fc8c963 Fishy Business Advancement 2022-06-01 10:22:10 -06:00
PrairieAstronomer 4abc8181f7 What A Deal! Advancement 2022-05-31 19:46:04 -06:00
3raven 36e671f439 Adjust light 2022-05-31 22:43:21 +00:00
3raven 5a3c1bb3d8 Move glowing itemframes 2022-05-31 22:15:36 +00:00
3raven 1b9c5e6e23 Move glowing itemframes 2022-05-31 22:14:17 +00:00
3raven 3b2483ff4f Move glowing itemframe 2022-05-31 22:13:27 +00:00
3raven b084071954 Move glowing itemframe 2022-05-31 22:09:13 +00:00
3raven ddcb7f141f Move glowing itemframe 2022-05-31 22:08:41 +00:00
3raven 36de9f53b7 Move glowing itemframe 2022-05-31 22:08:12 +00:00