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

10446 Commits (552b71add19f55e3436935e93b2549b3765a6e73)

Author SHA1 Message Date
nixnoxus 8931576c50 fix 'WARNING[Main]: Undeclared global variable ' in mcl_colorblocks (#4203) 
fix WARNING: Undeclared global variable

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4203
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: nixnoxus <nixnoxus@web.de>
Co-committed-by: nixnoxus <nixnoxus@web.de>
 2024-03-27 00:20:12 +00:00
the-real-herowl c65176af81 Merge pull request 'Added clovers' (#4224) from clovers into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4224
 2024-03-27 00:15:32 +00:00
the-real-herowl a71a634168 Merge pull request 'Make end rods use a mesh model' (#4177) from end_rod_model into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4177
 2024-03-27 00:14:13 +00:00
the-real-herowl 89e8cf0213 Merge branch 'skeleton_sounds' 2024-03-24 06:38:35 +01:00
nixnoxus 08b41a3b39 accelerate non-moving carts on `mcl_minecarts:golden_rail_on` (#4097) 
accelerate a non-moving minecart away from a solid opaque block the powered rail is facing

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4097
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: nixnoxus <nixnoxus@web.de>
Co-committed-by: nixnoxus <nixnoxus@web.de>
 2024-03-24 05:29:44 +00:00
the-real-herowl 26fc0cd4d8 Merge pull request 'update melon and pumpkin biomes' (#4037) from michaljmalinowski/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4037
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2024-03-24 05:17:20 +00:00
the-real-herowl 4b6d63739c Fix a crash with rocket explosion 
Defensive check
 2024-03-20 19:13:44 -05:00
the-real-herowl c6a112d200 Clovers now generate 
Also added a way to alter flower rarity
 2024-03-20 22:29:03 +01:00
the-real-herowl ade2a1a6a2 Add clovers and four-leaf clovers 2024-03-20 22:18:47 +01:00
the-real-herowl b04493dcb6 Add 'mods/CORE/tga_encoder/' from commit 'aad231f5e406a7c1eaafe6595a64b9c55f230692' 
git-subtree-dir: mods/CORE/tga_encoder
git-subtree-mainline: a5740f8edf
git-subtree-split: aad231f5e4
 2024-03-19 19:28:16 +01:00
the-real-herowl a5740f8edf Remove old tga_encoder 2024-03-19 19:27:12 +01:00
syl 21dbc25f13 Improve french translation (#4194) 
Made a few improvements in the french translation.
Revert a change (oeil->œil) which make harder to search items by typing theirs names. Because "œ" is not in the AZERTY keyboard.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4194
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: syl <syl@gresille.org>
Co-committed-by: syl <syl@gresille.org>
 2024-03-07 20:04:02 +00:00
CyberMango 4a22287eb6 Added a check for the bone meal's applied position. 
protection the position above as well to prevent growing high grass on
areas in which you are not allowed to place blocks. Because, if you cant
place a block there, why should you be able to grow grass/flowers there?
 2024-02-29 13:36:02 +02:00
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 8d5c9996a2 Centered the eating animation 2024-02-02 04:28:20 +01: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 1476c7ae59 Make end rods use a mesh model 
* merged the 3 textures of the end rod into one
* made a proper image mask for the colored end rods
* (used to be hardcoded & didn't work for higher-res texture packs)
 2024-02-02 02:31:57 +01:00
the-real-herowl 13825763b0 Added eating animation 2024-01-29 04:24:39 +01: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 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
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
Eliy21 44bd1c7b71 Reduce sweet berry bush slowdown (#4150) 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4150
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-01-21 01:07:14 +00:00
JoseDouglas26 3b60a8eb18 Farming fortune drop bug fix 2024-01-20 04:03:25 +00:00
the-real-herowl 681175c463 Merge pull request 'Show elytra animation when using elytra' (#4108) from elytra into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4108
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2024-01-20 04:02:44 +00:00
the-real-herowl 3dafeb7505 Merge pull request 'Set all mob spawn chance weights according to mc now that weights are actually taken into account' (#4035) from Bakawun/MineClone2:mob_chance into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4035
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2024-01-20 04:00:13 +00:00
Johannes Fritz 4c0bad754e Show elytra animation when using elytra 2024-01-20 03:41:38 +00:00
PrWalterB 899c45534f Adding occitan translation for CORE and ENTITIES 2024-01-20 04:28:46 +01:00
the-real-herowl cfd41d458a Merge pull request 'Add capes' (#4046) from capes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4046
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2024-01-20 03:26:10 +00:00
the-real-herowl 41c6773fd4 Merge pull request 'Spawning: fix random weighted choice' (#4025) from Bakawun/MineClone2:random_select into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4025
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2024-01-20 03:15:24 +00:00
the-real-herowl 27c3760da1 Merge pull request 'Ghast: align attributes with mc' (#4014) from Bakawun/MineClone2:ghast into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4014
 2024-01-20 03:14:16 +00:00
James David Clarke aa4d5738c7 Fix Survival Inventory Tab API (#4147) 
* restored some old code that had gone missing
* fixed the survival inventory tab API not working
* fixed some grammar

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4147
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: James David Clarke <james@jamesdavidclarke.com>
Co-committed-by: James David Clarke <james@jamesdavidclarke.com>
 2024-01-20 00:42:56 +00:00
James David Clarke ee24b24c68 Fix indentation 2024-01-15 14:19:51 +00:00
James David Clarke f94e7fc52f Fix mcl_shields is_blocking crash when object not found under player 2024-01-15 14:19:51 +00:00
chmodsayshello 45c84b1f1d fix formspec 2024-01-13 19:50:09 +01:00
chmodsayshello 96dbcc45d0 fix cape being registered twice 2024-01-13 19:50:09 +01:00
chmodsayshello bfe333ef60 fix cape rendering conflicts 
The elytra and the normal cape were able to render at the same time while wearing an elytra.
 2024-01-13 19:50:09 +01:00
chmodsayshello 89eb0f9b3e remove test selector_func 2024-01-13 19:50:09 +01:00
chmodsayshello 146b0ade37 update elytra cape instantly 2024-01-13 19:50:09 +01:00
chmodsayshello 0f91b763e9 add cape api 2024-01-13 19:50:09 +01:00
chmodsayshello aeccc94687 remove sha1 unlocking for minetest cape 2024-01-13 19:50:09 +01:00
the-real-herowl d3881fc1d1 Fix crash and trim trailing 2024-01-13 19:50:09 +01:00
chmodsayshello b47fae0ed4 fix string length method call 2024-01-13 19:50:08 +01:00
chmodsayshello 180c8fb73e add capes 2024-01-13 19:50:04 +01:00
the-real-herowl 12b3e34f88 Fix a crash 
Defensive check for nonexistent player
 2024-01-11 03:45:10 +00:00
bakawun 4d90dfab0e Spawning: add a comment to clarify what the random select is doing 2024-01-10 11:22:13 +01:00
bakawun b2b63266b7 Spawning: break mob selection loop when out of bounds 2024-01-10 11:22:13 +01:00
bakawun d151e79fb9 Spawning: remove unused summary_chance 2024-01-10 11:22:13 +01:00
bakawun e419e6d63b Spawning: remove another unused perlin var 2024-01-10 11:22:13 +01:00
cora 55517154bd Mob spawning: Remove unused vars 2024-01-10 11:22:13 +01:00
bakawun 402e4e7b79 Spawning: fix random weighted choice 2024-01-10 11:22:13 +01:00
tuxilio 4b5afee4bb Add and fix some german translations 2024-01-08 13:35:41 +00:00
the-real-herowl 3c2247d7c8 Merge pull request 'mobs:piglin: use (alt) zombified piglin sounds' (#4083) from Bakawun/MineClone2:piglin_sounds into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4083
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2024-01-08 08:47:16 +00:00
the-real-herowl 324fd0dc4a Merge pull request 'Add missing Hoglin/Zoglin sounds' (#4082) from Bakawun/MineClone2:hoglin_sounds into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4082
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2024-01-08 08:45:33 +00:00
bakawun cd033aa4ff mobs:zoglin:sounds: adress review comment 2024-01-08 09:30:12 +01:00
bakawun 1f3c7913dd mobs:piglin:sounds: adress review comment 2024-01-08 09:26:03 +01:00
bakawun 49aa32d2ee mobs:skeletons:sounds: fix code review issue and add todo 2024-01-08 09:16:05 +01:00
JoseDouglas26 cc3f092185 Changes in rotation code and bamboo rotation 2024-01-08 05:55:36 +00:00
JoseDouglas26 6694babbde nylium can be turned into netherrack 2024-01-08 03:08:56 +01:00
SmokeyDope fc204c8717 Merge pull request 'Fix typo in pumpkin.lua' (#4122) from fix_pumpkin_typo_pumkin into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4122
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
 2024-01-08 02:02:20 +00:00