Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity
11,954 Commits
85 Branches
80 Tags
173 MiB
Commit Graph

11954 Commits (497f1dcd8021da826fbe77e5392f515f0b7c9a55)

Author SHA1 Message Date
nixnoxus 497f1dcd80 drop stack instead of items 2024-02-05 00:24:27 +01:00
nixnoxus 01cace413f update bartering items 2024-02-05 00:11:22 +01:00
Eliy21 7bfbaac772 Fix damage animation and player invul crash in mcl_playerplus (#4176) 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4176
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Eliy21 <eliy21@noreply.git.minetest.land>
Co-committed-by: Eliy21 <eliy21@noreply.git.minetest.land>
 2024-02-04 17:31:11 +00:00
the-real-herowl 87abd0f4dc Merge pull request 'Colored Leather Armor' (#4024) from AFCMS/MineClone2:colored-leather-2 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4024
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2024-02-02 03:25:08 +00:00
the-real-herowl 03b8ad15e3 Privs for colorizing command and comment cleanup 2024-02-02 04:07:41 +01:00
the-real-herowl fc6fe3f1ed Crafting colorized leather armor 2024-02-02 03:05:57 +00:00
the-real-herowl 3fa4cf6d52 Cauldron leather armor washing 2024-02-02 03:05:57 +00:00
the-real-herowl 3d799266c3 Finished leather armor colorizing 2024-02-02 03:05:57 +00:00
AFCMS caa82c40c9 Colored Leather Armor 2024-02-02 03:05:57 +00:00
the-real-herowl 8c19d4b9b8 Merge pull request 'Add glazed terracotta pillars' (#4117) from Potiron/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4117
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2024-02-02 02:50:36 +00:00
the-real-herowl c31226041f Merge pull request 'Fixed ghast hitbox' (#4156) from ghast_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4156
 2024-01-28 12:56:06 +00:00
the-real-herowl b3bcd949b9 Merge pull request 'Change on scaffolding placement checking' (#4164) from JoseDouglas26/MineClone2:scaffolding_bug_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4164
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2024-01-25 13:30:41 +00:00
the-real-herowl a8ad631864 Added ghast achievement and nerfed ghast 
* ghast now attacks less frequently
* killing ghast with a ghast fireball now awards an achievement
 2024-01-25 14:29:08 +01:00
the-real-herowl 1478960b7f Improved ghast combat 
* ghast fireballs can now hit the shooter (used to just fly through)
* improved ghast aim
* increased ghast fireball lifetime
* mob projectile lifetime is now counted in seconds (was in ticks)
* improved variable naming
* improved default mob projectile deflecting (applies to ghast fireball)
 2024-01-25 02:51:36 +00:00
the-real-herowl f41990c1d0 Fixed ghast hitbox 2024-01-25 02:51:36 +00:00
José Douglas da Silva Souza 77a6ac1ef3 Protection check 2024-01-25 02:23:15 +00:00
José Douglas da Silva Souza 9b9271e5df Change on scaffolding placement checking 2024-01-25 02:23:15 +00:00
the-real-herowl 1175be45fb Merge pull request 'Add MC hold to eat delay' (#4144) from Eliy21/MineClone2:eating_delay into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4144
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2024-01-25 02:06:14 +00:00
the-real-herowl f444efbb03 Merge pull request 'Make cactus be able to damage mobs' (#4149) from Eliy21/MineClone2:cactus_mob_damage into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4149
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2024-01-25 01:57:22 +00:00
chmodsayshello a2a38b7b3d Merge pull request 'Fixed a crash' (#4154) from fix_capes_crash into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4154
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
 2024-01-22 20:20:31 +00:00
Eliy21 aa4f8ba6cc Add medium size mob distinction in the cactus mob damage area reach code 2024-01-21 09:18:43 +00:00
Eliy21 b645a2ab67 Remove commented out cactus mob damage code 2024-01-21 09:18:43 +00:00
Eliy21 d41d29be58 Add distinction between regular sized mobs and large mobs in the cactus mob damage area reach 2024-01-21 09:18:43 +00:00
Eliy21 434bb33f72 Add mob cactus damage logic to /mcl_mobs/physics.lua 2024-01-21 09:18:43 +00:00
Eliy21 d37840e022 Comment out cactus mob damage logic in preperation to move code logic to /mcl_mobs/physics.lua 2024-01-21 09:18:43 +00:00
Eliy21 aea5c6f7be Make cactus be able to damage mobs 2024-01-21 09:18:43 +00:00
Eliy21 5154dce8d0 Use table.update() on mcl_hunger.eat_internal[name] in the item eat code 2024-01-21 09:03:27 +00:00
Eliy21 c0a5c63601 Fix sus stew item frame duplication bug 2024-01-21 09:03:27 +00:00
Eliy21 473c85c543 Fix bucket milk item frame duplication bug 2024-01-21 09:03:27 +00:00
Eliy21 86c10002a6 Fix golden apple item frame duplication bug 2024-01-21 09:03:27 +00:00
Eliy21 b56424a0b6 Integrate mcl_hunger.is_eating(name) API into item eat code 2024-01-21 09:03:27 +00:00
Eliy21 93dff87a5e Add mcl_hunger.is_eating(name) API 2024-01-21 09:03:27 +00:00
Eliy21 be711ea727 Change beetroot soup food group to not be categorized as a drink and be eaten with particles 2024-01-21 09:03:27 +00:00
Eliy21 7b42779fe2 Change rabbit stew food group to not be categorized as a drink and be eaten with particles 2024-01-21 09:03:27 +00:00
Eliy21 11d0062255 Change mushroom stew food group to not be categorized as a drink and be eaten with particles 2024-01-21 09:03:27 +00:00
Eliy21 4dd04b4c91 Fix sus stew not leaving bowl after use 2024-01-21 09:03:27 +00:00
Eliy21 109aed75df Fix sus stew not having eating particle & sound effects and eating slow speed getting stuck on login 2024-01-21 09:03:27 +00:00
James David Clarke 184f1575ee Added mcl_eating_delay setting in settingtypes.txt 2024-01-21 09:03:27 +00:00
Eliy21 7561e1dc95 Make sus stew handle delayed eating 2024-01-21 09:03:27 +00:00
Eliy21 bee44f41b6 Make milk bucket handle delayed eating 2024-01-21 09:03:27 +00:00
Eliy21 b2b2dc4090 Make golden apples handle delayed eating 2024-01-21 09:03:27 +00:00
Eliy21 a78b308a75 Make potions handle delayed eating 2024-01-21 09:03:27 +00:00
Eliy21 cc7a2e0b41 Add eating delay entry to changelog.txt 2024-01-21 09:03:27 +00:00
Eliy21 996a5a6d47 Integrate delayed eating to item eat code 2024-01-21 09:03:27 +00:00
Eliy21 4c8efca4e6 Add eating delay code 2024-01-21 09:03:27 +00:00
SmokeyDope 2d2b64006b add nether vine placement checks for top and bottom of nodes (#4129) 
This adds placement checks to weeping and twisting vines, weeping vines should only be placed on bottom of nodes and twisting vines should only be placed on top of nodes.

Most of the work for this was done by JoseDouglas26. This was made with their permission, I just had to tweak the code a bit to get twisting vines to place right. Thank you Jose!

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4129
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: SmokeyDope <smokey@tilde.team>
Co-committed-by: SmokeyDope <smokey@tilde.team>
 2024-01-21 06:28:41 +00:00
emptyshore 8e103cf615 Mobs should not anger towards the player if damage is disabled. (#4114) 
Co-authored-by: Mateusz Uzdowski <mateusz@silverstripe.com>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4114
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: emptyshore <emptyshore@noreply.git.minetest.land>
Co-committed-by: emptyshore <emptyshore@noreply.git.minetest.land>
 2024-01-21 05:37:54 +00:00
the-real-herowl d1ac98a019 Fixed a crash 
Crash when the cape field is not set.
It is not set when joining an old world with the capes PR applied.
Also trimmed trailing.
 2024-01-21 03:09:11 +00:00
codiac d3c591915f Fix light check and limit Y level for slime chunk spawn. (#4139) 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4139
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: codiac <codiac@inbox.lv>
Co-committed-by: codiac <codiac@inbox.lv>
 2024-01-21 02:52:36 +00:00
the-real-herowl b507838e13 Merge pull request 'Overhaul Texture_Converter.py and Conversion_Table.csv' (#4133) from Impulse/MineClone2:texture-conversion-120 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4133
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2024-01-21 02:25:22 +00:00