From 0c6cfc1563e4bdb7c58dbd88bf18349a36cbd173 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Sat, 8 May 2021 21:13:25 +0100 Subject: [PATCH] Small improvements --- Gemfile | 1 + Gemfile.lock | 34 +++++++++++----------- _en/basics/getting_started.md | 48 ++++++++++++------------------- _en/items/nodes_items_crafting.md | 2 +- _en/map/environment.md | 10 +++---- _sass/_content.scss | 2 +- 6 files changed, 45 insertions(+), 52 deletions(-) diff --git a/Gemfile b/Gemfile index 181ae5b..1f50fb4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,7 @@ source "https://rubygems.org" gem "jekyll" +gem "webrick" group :jekyll_plugins do gem "jekyll-sitemap" diff --git a/Gemfile.lock b/Gemfile.lock index d605989..bed2810 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,31 +4,31 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - concurrent-ruby (1.1.7) - em-websocket (0.5.1) + concurrent-ruby (1.1.8) + em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.13.1) + ffi (1.15.0) forwardable-extended (2.6.0) http_parser.rb (0.6.0) - i18n (1.8.5) + i18n (1.8.10) concurrent-ruby (~> 1.0) - jekyll (4.1.1) + jekyll (4.2.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) i18n (~> 1.0) jekyll-sass-converter (~> 2.0) jekyll-watch (~> 2.0) - kramdown (~> 2.1) + kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) mercenary (~> 0.4.0) pathutil (~> 0.9) rouge (~> 3.0) safe_yaml (~> 1.0) - terminal-table (~> 1.8) + terminal-table (~> 2.0) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) jekyll-sass-converter (2.1.0) @@ -37,37 +37,39 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (2.3.0) + kramdown (2.3.1) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.2.1) + listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.5) - rb-fsevent (0.10.4) + public_suffix (4.0.6) + rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.2.4) - rouge (3.22.0) + rexml (3.2.5) + rouge (3.26.0) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) - terminal-table (1.8.0) + terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (1.7.0) + webrick (1.7.0) PLATFORMS - ruby + x86_64-linux DEPENDENCIES jekyll jekyll-redirect-from jekyll-sitemap + webrick BUNDLED WITH - 2.0.2 + 2.2.16 diff --git a/_en/basics/getting_started.md b/_en/basics/getting_started.md index de08bed..aa814a7 100644 --- a/_en/basics/getting_started.md +++ b/_en/basics/getting_started.md @@ -68,30 +68,15 @@ They are, in order: particular world. Eg: `minetest/worlds/world/worldmods/` -Minetest will check the locations in the order given above. If it encounters a mod -with a name the same as one found previously, the later mod will be loaded in place -of the earlier mod. -This means that you can override game mods by placing a mod with the same name -in the global mod location. +`minetest` is the user-data directory. You can find the location of the +user-data directory by opening up Minetest and clicking +"Open User Data Directory" in the Credits tab. -The actual location of each mod load path depends on what operating system you're -using, and how you installed Minetest. +When loading mods, Minetest will check each of the above locations in order. +If it encounters a mod with a name the same as one found previously, the later +mod will be loaded in place of the earlier mod. This means that you can override +game mods by placing a mod with the same name in the global mod location. -* **Windows:** - * For portable builds, ie: from a .zip file, just go to the directory where - you extracted the zip and look for the `games`, `mods`, and `worlds` - directories. - * For installed builds, ie: from a setup.exe, - look in C:\\\\Minetest or C:\\\\Games\\Minetest. -* **GNU/Linux:** - * For system-wide installs, look in `~/.minetest`. - Note that `~` means the user home directory, and that files and directories - starting with a dot (`.`) are hidden. - * For portable installs, look in the build directory. - * For Flatpak installs, look in `~/.var/app/net.minetest.Minetest/.minetest/mods/`. -* **MacOS** - * Look in `~/Library/Application Support/minetest/`. - Note that `~` means the user home, ie: `/Users/USERNAME/`. ## Mod Directory @@ -184,6 +169,12 @@ minetest.register_node("mymod:node", { tiles = {"mymod_node.png"}, groups = {cracky = 1} }) + +minetest.register_craft({ + type = "shapeless", + output = "mymod:node 3", + recipe = { "default:dirt", "default:stone" }, +}) ``` ### mod.conf @@ -191,10 +182,9 @@ minetest.register_node("mymod:node", { descriptions = Adds a node depends = default -This mod has the name "mymod". It has two text files: init.lua and mod.conf.\\ -The script prints a message and then registers a node – -which will be explained in the next chapter.\\ -There's a single dependency, the -[default mod](https://content.minetest.net/metapackages/default/), which is -usually found in Minetest Game.\\ -There is also a texture in textures/ for the node. +This mod has the name "mymod". It has two text files: init.lua and mod.conf. The +script prints a message and then registers a node and craft recipe – these will +be explained later on. There's a single dependency, the +[default mod](https://content.minetest.net/metapackages/default/), +which is usually found in Minetest Game. There is also a texture in textures/ +for the node. diff --git a/_en/items/nodes_items_crafting.md b/_en/items/nodes_items_crafting.md index f6dbdc5..1955783 100644 --- a/_en/items/nodes_items_crafting.md +++ b/_en/items/nodes_items_crafting.md @@ -148,7 +148,7 @@ minetest.register_node("mymod:diamond", { }) ``` -The is_ground_content attribute allows caves to be generated over the stone. +The `is_ground_content` attribute allows caves to be generated over the stone. This is essential for any node which may be placed during map generation underground. Caves are cut out of the world after all the other nodes in an area have generated. diff --git a/_en/map/environment.md b/_en/map/environment.md index 5ac0ffa..fe7cf6d 100644 --- a/_en/map/environment.md +++ b/_en/map/environment.md @@ -23,11 +23,11 @@ In this chapter, you will learn how to perform basic actions on the map. ## Map Structure -The Minetest map is split into MapBlocks, each MapBlocks being a cube of size -16. As players travel around the map, MapBlocks are created, loaded, activated, -and unloaded. Areas of the map which are not yet loaded are full of *ignore* -nodes, an impassable unselectable placeholder node. Empty space is full of *air* -nodes, an invisible node you can walk through. +The Minetest map is split into MapBlocks, each MapBlocks being a cube of +size 16. As players travel around the map, MapBlocks are created, loaded, +activated, and unloaded. Areas of the map which are not yet loaded are full of +*ignore* nodes, an impassable unselectable placeholder node. Empty space is +full of *air* nodes, an invisible node you can walk through. An active MapBlock is one which is loaded and has updates running on it. diff --git a/_sass/_content.scss b/_sass/_content.scss index a6a3843..d4b5283 100644 --- a/_sass/_content.scss +++ b/_sass/_content.scss @@ -118,7 +118,7 @@ h1 { } h2 { - border-bottom: 1px solid black; + border-bottom: 1px solid #bbb; margin: 30px 0 10px 0; display: block; padding: 0 0 5px 0;