Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-25 04:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,458 Commits 108 Branches 83 Tags 166 MiB
5a069af072
Commit Graph

9960 Commits

Author SHA1 Message Date
the-real-herowl
df17688b7d Great batch of improvements 2023-10-11 00:54:31 +00:00
the-real-herowl
729d8ec9e0 Another batch of wither adjustments 2023-10-11 00:54:31 +00:00
the-real-herowl
c9dc12b081 Further wither adjustments 2023-10-11 00:54:31 +00:00
Nauta Turbidus
a1b6819756 Withering effect and effect immunities 
Added withering effect and immunities to effects.

Signed-off-by: Nauta Turbidus <88062389+nauta-turbidus@users.noreply.github.com>
 2023-10-11 00:54:31 +00:00
ThePython10110
d7fa24ebf8 Keep axolotls from attacking sheep 2023-10-10 23:50:46 +00:00
chmodsayshello
712a6d6c66 Merge pull request 'add 1.20 armor trims' (#3784) from armor_trims into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3784
Reviewed-by: AFCMS <afcm.contact@gmail.com>
 2023-10-03 21:46:00 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟
a620d24ec8 Fix a number of crashes involving unknown nodes, also fix fishbuckets on_place (#3914) 
Fixes: #3913 #3915

~~You can reproduce the crash by placing a fish bucket on top snow above an unknown node.

I also noticed that the code always uses pointed_thing.above so I fixed that and also added a function to mcl_utils to figure out where a node should be placed (either above or below). Looks like the rest of the code could also use improvement but at least it does not crash now.~~

Cora fixed a bunch of related crashes in Mineclona so I am replacing my commit and cherry picking all her commits here.
https://codeberg.org/mineclonia/mineclonia/pulls/549

Here is the list of fixes from that PR:
- Crash when placing snow layer on unknown nodes
- Crash when snow layers on unknown nodes are flooded
- Crash when placing fishbucket on snow on top of unknown nodes
- Crash when placing chorus flower and stem on unknown
- Crash when placing mob spawners on unknown
- The fishbucket on place to actually replace buildable_to

Co-authored-by: cora <coradelamouche@gmx.ch>
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3914
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
Co-committed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
 2023-09-29 18:47:07 +00:00
ancientmarinerdev
178b24886f Merge pull request 'mcl_oxidation: typo in README.' (#3910) from mdk/MineClone2:typo into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3910
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-09-29 18:41:27 +00:00
Nicu
6d3e55ce12 Reduced the creeper explosion timer reset radius from 6 to 3 
This gives the player just enough time to get out of the creeper's range, to reset their explosion timer and avoid unnecessary destruction.
 2023-09-29 18:35:21 +00:00
ancientmarinerdev
2c2f5595f3 Merge pull request 'Add Setting to keep respawn location set if bed is destroyed.' (#3933) from Eliy21/MineClone2:no_bed_respawn_setting into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3933
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
 2023-09-29 18:29:31 +00:00
chmodsayshello
8936313fb3 proper itemslot background 
redo of 904cd78d3f ; caused some issues after cherry pick, same texture
 2023-09-29 16:59:45 +02:00
Johannes Fritz
2bd6678b08 mcl_skins: link to official mcl_custom_skins 2023-09-28 13:09:45 -05:00
Codiac
e0c44244f9 Merge pull request 'Point mcl_custom_skins link to a working URL' (#3949) from Montandalar/MineClone2:fix_url_mcl_custom_skins into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3949
Reviewed-by: Codiac <codiac@noreply.git.minetest.land>
 2023-09-28 10:40:03 +00:00
Michieal
e8c658658d Update Credits. 2023-09-26 18:59:51 +00:00
Michieal
e9d994b74d Fix Campifires API to not crash the server. 
Fixed the error in Campfires' On_RightClick() to not error out when called with a non-existent pointed_thing.
 2023-09-26 18:57:17 +00:00
Michieal
eafe6627d8 Extra checks placed in. 2023-09-26 18:35:12 +00:00
chmodsayshello
4046a68fbf Add trim snippet 2023-09-26 20:24:54 +02:00
Blockhead
882c3ef339 Point mcl_custom_skins link to a working URL 2023-09-25 19:55:36 +10:00
codiac
95db118361 Add rules for blaze, wither skeleton, silverfish 2023-09-22 09:09:35 +10:00
codiac
d2d7887e0f Handle bat and slime light checks 2023-09-21 14:53:32 +10:00
Michieal
b2ebcf5d4f Readme Change 
Putting my name back into the credits in the mod.
 2023-09-20 06:07:13 +00:00
Michieal
f57220f784 Fix Server crash (Issue ##3939) 
Fixes the error of pointed_thing being nil (null) by first checking to see if it exists, and if not, exit the on_place call back.
 2023-09-20 05:57:49 +00:00
codiac
bf4c7e1913 Allow non monsters spawns too 2023-09-20 09:24:51 +10:00
codiac
11e3674926 Use MC 1.18 light levels to control mob spawning 2023-09-19 11:18:40 +10:00
Eliy21
eb658a4996 Update mods/PLAYER/mcl_spawn/init.lua 
Add if then condition for no bed/anchor respawn settings
 2023-09-11 19:38:33 +00:00
ancientmarinerdev
bd46428d65 Updated credits 2023-09-04 22:05:38 +00:00
ancientmarinerdev
9e53efbc3e Fix campfire smoke timing 2023-09-04 22:05:38 +00:00
ancientmarinerdev
6b36abfe91 Fix credits 2023-09-04 22:05:38 +00:00
ancientmarinerdev
49e7449d7f Implement feedback and add credit 2023-09-04 22:05:38 +00:00
ancientmarinerdev
1d28a8e4ac Convert campfire particle spawning from ABM to particle spawner 2023-09-04 22:05:38 +00:00
Wbjitscool
c32e88e910 Add better smoke particles 2023-09-04 22:05:38 +00:00
thunder1035
969fa98f18 Update campfire model and textures 2023-09-04 22:05:38 +00:00
PrairieWind
107420c80f Offset smoke a bit 2023-09-04 22:05:38 +00:00
PrairieWind
f9afc74077 Add changes to campfires from feedback 2023-09-04 22:05:38 +00:00
PrairieWind
21f0c7750b Throw experience points after food is cooked 2023-09-04 22:05:38 +00:00
PrairieWind
04b59b2190 Campfires are unaffected by pistons 2023-09-04 22:05:38 +00:00
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
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
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
SmokeyDope
b911f99d23 fix barrel sound code for proper max hear distance 2023-08-31 22:55:21 +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
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
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
AFCMS
1b5b2e4dc7
Use new vectors in several places 2023-08-19 18:27:00 +02:00
AFCMS
560aead57f
Use table.indexof in mcl_anvils 2023-08-19 18:18:27 +02:00
AFCMS
4f0620c7c1
Fix meshhand not updating correctly 2023-08-19 18:06:31 +02:00
AFCMS
4efb5bf8b9
Make creative inventory page buttons vertical 2023-08-19 18:01:32 +02:00
AFCMS
158ff8e860
Add commented basic scrollbar support to replace pages system 2023-08-19 18:01:32 +02:00
AFCMS
e936cede03
Update meshhand 2023-08-19 18:01:32 +02:00
AFCMS
df2ab1fd8c
Remove duplicated armor update code 2023-08-19 18:01:32 +02:00
AFCMS
dc20267b4f
Update inventory when player visuals change 2023-08-19 18:01:32 +02:00
AFCMS
9d184e9897
Remove duplicated creative inventory code 2023-08-19 18:01:32 +02:00
AFCMS
3fe3153a40
Remove duplicated creative digging code 2023-08-19 18:01:32 +02:00
AFCMS
bf28bab427
Remove duplicated creacode 2023-08-19 18:01:31 +02:00
AFCMS
f7c251e7f2
Fix mcl_grindstone auto formating 2023-08-19 18:01:31 +02:00
AFCMS
1bdbdc365d
Fix mcl_enchanting auto formating 2023-08-19 18:01:31 +02:00
AFCMS
a77930d4a1
Fix mcl_chests auto formating 2023-08-19 18:01:31 +02:00
AFCMS
bb3771c0d2
Fix formating in mcl_anvils 2023-08-19 18:01:31 +02:00
AFCMS
40bc219a86
Fix mcl_books formating? 2023-08-19 18:01:31 +02:00
AFCMS
054dc22432
Use new vectors in mcl_chests 2023-08-19 18:01:31 +02:00
AFCMS
06e2022c6d
Fix mcl_enchanting formating 2023-08-19 18:01:30 +02:00
AFCMS
2cb9eca8e1
Use new vectors in mcl_blast_furnace 2023-08-19 18:01:30 +02:00
AFCMS
ae632fe773
Fixes in mcl_inventory 
- Fix (yet another) rebase conflict
- Remove unused code and annotations
- Fix annotations in `mcl_gamemode` to https://github.com/minetest-toolkit/minetest-lsp-api
 2023-08-19 18:01:30 +02:00
AFCMS
4db0631133
mcl_inventory creative fixes 
- Add many comments (I had a really hard time understanding the code)
- Add some more type annotations (https://github.com/minetest-toolkit/minetest-lsp-api)
- Rename non english variable
 2023-08-19 18:01:30 +02:00
AFCMS
0e13190ea4
Fix reabse problem with mcl_inventory 2023-08-19 18:01:30 +02:00
AFCMS
cd6dd4d851
Fix merge conflict (huge chests) 2023-08-19 18:01:30 +02:00