Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-28 13:53:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,506 Commits 109 Branches 83 Tags 165 MiB
0c7b4d473c
Commit Graph

5094 Commits

Author SHA1 Message Date
Michieal
a425d359f5 WaterLoggedRootsKelpFix (#3994) 
Fixes #3990

A very simple fix to Kelp and the current water logged nodes. It adds the group "waterlogged" to water logged items and then puts a check for the group in kelp growth. Made it as a group, because eventually there will be other waterlogged nodes.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3994
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Michieal <michieal@noreply.git.minetest.land>
Co-committed-by: Michieal <michieal@noreply.git.minetest.land>
 2023-11-03 21:46:00 +00:00
FossFanatic
ce403b9245 Rename Liquid Textures (#3758) 
This pull request renames the textures of water and lava to more closely follow the MineClone 2 naming convention.

The code has also been changed to now reflect these new names.

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3758
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
Co-committed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
 2023-11-02 23:47:26 +00:00
the-real-herowl
5b1deedaf0 Disabled grass path making when sneaking 2023-11-02 20:00:19 +01:00
SmokeyDope
fa1d8dfc47 Adjust grass path long description to inform players of new way to turn paths back to dirt. 2023-11-02 17:34:01 +00:00
SmokeyDope
d2a4a6d042 add group 'path_remove_possible' to grass paths 2023-11-02 17:34:01 +00:00
SmokeyDope
5e194b33bd Adjust make_grass_path function to let shovels turn grass paths back to dirt with shift+rightclick 2023-11-02 17:34:01 +00:00
chmodsayshello
5be506830f make diamond tools upgradeable again 2023-10-25 18:04:32 +02:00
seventeenthShulker
bc3bde4cf8 Forgot about blackstone 2023-10-22 02:14:17 +00:00
seventeenthShulker
8099a4bd17 Walls use source parameter for default hardness and blast resistance 
If no `source` given, fallbacks are 2 and 6 respectively
 2023-10-22 02:14:17 +00:00
seventeenthShulker
e2ed1ab4a6 Fix prismarine bricks and dark variant blast res. 
Should be 6 like regular prismarine
 2023-10-22 02:14:17 +00:00
seventeenthShulker
e43a8e267d Un-hardcode blast resistance, hardness for walls, 
now only based on their material
 2023-10-22 02:14:17 +00:00
seventeenthShulker
570caf47eb All wood-type and nether-type fences now match material's blast resistance 2023-10-22 02:14:17 +00:00
chmodsayshello
ec7e99019e add trim advancements 2023-10-21 22:25:30 +02:00
Dehydrate6684
b320d008ca
Unhardcoded nil 2023-10-18 08:04:54 +08:00
Freeman
8d440252a4 fix crash when opening a chest that has an unknow node on it 
fix #3961
 2023-10-13 21:07:00 +02:00
the-real-herowl
645072507f Wither melee attack and bug fixes 2023-10-11 00:54:31 +00:00
the-real-herowl
966712f4ff Optimisation and cleanup 
-optimised and cleaned up wither rose withering effect code
-removed unused code
 2023-10-11 00:54:31 +00:00
the-real-herowl
e4102e6124 Implemented wither defensive measures 
Added block breaking when hit, or a safe_boom when hit and mobs_griefing
is disabled. Removed dubious anti-troll measures.
 2023-10-11 00:54:31 +00:00
the-real-herowl
17c8f220e6 A few more wither fixes 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
Dehydrate6684
23468cc2dd
Used vector.offset instead of add/subtract 2023-10-10 09:39:16 +08:00
Dehydrate6684
0c48a46f7c
Updated code based on reviews 2023-10-09 13:55:08 +08: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
chmodsayshello
8936313fb3 proper itemslot background 
redo of 904cd78d3f ; caused some issues after cherry pick, same texture
 2023-09-29 16:59:45 +02: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
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
Dehydrate6684
cc217d0089
Removed unnessary node definitions 2023-09-17 17:13:50 +08:00
Dehydrate6684
e6653b78ee
Added directional checks 2023-09-17 17:04:24 +08:00
Dehydrate6684
a960bf2e8e
Update trapdoor climbable behavior 2023-09-16 13:16:49 +08: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
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
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
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
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
chmodsayshello
2f8bb9726b meta based: proof of concept 2023-08-27 21:44:43 +02:00
Sebastian Riedel
28d77a3e5b Replace spaces in itemstrings with underscore 2023-08-20 03:19:17 +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
3fe3153a40
Remove duplicated creative digging code 2023-08-19 18:01:32 +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
cd6dd4d851
Fix merge conflict (huge chests) 2023-08-19 18:01:30 +02:00
AFCMS
653f82198e
Apply MysticTempest fixes to enchanting table 2023-08-19 18:01:29 +02:00
AFCMS
7cf91c79cb
Smithing Table 2023-08-19 18:01:29 +02:00
AFCMS
6a2ad4e618
Materialize the fact that bookshelves only store books 2023-08-19 18:01:29 +02:00
AFCMS
ecb4c82600
Anvil Formspec 
- anvil formspec
- hammer icon
- use new vectors
- add some type annotations
- optimize textures (some of them by 95%)
 2023-08-19 18:01:28 +02:00
AFCMS
7c15fe6ac9
Furnaces formspec redo 2023-08-19 18:01:28 +02:00
AFCMS
f6804600ba
Grindstone menu 2023-08-19 18:01:28 +02:00
AFCMS
bf57cf3aa3
Barrel formspec 2023-08-19 18:01:28 +02:00
AFCMS
0da1822d26
Code style fixes in mcl_chests 2023-08-19 18:01:27 +02:00
AFCMS
0ae76776b1
Bookshelf menu redo 2023-08-19 18:01:27 +02:00
AFCMS
e5ee0c4afc
Crafting table formspec redo 2023-08-19 18:01:27 +02:00
AFCMS
842363464d
Enchanting table formspec redo 2023-08-19 18:01:27 +02:00