Revert "Merge remote-tracking branch 'refs/remotes/minetest-mods/master'"

This reverts commit dd68bb7994, reversing
changes made to 3355729f06.
This commit is contained in:
FaceDeer 2017-05-02 00:37:52 -06:00
parent dd68bb7994
commit de28eb2486
6 changed files with 9 additions and 32 deletions

View File

@ -1,10 +0,0 @@
# Change Log
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
## [1.0.0] - 2017-02-19
- Initial versioned release.

View File

@ -1,10 +0,0 @@
# Contribution Guide
Thank you for your interest in this mod! Before contributing, be sure to know
about these few guidelines:
- Contributions have to be under the zlib license (or compatible) for code,
and CC BY-SA 3.0 license (or compatible) for assets.
- Make sure to update the change log, keeping the
[change log format](http://keepachangelog.com/) we use.
- Don't bump the version yourself. Maintainers will do this when necessary.

View File

@ -1,6 +1,7 @@
# zlib license
zlib license
============
Copyright (c) 2011-2017 Hugo Locurcio and contributors
Copyright (c) 2011-2015 Calinou and contributors
**This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.**

View File

@ -1,6 +1,6 @@
# More Ores
## More Ores
More Ores for [Minetest](http://minetest.net), a free and open source infinite
More Ores for Minetest <http://minetest.net>, a free/libre infinite
world block sandbox game.
It adds three new ores: silver, tin, and mithril. The ores can be enabled independently

View File

@ -3,7 +3,7 @@
** More Ores **
By Calinou, with the help of Nore.
Copyright (c) 2011-2017 Hugo Locurcio and contributors.
Copyright (c) 2011-2017 Calinou and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
=====================================================================
--]]
@ -14,13 +14,9 @@ moreores = {}
local modpath = minetest.get_modpath("moreores")
local S, NS = dofile(modpath.."/intllib.lua")
dofile(modpath .. "/loot.lua")
dofile(modpath .. "/readsettings.lua")
-- `mg` support:
if minetest.get_modpath("mg") then
dofile(modpath .. "/mg.lua")
end
dofile(modpath .. "/loot.lua")
dofile(modpath .. "/mg.lua")
-- Utility functions
-- =================

2
mg.lua
View File

@ -1,7 +1,7 @@
--[[
More Ores: `mg` mod support
Copyright (c) 2011-2017 Hugo Locurcio and contributors.
Copyright (c) 2011-2015 Calinou and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]
if not minetest.get_modpath("mg") then