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
@@ -19,13 +22,23 @@ craftguide.register_craft_type("digging", {
 ```Lua
 craftguide.register_craft({
 	type   = "digging",
-	width  = 1,
 	result = "default:cobble 2",
 	items  = {"default:stone"},
 })
 ```
 
-Recipes can also be registered in a Minecraft-like way:
+```Lua
+craftguide.register_craft({
+	result = "default:cobble 16",
+	items = {
+		"default:stone, default:stone, default:stone",
+		"default:stone,              , default:stone",
+		"default:stone, default:stone, default:stone",
+	}
+})
+```
+
+Recipes can be registered in a Minecraft-like way:
 
 ```Lua
 craftguide.register_craft({
@@ -43,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
@@ -72,6 +117,10 @@ craftguide.add_recipe_filter("Hide secretstuff", function(recipes)
 end)
 ```
 
+#### `craftguide.set_recipe_filter(name, function(recipe, player))`
+
+Removes all recipe filters and adds a new one.
+
 #### `craftguide.remove_recipe_filter(name)`
 
 Removes the recipe filter with the given name.
@@ -155,13 +204,11 @@ You can add a stereotype like so:
 craftguide.group_stereotypes.radioactive = "mod:item"
 ```
 
-#### `craftguide.background`
+#### `craftguide.export_url`
 
-You can set a custom background theme by overriding this variable:
+If set, the mod will export all the cached recipes and usages in a JSON format
+to the given URL (HTTP support is required¹).
 
-```Lua
+---
-craftguide.background = "<file_name.png>:<middle>"
 
-```
+**¹** Add `craftguide` to the `secure.http_mods` or `secure.trusted_mods` setting in `minetest.conf`.
-
-`middle` (number) refers to a 9-sliced background. Read the engine's Lua API documentation for more info.

README.md

@@ -6,7 +6,7 @@
 This crafting guide is a blue book named *"Crafting Guide"* or a wooden sign.
 
 This crafting guide features a **progressive mode**.
-The progressive mode is a Terraria-like system that shows recipes you can craft
+This mode is a Terraria-like system that shows recipes you can craft
 from items you ever had in your inventory. To enable it: `craftguide_progressive_mode = true` in `minetest.conf`.
 
 `craftguide` is also integrated in `sfinv` (Minetest Game inventory). To enable it:
@@ -16,5 +16,7 @@ Use the command `/craft` to show the recipe(s) of the pointed node.
 
 For developers, `craftguide` also has a [modding API](https://github.com/minetest-mods/craftguide/blob/master/API.md). 
 
+Love this mod? Donations are appreciated: https://www.paypal.me/jpg84240
 
-![Preview2](https://i.imgur.com/oGSvbTW.png)
+
+![Preview2](https://i.imgur.com/w7KMS9G.png)

description.txt

@@ -1,2 +0,0 @@
-The most comprehensive Crafting Guide
-on Minetest.

locale/craftguide.it.tr

@@ -0,0 +1,26 @@
+# textdomain: craftguide
+
+Craft Guide=Guida di assemblaggio
+Crafting Guide=Guida d'assemblaggio
+Crafting Guide Sign=Cartello della guida d'assemblaggio
+Usage @1 of @2=Utilizzo @1 di @2
+Recipe @1 of @2=Ricetta @1 di @2
+Burning time: @1=Tempo di bruciatura: @1
+Cooking time: @1=Tempo di cottura: @1
+Replaced by @1 on smelting=Sostituito da @1 alla fusione
+Replaced by @1 on burning=Sostituito da @1 alla bruciatura
+Replaced by @1 on crafting=Sostituito da @1 all'assemblaggio
+Repairable by step of @1=Riparabile per passo di @1
+Any item belonging to the group(s): @1=Qualunque oggetto appartenente al gruppo: @1
+Recipe's too big to be displayed (@1x@2)=La ricetta è troppo grande per essere mostrata (@1x@2)
+Shapeless=Senza forma
+Cooking=Cottura
+No item to show=Nessun oggetto da mostrare
+Collect items to reveal more recipes=Raccogli oggetti per svelare più ricette
+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,5 +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 for this node=
+You don't know a recipe or usage for this item=
-No recipe for this node=
+No recipe or usage for this item=
+Digging=
+Digging Chance=
+@1 of chance to drop=

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"
+}