Browse Source

Revert "games -> planets"

This reverts commit dc725eb649.
tags/v2.0.1
Mrchiantos 4 weeks ago
parent
commit
48ce801856

+ 1
- 1
build/android/README.md View File

@@ -123,6 +123,6 @@ Other things that may be nice to know


After compiling you need to archive files in assets into three zips - Files.zip, games.zip and worlds.zip.
games.zip must contain "planets" folder.
games.zip must contain "games" folder.
worlds.zip must contain "worlds" folder and "multicraf.conf" text file.
Finally, remaining files must be packed into Files.zip.

+ 1
- 1
build/android/src/main/java/com/multicraft/game/MainActivity.java View File

@@ -485,7 +485,7 @@ public class MainActivity extends Activity implements WVersionManager.ActivityLi
if (isAll) {
dt.execute(unzipLocation);
} else {
dt.execute(unzipLocation + "builtin", unzipLocation + "planets", unzipLocation + "textures"/*, unzipLocation + "debug.txt"*/);
dt.execute(unzipLocation + "builtin", unzipLocation + "games", unzipLocation + "textures"/*, unzipLocation + "debug.txt"*/);
}
}


+ 1
- 1
builtin/mainmenu/dlg_contentstore.lua View File

@@ -31,7 +31,7 @@ local num_per_page = 5
local filter_type = 1
local filter_types_titles = {
fgettext("All packages"),
fgettext("planets"),
fgettext("Games"),
fgettext("Mods"),
fgettext("Texture packs"),
}

+ 3
- 3
builtin/mainmenu/dlg_create_world.lua View File

@@ -56,7 +56,7 @@ local function create_world_formspec(dialogdata)
"label[2,2;" .. fgettext("Mapgen") .. "]"..
"dropdown[4.2,2;6.3;dd_mapgen;" .. mglist .. ";" .. selindex .. "]" ..

"label[2,3;" .. fgettext("files") .. "]"..
"label[2,3;" .. fgettext("Planets") .. "]"..
"textlist[4.2,3;5.8,2.3;games;" .. gamemgr.gamelist() ..
";" .. gameidx .. ";true]" ..

@@ -83,7 +83,7 @@ local function create_world_buttonhandler(this, fields)
fields["key_enter"] then

local worldname = fields["te_world_name"]
local gameindex = core.get_textlist_index("planets")
local gameindex = core.get_textlist_index("games")

if gameindex ~= nil and
worldname ~= "" then
@@ -119,7 +119,7 @@ local function create_world_buttonhandler(this, fields)
return true
end

if fields["planets"] then
if fields["games"] then
return true
end

+ 2
- 2
builtin/mainmenu/dlg_settings_advanced.lua View File

@@ -286,9 +286,9 @@ local function parse_config_file(read_all, parse_mods)
local file = io.open(path, "r")
if file then
if not games_category_initialized then
local translation = fgettext_ne("planets"), -- not used, but needed for xgettext
local translation = fgettext_ne("Games"), -- not used, but needed for xgettext
table.insert(settings, {
name = "planets",
name = "Games",
level = 0,
type = "category",
})

+ 1
- 1
doc/lua_api.txt View File

@@ -59,7 +59,7 @@ The game directory can contain the file minetest.conf, which will be used
to set default settings when running the particular game.
It can also contain a settingtypes.txt in the same format as the one in builtin.
This settingtypes.txt will be parsed by the menu and the settings will be displayed
in the "planets" category in the settings tab.
in the "Games" category in the settings tab.

### Menu images


+ 1
- 1
games/default/files/Menu/inventory_plus/menu.lua View File

@@ -269,7 +269,7 @@ if page == "furnitures" then

end

if page == "files" then
if page == "planets" then

local inv = player:get_inventory() or nil


+ 1
- 1
po/BlockColor.pot View File

@@ -205,7 +205,7 @@ msgid "Accept"
msgstr ""

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr ""

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 1
- 1
po/be/BlockColor.po View File

@@ -253,7 +253,7 @@ msgstr ""
"<octaves>, <persistence>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Гульні"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 1
- 1
po/ca/BlockColor.po View File

@@ -259,7 +259,7 @@ msgstr ""
"<llavor>, <octaves>, <persistència>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Jocs"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 2
- 2
po/cs/BlockColor.po View File

@@ -254,7 +254,7 @@ msgstr ""
"<octaves>, <persistence>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Hry"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
@@ -4959,7 +4959,7 @@ msgstr "cURL timeout"
#~ msgid "Mods:"
#~ msgstr "Mody:"

#~ msgid "planets"
#~ msgid "GAMES"
#~ msgstr "HRY"

#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""

+ 1
- 1
po/da/BlockColor.po View File

@@ -256,7 +256,7 @@ msgstr ""
"<udbredelseZ>), <kim>, <oktaver>, <vedholdenhed>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Spil"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 2
- 2
po/de/BlockColor.po View File

@@ -257,7 +257,7 @@ msgstr ""
"<Seed>, <Oktaven>, <Persistenz>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Spiele"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
@@ -5850,7 +5850,7 @@ msgstr "cURL-Zeitüberschreitung"
#~ msgid "Mods:"
#~ msgstr "Mods:"

#~ msgid "planets"
#~ msgid "GAMES"
#~ msgstr "SPIELE"

#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""

+ 1
- 1
po/dv/BlockColor.po View File

@@ -254,7 +254,7 @@ msgid ""
msgstr ""

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr ""

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 1
- 1
po/eo/BlockColor.po View File

@@ -261,7 +261,7 @@ msgid ""
msgstr ""

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Ludoj"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 1
- 1
po/es/BlockColor.po View File

@@ -257,7 +257,7 @@ msgstr ""
"<semilla>, <octavas>, <persistencia>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Juegos"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 2
- 2
po/et/BlockColor.po View File

@@ -254,7 +254,7 @@ msgid ""
msgstr ""

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Mängud"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
@@ -4917,7 +4917,7 @@ msgstr ""
#~ msgid "If enabled, "
#~ msgstr "Sisse lülitatud"

#~ msgid "planets"
#~ msgid "GAMES"
#~ msgstr "MÄNGUD"

#~ msgid "new game"

+ 2
- 2
po/fr/BlockColor.po View File

@@ -254,7 +254,7 @@ msgstr ""
"<octaves>, <persistence>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Jeux"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
@@ -5619,7 +5619,7 @@ msgstr "Délais d'interruption de cURL"
#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
#~ msgstr "Gamemgr : Impossible de copier le mod \"$1\" dans le jeu \"$2\""

#~ msgid "planets"
#~ msgid "GAMES"
#~ msgstr "JEUX"

#~ msgid "Mods:"

+ 1
- 1
po/he/BlockColor.po View File

@@ -250,7 +250,7 @@ msgid ""
msgstr ""

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "משחקים"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 1
- 1
po/hu/BlockColor.po View File

@@ -253,7 +253,7 @@ msgid ""
msgstr ""

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Játékok"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 1
- 1
po/id/BlockColor.po View File

@@ -252,7 +252,7 @@ msgstr ""
"<octaves>, <persistence>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Permainan"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 2
- 2
po/it/BlockColor.po View File

@@ -254,7 +254,7 @@ msgstr ""
"<estensioneZ>), <seme>, <ottave>, <persistenza>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Giochi"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
@@ -5676,7 +5676,7 @@ msgstr "Tempo di scadenza cURL"
#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
#~ msgstr "Gestore del gioco: impossibile il modulo \"$1\" nel gioco \"$2\""

#~ msgid "planets"
#~ msgid "GAMES"
#~ msgstr "GIOCHI"

#~ msgid "Mods:"

+ 1
- 1
po/ja/BlockColor.po View File

@@ -247,7 +247,7 @@ msgstr ""
"<octaves>, <persistence>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "ゲーム"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 1
- 1
po/jbo/BlockColor.po View File

@@ -252,7 +252,7 @@ msgid ""
msgstr ""

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr ""

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 1
- 1
po/ko/BlockColor.po View File

@@ -250,7 +250,7 @@ msgstr ""
"<octaves>, <persistence>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "게임"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 1
- 1
po/ky/BlockColor.po View File

@@ -257,7 +257,7 @@ msgstr ""

#: builtin/mainmenu/dlg_settings_advanced.lua
#, fuzzy
msgid "planets"
msgid "Games"
msgstr "Оюн"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 2
- 2
po/lt/BlockColor.po View File

@@ -255,7 +255,7 @@ msgid ""
msgstr ""

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Žaidimai"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
@@ -4861,7 +4861,7 @@ msgstr ""
#~ msgid "If enabled, "
#~ msgstr "įjungtas"

#~ msgid "planets"
#~ msgid "GAMES"
#~ msgstr "ŽAIDIMAI"

#~ msgid "Mods:"

+ 1
- 1
po/ms/BlockColor.po View File

@@ -254,7 +254,7 @@ msgstr ""
"<penerusan>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Permainan"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 1
- 1
po/nb/BlockColor.po View File

@@ -255,7 +255,7 @@ msgstr ""

#: builtin/mainmenu/dlg_settings_advanced.lua
#, fuzzy
msgid "planets"
msgid "Games"
msgstr "Spill"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 2
- 2
po/nl/BlockColor.po View File

@@ -258,7 +258,7 @@ msgstr ""
"<kiemgetal>, <octaven>, <persistentie>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Spellen"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
@@ -5735,7 +5735,7 @@ msgstr "cURL timeout"
#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
#~ msgstr "Gamemgr: Kan mod \"$1\" niet naar spel \"$2\" kopiëren"

#~ msgid "planets"
#~ msgid "GAMES"
#~ msgstr "SPELLEN"

#~ msgid "Mods:"

+ 2
- 2
po/pl/BlockColor.po View File

@@ -256,7 +256,7 @@ msgstr ""
"<ziarno>, <oktawy>, <trwanie>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Gry"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
@@ -5351,7 +5351,7 @@ msgstr "Limit czasu cURL"
#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
#~ msgstr "Gamemgr: Kopiowanie moda \"$1\" do gry \"$2\" nie powiodło się"

#~ msgid "planets"
#~ msgid "GAMES"
#~ msgstr "GRY"

#~ msgid "Mods:"

+ 2
- 2
po/pt/BlockColor.po View File

@@ -254,7 +254,7 @@ msgstr ""
"<seed>, <oitavos>, <persistência>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Jogos"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
@@ -5172,7 +5172,7 @@ msgstr ""
#~ "Mensagem de Jogo: Impossível fazer cópia do extra \"$1\" para o jogo "
#~ "\"$2\""

#~ msgid "planets"
#~ msgid "GAMES"
#~ msgstr "JOGOS"

#~ msgid "Mods:"

+ 2
- 2
po/pt_BR/BlockColor.po View File

@@ -257,7 +257,7 @@ msgstr ""
"<octaves>, <persistence>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Jogos"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
@@ -5660,7 +5660,7 @@ msgstr "Tempo limite de cURL"
#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
#~ msgstr "Gamemgr: Não foi possível copiar o mod \"$1\" para o jogo \"$2\""

#~ msgid "planets"
#~ msgid "GAMES"
#~ msgstr "JOGOS"

#~ msgid "Mods:"

+ 2
- 2
po/ro/BlockColor.po View File

@@ -254,7 +254,7 @@ msgid ""
msgstr ""

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Jocuri"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
@@ -4959,7 +4959,7 @@ msgstr ""
#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
#~ msgstr "Gamemgr: Nu se poate copia modul \"$1\" în jocul \"$2\""

#~ msgid "planets"
#~ msgid "GAMES"
#~ msgstr "JOCURI"

#~ msgid "Mods:"

+ 2
- 2
po/ru/BlockColor.po View File

@@ -245,7 +245,7 @@ msgstr ""
"<Октавы>,<Постоянство>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Игры"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
@@ -5332,7 +5332,7 @@ msgstr "cURL тайм-аут"
#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
#~ msgstr "Gamemgr: Не могу скопировать мод \"$1\" в игру \"$2\""

#~ msgid "planets"
#~ msgid "GAMES"
#~ msgstr "ИГРЫ"

#~ msgid "Mods:"

+ 1
- 1
po/sl/BlockColor.po View File

@@ -213,7 +213,7 @@ msgid "Accept"
msgstr "Potrdi"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Igre"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 1
- 1
po/sr_Cyrl/BlockColor.po View File

@@ -255,7 +255,7 @@ msgstr ""
"<октаве>, <упорност>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Игре"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 1
- 1
po/sv/BlockColor.po View File

@@ -253,7 +253,7 @@ msgstr ""
"<frö>, <oktaver>, <framhärdande>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Spel"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 1
- 1
po/sw/BlockColor.po View File

@@ -245,7 +245,7 @@ msgid ""
msgstr ""

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Michezo"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 1
- 1
po/tr/BlockColor.po View File

@@ -253,7 +253,7 @@ msgstr ""
"<oktav>, <kalıcılık>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Oyunlar"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 1
- 1
po/uk/BlockColor.po View File

@@ -253,7 +253,7 @@ msgstr ""
"<octaves>, <persistence>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "Ігри"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 2
- 2
po/zh_CN/BlockColor.po View File

@@ -249,7 +249,7 @@ msgstr ""
"<octaves>, <persistence>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "游戏"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua
@@ -5029,7 +5029,7 @@ msgstr "cURL 超时"
#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
#~ msgstr "游戏管理: 无法复制MOD“$1”到游戏“$2”"

#~ msgid "planets"
#~ msgid "GAMES"
#~ msgstr "游戏"

#~ msgid "Mods:"

+ 1
- 1
po/zh_TW/BlockColor.po View File

@@ -252,7 +252,7 @@ msgstr ""
"性>"

#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "planets"
msgid "Games"
msgstr "遊戲"

#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua

+ 2
- 2
src/script/lua_api/l_mainmenu.cpp View File

@@ -762,7 +762,7 @@ int ModApiMainMenu::l_get_modpath(lua_State *L)
int ModApiMainMenu::l_get_gamepath(lua_State *L)
{
std::string gamepath = fs::RemoveRelativePathComponents(
porting::path_share + DIR_DELIM + "planets" + DIR_DELIM);
porting::path_share + DIR_DELIM + "games" + DIR_DELIM);
lua_pushstring(L, gamepath.c_str());
return 1;
}
@@ -949,7 +949,7 @@ bool ModApiMainMenu::isMinetestPath(std::string path)
return true;

/* games */
if (fs::PathStartsWith(path,fs::RemoveRelativePathComponents(porting::path_share + DIR_DELIM + "planets")))
if (fs::PathStartsWith(path,fs::RemoveRelativePathComponents(porting::path_share + DIR_DELIM + "games")))
return true;

/* mods */

+ 5
- 5
src/subgame.cpp View File

@@ -87,13 +87,13 @@ SubgameSpec findSubgame(const std::string &id)
}

find_paths.push_back(GameFindPath(
share + DIR_DELIM + "planets" + DIR_DELIM + id + "_game", true));
share + DIR_DELIM + "games" + DIR_DELIM + id + "_game", true));
find_paths.push_back(GameFindPath(
share + DIR_DELIM + "planets" + DIR_DELIM + id, true));
share + DIR_DELIM + "games" + DIR_DELIM + id, true));
find_paths.push_back(GameFindPath(
share + DIR_DELIM + "planets" + DIR_DELIM + id + "_game", false));
share + DIR_DELIM + "games" + DIR_DELIM + id + "_game", false));
find_paths.push_back(GameFindPath(
share + DIR_DELIM + "planets" + DIR_DELIM + id, false));
share + DIR_DELIM + "games" + DIR_DELIM + id, false));
// Find game directory
std::string game_path;
bool user_game = true; // Game is in user's directory
@@ -145,7 +145,7 @@ std::set<std::string> getAvailableGameIds()
{
std::set<std::string> gameids;
std::set<std::string> gamespaths;
gamespaths.insert(porting::path_share + DIR_DELIM + "planets");
gamespaths.insert(porting::path_share + DIR_DELIM + "games");

Strfnd search_paths(getSubgamePathEnv());


Loading…
Cancel
Save