Merge branch 'dev'

This commit is contained in:
sys4-fr 2018-08-02 21:07:29 +02:00
commit 8b88c2c1ec
4 changed files with 221 additions and 250 deletions

9
.gitmodules vendored
View File

@ -154,9 +154,6 @@
[submodule "mods/plantlife_modpack"]
path = mods/plantlife_modpack
url = https://github.com/sys4-fr/plantlife_modpack.git
[submodule "mods/mesecons"]
path = mods/mesecons
url = https://github.com/minetest-mods/mesecons.git
[submodule "mods/moremesecons"]
path = mods/moremesecons
url = https://github.com/minetest-mods/moremesecons.git
@ -209,3 +206,9 @@
[submodule "mods/coloredwood"]
path = mods/coloredwood
url = https://sys4.fr/gogs/NotreAmiLeCube/coloredwood.git
[submodule "mods/mesecons"]
path = mods/mesecons
url = https://sys4.fr/gogs/NotreAmiLeCube/mesecons.git
[submodule "mods/boost_cart"]
path = mods/boost_cart
url = https://sys4.fr/gogs/NotreAmiLeCube/boost_cart.git

1
mods/boost_cart Submodule

@ -0,0 +1 @@
Subproject commit 3386942d718044d0d7f8bdd217eea973e52d7ec9

@ -1 +1 @@
Subproject commit a2340065925a2b622bba45661b8a5f96a888101a
Subproject commit 6d4a0b0684a2dc128eee2c80795ca1f792a5d0d7

View File

@ -1,134 +1,160 @@
gameid = minetest_game
backend = redis
redis_hash = mff_sys4
redis_hash = nalc-0.4
redis_address = localhost
load_mod_mysql_auth = false
load_mod_darkage = true
load_mod_quartz = true
load_mod_moreblocks = true
load_mod_unifieddyes = true
load_mod_3d_armor = true
load_mod_3d_armor_ip = false
load_mod_3d_armor_sfinv = false
load_mod_3d_armor_stand = true
load_mod_3d_armor_ui = true
load_mod_shields = true
load_mod_wieldview = true
load_mod_blackmithril = false
load_mod_hardenedleather = false
load_mod_magicmithril = false
load_mod_mff_classes = true
load_mod_obsidian = false
load_mod_reinforcedleather = false
load_mod_action_timers = true
load_mod_ambience = true
load_mod_areas = true
load_mod_arrow_signs = true
load_mod_automappercolors = true
load_mod_bakedclay = true
load_mod_biome_lib = true
load_mod_bobblocks = true
load_mod_bonemeal = true
load_mod_broomstick = true
load_mod_builtin_falling = true
load_mod_builtin_item = true
load_mod_camera = true
load_mod_cherry_tree = true
load_mod_chesttools = true
load_mod_christmas_craft = true
load_mod_claycrafter = true
load_mod_coloredwood = true
load_mod_colouredstonebricks = true
load_mod_metatools = true
load_mod_worldedit = true
load_mod_worldedit_commands = true
load_mod_worldedit_gui = true
load_mod_worldedit_infinity = true
load_mod_worldedit_limited = true
load_mod_worldedit_shortcommands = true
load_mod_automappercolors = true
load_mod_mapfix = true
load_mod_worldedge = true
load_mod_maze = true
load_mod_peace_areas = true
load_mod_soccer = true
load_mod_serverguide = true
load_mod_meru = true
load_mod_watershed = false
load_mod_bushes_classic = true
load_mod_flowers_plus = true
load_mod_junglegrass = true
load_mod_nature_classic = true
load_mod_biome_lib = true
load_mod_poisonivy = true
load_mod_vines = true
load_mod_moretrees = true
load_mod_along_shore = true
load_mod_bushes = true
load_mod_cavestuff = true
load_mod_dryplants = true
load_mod_ferns = true
load_mod_molehills = true
load_mod_trunks = true
load_mod_woodsoils = true
load_mod_youngtrees = true
load_mod_columnia = true
load_mod_clams = true
load_mod_stairsshine = true
load_mod_whiteshell = true
load_mod_3dmushrooms = true
load_mod_plantlife_i18n= true
load_mod_nether = true
load_mod_vector_extras = true
load_mod_connected_chests = true
load_mod_cozy = true
load_mod_creeper = true
load_mod_darkage = true
load_mod_death_messages = true
load_mod_diet = true
load_mod_digilines = true
load_mod_email = true
load_mod_enchanting = true
load_mod_eventobjects = false
load_mod_factions = true
load_mod_fail = true
load_mod_farming = true
load_mod_fences = true
load_mod_fishing = true
load_mod_food = true
load_mod_food_basic = true
load_mod_food_sweet = true
load_mod_framedglass = true
load_mod_gauges = true
load_mod_glow = true
load_mod_riesenpilz = true
load_mod_seacobble = true
load_mod_seacoral = true
load_mod_seaglass = true
load_mod_seagravel = true
load_mod_sealamps = true
load_mod_seaplants = true
load_mod_seastone = true
load_mod_seastonebrick = true
load_mod_seawrecks = true
load_mod_noairblocks = true
load_mod_christmas_craft = true
load_mod_homedecor = true
load_mod_h2omes = true
load_mod_hazmat_suit = true
load_mod_hbarmor = true
load_mod_hbhunger = true
load_mod_building_blocks = true
load_mod_chains = true
load_mod_computer = true
load_mod_fake_fire = true
load_mod_homedecor = true
load_mod_homedecor_3d_extras = true
load_mod_homedecor_i18n = true
load_mod_inbox = true
load_mod_itemframes = true
load_mod_lavalamp = true
load_mod_lrfurn = true
load_mod_plasmascreen = true
load_mod_arrow_signs = true
load_mod_chains = true
load_mod_signs_lib = true
load_mod_locked_sign = true
load_mod_fences = true
load_mod_stained_glass = true
load_mod_framedglass = true
load_mod_paintings = true
load_mod_multitest = true
load_mod_lavalamp = true
load_mod_lantern = true
load_mod_hudbars = true
load_mod_interact = true
load_mod_inventorycheck = true
load_mod_inventory_icon = true
load_mod_invtweak = true
load_mod_irc = false
load_mod_irc_commands = false
load_mod_item_drop = true
load_mod_jumping = true
load_mod_homedecor_i18n = true
load_mod_kpgmobs = true
load_mod_lantern = true
load_mod_lavatemple = true
load_mod_lightning = true
load_mod_locked_sign = true
load_mod_maidroid = true
load_mod_maidroid_core = true
load_mod_maidroid_tool = true
load_mod_mana = true
load_mod_mapfix = true
load_mod_maptools = true
load_mod_markers = true
load_mod_maze = true
load_mod_meru = true
load_mod_mesecons = true
load_mod_warps = true
load_mod_mesecons_commandblock = true
load_mod_mesecons_alias = true
load_mod_mesecons_blinkyplant = true
load_mod_mesecons_button = true
load_mod_mesecons_commandblock = true
load_mod_mesecons_delayer = true
load_mod_mesecons_detector = true
load_mod_mesecons_doors = true
load_mod_mesecons_extrawires = true
load_mod_mesecons_fpga = true
load_mod_mesecons_gates = true
load_mod_mesecons_hydroturbine = true
load_mod_mesecons_insulated = true
load_mod_mesecons_lamp = true
load_mod_mesecons_lightstone = true
load_mod_mesecons_luacontroller = true
load_mod_mesecons_materials = true
load_mod_mesecons_microcontroller = true
load_mod_mesecons_movestones = true
load_mod_mesecons_mvps = true
load_mod_mesecons_noteblock = true
load_mod_mesecons_pistons = true
load_mod_mesecons_powerplant = true
load_mod_mesecons_pressureplates = true
load_mod_mesecons_random = true
load_mod_mesecons_receiver = true
load_mod_mesecons_solarpanel = true
load_mod_mesecons_stickyblocks = true
load_mod_mesecons_switch = true
load_mod_mesecons_torch = true
load_mod_mesecons_walllever = true
load_mod_mesecons_blinkyplant = true
load_mod_mesecons_detector = true
load_mod_mesecons_gates = true
load_mod_mesecons_luacontroller = true
load_mod_mesecons_microcontroller = true
load_mod_mesecons_movestones = true
load_mod_mesecons_noteblock = true
load_mod_mesecons_stickyblocks = true
load_mod_mesecons_fpga = true
load_mod_mesecons_wires = true
load_mod_metatools = true
load_mod_mff_core = true
load_mod_mff_hud = true
load_mod_mff_introspect = true
load_mod_mff_pclasses = true
load_mod_mff_quests = true
load_mod_minercantile = true
load_mod__misc = true
load_mod_mob_horse = true
load_mod_mobs = true
load_mod_mobs_animal = true
load_mod_mobs_monster = true
load_mod_mobs_crocs = true
load_mod_mobs_fish = true
load_mod_mobs_jellyfish = true
load_mod_mobs_sharks = true
load_mod_mobs_turtles = true
load_mod_money = true
load_mod_moreblocks = true
load_mod_more_chests = true
load_mod_morefarming = true
load_mod_moreflowers = true
load_mod_moremesecons_adjustable_blinkyplant = true
load_mod_moremesecons_adjustable_player_detector = true
load_mod_moremesecons_commandblock = true
load_mod_moremesecons_conductor_signalchanger = true
load_mod_moremesecons_dual_delayer = tru
load_mod_moremesecons_dual_delayer = true
load_mod_moremesecons_entity_detector = true
load_mod_moremesecons_igniter = true
load_mod_moremesecons_induction_transmitter = true
@ -145,170 +171,111 @@ load_mod_moremesecons_teleporter = true
load_mod_moremesecons_timegate = true
load_mod_moremesecons_utils = true
load_mod_moremesecons_wireless = true
load_mod_bobblocks = true
load_mod_pipeworks = true
load_mod_factions = true
load_mod_invtweak = true
load_mod_sponge = true
load_mod_mobs = true
load_mod_mob_horse = true
load_mod_creeper = true
load_mod_kpgmobs = true
load_mod_mobs_animal = true
load_mod_mobs_monster = true
load_mod_mobs_crocs = true
load_mod_mobs_fish = true
load_mod_mobs_jellyfish = true
load_mod_mobs_old = false
load_mod_mobs_sharks = true
load_mod_mobs_turtles = true
load_mod_pmobs = true
load_mod_slimes = true
load_mod_zombie = true
load_mod_tsm_pyramids = true
load_mod_trm_pyramids = true
load_mod_treasurer = true
load_mod_lavatemple = true
load_mod_more_chests = true
load_mod_connected_chests = true
load_mod_chesttools = true
load_mod_food = true
load_mod_food_basic = true
load_mod_food_sweet = true
load_mod_moreores = true
load_mod_moreplants = true
load_mod_moretrees = true
load_mod_mtfoods = true
load_mod_diet = true
load_mod_fishing = true
load_mod_hbarmor = true
load_mod_hbhunger = true
load_mod_hudbars = true
load_mod_mff_hud = true
load_mod_gauges = true
load_mod_sprint = true
load_mod_mana = true
load_mod_runes = true
load_mod_broomstick = true
load_mod_fail = true
load_mod_cozy = true
load_mod_unified_inventory = true
load_mod_inventory_icon = true
load_mod_u_skins = true
load_mod_item_drop = true
load_mod_mff_core = true
load_mod_mff_introspect = true
load_mod_mff_quests = true
load_mod_quests = true
load_mod_action_timers = true
load_mod_throwing = true
load_mod_spears = true
load_mod_pclasses = true
load_mod_mff_pclasses = true
load_mod_3d_armor = true
load_mod_3d_armor_stand = true
load_mod_reinforcedleather = true
load_mod_hardenedleather = true
load_mod_blackmithril = true
load_mod_technic_armor = true
load_mod_magicmithril = false
load_mod_obsidian = false
load_mod_shields = true
load_mod_wieldview = true
load_mod_returnmirror = true
load_mod_eventobjects = false
load_mod_xban2 = true
load_mod_names_per_ip = true
load_mod_inventorycheck = true
load_mod_maptools = true
load_mod_notice = true
load_mod_multitest = true
load_mod_mysql_auth = false
load_mod_nalc = true
load_mod_name_restrictions = true
load_mod_whoison = true
load_mod_player_inactive = false
load_mod_track_players = true
load_mod__misc = true
load_mod_interact = true
load_mod_names_per_ip = true
load_mod_nether = true
load_mod_news = true
load_mod_random_messages = false
load_mod_death_messages = true
load_mod_shutdown = true
load_mod_irc = false
load_mod_irc_commands = false
load_mod_time_regulation = true
load_mod_h2omes = true
load_mod_player_physics = true
load_mod_ambience = true
load_mod_areas = true
load_mod_markers = true
load_mod_builtin_falling = true
load_mod_building_blocks = true
load_mod_inbox = true
load_mod_money = true
load_mod_minercantile = true
load_mod_builtin_item = true
load_mod_email = true
load_mod_report = true
load_mod_snow = true
load_mod_profilerdumper = false
load_mod_stacktraceplus = true
load_mod_profnsched = false
load_mod_maidroid = true
load_mod_maidroid_core = true
load_mod_maidroid_tool = true
load_mod_notice = true
load_mod_nyancat = true
load_mod_paintings = true
load_mod_pclasses = true
load_mod_pdisc = true
load_mod_digilines = true
load_mod_peace_areas = true
load_mod_pipeworks = true
load_mod_3dmushrooms = true
load_mod_along_shore = true
load_mod_bushes = true
load_mod_bushes_classic = true
load_mod_cavestuff = true
load_mod_dryplants = true
load_mod_ferns = true
load_mod_flowers_plus = true
load_mod_junglegrass = true
load_mod_molehills = true
load_mod_nature_classic = true
load_mod_plantlife_i18n = true
load_mod_poisonivy = true
load_mod_trunks = true
load_mod_vines = true
load_mod_woodsoils = true
load_mod_youngtrees = true
load_mod_playeranim = true
load_mod_playereffects = true
load_mod_player_inactive = false
load_mod_player_physics = true
load_mod_pmobs = true
load_mod_profilerdumper = false
load_mod_profnsched = false
load_mod_quartz = true
load_mod_quests = true
load_mod_random_messages = false
load_mod_report = true
load_mod_returnmirror = true
load_mod_riesenpilz = true
load_mod_runes = true
load_mod_clams = true
load_mod_noairblocks = true
load_mod_seacobble = true
load_mod_seacoral = true
load_mod_seaglass = true
load_mod_seagravel = true
load_mod_sealamps = true
load_mod_seaplants = true
load_mod_seastone = true
load_mod_seastonebrick = true
load_mod_seawrecks = true
load_mod_stairsshine = true
load_mod_whiteshell = true
load_mod_serverguide = true
load_mod_shutdown = true
load_mod_signs_lib = true
load_mod_slimes = true
load_mod_snow = true
load_mod_soccer = true
load_mod_spears = true
load_mod_sponge = true
load_mod_sprint = true
load_mod_stacktraceplus = true
load_mod_stained_glass = true
load_mod_concrete = true
load_mod_extranodes = true
load_mod_technic = true
load_mod_technic_chests = true
load_mod_technic_worldgen = true
load_mod_wrench = true
load_mod_enchanting = true
load_mod_witchcraft = true
load_mod_playereffects = true
load_mod_bonemeal = true
load_mod_playeranim = true
load_mod_lightning = true
load_mod_bakedclay = true
load_mod_farming = true
load_mod_moreores = true
load_mod_moreflowers = true
load_mod_morefarming = true
load_mod_moreplants = true
load_mod_nalc = true
load_mod_unifiedwool = true
load_mod_unifiedbricks = true
load_mod_camera = true
load_mod_claycrafter = true
load_mod_weather_pack = true
load_mod_nyancat = true
load_mod_cherry_tree = true
load_mod_toolranks = true
load_mod_technic_armor = true
load_mod_throwing = true
load_mod_time_regulation = true
load_mod_tnt = true
player_backend = files
load_mod_toolranks = true
load_mod_track_players = true
load_mod_treasurer = true
load_mod_trm_pyramids = true
load_mod_tsm_pyramids = true
load_mod_unifiedbricks = true
load_mod_unifieddyes = true
load_mod_unified_inventory = true
load_mod_unifiedwool = true
load_mod_u_skins = true
load_mod_vector_extras = true
load_mod_warps = true
load_mod_weather_pack = true
load_mod_whoison = true
load_mod_witchcraft = true
load_mod_worldedge = true
load_mod_worldedit = true
load_mod_worldedit_commands = true
load_mod_worldedit_gui = true
load_mod_worldedit_infinity = true
load_mod_worldedit_limited = true
load_mod_worldedit_shortcommands = true
load_mod_xban2 = true
load_mod_zombie = true
load_mod_boost_cart = true