1
0
Fork 0

Compare commits

..

14 Commits

Author SHA1 Message Date
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 d3fb221641 Merge pull request 'Fix meshhand with mcl_skins disabled' (#3864) from skins into master
Reviewed-on: MineClone2/MineClone2#3864
Reviewed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
2023-08-16 13:12:52 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 6756358307 Fix meshhand with mcl_skins disabled 2023-08-16 08:06:12 -05:00
ancientmarinerdev 6cdd679baf Merge pull request 'Fix attribution and typo' (#3886) from basxto/MineClonXX:basxto-attrfix-again into master
Reviewed-on: MineClone2/MineClone2#3886
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-08-14 12:04:08 +00:00
Sebastian Riedel d7ea628270 Revert reversion of 822071c66b 2023-08-14 11:27:36 +02:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 e3bdedb4d5 Merge pull request 'Markdown fix' (#3879) from markdownfix into master
Reviewed-on: MineClone2/MineClone2#3879
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-08-10 16:46:23 +00:00
Mikita Wiśniewski f884de5f87 Fix a link and a typo in LEGAL.md 2023-08-09 12:06:50 +07:00
Mikita Wiśniewski a609639585 Add spaces after #, make the commands monospaced 2023-08-09 12:02:04 +07:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 aa3b3421d5 Merge pull request 'Allow villager to claim filled cauldrons.' (#3856) from Codiac/MineClone2:cauldron_job_site_fix into master
Reviewed-on: MineClone2/MineClone2#3856
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-08-05 16:44:27 +00:00
codiac 4f2cb955b8 Use minetest.get_item_group for more flexibility 2023-08-05 15:09:53 +10:00
codiac a3bbb3694c Allow villager to claim filled cauldrons.
Fixes #3733
2023-08-05 15:09:53 +10:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 b911da121e Merge pull request 'Fixed typo in mcl_damage' (#3858) from mcl_cached_reason-fix into master
Reviewed-on: MineClone2/MineClone2#3858
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
2023-08-01 21:08:11 +00:00
Nicu a99daf4294 Fixed typo in mcl_damage
Fixed typo that invalidated the cached reason for damage
2023-08-01 15:53:17 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 f9eb31ed46 Merge pull request 'Remove mcl_base_textures mod' (#3855) from mcl_base_textures into master
Reviewed-on: MineClone2/MineClone2#3855
Reviewed-by: AFCMS <afcm.contact@gmail.com>
Reviewed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
2023-07-31 12:52:15 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 80b21759d9 Remove mcl_base_textures mod 2023-07-26 09:56:13 -05:00
10 changed files with 48 additions and 32 deletions

View File

@ -38,11 +38,11 @@ No non-free licenses are used anywhere.
The textures, unless otherwise noted, are based on the Pixel Perfection resource pack for Minecraft 1.11, The textures, unless otherwise noted, are based on the Pixel Perfection resource pack for Minecraft 1.11,
authored by XSSheep. Most textures are verbatim copies, while some textures have been changed or redone authored by XSSheep. Most textures are verbatim copies, while some textures have been changed or redone
from scratch. from scratch.
The glazed terracotta textures have been created by (MysticTempest)[https://github.com/MysticTempest]. The glazed terracotta textures have been created by [MysticTempest](https://github.com/MysticTempest).
Source: <https://www.planetminecraft.com/texture_pack/131pixel-perfection/> Source: <https://www.planetminecraft.com/texture_pack/131pixel-perfection/>
License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/) License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)
The main menu images are release under: [CC0](https://creativecommons.org/publicdomain/zero/1.0/) The main menu images are released under: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)
All other files, unless mentioned otherwise, fall under: All other files, unless mentioned otherwise, fall under:
Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)

View File

@ -1,13 +1,14 @@
#Models in Minetest/Mineclone2 # Models in Minetest/Mineclone2
Models are an important part of all entities & unique nodes in Mineclone2. They provide a 3 dimensional map of an object for which textures are then applied to. This document is for modders, it quickly highlights some important information for the software needed to open models in Mineclone2. Models are an important part of all entities & unique nodes in Mineclone2. They provide a 3 dimensional map of an object for which textures are then applied to. This document is for modders, it quickly highlights some important information for the software needed to open models in Mineclone2.
## Minetest Wiki ## Minetest Wiki
For more detailed information on actually using blender to create and modify models for Minetest/Mineclone2, please visit the Minetest wiki's page on using Blender [Here](https://wiki.minetest.net/Using_Blender) For more detailed information on actually using blender to create and modify models for Minetest/Mineclone2, please visit the Minetest wiki's page on using Blender [Here](https://wiki.minetest.net/Using_Blender)
##Recommended software ## Recommended software
###Blender ### Blender
Blender is a very popular and free modeling software supported on Windows, MacOS, and most Linux distributions. It is recommended to use Blender to create and modify 3D models within the minetest engine. Blender is a very popular and free modeling software supported on Windows, MacOS, and most Linux distributions. It is recommended to use Blender to create and modify 3D models within the minetest engine.
@ -19,14 +20,16 @@ Blitz 3D (.b3d) Is one of the main animated model formats used for entities in t
The most up to date version of this Blender plugin can be downloaded [Here](https://github.com/GreenXenith/io_scene_b3d/releases/tag/f189786) The most up to date version of this Blender plugin can be downloaded [Here](https://github.com/GreenXenith/io_scene_b3d/releases/tag/f189786)
##Types of model formats ## Types of model formats
### Animated, skinned models
###Animated, skinned models
* Blitz 3D files (.b3d) * Blitz 3D files (.b3d)
* Microsoft DirectX (.x) (binary & text, compression is not supported) * Microsoft DirectX (.x) (binary & text, compression is not supported)
###Static meshes ### Static meshes
* Wavefront OBJ (.obj) * Wavefront OBJ (.obj)
Note: The sometimes accompanying .mtl files are not supported and can safely be deleted. Note: The sometimes accompanying .mtl files are not supported and can safely be deleted.
@ -45,16 +48,18 @@ Note: Do not use .b3d and .x files for static meshes at the moment, Minetest cur
Note: Any formats not mentioned above but known to work in the past were removed in 5.5.0 and aren't supported anymore. Note: Any formats not mentioned above but known to work in the past were removed in 5.5.0 and aren't supported anymore.
##Pros & Cons of .b3d vs .x ## Pros & Cons of .b3d vs .x
### B3D
###B3D
* [+] Binary format means a small size * [+] Binary format means a small size
* [-] Difficult to postprocess after exporting * [-] Difficult to postprocess after exporting
* [-] Difficult to debug problems * [-] Difficult to debug problems
###X (text version) ### X (text version)
* [+] Can be parsed easily with lua scripts * [+] Can be parsed easily with lua scripts
* [+] Can be easily generated by scripts * [+] Can be easily generated by scripts

View File

@ -1,10 +1,11 @@
### Standard Release ### Standard Release
#File to document release steps with a view to evolving into a script # File to document release steps with a view to evolving into a script
#Update CREDITS.md # Update CREDITS.md
#Update version in game.conf # Update version in game.conf
```
lua tools/generate_ingame_credits.lua lua tools/generate_ingame_credits.lua
git add CREDITS.md git add CREDITS.md
@ -18,10 +19,11 @@ git commit -m "Pre-release update credits and set version 0.83.0"
git tag 0.83.0 git tag 0.83.0
git push origin 0.83.0 git push origin 0.83.0
```
#Update version in game.conf to the next version with -SNAPSHOT suffix # Update version in game.conf to the next version with -SNAPSHOT suffix
git commit -m "Post-release set version 0.84.0-SNAPSHOT" `git commit -m "Post-release set version 0.84.0-SNAPSHOT"`
### Hotfix Release ### Hotfix Release
@ -32,15 +34,17 @@ To mitigate this, you just release the last release, and the relevant bug fix. F
* Create release branch from the last release tag, push it: * Create release branch from the last release tag, push it:
```
git checkout -b release/0.82.1 0.82.0 git checkout -b release/0.82.1 0.82.0
git push origin release/0.82.1 git push origin release/0.82.1
```
##### Prepare feature branch and fix ##### Prepare feature branch and fix
* Create feature branch from that release branch (can review it to check only fix is there, nothing else, and use to also merge into master separately) * Create feature branch from that release branch (can review it to check only fix is there, nothing else, and use to also merge into master separately)
git checkout -b hotfix_bug_1_branch `git checkout -b hotfix_bug_1_branch`
* Fix crash/serious bug and commit * Fix crash/serious bug and commit
* Push branch and create pr to the release and also the master branch (Do not rebase, to reduce merge conflict risk. Do not delete after first merge or it needs to be repushed) * Push branch and create pr to the release and also the master branch (Do not rebase, to reduce merge conflict risk. Do not delete after first merge or it needs to be repushed)
@ -53,11 +57,13 @@ git checkout -b hotfix_bug_1_branch
* Tag it, push tag and branch: * Tag it, push tag and branch:
```
git tag 0.82.1 git tag 0.82.1
git push origin 0.82.1 git push origin 0.82.1
git push origin release/0.82.1 git push origin release/0.82.1
```
Note: If you have to do more than 1 hotfix release, can do it on the same release branch. Note: If you have to do more than 1 hotfix release, can do it on the same release branch.

View File

@ -96,8 +96,8 @@ function mcl_damage.finish_reason(mcl_reason)
end end
function mcl_damage.from_mt(mt_reason) function mcl_damage.from_mt(mt_reason)
if mt_reason._mcl_chached_reason then if mt_reason._mcl_cached_reason then
return mt_reason._mcl_chached_reason return mt_reason._mcl_cached_reason
end end
local mcl_reason local mcl_reason

View File

@ -191,9 +191,10 @@ Origin of those models:
* [Spennnyyy](https://freesound.org/people/Spennnyyy/) (CC0) * [Spennnyyy](https://freesound.org/people/Spennnyyy/) (CC0)
* `mcl_totems_totem.ogg` * `mcl_totems_totem.ogg`
* Source: <https://freesound.org/people/Spennnyyy/sounds/323502/> * Source: <https://freesound.org/people/Spennnyyy/sounds/323502/>
* [Baŝto](https://opengameart.org/users/ba%C5%9Dto) * [Baŝto](https://opengameart.org/users/ba%C5%9Dto) (remixer) and [kantouth](https://freesound.org/people/kantouth/) (original author)
* `mobs_mc_skeleton_random.*.ogg` (CC BY 3.0) * `mobs_mc_skeleton_random.*.ogg` (CC BY 3.0)
* Source: <https://opengameart.org/content/walking-skeleton> * Source: <https://opengameart.org/content/walking-skeleton>
* Based on: <https://freesound.org/people/kantouth/sounds/115113/>
* [spookymodem](https://freesound.org/people/spookymodem/) * [spookymodem](https://freesound.org/people/spookymodem/)
* `mobs_mc_skeleton_death.ogg` (CC0) * `mobs_mc_skeleton_death.ogg` (CC0)
* <https://freesound.org/people/spookymodem/sounds/202091/> * <https://freesound.org/people/spookymodem/sounds/202091/>
@ -307,4 +308,4 @@ Origin of those models:
Note: Many of these sounds have been more or less modified to fit the game. Note: Many of these sounds have been more or less modified to fit the game.
Sounds not mentioned hre are licensed under CC0. Sounds not mentioned here are licensed under CC0.

View File

@ -351,7 +351,7 @@ local professions = {
leatherworker = { leatherworker = {
name = N("Leatherworker"), name = N("Leatherworker"),
texture = "mobs_mc_villager_leatherworker.png", texture = "mobs_mc_villager_leatherworker.png",
jobsite = "mcl_cauldrons:cauldron", jobsite = "group:cauldron",
trades = { trades = {
{ {
{ { "mcl_mobitems:leather", 9, 12 }, E1 }, { { "mcl_mobitems:leather", 9, 12 }, E1 },
@ -1008,7 +1008,15 @@ end
----- JOBSITE LOGIC ----- JOBSITE LOGIC
local function get_profession_by_jobsite(js) local function get_profession_by_jobsite(js)
for k,v in pairs(professions) do for k,v in pairs(professions) do
if v.jobsite == js then return k end if v.jobsite == js then
return k
-- Catch Nitwit doesn't have a jobsite
elseif v.jobsite and v.jobsite:find("^group:") then
local group = v.jobsite:gsub("^group:", "")
if minetest.get_item_group(js, group) > 0 then
return k
end
end
end end
end end

View File

@ -1 +0,0 @@
-- This mod has no code and is only a collection of textures.

View File

@ -1,3 +0,0 @@
name = mcl_base_textures
author = Wuzzy
description = Provides core textures needed by Minetest.

View File

@ -11,7 +11,7 @@ To use the bow, you first need to have at least one arrow anywhere in your inven
Bow=Arco Bow=Arco
Ammunition=Munición Ammunition=Munición
Damage from bow: 1-10=Daño con arco: 1-10 Damage from bow: 1-10=Daño con arco: 1-10
Damage from dispenser: 3=Daño por dispensador: 3 Damage from dispenser: 3=Daño por dispendsador: 3
Launches arrows=Lanza flechas Launches arrows=Lanza flechas
Crossbow=Ballesta Crossbow=Ballesta
Crossbows are ranged weapons to shoot arrows at your foes.=Las ballestas son armas a distancia para disparar flechas a tus enemigos. Crossbows are ranged weapons to shoot arrows at your foes.=Las ballestas son armas a distancia para disparar flechas a tus enemigos.

View File

@ -85,16 +85,16 @@ function mcl_meshhand.update_player(player)
end end
end end
minetest.register_on_joinplayer(function(player)
player:get_inventory():set_size("hand", 1)
end)
if mcl_skins_enabled then if mcl_skins_enabled then
mcl_player.register_on_visual_change(mcl_meshhand.update_player) mcl_player.register_on_visual_change(mcl_meshhand.update_player)
else else
minetest.register_on_joinplayer(mcl_meshhand.update_player) minetest.register_on_joinplayer(mcl_meshhand.update_player)
end end
minetest.register_on_joinplayer(function(player)
player:get_inventory():set_size("hand", 1)
end)
-- This is needed to deal damage when punching mobs -- This is needed to deal damage when punching mobs
-- with random items in hand in survival mode -- with random items in hand in survival mode
minetest.override_item("", { minetest.override_item("", {