Compare commits

..

1 Commits

Author SHA1 Message Date
José Muñoz 26504cd36a Fix typos 2023-07-29 22:40:42 -06:00
10 changed files with 32 additions and 48 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,
authored by XSSheep. Most textures are verbatim copies, while some textures have been changed or redone
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/>
License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)
The main menu images are released under: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)
The main menu images are release under: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)
All other files, unless mentioned otherwise, fall under:
Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)

View File

@ -1,14 +1,13 @@
# 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.
## 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)
## 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.
@ -20,16 +19,14 @@ 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)
## Types of model formats
### Animated, skinned models
##Types of model formats
###Animated, skinned models
* Blitz 3D files (.b3d)
* Microsoft DirectX (.x) (binary & text, compression is not supported)
### Static meshes
###Static meshes
* Wavefront OBJ (.obj)
Note: The sometimes accompanying .mtl files are not supported and can safely be deleted.
@ -48,18 +45,16 @@ 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.
## Pros & Cons of .b3d vs .x
### B3D
##Pros & Cons of .b3d vs .x
###B3D
* [+] Binary format means a small size
* [-] Difficult to postprocess after exporting
* [-] Difficult to debug problems
### X (text version)
###X (text version)
* [+] Can be parsed easily with lua scripts
* [+] Can be easily generated by scripts

View File

@ -1,11 +1,10 @@
### 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 version in game.conf
#Update CREDITS.md
#Update version in game.conf
```
lua tools/generate_ingame_credits.lua
git add CREDITS.md
@ -19,11 +18,10 @@ git commit -m "Pre-release update credits and set version 0.83.0"
git tag 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
@ -34,17 +32,15 @@ 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:
```
git checkout -b release/0.82.1 0.82.0
git push origin release/0.82.1
```
##### 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)
`git checkout -b hotfix_bug_1_branch`
git checkout -b hotfix_bug_1_branch
* 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)
@ -57,13 +53,11 @@ git push origin release/0.82.1
* Tag it, push tag and branch:
```
git tag 0.82.1
git push origin 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.

View File

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

View File

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

View File

@ -351,7 +351,7 @@ local professions = {
leatherworker = {
name = N("Leatherworker"),
texture = "mobs_mc_villager_leatherworker.png",
jobsite = "group:cauldron",
jobsite = "mcl_cauldrons:cauldron",
trades = {
{
{ { "mcl_mobitems:leather", 9, 12 }, E1 },
@ -1008,15 +1008,7 @@ end
----- JOBSITE LOGIC
local function get_profession_by_jobsite(js)
for k,v in pairs(professions) do
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
if v.jobsite == js then return k end
end
end

View File

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

View File

@ -0,0 +1,3 @@
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
Ammunition=Munición
Damage from bow: 1-10=Daño con arco: 1-10
Damage from dispenser: 3=Daño por dispendsador: 3
Damage from dispenser: 3=Daño por dispensador: 3
Launches arrows=Lanza flechas
Crossbow=Ballesta
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
minetest.register_on_joinplayer(function(player)
player:get_inventory():set_size("hand", 1)
end)
if mcl_skins_enabled then
mcl_player.register_on_visual_change(mcl_meshhand.update_player)
else
minetest.register_on_joinplayer(mcl_meshhand.update_player)
end
minetest.register_on_joinplayer(function(player)
player:get_inventory():set_size("hand", 1)
end)
-- This is needed to deal damage when punching mobs
-- with random items in hand in survival mode
minetest.override_item("", {