Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

Cette dernière n'était pas bien supportée par tous les terminaux.

.luacheckrc

@@ -9,6 +9,7 @@ read_globals = {
 	"vector",
 	"string",
 	"table",
+	"ItemStack",
 }
 
 globals = {

API.md

@@ -5,6 +5,9 @@
 Custom recipes are nonconventional crafts outside the main crafting grid.
 They can be registered in-game dynamically and have a size beyond 3x3 items.
 
+**Note:** the registration format differs from the default registration format in everything.
+The width is automatically calculated depending where you place the commas. Look at the examples attentively.
+
 #### Registering a custom crafting type (example)
 
 ```Lua
@@ -35,7 +38,7 @@ craftguide.register_craft({
 })
 ```
 
-Recipes can also be registered in a Minecraft-like way:
+Recipes can be registered in a Minecraft-like way:
 
 ```Lua
 craftguide.register_craft({
@@ -53,6 +56,38 @@ craftguide.register_craft({
 })
 ```
 
+Multiples recipes can also be registered:
+
+```Lua
+craftguide.register_craft({
+	{
+		result = "default:mese",
+		items = {
+			"default:mese_crystal, default:mese_crystal",
+			"default:mese_crystal, default:mese_crystal",
+		}
+	},
+
+	big = {
+		result = "default:mese 4",
+		items = {
+			"default:mese_crystal, default:mese_crystal",
+			"default:mese_crystal, default:mese_crystal",
+			"default:mese_crystal, default:mese_crystal",
+			"default:mese_crystal, default:mese_crystal",
+		}
+	},
+})
+```
+
+Recipes can be registered from a given URL containing a JSON file (HTTP support is required¹):
+
+```Lua
+craftguide.register_craft({
+	url = "https://raw.githubusercontent.com/minetest-mods/craftguide/master/test.json"
+})
+```
+
 ---
 
 ### Recipe filters
@@ -168,3 +203,12 @@ You can add a stereotype like so:
 ```Lua
 craftguide.group_stereotypes.radioactive = "mod:item"
 ```
+
+#### `craftguide.export_url`
+
+If set, the mod will export all the cached recipes and usages in a JSON format
+to the given URL (HTTP support is required¹).
+
+---
+
+**¹** Add `craftguide` to the `secure.http_mods` or `secure.trusted_mods` setting in `minetest.conf`.

README.md

@@ -19,4 +19,4 @@ For developers, `craftguide` also has a [modding API](https://github.com/minetes
 Love this mod? Donations are appreciated: https://www.paypal.me/jpg84240
 
 
-![Preview2](https://i.imgur.com/GVQvufb.png)
+![Preview2](https://i.imgur.com/w7KMS9G.png)

locale/craftguide.it.tr

@@ -21,3 +21,6 @@ Show recipe(s) of the pointed node=Mostra la ricetta del nodo puntato
 No node pointed=Nessun nodo puntato
 You don't know a recipe for this node=Non conosci una ricetta per questo nodo
 No recipe for this node=Nessuna ricetta per questo nodo
+Digging=Scavando
+Digging Chance=Probabilità di scavare
+@1 of chance to drop=@1 di probabilità di rilascio

locale/template

@@ -5,6 +5,8 @@ Crafting Guide=
 Crafting Guide Sign=
 Usage @1 of @2=
 Recipe @1 of @2=
+No recipes=
+No usages=
 Burning time: @1=
 Cooking time: @1=
 Replaced by @1 on smelting=
@@ -19,14 +21,8 @@ No item to show=
 Collect items to reveal more recipes=
 Show recipe(s) of the pointed node=
 No node pointed=
-You don't know a recipe or usage for this node=
+You don't know a recipe or usage for this item=
-No recipe or usage for this node=
+No recipe or usage for this item=
-Node=
+Digging=
-Entity=
+Digging Chance=
-Craftitem=
+@1 of chance to drop=
-Tool=
-Name=
-Type=
-Groups=
-Unknown=
-None=

test.json

@@ -0,0 +1,8 @@
+{
+	"items": [
+		"default:stone, default:stone, default:stone",
+		"default:stone,              , default:stone",
+		"default:stone, default:stone, default:stone"
+	],
+	"result": "default:cobble 16"
+}