Compare commits

..

19 Commits

Author SHA1 Message Date
Zweihorn aa868b1586 Merge after rebase and resolving conflict
M  mods/wool/init.lua
2019-05-28 02:00:27 +02:00
Zweihorn 73d0d21897 Remove redundant commentary lines
M  mods/default/craftitems.lua
2019-05-28 01:52:53 +02:00
Zweihorn 54cbb807d6 Depollute the code - 06a - delete tab to make unrelated change vanish
M  mods/flowers/init.lua
2019-05-28 01:52:53 +02:00
Zweihorn abea00fbc7 Depollute the code - 06 - Undo unrelated changes due to failed repair.
M  mods/flowers/init.lua

My related review message was:
I am utterly sorry but appears as if I mixed lines 224-230 with lines 239-245 instead of an appropriate depollute. Please clarify.
2019-05-28 01:52:53 +02:00
Zweihorn c7e5952aa6 Add some more translation tags (overlooked or difficult)
M  mods/default/craftitems.lua
M  mods/default/nodes.lua
M  mods/doors/init.lua
2019-05-28 01:52:53 +02:00
Zweihorn 732962fc19 Depollute the code - 05 - blueberries need group definitions back
M  mods/default/craftitems.lua
2019-05-28 01:52:53 +02:00
Zweihorn e7fb094fe1 Add function mod.get_translator to any mod with serveral lua files
M  mods/beds/beds.lua
M  mods/beds/init.lua
M  mods/carts/cart_entity.lua
M  mods/carts/init.lua
M  mods/carts/rails.lua
M  mods/creative/init.lua
M  mods/creative/inventory.lua
M  mods/default/chests.lua
M  mods/default/craftitems.lua
M  mods/default/furnace.lua
M  mods/default/init.lua
M  mods/default/nodes.lua
M  mods/default/tools.lua
M  mods/default/torch.lua
M  mods/default/trees.lua
M  mods/farming/api.lua
M  mods/farming/hoes.lua
M  mods/farming/init.lua
M  mods/farming/nodes.lua
2019-05-28 01:52:53 +02:00
Zweihorn 7fa0bb07ed do not forget the header as bed/init.lua is not bed/bed.lua 2019-05-28 01:52:53 +02:00
Zweihorn fbd565fcba do not break the bed formspec in translation 2019-05-28 01:52:53 +02:00
Zweihorn e9a0fdb828 more translation tags and some code tidy for wool and dyes 2019-05-28 01:52:53 +02:00
Zweihorn ba4ecd16d2 wool to make use of global dye.dyes 2019-05-28 01:52:53 +02:00
Zweihorn 0f77672354 Depollute the code - 04a - bloody spaces & brown mushrooms 2019-05-28 01:51:54 +02:00
Zweihorn 2f3796ab81 Depollute the code - 04 - bloody brown mushrooms 2019-05-28 01:51:54 +02:00
Zweihorn a0f659596a Depollute the code - 03 2019-05-28 01:51:54 +02:00
Zweihorn 950f618d73 Depollute the code - 02 2019-05-28 01:51:54 +02:00
Zweihorn ed6a047adf Depollute the code 2019-05-28 01:51:54 +02:00
Zweihorn 34d9499f3e ref luacheck whitespace 2nd run 2019-05-28 01:51:54 +02:00
Zweihorn e0bf848c57 ref luacheck whitespace warnings 2019-05-28 01:51:54 +02:00
Zweihorn 8c2d3f0b1f Add support for MT 5 game translation 2019-05-28 01:50:13 +02:00
862 changed files with 613 additions and 57983 deletions

View File

@ -1,11 +1,12 @@
language: generic
sudo: false
addons:
apt:
packages:
- luarocks
before_install:
- luarocks install --local luacheck
script:
- $HOME/.luarocks/bin/luacheck ./mods
script:
- $HOME/.luarocks/bin/luacheck --no-color ./mods
notifications:
email: false

View File

@ -1,34 +0,0 @@
# Minetest Game
The default game bundled in the Minetest engine.
For further information, check [this forum topic](https://forum.minetest.net/viewtopic.php?f=15&t=9724).
Also see the [Minetest Wiki](https://wiki.minetest.net/Subgames/Minetest_Game) for more information.
## Installation
- Unzip the archive, rename the folder to minetest_game and
place it in .. minetest/games/
- GNU/Linux: If you use a system-wide installation place
it in ~/.minetest/games/.
The Minetest engine can be found at
[GitHub](https://github.com/minetest/minetest).
For further information or help, see:
https://wiki.minetest.net/Installing_Mods
## Compatibility
The Minetest Game GitHub master HEAD is generally compatible with the GitHub
master HEAD of the Minetest engine.
Additionally, when the Minetest engine is tagged to be a certain version (e.g.
0.4.10), Minetest Game is tagged with the version too.
When stable releases are made, Minetest Game and the Minetest engine is packaged and made available at
https://minetest.net/downloads/
## Licensing
See `LICENSE.txt`

28
README.txt Normal file
View File

@ -0,0 +1,28 @@
Minetest Game [minetest_game]
=============================
The main game for the Minetest engine
=====================================
To use this game with the Minetest engine, insert this repository as
/games/minetest_game
The Minetest engine can be found in:
https://github.com/minetest/minetest/
Compatibility
--------------
The Minetest Game github master HEAD is generally compatible with the github
master HEAD of the Minetest engine.
Additionally, when the Minetest engine is tagged to be a certain version (eg.
0.4.10), Minetest Game is tagged with the version too.
When stable releases are made, Minetest Game is packaged and made available in
http://minetest.net/downloads/
and in case the repository has grown too much, it may be reset. In that sense,
this is not a "real" git repository. (Package maintainers please note!)
Licensing
---------
See LICENSE.txt

View File

@ -276,7 +276,7 @@ The mod that places chests with loot in dungeons provides an API to register add
name = "item:name",
chance = 0.5,
-- ^ chance value from 0.0 to 1.0 that the item will appear in the chest when chosen
-- Due to an extra step in the selection process, 0.5 does not(!) mean that
-- due to an extra step in the selection process, 0.5 does not(!) mean that
-- on average every second chest will have this item
count = {1, 4},
-- ^ table with minimum and maximum amounts of this item
@ -286,8 +286,7 @@ The mod that places chests with loot in dungeons provides an API to register add
-- optional, defaults to no height restrictions
types = {"desert"},
-- ^ table with types of dungeons this item can be found in
-- supported types: "normal" (the cobble/mossycobble one), "sandstone"
-- "desert" and "ice"
-- supported types: "normal" (the cobble/mossycobble one), "sandstone", "desert"
-- optional, defaults to no type restrictions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,63 +0,0 @@
# Transforms the generic po file produced by weblate into a series of
# locale/[modname].ja.tr files.
# TODO: make it work for all languages!
import os
import re
from collections import defaultdict
strings=dict()
modstr=defaultdict(list)
for modname in os.listdir("../mods/"):
for fn in os.listdir("../mods/"+modname):
if fn.endswith(".lua"):
s=open("../mods/"+modname+"/"+fn).read()
for gtstring in re.findall("S\(.*\)", s):
k=gtstring[3:-2]
strings[k]=modname
modstr[modname].append(k)
"""
for m in modstr.keys():
print(m)
for v in modstr[m]:
print("\t"+v)
"""
locales = list()
for fn in os.listdir("."):
if fn .endswith(".po"):
locales.append(fn[:-3])
print(locales)
notused=set()
for loc in locales:
matches = 0
nom = 0
msgid = None
translation = dict()
for line in open(loc+".po"):
match = re.match('[^#]*msgstr[ \t]+"(.*)"', line)
if match and msgid is not None:
translation[msgid]=match.group(1)
match = re.match('[^#]*msgid[ \t]+"(.*)"', line)
if match:
msgid = match.group(1)
if msgid in strings:
matches+=1
else:
nom+=1
notused.add(msgid)
else:
msgid=None
print("{}: {}/{}".format(loc, matches, matches+nom))
for modname in os.listdir("../mods/"):
os.makedirs("../mods/{0}/locale".format(modname), exist_ok=True)
localefile = open("../mods/{0}/locale/{0}.{1}.tr".format(modname, loc), "w")
localefile.write("# textdomain: "+modname+"\n\n")
for k in modstr[modname]:
if k in translation:
localefile.write("{}={}\n\n".format(k,translation[k]))
localefile.close()
print(notused)

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

2
mods/beds/depends.txt Normal file
View File

@ -0,0 +1,2 @@
default
wool

View File

@ -1,7 +1,7 @@
-- beds/init.lua
-- Load support for MT game translation.
local S = minetest.get_translator("beds")
local S = minetest.get_translator()
beds = {}

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Незвычайны ложак
Simple Bed=Просты ложак

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Zdobená postel
Simple Bed=Prostá postel

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Schönes Bett
Simple Bed=Schlichtes Bett

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=
Simple Bed=

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Luksa lito
Simple Bed=Simpla lito

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Cama sofisticada
Simple Bed=Cama sencilla

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Lit fantaisie
Simple Bed=Lit Simple

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Csinos ágy
Simple Bed=Egyszerű ágy

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Dipan Mewah
Simple Bed=Dipan Sederhana

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Letto elegante
Simple Bed=Letto semplice

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=お洒落なベッド
Simple Bed=簡素なベッド

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=se jadni ckana
Simple Bed=sampu ckana

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Katil Beragam
Simple Bed=Katil Biasa

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Mooi Bed
Simple Bed=Simpel bed

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Łóżko ozdobne
Simple Bed=Proste łóżko

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Cama com Cabeceira
Simple Bed=Cama Simples

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Cama com Cabeceira
Simple Bed=Cama Simples

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Pat Luxos
Simple Bed=Pat Simplu

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Необычная кровать
Simple Bed=Обычная кровать

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Китњаст кревет
Simple Bed=Једноставан кревет

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Süslü Yatak
Simple Bed=Basit Yatak

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=Чепурне Ліжко
Simple Bed=Просте Ліжко

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=豪华大床
Simple Bed=简单的床

View File

@ -1,6 +0,0 @@
# textdomain: beds
Fancy Bed=
Simple Bed=

View File

@ -1,3 +0,0 @@
name = beds
description = Minetest Game mod: beds
depends = default, wool

View File

@ -0,0 +1,2 @@
default
creative?

View File

@ -5,7 +5,7 @@
binoculars = {}
-- Load support for MT game translation.
local S = minetest.get_translator("binoculars")
local S = minetest.get_translator()
-- Detect creative mod

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,2 +0,0 @@
# textdomain: binoculars

View File

@ -1,4 +0,0 @@
name = binoculars
description = Minetest Game mod: binoculars
depends = default
optional_depends = creative

2
mods/boats/depends.txt Normal file
View File

@ -0,0 +1,2 @@
default
player_api

View File

@ -1,7 +1,7 @@
-- boats/init.lua
-- Load support for MT game translation.
local S = minetest.get_translator("boats")
local S = minetest.get_translator()
--
-- Helper functions

View File

@ -1,4 +0,0 @@
# textdomain: boats
Boat=Човен

View File

@ -1,4 +0,0 @@
# textdomain: boats
Boat=Loďka

View File

@ -1,4 +0,0 @@
# textdomain: boats
Boat=Boot

View File

@ -1,4 +0,0 @@
# textdomain: boats
Boat=

View File

@ -1,4 +0,0 @@
# textdomain: boats
Boat=Boato

View File

@ -1,4 +0,0 @@
# textdomain: boats
Boat=Bote

View File

@ -1,4 +0,0 @@
# textdomain: boats
Boat=Bateau

View File

@ -1,4 +0,0 @@
# textdomain: boats
Boat=Csónak

View File

@ -1,4 +0,0 @@
# textdomain: boats
Boat=Kapal

View File

@ -1,4 +0,0 @@
# textdomain: boats
Boat=zattera

View File

@ -1,4 +0,0 @@
# textdomain: boats
Boat=ボート

View File

@ -1,4 +0,0 @@
# textdomain: boats
Boat=bloti

View File

@ -1,4 +0,0 @@
# textdomain: boats
Boat=Bot

View File

@ -1,4 +0,0 @@
# textdomain: boats
Boat=Boot

Some files were not shown because too many files have changed in this diff Show More