From 2dc3f24f1ce1c41d1239d2800547f0a52e312ddf Mon Sep 17 00:00:00 2001 From: Joachim Stolberg Date: Sun, 20 Aug 2023 14:22:40 +0200 Subject: [PATCH] Fix manual issues, increase version to v1.17 --- README.md | 11 ++++++++++- doc/manual_ta3_EN.lua | 13 ------------- doc/manual_ta4_DE.lua | 7 ------- doc/manual_ta4_EN.lua | 7 ------- init.lua | 2 +- logic/node_detector.lua | 1 - manuals/manual_ta3_EN.md | 13 ------------- manuals/manual_ta4_DE.md | 6 ------ manuals/manual_ta4_EN.md | 7 ------- 9 files changed, 11 insertions(+), 56 deletions(-) diff --git a/README.md b/README.md index 9edbfa4..f3c6bea 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Many thanks to Thomas-S, niklp09, and others for their contributions ### Dependencies -Required: default, doors, bucket, stairs, screwdriver, basic_materials, tubelib2, networks, minecart, lcdlib, safer_lua +Required: default, doors, bucket, stairs, screwdriver, basic_materials, tubelib2, networks, minecart, lcdlib, safer_lua, doclib Recommended: signs_bot, hyperloop, compost, techpack_stairway, autobahn Optional: unified_inventory, wielded_light, unifieddyes, lua-mashal, lsqlite3, moreores, ethereal, mesecon @@ -53,6 +53,7 @@ The following mods in the newest version have to be downloaded directly from Git * [minecart](https://github.com/joe7575/minecart) * [lcdlib](https://github.com/joe7575/lcdlib) * [safer_lua](https://github.com/joe7575/safer_lua) +* [doclib](https://github.com/joe7575/doclib) It is highly recommended that you install the following mods, too: @@ -94,6 +95,14 @@ Available worlds will be converted to 'lsqlite3', but there is no way back, so: ### History +**2023-08-20 V1.17** + +- Add support for doclib / remove techage internal doc support + **The mod doclib is a new hard depenency !** +- Fix LICENCSE file bug +- Add beduino support for TA3 repeater (realmicu) +- Fix some bugs + **2023-06-30 V1.16** - Add TA4 node detector diff --git a/doc/manual_ta3_EN.lua b/doc/manual_ta3_EN.lua index 8b02de4..fcd2c3e 100644 --- a/doc/manual_ta3_EN.lua +++ b/doc/manual_ta3_EN.lua @@ -79,7 +79,6 @@ return { "3,TA3 Gravel Rinser", "3,TA3 Grinder", "3,TA3 Injector", - "3,TA3 Item Flow Limiter", "2,Tools", "3,Techage Info Tool", "3,TechAge Programmer", @@ -709,16 +708,6 @@ return { "\n".. "\n".. "\n", - "The Flow Limiter limits the number of items that can be pushed through by using a slider. This allows the number of items that are put into an oven\\, for example\\, to be precisely adapted to the recipe.\n".. - "\n".. - "The Flow Limiter must be configured via the menu and then started. If the configured number of items has been passed\\, the block switches off. The next time the Flow Limiter is switched on\\, it again transmits the configured number of items.\n".. - "\n".. - "*Note: The Flow Limiter must be placed behind the pusher.*\n".. - "\n".. - "The Flow Limiter can also be configured and started using a Lua or Beduino controller.\n".. - "\n".. - "\n".. - "\n", "", "The Techage Info Tool (open-ended wrench) has several functions. It shows the time\\, position\\, temperature and biome when an unknown block is clicked on.\n".. "If you click on a TechAge block with command interface\\, all available data will be shown (see also \"Logic / switching blocks\").\n".. @@ -830,7 +819,6 @@ return { "ta3_gravelrinser", "ta3_grinder", "ta3_injector", - "ta3_item_flow_limiter_pas", "", "ta3_end_wrench", "ta3_programmer", @@ -924,6 +912,5 @@ return { "", "", "", - "", } } \ No newline at end of file diff --git a/doc/manual_ta4_DE.lua b/doc/manual_ta4_DE.lua index a6a831b..2073353 100644 --- a/doc/manual_ta4_DE.lua +++ b/doc/manual_ta4_DE.lua @@ -91,7 +91,6 @@ return { "3,TA4 Elektronikfabrik / Electronic Fab", "3,TA4 Injektor / Injector", "3,TA4 Recycler", - "3,TA4 Item Durchlaufbegrenzer / Item Flow Limiter", }, texts = { "Regenerative Energiequellen wie Wind\\, Sonne und Biokraft helfen dir\\, das Ölzeitalter zu verlassen. Mit modernen Technologien und intelligenten Maschinen machst du dich auf in die Zukunft.\n".. @@ -855,10 +854,6 @@ return { "\n".. "\n".. "\n", - "Die Funktion entspricht der von TA3. \n".. - "\n".. - "\n".. - "\n", }, images = { "techage_ta4", @@ -952,7 +947,6 @@ return { "ta4_electronicfab", "ta4_injector", "ta4_recycler", - "ta4_item_flow_limiter_pas", }, plans = { "", @@ -1046,6 +1040,5 @@ return { "", "", "", - "", } } \ No newline at end of file diff --git a/doc/manual_ta4_EN.lua b/doc/manual_ta4_EN.lua index 89dc252..114693b 100644 --- a/doc/manual_ta4_EN.lua +++ b/doc/manual_ta4_EN.lua @@ -91,7 +91,6 @@ return { "3,TA4 Electronic Fab", "3,TA4 Injector", "3,TA4 Recycler", - "3,TA4 Item Flow Limiter", }, texts = { "Renewable energy sources such as wind\\, sun and biofuels help you to leave the oil age. With modern technologies and intelligent machines you set out into the future.\n".. @@ -854,10 +853,6 @@ return { "\n".. " \n".. "\n", - "The function corresponds to that of TA3.\n".. - "\n".. - "\n".. - "\n", }, images = { "techage_ta4", @@ -951,7 +946,6 @@ return { "ta4_electronicfab", "ta4_injector", "ta4_recycler", - "ta4_item_flow_limiter_pas", }, plans = { "", @@ -1045,6 +1039,5 @@ return { "", "", "", - "", } } \ No newline at end of file diff --git a/init.lua b/init.lua index 2cb60d6..091cc10 100644 --- a/init.lua +++ b/init.lua @@ -13,7 +13,7 @@ techage = {} -- Version for compatibility checks, see readme.md/history -techage.version = 1.16 +techage.version = 1.17 if minetest.global_exists("tubelib") then minetest.log("error", "[techage] Techage can't be used together with the mod tubelib!") diff --git a/logic/node_detector.lua b/logic/node_detector.lua index 89fc156..0ebf3f4 100644 --- a/logic/node_detector.lua +++ b/logic/node_detector.lua @@ -277,7 +277,6 @@ minetest.register_node("techage:ta3_nodedetector_on", { }) local function node_timer4(pos) - print("node_timer4") if any_node_changed4(pos)then switch_on4(pos) else diff --git a/manuals/manual_ta3_EN.md b/manuals/manual_ta3_EN.md index 1bc607a..82b5fcd 100644 --- a/manuals/manual_ta3_EN.md +++ b/manuals/manual_ta3_EN.md @@ -846,19 +846,6 @@ The processing power is up to 8 times one item every 4 seconds. [ta3_injector|image] -### TA3 Item Flow Limiter - -The Flow Limiter limits the number of items that can be pushed through by using a slider. This allows the number of items that are put into an oven, for example, to be precisely adapted to the recipe. - -The Flow Limiter must be configured via the menu and then started. If the configured number of items has been passed, the block switches off. The next time the Flow Limiter is switched on, it again transmits the configured number of items. - -**Note: The Flow Limiter must be placed behind the pusher.** - -The Flow Limiter can also be configured and started using a Lua or Beduino controller. - -[ta3_item_flow_limiter_pas|image] - - ## Tools diff --git a/manuals/manual_ta4_DE.md b/manuals/manual_ta4_DE.md index fafb67e..02ba443 100644 --- a/manuals/manual_ta4_DE.md +++ b/manuals/manual_ta4_DE.md @@ -1014,9 +1014,3 @@ Aber nicht alle Zutaten/Materialien der Rezepte lassen sich recyclen: Die Verarbeitungsleistung beträgt ein Item alle 8 s. Der Block benötigt hierfür 16 ku Strom. [ta4_recycler|image] - -### TA4 Item Durchlaufbegrenzer / Item Flow Limiter - -Die Funktion entspricht der von TA3. - -[ta4_item_flow_limiter_pas|image] \ No newline at end of file diff --git a/manuals/manual_ta4_EN.md b/manuals/manual_ta4_EN.md index f06ff11..0f168c5 100644 --- a/manuals/manual_ta4_EN.md +++ b/manuals/manual_ta4_EN.md @@ -1005,10 +1005,3 @@ The machine can disassemble pretty much any Techage and Hyperloop blocks. But no The processing power is one item every 8 s. The block requires 16 ku of electricity for this. [ta4_recycler|image] - -### TA4 Item Flow Limiter - -The function corresponds to that of TA3. - -[ta4_item_flow_limiter_pas|image] -