From b39a6017d4b18a1f75321bd345e9cf2cdb580da6 Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Sat, 29 Dec 2018 14:47:17 +0100
Subject: [PATCH] Add backwards-compatiblity, tidy config.default.txt

---
 config.default.txt | 31 ++++++++++++++++---------------
 depends.txt        |  1 -
 moreores.lua       |  5 +++++
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/config.default.txt b/config.default.txt
index 0fa9ce5..c2e11ad 100644
--- a/config.default.txt
+++ b/config.default.txt
@@ -1,26 +1,27 @@
--- General configuration - BitChange
--- Do NOT change your settings in "config.default.txt"
+-- General configuration for the BitChange mod
+-- Do NOT modify "config.default.txt"! Instead, edit "bitchange_config.txt"
+-- inside your world's directory. Start the world once to generate the file.
 
-bitchange.initial_give			= 10
+bitchange.initial_give        = 10
 -- Enable/Disable whole nodes
-bitchange.enable_exchangeshop		= true
-bitchange.enable_moneychanger		= true
-bitchange.enable_warehouse		= false
-bitchange.enable_toolrepair		= true
-bitchange.enable_donationbox		= true
+bitchange.enable_exchangeshop = true
+bitchange.enable_moneychanger = true
+bitchange.enable_warehouse    = false
+bitchange.enable_toolrepair   = true
+bitchange.enable_donationbox  = true
 
 -- Converting other ores to MineCoins
--- Tin		moreores
+-- Tin		default
 -- Zinc		technic_worldgen
 -- Quartz	quartz
-bitchange.use_technic_zinc		= false
-bitchange.use_quartz			= false
-bitchange.use_default_tin		= false
+bitchange.use_technic_zinc = false
+bitchange.use_quartz       = false
+bitchange.use_default_tin  = false
 
 -- Pipeworks support
-bitchange.exchangeshop_pipeworks	= false
-bitchange.warehouse_pipeworks		= false
+bitchange.exchangeshop_pipeworks = false
+bitchange.warehouse_pipeworks    = false
 
 -- Advanced generation settings
 -- Change in 'minecoins.lua', starting at line 101
-bitchange.enable_generation		= false
+bitchange.enable_generation = false
diff --git a/depends.txt b/depends.txt
index b59e233..9f91021 100644
--- a/depends.txt
+++ b/depends.txt
@@ -1,5 +1,4 @@
 default
-moreores?
 pipeworks?
 quartz?
 technic_worldgen?
diff --git a/moreores.lua b/moreores.lua
index 2cb6b9c..b5bc340 100644
--- a/moreores.lua
+++ b/moreores.lua
@@ -23,6 +23,11 @@ if bitchange.use_quartz and minetest.get_modpath("quartz") then
 	})
 end
 
+if bitchange.use_moreores_tin then
+	bitchange.use_default_tin = true
+	minetest.log("warning", "[bitchange] Loaded deprecated setting 'use_default_tin'")
+end
+
 if bitchange.use_default_tin then
 	minetest.register_craft({
 		output = "bitchange:mineninth 18",