From de28eb24861dff524821d22a741a81183525d9f7 Mon Sep 17 00:00:00 2001
From: FaceDeer <derksenmobile@gmail.com>
Date: Tue, 2 May 2017 00:37:52 -0600
Subject: [PATCH] Revert "Merge remote-tracking branch
 'refs/remotes/minetest-mods/master'"

This reverts commit dd68bb7994acf55d0fb8dbc72e19cfa51b046dc2, reversing
changes made to 3355729f06c3d108a37078a8f1daac39715e5f72.
---
 CHANGELOG.md    | 10 ----------
 CONTRIBUTING.md | 10 ----------
 LICENSE.md      |  5 +++--
 README.md       |  4 ++--
 init.lua        | 10 +++-------
 mg.lua          |  2 +-
 6 files changed, 9 insertions(+), 32 deletions(-)
 delete mode 100644 CHANGELOG.md
 delete mode 100644 CONTRIBUTING.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index e3c422f..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -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.
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 56fb504..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -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.
diff --git a/LICENSE.md b/LICENSE.md
index a3511ad..45c5ff5 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -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.**
 
diff --git a/README.md b/README.md
index 2980031..35c88ee 100644
--- a/README.md
+++ b/README.md
@@ -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
diff --git a/init.lua b/init.lua
index cef6875..37a8b60 100644
--- a/init.lua
+++ b/init.lua
@@ -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
 -- =================
diff --git a/mg.lua b/mg.lua
index 94244c3..4ff93f3 100644
--- a/mg.lua
+++ b/mg.lua
@@ -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