aboutsummaryrefslogtreecommitdiff
path: root/data/mods
diff options
context:
space:
mode:
(at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef CONTENT_OBJECT_HEADER #define CONTENT_OBJECT_HEADER #define ACTIVEOBJECT_TYPE_TEST 1 #define ACTIVEOBJECT_TYPE_ITEM 2 #define ACTIVEOBJECT_TYPE_RAT 3 #define ACTIVEOBJECT_TYPE_OERKKI1 4 #define ACTIVEOBJECT_TYPE_FIREFLY 5 #define ACTIVEOBJECT_TYPE_MOBV2 6 #define ACTIVEOBJECT_TYPE_LUAENTITY 7 // Special type, not stored in active object lists #define ACTIVEOBJECT_T
authorPerttu Ahola <celeron55@gmail.com>2011-12-03 21:22:29 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-12-03 21:22:29 +0200
commitfd1ef116176503fda9377a6fb4193727667118f0 (patch)
-rw-r--r--data/mods/default/init.lua7
-rw-r--r--data/mods/legacy/init.lua4
-rw-r--r--data/mods/legacy/textures/dungeon_master.png (renamed from data/mods/default/textures/default_dungeon_master.png)bin6636 -> 6636 bytes
-rw-r--r--data/mods/legacy/textures/mineral_coal.png (renamed from data/mods/default/textures/default_mineral_coal.png)bin952 -> 952 bytes
-rw-r--r--data/mods/legacy/textures/mineral_iron.png (renamed from data/mods/default/textures/default_mineral_iron.png)bin1614 -> 1614 bytes
5 files changed, 2 insertions, 9 deletions
diff --git a/data/mods/default/init.lua b/data/mods/default/init.lua
index 68de378c6..552d78c8c 100644
--- a/data/mods/default/init.lua
+++ b/data/mods/default/init.lua
@@ -986,13 +986,6 @@ minetest.register_node("default:ladder", {
material = minetest.digprop_woodlike(0.5),
})
-minetest.register_node("default:coalstone", {
- tile_images = {"stone.png^mineral_coal.png"},
- inventory_image = "stone.png^mineral_coal.png",
- is_ground_content = true,
- material = minetest.digprop_stonelike(1.5),
-})
-
minetest.register_node("default:wood", {
tile_images = {"default_wood.png"},
inventory_image = minetest.inventorycube("default_wood.png"),
diff --git a/data/mods/legacy/init.lua b/data/mods/legacy/init.lua
index e95f0e6ef..61d78fd61 100644
--- a/data/mods/legacy/init.lua
+++ b/data/mods/legacy/init.lua
@@ -654,8 +654,8 @@ minetest.register_node(":ladder", {
})
minetest.register_node(":coalstone", {
- tile_images = {"stone.png^mineral_coal.png"},
- inventory_image = "stone.png^mineral_coal.png",
+ tile_images = {"default_stone.png^mineral_coal.png"},
+ inventory_image = "default_stone.png^mineral_coal.png",
is_ground_content = true,
material = minetest.digprop_stonelike(1.5),
})
diff --git a/data/mods/default/textures/default_dungeon_master.png b/data/mods/legacy/textures/dungeon_master.png
index 3457c8228..3457c8228 100644
--- a/data/mods/default/textures/default_dungeon_master.png
+++ b/data/mods/legacy/textures/dungeon_master.png
Binary files differ
diff --git a/data/mods/default/textures/default_mineral_coal.png b/data/mods/legacy/textures/mineral_coal.png
index 3ff9692fb..3ff9692fb 100644
--- a/data/mods/default/textures/default_mineral_coal.png
+++ b/data/mods/legacy/textures/mineral_coal.png
Binary files differ
diff --git a/data/mods/default/textures/default_mineral_iron.png b/data/mods/legacy/textures/mineral_iron.png
index 51b15d95d..51b15d95d 100644
--- a/data/mods/default/textures/default_mineral_iron.png
+++ b/data/mods/legacy/textures/mineral_iron.png
Binary files differ