Commit graph

12388 commits

Author SHA1 Message Date
PrairieWind
15bb4fa4bf Players don't take burn damage when they have fire resistance potion in use, or frost walker boots
Entities seem to not burn anymore, and I am not sure why.
2023-09-04 22:05:38 +00:00
PrairieWind
4c3e521779 Fix campfire drops to work correctly with creative and silk touch 2023-09-04 22:05:38 +00:00
DinoNuggies4665
4c59b189dd changed line 82 to vector.new(), and refactored setting food wield item (wield_image doesn't matter) 2023-09-04 22:05:38 +00:00
PrairieWind
23d6c3d17b Update campfire rightclick and smothering 2023-09-04 22:05:38 +00:00
DinoNuggies4665
61f489e71f Food entities don't turn back to mutton when leaving a re-joining now 2023-09-04 22:05:38 +00:00
DinoNuggies4665
4616b6c3ec The food is now oriented the right direction when on the cooking on the campfire, and food entities are removed when the campfire is destroyed, still doesn't drop items though 2023-09-04 22:05:38 +00:00
DinoNuggies4665
d92296712c Fixed crash when standing on campfire whilst food is cooking 2023-09-04 22:05:38 +00:00
DinoNuggies4665
5b212dd3fe Made food entities local to evcery campfire, and made one food entity that works for all foods 2023-09-04 22:05:38 +00:00
PrairieWind
d3095fea57 Update ignition, smothering, and campfire inventory drops
Bonus fix for grass path creation sound traveling across the entire server
2023-09-04 22:05:38 +00:00
DinoNuggies4665
177196a8d2 modified: mods/ITEMS/mcl_campfires/api.lua
modified:   mods/ITEMS/mcl_fishing/init.lua
	modified:   mods/ITEMS/mcl_mobitems/init.lua
2023-09-04 22:05:38 +00:00
DinoNuggies4665
13d4841097 A couple of fixes 2023-09-04 22:05:38 +00:00
DinoNuggies4665
0b7cec419a Added visible items cooking on the fire 2023-09-04 22:05:38 +00:00
DinoNuggies4665
cef6c72a71 modified: mods/ITEMS/mcl_campfires/mod.conf 2023-09-04 22:05:38 +00:00
DinoNuggies4665
aca82fcafc modified: mods/ITEMS/mcl_campfires/api.lua
modified:   mods/ITEMS/mcl_mobitems/init.lua
2023-09-04 22:05:38 +00:00
DinoNuggies4665
a7fcd62999 Added visible items cooking on the fire 2023-09-04 22:05:38 +00:00
PrairieWind
d489c954f5 Campfires make big smoke
Smells like carcenogens, yum
2023-09-04 22:05:38 +00:00
PrairieWind
8b0097df71 Make campfires cook items 2023-09-04 22:05:38 +00:00
ancientmarinerdev
cb407666a4 Merge pull request 'Ensure creepers work by raycast line of sight' (#3905) from raycast_creeper_sight into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3905
2023-09-03 22:14:41 +00:00
ancientmarinerdev
969a08b7be Clean up 2023-09-03 22:02:34 +00:00
ancientmarinerdev
1749712318 Change creepers line of sight check to raycast and do it from eyes to targets feet and head 2023-09-03 22:02:34 +00:00
ancientmarinerdev
a648e53699 Merge pull request 'Import villager trade changes by Alessandra_Lozoya' (#3854) from Codiac/MineClone2:trades into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3854
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-09-02 15:44:13 +00:00
Julien Palard
878480d010
mcl_oxidation: typo in README. 2023-09-02 15:18:30 +02:00
ancientmarinerdev
b0208e622b Merge pull request 'Fix cherry chest boat inv texture' (#3865) from cherry_boat into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3865
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2023-09-02 10:01:20 +00:00
Johannes Fritz
8c41fb53e3 Fix cherry chest boat inv texture 2023-09-02 10:00:31 +00:00
chmodsayshello
408c7f71da Merge pull request 'Update Russian translation' (#3896) from Nanashi_Mumei/MineClone2:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3896
Reviewed-by: rudzik8
2023-09-02 08:25:43 +00:00
Sab Pyrope
8b7a71f93e Update Russian translation. Fix 1. 2023-09-02 15:51:49 +08:00
Codiac
98e7cd6e8e Merge branch 'master' into trades 2023-09-02 04:15:42 +00:00
ancientmarinerdev
4853018bb0 Merge pull request 'Increase copper needed for blocks from 4 to 9' (#3887) from basxto/MineClonXX:copper into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3887
2023-09-01 12:20:28 +00:00
ancientmarinerdev
c6256295a7 Merge pull request 'fix barrel sound code for proper max hear distance' (#3900) from fix_barrel_sound_distance into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3900
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-08-31 22:56:20 +00:00
SmokeyDope
b911f99d23 fix barrel sound code for proper max hear distance 2023-08-31 22:55:21 +00:00
ancientmarinerdev
273165ce3b Merge pull request 'lower ruined portal structure spawn rate' (#3901) from lower_ruined_portal_generation_rate into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3901
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-08-31 22:47:51 +00:00
SmokeyDope
aa08a176fc lower ruined portal structure spawn rate 2023-08-31 22:47:02 +00:00
Van
7b764adbc0 Banners color editing (#3868)
### Changing banner colors
Reason: I think the current colors of the banners do not match the palette of the surrounding world.
Solution: Muting Banner Tones

### Testing
Check out the new colors on 12 color banners.

### Attachments
Changed banner colors/Current banner appearance

UPDATE: Adjusted colors, see the third attachment

UPDATE: Changed the color of the white flag. Fixed a bug with different colors of patterns and banners, increased the contrast of folds. The last four attachments display all.
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3868
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
Co-authored-by: Van <vanicgame@yandex.ru>
Co-committed-by: Van <vanicgame@yandex.ru>
2023-08-31 22:27:08 +00:00
chmodsayshello
1502757732 Merge pull request 'Replace spaces in itemstrings with underscore' (#3895) from basxto/MineClonXX:fixspace into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3895
Reviewed-by: AFCMS <afcm.contact@gmail.com>
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
2023-08-31 17:08:18 +00:00
chmodsayshello
49bd28e109 add/remove comments 2023-08-31 18:16:34 +02:00
chmodsayshello
6c107ce990 fix for enchanted items 2023-08-31 17:59:46 +02:00
chmodsayshello
7c43c15fda update loottables 2023-08-31 17:17:38 +02:00
Sab Pyrope
5b4a79a26d Update russian translation 2023-08-31 14:16:42 +08:00
chmodsayshello
291cbaf434 move armor trim license info to LEGAL.md 2023-08-28 18:48:37 +02:00
chmodsayshello
fb74689f3d resolve merge conflicts 2023-08-28 16:47:31 +02:00
chmodsayshello
da024bb4b8 move mcl_armor_trims to mcl_armor 2023-08-28 15:09:48 +02:00
ancientmarinerdev
3c266f5cfd Merge pull request 'Enable enchanting on sheers & allow enchanted shears to shear.' (#3884) from Codiac/MineClone2:shears_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3884
Reviewed-by: AFCMS <afcm.contact@gmail.com>
2023-08-27 23:42:53 +00:00
ancientmarinerdev
5f0944062c Merge pull request 'Improve mob floating' (#3883) from Codiac/MineClone2:mob_float_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3883
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-08-27 23:30:16 +00:00
chmodsayshello
2f8bb9726b meta based: proof of concept 2023-08-27 21:44:43 +02:00
chmodsayshello
8176e7319f update 'armor trim credits' 2023-08-27 19:42:40 +02:00
Nils Dagsson Moskopp
5bf0e79c6f
Add example code to generate TGA logo
The tiny logo is a 12×12 TGA image.
The huge logo is a 1200×1200 TGA image.
2023-08-27 15:12:47 +02:00
AFCMS
f008fa3323 Merge pull request 'Formspec Refactoring' (#2635) from AFCMS/MineClone2:formspec-v4 into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2635
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-08-26 07:27:25 +00:00
AFCMS
2eabeb119a
Fix creative node placement 2023-08-23 21:48:49 +02:00
Sebastian Riedel
28d77a3e5b Replace spaces in itemstrings with underscore 2023-08-20 03:19:17 +02:00
AFCMS
149cb5d17c
Fix gramar mistakes 2023-08-19 18:30:03 +02:00